diff options
| -rw-r--r-- | basctl/source/basicide/basidesh.cxx | 2 | ||||
| -rw-r--r-- | basctl/util/makefile.mk | 2 | ||||
| -rw-r--r-- | cui/source/customize/acccfg.cxx | 4 | ||||
| -rw-r--r-- | cui/source/customize/acccfg.src | 4 |
4 files changed, 4 insertions, 8 deletions
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx index 2d2e0f6a5693..cd3d129081e1 100644 --- a/basctl/source/basicide/basidesh.cxx +++ b/basctl/source/basicide/basidesh.cxx @@ -90,7 +90,7 @@ using ::rtl::OUString; TYPEINIT1( BasicIDEShell, SfxViewShell ); -SFX_IMPL_VIEWFACTORY( BasicIDEShell, IDEResId( SVX_INTERFACE_BASIDE_VIEWSH ) ) +SFX_IMPL_VIEWFACTORY( BasicIDEShell ) { SFX_VIEW_REGISTRATION( BasicDocShell ); } diff --git a/basctl/util/makefile.mk b/basctl/util/makefile.mk index 0f2a919ff655..70043bd969d9 100644 --- a/basctl/util/makefile.mk +++ b/basctl/util/makefile.mk @@ -94,8 +94,6 @@ SRSFILELIST=\ $(SRS)$/basicide.srs \ $(SRS)$/dlged.srs -SRSFILELIST+= $(SOLARCOMMONRESDIR)$/sfx.srs - RESLIB1NAME=basctl RESLIB1IMAGES =$(PRJ)$/res RESLIB1SRSFILES= $(SRSFILELIST) diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index 8ff50323cc76..3dbdd1424687 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -43,6 +43,7 @@ #include <sfx2/app.hxx> #include <sfx2/filedlghelper.hxx> #include <sfx2/minfitem.hxx> +#include <sfx2/sfxresid.hxx> #include <svl/stritem.hxx> #include "cuires.hrc" @@ -724,7 +725,6 @@ SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( Window* pParent, const SfxIt , aResetButton (this , CUI_RES(BTN_RESET )) , aLoadAccelConfigStr ( CUI_RES( STR_LOADACCELCONFIG ) ) , aSaveAccelConfigStr ( CUI_RES( STR_SAVEACCELCONFIG ) ) - , aFilterAllStr ( CUI_RES( STR_SFX_FILTERNAME_ALL ) ) , aFilterCfgStr ( CUI_RES( STR_FILTERNAME_CFG ) ) , m_bStylesInfoInitialized(sal_False) , m_xGlobal () @@ -733,6 +733,8 @@ SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( Window* pParent, const SfxIt { FreeResource(); + aFilterAllStr = String( SfxResId( STR_SFX_FILTERNAME_ALL ) ); + // install handler functions aChangeButton.SetClickHdl( LINK( this, SfxAcceleratorConfigPage, ChangeHdl )); aRemoveButton.SetClickHdl( LINK( this, SfxAcceleratorConfigPage, RemoveHdl )); diff --git a/cui/source/customize/acccfg.src b/cui/source/customize/acccfg.src index 4c26725a69d9..2f18d497a663 100644 --- a/cui/source/customize/acccfg.src +++ b/cui/source/customize/acccfg.src @@ -195,10 +195,6 @@ TabPage RID_SVXPAGE_KEYBOARD { Text [ en-US ] = "Save Keyboard Configuration" ; }; - String STR_SFX_FILTERNAME_ALL - { - Text [ en-US ] = "All files (*.*)" ; - }; String STR_FILTERNAME_CFG { Text [ en-US ] = "Configuration" ; |