summaryrefslogtreecommitdiff
path: root/sw
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 /sw
parentccc297097891e62489e5d281a4ea128ec6b71361 (diff)
remove most use of RTL_CONSTASCII_USTRINGPARAM macro
This is largely unnecessary when working with OUString Change-Id: I3cf4d68357a43665d01162ef4a2d5346a45da9be
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/unocore/unoframe.cxx2
-rw-r--r--sw/source/ui/sidebar/PageMarginControl.cxx10
2 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index 9e308fdc8f3a..83361354e817 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -1257,7 +1257,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
// the package URL based graphics are handled in different way currently
// TODO/LATER: actually this is the correct place to handle them
- OUString aGraphicProtocol( RTL_CONSTASCII_USTRINGPARAM( sGraphicObjectProtocol ) );
+ OUString aGraphicProtocol( sGraphicObjectProtocol );
if( aGrfUrl.startsWith( aGraphicProtocol ) )
{
OString sId(OUStringToOString(
diff --git a/sw/source/ui/sidebar/PageMarginControl.cxx b/sw/source/ui/sidebar/PageMarginControl.cxx
index 2a59a77135cb..c3d8c8081ba9 100644
--- a/sw/source/ui/sidebar/PageMarginControl.cxx
+++ b/sw/source/ui/sidebar/PageMarginControl.cxx
@@ -491,27 +491,27 @@ void PageMarginControl::StoreUserCustomValues()
::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue > aSeq(1);
SvtViewOptions aWinOpt( E_WINDOW, SWPAGE_LEFT_GVALUE );
- aSeq[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("mnPageLeftMargin") );
+ aSeq[0].Name = "mnPageLeftMargin";
aSeq[0].Value <<= ::rtl::OUString::number( mnPageLeftMargin );
aWinOpt.SetUserData( aSeq );
SvtViewOptions aWinOpt2( E_WINDOW, SWPAGE_RIGHT_GVALUE );
- aSeq[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("mnPageRightMargin") );
+ aSeq[0].Name = "mnPageRightMargin";
aSeq[0].Value <<= ::rtl::OUString::number( mnPageRightMargin );
aWinOpt2.SetUserData( aSeq );
SvtViewOptions aWinOpt3( E_WINDOW, SWPAGE_TOP_GVALUE );
- aSeq[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("mnPageTopMargin") );
+ aSeq[0].Name = "mnPageTopMargin";
aSeq[0].Value <<= ::rtl::OUString::number( mnPageTopMargin );
aWinOpt3.SetUserData( aSeq );
SvtViewOptions aWinOpt4( E_WINDOW, SWPAGE_DOWN_GVALUE );
- aSeq[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("mnPageBottomMargin") );
+ aSeq[0].Name = "mnPageBottomMargin";
aSeq[0].Value <<= ::rtl::OUString::number( mnPageBottomMargin );
aWinOpt4.SetUserData( aSeq );
SvtViewOptions aWinOpt5( E_WINDOW, SWPAGE_MIRROR_GVALUE );
- aSeq[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("mbMirrored") );
+ aSeq[0].Name = "mbMirrored";
aSeq[0].Value <<= ::rtl::OUString::number( (mbMirrored ? 1 : 0) );
aWinOpt5.SetUserData( aSeq );
}