diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-01-11 11:07:23 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-01-11 11:16:59 +0200 |
| commit | e103887c8c158e7059a586ef5a5f7b234c547dfe (patch) | |
| tree | 6cbcabd6d270e595578cc283afadd5b4023bd718 /sfx2 | |
| parent | 4d23222b15ac0034e265441c71405a48403721f8 (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 'sfx2')
| -rw-r--r-- | sfx2/source/appl/shutdownicon.cxx | 8 | ||||
| -rw-r--r-- | sfx2/source/appl/shutdownicon.hxx | 2 | ||||
| -rw-r--r-- | sfx2/source/dialog/filedlghelper.cxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index ba6fd3f307bb..bcb85ce490d3 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -76,7 +76,7 @@ using namespace ::rtl; using namespace ::sfx2; #ifdef ENABLE_QUICKSTART_APPLET -# if !defined(WIN32) && !defined(QUARTZ) +# if !defined(WIN32) && !defined(MACOSX) extern "C" { static void SAL_CALL thisModule() {} } # endif #endif @@ -137,7 +137,7 @@ bool ShutdownIcon::LoadModule( osl::Module **pModule, *pDeInit = win32_shutdown_sys_tray; } return true; -# elif defined QUARTZ +# elif defined MACOSX *pInit = aqua_init_systray; *pDeInit = aqua_shutdown_systray; return true; @@ -749,7 +749,7 @@ void ShutdownIcon::LeaveModalMode() #ifdef WNT // defined in shutdowniconw32.cxx -#elif defined QUARTZ +#elif defined MACOSX // defined in shutdowniconaqua.cxx #else bool ShutdownIcon::IsQuickstarterInstalled() @@ -828,7 +828,7 @@ rtl::OUString ShutdownIcon::getShortcutName() bool ShutdownIcon::GetAutostart( ) { -#if defined QUARTZ +#if defined MACOSX return true; #else bool bRet = false; diff --git a/sfx2/source/appl/shutdownicon.hxx b/sfx2/source/appl/shutdownicon.hxx index cfa5e5371409..bbcef09d31a8 100644 --- a/sfx2/source/appl/shutdownicon.hxx +++ b/sfx2/source/appl/shutdownicon.hxx @@ -172,7 +172,7 @@ extern "C" { // builtin win32 systray void win32_init_sys_tray(); void win32_shutdown_sys_tray(); -# elif defined QUARTZ +# elif defined MACOSX void aqua_init_systray(); void aqua_shutdown_systray(); # endif diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index abc47b024a41..cf072f25110f 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -1242,7 +1242,7 @@ void FileDialogHelper_Impl::preExecute() implInitializeFileName( ); -#if !(defined(MACOSX) && defined(QUARTZ)) && !defined(WNT) +#if !(defined(MACOSX) && defined(MACOSX)) && !defined(WNT) // allow for dialog implementations which need to be executed before they return valid values for // current filter and such |