Skip to content

O
onlyoffice_core
Commit 33caeb0f authored by Ilya.Kirillov's avatar Ilya.Kirillov Committed by Alexander Trofimov
Browse files
Options

Реализована поддержка Opacity, реализована поддержка разных способов задания... 

Реализована поддержка Opacity, реализована поддержка разных способов задания матрица преобразования и клипа.

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@63449 954022d7-b5bf-4e40-9824-e11837661b57
parent bc3999af
Hide whitespace changes
Inline Side-by-side
Showing with 248 additions and 77 deletions
XpsFile/XpsLib/ContextState.cpp
View file @ 33caeb0f
...@@ -6,15 +6,34 @@ ...@@ -6,15 +6,34 @@
namespace XPS namespace XPS
{ {
CContextState::CContextState(IRenderer* pRenderer) : m_oCurrentTransform(1.0, 0.0, 0.0, 1.0, 0.0, 0.0), m_pRenderer(pRenderer) CContextState::CContextState(IRenderer* pRenderer) : m_oCurrentTransform(1.0, 0.0, 0.0, 1.0, 0.0, 0.0), m_pRenderer(pRenderer), m_dCurOpacity(1.0)
{ {
m_lTransformStack.push_back(m_oCurrentTransform); m_lTransformStack.push_back(m_oCurrentTransform);
m_vOpacity.push_back(m_dCurOpacity);
} }
CContextState::~CContextState() CContextState::~CContextState()
{ {
m_vClipStack.clear(); m_vClipStack.clear();
m_lTransformStack.clear(); m_lTransformStack.clear();
m_vOpacity.clear();
} }
void CContextState::PushOpacity(const double& dOpacity)
{
m_dCurOpacity *= dOpacity;
m_vOpacity.push_back(m_dCurOpacity);
}
void CContextState::PopOpacity()
{
m_vOpacity.pop_back();
if (m_vOpacity.size())
m_dCurOpacity = m_vOpacity.at(m_vOpacity.size() - 1);
else
m_dCurOpacity = 1;
}
double CContextState::GetCurrentOpacity()
{
return m_dCurOpacity;
}
void CContextState::PushTransform(const double arrTransform[6]) void CContextState::PushTransform(const double arrTransform[6])
{ {
Aggplus::CMatrix oTransform(arrTransform[0], arrTransform[1], arrTransform[2], arrTransform[3], arrTransform[4], arrTransform[5]); Aggplus::CMatrix oTransform(arrTransform[0], arrTransform[1], arrTransform[2], arrTransform[3], arrTransform[4], arrTransform[5]);
......
XpsFile/XpsLib/ContextState.h
View file @ 33caeb0f
...@@ -18,6 +18,9 @@ namespace XPS ...@@ -18,6 +18,9 @@ namespace XPS
CContextState(IRenderer* pRenderer); CContextState(IRenderer* pRenderer);
~CContextState(); ~CContextState();
void PushOpacity(const double& dOpacity);
void PopOpacity();
double GetCurrentOpacity();
void PushClip(const CWString& wsClip); void PushClip(const CWString& wsClip);
void PopClip(); void PopClip();
void PushTransform(const double arrTransform[6]); void PushTransform(const double arrTransform[6]);
...@@ -35,6 +38,8 @@ namespace XPS ...@@ -35,6 +38,8 @@ namespace XPS
std::list<Aggplus::CMatrix> m_lTransformStack; std::list<Aggplus::CMatrix> m_lTransformStack;
std::vector<CWString> m_vClipStack; std::vector<CWString> m_vClipStack;
IRenderer* m_pRenderer; IRenderer* m_pRenderer;
std::vector<double> m_vOpacity;
double m_dCurOpacity;
}; };
} }
......
XpsFile/XpsLib/Page.cpp
View file @ 33caeb0f
...@@ -84,7 +84,7 @@ namespace XPS ...@@ -84,7 +84,7 @@ namespace XPS
} }
void Page::DrawCanvas(XmlUtils::CXmlLiteReader& oReader, IRenderer* pRenderer, CContextState* pState, bool* pbBreak) void Page::DrawCanvas(XmlUtils::CXmlLiteReader& oReader, IRenderer* pRenderer, CContextState* pState, bool* pbBreak)
{ {
bool bTransform = false, bClip = false; bool bTransform = false, bClip = false, bOpacity = false;
if (oReader.MoveToFirstAttribute()) if (oReader.MoveToFirstAttribute())
{ {
CWString wsAttrName = oReader.GetName(); CWString wsAttrName = oReader.GetName();
...@@ -94,6 +94,11 @@ namespace XPS ...@@ -94,6 +94,11 @@ namespace XPS
bClip = ClipToRenderer(oReader.GetText(), pState); bClip = ClipToRenderer(oReader.GetText(), pState);
else if (wsAttrName == L"RenderTransform") else if (wsAttrName == L"RenderTransform")
bTransform = TransformToRenderer(oReader.GetText(), pState); bTransform = TransformToRenderer(oReader.GetText(), pState);
else if (wsAttrName == L"Opacity")
{
pState->PushOpacity(GetDouble(oReader.GetText()));
bOpacity = true;
}
if (!oReader.MoveToNextAttribute()) if (!oReader.MoveToNextAttribute())
break; break;
...@@ -144,6 +149,9 @@ namespace XPS ...@@ -144,6 +149,9 @@ namespace XPS
if (bTransform) if (bTransform)
pState->PopTransform(); pState->PopTransform();
if (bOpacity)
pState->PopOpacity();
} }
void Page::ReadPageResources(XmlUtils::CXmlLiteReader& oReader, IRenderer* pRenderer, CContextState* pState) void Page::ReadPageResources(XmlUtils::CXmlLiteReader& oReader, IRenderer* pRenderer, CContextState* pState)
{ {
...@@ -209,13 +217,15 @@ namespace XPS ...@@ -209,13 +217,15 @@ namespace XPS
{ {
int nBgr = 0, nAlpha = 255; int nBgr = 0, nAlpha = 255;
double dFontSize = 10.0; double dFontSize = 10.0;
bool bTransform = false; bool bTransform = false, bClip = false, bOpacity = false;
int nTextLen = 0; int nTextLen = 0;
std::wstring wsText; std::wstring wsText;
double dX = 0; double dX = 0;
double dY = 0; double dY = 0;
std::wstring wsFontPath; std::wstring wsFontPath;
std::wstring wsIndicies; std::wstring wsIndicies;
int nBidiLevel = 0;
CWString wsClip, wsTransform;
if (oReader.MoveToFirstAttribute()) if (oReader.MoveToFirstAttribute())
{ {
std::wstring wsAttrName = oReader.GetName(); std::wstring wsAttrName = oReader.GetName();
...@@ -236,6 +246,15 @@ namespace XPS ...@@ -236,6 +246,15 @@ namespace XPS
wsFontPath = NormalizePath(wsFontPath); wsFontPath = NormalizePath(wsFontPath);
pRenderer->put_FontPath(wsFontPath); pRenderer->put_FontPath(wsFontPath);
} }
else if (wsAttrName == L"Opacity")
{
pState->PushOpacity(GetDouble(oReader.GetText()));
bOpacity = true;
}
else if (L"Clip" == wsAttrName)
{
wsClip.create(oReader.GetText(), true);
}
else if (L"Fill" == wsAttrName) else if (L"Fill" == wsAttrName)
{ {
std::wstring wsFontColor = oReader.GetText(); std::wstring wsFontColor = oReader.GetText();
...@@ -259,21 +278,18 @@ namespace XPS ...@@ -259,21 +278,18 @@ namespace XPS
} }
else if (L"RenderTransform" == wsAttrName) else if (L"RenderTransform" == wsAttrName)
{ {
std::wstring wsTransform = oReader.GetText(); wsTransform.create(oReader.GetText(), true);
if (!wsTransform.empty())
{
bTransform = TransformToRenderer(wsTransform.c_str(), pState);
if (dFontSize < 5)
{
double dDet = pState->NormalizeTransform();
dFontSize *= dDet;
}
}
} }
else if (L"UnicodeString" == wsAttrName) else if (L"UnicodeString" == wsAttrName)
{ {
wsText = oReader.GetText(); wsText = oReader.GetText();
nTextLen = wsText.length(); nTextLen = wsText.length();
if (nTextLen >= 2 && '{' == wsText.at(0) && '}' == wsText.at(1))
{
wsText = wsText.substr(2);
nTextLen -= 2;
}
} }
else if (L"OriginX" == wsAttrName) else if (L"OriginX" == wsAttrName)
{ {
...@@ -289,6 +305,10 @@ namespace XPS ...@@ -289,6 +305,10 @@ namespace XPS
{ {
wsIndicies = oReader.GetText(); wsIndicies = oReader.GetText();
} }
else if (L"BidiLevel" == wsAttrName)
{
nBidiLevel = GetInteger(oReader.GetText());
}
if (!oReader.MoveToNextAttribute()) if (!oReader.MoveToNextAttribute())
break; break;
...@@ -298,43 +318,95 @@ namespace XPS ...@@ -298,43 +318,95 @@ namespace XPS
} }
oReader.MoveToElement(); oReader.MoveToElement();
if (!oReader.IsEmptyNode())
{
std::wstring wsNodeName;
int nCurDepth = oReader.GetDepth();
while (oReader.ReadNextSiblingNode(nCurDepth))
{
wsNodeName = oReader.GetName();
wsNodeName = RemoveNamespace(wsNodeName);
if (L"Glyphs.RenderTransform" == wsNodeName)
{
wsTransform = ReadMatrixTransform(oReader);
}
}
}
// , ,
// , ,
// .
if (!wsTransform.empty())
{
bTransform = TransformToRenderer(wsTransform.c_str(), pState);
if (dFontSize < 5)
{
double dDet = pState->NormalizeTransform();
dFontSize *= dDet;
}
}
if (!wsClip.empty())
{
bClip = ClipToRenderer(wsClip.c_str(), pState);
}
pRenderer->put_BrushColor1(nBgr & 0x00FFFFFF); pRenderer->put_BrushColor1(nBgr & 0x00FFFFFF);
pRenderer->put_BrushAlpha1(nAlpha); pRenderer->put_BrushAlpha1(((double)nAlpha * pState->GetCurrentOpacity()));
pRenderer->put_BrushType(c_BrushTypeSolid); pRenderer->put_BrushType(c_BrushTypeSolid);
pRenderer->put_FontSize(dFontSize * 0.75); pRenderer->put_FontSize(dFontSize * 0.75);
std::wstring wsChar = wsText.substr(0, 1); std::wstring wsChar = wsText.substr(0, 1);
std::vector<std::vector<std::wstring>> arrElements = Split(wsIndicies, L';', L','); std::vector<std::vector<std::wstring>> arrElements = Split(wsIndicies, L';', L',');
bool bRtoL = (nBidiLevel % 2 ? true : false);
m_pFontManager->LoadFontFromFile(wsFontPath, 0, (float)(dFontSize * 0.75), 96, 96); m_pFontManager->LoadFontFromFile(wsFontPath, 0, (float)(dFontSize * 0.75), 96, 96);
for (int nIndex = 0; nIndex < nTextLen - 1; nIndex++) for (int nIndex = 0; nIndex < nTextLen; nIndex++)
{ {
if (nIndex >= arrElements.size()) if (nIndex >= arrElements.size())
arrElements.push_back(std::vector<std::wstring>()); arrElements.push_back(std::vector<std::wstring>());
pRenderer->CommandDrawText(wsChar, xpsUnitToMM(dX), xpsUnitToMM(dY), 0, 0, 0); if (bRtoL)
if (arrElements.at(nIndex).size() >= 2)
{ {
dX += GetDouble(arrElements.at(nIndex).at(1)) * dFontSize / 100.0; if (arrElements.at(nIndex).size() >= 2)
{
dX -= GetDouble(arrElements.at(nIndex).at(1)) * dFontSize / 100.0;
}
else
{
m_pFontManager->LoadString1(wsChar, 0, 0);
TBBox oBox = m_pFontManager->MeasureString2();
dX -= (oBox.fMaxX - oBox.fMinX);
}
pRenderer->CommandDrawText(wsChar, xpsUnitToMM(dX), xpsUnitToMM(dY), 0, 0, 0);
} }
else else
{ {
m_pFontManager->LoadString1(wsChar, 0, 0); pRenderer->CommandDrawText(wsChar, xpsUnitToMM(dX), xpsUnitToMM(dY), 0, 0, 0);
TBBox oBox = m_pFontManager->MeasureString2(); if (arrElements.at(nIndex).size() >= 2)
dX += (oBox.fMaxX - oBox.fMinX); {
dX += GetDouble(arrElements.at(nIndex).at(1)) * dFontSize / 100.0;
}
else
{
m_pFontManager->LoadString1(wsChar, 0, 0);
TBBox oBox = m_pFontManager->MeasureString2();
dX += (oBox.fMaxX - oBox.fMinX);
}
} }
wsChar = wsText.substr(nIndex + 1, 1); wsChar = wsText.substr(nIndex + 1, 1);
} }
if (nTextLen > 0) if (bClip)
{ pState->PopClip();
pRenderer->CommandDrawText(wsChar, xpsUnitToMM(dX), xpsUnitToMM(dY), 0, 0, 0);
}
if (bTransform) if (bTransform)
pState->PopTransform(); pState->PopTransform();
if (bOpacity)
pState->PopOpacity();
} }
bool Page::ReadTransform(XmlUtils::CXmlLiteReader& oReader, IRenderer* pRenderer, CContextState* pState) bool Page::ReadTransform(XmlUtils::CXmlLiteReader& oReader, IRenderer* pRenderer, CContextState* pState)
{ {
...@@ -355,14 +427,37 @@ namespace XPS ...@@ -355,14 +427,37 @@ namespace XPS
return false; return false;
} }
CWString Page::ReadMatrixTransform(XmlUtils::CXmlLiteReader& oReader)
{
CWString wsNodeName, wsTransform;
int nCurDepth = oReader.GetDepth();
while (oReader.ReadNextSiblingNode(nCurDepth))
{
wsNodeName = oReader.GetName();
if (wsNodeName == L"MatrixTransform")
{
ReadAttribute(oReader, L"Matrix", wsTransform);
break;
}
}
return wsTransform;
}
CWString Page::ReadClip(XmlUtils::CXmlLiteReader& oReader)
{
CWString wsClip;
// TODO: Clip
return wsClip;
}
void Page::DrawPath(XmlUtils::CXmlLiteReader& oReader, IRenderer* pRenderer, CContextState* pState) void Page::DrawPath(XmlUtils::CXmlLiteReader& oReader, IRenderer* pRenderer, CContextState* pState)
{ {
bool bTransform = false, bClip = false; bool bTransform = false, bClip = false, bOpacity = false;
bool bFillSetted = false; bool bFillSetted = false;
double dPenSize = 1.0; double dPenSize = 1.0;
std::wstring wsData; std::wstring wsData;
bool bStroke = false; bool bStroke = false;
int nFillBgr = 0, nFillAlpha = 255, nStrokeBgr = 0, nStrokeAlpha = 255;
BYTE nDashCap = Aggplus::LineCapFlat; BYTE nDashCap = Aggplus::LineCapFlat;
BYTE nStartCap = Aggplus::LineCapFlat; BYTE nStartCap = Aggplus::LineCapFlat;
BYTE nEndCap = Aggplus::LineCapFlat; BYTE nEndCap = Aggplus::LineCapFlat;
...@@ -373,6 +468,8 @@ namespace XPS ...@@ -373,6 +468,8 @@ namespace XPS
LONG lDashPatternSize = 0; LONG lDashPatternSize = 0;
double dDashOffset = 0.0; double dDashOffset = 0.0;
CWString wsClip, wsTransform;
if (oReader.MoveToFirstAttribute()) if (oReader.MoveToFirstAttribute())
{ {
std::wstring wsAttrName = oReader.GetName(); std::wstring wsAttrName = oReader.GetName();
...@@ -380,19 +477,21 @@ namespace XPS ...@@ -380,19 +477,21 @@ namespace XPS
{ {
if (L"RenderTransform" == wsAttrName) if (L"RenderTransform" == wsAttrName)
{ {
bTransform = TransformToRenderer(oReader.GetText(), pState); wsTransform.create(oReader.GetText(), true);
} }
else if (L"Clip" == wsAttrName) else if (L"Clip" == wsAttrName)
{ {
bClip = ClipToRenderer(oReader.GetText(), pState); wsClip.create(oReader.GetText(), true);
}
else if (L"Opacity" == wsAttrName)
{
pState->PushOpacity(GetDouble(oReader.GetText()));
bOpacity = true;
} }
else if (L"Stroke" == wsAttrName) else if (L"Stroke" == wsAttrName)
{ {
int nStrokeAlpha = 255, nStrokeBgr = 0;
std::wstring wsStrokeColor = oReader.GetText(); std::wstring wsStrokeColor = oReader.GetText();
GetBgra(wsStrokeColor, nStrokeBgr, nStrokeAlpha); GetBgra(wsStrokeColor, nStrokeBgr, nStrokeAlpha);
pRenderer->put_PenColor(nStrokeBgr & 0x00FFFFFF);
pRenderer->put_PenAlpha(nStrokeAlpha);
bStroke = true; bStroke = true;
} }
else if (L"StrokeThickness" == wsAttrName) else if (L"StrokeThickness" == wsAttrName)
...@@ -454,11 +553,7 @@ namespace XPS ...@@ -454,11 +553,7 @@ namespace XPS
{ {
bFillSetted = true; bFillSetted = true;
std::wstring wsFill = oReader.GetText(); std::wstring wsFill = oReader.GetText();
int nFillBgra, nFillAlpha; GetBgra(wsFill, nFillBgr, nFillAlpha);
GetBgra(wsFill, nFillBgra, nFillAlpha);
pRenderer->put_BrushType(c_BrushTypeSolid);
pRenderer->put_BrushColor1(nFillBgra & 0x00FFFFFF);
pRenderer->put_BrushAlpha1(nFillAlpha);
} }
else if (L"Data" == wsAttrName) else if (L"Data" == wsAttrName)
{ {
...@@ -473,6 +568,45 @@ namespace XPS ...@@ -473,6 +568,45 @@ namespace XPS
} }
oReader.MoveToElement(); oReader.MoveToElement();
bool bFill = bFillSetted;
if (!bFillSetted)
{
if (!oReader.IsEmptyNode())
{
CWString wsNodeName;
int nCurDepth = oReader.GetDepth();
while (oReader.ReadNextSiblingNode(nCurDepth))
{
wsNodeName = oReader.GetName();
if (wsNodeName == L"Path.Fill")
{
bFill = FillToRenderer(oReader, pRenderer);
}
else if (wsNodeName == L"Path.Data")
{
ReadPathData(oReader, wsData);
}
else if (wsNodeName == L"Path.RenderTransform")
{
wsTransform = ReadMatrixTransform(oReader);
}
}
}
}
// , ,
// , ,
// .
if (!wsTransform.empty())
{
bTransform = TransformToRenderer(wsTransform.c_str(), pState);
}
if (!wsClip.empty())
{
bClip = ClipToRenderer(wsClip.c_str(), pState);
}
if (pDashPattern) if (pDashPattern)
{ {
for (LONG lIndex = 0; lIndex < lDashPatternSize; lIndex++) for (LONG lIndex = 0; lIndex < lDashPatternSize; lIndex++)
...@@ -494,34 +628,24 @@ namespace XPS ...@@ -494,34 +628,24 @@ namespace XPS
pRenderer->put_PenLineEndCap(nEndCap); pRenderer->put_PenLineEndCap(nEndCap);
} }
if (bStroke)
{
pRenderer->put_PenColor(nStrokeBgr & 0x00FFFFFF);
pRenderer->put_PenAlpha(nStrokeAlpha * pState->GetCurrentOpacity());
}
if (bFill)
{
pRenderer->put_BrushType(c_BrushTypeSolid);
pRenderer->put_BrushColor1(nFillBgr & 0x00FFFFFF);
pRenderer->put_BrushAlpha1(nFillAlpha * pState->GetCurrentOpacity());
}
pRenderer->put_PenLineJoin(nJoinStyle); pRenderer->put_PenLineJoin(nJoinStyle);
if (nJoinStyle == Aggplus::LineJoinMiter) if (nJoinStyle == Aggplus::LineJoinMiter)
pRenderer->put_PenMiterLimit(xpsUnitToMM(dMiter)); pRenderer->put_PenMiterLimit(xpsUnitToMM(dMiter));
pRenderer->put_PenSize(xpsUnitToMM(dPenSize)); pRenderer->put_PenSize(xpsUnitToMM(dPenSize));
bool bFill = bFillSetted;
if (!bFillSetted)
{
if (!oReader.IsEmptyNode())
{
std::wstring wsNodeName;
int nCurDepth = oReader.GetDepth();
while (oReader.ReadNextSiblingNode(nCurDepth))
{
wsNodeName = oReader.GetName();
wsNodeName = RemoveNamespace(wsNodeName);
if (L"Path.Fill" == wsNodeName)
{
bFill = FillToRenderer(oReader, pRenderer);
}
}
}
}
if (L"" == wsData)
ReadPathData(oReader, wsData);
pRenderer->BeginCommand(c_nPathType); pRenderer->BeginCommand(c_nPathType);
pRenderer->PathCommandStart(); pRenderer->PathCommandStart();
...@@ -550,6 +674,9 @@ namespace XPS ...@@ -550,6 +674,9 @@ namespace XPS
if (bTransform) if (bTransform)
pState->PopTransform(); pState->PopTransform();
if (bOpacity)
pState->PopOpacity();
return; return;
} }
} }
...@@ -569,6 +696,9 @@ namespace XPS ...@@ -569,6 +696,9 @@ namespace XPS
if (bClip) if (bClip)
pState->PopClip(); pState->PopClip();
if (bOpacity)
pState->PopOpacity();
} }
bool Page::FillToRenderer(XmlUtils::CXmlLiteReader& oReader, IRenderer* pRenderer) bool Page::FillToRenderer(XmlUtils::CXmlLiteReader& oReader, IRenderer* pRenderer)
{ {
...@@ -612,27 +742,16 @@ namespace XPS ...@@ -612,27 +742,16 @@ namespace XPS
if (oReader.IsEmptyNode()) if (oReader.IsEmptyNode())
return; return;
std::wstring wsNodeName; CWString wsNodeName;
int nParentDepth = oReader.GetDepth(); int nCurDepth = oReader.GetDepth();
while (oReader.ReadNextSiblingNode(nParentDepth)) while (oReader.ReadNextSiblingNode(nCurDepth))
{ {
wsNodeName = oReader.GetName(); wsNodeName = oReader.GetName();
if (L"Path.Data" == wsNodeName) if (wsNodeName == L"PathGeometry")
{ {
if (!oReader.IsEmptyNode()) return ReadPathGeometry(oReader, wsData);
{
int nDataDepth = oReader.GetDepth();
while (oReader.ReadNextSiblingNode(nParentDepth))
{
wsNodeName = oReader.GetName();
if (L"PathGeometry" == wsNodeName)
{
return ReadPathGeometry(oReader, wsData);
}
}
}
} }
} }
} }
void Page::ReadPathGeometry(XmlUtils::CXmlLiteReader& oReader, std::wstring& wsData) void Page::ReadPathGeometry(XmlUtils::CXmlLiteReader& oReader, std::wstring& wsData)
{ {
......
XpsFile/XpsLib/Page.h
View file @ 33caeb0f
...@@ -38,6 +38,9 @@ namespace XPS ...@@ -38,6 +38,9 @@ namespace XPS
bool ClipToRenderer (const wchar_t* wsString, CContextState* pState); bool ClipToRenderer (const wchar_t* wsString, CContextState* pState);
bool TransformToRenderer(const wchar_t* wsString, CContextState* pState); bool TransformToRenderer(const wchar_t* wsString, CContextState* pState);
CWString ReadMatrixTransform(XmlUtils::CXmlLiteReader& oReader);
CWString ReadClip (XmlUtils::CXmlLiteReader& oReader);
private: private:
std::wstring m_wsPagePath; std::wstring m_wsPagePath;
......
XpsFile/XpsLib/Utils.cpp
View file @ 33caeb0f
...@@ -626,6 +626,30 @@ namespace XPS ...@@ -626,6 +626,30 @@ namespace XPS
oReader.MoveToElement(); oReader.MoveToElement();
} }
void ReadAttribute(XmlUtils::CXmlLiteReader& oReader, const wchar_t* wsAttrName, CWString& wsAttr)
{
if (oReader.GetAttributesCount() <= 0)
return;
if (!oReader.MoveToFirstAttribute())
return;
CWString wsName = oReader.GetName();
while (!wsName.empty())
{
if (wsName == wsAttrName)
{
wsAttr.create(oReader.GetText(), true);
break;
}
if (!oReader.MoveToNextAttribute())
break;
wsName = oReader.GetName();
}
oReader.MoveToElement();
}
bool VmlToRenderer(const wchar_t* wsString, IRenderer* pRenderer) bool VmlToRenderer(const wchar_t* wsString, IRenderer* pRenderer)
{ {
bool bWinding = false; bool bWinding = false;
......
XpsFile/XpsLib/Utils.h
View file @ 33caeb0f
...@@ -60,6 +60,7 @@ namespace XPS ...@@ -60,6 +60,7 @@ namespace XPS
std::vector<std::vector<std::wstring>> Split(const std::wstring& wsString, wchar_t wDelim1, wchar_t wDelim2); std::vector<std::vector<std::wstring>> Split(const std::wstring& wsString, wchar_t wDelim1, wchar_t wDelim2);
void ReadAttribute(XmlUtils::CXmlLiteReader& oReader, const wchar_t* wsAttrName, std::wstring& wsAttr); void ReadAttribute(XmlUtils::CXmlLiteReader& oReader, const wchar_t* wsAttrName, std::wstring& wsAttr);
void ReadAttribute(XmlUtils::CXmlLiteReader& oReader, const wchar_t* wsAttrName, CWString& wsAttr);
bool VmlToRenderer(const wchar_t* wsString, IRenderer* pRenderer); bool VmlToRenderer(const wchar_t* wsString, IRenderer* pRenderer);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7