мелкая правка дефайна

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@63669 954022d7-b5bf-4e40-9824-e11837661b57

DesktopEditor/doctrenderer/linux enviroment setup.txt

@@ -39,3 +39,6 @@ make dependencies
 // make native
 CFLAGS="-fPIC" CXXFLAGS="-fPIC" make native
 ---------------------------------------------------------------------------------------------------------
+
+# additionals
+zlib: sudo apt-get install --reinstall zlibc zlib1g zlib1g-dev
\ No newline at end of file

HtmlRenderer/htmlrenderer.pro

@@ -46,7 +46,7 @@ linux-g++:!contains(QMAKE_HOST.arch, x86_64):{
 
 ############# dynamic dependencies #############
 shared {
-    DEFINES += PDF_USE_DYNAMIC_LIBRARY
+    DEFINES += HTMLRENDERER_USE_DYNAMIC_LIBRARY
 
     LIBS += -L$$DESTDIR -lASCOfficeUtilsLib
     LIBS += -L$$DESTDIR -lgraphics

HtmlRenderer/include/HTMLRenderer3.h

 #ifndef _ASC_HTMLRENDERER3_H_
 #define _ASC_HTMLRENDERER3_H_
 
-#include "../../../DesktopEditor/graphics/IRenderer.h"
+#include "../../DesktopEditor/graphics/IRenderer.h"
+
+#ifndef HTMLRENDERER_USE_DYNAMIC_LIBRARY
+#define HTMLRENDERER_DECL_EXPORT
+#else
+#include "../../DesktopEditor/common/base_export.h"
+#define HTMLRENDERER_DECL_EXPORT Q_DECL_EXPORT
+#endif
 
 namespace NSHtmlRenderer
 {
     class CASCHTMLRenderer3_Private;
-    class CASCHTMLRenderer3 : public IRenderer
+    class HTMLRENDERER_DECL_EXPORT CASCHTMLRenderer3 : public IRenderer
     {
     public:
         CASCHTMLRenderer3();

HtmlRenderer/src/CanvasWriter.h

@@ -2,7 +2,7 @@
 #define _ASC_HTMLRENDERER_CANVASWRITER_H_
 
 #include "Common.h"
-#include "../../../DesktopEditor/graphics/GraphicsPath.h"
+#include "../../DesktopEditor/graphics/GraphicsPath.h"
 
 namespace NSHtmlRenderer
 {

HtmlRenderer/src/Common.h

 #ifndef _ASC_HTMLRENDERER_COMMON_H_
 #define _ASC_HTMLRENDERER_COMMON_H_
 
-#include "../../../DesktopEditor/common/Types.h"
-#include "../../../DesktopEditor/common/File.h"
-#include "../../../DesktopEditor/common/Directory.h"
-#include "../../../DesktopEditor/raster/BgraFrame.h"
-#include "../../../DesktopEditor/graphics/Matrix.h"
-#include "../../../DesktopEditor/graphics/structures.h"
-#include "../../../DesktopEditor/fontengine/ApplicationFonts.h"
-#include "../../../DesktopEditor/common/StringBuilder.h"
-#include "../../../DesktopEditor/graphics/IRenderer.h"
-#include "../../../DesktopEditor/xml/include/xmlutils.h"
+#include "../../DesktopEditor/common/Types.h"
+#include "../../DesktopEditor/common/File.h"
+#include "../../DesktopEditor/common/Directory.h"
+#include "../../DesktopEditor/raster/BgraFrame.h"
+#include "../../DesktopEditor/graphics/Matrix.h"
+#include "../../DesktopEditor/graphics/structures.h"
+#include "../../DesktopEditor/fontengine/ApplicationFonts.h"
+#include "../../DesktopEditor/common/StringBuilder.h"
+#include "../../DesktopEditor/graphics/IRenderer.h"
+#include "../../DesktopEditor/xml/include/xmlutils.h"
 
 namespace NSHtmlRenderer
 {

HtmlRenderer/src/Document.h

@@ -3,7 +3,7 @@
 
 #include "Common.h"
 #include <vector>
-#include "../../../DesktopEditor/graphics/GraphicsRenderer.h"
+#include "../../DesktopEditor/graphics/GraphicsRenderer.h"
 
 namespace NSHtmlRenderer
 {

HtmlRenderer/src/SVGWriter.h

@@ -3,7 +3,7 @@
 
 #include "Common.h"
 #include <vector>
-#include "../../../DesktopEditor/graphics/GraphicsPath.h"
+#include "../../DesktopEditor/graphics/GraphicsPath.h"
 
 namespace NSHtmlRenderer
 {

HtmlRenderer/src/SVGWriter2.h

@@ -2,7 +2,7 @@
 #define _ASC_HTMLRENDERER_SVGWRITER2_H_
 
 #include "SVGWriter.h"
-#include "../../../DesktopEditor/graphics/GraphicsRenderer.h"
+#include "../../DesktopEditor/graphics/GraphicsRenderer.h"
 
 #define SVG_INLINE_MAX_SIZE		500000 // 500Kb
 #define SVG_TO_RASTER_MIN_SIZE 50000000 // 1Mb

HtmlRenderer/src/Text.h

@@ -2,7 +2,7 @@
 #define _ASC_HTMLRENDERER_TEXT_H_
 
 #include "FontManager.h"
-#include "../../../Common/OfficeFileFormats.h"
+#include "../../Common/OfficeFileFormats.h"
 
 #ifdef min
 #undef min

HtmlRenderer/src/VectorGraphicsWriter.h

@@ -2,7 +2,7 @@
 #define _ASC_HTMLRENDERER_VGW_H_
 
 #include "Common.h"
-#include "../../../DesktopEditor/graphics/GraphicsPath.h"
+#include "../../DesktopEditor/graphics/GraphicsPath.h"
 #include <vector>
 
 namespace NSHtmlRenderer

HtmlRenderer/src/Writer.h

@@ -3,11 +3,11 @@
 
 #include "SVGWriter2.h"
 #include <map>
-#include "../../../DesktopEditor/xml/include/xmlutils.h"
-#include "../../../DesktopEditor/common/CalculatorCRC32.h"
+#include "../../DesktopEditor/xml/include/xmlutils.h"
+#include "../../DesktopEditor/common/CalculatorCRC32.h"
 #include "Text.h"
 #include "Document.h"
-#include "../../../DesktopEditor/fontengine/FontConverter.h"
+#include "../../DesktopEditor/fontengine/FontConverter.h"
 
 namespace NSHtmlRenderer
 {

HtmlRenderer/test/main.cpp

 #include <QCoreApplication>
 
-#include "../../../PdfReader/PdfReader.h"
+#include "../../DesktopEditor/fontengine/ApplicationFonts.h"
+
+#include "../../PdfReader/PdfReader.h"
 #include "../include/HTMLRenderer3.h"
-#include "../../../DesktopEditor/fontengine/ApplicationFonts.h"
 
 int main(int argc, char *argv[])
 {

HtmlRenderer/test/test.pro

@@ -12,16 +12,19 @@ TARGET = test
 CONFIG   += console
 CONFIG   -= app_bundle
 
+DEFINES += PDFREADER_USE_DYNAMIC_LIBRARY
+DEFINES += HTMLRENDERER_USE_DYNAMIC_LIBRARY
+
 INCLUDEPATH += \
-    ../../../DesktopEditor/freetype-2.5.2/include \
+    ../../DesktopEditor/freetype-2.5.2/include
 
 TEMPLATE = app
 
-LIBS += -L../../../../SDK/lib/win_64/DEBUG -lASCOfficeUtilsLib
-LIBS += -L../../../../SDK/lib/win_64/DEBUG -lgraphics
-LIBS += -L../../../../SDK/lib/win_64/DEBUG -lHtmlRenderer
-LIBS += -L../../../../SDK/lib/win_64/DEBUG -llibxml
-LIBS += -L../../../../SDK/lib/win_64/DEBUG -lPdfReader
+LIBS += -L../../../SDK/lib/win_64/DEBUG -lASCOfficeUtilsLib
+LIBS += -L../../../SDK/lib/win_64/DEBUG -lgraphics
+LIBS += -L../../../SDK/lib/win_64/DEBUG -lHtmlRenderer
+LIBS += -L../../../SDK/lib/win_64/DEBUG -llibxml
+LIBS += -L../../../SDK/lib/win_64/DEBUG -lPdfReader
 LIBS += -lgdi32 \
         -ladvapi32 \
         -luser32 \

PdfReader/PdfReader.h

@@ -7,11 +7,11 @@ class IRenderer;
 class CFontManager;
 class CApplicationFonts;
 
-#ifndef PDF_USE_DYNAMIC_LIBRARY
-#define PDF_DECL_EXPORT
+#ifndef PDFREADER_USE_DYNAMIC_LIBRARY
+#define PDFREADER_DECL_EXPORT
 #else
 #include "../DesktopEditor/common/base_export.h"
-#define PDF_DECL_EXPORT Q_DECL_EXPORT
+#define PDFREADER_DECL_EXPORT Q_DECL_EXPORT
 #endif
 
 namespace PdfReader
@@ -20,7 +20,7 @@ namespace PdfReader
 	class GlobalParams;
 	class CFontList;
 
-    class PDF_DECL_EXPORT CPdfReader
+    class PDFREADER_DECL_EXPORT CPdfReader
 	{
 	public:
 

PdfReader/PdfReader.pro

@@ -43,7 +43,7 @@ linux-g++:!contains(QMAKE_HOST.arch, x86_64):{
 
 ############# dynamic dependencies #############
 shared {
-    DEFINES += PDF_USE_DYNAMIC_LIBRARY
+    DEFINES += PDFREADER_USE_DYNAMIC_LIBRARY
 
     LIBS += -L$$DESTDIR -lASCOfficeUtilsLib
     LIBS += -L$$DESTDIR -lgraphics