[Libreoffice-commits] .: 2 commits - tools/inc vcl/inc vcl/Library_vclplug_svp.mk

[Caolán McNamara]

 tools/inc/tools/solar.h    |   70 +++------------------------------------------
 vcl/Library_vclplug_svp.mk |    6 ---
 vcl/inc/printergfx.hxx     |    5 +--
 3 files changed, 9 insertions(+), 72 deletions(-)

New commits:
commit fd9744b37f1055294f0f702c3dcc3870e5dcf4cd
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jun 3 11:38:23 2011 +0100

    track changes to solenv DLLEXTENSION here too

diff --git a/tools/inc/tools/solar.h b/tools/inc/tools/solar.h
index fa272ac..d8fcb9b 100644
--- a/tools/inc/tools/solar.h
+++ b/tools/inc/tools/solar.h
@@ -213,70 +213,12 @@ template<typename T> inline T Abs(T a) { return (a>=0?a:-a); }
 
 /* dll file extensions *******************************************************/
 
-#if defined WNT && defined __MINGW32__ && defined INTEL
-  #define __DLLEXTENSION "gi"
-#elif defined WNT && defined __MINGW32__ && defined X86_64
-  #define __DLLEXTENSION "gx"
-#elif defined WNT && defined _MSC_VER && defined INTEL
-  #define __DLLEXTENSION "mi"
-#elif defined WNT && defined _MSC_VER && defined X86_64
-  #define __DLLEXTENSION "mx"
-#elif defined AIX
-  #define __DLLEXTENSION "ap.so"
-#elif defined SOLARIS && defined SPARC && defined IS_LP64
-  #define __DLLEXTENSION "su.so"
-#elif defined SOLARIS && defined SPARC && !defined __GNUC__
-  #define __DLLEXTENSION "ss.so"
-#elif defined SOLARIS && defined SPARC && defined __GNUC__
-  #define __DLLEXTENSION "sogs.so"
-#elif defined SOLARIS && defined INTEL && !defined __GNUC__
-  #define __DLLEXTENSION "si.so"
-#elif defined SOLARIS && defined INTEL && defined __GNUC__
-  #define __DLLEXTENSION "sogi.so"
-#elif defined NETBSD && defined X86
-  #define __DLLEXTENSION "bi.so"
-#elif defined NETBSD && defined X86_64
-  #define __DLLEXTENSION "bx.so"
-#elif defined NETBSD && defined ARM32
-  #define __DLLEXTENSION "ba.so"
-#elif defined NETBSD && defined SPARC
-  #define __DLLEXTENSION "bs.so"
-#elif defined NETBSD && defined POWERPC
-  #define __DLLEXTENSION "bp.so"
-#elif defined LINUX && defined X86
-  #define __DLLEXTENSION "li.so"
-#elif defined LINUX && defined POWERPC
-  #define __DLLEXTENSION "lp.so"
-#elif defined LINUX && defined S390
-  #define __DLLEXTENSION "l3.so"
-#elif defined LINUX && defined ARM32
-  #define __DLLEXTENSION "lr.so"
-#elif defined LINUX && defined SPARC
-  #define __DLLEXTENSION "ls.so"
-#elif defined LINUX && defined __x86_64__
-  #define __DLLEXTENSION "lx.so"
-#elif defined LINUX && defined MIPS
-  #define __DLLEXTENSION "lm.so"
-#elif defined LINUX && defined IA64
-  #define __DLLEXTENSION "la.so"
-#elif defined LINUX && defined M68K
-  #define __DLLEXTENSION "lm.so"
-#elif defined LINUX && defined HPPA
-  #define __DLLEXTENSION "lh.so"
-#elif defined LINUX && defined AXP
-  #define __DLLEXTENSION "ll.so"
-#elif defined FREEBSD && defined X86
-  #define __DLLEXTENSION "fi.so"
-#elif defined FREEBSD && defined X86_64
-  #define __DLLEXTENSION "fx.so"
-#elif defined MACOSX && defined POWERPC
-  #define __DLLEXTENSION "mxp.dylib"
-#elif defined MACOSX && defined X86
-  #define __DLLEXTENSION "mxi.dylib"
-#elif defined OPENBSD
-  #define __DLLEXTENSION "ob.so"
-#elif defined DRAGONFLY
-  #define __DLLEXTENSION "df.so"
+#if defined WNT
+  #define __DLLEXTENSION "lo"
+#elif defined MACOSX
+  #define __DLLEXTENSION "lo.dylib"
+#elif defined UNX
+  #define __DLLEXTENSION "lo.so"
 #else
   #error unknown plattform
 #endif
commit 650c0d19af04bc7aa56d75109d510c2e98d0cd1a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jun 3 11:37:01 2011 +0100

    share gen plugin with svp plugin

diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk
index e62e50b..5ba89f3 100644
--- a/vcl/Library_vclplug_svp.mk
+++ b/vcl/Library_vclplug_svp.mk
@@ -68,12 +68,6 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_svp,\
 ))
 
 $(eval $(call gb_Library_add_exception_objects,vclplug_svp,\
-    vcl/unx/generic/printergfx/bitmap_gfx \
-    vcl/unx/generic/printergfx/common_gfx \
-    vcl/unx/generic/printergfx/glyphset \
-    vcl/unx/generic/printergfx/printerjob \
-    vcl/unx/generic/printergfx/psputil \
-    vcl/unx/generic/printergfx/text_gfx \
     vcl/unx/headless/svpbmp \
     vcl/unx/headless/svpdummies \
     vcl/unx/headless/svpelement \
diff --git a/vcl/inc/printergfx.hxx b/vcl/inc/printergfx.hxx
index 40bee37..d1c15d3 100644
--- a/vcl/inc/printergfx.hxx
+++ b/vcl/inc/printergfx.hxx
@@ -33,6 +33,7 @@
 #include "sallayout.hxx"
 #include "osl/file.hxx"
 #include "tools/gen.hxx"
+#include "vclpluginapi.h"
 
 #include <list>
 #include <boost/unordered_map.hpp>
@@ -139,7 +140,7 @@ struct CharacterMetric;
  *      vcl/unx/source/gdi/salgdi2.cxx
  */
 
-class PrinterBmp
+class VCLPLUG_GEN_PUBLIC PrinterBmp
 {
 public:
 
@@ -182,7 +183,7 @@ struct GraphicsStatus
 
 class Font3;
 
-class PrinterGfx
+class VCLPLUG_GEN_PUBLIC PrinterGfx
 {
 private: