[Libreoffice-commits] .: Branch 'feature/gtk3' - 2 commits - vcl/generic vcl/headless vcl/inc vcl/Library_vcl.mk

[Michael Meeks]

 vcl/Library_vcl.mk              |   24 ++++++++++++------------
 vcl/generic/app/geninst.cxx     |    5 +++++
 vcl/headless/svppspgraphics.cxx |    2 +-
 vcl/inc/generic/geninst.h       |    3 ++-
 vcl/inc/vcl/sysdata.hxx         |    1 +
 5 files changed, 21 insertions(+), 14 deletions(-)

New commits:
commit 8837810912cd77a1e715435cc0c167666c337f06
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Wed Oct 19 15:21:29 2011 +0100

    generic: undo attempt at cross-platform headless for now

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 40c0cd6..0128338 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -264,18 +264,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/source/window/window \
     vcl/source/window/winproc \
     vcl/source/window/wrkwin \
-    vcl/generic/app/gensys \
-    vcl/generic/app/geninst \
-    vcl/generic/app/gendisp \
-    vcl/generic/print/bitmap_gfx \
-    vcl/generic/print/common_gfx \
-    vcl/generic/print/glyphset \
-    vcl/generic/print/printerjob \
-    vcl/generic/print/psputil \
-    vcl/generic/print/genpspgraphics \
-    vcl/generic/print/genprnpsp \
-    vcl/generic/print/text_gfx \
-    vcl/generic/fontmanager/fontsubst \
 ))
 
 # optional parts
@@ -410,6 +398,18 @@ $(eval $(call gb_Library_add_defs,vcl,\
     -D_XSALSET_LIBNAME=\"$(call gb_Library_get_runtime_filename,spa)\" \
 ))
 $(eval $(call gb_Library_add_exception_objects,vcl,\
+    vcl/generic/app/gensys \
+    vcl/generic/app/geninst \
+    vcl/generic/app/gendisp \
+    vcl/generic/print/bitmap_gfx \
+    vcl/generic/print/common_gfx \
+    vcl/generic/print/glyphset \
+    vcl/generic/print/printerjob \
+    vcl/generic/print/psputil \
+    vcl/generic/print/genpspgraphics \
+    vcl/generic/print/genprnpsp \
+    vcl/generic/print/text_gfx \
+    vcl/generic/fontmanager/fontsubst \
     vcl/generic/glyphs/gcach_ftyp \
     vcl/generic/glyphs/gcach_layout \
     vcl/generic/glyphs/gcach_rbmp \
diff --git a/vcl/generic/app/geninst.cxx b/vcl/generic/app/geninst.cxx
index a4127d3..24f4967 100644
--- a/vcl/generic/app/geninst.cxx
+++ b/vcl/generic/app/geninst.cxx
@@ -51,6 +51,11 @@ SalYieldMutex::SalYieldMutex()
     ::tools::SolarMutex::SetSolarMutex( this );
 }
 
+SalYieldMutex::~SalYieldMutex()
+{
+    ::tools::SolarMutex::SetSolarMutex( NULL );
+}
+
 void SalYieldMutex::acquire()
 {
     SolarMutexObject::acquire();
diff --git a/vcl/headless/svppspgraphics.cxx b/vcl/headless/svppspgraphics.cxx
index 9728d99..56e0899 100644
--- a/vcl/headless/svppspgraphics.cxx
+++ b/vcl/headless/svppspgraphics.cxx
@@ -64,7 +64,7 @@ using namespace basegfx;
 using ::rtl::OUString;
 using ::rtl::OString;
 
-#warning FIXME: this is presumed un-necessary the generic/ BitmapBuffer code should work just as well - surely
+// FIXME: this is presumed un-necessary the generic/ BitmapBuffer code should work just as well - surely
 
 #ifdef USE_SVP_BITMAP
 // ----- Implementation of PrinterBmp by means of SalBitmap/BitmapBuffer ---------------
diff --git a/vcl/inc/generic/geninst.h b/vcl/inc/generic/geninst.h
index 621ff17..b3fb0ce 100644
--- a/vcl/inc/generic/geninst.h
+++ b/vcl/inc/generic/geninst.h
@@ -62,12 +62,13 @@ protected:
 
 public:
                         SalYieldMutex();
+                        ~SalYieldMutex();
 
     virtual void        acquire();
     virtual void        release();
     virtual sal_Bool    tryToAcquire();
 
-    sal_uIntPtr         GetAcquireCount() const { return mnCount; }
+    virtual sal_uIntPtr GetAcquireCount() const { return mnCount; }
     oslThreadIdentifier GetThreadId() const { return mnThreadId; }
 };
 
commit 32ecbf721843ceabe2f2f425eb85d5a96ae4c56d
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Fri Oct 7 21:35:14 2011 +0100

    cleanup some missing conditionals causing problems for mac

diff --git a/vcl/inc/vcl/sysdata.hxx b/vcl/inc/vcl/sysdata.hxx
index b97e854..59a174d 100644
--- a/vcl/inc/vcl/sysdata.hxx
+++ b/vcl/inc/vcl/sysdata.hxx
@@ -218,6 +218,7 @@ struct SystemFontData
         , hFont( 0 )
 #elif defined( QUARTZ )
         , aATSUFontID( NULL )
+#elif defined( IOS )
 #elif defined( UNX )
         , nFontId( NULL )
         , nFontFlags( 0 )