[Libreoffice-commits] libvisio.git: build/win32 inc/libvisio src/conv src/lib
Fridrich Å trba
fridrich.strba at bluewin.ch
Tue Nov 5 08:17:46 CET 2013
build/win32/libvisio.dsp | 6
build/win32/libvisio.vcproj | 4
build/win32/libvisio.vcxproj | 4
inc/libvisio/VisioDocument.h | 10
src/conv/raw/vsd2raw.cpp | 86 ++++----
src/conv/raw/vss2raw.cpp | 86 ++++----
src/conv/svg/vsd2xhtml.cpp | 4
src/conv/svg/vss2xhtml.cpp | 4
src/conv/text/vsd2text.cpp | 48 ++--
src/conv/text/vss2text.cpp | 48 ++--
src/lib/VDXParser.cpp | 10
src/lib/VDXParser.h | 8
src/lib/VSD5Parser.cpp | 98 ++++-----
src/lib/VSD5Parser.h | 48 ++--
src/lib/VSD6Parser.cpp | 62 +++---
src/lib/VSD6Parser.h | 18 -
src/lib/VSDCollector.h | 8
src/lib/VSDContentCollector.cpp | 216 ++++++++++-----------
src/lib/VSDContentCollector.h | 42 ++--
src/lib/VSDFieldList.cpp | 18 -
src/lib/VSDFieldList.h | 8
src/lib/VSDInternalStream.cpp | 14 -
src/lib/VSDInternalStream.h | 10
src/lib/VSDOutputElementList.cpp | 124 ++++++------
src/lib/VSDOutputElementList.h | 18 -
src/lib/VSDPages.cpp | 10
src/lib/VSDPages.h | 8
src/lib/VSDParser.cpp | 396 +++++++++++++++++++--------------------
src/lib/VSDParser.h | 140 ++++++-------
src/lib/VSDSVGGenerator.cpp | 66 +++---
src/lib/VSDSVGGenerator.h | 44 ++--
src/lib/VSDStencils.h | 2
src/lib/VSDStylesCollector.cpp | 8
src/lib/VSDStylesCollector.h | 8
src/lib/VSDTypes.h | 10
src/lib/VSDXMLHelper.cpp | 6
src/lib/VSDXMLHelper.h | 6
src/lib/VSDXMLParserBase.cpp | 8
src/lib/VSDXMLParserBase.h | 2
src/lib/VSDXParser.cpp | 78 +++----
src/lib/VSDXParser.h | 22 +-
src/lib/VSDXTheme.cpp | 2
src/lib/VSDXTheme.h | 2
src/lib/VisioDocument.cpp | 60 ++---
src/lib/libvisio_utils.cpp | 20 -
src/lib/libvisio_utils.h | 18 -
46 files changed, 959 insertions(+), 959 deletions(-)
New commits:
commit 2553cd43803e6af436a6c9e1aa40b4c1d2c3e3d2
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Tue Nov 5 08:17:19 2013 +0100
librevenge namespace
Change-Id: I68cc109a7583067dd375db5a98b291b5c3a20b4b
diff --git a/build/win32/libvisio.dsp b/build/win32/libvisio.dsp
index 23439c3..b4f16ef 100644
--- a/build/win32/libvisio.dsp
+++ b/build/win32/libvisio.dsp
@@ -151,7 +151,7 @@ SOURCE=..\..\src\lib\VSDStencils.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\src\lib\RVNGStringVector.cpp
+SOURCE=..\..\src\lib\librevenge::RVNGStringVector.cpp
# End Source File
# Begin Source File
@@ -203,7 +203,7 @@ SOURCE=..\..\inc\libvisio\VisioDocument.h
# End Source File
# Begin Source File
-SOURCE=..\..\inc\libvisio\RVNGStringVector.h
+SOURCE=..\..\inc\libvisio\librevenge::RVNGStringVector.h
# End Source File
# Begin Source File
@@ -283,7 +283,7 @@ SOURCE=..\..\src\lib\VSDStencils.h
# End Source File
# Begin Source File
-SOURCE=..\..\src\lib\RVNGStringVector.h
+SOURCE=..\..\src\lib\librevenge::RVNGStringVector.h
# End Source File
# Begin Source File
diff --git a/build/win32/libvisio.vcproj b/build/win32/libvisio.vcproj
index e4f27ee..426b46f 100644
--- a/build/win32/libvisio.vcproj
+++ b/build/win32/libvisio.vcproj
@@ -525,7 +525,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\src\lib\RVNGStringVector.cpp"
+ RelativePath="..\..\src\lib\librevenge::RVNGStringVector.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -758,7 +758,7 @@
>
</File>
<File
- RelativePath="..\..\inc\libvisio\RVNGStringVector.h"
+ RelativePath="..\..\inc\libvisio\librevenge::RVNGStringVector.h"
>
</File>
<File
diff --git a/build/win32/libvisio.vcxproj b/build/win32/libvisio.vcxproj
index 8e7bf78..0413aff 100644
--- a/build/win32/libvisio.vcxproj
+++ b/build/win32/libvisio.vcxproj
@@ -198,7 +198,7 @@
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\src\lib\RVNGStringVector.cpp">
+ <ClCompile Include="..\..\src\lib\librevenge::RVNGStringVector.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -262,7 +262,7 @@
<ItemGroup>
<ClInclude Include="..\..\inc\libvisio\libvisio.h" />
<ClInclude Include="..\..\inc\libvisio\VisioDocument.h" />
- <ClInclude Include="..\..\inc\libvisio\RVNGStringVector.h" />
+ <ClInclude Include="..\..\inc\libvisio\librevenge::RVNGStringVector.h" />
<ClInclude Include="..\..\src\lib\libvisio_utils.h" />
<ClInclude Include="..\..\src\lib\tokenhash.h" />
<ClInclude Include="..\..\src\lib\tokens.h" />
diff --git a/inc/libvisio/VisioDocument.h b/inc/libvisio/VisioDocument.h
index 498ab2c..94b7252 100644
--- a/inc/libvisio/VisioDocument.h
+++ b/inc/libvisio/VisioDocument.h
@@ -40,15 +40,15 @@ class VisioDocument
{
public:
- static bool isSupported(RVNGInputStream *input);
+ static bool isSupported(librevenge::RVNGInputStream *input);
- static bool parse(RVNGInputStream *input, RVNGDrawingInterface *painter);
+ static bool parse(librevenge::RVNGInputStream *input, librevenge::RVNGDrawingInterface *painter);
- static bool parseStencils(RVNGInputStream *input, RVNGDrawingInterface *painter);
+ static bool parseStencils(librevenge::RVNGInputStream *input, librevenge::RVNGDrawingInterface *painter);
- static bool generateSVG(RVNGInputStream *input, RVNGStringVector &output);
+ static bool generateSVG(librevenge::RVNGInputStream *input, librevenge::RVNGStringVector &output);
- static bool generateSVGStencils(RVNGInputStream *input, RVNGStringVector &output);
+ static bool generateSVGStencils(librevenge::RVNGInputStream *input, librevenge::RVNGStringVector &output);
};
} // namespace libvisio
diff --git a/src/conv/raw/vsd2raw.cpp b/src/conv/raw/vsd2raw.cpp
index e953541..c32710b 100644
--- a/src/conv/raw/vsd2raw.cpp
+++ b/src/conv/raw/vsd2raw.cpp
@@ -72,55 +72,55 @@ enum PainterCallback
m_callStack.pop(); \
}
-class RawPainter : public RVNGDrawingInterface
+class RawPainter : public librevenge::RVNGDrawingInterface
{
public:
RawPainter(bool printCallgraphScore);
~RawPainter();
- void startDocument(const ::RVNGPropertyList & /*propList*/) {}
+ void startDocument(const librevenge::RVNGPropertyList & /*propList*/) {}
void endDocument() {}
- void setDocumentMetaData(const RVNGPropertyList & /*propList*/) {}
- void startPage(const ::RVNGPropertyList &propList);
+ void setDocumentMetaData(const librevenge::RVNGPropertyList & /*propList*/) {}
+ void startPage(const librevenge::RVNGPropertyList &propList);
void endPage();
- void startLayer(const ::RVNGPropertyList &propList);
+ void startLayer(const librevenge::RVNGPropertyList &propList);
void endLayer();
- void startEmbeddedGraphics(const ::RVNGPropertyList &propList);
+ void startEmbeddedGraphics(const librevenge::RVNGPropertyList &propList);
void endEmbeddedGraphics();
- void setStyle(const ::RVNGPropertyList &propList, const ::RVNGPropertyListVector &gradient);
+ void setStyle(const librevenge::RVNGPropertyList &propList, const librevenge::RVNGPropertyListVector &gradient);
- void drawRectangle(const ::RVNGPropertyList &propList);
- void drawEllipse(const ::RVNGPropertyList &propList);
- void drawPolyline(const ::RVNGPropertyListVector &vertices);
- void drawPolygon(const ::RVNGPropertyListVector &vertices);
- void drawPath(const ::RVNGPropertyListVector &path);
- void drawGraphicObject(const ::RVNGPropertyList &propList, const ::RVNGBinaryData &binaryData);
- void startTextObject(const ::RVNGPropertyList &propList, const ::RVNGPropertyListVector &path);
+ void drawRectangle(const librevenge::RVNGPropertyList &propList);
+ void drawEllipse(const librevenge::RVNGPropertyList &propList);
+ void drawPolyline(const librevenge::RVNGPropertyListVector &vertices);
+ void drawPolygon(const librevenge::RVNGPropertyListVector &vertices);
+ void drawPath(const librevenge::RVNGPropertyListVector &path);
+ void drawGraphicObject(const librevenge::RVNGPropertyList &propList, const librevenge::RVNGBinaryData &binaryData);
+ void startTextObject(const librevenge::RVNGPropertyList &propList, const librevenge::RVNGPropertyListVector &path);
void endTextObject();
- void openOrderedListLevel(const RVNGPropertyList & /*propList*/) {}
+ void openOrderedListLevel(const librevenge::RVNGPropertyList & /*propList*/) {}
void closeOrderedListLevel() {}
- void openUnorderedListLevel(const RVNGPropertyList & /*propList*/) {}
+ void openUnorderedListLevel(const librevenge::RVNGPropertyList & /*propList*/) {}
void closeUnorderedListLevel() {}
- void openListElement(const RVNGPropertyList & /*propList*/, const RVNGPropertyListVector & /* tabStops */) {}
+ void openListElement(const librevenge::RVNGPropertyList & /*propList*/, const librevenge::RVNGPropertyListVector & /* tabStops */) {}
void closeListElement() {}
- void openParagraph(const RVNGPropertyList &propList, const RVNGPropertyListVector &tabStops);
+ void openParagraph(const librevenge::RVNGPropertyList &propList, const librevenge::RVNGPropertyListVector &tabStops);
void closeParagraph();
- void openSpan(const RVNGPropertyList &propList);
+ void openSpan(const librevenge::RVNGPropertyList &propList);
void closeSpan();
void insertTab() {}
void insertSpace() {}
- void insertText(const RVNGString &text);
+ void insertText(const librevenge::RVNGString &text);
void insertLineBreak() {}
- void insertField(const RVNGString & /* type */, const RVNGPropertyList & /*propList*/) {}
+ void insertField(const librevenge::RVNGString & /* type */, const librevenge::RVNGPropertyList & /*propList*/) {}
private:
@@ -143,10 +143,10 @@ private:
void __idprintf(const char *format, ...);
};
-RVNGString getPropString(const RVNGPropertyList &propList)
+librevenge::RVNGString getPropString(const librevenge::RVNGPropertyList &propList)
{
- RVNGString propString;
- RVNGPropertyList::Iter i(propList);
+ librevenge::RVNGString propString;
+ librevenge::RVNGPropertyList::Iter i(propList);
if (!i.last())
{
propString.append(i.key());
@@ -164,12 +164,12 @@ RVNGString getPropString(const RVNGPropertyList &propList)
return propString;
}
-RVNGString getPropString(const RVNGPropertyListVector &itemList)
+librevenge::RVNGString getPropString(const librevenge::RVNGPropertyListVector &itemList)
{
- RVNGString propString;
+ librevenge::RVNGString propString;
propString.append("(");
- RVNGPropertyListVector::Iter i(itemList);
+ librevenge::RVNGPropertyListVector::Iter i(itemList);
if (!i.last())
{
@@ -191,7 +191,7 @@ RVNGString getPropString(const RVNGPropertyListVector &itemList)
}
RawPainter::RawPainter(bool printCallgraphScore):
- RVNGDrawingInterface(),
+ librevenge::RVNGDrawingInterface(),
m_indent(0),
m_callbackMisses(0),
m_printCallgraphScore(printCallgraphScore),
@@ -239,7 +239,7 @@ void RawPainter::__idprintf(const char *format, ...)
va_end(args);
}
-void RawPainter::startPage(const ::RVNGPropertyList &propList)
+void RawPainter::startPage(const librevenge::RVNGPropertyList &propList)
{
_U(("RawPainter::startPage(%s)\n", getPropString(propList).cstr()), PC_START_GRAPHICS);
}
@@ -249,7 +249,7 @@ void RawPainter::endPage()
_D(("RawPainter::endPage\n"), PC_START_GRAPHICS);
}
-void RawPainter::startLayer(const ::RVNGPropertyList &propList)
+void RawPainter::startLayer(const librevenge::RVNGPropertyList &propList)
{
_U(("RawPainter::startLayer (%s)\n", getPropString(propList).cstr()), PC_START_LAYER);
}
@@ -259,7 +259,7 @@ void RawPainter::endLayer()
_D(("RawPainter::endLayer\n"), PC_START_LAYER);
}
-void RawPainter::startEmbeddedGraphics(const ::RVNGPropertyList &propList)
+void RawPainter::startEmbeddedGraphics(const librevenge::RVNGPropertyList &propList)
{
_U(("RawPainter::startEmbeddedGraphics (%s)\n", getPropString(propList).cstr()), PC_START_EMBEDDED_GRAPHICS);
}
@@ -269,7 +269,7 @@ void RawPainter::endEmbeddedGraphics()
_D(("RawPainter::endEmbeddedGraphics \n"), PC_START_EMBEDDED_GRAPHICS);
}
-void RawPainter::setStyle(const ::RVNGPropertyList &propList, const ::RVNGPropertyListVector &gradient)
+void RawPainter::setStyle(const librevenge::RVNGPropertyList &propList, const librevenge::RVNGPropertyListVector &gradient)
{
if (m_printCallgraphScore)
return;
@@ -277,7 +277,7 @@ void RawPainter::setStyle(const ::RVNGPropertyList &propList, const ::RVNGProper
__iprintf("RawPainter::setStyle(%s, gradient: (%s))\n", getPropString(propList).cstr(), getPropString(gradient).cstr());
}
-void RawPainter::drawRectangle(const ::RVNGPropertyList &propList)
+void RawPainter::drawRectangle(const librevenge::RVNGPropertyList &propList)
{
if (m_printCallgraphScore)
return;
@@ -285,7 +285,7 @@ void RawPainter::drawRectangle(const ::RVNGPropertyList &propList)
__iprintf("RawPainter::drawRectangle (%s)\n", getPropString(propList).cstr());
}
-void RawPainter::drawEllipse(const ::RVNGPropertyList &propList)
+void RawPainter::drawEllipse(const librevenge::RVNGPropertyList &propList)
{
if (m_printCallgraphScore)
return;
@@ -293,7 +293,7 @@ void RawPainter::drawEllipse(const ::RVNGPropertyList &propList)
__iprintf("RawPainter::drawEllipse (%s)\n", getPropString(propList).cstr());
}
-void RawPainter::drawPolyline(const ::RVNGPropertyListVector &vertices)
+void RawPainter::drawPolyline(const librevenge::RVNGPropertyListVector &vertices)
{
if (m_printCallgraphScore)
return;
@@ -301,7 +301,7 @@ void RawPainter::drawPolyline(const ::RVNGPropertyListVector &vertices)
__iprintf("RawPainter::drawPolyline (%s)\n", getPropString(vertices).cstr());
}
-void RawPainter::drawPolygon(const ::RVNGPropertyListVector &vertices)
+void RawPainter::drawPolygon(const librevenge::RVNGPropertyListVector &vertices)
{
if (m_printCallgraphScore)
return;
@@ -309,7 +309,7 @@ void RawPainter::drawPolygon(const ::RVNGPropertyListVector &vertices)
__iprintf("RawPainter::drawPolygon (%s)\n", getPropString(vertices).cstr());
}
-void RawPainter::drawPath(const ::RVNGPropertyListVector &path)
+void RawPainter::drawPath(const librevenge::RVNGPropertyListVector &path)
{
if (m_printCallgraphScore)
return;
@@ -317,7 +317,7 @@ void RawPainter::drawPath(const ::RVNGPropertyListVector &path)
__iprintf("RawPainter::drawPath (%s)\n", getPropString(path).cstr());
}
-void RawPainter::drawGraphicObject(const ::RVNGPropertyList &propList, const ::RVNGBinaryData & /*binaryData*/)
+void RawPainter::drawGraphicObject(const librevenge::RVNGPropertyList &propList, const librevenge::RVNGBinaryData & /*binaryData*/)
{
if (m_printCallgraphScore)
return;
@@ -325,7 +325,7 @@ void RawPainter::drawGraphicObject(const ::RVNGPropertyList &propList, const ::R
__iprintf("RawPainter::drawGraphicObject (%s)\n", getPropString(propList).cstr());
}
-void RawPainter::startTextObject(const ::RVNGPropertyList &propList, const ::RVNGPropertyListVector &path)
+void RawPainter::startTextObject(const librevenge::RVNGPropertyList &propList, const librevenge::RVNGPropertyListVector &path)
{
_U(("RawPainter::startTextObject (%s, path: (%s))\n", getPropString(propList).cstr(), getPropString(path).cstr()), PC_START_TEXT_OBJECT);
}
@@ -335,7 +335,7 @@ void RawPainter::endTextObject()
_D(("RawPainter::endTextObject\n"), PC_START_TEXT_OBJECT);
}
-void RawPainter::openParagraph(const ::RVNGPropertyList &propList, const RVNGPropertyListVector &tabStops)
+void RawPainter::openParagraph(const librevenge::RVNGPropertyList &propList, const librevenge::RVNGPropertyListVector &tabStops)
{
_U(("RawPainter::openParagraph (%s, tabStops: (%s))\n", getPropString(propList).cstr(), getPropString(tabStops).cstr()), PC_START_TEXT_LINE);
}
@@ -345,7 +345,7 @@ void RawPainter::closeParagraph()
_D(("RawPainter::closeParagraph\n"), PC_START_TEXT_LINE);
}
-void RawPainter::openSpan(const ::RVNGPropertyList &propList)
+void RawPainter::openSpan(const librevenge::RVNGPropertyList &propList)
{
_U(("RawPainter::openSpan (%s)\n", getPropString(propList).cstr()), PC_START_TEXT_SPAN);
}
@@ -355,7 +355,7 @@ void RawPainter::closeSpan()
_D(("RawPainter::closeSpan\n"), PC_START_TEXT_SPAN);
}
-void RawPainter::insertText(const ::RVNGString &str)
+void RawPainter::insertText(const librevenge::RVNGString &str)
{
if (m_printCallgraphScore)
return;
@@ -400,7 +400,7 @@ int main(int argc, char *argv[])
if (!file)
return printUsage();
- RVNGFileStream input(file);
+ librevenge::RVNGFileStream input(file);
if (!libvisio::VisioDocument::isSupported(&input))
{
diff --git a/src/conv/raw/vss2raw.cpp b/src/conv/raw/vss2raw.cpp
index 5dde8ad..46d1e23 100644
--- a/src/conv/raw/vss2raw.cpp
+++ b/src/conv/raw/vss2raw.cpp
@@ -72,55 +72,55 @@ enum PainterCallback
m_callStack.pop(); \
}
-class RawPainter : public RVNGDrawingInterface
+class RawPainter : public librevenge::RVNGDrawingInterface
{
public:
RawPainter(bool printCallgraphScore);
~RawPainter();
- void startDocument(const ::RVNGPropertyList & /*propList*/) {}
+ void startDocument(const librevenge::RVNGPropertyList & /*propList*/) {}
void endDocument() {}
- void setDocumentMetaData(const RVNGPropertyList & /*propList*/) {}
- void startPage(const ::RVNGPropertyList &propList);
+ void setDocumentMetaData(const librevenge::RVNGPropertyList & /*propList*/) {}
+ void startPage(const librevenge::RVNGPropertyList &propList);
void endPage();
- void startLayer(const ::RVNGPropertyList &propList);
+ void startLayer(const librevenge::RVNGPropertyList &propList);
void endLayer();
- void startEmbeddedGraphics(const ::RVNGPropertyList &propList);
+ void startEmbeddedGraphics(const librevenge::RVNGPropertyList &propList);
void endEmbeddedGraphics();
- void setStyle(const ::RVNGPropertyList &propList, const ::RVNGPropertyListVector &gradient);
+ void setStyle(const librevenge::RVNGPropertyList &propList, const librevenge::RVNGPropertyListVector &gradient);
- void drawRectangle(const ::RVNGPropertyList &propList);
- void drawEllipse(const ::RVNGPropertyList &propList);
- void drawPolyline(const ::RVNGPropertyListVector &vertices);
- void drawPolygon(const ::RVNGPropertyListVector &vertices);
- void drawPath(const ::RVNGPropertyListVector &path);
- void drawGraphicObject(const ::RVNGPropertyList &propList, const ::RVNGBinaryData &binaryData);
- void startTextObject(const ::RVNGPropertyList &propList, const ::RVNGPropertyListVector &path);
+ void drawRectangle(const librevenge::RVNGPropertyList &propList);
+ void drawEllipse(const librevenge::RVNGPropertyList &propList);
+ void drawPolyline(const librevenge::RVNGPropertyListVector &vertices);
+ void drawPolygon(const librevenge::RVNGPropertyListVector &vertices);
+ void drawPath(const librevenge::RVNGPropertyListVector &path);
+ void drawGraphicObject(const librevenge::RVNGPropertyList &propList, const librevenge::RVNGBinaryData &binaryData);
+ void startTextObject(const librevenge::RVNGPropertyList &propList, const librevenge::RVNGPropertyListVector &path);
void endTextObject();
- void openOrderedListLevel(const RVNGPropertyList & /*propList*/) {}
+ void openOrderedListLevel(const librevenge::RVNGPropertyList & /*propList*/) {}
void closeOrderedListLevel() {}
- void openUnorderedListLevel(const RVNGPropertyList & /*propList*/) {}
+ void openUnorderedListLevel(const librevenge::RVNGPropertyList & /*propList*/) {}
void closeUnorderedListLevel() {}
- void openListElement(const RVNGPropertyList & /*propList*/, const RVNGPropertyListVector & /* tabStops */) {}
+ void openListElement(const librevenge::RVNGPropertyList & /*propList*/, const librevenge::RVNGPropertyListVector & /* tabStops */) {}
void closeListElement() {}
- void openParagraph(const RVNGPropertyList &propList, const RVNGPropertyListVector &tabStops);
+ void openParagraph(const librevenge::RVNGPropertyList &propList, const librevenge::RVNGPropertyListVector &tabStops);
void closeParagraph();
- void openSpan(const RVNGPropertyList &propList);
+ void openSpan(const librevenge::RVNGPropertyList &propList);
void closeSpan();
void insertTab() {}
void insertSpace() {}
- void insertText(const RVNGString &text);
+ void insertText(const librevenge::RVNGString &text);
void insertLineBreak() {}
- void insertField(const RVNGString & /* type */, const RVNGPropertyList & /*propList*/) {}
+ void insertField(const librevenge::RVNGString & /* type */, const librevenge::RVNGPropertyList & /*propList*/) {}
private:
@@ -143,10 +143,10 @@ private:
void __idprintf(const char *format, ...);
};
-RVNGString getPropString(const RVNGPropertyList &propList)
+librevenge::RVNGString getPropString(const librevenge::RVNGPropertyList &propList)
{
- RVNGString propString;
- RVNGPropertyList::Iter i(propList);
+ librevenge::RVNGString propString;
+ librevenge::RVNGPropertyList::Iter i(propList);
if (!i.last())
{
propString.append(i.key());
@@ -164,12 +164,12 @@ RVNGString getPropString(const RVNGPropertyList &propList)
return propString;
}
-RVNGString getPropString(const RVNGPropertyListVector &itemList)
+librevenge::RVNGString getPropString(const librevenge::RVNGPropertyListVector &itemList)
{
- RVNGString propString;
+ librevenge::RVNGString propString;
propString.append("(");
- RVNGPropertyListVector::Iter i(itemList);
+ librevenge::RVNGPropertyListVector::Iter i(itemList);
if (!i.last())
{
@@ -191,7 +191,7 @@ RVNGString getPropString(const RVNGPropertyListVector &itemList)
}
RawPainter::RawPainter(bool printCallgraphScore):
- RVNGDrawingInterface(),
+ librevenge::RVNGDrawingInterface(),
m_indent(0),
m_callbackMisses(0),
m_printCallgraphScore(printCallgraphScore),
@@ -239,7 +239,7 @@ void RawPainter::__idprintf(const char *format, ...)
va_end(args);
}
-void RawPainter::startPage(const ::RVNGPropertyList &propList)
+void RawPainter::startPage(const librevenge::RVNGPropertyList &propList)
{
_U(("RawPainter::startPage(%s)\n", getPropString(propList).cstr()), PC_START_GRAPHICS);
}
@@ -249,7 +249,7 @@ void RawPainter::endPage()
_D(("RawPainter::endPage\n"), PC_START_GRAPHICS);
}
-void RawPainter::startLayer(const ::RVNGPropertyList &propList)
+void RawPainter::startLayer(const librevenge::RVNGPropertyList &propList)
{
_U(("RawPainter::startLayer (%s)\n", getPropString(propList).cstr()), PC_START_LAYER);
}
@@ -259,7 +259,7 @@ void RawPainter::endLayer()
_D(("RawPainter::endLayer\n"), PC_START_LAYER);
}
-void RawPainter::startEmbeddedGraphics(const ::RVNGPropertyList &propList)
+void RawPainter::startEmbeddedGraphics(const librevenge::RVNGPropertyList &propList)
{
_U(("RawPainter::startEmbeddedGraphics (%s)\n", getPropString(propList).cstr()), PC_START_EMBEDDED_GRAPHICS);
}
@@ -269,7 +269,7 @@ void RawPainter::endEmbeddedGraphics()
_D(("RawPainter::endEmbeddedGraphics \n"), PC_START_EMBEDDED_GRAPHICS);
}
-void RawPainter::setStyle(const ::RVNGPropertyList &propList, const ::RVNGPropertyListVector &gradient)
+void RawPainter::setStyle(const librevenge::RVNGPropertyList &propList, const librevenge::RVNGPropertyListVector &gradient)
{
if (m_printCallgraphScore)
return;
@@ -277,7 +277,7 @@ void RawPainter::setStyle(const ::RVNGPropertyList &propList, const ::RVNGProper
__iprintf("RawPainter::setStyle(%s, gradient: (%s))\n", getPropString(propList).cstr(), getPropString(gradient).cstr());
}
-void RawPainter::drawRectangle(const ::RVNGPropertyList &propList)
+void RawPainter::drawRectangle(const librevenge::RVNGPropertyList &propList)
{
if (m_printCallgraphScore)
return;
@@ -285,7 +285,7 @@ void RawPainter::drawRectangle(const ::RVNGPropertyList &propList)
__iprintf("RawPainter::drawRectangle (%s)\n", getPropString(propList).cstr());
}
-void RawPainter::drawEllipse(const ::RVNGPropertyList &propList)
+void RawPainter::drawEllipse(const librevenge::RVNGPropertyList &propList)
{
if (m_printCallgraphScore)
return;
@@ -293,7 +293,7 @@ void RawPainter::drawEllipse(const ::RVNGPropertyList &propList)
__iprintf("RawPainter::drawEllipse (%s)\n", getPropString(propList).cstr());
}
-void RawPainter::drawPolyline(const ::RVNGPropertyListVector &vertices)
+void RawPainter::drawPolyline(const librevenge::RVNGPropertyListVector &vertices)
{
if (m_printCallgraphScore)
return;
@@ -301,7 +301,7 @@ void RawPainter::drawPolyline(const ::RVNGPropertyListVector &vertices)
__iprintf("RawPainter::drawPolyline (%s)\n", getPropString(vertices).cstr());
}
-void RawPainter::drawPolygon(const ::RVNGPropertyListVector &vertices)
+void RawPainter::drawPolygon(const librevenge::RVNGPropertyListVector &vertices)
{
if (m_printCallgraphScore)
return;
@@ -309,7 +309,7 @@ void RawPainter::drawPolygon(const ::RVNGPropertyListVector &vertices)
__iprintf("RawPainter::drawPolygon (%s)\n", getPropString(vertices).cstr());
}
-void RawPainter::drawPath(const ::RVNGPropertyListVector &path)
+void RawPainter::drawPath(const librevenge::RVNGPropertyListVector &path)
{
if (m_printCallgraphScore)
return;
@@ -317,7 +317,7 @@ void RawPainter::drawPath(const ::RVNGPropertyListVector &path)
__iprintf("RawPainter::drawPath (%s)\n", getPropString(path).cstr());
}
-void RawPainter::drawGraphicObject(const ::RVNGPropertyList &propList, const ::RVNGBinaryData & /*binaryData*/)
+void RawPainter::drawGraphicObject(const librevenge::RVNGPropertyList &propList, const librevenge::RVNGBinaryData & /*binaryData*/)
{
if (m_printCallgraphScore)
return;
@@ -325,7 +325,7 @@ void RawPainter::drawGraphicObject(const ::RVNGPropertyList &propList, const ::R
__iprintf("RawPainter::drawGraphicObject (%s)\n", getPropString(propList).cstr());
}
-void RawPainter::startTextObject(const ::RVNGPropertyList &propList, const ::RVNGPropertyListVector &path)
+void RawPainter::startTextObject(const librevenge::RVNGPropertyList &propList, const librevenge::RVNGPropertyListVector &path)
{
_U(("RawPainter::startTextObject (%s, path: (%s))\n", getPropString(propList).cstr(), getPropString(path).cstr()), PC_START_TEXT_OBJECT);
}
@@ -335,7 +335,7 @@ void RawPainter::endTextObject()
_D(("RawPainter::endTextObject\n"), PC_START_TEXT_OBJECT);
}
-void RawPainter::openParagraph(const ::RVNGPropertyList &propList, const ::RVNGPropertyListVector &tabStops)
+void RawPainter::openParagraph(const librevenge::RVNGPropertyList &propList, const librevenge::RVNGPropertyListVector &tabStops)
{
_U(("RawPainter::openParagraph (%s, tabStops: (%s))\n", getPropString(propList).cstr(), getPropString(tabStops).cstr()), PC_START_TEXT_LINE);
}
@@ -345,7 +345,7 @@ void RawPainter::closeParagraph()
_D(("RawPainter::closeParagraph\n"), PC_START_TEXT_LINE);
}
-void RawPainter::openSpan(const ::RVNGPropertyList &propList)
+void RawPainter::openSpan(const librevenge::RVNGPropertyList &propList)
{
_U(("RawPainter::openSpan (%s)\n", getPropString(propList).cstr()), PC_START_TEXT_SPAN);
}
@@ -355,7 +355,7 @@ void RawPainter::closeSpan()
_D(("RawPainter::closeSpan\n"), PC_START_TEXT_SPAN);
}
-void RawPainter::insertText(const ::RVNGString &str)
+void RawPainter::insertText(const librevenge::RVNGString &str)
{
if (m_printCallgraphScore)
return;
@@ -400,7 +400,7 @@ int main(int argc, char *argv[])
if (!file)
return printUsage();
- RVNGFileStream input(file);
+ librevenge::RVNGFileStream input(file);
if (!libvisio::VisioDocument::isSupported(&input))
{
diff --git a/src/conv/svg/vsd2xhtml.cpp b/src/conv/svg/vsd2xhtml.cpp
index 299f876..3ce76fe 100644
--- a/src/conv/svg/vsd2xhtml.cpp
+++ b/src/conv/svg/vsd2xhtml.cpp
@@ -68,7 +68,7 @@ int main(int argc, char *argv[])
if (!file)
return printUsage();
- RVNGFileStream input(file);
+ librevenge::RVNGFileStream input(file);
if (!libvisio::VisioDocument::isSupported(&input))
{
@@ -76,7 +76,7 @@ int main(int argc, char *argv[])
return 1;
}
- RVNGStringVector output;
+ librevenge::RVNGStringVector output;
if (!libvisio::VisioDocument::generateSVG(&input, output))
{
std::cerr << "ERROR: SVG Generation failed!" << std::endl;
diff --git a/src/conv/svg/vss2xhtml.cpp b/src/conv/svg/vss2xhtml.cpp
index 9491a21..4ce3709 100644
--- a/src/conv/svg/vss2xhtml.cpp
+++ b/src/conv/svg/vss2xhtml.cpp
@@ -68,7 +68,7 @@ int main(int argc, char *argv[])
if (!file)
return printUsage();
- RVNGFileStream input(file);
+ librevenge::RVNGFileStream input(file);
if (!libvisio::VisioDocument::isSupported(&input))
{
@@ -76,7 +76,7 @@ int main(int argc, char *argv[])
return 1;
}
- RVNGStringVector output;
+ librevenge::RVNGStringVector output;
if (!libvisio::VisioDocument::generateSVGStencils(&input, output))
{
std::cerr << "ERROR: SVG Generation failed!" << std::endl;
diff --git a/src/conv/text/vsd2text.cpp b/src/conv/text/vsd2text.cpp
index d7c9e04..ff1652b 100644
--- a/src/conv/text/vsd2text.cpp
+++ b/src/conv/text/vsd2text.cpp
@@ -35,61 +35,61 @@
#include <librevenge/librevenge.h>
#include <libvisio/libvisio.h>
-class TextPainter : public RVNGDrawingInterface
+class TextPainter : public librevenge::RVNGDrawingInterface
{
public:
TextPainter();
- void startDocument(const ::RVNGPropertyList & /*propList*/) {}
+ void startDocument(const librevenge::RVNGPropertyList & /*propList*/) {}
void endDocument() {}
- void setDocumentMetaData(const RVNGPropertyList & /*propList*/) {}
- void startPage(const ::RVNGPropertyList &) {}
+ void setDocumentMetaData(const librevenge::RVNGPropertyList & /*propList*/) {}
+ void startPage(const librevenge::RVNGPropertyList &) {}
void endPage() {}
- void startLayer(const ::RVNGPropertyList &) {}
+ void startLayer(const librevenge::RVNGPropertyList &) {}
void endLayer() {}
- void startEmbeddedGraphics(const ::RVNGPropertyList &) {}
+ void startEmbeddedGraphics(const librevenge::RVNGPropertyList &) {}
void endEmbeddedGraphics() {}
- void setStyle(const ::RVNGPropertyList &, const ::RVNGPropertyListVector &) {}
+ void setStyle(const librevenge::RVNGPropertyList &, const librevenge::RVNGPropertyListVector &) {}
- void drawRectangle(const ::RVNGPropertyList &) {}
- void drawEllipse(const ::RVNGPropertyList &) {}
- void drawPolyline(const ::RVNGPropertyListVector &) {}
- void drawPolygon(const ::RVNGPropertyListVector &) {}
- void drawPath(const ::RVNGPropertyListVector &) {}
- void drawGraphicObject(const ::RVNGPropertyList &, const ::RVNGBinaryData &) {}
- void startTextObject(const ::RVNGPropertyList &, const ::RVNGPropertyListVector &) {}
+ void drawRectangle(const librevenge::RVNGPropertyList &) {}
+ void drawEllipse(const librevenge::RVNGPropertyList &) {}
+ void drawPolyline(const librevenge::RVNGPropertyListVector &) {}
+ void drawPolygon(const librevenge::RVNGPropertyListVector &) {}
+ void drawPath(const librevenge::RVNGPropertyListVector &) {}
+ void drawGraphicObject(const librevenge::RVNGPropertyList &, const librevenge::RVNGBinaryData &) {}
+ void startTextObject(const librevenge::RVNGPropertyList &, const librevenge::RVNGPropertyListVector &) {}
void endTextObject() {}
- void openOrderedListLevel(const RVNGPropertyList & /*propList*/) {}
+ void openOrderedListLevel(const librevenge::RVNGPropertyList & /*propList*/) {}
void closeOrderedListLevel() {}
- void openUnorderedListLevel(const RVNGPropertyList & /*propList*/) {}
+ void openUnorderedListLevel(const librevenge::RVNGPropertyList & /*propList*/) {}
void closeUnorderedListLevel() {}
- void openListElement(const RVNGPropertyList & /*propList*/, const RVNGPropertyListVector & /* tabStops */) {}
+ void openListElement(const librevenge::RVNGPropertyList & /*propList*/, const librevenge::RVNGPropertyListVector & /* tabStops */) {}
void closeListElement() {}
- void openParagraph(const RVNGPropertyList & /*propList*/, const RVNGPropertyListVector & /* tabStops */) {}
+ void openParagraph(const librevenge::RVNGPropertyList & /*propList*/, const librevenge::RVNGPropertyListVector & /* tabStops */) {}
void closeParagraph();
- void openSpan(const RVNGPropertyList & /* propList */) {}
+ void openSpan(const librevenge::RVNGPropertyList & /* propList */) {}
void closeSpan() {}
void insertTab() {}
void insertSpace() {}
- void insertText(const RVNGString &text);
+ void insertText(const librevenge::RVNGString &text);
void insertLineBreak() {}
- void insertField(const RVNGString & /* type */, const RVNGPropertyList & /*propList*/) {}
+ void insertField(const librevenge::RVNGString & /* type */, const librevenge::RVNGPropertyList & /*propList*/) {}
};
-TextPainter::TextPainter(): RVNGDrawingInterface()
+TextPainter::TextPainter(): librevenge::RVNGDrawingInterface()
{
}
-void TextPainter::insertText(const ::RVNGString &str)
+void TextPainter::insertText(const librevenge::RVNGString &str)
{
printf("%s", str.cstr());
}
@@ -131,7 +131,7 @@ int main(int argc, char *argv[])
if (!file)
return printUsage();
- RVNGFileStream input(file);
+ librevenge::RVNGFileStream input(file);
if (!libvisio::VisioDocument::isSupported(&input))
{
diff --git a/src/conv/text/vss2text.cpp b/src/conv/text/vss2text.cpp
index 2a103bf..aa5b55a 100644
--- a/src/conv/text/vss2text.cpp
+++ b/src/conv/text/vss2text.cpp
@@ -35,61 +35,61 @@
#include <librevenge/librevenge.h>
#include <libvisio/libvisio.h>
-class TextPainter : public RVNGDrawingInterface
+class TextPainter : public librevenge::RVNGDrawingInterface
{
public:
TextPainter();
- void startDocument(const ::RVNGPropertyList & /*propList*/) {}
+ void startDocument(const librevenge::RVNGPropertyList & /*propList*/) {}
void endDocument() {}
- void setDocumentMetaData(const RVNGPropertyList & /*propList*/) {}
- void startPage(const ::RVNGPropertyList &) {}
+ void setDocumentMetaData(const librevenge::RVNGPropertyList & /*propList*/) {}
+ void startPage(const librevenge::RVNGPropertyList &) {}
void endPage() {}
- void startLayer(const ::RVNGPropertyList &) {}
+ void startLayer(const librevenge::RVNGPropertyList &) {}
void endLayer() {}
- void startEmbeddedGraphics(const ::RVNGPropertyList &) {}
+ void startEmbeddedGraphics(const librevenge::RVNGPropertyList &) {}
void endEmbeddedGraphics() {}
- void setStyle(const ::RVNGPropertyList &, const ::RVNGPropertyListVector &) {}
+ void setStyle(const librevenge::RVNGPropertyList &, const librevenge::RVNGPropertyListVector &) {}
- void drawRectangle(const ::RVNGPropertyList &) {}
- void drawEllipse(const ::RVNGPropertyList &) {}
- void drawPolyline(const ::RVNGPropertyListVector &) {}
- void drawPolygon(const ::RVNGPropertyListVector &) {}
- void drawPath(const ::RVNGPropertyListVector &) {}
- void drawGraphicObject(const ::RVNGPropertyList &, const ::RVNGBinaryData &) {}
- void startTextObject(const ::RVNGPropertyList &, const ::RVNGPropertyListVector &) {}
+ void drawRectangle(const librevenge::RVNGPropertyList &) {}
+ void drawEllipse(const librevenge::RVNGPropertyList &) {}
+ void drawPolyline(const librevenge::RVNGPropertyListVector &) {}
+ void drawPolygon(const librevenge::RVNGPropertyListVector &) {}
+ void drawPath(const librevenge::RVNGPropertyListVector &) {}
+ void drawGraphicObject(const librevenge::RVNGPropertyList &, const librevenge::RVNGBinaryData &) {}
+ void startTextObject(const librevenge::RVNGPropertyList &, const librevenge::RVNGPropertyListVector &) {}
void endTextObject() {}
- void openOrderedListLevel(const RVNGPropertyList & /*propList*/) {}
+ void openOrderedListLevel(const librevenge::RVNGPropertyList & /*propList*/) {}
void closeOrderedListLevel() {}
- void openUnorderedListLevel(const RVNGPropertyList & /*propList*/) {}
+ void openUnorderedListLevel(const librevenge::RVNGPropertyList & /*propList*/) {}
void closeUnorderedListLevel() {}
- void openListElement(const RVNGPropertyList & /*propList*/, const RVNGPropertyListVector & /* tabStops */) {}
+ void openListElement(const librevenge::RVNGPropertyList & /*propList*/, const librevenge::RVNGPropertyListVector & /* tabStops */) {}
void closeListElement() {}
- void openParagraph(const RVNGPropertyList & /*propList*/, const RVNGPropertyListVector & /* tabStops */) {}
+ void openParagraph(const librevenge::RVNGPropertyList & /*propList*/, const librevenge::RVNGPropertyListVector & /* tabStops */) {}
void closeParagraph();
- void openSpan(const RVNGPropertyList & /*propList*/) {}
+ void openSpan(const librevenge::RVNGPropertyList & /*propList*/) {}
void closeSpan() {}
void insertTab() {}
void insertSpace() {}
- void insertText(const RVNGString &text);
+ void insertText(const librevenge::RVNGString &text);
void insertLineBreak() {}
- void insertField(const RVNGString & /* type */, const RVNGPropertyList & /*propList*/) {}
+ void insertField(const librevenge::RVNGString & /* type */, const librevenge::RVNGPropertyList & /*propList*/) {}
};
-TextPainter::TextPainter(): RVNGDrawingInterface()
+TextPainter::TextPainter(): librevenge::RVNGDrawingInterface()
{
}
-void TextPainter::insertText(const ::RVNGString &str)
+void TextPainter::insertText(const librevenge::RVNGString &str)
{
printf("%s", str.cstr());
}
@@ -131,7 +131,7 @@ int main(int argc, char *argv[])
if (!file)
return printUsage();
- RVNGFileStream input(file);
+ librevenge::RVNGFileStream input(file);
if (!libvisio::VisioDocument::isSupported(&input))
{
diff --git a/src/lib/VDXParser.cpp b/src/lib/VDXParser.cpp
index 23de46d..292243e 100644
--- a/src/lib/VDXParser.cpp
+++ b/src/lib/VDXParser.cpp
@@ -40,7 +40,7 @@
#include "VSDXMLTokenMap.h"
-libvisio::VDXParser::VDXParser(RVNGInputStream *input, RVNGDrawingInterface *painter)
+libvisio::VDXParser::VDXParser(librevenge::RVNGInputStream *input, librevenge::RVNGDrawingInterface *painter)
: VSDXMLParserBase(), m_input(input), m_painter(painter)
{
}
@@ -62,7 +62,7 @@ bool libvisio::VDXParser::parseMain()
VSDStylesCollector stylesCollector(groupXFormsSequence, groupMembershipsSequence, documentPageShapeOrders);
m_collector = &stylesCollector;
- m_input->seek(0, RVNG_SEEK_SET);
+ m_input->seek(0, librevenge::RVNG_SEEK_SET);
if (!processXmlDocument(m_input))
return false;
@@ -70,7 +70,7 @@ bool libvisio::VDXParser::parseMain()
VSDContentCollector contentCollector(m_painter, groupXFormsSequence, groupMembershipsSequence, documentPageShapeOrders, styles, m_stencils);
m_collector = &contentCollector;
- m_input->seek(0, RVNG_SEEK_SET);
+ m_input->seek(0, librevenge::RVNG_SEEK_SET);
if (!processXmlDocument(m_input))
return false;
@@ -88,7 +88,7 @@ bool libvisio::VDXParser::extractStencils()
return parseMain();
}
-bool libvisio::VDXParser::processXmlDocument(RVNGInputStream *input)
+bool libvisio::VDXParser::processXmlDocument(librevenge::RVNGInputStream *input)
{
if (!input)
return false;
@@ -714,7 +714,7 @@ void libvisio::VDXParser::readFonts(xmlTextReaderPtr reader)
if (id && name)
{
unsigned idx = (unsigned)xmlStringToLong(id);
- RVNGBinaryData textStream(name, xmlStrlen(name));
+ librevenge::RVNGBinaryData textStream(name, xmlStrlen(name));
m_fonts[idx] = VSDName(textStream, libvisio::VSD_TEXT_UTF8);
}
xmlFree(name);
diff --git a/src/lib/VDXParser.h b/src/lib/VDXParser.h
index a5be6f0..50bfb6c 100644
--- a/src/lib/VDXParser.h
+++ b/src/lib/VDXParser.h
@@ -46,7 +46,7 @@ class VDXParser : public VSDXMLParserBase
using VSDXMLParserBase::readLongData;
public:
- explicit VDXParser(RVNGInputStream *input, RVNGDrawingInterface *painter);
+ explicit VDXParser(librevenge::RVNGInputStream *input, librevenge::RVNGDrawingInterface *painter);
virtual ~VDXParser();
bool parseMain();
bool extractStencils();
@@ -65,7 +65,7 @@ private:
// Functions to read the DatadiagramML document structure
- bool processXmlDocument(RVNGInputStream *input);
+ bool processXmlDocument(librevenge::RVNGInputStream *input);
void processXmlNode(xmlTextReaderPtr reader);
// Functions reading the DiagramML document content
@@ -84,8 +84,8 @@ private:
// Private data
- RVNGInputStream *m_input;
- RVNGDrawingInterface *m_painter;
+ librevenge::RVNGInputStream *m_input;
+ librevenge::RVNGDrawingInterface *m_painter;
};
} // namespace libvisio
diff --git a/src/lib/VSD5Parser.cpp b/src/lib/VSD5Parser.cpp
index 283a0f3..4d051ce 100644
--- a/src/lib/VSD5Parser.cpp
+++ b/src/lib/VSD5Parser.cpp
@@ -40,51 +40,51 @@
#include "VSDContentCollector.h"
#include "VSDStylesCollector.h"
-libvisio::VSD5Parser::VSD5Parser(RVNGInputStream *input, RVNGDrawingInterface *painter)
+libvisio::VSD5Parser::VSD5Parser(librevenge::RVNGInputStream *input, librevenge::RVNGDrawingInterface *painter)
: VSD6Parser(input, painter)
{}
libvisio::VSD5Parser::~VSD5Parser()
{}
-void libvisio::VSD5Parser::readPointer(RVNGInputStream *input, Pointer &ptr)
+void libvisio::VSD5Parser::readPointer(librevenge::RVNGInputStream *input, Pointer &ptr)
{
ptr.Type = readU16(input) & 0x00ff;
ptr.Format = readU16(input) & 0x00ff;
- input->seek(4, RVNG_SEEK_CUR); // Skip dword
+ input->seek(4, librevenge::RVNG_SEEK_CUR); // Skip dword
ptr.Offset = readU32(input);
ptr.Length = readU32(input);
}
-void libvisio::VSD5Parser::readPointerInfo(RVNGInputStream *input, unsigned ptrType, unsigned shift, unsigned &listSize, int &pointerCount)
+void libvisio::VSD5Parser::readPointerInfo(librevenge::RVNGInputStream *input, unsigned ptrType, unsigned shift, unsigned &listSize, int &pointerCount)
{
VSD_DEBUG_MSG(("VSD5Parser::readPointerInfo\n"));
switch (ptrType)
{
case VSD_TRAILER_STREAM:
- input->seek(shift+0x82, RVNG_SEEK_SET);
+ input->seek(shift+0x82, librevenge::RVNG_SEEK_SET);
break;
case VSD_PAGE:
- input->seek(shift+0x42, RVNG_SEEK_SET);
+ input->seek(shift+0x42, librevenge::RVNG_SEEK_SET);
break;
case VSD_FONT_LIST:
- input->seek(shift+0x2e, RVNG_SEEK_SET);
+ input->seek(shift+0x2e, librevenge::RVNG_SEEK_SET);
break;
case VSD_STYLES:
- input->seek(shift+0x12, RVNG_SEEK_SET);
+ input->seek(shift+0x12, librevenge::RVNG_SEEK_SET);
break;
case VSD_STENCILS:
case VSD_SHAPE_FOREIGN:
- input->seek(shift+0x1e, RVNG_SEEK_SET);
+ input->seek(shift+0x1e, librevenge::RVNG_SEEK_SET);
break;
case VSD_STENCIL_PAGE:
- input->seek(shift+0x36, RVNG_SEEK_SET);
+ input->seek(shift+0x36, librevenge::RVNG_SEEK_SET);
break;
default:
if (ptrType > 0x45)
- input->seek(shift+0x1e, RVNG_SEEK_SET);
+ input->seek(shift+0x1e, librevenge::RVNG_SEEK_SET);
else
- input->seek(shift+0xa, RVNG_SEEK_SET);
+ input->seek(shift+0xa, librevenge::RVNG_SEEK_SET);
break;
}
pointerCount = readS16(input);
@@ -92,7 +92,7 @@ void libvisio::VSD5Parser::readPointerInfo(RVNGInputStream *input, unsigned ptrT
VSD_DEBUG_MSG(("VSD5Parser::readPointerInfo ptrType %u shift %u pointerCount %i\n", ptrType, shift, pointerCount));
}
-bool libvisio::VSD5Parser::getChunkHeader(RVNGInputStream *input)
+bool libvisio::VSD5Parser::getChunkHeader(librevenge::RVNGInputStream *input)
{
unsigned char tmpChar = 0;
while (!input->isEnd() && !tmpChar)
@@ -101,7 +101,7 @@ bool libvisio::VSD5Parser::getChunkHeader(RVNGInputStream *input)
if (input->isEnd())
return false;
else
- input->seek(-1, RVNG_SEEK_CUR);
+ input->seek(-1, librevenge::RVNG_SEEK_CUR);
m_header.chunkType = getUInt(input);
m_header.id = getUInt(input);
@@ -117,15 +117,15 @@ bool libvisio::VSD5Parser::getChunkHeader(RVNGInputStream *input)
return true;
}
-void libvisio::VSD5Parser::handleChunkRecords(RVNGInputStream *input)
+void libvisio::VSD5Parser::handleChunkRecords(librevenge::RVNGInputStream *input)
{
long startPosition = input->tell();
long endPosition = input->tell() + m_header.dataLength;
- input->seek(endPosition - 4, RVNG_SEEK_SET);
+ input->seek(endPosition - 4, librevenge::RVNG_SEEK_SET);
unsigned numRecords = readU16(input);
unsigned endOffset = readU16(input);
std::map<unsigned, ChunkHeader> records;
- input->seek(endPosition-4*(numRecords+1), RVNG_SEEK_SET);
+ input->seek(endPosition-4*(numRecords+1), librevenge::RVNG_SEEK_SET);
unsigned i = 0;
for (i = 0; i < numRecords; ++i)
{
@@ -145,12 +145,12 @@ void libvisio::VSD5Parser::handleChunkRecords(RVNGInputStream *input)
{
m_header = iter->second;
m_header.id = i++;
- input->seek(startPosition + iter->first, RVNG_SEEK_SET);
+ input->seek(startPosition + iter->first, librevenge::RVNG_SEEK_SET);
handleChunk(input);
}
}
-void libvisio::VSD5Parser::readGeomList(RVNGInputStream *input)
+void libvisio::VSD5Parser::readGeomList(librevenge::RVNGInputStream *input)
{
VSD_DEBUG_MSG(("VSD5Parser::readGeomList\n"));
if (!m_shape.m_geometries.empty() && m_currentGeometryList->empty())
@@ -162,57 +162,57 @@ void libvisio::VSD5Parser::readGeomList(RVNGInputStream *input)
handleChunkRecords(input);
}
-void libvisio::VSD5Parser::readList(RVNGInputStream *input)
+void libvisio::VSD5Parser::readList(librevenge::RVNGInputStream *input)
{
if (!m_isStencilStarted)
m_collector->collectUnhandledChunk(m_header.id, m_header.level);
handleChunkRecords(input);
}
-void libvisio::VSD5Parser::readCharList(RVNGInputStream *input)
+void libvisio::VSD5Parser::readCharList(librevenge::RVNGInputStream *input)
{
VSD_DEBUG_MSG(("VSD5Parser::readCharList\n"));
readList(input);
}
-void libvisio::VSD5Parser::readParaList(RVNGInputStream *input)
+void libvisio::VSD5Parser::readParaList(librevenge::RVNGInputStream *input)
{
VSD_DEBUG_MSG(("VSD5Parser::readParaList\n"));
readList(input);
}
-void libvisio::VSD5Parser::readShapeList(RVNGInputStream *input)
+void libvisio::VSD5Parser::readShapeList(librevenge::RVNGInputStream *input)
{
VSD_DEBUG_MSG(("VSD5Parser::readShapeList\n"));
readList(input);
}
-void libvisio::VSD5Parser::readPropList(RVNGInputStream *input)
+void libvisio::VSD5Parser::readPropList(librevenge::RVNGInputStream *input)
{
VSD_DEBUG_MSG(("VSD5Parser::readPropList\n"));
readList(input);
}
-void libvisio::VSD5Parser::readFieldList(RVNGInputStream *input)
+void libvisio::VSD5Parser::readFieldList(librevenge::RVNGInputStream *input)
{
VSD_DEBUG_MSG(("VSD5Parser::readFieldList\n"));
readList(input);
}
-void libvisio::VSD5Parser::readNameList2(RVNGInputStream *input)
+void libvisio::VSD5Parser::readNameList2(librevenge::RVNGInputStream *input)
{
VSD_DEBUG_MSG(("VSD5Parser::readNameList2\n"));
readList(input);
}
-void libvisio::VSD5Parser::readLine(RVNGInputStream *input)
+void libvisio::VSD5Parser::readLine(librevenge::RVNGInputStream *input)
{
- input->seek(1, RVNG_SEEK_CUR);
+ input->seek(1, librevenge::RVNG_SEEK_CUR);
double strokeWidth = readDouble(input);
unsigned char colourIndex = readU8(input);
Colour c = _colourFromIndex(colourIndex);
unsigned char linePattern = readU8(input);
- input->seek(10, RVNG_SEEK_CUR);
+ input->seek(10, librevenge::RVNG_SEEK_CUR);
unsigned char startMarker = readU8(input);
unsigned char endMarker = readU8(input);
unsigned char lineCap = readU8(input);
@@ -223,7 +223,7 @@ void libvisio::VSD5Parser::readLine(RVNGInputStream *input)
m_shape.m_lineStyle.override(VSDOptionalLineStyle(strokeWidth, c, linePattern, startMarker, endMarker, lineCap));
}
-void libvisio::VSD5Parser::readCharIX(RVNGInputStream *input)
+void libvisio::VSD5Parser::readCharIX(librevenge::RVNGInputStream *input)
{
unsigned charCount = readU16(input);
unsigned fontID = readU16(input);
@@ -256,7 +256,7 @@ void libvisio::VSD5Parser::readCharIX(RVNGInputStream *input)
if (fontMod & 1) superscript = true;
if (fontMod & 2) subscript = true;
- input->seek(4, RVNG_SEEK_CUR);
+ input->seek(4, librevenge::RVNG_SEEK_CUR);
double fontSize = readDouble(input);
#if 0
@@ -286,13 +286,13 @@ void libvisio::VSD5Parser::readCharIX(RVNGInputStream *input)
}
}
-void libvisio::VSD5Parser::readFillAndShadow(RVNGInputStream *input)
+void libvisio::VSD5Parser::readFillAndShadow(librevenge::RVNGInputStream *input)
{
Colour colourFG = _colourFromIndex(readU8(input));
Colour colourBG = _colourFromIndex(readU8(input));
unsigned char fillPattern = readU8(input);
Colour shfgc = _colourFromIndex(readU8(input));
- input->seek(1, RVNG_SEEK_CUR); // Shadow Background Colour skipped
+ input->seek(1, librevenge::RVNG_SEEK_CUR); // Shadow Background Colour skipped
unsigned char shadowPattern = readU8(input);
if (m_isInStyles)
@@ -318,9 +318,9 @@ void libvisio::VSD5Parser::readFillAndShadow(RVNGInputStream *input)
}
}
-void libvisio::VSD5Parser::readStyleSheet(RVNGInputStream *input)
+void libvisio::VSD5Parser::readStyleSheet(librevenge::RVNGInputStream *input)
{
- input->seek(10, RVNG_SEEK_CUR);
+ input->seek(10, librevenge::RVNG_SEEK_CUR);
unsigned lineStyle = getUInt(input);
unsigned fillStyle = getUInt(input);
unsigned textStyle = getUInt(input);
@@ -328,7 +328,7 @@ void libvisio::VSD5Parser::readStyleSheet(RVNGInputStream *input)
m_collector->collectStyleSheet(m_header.id, m_header.level, lineStyle, fillStyle, textStyle);
}
-void libvisio::VSD5Parser::readShape(RVNGInputStream *input)
+void libvisio::VSD5Parser::readShape(librevenge::RVNGInputStream *input)
{
m_currentGeomListCount = 0;
m_isShapeStarted = true;
@@ -345,9 +345,9 @@ void libvisio::VSD5Parser::readShape(RVNGInputStream *input)
try
{
- input->seek(2, RVNG_SEEK_CUR);
+ input->seek(2, librevenge::RVNG_SEEK_CUR);
parent = getUInt(input);
- input->seek(2, RVNG_SEEK_CUR);
+ input->seek(2, librevenge::RVNG_SEEK_CUR);
masterPage = getUInt(input);
masterShape = getUInt(input);
lineStyle = getUInt(input);
@@ -378,21 +378,21 @@ void libvisio::VSD5Parser::readShape(RVNGInputStream *input)
m_currentShapeID = MINUS_ONE;
}
-void libvisio::VSD5Parser::readPage(RVNGInputStream *input)
+void libvisio::VSD5Parser::readPage(librevenge::RVNGInputStream *input)
{
unsigned backgroundPageID = getUInt(input);
m_collector->collectPage(m_header.id, m_header.level, backgroundPageID, m_isBackgroundPage, m_currentPageName);
}
-void libvisio::VSD5Parser::readTextBlock(RVNGInputStream *input)
+void libvisio::VSD5Parser::readTextBlock(librevenge::RVNGInputStream *input)
{
- input->seek(1, RVNG_SEEK_CUR);
+ input->seek(1, librevenge::RVNG_SEEK_CUR);
double leftMargin = readDouble(input);
- input->seek(1, RVNG_SEEK_CUR);
+ input->seek(1, librevenge::RVNG_SEEK_CUR);
double rightMargin = readDouble(input);
- input->seek(1, RVNG_SEEK_CUR);
+ input->seek(1, librevenge::RVNG_SEEK_CUR);
double topMargin = readDouble(input);
- input->seek(1, RVNG_SEEK_CUR);
+ input->seek(1, librevenge::RVNG_SEEK_CUR);
double bottomMargin = readDouble(input);
unsigned char verticalAlign = readU8(input);
unsigned char colourIndex = readU8(input);
@@ -409,9 +409,9 @@ void libvisio::VSD5Parser::readTextBlock(RVNGInputStream *input)
verticalAlign, isBgFilled, c, 0.0, (unsigned char)0));
}
-void libvisio::VSD5Parser::readTextField(RVNGInputStream *input)
+void libvisio::VSD5Parser::readTextField(librevenge::RVNGInputStream *input)
{
- input->seek(3, RVNG_SEEK_CUR);
+ input->seek(3, librevenge::RVNG_SEEK_CUR);
if (0xe8 == readU8(input))
{
int nameId = readS16(input);
@@ -424,7 +424,7 @@ void libvisio::VSD5Parser::readTextField(RVNGInputStream *input)
}
}
-void libvisio::VSD5Parser::readNameIDX(RVNGInputStream *input)
+void libvisio::VSD5Parser::readNameIDX(librevenge::RVNGInputStream *input)
{
VSD_DEBUG_MSG(("VSD5Parser::readNameIDX\n"));
std::map<unsigned, VSDName> names;
@@ -441,13 +441,13 @@ void libvisio::VSD5Parser::readNameIDX(RVNGInputStream *input)
}
-unsigned libvisio::VSD5Parser::getUInt(RVNGInputStream *input)
+unsigned libvisio::VSD5Parser::getUInt(librevenge::RVNGInputStream *input)
{
int value = readS16(input);
return (unsigned)value;
}
-int libvisio::VSD5Parser::getInt(RVNGInputStream *input)
+int libvisio::VSD5Parser::getInt(librevenge::RVNGInputStream *input)
{
return readS16(input);
}
diff --git a/src/lib/VSD5Parser.h b/src/lib/VSD5Parser.h
index d67c714..787209d 100644
--- a/src/lib/VSD5Parser.h
+++ b/src/lib/VSD5Parser.h
@@ -43,46 +43,46 @@ namespace libvisio
class VSD5Parser : public VSD6Parser
{
public:
- explicit VSD5Parser(RVNGInputStream *input, RVNGDrawingInterface *painter);
+ explicit VSD5Parser(librevenge::RVNGInputStream *input, librevenge::RVNGDrawingInterface *painter);
~VSD5Parser();
protected:
- virtual void readPointer(RVNGInputStream *input, Pointer &ptr);
- virtual bool getChunkHeader(RVNGInputStream *input);
- virtual void readPointerInfo(RVNGInputStream *input, unsigned ptrType, unsigned shift, unsigned &listSize, int &pointerCount);
+ virtual void readPointer(librevenge::RVNGInputStream *input, Pointer &ptr);
+ virtual bool getChunkHeader(librevenge::RVNGInputStream *input);
+ virtual void readPointerInfo(librevenge::RVNGInputStream *input, unsigned ptrType, unsigned shift, unsigned &listSize, int &pointerCount);
- virtual void readGeomList(RVNGInputStream *input);
- virtual void readCharList(RVNGInputStream *input);
- virtual void readParaList(RVNGInputStream *input);
- virtual void readShapeList(RVNGInputStream *input);
- virtual void readPropList(RVNGInputStream *input);
- virtual void readFieldList(RVNGInputStream *input);
- virtual void readNameList2(RVNGInputStream *input);
+ virtual void readGeomList(librevenge::RVNGInputStream *input);
+ virtual void readCharList(librevenge::RVNGInputStream *input);
+ virtual void readParaList(librevenge::RVNGInputStream *input);
+ virtual void readShapeList(librevenge::RVNGInputStream *input);
+ virtual void readPropList(librevenge::RVNGInputStream *input);
+ virtual void readFieldList(librevenge::RVNGInputStream *input);
+ virtual void readNameList2(librevenge::RVNGInputStream *input);
- virtual void readLine(RVNGInputStream *input);
- virtual void readFillAndShadow(RVNGInputStream *input);
- virtual void readTextBlock(RVNGInputStream *input);
- virtual void readCharIX(RVNGInputStream *input);
- virtual void readTextField(RVNGInputStream *input);
+ virtual void readLine(librevenge::RVNGInputStream *input);
+ virtual void readFillAndShadow(librevenge::RVNGInputStream *input);
+ virtual void readTextBlock(librevenge::RVNGInputStream *input);
+ virtual void readCharIX(librevenge::RVNGInputStream *input);
+ virtual void readTextField(librevenge::RVNGInputStream *input);
- virtual void readShape(RVNGInputStream *input);
- virtual void readPage(RVNGInputStream *input);
+ virtual void readShape(librevenge::RVNGInputStream *input);
+ virtual void readPage(librevenge::RVNGInputStream *input);
- virtual void handleChunkRecords(RVNGInputStream *input);
+ virtual void handleChunkRecords(librevenge::RVNGInputStream *input);
- virtual void readStyleSheet(RVNGInputStream *input);
+ virtual void readStyleSheet(librevenge::RVNGInputStream *input);
- virtual void readNameIDX(RVNGInputStream *input);
+ virtual void readNameIDX(librevenge::RVNGInputStream *input);
- virtual unsigned getUInt(RVNGInputStream *input);
- virtual int getInt(RVNGInputStream *input);
+ virtual unsigned getUInt(librevenge::RVNGInputStream *input);
+ virtual int getInt(librevenge::RVNGInputStream *input);
private:
VSD5Parser();
VSD5Parser(const VSDParser &);
VSD5Parser &operator=(const VSDParser &);
- void readList(RVNGInputStream *input);
+ void readList(librevenge::RVNGInputStream *input);
};
} // namespace libvisio
diff --git a/src/lib/VSD6Parser.cpp b/src/lib/VSD6Parser.cpp
index f1f4564..683e0ae 100644
--- a/src/lib/VSD6Parser.cpp
+++ b/src/lib/VSD6Parser.cpp
@@ -39,14 +39,14 @@
#include "VSDContentCollector.h"
#include "VSDStylesCollector.h"
-libvisio::VSD6Parser::VSD6Parser(RVNGInputStream *input, RVNGDrawingInterface *painter)
+libvisio::VSD6Parser::VSD6Parser(librevenge::RVNGInputStream *input, librevenge::RVNGDrawingInterface *painter)
: VSDParser(input, painter)
{}
libvisio::VSD6Parser::~VSD6Parser()
{}
-bool libvisio::VSD6Parser::getChunkHeader(RVNGInputStream *input)
+bool libvisio::VSD6Parser::getChunkHeader(librevenge::RVNGInputStream *input)
{
unsigned char tmpChar = 0;
while (!input->isEnd() && !tmpChar)
@@ -55,7 +55,7 @@ bool libvisio::VSD6Parser::getChunkHeader(RVNGInputStream *input)
if (input->isEnd())
return false;
else
- input->seek(-1, RVNG_SEEK_CUR);
+ input->seek(-1, librevenge::RVNG_SEEK_CUR);
m_header.chunkType = readU32(input);
m_header.id = readU32(input);
@@ -84,10 +84,10 @@ bool libvisio::VSD6Parser::getChunkHeader(RVNGInputStream *input)
return true;
}
-void libvisio::VSD6Parser::readText(RVNGInputStream *input)
+void libvisio::VSD6Parser::readText(librevenge::RVNGInputStream *input)
{
- input->seek(8, RVNG_SEEK_CUR);
- ::RVNGBinaryData textStream;
+ input->seek(8, librevenge::RVNG_SEEK_CUR);
+ librevenge::RVNGBinaryData textStream;
unsigned long numBytesRead = 0;
const unsigned char *tmpBuffer = input->read(m_header.dataLength - 8, numBytesRead);
@@ -103,7 +103,7 @@ void libvisio::VSD6Parser::readText(RVNGInputStream *input)
}
}
-void libvisio::VSD6Parser::readCharIX(RVNGInputStream *input)
+void libvisio::VSD6Parser::readCharIX(librevenge::RVNGInputStream *input)
{
unsigned charCount = readU32(input);
unsigned fontID = readU16(input);
@@ -111,7 +111,7 @@ void libvisio::VSD6Parser::readCharIX(RVNGInputStream *input)
std::map<unsigned, VSDName>::const_iterator iter = m_fonts.find(fontID);
if (iter != m_fonts.end())
font = iter->second;
- input->seek(1, RVNG_SEEK_CUR); // Color ID
+ input->seek(1, librevenge::RVNG_SEEK_CUR); // Color ID
Colour fontColour; // Font Colour
fontColour.r = readU8(input);
fontColour.g = readU8(input);
@@ -141,7 +141,7 @@ void libvisio::VSD6Parser::readCharIX(RVNGInputStream *input)
if (fontMod & 1) superscript = true;
if (fontMod & 2) subscript = true;
- input->seek(4, RVNG_SEEK_CUR);
+ input->seek(4, librevenge::RVNG_SEEK_CUR);
double fontSize = readDouble(input);
fontMod = readU8(input);
@@ -169,20 +169,20 @@ void libvisio::VSD6Parser::readCharIX(RVNGInputStream *input)
}
}
-void libvisio::VSD6Parser::readParaIX(RVNGInputStream *input)
+void libvisio::VSD6Parser::readParaIX(librevenge::RVNGInputStream *input)
{
unsigned charCount = getUInt(input);
- input->seek(1, RVNG_SEEK_CUR);
+ input->seek(1, librevenge::RVNG_SEEK_CUR);
double indFirst = readDouble(input);
- input->seek(1, RVNG_SEEK_CUR);
+ input->seek(1, librevenge::RVNG_SEEK_CUR);
double indLeft = readDouble(input);
- input->seek(1, RVNG_SEEK_CUR);
+ input->seek(1, librevenge::RVNG_SEEK_CUR);
double indRight = readDouble(input);
- input->seek(1, RVNG_SEEK_CUR);
+ input->seek(1, librevenge::RVNG_SEEK_CUR);
double spLine = readDouble(input);
- input->seek(1, RVNG_SEEK_CUR);
+ input->seek(1, librevenge::RVNG_SEEK_CUR);
double spBefore = readDouble(input);
- input->seek(1, RVNG_SEEK_CUR);
+ input->seek(1, librevenge::RVNG_SEEK_CUR);
double spAfter = readDouble(input);
unsigned char align = readU8(input);
@@ -204,7 +204,7 @@ void libvisio::VSD6Parser::readParaIX(RVNGInputStream *input)
}
-void libvisio::VSD6Parser::readFillAndShadow(RVNGInputStream *input)
+void libvisio::VSD6Parser::readFillAndShadow(librevenge::RVNGInputStream *input)
{
unsigned char colourFGIndex = readU8(input);
Colour colourFG;
@@ -271,21 +271,21 @@ void libvisio::VSD6Parser::readFillAndShadow(RVNGInputStream *input)
}
}
-void libvisio::VSD6Parser::readName(RVNGInputStream *input)
+void libvisio::VSD6Parser::readName(librevenge::RVNGInputStream *input)
{
unsigned long numBytesRead = 0;
const unsigned char *tmpBuffer = input->read(m_header.dataLength, numBytesRead);
if (numBytesRead)
{
- ::RVNGBinaryData name(tmpBuffer, numBytesRead);
+ librevenge::RVNGBinaryData name(tmpBuffer, numBytesRead);
m_shape.m_names[m_header.id] = VSDName(name, libvisio::VSD_TEXT_ANSI);
}
}
-void libvisio::VSD6Parser::readName2(RVNGInputStream *input)
+void libvisio::VSD6Parser::readName2(librevenge::RVNGInputStream *input)
{
unsigned char character = 0;
- ::RVNGBinaryData name;
+ librevenge::RVNGBinaryData name;
getInt(input); // skip a dword that seems to be always 1
while ((character = readU8(input)))
name.append(character);
@@ -293,52 +293,52 @@ void libvisio::VSD6Parser::readName2(RVNGInputStream *input)
m_names[m_header.id] = VSDName(name, libvisio::VSD_TEXT_ANSI);
}
-void libvisio::VSD6Parser::readTextField(RVNGInputStream *input)
+void libvisio::VSD6Parser::readTextField(librevenge::RVNGInputStream *input)
{
unsigned long initialPosition = input->tell();
- input->seek(7, RVNG_SEEK_CUR);
+ input->seek(7, librevenge::RVNG_SEEK_CUR);
unsigned char tmpCode = readU8(input);
if (tmpCode == 0xe8)
{
int nameId = readS32(input);
- input->seek(6, RVNG_SEEK_CUR);
+ input->seek(6, librevenge::RVNG_SEEK_CUR);
int formatStringId = readS32(input);
m_shape.m_fields.addTextField(m_header.id, m_header.level, nameId, formatStringId);
}
else
{
double numericValue = readDouble(input);
- input->seek(2, RVNG_SEEK_CUR);
+ input->seek(2, librevenge::RVNG_SEEK_CUR);
int formatStringId = readS32(input);
unsigned blockIdx = 0;
unsigned length = 0;
unsigned short formatNumber = 0;
- input->seek(initialPosition+0x24, RVNG_SEEK_SET);
+ input->seek(initialPosition+0x24, librevenge::RVNG_SEEK_SET);
while (blockIdx != 2 && !input->isEnd() && (unsigned long) input->tell() < (unsigned long)(initialPosition+m_header.dataLength+m_header.trailer))
{
unsigned long inputPos = input->tell();
length = readU32(input);
if (!length)
break;
- input->seek(1, RVNG_SEEK_CUR);
+ input->seek(1, librevenge::RVNG_SEEK_CUR);
blockIdx = readU8(input);
if (blockIdx != 2)
- input->seek(inputPos + length, RVNG_SEEK_SET);
+ input->seek(inputPos + length, librevenge::RVNG_SEEK_SET);
else
{
- input->seek(1, RVNG_SEEK_CUR);
+ input->seek(1, librevenge::RVNG_SEEK_CUR);
formatNumber = readU16(input);
if (0x80 != readU8(input))
{
- input->seek(inputPos + length, RVNG_SEEK_SET);
+ input->seek(inputPos + length, librevenge::RVNG_SEEK_SET);
blockIdx = 0;
}
else
{
if (0xc2 != readU8(input))
{
- input->seek(inputPos + length, RVNG_SEEK_SET);
+ input->seek(inputPos + length, librevenge::RVNG_SEEK_SET);
blockIdx = 0;
}
else
diff --git a/src/lib/VSD6Parser.h b/src/lib/VSD6Parser.h
index 50c5859..eba804c 100644
--- a/src/lib/VSD6Parser.h
+++ b/src/lib/VSD6Parser.h
@@ -43,18 +43,18 @@ namespace libvisio
class VSD6Parser : public VSDParser
{
public:
- explicit VSD6Parser(RVNGInputStream *input, RVNGDrawingInterface *painter);
+ explicit VSD6Parser(librevenge::RVNGInputStream *input, librevenge::RVNGDrawingInterface *painter);
~VSD6Parser();
protected:
- virtual bool getChunkHeader(RVNGInputStream *input);
+ virtual bool getChunkHeader(librevenge::RVNGInputStream *input);
private:
- void readText(RVNGInputStream *input);
- virtual void readCharIX(RVNGInputStream *input);
- virtual void readParaIX(RVNGInputStream *input);
- virtual void readFillAndShadow(RVNGInputStream *input);
- virtual void readName(RVNGInputStream *input);
- virtual void readName2(RVNGInputStream *input);
- virtual void readTextField(RVNGInputStream *input);
+ void readText(librevenge::RVNGInputStream *input);
+ virtual void readCharIX(librevenge::RVNGInputStream *input);
+ virtual void readParaIX(librevenge::RVNGInputStream *input);
+ virtual void readFillAndShadow(librevenge::RVNGInputStream *input);
+ virtual void readName(librevenge::RVNGInputStream *input);
+ virtual void readName2(librevenge::RVNGInputStream *input);
+ virtual void readTextField(librevenge::RVNGInputStream *input);
VSD6Parser();
VSD6Parser(const VSDParser &);
diff --git a/src/lib/VSDCollector.h b/src/lib/VSDCollector.h
index 2bb889a..8535ee9 100644
--- a/src/lib/VSDCollector.h
+++ b/src/lib/VSDCollector.h
@@ -45,9 +45,9 @@ public:
virtual ~VSDCollector() {}
virtual void collectEllipticalArcTo(unsigned id, unsigned level, double x3, double y3, double x2, double y2, double angle, double ecc) = 0;
- virtual void collectForeignData(unsigned level, const RVNGBinaryData &binaryData) = 0;
+ virtual void collectForeignData(unsigned level, const librevenge::RVNGBinaryData &binaryData) = 0;
virtual void collectOLEList(unsigned id, unsigned level) = 0;
- virtual void collectOLEData(unsigned id, unsigned level, const RVNGBinaryData &oleData) = 0;
+ virtual void collectOLEData(unsigned id, unsigned level, const librevenge::RVNGBinaryData &oleData) = 0;
virtual void collectEllipse(unsigned id, unsigned level, double cx, double cy, double xleft, double yleft, double xtop, double ytop) = 0;
virtual void collectLine(unsigned level, const boost::optional<double> &strokeWidth, const boost::optional<Colour> &c, const boost::optional<unsigned char> &linePattern,
const boost::optional<unsigned char> &startMarker, const boost::optional<unsigned char> &endMarker,
@@ -93,7 +93,7 @@ public:
virtual void collectUnhandledChunk(unsigned id, unsigned level) = 0;
- virtual void collectText(unsigned level, const ::RVNGBinaryData &textStream, TextFormat format) = 0;
+ virtual void collectText(unsigned level, const librevenge::RVNGBinaryData &textStream, TextFormat format) = 0;
virtual void collectCharIX(unsigned id, unsigned level, unsigned charCount, const boost::optional<VSDName> &font,
const boost::optional<Colour> &fontColour, const boost::optional<double> &fontSize, const boost::optional<bool> &bold,
const boost::optional<bool> &italic, const boost::optional<bool> &underline, const boost::optional<bool> &doubleunderline,
@@ -118,7 +118,7 @@ public:
const boost::optional<Colour> &bgColour, const boost::optional<double> &defaultTabStop,
const boost::optional<unsigned char> &textDirection) = 0;
virtual void collectNameList(unsigned id, unsigned level) = 0;
- virtual void collectName(unsigned id, unsigned level, const ::RVNGBinaryData &name, TextFormat format) = 0;
+ virtual void collectName(unsigned id, unsigned level, const librevenge::RVNGBinaryData &name, TextFormat format) = 0;
virtual void collectPageSheet(unsigned id, unsigned level) = 0;
virtual void collectMisc(unsigned level, const VSDMisc &misc) = 0;
diff --git a/src/lib/VSDContentCollector.cpp b/src/lib/VSDContentCollector.cpp
index ec5a0ed..68cb54f 100644
--- a/src/lib/VSDContentCollector.cpp
+++ b/src/lib/VSDContentCollector.cpp
@@ -57,7 +57,7 @@ static unsigned bitmapId = 0;
namespace
{
-static void _appendUCS4(RVNGString &text, UChar32 ucs4Character)
+static void _appendUCS4(librevenge::RVNGString &text, UChar32 ucs4Character)
{
// Convert carriage returns to new line characters
// Writerperfect/LibreOffice will replace them by <text:line-break>
@@ -76,7 +76,7 @@ static void _appendUCS4(RVNGString &text, UChar32 ucs4Character)
libvisio::VSDContentCollector::VSDContentCollector(
- RVNGDrawingInterface *painter,
+ librevenge::RVNGDrawingInterface *painter,
std::vector<std::map<unsigned, XForm> > &groupXFormsSequence,
std::vector<std::map<unsigned, unsigned> > &groupMembershipsSequence,
std::vector<std::list<unsigned> > &documentPageShapeOrders,
@@ -225,10 +225,10 @@ void libvisio::VSDContentCollector::_flushShape()
numTextElements++;
if (numPathElements+numForeignElements+numTextElements > 1)
- m_shapeOutputDrawing->addStartLayer(RVNGPropertyList());
+ m_shapeOutputDrawing->addStartLayer(librevenge::RVNGPropertyList());
if (numPathElements > 1 && (numForeignElements || numTextElements))
- m_shapeOutputDrawing->addStartLayer(RVNGPropertyList());
+ m_shapeOutputDrawing->addStartLayer(librevenge::RVNGPropertyList());
_flushCurrentPath();
if (numPathElements > 1 && (numForeignElements || numTextElements))
m_shapeOutputDrawing->addEndLayer();
@@ -248,15 +248,15 @@ void libvisio::VSDContentCollector::_flushShape()
void libvisio::VSDContentCollector::_flushCurrentPath()
{
- RVNGPropertyList styleProps;
+ librevenge::RVNGPropertyList styleProps;
_lineProperties(m_lineStyle, styleProps);
_fillAndShadowProperties(m_fillStyle, styleProps);
- RVNGPropertyList fillPathProps(styleProps);
+ librevenge::RVNGPropertyList fillPathProps(styleProps);
fillPathProps.insert("draw:stroke", "none");
- RVNGPropertyList linePathProps(styleProps);
+ librevenge::RVNGPropertyList linePathProps(styleProps);
linePathProps.insert("draw:fill", "none");
- std::vector<RVNGPropertyList> tmpPath;
+ std::vector<librevenge::RVNGPropertyList> tmpPath;
if (m_fillStyle.pattern && !m_currentFillGeometry.empty())
{
bool firstPoint = true;
@@ -276,7 +276,7 @@ void libvisio::VSDContentCollector::_flushCurrentPath()
{
if (tmpPath.back()["librevenge:path-action"]->getStr() != "Z")
{
- RVNGPropertyList closedPath;
+ librevenge::RVNGPropertyList closedPath;
closedPath.insert("librevenge:path-action", "Z");
tmpPath.push_back(closedPath);
}
@@ -298,7 +298,7 @@ void libvisio::VSDContentCollector::_flushCurrentPath()
{
if (tmpPath.back()["librevenge:path-action"]->getStr() != "Z")
{
- RVNGPropertyList closedPath;
+ librevenge::RVNGPropertyList closedPath;
closedPath.insert("librevenge:path-action", "Z");
tmpPath.push_back(closedPath);
}
@@ -308,10 +308,10 @@ void libvisio::VSDContentCollector::_flushCurrentPath()
}
if (!tmpPath.empty())
{
- RVNGPropertyListVector path;
+ librevenge::RVNGPropertyListVector path;
for (unsigned i = 0; i < tmpPath.size(); ++i)
path.append(tmpPath[i]);
- m_shapeOutputDrawing->addStyle(fillPathProps, RVNGPropertyListVector());
+ m_shapeOutputDrawing->addStyle(fillPathProps, librevenge::RVNGPropertyListVector());
m_shapeOutputDrawing->addPath(path);
}
}
@@ -345,7 +345,7 @@ void libvisio::VSDContentCollector::_flushCurrentPath()
{
if (tmpPath.back()["librevenge:path-action"]->getStr() != "Z")
{
- RVNGPropertyList closedPath;
+ librevenge::RVNGPropertyList closedPath;
closedPath.insert("librevenge:path-action", "Z");
tmpPath.push_back(closedPath);
}
@@ -376,7 +376,7 @@ void libvisio::VSDContentCollector::_flushCurrentPath()
{
if (tmpPath.back()["librevenge:path-action"]->getStr() != "Z")
{
- RVNGPropertyList closedPath;
+ librevenge::RVNGPropertyList closedPath;
closedPath.insert("librevenge:path-action", "Z");
tmpPath.push_back(closedPath);
}
@@ -389,10 +389,10 @@ void libvisio::VSDContentCollector::_flushCurrentPath()
}
if (!tmpPath.empty())
{
- RVNGPropertyListVector path;
+ librevenge::RVNGPropertyListVector path;
for (unsigned i = 0; i < tmpPath.size(); ++i)
path.append(tmpPath[i]);
- m_shapeOutputDrawing->addStyle(linePathProps, RVNGPropertyListVector());
+ m_shapeOutputDrawing->addStyle(linePathProps, librevenge::RVNGPropertyListVector());
m_shapeOutputDrawing->addPath(path);
}
}
@@ -415,7 +415,7 @@ void libvisio::VSDContentCollector::_flushText()
double angle = 0.0;
transformAngle(angle, m_txtxform);
- RVNGPropertyList textBlockProps;
+ librevenge::RVNGPropertyList textBlockProps;
bool flipX = false;
bool flipY = false;
@@ -437,7 +437,7 @@ void libvisio::VSDContentCollector::_flushText()
textBlockProps.insert("fo:padding-bottom", m_textBlockStyle.bottomMargin);
textBlockProps.insert("fo:padding-left", m_textBlockStyle.leftMargin);
textBlockProps.insert("fo:padding-right", m_textBlockStyle.rightMargin);
- textBlockProps.insert("librevenge:rotate", angle*180/M_PI, RVNG_GENERIC);
+ textBlockProps.insert("librevenge:rotate", angle*180/M_PI, librevenge::RVNG_GENERIC);
switch (m_textBlockStyle.verticalAlign)
{
@@ -477,7 +477,7 @@ void libvisio::VSDContentCollector::_flushText()
m_paraFormats[iPara].charCount = numCharsInText;
}
- m_shapeOutputText->addStartTextObject(textBlockProps, RVNGPropertyListVector());
+ m_shapeOutputText->addStartTextObject(textBlockProps, librevenge::RVNGPropertyListVector());
unsigned int charIndex = 0;
unsigned int paraCharCount = 0;
@@ -488,7 +488,7 @@ void libvisio::VSDContentCollector::_flushText()
for (std::vector<VSDParaStyle>::iterator paraIt = m_paraFormats.begin();
paraIt != m_paraFormats.end() && charIndex < m_charFormats.size(); ++paraIt)
{
- RVNGPropertyList paraProps;
+ librevenge::RVNGPropertyList paraProps;
paraProps.insert("fo:text-indent", (*paraIt).indFirst);
paraProps.insert("fo:margin-left", (*paraIt).indLeft);
@@ -522,9 +522,9 @@ void libvisio::VSDContentCollector::_flushText()
if ((*paraIt).spLine > 0)
paraProps.insert("fo:line-height", (*paraIt).spLine);
else
- paraProps.insert("fo:line-height", -(*paraIt).spLine, RVNG_PERCENT);
+ paraProps.insert("fo:line-height", -(*paraIt).spLine, librevenge::RVNG_PERCENT);
- m_shapeOutputText->addOpenParagraph(paraProps, RVNGPropertyListVector());
+ m_shapeOutputText->addOpenParagraph(paraProps, librevenge::RVNGPropertyListVector());
paraCharCount = (*paraIt).charCount;
@@ -533,9 +533,9 @@ void libvisio::VSDContentCollector::_flushText()
{
paraCharCount -= m_charFormats[charIndex].charCount;
- RVNGPropertyList textProps;
+ librevenge::RVNGPropertyList textProps;
- RVNGString fontName;
+ librevenge::RVNGString fontName;
if (m_charFormats[charIndex].font.m_data.size())
_convertDataToString(fontName, m_charFormats[charIndex].font.m_data, m_charFormats[charIndex].font.m_format);
else
@@ -554,24 +554,24 @@ void libvisio::VSDContentCollector::_flushText()
if (m_charFormats[charIndex].smallcaps) textProps.insert("fo:font-variant", "small-caps");
if (m_charFormats[charIndex].superscript) textProps.insert("style:text-position", "super");
if (m_charFormats[charIndex].subscript) textProps.insert("style:text-position", "sub");
- textProps.insert("fo:font-size", m_charFormats[charIndex].size*72.0, RVNG_POINT);
+ textProps.insert("fo:font-size", m_charFormats[charIndex].size*72.0, librevenge::RVNG_POINT);
textProps.insert("fo:color", getColourString(m_charFormats[charIndex].colour));
double opacity = 1.0;
if (m_charFormats[charIndex].colour.a)
opacity -= (double)(m_charFormats[charIndex].colour.a)/255.0;
- textProps.insert("svg:stroke-opacity", opacity, RVNG_PERCENT);
- textProps.insert("svg:fill-opacity", opacity, RVNG_PERCENT);
+ textProps.insert("svg:stroke-opacity", opacity, librevenge::RVNG_PERCENT);
+ textProps.insert("svg:fill-opacity", opacity, librevenge::RVNG_PERCENT);
// TODO: In draw, text span background cannot be specified the same way as in writer span
if (m_textBlockStyle.isTextBkgndFilled)
{
textProps.insert("fo:background-color", getColourString(m_textBlockStyle.textBkgndColour));
#if 0
if (m_textBlockStyle.textBkgndColour.a)
- textProps.insert("fo:background-opacity", 1.0 - m_textBlockStyle.textBkgndColour.a/255.0, RVNG_PERCENT);
+ textProps.insert("fo:background-opacity", 1.0 - m_textBlockStyle.textBkgndColour.a/255.0, librevenge::RVNG_PERCENT);
#endif
}
- RVNGString text;
+ librevenge::RVNGString text;
if (m_textFormat == VSD_TEXT_UTF16)
{
@@ -680,7 +680,7 @@ void libvisio::VSDContentCollector::_flushCurrentForeignData()
transformFlips(flipX, flipY);
- RVNGPropertyList styleProps;
+ librevenge::RVNGPropertyList styleProps;
m_currentForeignProps.insert("svg:x", m_scale*(xmiddle - (m_foreignWidth / 2.0)));
m_currentForeignProps.insert("svg:width", m_scale*m_foreignWidth);
@@ -702,11 +702,11 @@ void libvisio::VSDContentCollector::_flushCurrentForeignData()
}
if (angle != 0.0)
- m_currentForeignProps.insert("librevenge:rotate", angle * 180 / M_PI, RVNG_GENERIC);
+ m_currentForeignProps.insert("librevenge:rotate", angle * 180 / M_PI, librevenge::RVNG_GENERIC);
if (m_currentForeignData.size() && m_currentForeignProps["librevenge:mime-type"] && m_foreignWidth != 0.0 && m_foreignHeight != 0.0)
{
- m_shapeOutputDrawing->addStyle(styleProps, RVNGPropertyListVector());
+ m_shapeOutputDrawing->addStyle(styleProps, librevenge::RVNGPropertyListVector());
m_shapeOutputDrawing->addGraphicObject(m_currentForeignProps, m_currentForeignData);
}
m_currentForeignData.clear();
@@ -783,7 +783,7 @@ void libvisio::VSDContentCollector::collectEllipticalArcTo(unsigned /* id */, un
if (fabs(((x1-x2n)*(y2n-y3n) - (x2n-x3n)*(y1-y2n))) <= LIBVISIO_EPSILON || fabs(((x2n-x3n)*(y1-y2n) - (x1-x2n)*(y2n-y3n))) <= LIBVISIO_EPSILON)
// most probably all of the points lie on the same line, so use lineTo instead
{
- RVNGPropertyList end;
+ librevenge::RVNGPropertyList end;
end.insert("svg:x", m_scale*m_x);
end.insert("svg:y", m_scale*m_y);
end.insert("librevenge:path-action", "L");
@@ -805,7 +805,7 @@ void libvisio::VSDContentCollector::collectEllipticalArcTo(unsigned /* id */, un
double rx = sqrt(pow(x1-x0, 2) + pow(y1-y0, 2));
double ry = rx / ecc;
- RVNGPropertyList arc;
+ librevenge::RVNGPropertyList arc;
int largeArc = 0;
int sweep = 1;
@@ -821,7 +821,7 @@ void libvisio::VSDContentCollector::collectEllipticalArcTo(unsigned /* id */, un
arc.insert("svg:rx", m_scale*rx);
arc.insert("svg:ry", m_scale*ry);
- arc.insert("librevenge:rotate", angle * 180 / M_PI, RVNG_GENERIC);
+ arc.insert("librevenge:rotate", angle * 180 / M_PI, librevenge::RVNG_GENERIC);
arc.insert("librevenge:large-arc", largeArc);
arc.insert("librevenge:sweep", sweep);
arc.insert("svg:x", m_scale*m_x);
@@ -836,7 +836,7 @@ void libvisio::VSDContentCollector::collectEllipticalArcTo(unsigned /* id */, un
void libvisio::VSDContentCollector::collectEllipse(unsigned /* id */, unsigned level, double cx, double cy, double xleft, double yleft, double xtop, double ytop)
{
_handleLevelChange(level);
- RVNGPropertyList ellipse;
+ librevenge::RVNGPropertyList ellipse;
double angle = fmod(2.0*M_PI + (cy > yleft ? 1.0 : -1.0)*acos((cx-xleft) / sqrt((xleft - cx)*(xleft - cx) + (yleft - cy)*(yleft - cy))), 2.0*M_PI);
transformPoint(cx, cy);
transformPoint(xleft, yleft);
@@ -865,7 +865,7 @@ void libvisio::VSDContentCollector::collectEllipse(unsigned /* id */, unsigned l
ellipse.insert("svg:y",m_scale*ytop);
ellipse.insert("librevenge:large-arc", largeArc?1:0);
ellipse.insert("librevenge:path-action", "A");
- ellipse.insert("librevenge:rotate", angle * 180/M_PI, RVNG_GENERIC);
+ ellipse.insert("librevenge:rotate", angle * 180/M_PI, librevenge::RVNG_GENERIC);
if (!m_noFill && !m_noShow)
m_currentFillGeometry.push_back(ellipse);
if (!m_noLine && !m_noShow)
@@ -957,7 +957,7 @@ void libvisio::VSDContentCollector::collectInfiniteLine(unsigned /* id */, unsig
}
}
- RVNGPropertyList infLine;
+ librevenge::RVNGPropertyList infLine;
infLine.insert("svg:x",m_scale*xmove);
infLine.insert("svg:y",m_scale*ymove);
infLine.insert("librevenge:path-action", "M");
@@ -990,7 +990,7 @@ void libvisio::VSDContentCollector::collectRelCubBezTo(unsigned /* id */, unsign
transformPoint(x, y);
m_x = x;
m_y = y;
- RVNGPropertyList node;
+ librevenge::RVNGPropertyList node;
node.insert("librevenge:path-action", "C");
node.insert("svg:x",m_scale*x);
node.insert("svg:y",m_scale*y);
@@ -1040,7 +1040,7 @@ void libvisio::VSDContentCollector::collectRelQuadBezTo(unsigned /* id */, unsig
transformPoint(x, y);
m_x = x;
m_y = y;
- RVNGPropertyList node;
+ librevenge::RVNGPropertyList node;
node.insert("librevenge:path-action", "Q");
node.insert("svg:x",m_scale*x);
node.insert("svg:y",m_scale*y);
@@ -1075,7 +1075,7 @@ void libvisio::VSDContentCollector::collectFillAndShadow(unsigned level, const b
collectFillAndShadow(level, colourFG, colourBG, fillPattern, fillFGTransparency, fillBGTransparency, shadowPattern, shfgc, m_shadowOffsetX, m_shadowOffsetY);
}
-void libvisio::VSDContentCollector::collectForeignData(unsigned level, const RVNGBinaryData &binaryData)
+void libvisio::VSDContentCollector::collectForeignData(unsigned level, const librevenge::RVNGBinaryData &binaryData)
{
_handleLevelChange(level);
_handleForeignData(binaryData);
@@ -1085,17 +1085,17 @@ void libvisio::VSDContentCollector::collectOLEList(unsigned /* id */, unsigned l
{
_handleLevelChange(level);
m_currentForeignData.clear();
- RVNGBinaryData binaryData;
+ librevenge::RVNGBinaryData binaryData;
_handleForeignData(binaryData);
}
-void libvisio::VSDContentCollector::collectOLEData(unsigned /* id */, unsigned level, const RVNGBinaryData &oleData)
+void libvisio::VSDContentCollector::collectOLEData(unsigned /* id */, unsigned level, const librevenge::RVNGBinaryData &oleData)
{
_handleLevelChange(level);
m_currentForeignData.append(oleData);
}
-void libvisio::VSDContentCollector::_handleForeignData(const RVNGBinaryData &binaryData)
+void libvisio::VSDContentCollector::_handleForeignData(const librevenge::RVNGBinaryData &binaryData)
{
if (m_foreignType == 0 || m_foreignType == 1 || m_foreignType == 4) // Image
{
@@ -1162,7 +1162,7 @@ void libvisio::VSDContentCollector::_handleForeignData(const RVNGBinaryData &bin
}
#if DUMP_BITMAP
- ::RVNGString filename;
+ librevenge::RVNGString filename;
if (m_foreignType == 1)
{
switch(m_foreignFormat)
@@ -1236,7 +1236,7 @@ void libvisio::VSDContentCollector::collectMoveTo(unsigned /* id */, unsigned le
transformPoint(x, y);
m_x = x;
m_y = y;
- RVNGPropertyList end;
+ librevenge::RVNGPropertyList end;
end.insert("svg:x", m_scale*m_x);
end.insert("svg:y", m_scale*m_y);
end.insert("librevenge:path-action", "M");
@@ -1254,7 +1254,7 @@ void libvisio::VSDContentCollector::collectLineTo(unsigned /* id */, unsigned le
transformPoint(x, y);
m_x = x;
m_y = y;
- RVNGPropertyList end;
+ librevenge::RVNGPropertyList end;
end.insert("svg:x", m_scale*m_x);
end.insert("svg:y", m_scale*m_y);
end.insert("librevenge:path-action", "L");
@@ -1277,7 +1277,7 @@ void libvisio::VSDContentCollector::collectArcTo(unsigned /* id */, unsigned lev
{
m_x = x2;
m_y = y2;
- RVNGPropertyList end;
+ librevenge::RVNGPropertyList end;
end.insert("svg:x", m_scale*m_x);
end.insert("svg:y", m_scale*m_y);
end.insert("librevenge:path-action", "L");
@@ -1288,7 +1288,7 @@ void libvisio::VSDContentCollector::collectArcTo(unsigned /* id */, unsigned lev
}
else
{
- RVNGPropertyList arc;
+ librevenge::RVNGPropertyList arc;
double chord = sqrt(pow((y2 - m_y),2) + pow((x2 - m_x),2));
double radius = (4 * bow * bow + chord * chord) / (8 * fabs(bow));
int largeArc = fabs(bow) > radius ? 1 : 0;
@@ -1299,7 +1299,7 @@ void libvisio::VSDContentCollector::collectArcTo(unsigned /* id */, unsigned lev
m_y = y2;
arc.insert("svg:rx", m_scale*radius);
arc.insert("svg:ry", m_scale*radius);
- arc.insert("librevenge:rotate", angle*180/M_PI, RVNG_GENERIC);
+ arc.insert("librevenge:rotate", angle*180/M_PI, librevenge::RVNG_GENERIC);
arc.insert("librevenge:large-arc", largeArc);
arc.insert("librevenge:sweep", sweep);
arc.insert("svg:x", m_scale*m_x);
@@ -1317,7 +1317,7 @@ void libvisio::VSDContentCollector::_outputCubicBezierSegment(const std::vector<
{
if (points.size() < 4)
return;
- RVNGPropertyList node;
+ librevenge::RVNGPropertyList node;
node.insert("librevenge:path-action", "C");
double x = points[1].first;
double y = points[1].second;
@@ -1345,7 +1345,7 @@ void libvisio::VSDContentCollector::_outputQuadraticBezierSegment(const std::vec
{
if (points.size() < 3)
return;
- RVNGPropertyList node;
+ librevenge::RVNGPropertyList node;
node.insert("librevenge:path-action", "Q");
double x = points[1].first;
double y = points[1].second;
@@ -1368,7 +1368,7 @@ void libvisio::VSDContentCollector::_outputLinearBezierSegment(const std::vector
{
if (points.size() < 2)
return;
- RVNGPropertyList node;
+ librevenge::RVNGPropertyList node;
node.insert("librevenge:path-action", "L");
double x = points[1].first;
double y = points[1].second;
@@ -1491,7 +1491,7 @@ void libvisio::VSDContentCollector::_generatePolylineFromNURBS(unsigned degree,
if (m_noShow)
return;
- RVNGPropertyList node;
+ librevenge::RVNGPropertyList node;
for (unsigned i = 0; i < VSD_NUM_POLYLINES_PER_KNOT * knotVector.size(); i++)
{
@@ -1589,7 +1589,7 @@ void libvisio::VSDContentCollector::collectNURBSTo(unsigned /* id */, unsigned l
m_y = y2;
transformPoint(m_x, m_y);
#if 1
- RVNGPropertyList node;
+ librevenge::RVNGPropertyList node;
node.insert("librevenge:path-action", "L");
node.insert("svg:x", m_scale*m_x);
node.insert("svg:y", m_scale*m_y);
@@ -1653,7 +1653,7 @@ void libvisio::VSDContentCollector::collectPolylineTo(unsigned /* id */ , unsign
{
_handleLevelChange(level);
- RVNGPropertyList polyline;
+ librevenge::RVNGPropertyList polyline;
std::vector<std::pair<double, double> > tmpPoints(points);
for (unsigned i = 0; i< points.size(); i++)
{
@@ -1995,7 +1995,7 @@ void libvisio::VSDContentCollector::collectShape(unsigned id, unsigned level, un
for (std::map< unsigned, VSDName>::const_iterator iterData = m_stencilShape->m_names.begin(); iterData != m_stencilShape->m_names.end(); ++iterData)
{
- RVNGString nameString;
+ librevenge::RVNGString nameString;
_convertDataToString(nameString, iterData->second.m_data, iterData->second.m_format);
m_stencilNames[iterData->first] = nameString;
}
@@ -2007,7 +2007,7 @@ void libvisio::VSDContentCollector::collectShape(unsigned id, unsigned level, un
if (elem)
m_fields.push_back(elem->getString(m_stencilNames));
else
- m_fields.push_back(RVNGString());
+ m_fields.push_back(librevenge::RVNGString());
}
if (m_stencilShape->m_lineStyleId != MINUS_ONE)
@@ -2093,7 +2093,7 @@ void libvisio::VSDContentCollector::collectSplineEnd()
}
-void libvisio::VSDContentCollector::collectText(unsigned level, const RVNGBinaryData &textStream, TextFormat format)
+void libvisio::VSDContentCollector::collectText(unsigned level, const librevenge::RVNGBinaryData &textStream, TextFormat format)
{
_handleLevelChange(level);
@@ -2159,7 +2159,7 @@ void libvisio::VSDContentCollector::collectNameList(unsigned /*id*/, unsigned le
m_names.clear();
}
-void libvisio::VSDContentCollector::_convertDataToString(RVNGString &result, const RVNGBinaryData &data, TextFormat format)
+void libvisio::VSDContentCollector::_convertDataToString(librevenge::RVNGString &result, const librevenge::RVNGBinaryData &data, TextFormat format)
{
if (!data.size())
return;
@@ -2168,11 +2168,11 @@ void libvisio::VSDContentCollector::_convertDataToString(RVNGString &result, con
appendCharacters(result, tmpData, format);
}
-void libvisio::VSDContentCollector::collectName(unsigned id, unsigned level, const RVNGBinaryData &name, TextFormat format)
+void libvisio::VSDContentCollector::collectName(unsigned id, unsigned level, const librevenge::RVNGBinaryData &name, TextFormat format)
{
_handleLevelChange(level);
- RVNGString nameString;
+ librevenge::RVNGString nameString;
_convertDataToString(nameString, name, format);
m_names[id] = nameString;
}
@@ -2250,7 +2250,7 @@ void libvisio::VSDContentCollector::collectTextBlockStyle(unsigned /* level */,
m_styles.addTextBlockStyle(m_currentStyleSheet, textBlockStyle);
}
-void libvisio::VSDContentCollector::_lineProperties(const VSDLineStyle &style, RVNGPropertyList &styleProps)
+void libvisio::VSDContentCollector::_lineProperties(const VSDLineStyle &style, librevenge::RVNGPropertyList &styleProps)
{
if (!style.pattern)
{
@@ -2261,9 +2261,9 @@ void libvisio::VSDContentCollector::_lineProperties(const VSDLineStyle &style, R
styleProps.insert("svg:stroke-width", m_scale*style.width);
styleProps.insert("svg:stroke-color", getColourString(style.colour));
if (style.colour.a)
- styleProps.insert("svg:stroke-opacity", (1 - style.colour.a/255.0), RVNG_PERCENT);
+ styleProps.insert("svg:stroke-opacity", (1 - style.colour.a/255.0), librevenge::RVNG_PERCENT);
else
- styleProps.insert("svg:stroke-opacity", 1.0, RVNG_PERCENT);
+ styleProps.insert("svg:stroke-opacity", 1.0, librevenge::RVNG_PERCENT);
switch (style.cap)
{
case 0:
@@ -2455,10 +2455,10 @@ void libvisio::VSDContentCollector::_lineProperties(const VSDLineStyle &style, R
{
styleProps.insert("draw:stroke", "dash");
styleProps.insert("draw:dots1", dots1);
- styleProps.insert("draw:dots1-length", dots1len, RVNG_PERCENT);
+ styleProps.insert("draw:dots1-length", dots1len, librevenge::RVNG_PERCENT);
styleProps.insert("draw:dots2", dots2);
- styleProps.insert("draw:dots2-length", dots2len, RVNG_PERCENT);
- styleProps.insert("draw:distance", gap, RVNG_PERCENT);
+ styleProps.insert("draw:dots2-length", dots2len, librevenge::RVNG_PERCENT);
+ styleProps.insert("draw:distance", gap, librevenge::RVNG_PERCENT);
}
else
// FIXME: later it will require special treatment for custom line patterns
@@ -2466,7 +2466,7 @@ void libvisio::VSDContentCollector::_lineProperties(const VSDLineStyle &style, R
styleProps.insert("draw:stroke", "solid");
}
-void libvisio::VSDContentCollector::_fillAndShadowProperties(const VSDFillStyle &style, RVNGPropertyList &styleProps)
+void libvisio::VSDContentCollector::_fillAndShadowProperties(const VSDFillStyle &style, librevenge::RVNGPropertyList &styleProps)
{
if (style.pattern)
styleProps.insert("svg:fill-rule", "evenodd");
@@ -2478,7 +2478,7 @@ void libvisio::VSDContentCollector::_fillAndShadowProperties(const VSDFillStyle
styleProps.insert("draw:fill", "solid");
styleProps.insert("draw:fill-color", getColourString(style.fgColour));
if (style.fgTransparency > 0)
- styleProps.insert("draw:opacity", 1 - style.fgTransparency, RVNG_PERCENT);
+ styleProps.insert("draw:opacity", 1 - style.fgTransparency, librevenge::RVNG_PERCENT);
else
styleProps.remove("draw:opacity");
}
@@ -2490,14 +2490,14 @@ void libvisio::VSDContentCollector::_fillAndShadowProperties(const VSDFillStyle
styleProps.insert("draw:end-color", getColourString(style.bgColour));
styleProps.remove("draw:opacity");
if (style.bgTransparency > 0.0)
- styleProps.insert("librevenge:start-opacity", 1 - style.bgTransparency, RVNG_PERCENT);
+ styleProps.insert("librevenge:start-opacity", 1 - style.bgTransparency, librevenge::RVNG_PERCENT);
else
- styleProps.insert("librevenge:start-opacity", 1, RVNG_PERCENT);
+ styleProps.insert("librevenge:start-opacity", 1, librevenge::RVNG_PERCENT);
if (style.fgTransparency > 0.0)
- styleProps.insert("librevenge:end-opacity", 1 - style.fgTransparency, RVNG_PERCENT);
+ styleProps.insert("librevenge:end-opacity", 1 - style.fgTransparency, librevenge::RVNG_PERCENT);
else
- styleProps.insert("librevenge:end-opacity", 1, RVNG_PERCENT);
- styleProps.insert("draw:border", 0, RVNG_PERCENT);
+ styleProps.insert("librevenge:end-opacity", 1, librevenge::RVNG_PERCENT);
+ styleProps.insert("draw:border", 0, librevenge::RVNG_PERCENT);
if (style.pattern == 26)
styleProps.insert("draw:angle", 90);
@@ -2512,14 +2512,14 @@ void libvisio::VSDContentCollector::_fillAndShadowProperties(const VSDFillStyle
styleProps.insert("draw:end-color", getColourString(style.fgColour));
styleProps.remove("draw:opacity");
if (style.bgTransparency > 0)
- styleProps.insert("librevenge:start-opacity", 1 - style.bgTransparency, RVNG_PERCENT);
+ styleProps.insert("librevenge:start-opacity", 1 - style.bgTransparency, librevenge::RVNG_PERCENT);
else
- styleProps.insert("librevenge:start-opacity", 1, RVNG_PERCENT);
+ styleProps.insert("librevenge:start-opacity", 1, librevenge::RVNG_PERCENT);
if (style.fgTransparency > 0)
- styleProps.insert("librevenge:end-opacity", 1 - style.fgTransparency, RVNG_PERCENT);
+ styleProps.insert("librevenge:end-opacity", 1 - style.fgTransparency, librevenge::RVNG_PERCENT);
else
- styleProps.insert("librevenge:end-opacity", 1, RVNG_PERCENT);
- styleProps.insert("draw:border", 0, RVNG_PERCENT);
+ styleProps.insert("librevenge:end-opacity", 1, librevenge::RVNG_PERCENT);
+ styleProps.insert("draw:border", 0, librevenge::RVNG_PERCENT);
switch(style.pattern)
{
@@ -2553,21 +2553,21 @@ void libvisio::VSDContentCollector::_fillAndShadowProperties(const VSDFillStyle
{
styleProps.insert("draw:fill", "gradient");
styleProps.insert("draw:style", "rectangular");
- styleProps.insert("svg:cx", 0.5, RVNG_PERCENT);
- styleProps.insert("svg:cy", 0.5, RVNG_PERCENT);
+ styleProps.insert("svg:cx", 0.5, librevenge::RVNG_PERCENT);
+ styleProps.insert("svg:cy", 0.5, librevenge::RVNG_PERCENT);
styleProps.insert("draw:start-color", getColourString(style.bgColour));
styleProps.insert("draw:end-color", getColourString(style.fgColour));
styleProps.remove("draw:opacity");
if (style.bgTransparency > 0)
- styleProps.insert("librevenge:start-opacity", 1 - style.bgTransparency, RVNG_PERCENT);
+ styleProps.insert("librevenge:start-opacity", 1 - style.bgTransparency, librevenge::RVNG_PERCENT);
else
- styleProps.insert("librevenge:start-opacity", 1, RVNG_PERCENT);
+ styleProps.insert("librevenge:start-opacity", 1, librevenge::RVNG_PERCENT);
if (style.fgTransparency > 0)
- styleProps.insert("librevenge:end-opacity", 1 - style.fgTransparency, RVNG_PERCENT);
+ styleProps.insert("librevenge:end-opacity", 1 - style.fgTransparency, librevenge::RVNG_PERCENT);
else
- styleProps.insert("librevenge:end-opacity", 1, RVNG_PERCENT);
+ styleProps.insert("librevenge:end-opacity", 1, librevenge::RVNG_PERCENT);
styleProps.insert("draw:angle", 0);
- styleProps.insert("draw:border", 0, RVNG_PERCENT);
+ styleProps.insert("draw:border", 0, librevenge::RVNG_PERCENT);
}
else if (style.pattern >= 36 && style.pattern <= 40)
{
@@ -2577,36 +2577,36 @@ void libvisio::VSDContentCollector::_fillAndShadowProperties(const VSDFillStyle
styleProps.insert("draw:end-color", getColourString(style.fgColour));
styleProps.remove("draw:opacity");
if (style.bgTransparency > 0)
- styleProps.insert("librevenge:start-opacity", 1 - style.bgTransparency, RVNG_PERCENT);
+ styleProps.insert("librevenge:start-opacity", 1 - style.bgTransparency, librevenge::RVNG_PERCENT);
else
- styleProps.insert("librevenge:start-opacity", 1, RVNG_PERCENT);
+ styleProps.insert("librevenge:start-opacity", 1, librevenge::RVNG_PERCENT);
if (style.fgTransparency > 0)
- styleProps.insert("librevenge:end-opacity", 1 - style.fgTransparency, RVNG_PERCENT);
+ styleProps.insert("librevenge:end-opacity", 1 - style.fgTransparency, librevenge::RVNG_PERCENT);
else
- styleProps.insert("librevenge:end-opacity", 1, RVNG_PERCENT);
- styleProps.insert("draw:border", 0, RVNG_PERCENT);
+ styleProps.insert("librevenge:end-opacity", 1, librevenge::RVNG_PERCENT);
+ styleProps.insert("draw:border", 0, librevenge::RVNG_PERCENT);
switch(style.pattern)
{
case 36:
- styleProps.insert("svg:cx", 0, RVNG_PERCENT);
- styleProps.insert("svg:cy", 0, RVNG_PERCENT);
+ styleProps.insert("svg:cx", 0, librevenge::RVNG_PERCENT);
+ styleProps.insert("svg:cy", 0, librevenge::RVNG_PERCENT);
break;
case 37:
- styleProps.insert("svg:cx", 1, RVNG_PERCENT);
- styleProps.insert("svg:cy", 0, RVNG_PERCENT);
+ styleProps.insert("svg:cx", 1, librevenge::RVNG_PERCENT);
+ styleProps.insert("svg:cy", 0, librevenge::RVNG_PERCENT);
break;
case 38:
- styleProps.insert("svg:cx", 0, RVNG_PERCENT);
- styleProps.insert("svg:cy", 1, RVNG_PERCENT);
+ styleProps.insert("svg:cx", 0, librevenge::RVNG_PERCENT);
+ styleProps.insert("svg:cy", 1, librevenge::RVNG_PERCENT);
break;
case 39:
- styleProps.insert("svg:cx", 1, RVNG_PERCENT);
- styleProps.insert("svg:cy", 1, RVNG_PERCENT);
+ styleProps.insert("svg:cx", 1, librevenge::RVNG_PERCENT);
+ styleProps.insert("svg:cy", 1, librevenge::RVNG_PERCENT);
break;
case 40:
- styleProps.insert("svg:cx", 0.5, RVNG_PERCENT);
- styleProps.insert("svg:cy", 0.5, RVNG_PERCENT);
+ styleProps.insert("svg:cx", 0.5, librevenge::RVNG_PERCENT);
+ styleProps.insert("svg:cy", 0.5, librevenge::RVNG_PERCENT);
break;
}
}
@@ -2623,7 +2623,7 @@ void libvisio::VSDContentCollector::_fillAndShadowProperties(const VSDFillStyle
styleProps.insert("draw:shadow-offset-x",style.shadowOffsetX != 0.0 ? style.shadowOffsetX : m_shadowOffsetX);
styleProps.insert("draw:shadow-offset-y",style.shadowOffsetY != 0.0 ? -style.shadowOffsetY : -m_shadowOffsetY);
styleProps.insert("draw:shadow-color",getColourString(style.shadowFgColour));
- styleProps.insert("draw:shadow-opacity",(double)(1 - style.shadowFgColour.a/255.), RVNG_PERCENT);
+ styleProps.insert("draw:shadow-opacity",(double)(1 - style.shadowFgColour.a/255.), librevenge::RVNG_PERCENT);
}
}
@@ -2646,7 +2646,7 @@ void libvisio::VSDContentCollector::collectTextField(unsigned id, unsigned level
if (nameId >= 0)
m_fields.push_back(m_names[nameId]);
else
- m_fields.push_back(RVNGString());
+ m_fields.push_back(librevenge::RVNGString());
}
}
else
@@ -2668,7 +2668,7 @@ void libvisio::VSDContentCollector::collectNumericField(unsigned id, unsigned le
element->setValue(number);
if (format == 0xffff)
{
- std::map<unsigned, RVNGString>::const_iterator iter = m_names.find(formatStringId);
+ std::map<unsigned, librevenge::RVNGString>::const_iterator iter = m_names.find(formatStringId);
if (iter != m_names.end())
parseFormatId(iter->second.cstr(), format);
}
@@ -2803,7 +2803,7 @@ bool libvisio::VSDContentCollector::parseFormatId( const char *formatString, uns
return false;
}
-void libvisio::VSDContentCollector::appendCharacters(RVNGString &text, const std::vector<unsigned char> &characters, TextFormat format)
+void libvisio::VSDContentCollector::appendCharacters(librevenge::RVNGString &text, const std::vector<unsigned char> &characters, TextFormat format)
{
if (format == VSD_TEXT_UTF16)
return appendCharacters(text, characters);
@@ -2937,7 +2937,7 @@ void libvisio::VSDContentCollector::appendCharacters(RVNGString &text, const std
}
}
-void libvisio::VSDContentCollector::appendCharacters(RVNGString &text, const std::vector<unsigned char> &characters)
+void libvisio::VSDContentCollector::appendCharacters(librevenge::RVNGString &text, const std::vector<unsigned char> &characters)
{
UErrorCode status = U_ZERO_ERROR;
UConverter *conv = ucnv_open("UTF-16LE", &status);
@@ -2962,7 +2962,7 @@ void libvisio::VSDContentCollector::appendCharacters(RVNGString &text, const std
ucnv_close(conv);
}
-void libvisio::VSDContentCollector::_appendField(RVNGString &text)
+void libvisio::VSDContentCollector::_appendField(librevenge::RVNGString &text)
{
if (m_fieldIndex < m_fields.size())
text.append(m_fields[m_fieldIndex++].cstr());
diff --git a/src/lib/VSDContentCollector.h b/src/lib/VSDContentCollector.h
index 6524794..504747b 100644
--- a/src/lib/VSDContentCollector.h
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list