diff options
-rw-r--r-- | sfx2/AllLangResTarget_sfx2.mk | 1 | ||||
-rw-r--r-- | sfx2/source/appl/app.cxx | 9 | ||||
-rw-r--r-- | sfx2/source/appl/appinit.cxx | 9 | ||||
-rw-r--r-- | sfx2/source/appl/appserv.cxx | 13 | ||||
-rwxr-xr-x[-rw-r--r--] | sfx2/source/dialog/sfxdlg.cxx | 2 |
5 files changed, 9 insertions, 25 deletions
diff --git a/sfx2/AllLangResTarget_sfx2.mk b/sfx2/AllLangResTarget_sfx2.mk index 6148e23a5b35..aa3270e08a07 100644 --- a/sfx2/AllLangResTarget_sfx2.mk +++ b/sfx2/AllLangResTarget_sfx2.mk @@ -69,6 +69,7 @@ $(eval $(call gb_SrsTarget_add_files,sfx/res,\ sfx2/source/doc/doc.src \ sfx2/source/doc/doctdlg.src \ sfx2/source/doc/doctempl.src \ + sfx2/source/doc/docvor.src \ sfx2/source/doc/graphhelp.src \ sfx2/source/doc/new.src \ sfx2/source/menu/menu.src \ diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 0ebd2dd782aa..4a1586175e15 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -112,6 +112,7 @@ #include "sfx2/stbitem.hxx" #include "eventsupplier.hxx" #include <sfx2/dockwin.hxx> +#include <tools/svlibrary.hxx>
#ifdef DBG_UTIL #include <sfx2/tbxctrl.hxx> @@ -725,9 +726,7 @@ extern "C" { static void SAL_CALL thisModule() {} } IMPL_LINK( SfxApplication, GlobalBasicErrorHdl_Impl, StarBASIC*, pStarBasic ) { // get basctl dllname - String sLibName = String::CreateFromAscii( STRING( DLL_NAME ) ); - sLibName.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "sfx" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "basctl" ) ) ); - ::rtl::OUString aLibName( sLibName ); + static ::rtl::OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( SVLIBRARY( "basctl" ) ) );
// load module oslModule handleMod = osl_loadModuleRelative( @@ -816,9 +815,7 @@ SfxApplication::ChooseScript() void SfxApplication::MacroOrganizer( INT16 nTabId ) { // get basctl dllname - String sLibName = String::CreateFromAscii( STRING( DLL_NAME ) ); - sLibName.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "sfx" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "basctl" ) ) ); - ::rtl::OUString aLibName( sLibName ); + static ::rtl::OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( SVLIBRARY( "basctl" ) ) );
// load module oslModule handleMod = osl_loadModuleRelative( diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index ddec7341f4c5..2aa19901d87c 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -65,9 +65,6 @@ #include <rtl/logfile.hxx> #include <vcl/edit.hxx> -#ifndef GCC -#endif - #include <sfx2/unoctitm.hxx> #include "app.hrc" #include "sfxlocal.hrc" @@ -89,6 +86,7 @@ #include <sfx2/fcontnr.hxx> #include "helper.hxx" // SfxContentHelper::Kill() #include "sfxpicklist.hxx" +#include <tools/svlibrary.hxx>
#ifdef UNX #define stricmp(a,b) strcmp(a,b) @@ -215,10 +213,7 @@ String GetSpecialCharsForEdit(Window* pParent, const Font& rFont) { bDetermineFunction = true; - String sLibName = String::CreateFromAscii( STRING( DLL_NAME ) ); - sLibName.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "sfx" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "cui" ) ) ); - - rtl::OUString aLibName( sLibName ); + static ::rtl::OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( SVLIBRARY( "cui" ) ) );
oslModule handleMod = osl_loadModuleRelative( &thisModule, aLibName.pData, 0 ); diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index d323fc91a395..c1858c5b33fb 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sfx2.hxx" #include <com/sun/star/uno/Reference.hxx> -#ifndef _COM_SUN_STAR_LANG_XMultiServiceFactory_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/frame/DispatchResultEvent.hpp> #include <com/sun/star/frame/DispatchResultState.hpp> @@ -40,9 +38,7 @@ #include <com/sun/star/frame/XDispatchHelper.hpp> #include <com/sun/star/frame/XFramesSupplier.hpp> #include <com/sun/star/util/XCloseable.hpp> -#ifndef _COM_SUN_STAR_UTIL_CloseVetoException_HPP_ #include <com/sun/star/util/CloseVetoException.hpp> -#endif #include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/document/XEmbeddedScripts.hpp> #include <com/sun/star/embed/XStorage.hpp> @@ -133,6 +129,7 @@ #include <sfx2/dialogs.hrc> #include "sorgitm.hxx" #include "sfx2/sfxhelp.hxx" +#include <tools/svlibrary.hxx>
using namespace ::com::sun::star; using namespace ::com::sun::star::beans; @@ -749,9 +746,7 @@ extern "C" { static void SAL_CALL thisModule() {} } ::rtl::OUString ChooseMacro( const Reference< XModel >& rxLimitToDocument, BOOL bChooseOnly, const ::rtl::OUString& rMacroDesc = ::rtl::OUString() ) { // get basctl dllname - String sLibName = String::CreateFromAscii( STRING( DLL_NAME ) ); - sLibName.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "sfx" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "basctl" ) ) ); - ::rtl::OUString aLibName( sLibName ); + static ::rtl::OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( SVLIBRARY( "basctl" ) ) );
// load module oslModule handleMod = osl_loadModuleRelative( @@ -771,9 +766,7 @@ extern "C" { static void SAL_CALL thisModule() {} } void MacroOrganizer( INT16 nTabId ) { // get basctl dllname - String sLibName = String::CreateFromAscii( STRING( DLL_NAME ) ); - sLibName.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "sfx" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "basctl" ) ) ); - ::rtl::OUString aLibName( sLibName ); + static ::rtl::OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( SVLIBRARY( "basctl" ) ) );
// load module oslModule handleMod = osl_loadModuleRelative( diff --git a/sfx2/source/dialog/sfxdlg.cxx b/sfx2/source/dialog/sfxdlg.cxx index afad5053a5f7..becab5097ec3 100644..100755 --- a/sfx2/source/dialog/sfxdlg.cxx +++ b/sfx2/source/dialog/sfxdlg.cxx @@ -31,8 +31,6 @@ #include <sfx2/sfxdlg.hxx> //#include "cuilib.hxx" -#define DLL_NAME "libcuili.so" - #include <osl/module.hxx> #include <tools/string.hxx> |