summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-01-11 11:07:23 +0200
committerTor Lillqvist <tml@iki.fi>2013-01-11 11:16:59 +0200
commite103887c8c158e7059a586ef5a5f7b234c547dfe (patch)
tree6cbcabd6d270e595578cc283afadd5b4023bd718 /svtools
parent4d23222b15ac0034e265441c71405a48403721f8 (diff)
QUARTZ is equivalent to MACOSX
So just check MACOSX in the sources, and don't pass any -DQUARTZ to compilations. Change-Id: Ia1de6024810f81f1eea01b8eb0b885d9d1ee8e20
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/misc/sampletext.cxx2
-rw-r--r--svtools/source/misc/transfer.cxx4
2 files changed, 3 insertions, 3 deletions
diff --git a/svtools/source/misc/sampletext.cxx b/svtools/source/misc/sampletext.cxx
index 6b8cc6180968..8bc9bb5add83 100644
--- a/svtools/source/misc/sampletext.cxx
+++ b/svtools/source/misc/sampletext.cxx
@@ -81,7 +81,7 @@ rtl::OUString makeShortRepresentativeSymbolTextForSelectedFont(OutputDevice &rDe
// start just above the PUA used by most symbol fonts
sal_uInt32 cNewChar = 0xFF00;
-#ifdef QUARTZ
+#ifdef MACOSX
// on MacOSX there are too many non-presentable symbols above the codepoint 0x0192
if( !bOpenSymbol )
cNewChar = 0x0192;
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index e43a3ee27a6a..81a679da5c02 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -1113,7 +1113,7 @@ void TransferableHelper::StartDrag( Window* pWindow, sal_Int8 nDnDSourceActions,
// contrary to the XDragSource interface specification because
// we can receive drag events from the system only in the main
// thread
-#if !defined(QUARTZ)
+#if !defined(MACOSX)
const sal_uInt32 nRef = Application::ReleaseSolarMutex();
#endif
@@ -1132,7 +1132,7 @@ void TransferableHelper::StartDrag( Window* pWindow, sal_Int8 nDnDSourceActions,
}
// See above for the reason of this define
-#if !defined(QUARTZ)
+#if !defined(MACOSX)
Application::AcquireSolarMutex( nRef );
#endif
}