summaryrefslogtreecommitdiffstats
path: root/sfx2
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-05-06 16:32:22 +0200
committerLuboš Luňák <l.lunak@suse.cz>2013-05-06 16:51:45 +0200
commite2e2cc61144cb22227eebfadff0ea24b51ccfbd0 (patch)
tree8063275cabcdf32e30c37451a32d96db5929561a /sfx2
parentRevert "ignore already seen locations in compiler plugins" (diff)
downloadcore-e2e2cc61144cb22227eebfadff0ea24b51ccfbd0.tar.gz
core-e2e2cc61144cb22227eebfadff0ea24b51ccfbd0.zip
remove usage of RTL_CONSTASCII_USTRINGPARAM
Mechanical removal of usage together with OUString ctor, done by compiler plugin. Change-Id: I554227f76df0dac620b1b46fca32516f78b462c5
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/appl/imestatuswindow.cxx4
-rw-r--r--sfx2/source/appl/workwin.cxx10
-rw-r--r--sfx2/source/doc/doctemplateslocal.cxx8
-rw-r--r--sfx2/source/doc/zoomitem.cxx6
4 files changed, 14 insertions, 14 deletions
diff --git a/sfx2/source/appl/imestatuswindow.cxx b/sfx2/source/appl/imestatuswindow.cxx
index 5644f7803edb..b5e8fd270495 100644
--- a/sfx2/source/appl/imestatuswindow.cxx
+++ b/sfx2/source/appl/imestatuswindow.cxx
@@ -223,9 +223,9 @@ css::uno::Reference< css::beans::XPropertySet > ImeStatusWindow::getConfig()
css::uno::UNO_QUERY);
if (!m_xConfig.is())
throw css::uno::RuntimeException(
- OUString(RTL_CONSTASCII_USTRINGPARAM(
+ OUString(
"null com.sun.star.configuration."
- "ConfigurationUpdateAccess")),
+ "ConfigurationUpdateAccess"),
0);
bAdd = true;
}
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 97d04dd6cde5..c1c9fdf5d5d4 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -159,7 +159,7 @@ LayoutManagerListener::LayoutManagerListener(
SfxWorkWindow* pWrkWin ) :
m_bHasFrame( sal_False ),
m_pWrkWin( pWrkWin ),
- m_aLayoutManagerPropName( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ))
+ m_aLayoutManagerPropName( "LayoutManager" )
{
}
@@ -603,10 +603,10 @@ SfxWorkWindow::SfxWorkWindow( Window *pWin, SfxBindings& rB, SfxWorkWindow* pPar
bShowStatusBar( sal_False ),
#endif
m_nLock( 0 ),
- m_aStatusBarResName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/statusbar/statusbar" )),
- m_aLayoutManagerPropName( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" )),
- m_aTbxTypeName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/" )),
- m_aProgressBarResName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/progressbar/progressbar" ))
+ m_aStatusBarResName( "private:resource/statusbar/statusbar" ),
+ m_aLayoutManagerPropName( "LayoutManager" ),
+ m_aTbxTypeName( "private:resource/toolbar/" ),
+ m_aProgressBarResName( "private:resource/progressbar/progressbar" )
{
DBG_CTOR(SfxWorkWindow, 0);
DBG_ASSERT (pBindings, "No Bindings!");
diff --git a/sfx2/source/doc/doctemplateslocal.cxx b/sfx2/source/doc/doctemplateslocal.cxx
index 33ddb3341dbf..3432fdfa6b08 100644
--- a/sfx2/source/doc/doctemplateslocal.cxx
+++ b/sfx2/source/doc/doctemplateslocal.cxx
@@ -114,10 +114,10 @@ uno::Sequence< beans::StringPair > SAL_CALL DocTemplLocaleHelper::ReadLocalizati
// -----------------------------------
DocTemplLocaleHelper::DocTemplLocaleHelper()
-: m_aGroupListElement( RTL_CONSTASCII_USTRINGPARAM( "groupuinames:template-group-list" ) )
-, m_aGroupElement( RTL_CONSTASCII_USTRINGPARAM( "groupuinames:template-group" ) )
-, m_aNameAttr( RTL_CONSTASCII_USTRINGPARAM( "groupuinames:name" ) )
-, m_aUINameAttr( RTL_CONSTASCII_USTRINGPARAM( "groupuinames:default-ui-name" ) )
+: m_aGroupListElement( "groupuinames:template-group-list" )
+, m_aGroupElement( "groupuinames:template-group" )
+, m_aNameAttr( "groupuinames:name" )
+, m_aUINameAttr( "groupuinames:default-ui-name" )
{
}
diff --git a/sfx2/source/doc/zoomitem.cxx b/sfx2/source/doc/zoomitem.cxx
index ee285605051a..c6a40f94e2f6 100644
--- a/sfx2/source/doc/zoomitem.cxx
+++ b/sfx2/source/doc/zoomitem.cxx
@@ -113,11 +113,11 @@ bool SvxZoomItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberI
case 0:
{
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSeq( ZOOM_PARAMS );
- aSeq[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOM_PARAM_VALUE ));
+ aSeq[0].Name = OUString( ZOOM_PARAM_VALUE );
aSeq[0].Value <<= sal_Int32( GetValue() );
- aSeq[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOM_PARAM_VALUESET ));
+ aSeq[1].Name = OUString( ZOOM_PARAM_VALUESET );
aSeq[1].Value <<= sal_Int16( nValueSet );
- aSeq[2].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOM_PARAM_TYPE ));
+ aSeq[2].Name = OUString( ZOOM_PARAM_TYPE );
aSeq[2].Value <<= sal_Int16( eType );
rVal <<= aSeq;
break;