From 6f6f7a17dc82248446dc4eddfd51af08362fc352 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 26 Sep 2012 23:45:28 +0200 Subject: gbuild: split uwinapi out of gb_STDLIBS Change-Id: I53316e0b9369d806197bccb42cf22d3497af43e7 --- sfx2/CppunitTest_sfx2_metadatable.mk | 1 + sfx2/Library_qstart.mk | 1 + sfx2/Library_sfx.mk | 1 + 3 files changed, 3 insertions(+) (limited to 'sfx2') diff --git a/sfx2/CppunitTest_sfx2_metadatable.mk b/sfx2/CppunitTest_sfx2_metadatable.mk index ae2132d05915..6c1d68d8c189 100644 --- a/sfx2/CppunitTest_sfx2_metadatable.mk +++ b/sfx2/CppunitTest_sfx2_metadatable.mk @@ -28,6 +28,7 @@ $(eval $(call gb_CppunitTest_use_sdk_api,sfx2_metadatable)) $(eval $(call gb_CppunitTest_use_libraries,sfx2_metadatable, \ sal \ sfx \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk index ccd254c889f5..12c1812a96b4 100644 --- a/sfx2/Library_qstart.mk +++ b/sfx2/Library_qstart.mk @@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_libraries,qstart_gtk,\ utl \ vcl \ sfx \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index 3ed3a02ce483..5e01c7d01f70 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -67,6 +67,7 @@ $(eval $(call gb_Library_use_libraries,sfx,\ ucbhelper \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) -- cgit From 816ec4b0933e36ac468230365359c3b9d8d52986 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 27 Sep 2012 00:49:12 +0200 Subject: gbuild: replace direct gb_STDLIBS use with ... ... new gb_LinkTarget_add_standard_system_libs Change-Id: Ib2bc843098db3d8c6822b45a3d21724e67f57d69 --- sfx2/CppunitTest_sfx2_metadatable.mk | 3 ++- sfx2/Library_qstart.mk | 3 ++- sfx2/Library_sfx.mk | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'sfx2') diff --git a/sfx2/CppunitTest_sfx2_metadatable.mk b/sfx2/CppunitTest_sfx2_metadatable.mk index 6c1d68d8c189..81706c523065 100644 --- a/sfx2/CppunitTest_sfx2_metadatable.mk +++ b/sfx2/CppunitTest_sfx2_metadatable.mk @@ -29,9 +29,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sfx2_metadatable, \ sal \ sfx \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,sfx2_metadatable)) + $(eval $(call gb_CppunitTest_set_include,sfx2_metadatable,\ $$(INCLUDE) \ )) diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk index 12c1812a96b4..22925b03f315 100644 --- a/sfx2/Library_qstart.mk +++ b/sfx2/Library_qstart.mk @@ -53,9 +53,10 @@ $(eval $(call gb_Library_use_libraries,qstart_gtk,\ vcl \ sfx \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,qstart_gtk)) + $(eval $(call gb_Library_use_externals,qstart_gtk,\ gio \ gtk \ diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index 5e01c7d01f70..23badc19286e 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -68,9 +68,10 @@ $(eval $(call gb_Library_use_libraries,sfx,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sfx)) + $(eval $(call gb_Library_use_external,sfx,libxml2)) $(eval $(call gb_Library_add_exception_objects,sfx,\ -- cgit From ecddbecedccf2bf67e569544854c6fbd1269dd88 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 28 Sep 2012 00:18:12 +0200 Subject: gbuild: clean up Mac OS X framework handling: There are currently 3 different mechanisms being used for frameworks, which is of course intolerable so we invent a 4th one and standardize on it: gb_LinkTarget_use_darwin_frameworks (This doesn't mean using add_libs or externals was wrong, it was just inconsistent... and i don't see an obvious benefit of using externals here) Change-Id: I5de9020402c87e7236c6a358c47f02fa56642d3d --- sfx2/Library_sfx.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'sfx2') diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index 23badc19286e..c384a1b98046 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -280,8 +280,10 @@ ifeq ($(OS),MACOSX) $(eval $(call gb_Library_add_objcxxobjects,sfx,\ sfx2/source/appl/shutdowniconaqua \ )) -$(eval $(call gb_Library_use_libraries,sfx,\ - objc \ +$(eval $(call gb_Library_add_libs,sfx,\ + -lobjc \ +)) +$(eval $(call gb_Library_use_system_darwin_frameworks,sfx,\ Cocoa \ )) endif -- cgit From 8831c592e80288be39a9e5f4d20e617b55682003 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 28 Sep 2012 15:31:46 +0200 Subject: gbuild: gb_Library_PLAINLIBS_NONE cleanup for WNT: add a new gb_LinkTarget_use_system_win32_libs to abstract different linker options on MSVC and GCC. Change-Id: Ic9bf2545f59bf7871e6fc06b290c486ddfbec03d --- sfx2/Library_sfx.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'sfx2') diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index c384a1b98046..1ec228446b2f 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -295,12 +295,12 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/doc/syspathw32 \ )) -$(eval $(call gb_Library_use_libraries,sfx,\ - gdi32 \ - advapi32 \ - ole32 \ - shell32 \ - uuid \ +$(eval $(call gb_Library_use_system_win32_libs,sfx,\ + advapi32 \ + gdi32 \ + ole32 \ + shell32 \ + uuid \ )) endif -- cgit From f011af716e2978cbf9fcb7748dc868c503edddff Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 28 Sep 2012 16:29:24 +0200 Subject: gbuild: invert handling of standard system libraries: Always link in gb_STDLIBS, except when the library explicitly opts out with gb_LinkTarget_disable_standard_system_libs. Change-Id: I489a99114fbfa46d0421a27cf6c7b899dc268a4a --- sfx2/CppunitTest_sfx2_metadatable.mk | 2 -- sfx2/Library_qstart.mk | 2 -- sfx2/Library_sfx.mk | 2 -- 3 files changed, 6 deletions(-) (limited to 'sfx2') diff --git a/sfx2/CppunitTest_sfx2_metadatable.mk b/sfx2/CppunitTest_sfx2_metadatable.mk index 81706c523065..277c56417f1c 100644 --- a/sfx2/CppunitTest_sfx2_metadatable.mk +++ b/sfx2/CppunitTest_sfx2_metadatable.mk @@ -31,8 +31,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sfx2_metadatable, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sfx2_metadatable)) - $(eval $(call gb_CppunitTest_set_include,sfx2_metadatable,\ $$(INCLUDE) \ )) diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk index 22925b03f315..3ecdb9cd263d 100644 --- a/sfx2/Library_qstart.mk +++ b/sfx2/Library_qstart.mk @@ -55,8 +55,6 @@ $(eval $(call gb_Library_use_libraries,qstart_gtk,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,qstart_gtk)) - $(eval $(call gb_Library_use_externals,qstart_gtk,\ gio \ gtk \ diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index 1ec228446b2f..baf71388e393 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -70,8 +70,6 @@ $(eval $(call gb_Library_use_libraries,sfx,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,sfx)) - $(eval $(call gb_Library_use_external,sfx,libxml2)) $(eval $(call gb_Library_add_exception_objects,sfx,\ -- cgit From f5f06fb016766cc40817f1fcc3feec0b464845b0 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Sat, 29 Sep 2012 17:20:22 +0200 Subject: Use comphelper::getComponentContext ...and some further clean up. Change-Id: Id294c0f38fe0041646fc86cacbd2e19734c746a9 --- sfx2/source/dialog/dockwin.cxx | 15 ++++-------- sfx2/source/doc/doctemplates.cxx | 51 ++++++++++------------------------------ 2 files changed, 18 insertions(+), 48 deletions(-) (limited to 'sfx2') diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index 7106771db298..d95318b00704 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -163,17 +163,12 @@ SfxDockingWrapper::SfxDockingWrapper( Window* pParentWnd , uno::Reference< awt::XWindow > xWindow; try { - uno::Reference< beans::XPropertySet > xProps( xServiceManager, uno::UNO_QUERY ); - uno::Reference< uno::XComponentContext > xContext; + uno::Reference< uno::XComponentContext > xContext( + comphelper::getComponentContext( xServiceManager ) ); - if ( xProps.is() ) - xProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>= xContext; - if ( xContext.is() ) - { - xWindow = uno::Reference< awt::XWindow>( - xFactoryMgr->createInstanceWithArgumentsAndContext( aArgs, xContext ), - uno::UNO_QUERY ); - } + xWindow = uno::Reference< awt::XWindow>( + xFactoryMgr->createInstanceWithArgumentsAndContext( aArgs, xContext ), + uno::UNO_QUERY ); static uno::WeakReference< frame::XModuleManager2 > m_xModuleManager; diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index c7a2fa62d6b5..25ed45909bcc 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -581,29 +581,18 @@ void SfxDocTplService_Impl::getDirList() maTemplateDirs = Sequence< OUString >( nCount ); - uno::Reference< XComponentContext > xCtx; + uno::Reference< XComponentContext > xCtx( + comphelper::getComponentContext( mxFactory ) ); uno::Reference< util::XMacroExpander > xExpander; - uno::Reference< XPropertySet > xPropSet( mxFactory, UNO_QUERY ); const rtl::OUString aPrefix( "vnd.sun.star.expand:" ); - if ( xPropSet.is() ) - { - xPropSet->getPropertyValue( - rtl::OUString( - "DefaultContext" ) ) - >>= xCtx; - } + xCtx->getValueByName( + rtl::OUString( "/singletons/com.sun.star.util.theMacroExpander" ) ) + >>= xExpander; - if ( xCtx.is() ) - { - xCtx->getValueByName( - rtl::OUString( "/singletons/com.sun.star.util.theMacroExpander" ) ) - >>= xExpander; - - OSL_ENSURE( xExpander.is(), - "Unable to obtain macro expander singleton!" ); - } + OSL_ENSURE( xExpander.is(), + "Unable to obtain macro expander singleton!" ); for ( sal_uInt16 i=0; i xCtx; - uno::Reference< XPropertySet > xPropSet( mxFactory, UNO_QUERY ); - if ( xPropSet.is() ) - { - xPropSet->getPropertyValue( - rtl::OUString( - "DefaultContext" ) ) - >>= xCtx; - } - - OSL_ENSURE( xCtx.is(), - "Unable to obtain component context from " - "service manager!" ); + uno::Reference< XComponentContext > xCtx( + comphelper::getComponentContext( mxFactory ) ); - if ( xCtx.is() ) - { - xCtx->getValueByName( - rtl::OUString( - "/singletons/" - "com.sun.star.util.theOfficeInstallationDirectories" ) ) + xCtx->getValueByName( + rtl::OUString( + "/singletons/" + "com.sun.star.util.theOfficeInstallationDirectories" ) ) >>= mxOfficeInstDirs; - } OSL_ENSURE( mxOfficeInstDirs.is(), "Unable to obtain office installation directory " -- cgit From 39bac3f6c0a29d4d6ef7d6a636b8204cf12b4866 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Mon, 1 Oct 2012 15:19:10 +0200 Subject: translations is a source-only module Change-Id: I9fcddfcdfa2d60860a7b016dbb870a3b6e8f3ea4 --- sfx2/prj/build.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sfx2') diff --git a/sfx2/prj/build.lst b/sfx2/prj/build.lst index e56d8946fece..7a97de18b158 100644 --- a/sfx2/prj/build.lst +++ b/sfx2/prj/build.lst @@ -1,2 +1,2 @@ -sf sfx2 : TRANSLATIONS:translations NATIVE:idl basic xmlscript framework readlicense_oo shell sax LIBXML2:libxml2 LIBXSLT:libxslt NULL +sf sfx2 : NATIVE:idl basic xmlscript framework readlicense_oo shell sax LIBXML2:libxml2 LIBXSLT:libxslt NULL sf sfx2\prj nmake - all sf_prj NULL -- cgit