summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorJoseph Powers <jpowers27@cox.net>2010-11-16 19:01:58 -0800
committerJoseph Powers <jpowers27@cox.net>2010-11-16 19:01:58 -0800
commitdf07e0fa0586d2ec9a0d72b00353e4af3510a341 (patch)
tree4a45f55a65a0eb5f9725ba92585cb31110098ce8 /svx
parente80018f8fce130bc7ba6c9bef6b9f927c857afe2 (diff)
HC Cleanup - libs-core
Diffstat (limited to 'svx')
-rw-r--r--svx/source/customshapes/tbxcustomshapes.cxx2
-rw-r--r--svx/source/dialog/docrecovery.cxx2
-rw-r--r--svx/source/form/tbxform.cxx7
-rw-r--r--svx/source/intro/iso.src32
-rw-r--r--svx/source/intro/ooo.src2
-rw-r--r--svx/source/tbxctrls/grafctrl.cxx32
-rw-r--r--svx/source/tbxctrls/tbcontrl.src15
-rw-r--r--svx/source/tbxctrls/tbxalign.cxx4
8 files changed, 41 insertions, 55 deletions
diff --git a/svx/source/customshapes/tbxcustomshapes.cxx b/svx/source/customshapes/tbxcustomshapes.cxx
index 0f9d3c4a14..bcaf8a6f80 100644
--- a/svx/source/customshapes/tbxcustomshapes.cxx
+++ b/svx/source/customshapes/tbxcustomshapes.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index 63a60d8de0..5b8de3935f 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 beb9ec0bb9..d533d9c052 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -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 bc183686dd..be0ec5d20c 100644
--- a/svx/source/intro/iso.src
+++ b/svx/source/intro/iso.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -167,32 +167,4 @@ ImageList RID_SVTOOLS_IMAGELIST_SMALL
X_IMAGE_LIST
};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+// ******************************************************************* EOF
diff --git a/svx/source/intro/ooo.src b/svx/source/intro/ooo.src
index 35c32fed17..6bc1b6219e 100644
--- a/svx/source/intro/ooo.src
+++ b/svx/source/intro/ooo.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index f349b31445..0978976949 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 4df0442823..c0f8874a3b 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...";
diff --git a/svx/source/tbxctrls/tbxalign.cxx b/svx/source/tbxctrls/tbxalign.cxx
index 182c2fcd98..bf1d01592c 100644
--- a/svx/source/tbxctrls/tbxalign.cxx
+++ b/svx/source/tbxctrls/tbxalign.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -102,7 +102,7 @@ SfxPopupWindow* SvxTbxCtlAlign::CreatePopupWindow()
::rtl::OUString SAL_CALL SvxTbxCtlAlign::getSubToolbarName() throw (::com::sun::star::uno::RuntimeException)
{
- // Provide the controlled sub-toolbar name, so we are notified whenever
+ // Provide the controlled sub-toolbar name, so we are notified whenever
// this toolbar executes a function.
SolarMutexGuard aGuard;
return m_aSubTbName;