summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2011-10-19 15:21:29 +0100
committerMichael Meeks <michael.meeks@suse.com>2011-10-25 13:41:56 +0100
commit0dc6cb349ca1246a0febfaad15e5724fef2bd264 (patch)
tree7300daceaad796e37c95d72e6d1821797f93d603 /vcl
parent931e6bf52fd14e122511ce97f15b0d8527bc3c07 (diff)
generic: undo attempt at cross-platform headless for now
Diffstat (limited to 'vcl')
-rw-r--r--vcl/Library_vcl.mk24
-rw-r--r--vcl/generic/app/geninst.cxx5
-rw-r--r--vcl/headless/svppspgraphics.cxx2
-rw-r--r--vcl/inc/generic/geninst.h3
4 files changed, 20 insertions, 14 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 40c0cd627810..012833875bed 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 a4127d32ba95..24f49675778f 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 9728d997fe22..56e08991d4fb 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 621ff175f6fb..b3fb0ce31a23 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; }
};