diff options
author | Joseph Powers <jpowers27@cox.net> | 2010-11-16 19:01:58 -0800 |
---|---|---|
committer | Joseph Powers <jpowers27@cox.net> | 2010-11-16 19:01:58 -0800 |
commit | 7e37ceda28587f513cffcf5430fc9847fdfc5d90 (patch) | |
tree | df25852edef25d7005e4507e209a224185c33046 /svx/source | |
parent | 8458bfa33ce5bf3f98fc9d0a353b956fd4b42617 (diff) |
HC Cleanup - libs-core
Diffstat (limited to 'svx/source')
-rw-r--r-- | svx/source/dialog/docrecovery.cxx | 2 | ||||
-rw-r--r-- | svx/source/form/tbxform.cxx | 5 | ||||
-rw-r--r-- | svx/source/intro/iso.src | 30 | ||||
-rw-r--r-- | svx/source/tbxctrls/grafctrl.cxx | 32 | ||||
-rw-r--r-- | svx/source/tbxctrls/tbcontrl.src | 15 |
5 files changed, 35 insertions, 49 deletions
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index dc19ea73af5e..7f04a119d1f5 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -773,7 +773,6 @@ SaveDialog::SaveDialog(Window* pParent, m_aTitleFT.SetFont(aFont); m_aOkBtn.SetClickHdl( LINK( this, SaveDialog, OKButtonHdl ) ); -// m_aFileListLB.EnableInput( sal_False ); m_aFileListLB.SetControlBackground( rStyleSettings.GetDialogColor() ); // fill listbox with current open documents @@ -846,7 +845,6 @@ SaveProgressDialog::SaveProgressDialog(Window* pParent, FreeResource(); PluginProgress* pProgress = new PluginProgress( &m_aProgrParent, pCore->getSMGR() ); m_xProgress = css::uno::Reference< css::task::XStatusIndicator >(static_cast< css::task::XStatusIndicator* >(pProgress), css::uno::UNO_QUERY_THROW); -// m_aProgrBaseTxt = m_aProgrFT.GetText(); } //=============================================== diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx index 895a09d54f55..96c37148b166 100644 --- a/svx/source/form/tbxform.cxx +++ b/svx/source/form/tbxform.cxx @@ -208,10 +208,7 @@ void SvxFmTbxCtlConfig::StateChanged(USHORT nSID, SfxItemState eState, const Sfx { // set a new image, matching to this slot rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" )); aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlot )); - Image aImage = GetImage( m_xFrame, - aSlotURL, - hasBigImages() ); - + Image aImage = GetImage( m_xFrame, aSlotURL, hasBigImages() ); GetToolBox().SetItemImage( GetId(), aImage ); nLastSlot = nSlot; } diff --git a/svx/source/intro/iso.src b/svx/source/intro/iso.src index 11a3e185771f..b224ea40b760 100644 --- a/svx/source/intro/iso.src +++ b/svx/source/intro/iso.src @@ -167,32 +167,4 @@ ImageList RID_SVTOOLS_IMAGELIST_SMALL X_IMAGE_LIST }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +// ******************************************************************* EOF diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 8267f4ec9951..cd94a9156acd 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -259,13 +259,13 @@ static USHORT ImplGetRID( const OUString& aCommand ) { static const CommandToRID aImplCommandToResMap[] = { - { ".uno:GrafRed", RID_SVXIMG_GRAF_RED }, - { ".uno:GrafGreen", RID_SVXIMG_GRAF_GREEN }, - { ".uno:GrafBlue", RID_SVXIMG_GRAF_BLUE }, - { ".uno:GrafLuminance", RID_SVXIMG_GRAF_LUMINANCE }, - { ".uno:GrafContrast", RID_SVXIMG_GRAF_CONTRAST }, - { ".uno:GrafGamma", RID_SVXIMG_GRAF_GAMMA }, - { ".uno:GrafTransparence", RID_SVXIMG_GRAF_TRANSPARENCE }, + { ".uno:GrafRed", RID_SVXIMG_GRAF_RED }, + { ".uno:GrafGreen", RID_SVXIMG_GRAF_GREEN }, + { ".uno:GrafBlue", RID_SVXIMG_GRAF_BLUE }, + { ".uno:GrafLuminance", RID_SVXIMG_GRAF_LUMINANCE }, + { ".uno:GrafContrast", RID_SVXIMG_GRAF_CONTRAST }, + { ".uno:GrafGamma", RID_SVXIMG_GRAF_GAMMA }, + { ".uno:GrafTransparence", RID_SVXIMG_GRAF_TRANSPARENCE }, { 0, 0 } }; @@ -309,10 +309,14 @@ public: // ----------------------------------------------------------------------------- -ImplGrafControl::ImplGrafControl( Window* pParent, USHORT nSlotId, const rtl::OUString& rCmd, const Reference< XFrame >& rFrame ) : - Control( pParent, WB_TABSTOP ), - maImage ( this ), - maField ( this, rCmd, rFrame ) +ImplGrafControl::ImplGrafControl( + Window* pParent, + USHORT nSlotId, + const rtl::OUString& rCmd, + const Reference< XFrame >& rFrame +) : Control( pParent, WB_TABSTOP ) + , maImage( this ) + , maField( this, rCmd, rFrame ) { ResId aResId( ImplGetRID( rCmd ), DIALOG_MGR() ) ; Image aImage( aResId ); @@ -393,9 +397,9 @@ ImplGrafModeControl::ImplGrafModeControl( Window* pParent, const Reference< XFra { SetSizePixel( Size( 100, 260 ) ); - InsertEntry( SVX_RESSTR( RID_SVXSTR_GRAFMODE_STANDARD ) ); - InsertEntry( SVX_RESSTR( RID_SVXSTR_GRAFMODE_GREYS ) ); - InsertEntry( SVX_RESSTR( RID_SVXSTR_GRAFMODE_MONO ) ); + InsertEntry( SVX_RESSTR( RID_SVXSTR_GRAFMODE_STANDARD ) ); + InsertEntry( SVX_RESSTR( RID_SVXSTR_GRAFMODE_GREYS ) ); + InsertEntry( SVX_RESSTR( RID_SVXSTR_GRAFMODE_MONO ) ); InsertEntry( SVX_RESSTR( RID_SVXSTR_GRAFMODE_WATERMARK ) ); Show(); diff --git a/svx/source/tbxctrls/tbcontrl.src b/svx/source/tbxctrls/tbcontrl.src index f7ea54a2c24e..acdd4586e619 100644 --- a/svx/source/tbxctrls/tbcontrl.src +++ b/svx/source/tbxctrls/tbcontrl.src @@ -40,11 +40,13 @@ Image RID_SVX_RELOAD_NORMAL ImageBitmap = Bitmap { File = "reload.bmp" ; }; MASKCOLOR }; + Image RID_SVX_RELOAD_SPECIAL { ImageBitmap = Bitmap { File = "reloads.bmp" ; }; MASKCOLOR }; + ImageList RID_SVXIL_FRAME { Prefix = "fr"; @@ -52,26 +54,32 @@ ImageList RID_SVXIL_FRAME IdCount = { 12 ; }; MASKCOLOR }; + String RID_SVXSTR_TRANSPARENT { Text [ en-US ] = "No Fill" ; }; String RID_SVXSTR_FILLPATTERN + { Text [ en-US ] = "Pattern" ; }; + String RID_SVXSTR_FRAME { Text [ en-US ] = "Borders" ; }; + String RID_SVXSTR_FRAME_STYLE { Text [ en-US ] = "Border Style" ; }; + String RID_SVXSTR_FRAME_COLOR { Text [ en-US ] = "Border Color" ; }; + ComboBox RID_SVXTBX_STYLE { HelpId = HID_STYLE_LISTBOX ; @@ -83,22 +91,27 @@ ComboBox RID_SVXTBX_STYLE Border = TRUE ; Hide = TRUE ; }; + String RID_SVXSTR_EXTRAS_CHARBACKGROUND { Text [ en-US ] = "Highlighting" ; }; + String RID_SVXSTR_BACKGROUND { Text [ en-US ] = "Background"; }; + String RID_SVXSTR_AUTOMATIC { Text [ en-US ] = "Automatic"; }; + String RID_SVXSTR_PAGES { Text [ en-US ] = "Pages"; }; + Image RID_SVXIMG_GRAF_RED { ImageBitmap = Bitmap { File = "sc10865.bmp" ; }; @@ -134,10 +147,12 @@ Image RID_SVXIMG_GRAF_TRANSPARENCE ImageBitmap = Bitmap { File = "sc10869.bmp" ; }; MASKCOLOR }; + String RID_SVXSTR_CLEARFORM { Text [ en-US ] = "Clear formatting"; }; + String RID_SVXSTR_MORE { Text [ en-US ] = "More..."; |