summaryrefslogtreecommitdiff
path: root/sc/source/ui
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-11-14 13:13:19 +0200
committerNoel Grandin <noel@peralex.com>2013-11-19 10:29:30 +0200
commit2c35fff7eca3a143d28dc75e6a73fe1101d2af77 (patch)
treefb31b64880b06b0e2bd867aa6216ae0259c7c091 /sc/source/ui
parentccc297097891e62489e5d281a4ea128ec6b71361 (diff)
remove most use of RTL_CONSTASCII_USTRINGPARAM macro
This is largely unnecessary when working with OUString Change-Id: I3cf4d68357a43665d01162ef4a2d5346a45da9be
Diffstat (limited to 'sc/source/ui')
-rw-r--r--sc/source/ui/sidebar/AlignmentPropertyPanel.cxx6
-rw-r--r--sc/source/ui/sidebar/CellBorderStylePopup.cxx2
-rw-r--r--sc/source/ui/sidebar/CellLineStylePopup.cxx2
-rw-r--r--sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx6
-rw-r--r--sc/source/ui/unoobj/datauno.cxx2
-rw-r--r--sc/source/ui/vba/vbaworkbook.cxx2
6 files changed, 10 insertions, 10 deletions
diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
index 4e2316a7b07d..9c83b3b9775e 100644
--- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
@@ -105,7 +105,7 @@ void AlignmentPropertyPanel::Initialize()
mpFTLeftIndent->Disable();
mpMFLeftIndent->Disable();
- mpMFLeftIndent->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Left Indent"))); //wj acc
+ mpMFLeftIndent->SetAccessibleName(OUString( "Left Indent")); //wj acc
aLink = LINK(this, AlignmentPropertyPanel, MFLeftIndentMdyHdl);
mpMFLeftIndent->SetModifyHdl ( aLink );
@@ -116,11 +116,11 @@ void AlignmentPropertyPanel::Initialize()
mpCBXWrapText->SetClickHdl ( aLink );
//rotation control
- mpCtrlDial->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Text Orientation"))); //wj acc
+ mpCtrlDial->SetAccessibleName(OUString( "Text Orientation")); //wj acc
mpCtrlDial->SetModifyHdl(LINK( this, AlignmentPropertyPanel, RotationHdl));
//rotation
- mpMtrAngle->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Text Orientation"))); //wj acc
+ mpMtrAngle->SetAccessibleName(OUString( "Text Orientation")); //wj acc
mpMtrAngle->SetModifyHdl(LINK( this, AlignmentPropertyPanel, AngleModifiedHdl));
mpMtrAngle->EnableAutocomplete( false );
diff --git a/sc/source/ui/sidebar/CellBorderStylePopup.cxx b/sc/source/ui/sidebar/CellBorderStylePopup.cxx
index 376e37ab1091..5225a5977876 100644
--- a/sc/source/ui/sidebar/CellBorderStylePopup.cxx
+++ b/sc/source/ui/sidebar/CellBorderStylePopup.cxx
@@ -25,7 +25,7 @@ namespace sc { namespace sidebar {
CellBorderStylePopup::CellBorderStylePopup (
Window* pParent,
const ::boost::function<svx::sidebar::PopupControl*(svx::sidebar::PopupContainer*)>& rControlCreator)
-: Popup(pParent, rControlCreator, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CellBorderStyle")))
+: Popup(pParent, rControlCreator, ::OUString("CellBorderStyle"))
{
}
diff --git a/sc/source/ui/sidebar/CellLineStylePopup.cxx b/sc/source/ui/sidebar/CellLineStylePopup.cxx
index 5b5f10ab17ed..dc773a70de63 100644
--- a/sc/source/ui/sidebar/CellLineStylePopup.cxx
+++ b/sc/source/ui/sidebar/CellLineStylePopup.cxx
@@ -25,7 +25,7 @@ namespace sc { namespace sidebar {
CellLineStylePopup::CellLineStylePopup (
Window* pParent,
const ::boost::function<svx::sidebar::PopupControl*(svx::sidebar::PopupContainer*)>& rControlCreator)
-: Popup(pParent, rControlCreator, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CellLineStyle")))
+: Popup(pParent, rControlCreator, OUString("CellLineStyle"))
{
}
diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
index b4ce5e4b06a4..65435bbb83d0 100644
--- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
@@ -89,7 +89,7 @@ void NumberFormatPropertyPanel::Initialize()
Link aLink = LINK(this, NumberFormatPropertyPanel, NumFormatSelectHdl);
mpLbCategory->SetSelectHdl ( aLink );
mpLbCategory->SelectEntryPos(0);
- mpLbCategory->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Category"))); //wj acc
+ mpLbCategory->SetAccessibleName(OUString( "Category")); //wj acc
mpLbCategory->SetDropDownLineCount(mpLbCategory->GetEntryCount());
aLink = LINK(this, NumberFormatPropertyPanel, NumFormatHdl);
@@ -99,8 +99,8 @@ void NumberFormatPropertyPanel::Initialize()
mpEdDecimals->SetModifyHdl( aLink );
mpEdLeadZeroes->SetModifyHdl( aLink );
- mpEdDecimals->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Decimal Places"))); //wj acc
- mpEdLeadZeroes->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Leading Zeroes"))); //wj acc
+ mpEdDecimals->SetAccessibleName(OUString( "Decimal Places")); //wj acc
+ mpEdLeadZeroes->SetAccessibleName(OUString( "Leading Zeroes")); //wj acc
mpBtnNegRed->SetClickHdl( aLink );
mpBtnThousand->SetClickHdl( aLink );
diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx
index 152246706cb6..8886776e76c2 100644
--- a/sc/source/ui/unoobj/datauno.cxx
+++ b/sc/source/ui/unoobj/datauno.cxx
@@ -1669,7 +1669,7 @@ ScDatabaseRangeObj::ScDatabaseRangeObj(ScDocShell* pDocSh, const OUString& rNm)
ScDatabaseRangeObj::ScDatabaseRangeObj(ScDocShell* pDocSh, const SCTAB nTab) :
pDocShell( pDocSh ),
- aName(RTL_CONSTASCII_USTRINGPARAM(STR_DB_LOCAL_NONAME)),
+ aName(STR_DB_LOCAL_NONAME),
aPropSet( lcl_GetDBRangePropertyMap() ),
bIsUnnamed(true),
aTab( nTab )
diff --git a/sc/source/ui/vba/vbaworkbook.cxx b/sc/source/ui/vba/vbaworkbook.cxx
index 60974d21ce60..e486087d4139 100644
--- a/sc/source/ui/vba/vbaworkbook.cxx
+++ b/sc/source/ui/vba/vbaworkbook.cxx
@@ -344,7 +344,7 @@ ScVbaWorkbook::SaveAs( const uno::Any& FileName, const uno::Any& FileFormat, con
FileFormat >>= nFileFormat;
uno::Sequence< beans::PropertyValue > storeProps(1);
- storeProps[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterName" ) );
+ storeProps[0].Name = "FilterName" ;
setFilterPropsFromFormat( nFileFormat, storeProps );