From e103887c8c158e7059a586ef5a5f7b234c547dfe Mon Sep 17 00:00:00 2001 From: Tor Lillqvist 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 --- avmedia/source/inc/mediamisc.hxx | 2 +- canvas/source/cairo/cairo_devicehelper.cxx | 2 +- canvas/source/cairo/cairo_quartz_cairo.cxx | 2 +- canvas/source/cairo/cairo_textlayout.cxx | 4 ++-- canvas/source/vcl/backbuffer.cxx | 2 +- canvas/source/vcl/bitmapbackbuffer.cxx | 2 +- canvas/source/vcl/spritedevicehelper.cxx | 2 +- canvas/source/vcl/spritehelper.cxx | 6 +++--- cui/source/options/optgdlg.cxx | 4 ++-- desktop/source/app/app.cxx | 4 ++-- extensions/source/plugin/base/nfuncs.cxx | 10 +++++----- extensions/source/plugin/base/xplugin.cxx | 6 +++--- extensions/source/plugin/inc/plugin/impl.hxx | 4 ++-- framework/source/dispatch/closedispatcher.cxx | 2 +- framework/source/uielement/menubarmanager.cxx | 2 +- scp2/source/ooo/common_brand.scp | 2 +- scp2/source/ooo/file_library_ooo.scp | 14 +++++++------- scp2/source/ooo/file_ooo.scp | 4 ++-- scp2/source/ooo/file_resource_ooo.scp | 2 +- sd/source/ui/dlg/prntopts.cxx | 6 +++--- sd/source/ui/slideshow/slideshowimpl.cxx | 2 +- sfx2/source/appl/shutdownicon.cxx | 8 ++++---- sfx2/source/appl/shutdownicon.hxx | 2 +- sfx2/source/dialog/filedlghelper.cxx | 2 +- .../engine/OGLTrans/win/OGLTrans_TransitionImpl.cxx | 2 +- .../engine/OGLTrans/win/OGLTrans_TransitionImpl.hxx | 6 +++--- solenv/gbuild/platform/macosx.mk | 1 - solenv/inc/unxmacx.mk | 1 - svtools/source/misc/sampletext.cxx | 2 +- svtools/source/misc/transfer.cxx | 4 ++-- sw/source/core/text/itrform2.cxx | 2 +- sw/source/core/view/viewsh.cxx | 2 +- toolkit/source/awt/vclxsystemdependentwindow.cxx | 6 +++--- toolkit/source/awt/vclxtoolkit.cxx | 8 ++++---- toolkit/source/awt/vclxtopwindow.cxx | 4 ++-- toolkit/source/awt/vclxwindow1.cxx | 4 ++-- vcl/generic/print/genprnpsp.cxx | 4 ++-- vcl/inc/svsys.h | 2 +- vcl/inc/vcl/bitmap.hxx | 2 +- vcl/inc/vcl/sysdata.hxx | 18 +++++++++--------- vcl/source/components/dtranscomp.cxx | 10 +++++----- vcl/source/gdi/outdev6.cxx | 2 +- vcl/source/window/menu.cxx | 2 +- vcl/source/window/syschild.cxx | 3 +-- vcl/source/window/window.cxx | 6 +++--- 45 files changed, 92 insertions(+), 95 deletions(-) diff --git a/avmedia/source/inc/mediamisc.hxx b/avmedia/source/inc/mediamisc.hxx index 218cdbba90a3..1e4393404f8e 100644 --- a/avmedia/source/inc/mediamisc.hxx +++ b/avmedia/source/inc/mediamisc.hxx @@ -24,7 +24,7 @@ class ResMgr; #ifdef WNT #define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.comp.avmedia.Manager_DirectX" #else -#ifdef QUARTZ +#ifdef MACOSX #define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.comp.avmedia.Manager_QuickTime" #else #define AVMEDIA_MANAGER_SERVICE_NAME_OLD "com.sun.star.comp.avmedia.Manager_GStreamer_0_10" diff --git a/canvas/source/cairo/cairo_devicehelper.cxx b/canvas/source/cairo/cairo_devicehelper.cxx index 057f91372d2c..f9df77911b2c 100644 --- a/canvas/source/cairo/cairo_devicehelper.cxx +++ b/canvas/source/cairo/cairo_devicehelper.cxx @@ -90,7 +90,7 @@ namespace cairocanvas OutputDevice* pOutDev=getOutputDevice(); -#if defined (UNX) && !defined (QUARTZ) +#if defined (UNX) && !defined (MACOSX) // X11 only if( mpSurface ) mpSurface->Resize( rSize.getX() + pOutDev->GetOutOffXPixel(), diff --git a/canvas/source/cairo/cairo_quartz_cairo.cxx b/canvas/source/cairo/cairo_quartz_cairo.cxx index 5719d1c02964..9c3d5a065a07 100644 --- a/canvas/source/cairo/cairo_quartz_cairo.cxx +++ b/canvas/source/cairo/cairo_quartz_cairo.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if defined QUARTZ || defined IOS +#if defined MACOSX || defined IOS /************************************************************************ * Mac OS X/Quartz and iOS surface backend for OpenOffice.org Cairo Canvas * ************************************************************************/ diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx index 6075029b311f..c5bb94735934 100644 --- a/canvas/source/cairo/cairo_textlayout.cxx +++ b/canvas/source/cairo/cairo_textlayout.cxx @@ -320,7 +320,7 @@ namespace cairocanvas **/ bool TextLayout::isCairoRenderable(SystemFontData aSysFontData) const { -#if defined UNX && !defined QUARTZ && !defined IOS +#if defined UNX && !defined MACOSX && !defined IOS // is font usable? if (!aSysFontData.nFontId) return false; @@ -473,7 +473,7 @@ namespace cairocanvas cairo_font_face_t* font_face = NULL; #ifdef CAIRO_HAS_QUARTZ_SURFACE -# ifdef QUARTZ +# ifdef MACOSX // TODO: use cairo_quartz_font_face_create_for_cgfont(cgFont) // when CGFont (Mac OS X 10.5 API) is provided by the AQUA VCL backend. font_face = cairo_quartz_font_face_create_for_atsu_font_id((ATSUFontID) rSysFontData.aATSUFontID); diff --git a/canvas/source/vcl/backbuffer.cxx b/canvas/source/vcl/backbuffer.cxx index 1c01906f3fd4..2666c614c3f8 100644 --- a/canvas/source/vcl/backbuffer.cxx +++ b/canvas/source/vcl/backbuffer.cxx @@ -31,7 +31,7 @@ namespace vclcanvas if( !bMonochromeBuffer ) { // #i95645# -#if defined( QUARTZ ) +#if defined( MACOSX ) // use AA on VCLCanvas for Mac maVDev->SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW | maVDev->GetAntialiasing() ); #else diff --git a/canvas/source/vcl/bitmapbackbuffer.cxx b/canvas/source/vcl/bitmapbackbuffer.cxx index cefff7b2da11..ae3e7cfb5799 100644 --- a/canvas/source/vcl/bitmapbackbuffer.cxx +++ b/canvas/source/vcl/bitmapbackbuffer.cxx @@ -120,7 +120,7 @@ namespace vclcanvas mpVDev->SetOutputSizePixel( maBitmap->GetSizePixel() ); // #i95645# -#if defined( QUARTZ ) +#if defined( MACOSX ) // use AA on VCLCanvas for Mac mpVDev->SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW | mpVDev->GetAntialiasing() ); #else diff --git a/canvas/source/vcl/spritedevicehelper.cxx b/canvas/source/vcl/spritedevicehelper.cxx index 901c8a0ad963..e943524b83c3 100644 --- a/canvas/source/vcl/spritedevicehelper.cxx +++ b/canvas/source/vcl/spritedevicehelper.cxx @@ -50,7 +50,7 @@ namespace vclcanvas mpBackBuffer->setSize( rOutDev.GetOutputSizePixel() ); // #i95645# -#if defined( QUARTZ ) +#if defined( MACOSX ) // use AA on VCLCanvas for Mac mpBackBuffer->getOutDev().SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW | mpBackBuffer->getOutDev().GetAntialiasing() ); #else diff --git a/canvas/source/vcl/spritehelper.cxx b/canvas/source/vcl/spritehelper.cxx index 07b55110866c..534e0cb9e9f6 100644 --- a/canvas/source/vcl/spritehelper.cxx +++ b/canvas/source/vcl/spritehelper.cxx @@ -153,7 +153,7 @@ namespace vclcanvas // bitmasks are much faster than alphamasks on some platforms // so convert to bitmask if useful -#ifndef QUARTZ +#ifndef MACOSX if( aMask.GetBitCount() != 1 ) { OSL_FAIL("CanvasCustomSprite::redraw(): Mask bitmap is not " @@ -253,7 +253,7 @@ namespace vclcanvas // the final sprite output position. aClipPoly.transform( aTransform ); -#if ! defined WNT && ! defined QUARTZ +#if ! defined WNT && ! defined MACOSX // non-Windows only - bAtLeastOnePolygon is // only used in non-WNT code below @@ -287,7 +287,7 @@ namespace vclcanvas rTargetSurface.DrawPolyPolygon(PolyPolygon(aClipPoly)); // #i76339# } -#if ! defined WNT && ! defined QUARTZ +#if ! defined WNT && ! defined MACOSX // as a matter of fact, this fast path only // performs well for X11 - under Windows, the // clip via SetTriangleClipRegion is faster. diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 8f8e664b59bb..6b7f6ec496db 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -141,7 +141,7 @@ namespace } #if defined WNT return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.SystemFilePicker") ); - #elif (defined MACOSX && defined QUARTZ) + #elif defined MACOSX return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.AquaFilePicker") ); #else return rtl::OUString(); @@ -212,7 +212,7 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) : aFileDlgCB.Hide(); } -#if !defined(QUARTZ) && !defined(ENABLE_GTK) +#if !defined(MACOSX) && !defined(ENABLE_GTK) aPrintDlgFL.Hide(); aPrintDlgCB.Hide(); #endif diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 02f6001d4daa..b7b9a6cef9d6 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1839,10 +1839,10 @@ sal_Bool Desktop::InitializeQuickstartMode( Reference< XMultiServiceFactory >& r // do nothing if service is not available // #i105753# the following if was invented for performance - // unfortunately this broke the QUARTZ behavior which is to always run + // unfortunately this broke the Mac behavior which is to always run // in quickstart mode since Mac applications do not usually quit // when the last document closes - #ifndef QUARTZ + #ifndef MACOSX if ( bQuickstart ) #endif { diff --git a/extensions/source/plugin/base/nfuncs.cxx b/extensions/source/plugin/base/nfuncs.cxx index b37a1c94d9df..7e48f9b45761 100644 --- a/extensions/source/plugin/base/nfuncs.cxx +++ b/extensions/source/plugin/base/nfuncs.cxx @@ -563,7 +563,7 @@ NPError SAL_CALL NP_LOADDS NPN_GetValue( NPP instance, NPNVariable variable, vo default: aResult = NPERR_INVALID_PARAM; break; - #ifdef QUARTZ + #ifdef MACOSX case 2000: // NPNVsupportsQuickDrawBool *(NPBool*)value = false; break; @@ -600,7 +600,7 @@ NPError SAL_CALL NP_LOADDS NPN_SetValue( NPP instance, { NPError nError = NPERR_NO_ERROR; TRACEN( "NPN_SetValue ", variable ); - #ifdef QUARTZ + #ifdef MACOSX NPN_SetValue_Impl(instance, variable, value); #else (void)instance; @@ -614,7 +614,7 @@ void SAL_CALL NP_LOADDS NPN_InvalidateRect(NPP instance, NPRect* /*invalidRect* { TRACE( "NPN_InvalidateRect" ); - #ifdef QUARTZ + #ifdef MACOSX NPN_ForceRedraw( instance ); #else (void)instance; @@ -625,7 +625,7 @@ void SAL_CALL NP_LOADDS NPN_InvalidateRegion(NPP instance, NPRegion /*invalidRe { TRACE( "NPN_InvalidateRegion" ); - #ifdef QUARTZ + #ifdef MACOSX NPN_ForceRedraw( instance ); #else (void)instance; @@ -635,7 +635,7 @@ void SAL_CALL NP_LOADDS NPN_InvalidateRegion(NPP instance, NPRegion /*invalidRe void SAL_CALL NP_LOADDS NPN_ForceRedraw(NPP instance) { TRACE( "NPN_ForceRedraw" ); - #ifdef QUARTZ + #ifdef MACOSX NPN_ForceRedraw_Impl(instance); #else (void)instance; diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx index 6ad9b2cb3784..ea77d38fd18c 100644 --- a/extensions/source/plugin/base/xplugin.cxx +++ b/extensions/source/plugin/base/xplugin.cxx @@ -523,7 +523,7 @@ void XPlugin_Impl::loadPlugin() } } const SystemEnvData* pEnvData = getSysChildSysData(); -#if defined( UNX ) && !(defined(QUARTZ)) +#if defined( UNX ) && !(defined(MACOSX)) if (pEnvData->pDisplay) // headless? { XSync( (Display*)pEnvData->pDisplay, False ); @@ -533,7 +533,7 @@ void XPlugin_Impl::loadPlugin() { if( !m_aDescription.PluginName.isEmpty() ) { -#if defined QUARTZ +#if defined MACOSX PluginComm* pComm = new MacPluginComm( m_aDescription.Mimetype, m_aDescription.PluginName, pEnvData->pView ); @@ -568,7 +568,7 @@ void XPlugin_Impl::loadPlugin() (char**)(m_nArgs ? m_pArgn : NULL), (char**)(m_nArgs ? m_pArgv : NULL), NULL ); -#ifdef QUARTZ +#ifdef MACOSX // m_aNPWindow is set up in the MacPluginComm from the view SetSysPlugDataParentView(*pEnvData); #elif defined( UNX ) diff --git a/extensions/source/plugin/inc/plugin/impl.hxx b/extensions/source/plugin/inc/plugin/impl.hxx index dbb06a06be67..e50853d9296f 100644 --- a/extensions/source/plugin/inc/plugin/impl.hxx +++ b/extensions/source/plugin/inc/plugin/impl.hxx @@ -73,7 +73,7 @@ #ifdef WNT #include -#elif defined(QUARTZ) +#elif defined(MACOSX) #include "plugin/aqua/sysplug.hxx" #elif defined(UNX) #include "plugin/unx/sysplug.hxx" @@ -152,7 +152,7 @@ private: sal_Bool m_bIsDisposed; -#ifdef QUARTZ +#ifdef MACOSX void SetSysPlugDataParentView(SystemEnvData const& rEnvData); #endif diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx index 675c507ab898..eb9087e0ec79 100644 --- a/framework/source/dispatch/closedispatcher.cxx +++ b/framework/source/dispatch/closedispatcher.cxx @@ -380,7 +380,7 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback) bSuccess = implts_closeFrame(); else if (bEstablishBackingMode) - #if defined QUARTZ + #if defined MACOSX { // on mac close down, quickstarter keeps the process alive // however if someone has shut down the quickstarter diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index f28788709f3f..bfb8f2843a82 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -285,7 +285,7 @@ Any SAL_CALL MenuBarManager::getMenuHandle( const Sequence< sal_Int8 >& /*Proces aSystemMenuData.nSize = sizeof( SystemMenuData ); m_pVCLMenu->GetSystemMenuData( &aSystemMenuData ); -#ifdef QUARTZ +#ifdef MACOSX if( SystemType == SystemDependent::SYSTEM_MAC ) { } diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 025ad7f5346a..b84ed29c681d 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -504,7 +504,7 @@ File gid_Brand_File_Bin_Soffice #endif End -#if defined(UNX) && !defined(QUARTZ) && !defined(LIBO_HEADLESS) +#if defined(UNX) && !defined(MACOSX) && !defined(LIBO_HEADLESS) File gid_Brand_File_Bin_Spadmin BIN_FILE_BODY; Dir = gid_Brand_Dir_Program; diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 65a346f77469..9e29e0316163 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -498,7 +498,7 @@ End #endif #endif -#ifdef QUARTZ +#ifdef MACOSX File gid_File_Lib_Fps_Aqua LIB_FILE_BODY; Styles = (PACKED); @@ -898,7 +898,7 @@ STD_LIB_FILE(gid_File_Lib_DeploymentMisc, deploymentmisc) STD_LIB_FILE( gid_File_Lib_Pl , pl) #endif -#if defined(UNX) && ! defined(QUARTZ) && ! defined(LIBO_HEADLESS) +#if defined(UNX) && ! defined(MACOSX) && ! defined(LIBO_HEADLESS) File gid_File_Lib_Desktop_Detector Name = LIBNAME(desktop_detector); LIB_FILE_BODY; @@ -913,7 +913,7 @@ File gid_File_Lib_Vclplug_Gen End #endif -#if defined(UNX) && ! defined(QUARTZ) +#if defined(UNX) && ! defined(MACOSX) #ifdef ENABLE_GTK File gid_File_Lib_Vclplug_Gtk Name = LIBNAME(vclplug_gtk); @@ -962,7 +962,7 @@ End #endif #endif -#if defined(QUARTZ) +#if defined(MACOSX) File gid_File_Lib_AppleRemote Name = LIBNAME(AppleRemote); LIB_FILE_BODY; @@ -971,7 +971,7 @@ File gid_File_Lib_AppleRemote End #endif -#if defined(QUARTZ) +#if defined(MACOSX) File gid_File_Lib_Basebmp Name = LIBNAME(basebmp); LIB_FILE_BODY; @@ -980,7 +980,7 @@ File gid_File_Lib_Basebmp End #endif -#if defined UNX && ! defined QUARTZ +#if defined UNX && ! defined MACOSX #if ! defined LIBO_HEADLESS STD_LIB_FILE( gid_File_Lib_Vclplug_Svp, vclplug_svp ) #endif @@ -1136,7 +1136,7 @@ End STD_LIB_FILE( gid_File_Lib_Sot, sot ) -#if defined(UNX) && !defined(QUARTZ) && !defined(LIBO_HEADLESS) +#if defined(UNX) && !defined(MACOSX) && !defined(LIBO_HEADLESS) File gid_File_Lib_Spa Name = LIBNAME(spa); diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 68fe44839f37..a6a066ba86bb 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -148,7 +148,7 @@ End #endif -#if defined ENABLE_NPAPI_FROM_BROWSER && defined UNX && !defined QUARTZ +#if defined ENABLE_NPAPI_FROM_BROWSER && defined UNX && !defined MACOSX File gid_File_Bin_Pluginapp BIN_FILE_BODY; @@ -232,7 +232,7 @@ File gid_File_Bin_Senddoc #endif End -#if defined(UNX) && !defined(QUARTZ) && !defined(LIBO_HEADLESS) +#if defined(UNX) && !defined(MACOSX) && !defined(LIBO_HEADLESS) File gid_File_Bin_Spadmin_Bin BIN_FILE_BODY; diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp index 9a04b2ff102d..29559dc1e315 100644 --- a/scp2/source/ooo/file_resource_ooo.scp +++ b/scp2/source/ooo/file_resource_ooo.scp @@ -74,7 +74,7 @@ STD_RES_FILE( gid_File_Res_Sd, sd ) STD_RES_FILE( gid_File_Res_Sfx, sfx ) -#if defined(UNX) && !defined(QUARTZ) && !defined(LIBO_HEADLESS) +#if defined(UNX) && !defined(MACOSX) && !defined(LIBO_HEADLESS) STD_RES_FILE( gid_File_Res_Spa, spa ) 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 ) { 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 diff --git a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.cxx b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.cxx index fdf575d94faf..f9186bd8476e 100644 --- a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.cxx +++ b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.cxx @@ -28,7 +28,7 @@ #include "OGLTrans_TransitionImpl.hxx" #include "OGLTrans_Shaders.hxx" -#ifdef QUARTZ +#ifdef MACOSX #include #else #include diff --git a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.hxx b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.hxx index 9ad9fb05d1b0..b61e73ae5f69 100644 --- a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.hxx +++ b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.hxx @@ -32,14 +32,14 @@ #include #if defined( WNT ) -#elif defined( QUARTZ ) +#elif defined( MACOSX ) #include -#elif defined( UNX ) && !defined( QUARTZ ) +#elif defined( UNX ) && !defined( MACOSX ) #endif #include -#if !defined( QUARTZ ) +#if !defined( MACOSX ) #include #endif diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index ed596e7b3c13..0de72bb8fa93 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -41,7 +41,6 @@ gb_OSDEFS := \ -DUNX \ -D_REENTRANT \ -DNO_PTHREAD_PRIORITY \ - -DQUARTZ \ -DMAC_OS_X_VERSION_MIN_REQUIRED=$(MAC_OS_X_VERSION_MIN_REQUIRED) \ -DMAC_OS_X_VERSION_MAX_ALLOWED=$(MAC_OS_X_VERSION_MAX_ALLOWED) \ -DMACOSX_SDK_VERSION=$(MACOSX_SDK_VERSION) \ diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk index 0a58f4cc10b8..6b866b91a530 100644 --- a/solenv/inc/unxmacx.mk +++ b/solenv/inc/unxmacx.mk @@ -47,7 +47,6 @@ CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNO_PTHREAD_PRIORITY $(PROCESSOR_DEFI # done in setsolar/configure now. left here for documentation #MACOSX_DEPLOYMENT_TARGET=10.4 #.EXPORT: MACOSX_DEPLOYMENT_TARGET -CDEFS+:=-DQUARTZ EXTRA_CDEFS+:=-DMAC_OS_X_VERSION_MIN_REQUIRED=$(MAC_OS_X_VERSION_MIN_REQUIRED) -DMAC_OS_X_VERSION_MAX_ALLOWED=$(MAC_OS_X_VERSION_MAX_ALLOWED) -DMACOSX_SDK_VERSION=$(MACOSX_SDK_VERSION) 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 } diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx index 2283eedd0785..2c055363c57a 100644 --- a/sw/source/core/text/itrform2.cxx +++ b/sw/source/core/text/itrform2.cxx @@ -2601,7 +2601,7 @@ namespace { // step back two positions for smoother repaint nReformat -= 2; - #ifndef QUARTZ + #ifndef MACOSX #ifndef ENABLE_GRAPHITE // #i28795#, #i34607#, #i38388# // step back six(!) more characters for complex scripts diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index 883cb77206c8..8d8d333f830a 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -1223,7 +1223,7 @@ sal_Bool ViewShell::SmoothScroll( long lXDiff, long lYDiff, const Rectangle *pRe const bool bOnlyYScroll(!lXDiff && Abs(lYDiff) != 0 && Abs(lYDiff) < lMax); const bool bAllowedWithChildWindows(GetWin()->GetWindowClipRegionPixel(WINDOW_GETCLIPREGION_NOCHILDREN|WINDOW_GETCLIPREGION_NULL).IsNull()); // --> OD 2009-08-12 #i98766# - disable smooth scrolling for Mac port builds -#ifdef QUARTZ +#ifdef MACOSX const bool bSmoothScrollAllowed(false); (void) bOnlyYScroll; (void) bAllowedWithChildWindows; diff --git a/toolkit/source/awt/vclxsystemdependentwindow.cxx b/toolkit/source/awt/vclxsystemdependentwindow.cxx index 7b26d7877bf3..d05eacfe0954 100644 --- a/toolkit/source/awt/vclxsystemdependentwindow.cxx +++ b/toolkit/source/awt/vclxsystemdependentwindow.cxx @@ -19,7 +19,7 @@ #include -#if defined UNX && ! defined QUARTZ && ! defined _COM_SUN_STAR_AWT_SYSTEMDEPENDENTXWINDOW_HPP_ +#if defined UNX && ! defined MACOSX && ! defined _COM_SUN_STAR_AWT_SYSTEMDEPENDENTXWINDOW_HPP_ #include #endif @@ -27,7 +27,7 @@ #include #include -#ifdef QUARTZ +#ifdef MACOSX #include "premac.h" #include #include "postmac.h" @@ -85,7 +85,7 @@ IMPL_XTYPEPROVIDER_END { aRet <<= (sal_Int32)pSysData->hWnd; } -#elif (defined QUARTZ) +#elif (defined MACOSX) if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_MAC ) { aRet <<= (sal_IntPtr)pSysData->pView; diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 38960e2aa06e..527188b0efdb 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -47,7 +47,7 @@ #include #include -#ifdef QUARTZ +#ifdef MACOSX #include "premac.h" #include #include "postmac.h" @@ -129,7 +129,7 @@ using org::libreoffice::touch::ByteBufferWrapper; #if (defined WNT) #define SYSTEM_DEPENDENT_TYPE ::com::sun::star::lang::SystemDependent::SYSTEM_WIN32 -#elif (defined QUARTZ) +#elif (defined MACOSX) #define SYSTEM_DEPENDENT_TYPE ::com::sun::star::lang::SystemDependent::SYSTEM_MAC #elif (defined UNX) #define SYSTEM_DEPENDENT_TYPE ::com::sun::star::lang::SystemDependent::SYSTEM_XWINDOW @@ -939,7 +939,7 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, { SystemParentData aParentData; aParentData.nSize = sizeof( aParentData ); - #if defined QUARTZ + #if defined MACOSX aParentData.pView = reinterpret_cast(nWindowHandle); #elif defined IOS aParentData.pView = reinterpret_cast(nWindowHandle); @@ -1186,7 +1186,7 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow( { SystemParentData aParentData; aParentData.nSize = sizeof( aParentData ); - #if defined QUARTZ + #if defined MACOSX aParentData.pView = reinterpret_cast(nWindowHandle); #elif defined IOS aParentData.pView = reinterpret_cast(nWindowHandle); diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx index 462a5682184d..dc80565b1eaa 100644 --- a/toolkit/source/awt/vclxtopwindow.cxx +++ b/toolkit/source/awt/vclxtopwindow.cxx @@ -20,7 +20,7 @@ #include #include -#if defined ( QUARTZ ) +#if defined ( MACOSX ) #include "premac.h" #include #include "postmac.h" @@ -97,7 +97,7 @@ Sequence< Type > VCLXTopWindow_Base::getTypes() throw(RuntimeException) { aRet <<= (sal_Int32)pSysData->hWnd; } -#elif (defined QUARTZ) +#elif (defined MACOSX) if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_MAC ) { aRet <<= (sal_IntPtr)pSysData->pView; diff --git a/toolkit/source/awt/vclxwindow1.cxx b/toolkit/source/awt/vclxwindow1.cxx index f38a95cb6dda..c937d3c035a9 100644 --- a/toolkit/source/awt/vclxwindow1.cxx +++ b/toolkit/source/awt/vclxwindow1.cxx @@ -28,7 +28,7 @@ #ifdef WNT #include #include -#elif defined ( QUARTZ ) +#elif defined ( MACOSX ) #include "premac.h" #include #include "postmac.h" @@ -87,7 +87,7 @@ void VCLXWindow::SetSystemParent_Impl( const com::sun::star::uno::Any& rHandle ) aSysParentData.nSize = sizeof ( SystemParentData ); #if defined( WNT ) aSysParentData.hWnd = (HWND) nHandle; -#elif defined( QUARTZ ) +#elif defined( MACOSX ) aSysParentData.pView = reinterpret_cast(nHandle); #elif defined( IOS ) aSysParentData.pView = reinterpret_cast(nHandle); diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx index 6800e01ed506..a55cb21ab43f 100644 --- a/vcl/generic/print/genprnpsp.cxx +++ b/vcl/generic/print/genprnpsp.cxx @@ -68,7 +68,7 @@ using ::rtl::OUStringToOString; * static helpers */ -#if defined( UNX ) && !( defined( QUARTZ ) || defined( IOS ) || defined( ANDROID ) ) +#if defined( UNX ) && !( defined( MACOSX ) || defined( IOS ) || defined( ANDROID ) ) static oslModule driverLib = NULL; #endif extern "C" @@ -100,7 +100,7 @@ static rtl::OUString getPdfDir( const PrinterInfo& rInfo ) static void getPaLib() { -#if defined( UNX ) && !( defined( QUARTZ ) || defined( IOS ) || defined( ANDROID ) ) +#if defined( UNX ) && !( defined( MACOSX ) || defined( IOS ) || defined( ANDROID ) ) if( ! driverLib ) { OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( _XSALSET_LIBNAME ) ); diff --git a/vcl/inc/svsys.h b/vcl/inc/svsys.h index dce82ce1f913..0614ccccde4c 100644 --- a/vcl/inc/svsys.h +++ b/vcl/inc/svsys.h @@ -22,7 +22,7 @@ #ifdef WNT #include "win/svsys.h" -#elif defined QUARTZ +#elif defined MACOSX #include "aqua/svsys.h" #elif defined OS2 #include "os2/svsys.h" diff --git a/vcl/inc/vcl/bitmap.hxx b/vcl/inc/vcl/bitmap.hxx index ea52068160c9..7e1fced00998 100644 --- a/vcl/inc/vcl/bitmap.hxx +++ b/vcl/inc/vcl/bitmap.hxx @@ -321,7 +321,7 @@ struct BitmapSystemData #if defined( WNT ) void* pDIB; // device independent byte buffer void* pDDB; // if not NULL then this is actually an HBITMAP - #elif defined( QUARTZ ) || defined( IOS ) + #elif defined( MACOSX ) || defined( IOS ) void* rImageContext; //Image context (CGContextRef) #else void* aPixmap; diff --git a/vcl/inc/vcl/sysdata.hxx b/vcl/inc/vcl/sysdata.hxx index bf5f337e6d87..b032a0401ddd 100644 --- a/vcl/inc/vcl/sysdata.hxx +++ b/vcl/inc/vcl/sysdata.hxx @@ -23,7 +23,7 @@ #include #include -#ifdef QUARTZ +#ifdef MACOSX // predeclare the native classes to avoid header/include problems typedef struct CGContext *CGContextRef; typedef struct CGLayer *CGLayerRef; @@ -65,7 +65,7 @@ struct SystemEnvData unsigned long nSize; // size in bytes of this structure #if defined( WNT ) HWND hWnd; // the window hwnd -#elif defined( QUARTZ ) +#elif defined( MACOSX ) NSView* pView; // the cocoa (NSView *) implementing this object #elif defined( IOS ) UIView* pView; // the CocoaTouch (UIView *) implementing this object @@ -95,7 +95,7 @@ struct SystemParentData unsigned long nSize; // size in bytes of this structure #if defined( WNT ) HWND hWnd; // the window hwnd -#elif defined( QUARTZ ) +#elif defined( MACOSX ) NSView* pView; // the cocoa (NSView *) implementing this object #elif defined( IOS ) UIView* pView; // the CocoaTouch (UIView *) implementing this object @@ -115,7 +115,7 @@ struct SystemMenuData unsigned long nSize; // size in bytes of this structure #if defined( WNT ) HMENU hMenu; // the menu handle of the menu bar -#elif defined( QUARTZ ) +#elif defined( MACOSX ) //not defined #elif defined( UNX ) long aMenu; // ??? @@ -131,7 +131,7 @@ struct SystemGraphicsData unsigned long nSize; // size in bytes of this structure #if defined( WNT ) HDC hDC; // handle to a device context -#elif defined( QUARTZ ) || defined( IOS ) +#elif defined( MACOSX ) || defined( IOS ) CGContextRef rCGContext; // CoreGraphics graphic context #elif defined( UNX ) void* pDisplay; // the relevant display connection @@ -146,7 +146,7 @@ struct SystemGraphicsData : nSize( sizeof( SystemGraphicsData ) ) #if defined( WNT ) , hDC( 0 ) -#elif defined( QUARTZ ) || defined( IOS ) +#elif defined( MACOSX ) || defined( IOS ) #elif defined( UNX ) , pDisplay( NULL ) , hDrawable( 0 ) @@ -168,7 +168,7 @@ struct SystemWindowData { unsigned long nSize; // size in bytes of this structure #if defined( WNT ) // meaningless on Windows -#elif defined( QUARTZ ) // meaningless on Mac OS X / Quartz +#elif defined( MACOSX ) // meaningless on Mac OS X #elif defined( IOS ) // and maybe on iOS, too, then #elif defined( UNX ) void* pVisual; // the visual to be used @@ -197,7 +197,7 @@ struct SystemFontData unsigned long nSize; // size in bytes of this structure #if defined( WNT ) HFONT hFont; // native font object -#elif defined( QUARTZ ) +#elif defined( MACOSX ) #ifdef ENABLE_CORETEXT void* rCTFont; #else @@ -218,7 +218,7 @@ struct SystemFontData : nSize( sizeof( SystemFontData ) ) #if defined( WNT ) , hFont( 0 ) -#elif defined( QUARTZ ) +#elif defined( MACOSX ) #ifdef ENABLE_CORETEXT #else , aATSUFontID( NULL ) diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx index 9285c96b606b..88242e5e8849 100644 --- a/vcl/source/components/dtranscomp.cxx +++ b/vcl/source/components/dtranscomp.cxx @@ -271,7 +271,7 @@ OUString SAL_CALL Clipboard_getImplementationName() { #if defined UNX return OUString( - #if ! defined QUARTZ + #if ! defined MACOSX "com.sun.star.datatransfer.X11ClipboardSupport" #else "com.sun.star.datatransfer.clipboard.AquaClipboard" @@ -361,7 +361,7 @@ Sequence< OUString > SAL_CALL DragSource_getSupportedServiceNames() { #if defined UNX OUString aServiceName( - #if ! defined QUARTZ + #if ! defined MACOSX "com.sun.star.datatransfer.dnd.X11DragSource" #else "com.sun.star.datatransfer.dnd.OleDragSource" @@ -377,7 +377,7 @@ OUString SAL_CALL DragSource_getImplementationName() { #if defined UNX return OUString( - #if ! defined QUARTZ + #if ! defined MACOSX "com.sun.star.datatransfer.dnd.XdndSupport" #else "com.sun.star.comp.datatransfer.dnd.OleDragSource_V1" @@ -475,7 +475,7 @@ Sequence< OUString > SAL_CALL DropTarget_getSupportedServiceNames() { #if defined UNX OUString aServiceName( - #if ! defined QUARTZ + #if ! defined MACOSX "com.sun.star.datatransfer.dnd.X11DropTarget" #else "com.sun.star.datatransfer.dnd.OleDropTarget" @@ -491,7 +491,7 @@ OUString SAL_CALL DropTarget_getImplementationName() { #if defined UNX return OUString( - #if ! defined QUARTZ + #if ! defined MACOSX "com.sun.star.datatransfer.dnd.XdndDropTarget" #else "com.sun.star.comp.datatransfer.dnd.OleDropTarget_V1" diff --git a/vcl/source/gdi/outdev6.cxx b/vcl/source/gdi/outdev6.cxx index 46eb689356ff..4341a1ed2a80 100644 --- a/vcl/source/gdi/outdev6.cxx +++ b/vcl/source/gdi/outdev6.cxx @@ -259,7 +259,7 @@ void OutputDevice::DrawTransparent( const PolyPolygon& rPolyPoly, // try hard to draw it directly, because the emulation layers are slower if( !pDisableNative && mpGraphics->supportsOperation( OutDevSupport_B2DDraw ) -#if defined UNX && ! defined QUARTZ +#if defined UNX && ! defined MACOSX && GetBitCount() > 8 #endif #ifdef WIN32 diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 3542ee4ce438..fa827ecbe6a6 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -1142,7 +1142,7 @@ void Menu::Select() } } -#if defined(QUARTZ) +#if defined(MACOSX) void Menu::ImplSelectWithStart( Menu* pSMenu ) { Menu* pOldStartedFrom = pStartedFrom; diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx index 56f6cca4d854..5bd71f54f913 100644 --- a/vcl/source/window/syschild.cxx +++ b/vcl/source/window/syschild.cxx @@ -220,7 +220,7 @@ sal_IntPtr SystemChildWindow::GetParentWindowHandle( sal_Bool bUseJava ) #if defined WNT nRet = reinterpret_cast< sal_IntPtr >( GetSystemData()->hWnd ); (void)bUseJava; -#elif defined QUARTZ +#elif defined MACOSX // FIXME: this is wrong nRet = reinterpret_cast< sal_IntPtr >( GetSystemData()->pView ); (void)bUseJava; @@ -313,7 +313,6 @@ sal_IntPtr SystemChildWindow::GetParentWindowHandle( sal_Bool bUseJava ) } } #endif // SOLAR_JAVA -#else // WNT || QUARTZ || UNX #endif return nRet; diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index d935f359821e..f4f6f3deda86 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -8355,7 +8355,7 @@ uno::Reference< XDragSource > Window::GetDragSource() aDropTargetSN = OUString("com.sun.star.datatransfer.dnd.OleDropTarget"); aDragSourceAL[ 1 ] = makeAny( (sal_uInt32) pEnvData->hWnd ); aDropTargetAL[ 0 ] = makeAny( (sal_uInt32) pEnvData->hWnd ); -#elif defined QUARTZ +#elif defined MACOSX /* FIXME: Mac OS X specific dnd interface does not exist! * * Using Windows based dnd as a temporary solution */ aDragSourceSN = OUString("com.sun.star.datatransfer.dnd.OleDragSource"); @@ -8433,7 +8433,7 @@ uno::Reference< XClipboard > Window::GetClipboard() if( !mpWindowImpl->mpFrameData->mxClipboard.is() ) mpWindowImpl->mpFrameData->mxClipboard = uno::Reference< XClipboard >( xFactory->createInstance( OUString("com.sun.star.datatransfer.clipboard.SystemClipboard") ), UNO_QUERY ); -#if defined(UNX) && !defined(QUARTZ) // unix clipboard needs to be initialized +#if defined(UNX) && !defined(MACOSX) // unix clipboard needs to be initialized if( mpWindowImpl->mpFrameData->mxClipboard.is() ) { uno::Reference< XInitialization > xInit = uno::Reference< XInitialization >( mpWindowImpl->mpFrameData->mxClipboard, UNO_QUERY ); @@ -8479,7 +8479,7 @@ uno::Reference< XClipboard > Window::GetPrimarySelection() { uno::Reference< XMultiServiceFactory > xFactory( comphelper::getProcessServiceFactory() ); -#if defined(UNX) && !defined(QUARTZ) +#if defined(UNX) && !defined(MACOSX) Sequence< Any > aArgumentList( 3 ); aArgumentList[ 0 ] = makeAny( Application::GetDisplayConnection() ); aArgumentList[ 1 ] = makeAny( OUString("PRIMARY") ); -- cgit