diff options
-rw-r--r-- | starmath/source/view.cxx | 2 | ||||
-rw-r--r-- | starmath/util/makefile.mk | 3 | ||||
-rw-r--r-- | sw/prj/d.lst | 1 | ||||
-rw-r--r-- | sw/source/ui/uiview/pview.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/uiview/srcview.cxx | 8 | ||||
-rw-r--r-- | sw/source/ui/uiview/view0.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/vba/service.cxx | 6 | ||||
-rw-r--r-- | sw/source/ui/web/wview.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/wrtsh/wrtundo.cxx | 11 | ||||
-rw-r--r-- | sw/util/makefile.mk | 7 |
10 files changed, 23 insertions, 21 deletions
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index 855831fc9e9f..233054cfe35b 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -752,7 +752,7 @@ SFX_IMPL_INTERFACE(SmViewShell, SfxViewShell, SmResId(0)) } -SFX_IMPL_VIEWFACTORY(SmViewShell, SmResId(RID_VIEWNAME)) +SFX_IMPL_VIEWFACTORY(SmViewShell) { SFX_VIEW_REGISTRATION(SmDocShell); } diff --git a/starmath/util/makefile.mk b/starmath/util/makefile.mk index 978cb6cff40c..50ef998b984a 100644 --- a/starmath/util/makefile.mk +++ b/starmath/util/makefile.mk @@ -46,8 +46,7 @@ GEN_HID_OTHER=TRUE RESLIB1NAME=sm RESLIB1IMAGES=$(PRJ)$/res RESLIB1SRSFILES=\ - $(SRS)$/smres.srs \ - $(SOLARCOMMONRESDIR)$/sfx.srs + $(SRS)$/smres.srs SHL1TARGET= sm$(DLLPOSTFIX) SHL1IMPLIB= smimp diff --git a/sw/prj/d.lst b/sw/prj/d.lst index 958771dad257..ed58b3140762 100644 --- a/sw/prj/d.lst +++ b/sw/prj/d.lst @@ -66,6 +66,7 @@ mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swreport\statusbar ..\%__SRC%\bin\vbaswobj*.dll %_DEST%\bin%_EXT%\vbaswobj*.dll ..\%__SRC%\bin\sw*.res %_DEST%\bin%_EXT%\sw*.res ..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.* +..\%__SRC%\lib\vbaswobj* %_DEST%\lib%_EXT%\vbaswobj* ..\uiconfig\swriter\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swriter\menubar\*.xml ..\uiconfig\swxform\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swxform\menubar\*.xml diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx index d7cc7936958b..3e8ce79ae2fb 100644 --- a/sw/source/ui/uiview/pview.cxx +++ b/sw/source/ui/uiview/pview.cxx @@ -111,7 +111,7 @@ using namespace ::com::sun::star; -SFX_IMPL_VIEWFACTORY(SwPagePreView, SW_RES(STR_NONAME)) +SFX_IMPL_VIEWFACTORY(SwPagePreView) { SFX_VIEW_REGISTRATION(SwDocShell); SFX_VIEW_REGISTRATION(SwWebDocShell); diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx index 26a1253c5486..716164348aa8 100644 --- a/sw/source/ui/uiview/srcview.cxx +++ b/sw/source/ui/uiview/srcview.cxx @@ -52,6 +52,8 @@ #include <svl/whiter.hxx> #include <unotools/saveopt.hxx> #include <svtools/transfer.hxx> +#include <svl/svtools.hrc> +#include <svtools/svtdata.hxx> #include <svx/htmlcfg.hxx> #include <sfx2/app.hxx> @@ -130,7 +132,7 @@ using ::com::sun::star::util::SearchOptions; -SFX_IMPL_VIEWFACTORY(SwSrcView, SW_RES(STR_NONAME)) +SFX_IMPL_VIEWFACTORY(SwSrcView) { SFX_VIEW_REGISTRATION(SwWebDocShell); } @@ -566,7 +568,7 @@ void SwSrcView::GetState(SfxItemSet& rSet) nCount = rMgr.GetUndoActionCount(); if(nCount) { - String aStr(ResId( STR_UNDO, *SFX_APP()->GetSfxResManager() ));; + String aStr(SvtResId( STR_UNDO));; aStr += rMgr.GetUndoActionComment(--nCount); rSet.Put(SfxStringItem(nWhich, aStr)); } @@ -578,7 +580,7 @@ void SwSrcView::GetState(SfxItemSet& rSet) nCount = rMgr.GetRedoActionCount(); if(nCount) { - String aStr(ResId( STR_REDO, *SFX_APP()->GetSfxResManager() ));; + String aStr(SvtResId( STR_REDO));; aStr += rMgr.GetRedoActionComment(--nCount); rSet.Put(SfxStringItem(nWhich,aStr)); } diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx index 73c401f2bcb6..2d0b7f340f51 100644 --- a/sw/source/ui/uiview/view0.cxx +++ b/sw/source/ui/uiview/view0.cxx @@ -106,7 +106,7 @@ using ::rtl::OUString; #include <unomid.h> -SFX_IMPL_VIEWFACTORY(SwView, SW_RES(STR_NONAME)) +SFX_IMPL_VIEWFACTORY(SwView) { if ( SvtModuleOptions().IsWriter() ) { diff --git a/sw/source/ui/vba/service.cxx b/sw/source/ui/vba/service.cxx index 20b93a45a2ce..e7532cee443c 100644 --- a/sw/source/ui/vba/service.cxx +++ b/sw/source/ui/vba/service.cxx @@ -57,14 +57,14 @@ extern sdecl::ServiceDecl const serviceDecl; extern "C" { - void SAL_CALL component_getImplementationEnvironment( + SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { OSL_TRACE("In component_getImplementationEnv"); *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - sal_Bool SAL_CALL component_writeInfo( + SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) { OSL_TRACE("In component_writeInfo"); @@ -74,7 +74,7 @@ extern "C" globals::serviceDecl, document::serviceDecl, wrapformat::serviceDecl ); } - void * SAL_CALL component_getFactory( + SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) { diff --git a/sw/source/ui/web/wview.cxx b/sw/source/ui/web/wview.cxx index 34ccd8f72378..d24fdfbfe9ab 100644 --- a/sw/source/ui/web/wview.cxx +++ b/sw/source/ui/web/wview.cxx @@ -96,7 +96,7 @@ #include <swslots.hxx> -SFX_IMPL_VIEWFACTORY(SwWebView, SW_RES(STR_NONAME)) +SFX_IMPL_VIEWFACTORY(SwWebView) { SFX_VIEW_REGISTRATION(SwWebDocShell); } diff --git a/sw/source/ui/wrtsh/wrtundo.cxx b/sw/source/ui/wrtsh/wrtundo.cxx index 8a1a011988b3..39ac134420db 100644 --- a/sw/source/ui/wrtsh/wrtundo.cxx +++ b/sw/source/ui/wrtsh/wrtundo.cxx @@ -40,10 +40,11 @@ #include <wrtsh.hxx> #include <swundo.hxx> // fuer Undo-Ids #include <swdtflvr.hxx> - -#ifndef _WRTSH_HRC +#include <svl/svtools.hrc> +#include <svtools/svtdata.hxx> +#include <svl/svtools.hrc> +#include <svtools/svtdata.hxx> #include <wrtsh.hrc> -#endif #include <sfx2/sfx.hrc> @@ -131,7 +132,7 @@ String SwWrtShell::GetDoString( DoType eDoType ) const default:;//prevent warning } - aStr.Insert( String(ResId( nResStr, *SFX_APP()->GetSfxResManager())), 0 ); + aStr.Insert( String( SvtResId( nResStr)), 0 ); aStr += aUndoStr; return aStr; @@ -175,7 +176,7 @@ String SwWrtShell::GetRepeatString() const if (aUndoStr.Len() > 0) { - aStr.Insert( ResId( STR_REPEAT, *SFX_APP()->GetSfxResManager()), 0 ); + aStr.Insert( SvtResId( STR_REPEAT ), 0 ); aStr += aUndoStr; } diff --git a/sw/util/makefile.mk b/sw/util/makefile.mk index 08afadc10698..cf8b8f176e45 100644 --- a/sw/util/makefile.mk +++ b/sw/util/makefile.mk @@ -68,8 +68,7 @@ sw_res_files= \ $(SRS)$/unocore.srs \ $(SRS)$/utlui.srs \ $(SRS)$/web.srs \ - $(SRS)$/wrtsh.srs \ - $(SOLARCOMMONRESDIR)$/sfx.srs + $(SRS)$/wrtsh.srs RESLIB1NAME=sw RESLIB1IMAGES=$(PRJ)$/imglst $(PRJ)$/res @@ -342,9 +341,9 @@ SHL4STDLIBS= \ #target vba TARGET_VBA=vbaswobj -SHL5TARGET=$(TARGET_VBA)$(DLLPOSTFIX).uno +SHL5TARGET=$(TARGET_VBA).uno SHL5IMPLIB= i$(TARGET_VBA) - +SHL5DLLPRE= SHL5VERSIONMAP=$(TARGET_VBA).map SHL5DEF=$(MISC)$/$(SHL5TARGET).def DEF5NAME=$(SHL5TARGET) |