From 3e9e70655c38411bec112f35755d49d48c742150 Mon Sep 17 00:00:00 2001
From: Oleg Korshul <Oleg.Korshul@onlyoffice.com>
Date: Thu, 12 Apr 2018 11:59:58 +0300
Subject: [PATCH] 12

---
 DesktopEditor/graphics/GraphicsPath.h         | 4 ++--
 DesktopEditor/graphics/Matrix.h               | 2 +-
 DesktopEditor/graphics/config.h               | 8 ++++++--
 DesktopEditor/graphics/pro/graphics.pro       | 1 +
 DesktopEditor/raster/BgraFrame.h              | 2 +-
 DesktopEditor/raster/ImageFileFormatChecker.h | 2 +-
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/DesktopEditor/graphics/GraphicsPath.h b/DesktopEditor/graphics/GraphicsPath.h
index 87a06098d9..25e76a541f 100644
--- a/DesktopEditor/graphics/GraphicsPath.h
+++ b/DesktopEditor/graphics/GraphicsPath.h
@@ -43,7 +43,7 @@
 namespace Aggplus
 {
     class CGraphicsPath_private;
-    class GRAPHICS_DECL_EXPORT CGraphicsPath : public ISimpleGraphicsPath
+    class GRAPHICS_DECL CGraphicsPath : public ISimpleGraphicsPath
     {
     public:
         CGraphicsPath();
@@ -103,7 +103,7 @@ namespace Aggplus
     };
 
     class CGraphicsPathSimpleConverter_private;
-    class GRAPHICS_DECL_EXPORT CGraphicsPathSimpleConverter : public ISimpleGraphicsPath
+    class GRAPHICS_DECL CGraphicsPathSimpleConverter : public ISimpleGraphicsPath
     {
     private:
         IRenderer* m_pRenderer;
diff --git a/DesktopEditor/graphics/Matrix.h b/DesktopEditor/graphics/Matrix.h
index ba44c329dc..76ff42331c 100644
--- a/DesktopEditor/graphics/Matrix.h
+++ b/DesktopEditor/graphics/Matrix.h
@@ -38,7 +38,7 @@
 namespace Aggplus
 {
     class CMatrix_private;
-    class GRAPHICS_DECL_EXPORT CMatrix
+    class GRAPHICS_DECL CMatrix
     {
     public:
         CMatrix(double m11, double m12, double m21, double m22, double dx, double dy);
diff --git a/DesktopEditor/graphics/config.h b/DesktopEditor/graphics/config.h
index 6f7f04af4b..5e0d55f08b 100644
--- a/DesktopEditor/graphics/config.h
+++ b/DesktopEditor/graphics/config.h
@@ -33,10 +33,14 @@
 #define _GRAPHICS_CONFIG_H_
 
 #ifndef GRAPHICS_USE_DYNAMIC_LIBRARY
-#define GRAPHICS_DECL_EXPORT
+#define GRAPHICS_DECL
 #else
 #include "./../common/base_export.h"
-#define GRAPHICS_DECL_EXPORT Q_DECL_EXPORT
+#ifdef GRAPHICS_USE_DYNAMIC_LIBRARY_BUILDING
+#define GRAPHICS_DECL Q_DECL_EXPORT
+#else
+#define GRAPHICS_DECL Q_DECL_IMPORT
+#endif
 #endif
 
 #endif //_GRAPHICS_CONFIG_H_
diff --git a/DesktopEditor/graphics/pro/graphics.pro b/DesktopEditor/graphics/pro/graphics.pro
index 613248e427..eb01bd321d 100644
--- a/DesktopEditor/graphics/pro/graphics.pro
+++ b/DesktopEditor/graphics/pro/graphics.pro
@@ -48,6 +48,7 @@ core_windows {
 }
 
 DEFINES += GRAPHICS_USE_DYNAMIC_LIBRARY
+DEFINES += GRAPHICS_USE_DYNAMIC_LIBRARY_BUILDING
 
 LIB_GRAPHICS_PRI_PATH = $$PWD/../..
 
diff --git a/DesktopEditor/raster/BgraFrame.h b/DesktopEditor/raster/BgraFrame.h
index 010d857c8a..d5a2600a2f 100644
--- a/DesktopEditor/raster/BgraFrame.h
+++ b/DesktopEditor/raster/BgraFrame.h
@@ -36,7 +36,7 @@
 #include "../common/Types.h"
 #include "./../graphics/config.h"
 
-class GRAPHICS_DECL_EXPORT CBgraFrame
+class GRAPHICS_DECL CBgraFrame
 {
 private:
 	int m_nFileType;
diff --git a/DesktopEditor/raster/ImageFileFormatChecker.h b/DesktopEditor/raster/ImageFileFormatChecker.h
index 3d66519aa4..62802b238d 100644
--- a/DesktopEditor/raster/ImageFileFormatChecker.h
+++ b/DesktopEditor/raster/ImageFileFormatChecker.h
@@ -64,7 +64,7 @@ enum __ENUM_CXIMAGE_FORMATS
     _CXIMAGE_FORMAT_SVM = 23
 };
 
-class GRAPHICS_DECL_EXPORT CImageFileFormatChecker
+class GRAPHICS_DECL CImageFileFormatChecker
 {
 public:
 	__ENUM_CXIMAGE_FORMATS eFileType;