mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CWS gnumake2: move delivered header files from sfx2/inc to sfx2/inc/sfx2; removed unused code; avoid delivering sfx.srs to solver

Browse Source
This commit is contained in:
Mathias Bauer
2010-04-16 23:02:51 +02:00
parent 8a5b599890
commit 930e6cefb6
4 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
basctl/source/basicide/basidesh.cxx
View File

@@ -90,7 +90,7 @@ using ::rtl::OUString;
TYPEINIT1( BasicIDEShell, SfxViewShell ); TYPEINIT1( BasicIDEShell, SfxViewShell );
SFX_IMPL_VIEWFACTORY( BasicIDEShell, IDEResId( SVX_INTERFACE_BASIDE_VIEWSH ) ) SFX_IMPL_VIEWFACTORY( BasicIDEShell )
{ {
SFX_VIEW_REGISTRATION( BasicDocShell ); SFX_VIEW_REGISTRATION( BasicDocShell );
} }

2
basctl/util/makefile.mk
View File

@@ -94,8 +94,6 @@ SRSFILELIST=\
$(SRS)$/basicide.srs \ $(SRS)$/basicide.srs \
$(SRS)$/dlged.srs $(SRS)$/dlged.srs
SRSFILELIST+= $(SOLARCOMMONRESDIR)$/sfx.srs
RESLIB1NAME=basctl RESLIB1NAME=basctl
RESLIB1IMAGES =$(PRJ)$/res RESLIB1IMAGES =$(PRJ)$/res
RESLIB1SRSFILES= $(SRSFILELIST) RESLIB1SRSFILES= $(SRSFILELIST)

4
cui/source/customize/acccfg.cxx
View File

@@ -43,6 +43,7 @@
#include <sfx2/app.hxx> #include <sfx2/app.hxx>
#include <sfx2/filedlghelper.hxx> #include <sfx2/filedlghelper.hxx>
#include <sfx2/minfitem.hxx> #include <sfx2/minfitem.hxx>
#include <sfx2/sfxresid.hxx>
#include <svl/stritem.hxx> #include <svl/stritem.hxx>
#include "cuires.hrc" #include "cuires.hrc"
@@ -724,7 +725,6 @@ SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( Window* pParent, const SfxIt
, aResetButton (this , CUI_RES(BTN_RESET )) , aResetButton (this , CUI_RES(BTN_RESET ))
, aLoadAccelConfigStr ( CUI_RES( STR_LOADACCELCONFIG ) ) , aLoadAccelConfigStr ( CUI_RES( STR_LOADACCELCONFIG ) )
, aSaveAccelConfigStr ( CUI_RES( STR_SAVEACCELCONFIG ) ) , aSaveAccelConfigStr ( CUI_RES( STR_SAVEACCELCONFIG ) )
, aFilterAllStr ( CUI_RES( STR_SFX_FILTERNAME_ALL ) )
, aFilterCfgStr ( CUI_RES( STR_FILTERNAME_CFG ) ) , aFilterCfgStr ( CUI_RES( STR_FILTERNAME_CFG ) )
, m_bStylesInfoInitialized(sal_False) , m_bStylesInfoInitialized(sal_False)
, m_xGlobal () , m_xGlobal ()
@@ -733,6 +733,8 @@ SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( Window* pParent, const SfxIt
{ {
FreeResource(); FreeResource();
aFilterAllStr = String( SfxResId( STR_SFX_FILTERNAME_ALL ) );
// install handler functions // install handler functions
aChangeButton.SetClickHdl( LINK( this, SfxAcceleratorConfigPage, ChangeHdl )); aChangeButton.SetClickHdl( LINK( this, SfxAcceleratorConfigPage, ChangeHdl ));
aRemoveButton.SetClickHdl( LINK( this, SfxAcceleratorConfigPage, RemoveHdl )); aRemoveButton.SetClickHdl( LINK( this, SfxAcceleratorConfigPage, RemoveHdl ));

4
cui/source/customize/acccfg.src
View File

@@ -195,10 +195,6 @@ TabPage RID_SVXPAGE_KEYBOARD
{ {
Text [ en-US ] = "Save Keyboard Configuration" ; Text [ en-US ] = "Save Keyboard Configuration" ;
}; };
String STR_SFX_FILTERNAME_ALL
{
Text [ en-US ] = "All files (*.*)" ;
};
String STR_FILTERNAME_CFG String STR_FILTERNAME_CFG
{ {
Text [ en-US ] = "Configuration" ; Text [ en-US ] = "Configuration" ;