From e103887c8c158e7059a586ef5a5f7b234c547dfe Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Fri, 11 Jan 2013 11:07:23 +0200
Subject: QUARTZ is equivalent to MACOSX

So just check MACOSX in the sources, and don't pass any -DQUARTZ to
compilations.

Change-Id: Ia1de6024810f81f1eea01b8eb0b885d9d1ee8e20
---
 sd/source/ui/dlg/prntopts.cxx            | 6 +++---
 sd/source/ui/slideshow/slideshowimpl.cxx | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'sd')

diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx
index 799a247d0590..78f5d4758dc5 100644
--- a/sd/source/ui/dlg/prntopts.cxx
+++ b/sd/source/ui/dlg/prntopts.cxx
@@ -86,7 +86,7 @@ SdPrintOptions::SdPrintOptions( Window* pParent, const SfxItemSet& rInAttrs ) :
     aCbxHandout.SetClickHdl( aLink );
     aCbxOutline.SetClickHdl( aLink );
 
-#ifndef QUARTZ
+#ifndef MACOSX
     SetDrawMode();
 #endif
 
@@ -281,12 +281,12 @@ void    SdPrintOptions::SetDrawMode()
 }
 
 void SdPrintOptions::PageCreated (SfxAllItemSet
-#ifdef QUARTZ
+#ifdef MACOSX
                                   aSet
 #endif
                                   )
 {
-#ifdef QUARTZ
+#ifdef MACOSX
     SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt32Item,SID_SDMODE_FLAG,sal_False);
     if (pFlagItem)
     {
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 8c718421debe..ea48eee52064 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -2079,7 +2079,7 @@ IMPL_LINK( SlideshowImpl, EventListenerHdl, VclSimpleEvent*, pEvent )
         {
             switch( rEvent.GetMediaCommand() )
             {
-#if defined( QUARTZ )
+#if defined( MACOSX )
             case MEDIA_COMMAND_MENU:
                 if( !mnContextMenuEvent )
                 {
-- 
cgit