summaryrefslogtreecommitdiff
path: root/framework
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 /framework
parentccc297097891e62489e5d281a4ea128ec6b71361 (diff)
remove most use of RTL_CONSTASCII_USTRINGPARAM macro
This is largely unnecessary when working with OUString Change-Id: I3cf4d68357a43665d01162ef4a2d5346a45da9be
Diffstat (limited to 'framework')
-rw-r--r--framework/source/fwe/classes/addonsoptions.cxx14
-rw-r--r--framework/source/services/autorecovery.cxx2
-rw-r--r--framework/source/uielement/genericstatusbarcontroller.cxx2
-rw-r--r--framework/source/uielement/popuptoolbarcontroller.cxx6
-rw-r--r--framework/source/uielement/recentfilesmenucontroller.cxx2
-rw-r--r--framework/source/uielement/statusbarmanager.cxx2
-rw-r--r--framework/source/uielement/toolbarmanager.cxx4
-rw-r--r--framework/source/uielement/toolbarsmenucontroller.cxx2
-rw-r--r--framework/source/uifactory/uicontrollerfactory.cxx6
9 files changed, 20 insertions, 20 deletions
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index d8bfdbbfa4f8..bebbd953a8b6 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -95,12 +95,12 @@ using namespace ::com::sun::star;
#define PROPERTYNAME_MERGETOOLBAR_MERGECONTEXT OUString("MergeContext" )
#define PROPERTYNAME_MERGETOOLBAR_TOOLBARITEMS OUString("ToolBarItems" )
-#define PROPERTYNAME_MERGESTATUSBAR_MERGEPOINT ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MergePoint" ))
-#define PROPERTYNAME_MERGESTATUSBAR_MERGECOMMAND ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MergeCommand" ))
-#define PROPERTYNAME_MERGESTATUSBAR_MERGECOMMANDPARAMETER ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MergeCommandParameter" ))
-#define PROPERTYNAME_MERGESTATUSBAR_MERGEFALLBACK ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MergeFallback" ))
-#define PROPERTYNAME_MERGESTATUSBAR_MERGECONTEXT ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MergeContext" ))
-#define PROPERTYNAME_MERGESTATUSBAR_STATUSBARITEMS ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StatusBarItems" ))
+#define PROPERTYNAME_MERGESTATUSBAR_MERGEPOINT ::rtl::OUString("MergePoint")
+#define PROPERTYNAME_MERGESTATUSBAR_MERGECOMMAND ::rtl::OUString("MergeCommand")
+#define PROPERTYNAME_MERGESTATUSBAR_MERGECOMMANDPARAMETER ::rtl::OUString("MergeCommandParameter")
+#define PROPERTYNAME_MERGESTATUSBAR_MERGEFALLBACK ::rtl::OUString("MergeFallback")
+#define PROPERTYNAME_MERGESTATUSBAR_MERGECONTEXT ::rtl::OUString("MergeContext")
+#define PROPERTYNAME_MERGESTATUSBAR_STATUSBARITEMS ::rtl::OUString("StatusBarItems")
// The following order is mandatory. Please add properties at the end!
#define INDEX_URL 0
@@ -1152,7 +1152,7 @@ sal_Bool AddonsOptions_Impl::ReadMergeToolbarData( const OUString& aMergeAddonIn
sal_Bool AddonsOptions_Impl::ReadStatusbarMergeInstructions( MergeStatusbarInstructionContainer& aContainer )
{
- const ::rtl::OUString aStatusbarMergeRootName( RTL_CONSTASCII_USTRINGPARAM( "AddonUI/OfficeStatusbarMerging/" ));
+ const ::rtl::OUString aStatusbarMergeRootName( "AddonUI/OfficeStatusbarMerging/" );
Sequence< ::rtl::OUString > aAddonMergeNodesSeq = GetNodeNames( aStatusbarMergeRootName );
::rtl::OUString aAddonMergeNode( aStatusbarMergeRootName );
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 0c7e3b2d6ed3..6c3944f1cf32 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -910,7 +910,7 @@ css::uno::Reference< css::container::XNameAccess > AutoRecovery::implts_openConf
aWriteLock.unlock();
// <- SAFE ----------------------------------
- OUString sCFG_PACKAGE_RECOVERY(RTL_CONSTASCII_USTRINGPARAM(CFG_PACKAGE_RECOVERY));
+ OUString sCFG_PACKAGE_RECOVERY(CFG_PACKAGE_RECOVERY);
// throws a RuntimeException if an error occurs!
css::uno::Reference< css::container::XNameAccess > xCFG(
::comphelper::ConfigurationHelper::openConfig(xContext, sCFG_PACKAGE_RECOVERY, ::comphelper::ConfigurationHelper::E_STANDARD),
diff --git a/framework/source/uielement/genericstatusbarcontroller.cxx b/framework/source/uielement/genericstatusbarcontroller.cxx
index 0dcc719a0475..62e19d00858a 100644
--- a/framework/source/uielement/genericstatusbarcontroller.cxx
+++ b/framework/source/uielement/genericstatusbarcontroller.cxx
@@ -139,7 +139,7 @@ throw ( RuntimeException )
if ( xGraphicProps.is() && m_xGraphic->getType() != graphic::GraphicType::EMPTY )
{
awt::Size aGraphicSize;
- xGraphicProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("SizePixel") ) ) >>= aGraphicSize;
+ xGraphicProps->getPropertyValue( OUString( "SizePixel" ) ) >>= aGraphicSize;
OSL_ENSURE( aGraphicSize.Height > 0 && aGraphicSize.Width > 0, "Empty status bar graphic!" );
sal_Int32 nOffset = m_xStatusbarItem->getOffset( );
diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx
index 37d84dcbcc8a..03b1fce4c931 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -289,7 +289,7 @@ NewToolbarController::execute( sal_Int16 /*KeyModifier*/ )
if ( !m_aLastURL.getLength() )
return;
- OUString aTarget( RTL_CONSTASCII_USTRINGPARAM( "_default" ) );
+ OUString aTarget( "_default" );
if ( m_xPopupMenu.is() )
{
// TODO investigate how to wrap Get/SetUserValue in css::awt::XMenu
@@ -308,8 +308,8 @@ NewToolbarController::execute( sal_Int16 /*KeyModifier*/ )
}
css::uno::Sequence< css::beans::PropertyValue > aArgs( 1 );
- aArgs[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Referer" ));
- aArgs[0].Value <<= OUString( RTL_CONSTASCII_USTRINGPARAM( "private:user" ) );
+ aArgs[0].Name = "Referer";
+ aArgs[0].Value <<= OUString( "private:user" );
dispatchCommand( m_aLastURL, aArgs, aTarget );
}
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx
index 644908791eb8..37c3c052d9c1 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -177,7 +177,7 @@ void RecentFilesMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >
pVCLPopupMenu->InsertItem( sal_uInt16( nCount + 1 ),
FWK_RESSTR(STR_CLEAR_RECENT_FILES) );
pVCLPopupMenu->SetItemCommand( sal_uInt16( nCount + 1 ),
- OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_CLEAR_LIST ) ) );
+ OUString( CMD_CLEAR_LIST ) );
pVCLPopupMenu->SetHelpText( sal_uInt16( nCount + 1 ),
FWK_RESSTR(STR_CLEAR_RECENT_FILES_HELP) );
}
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx
index b37d2d1769a0..da44a22d4e8c 100644
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -332,7 +332,7 @@ void StatusBarManager::CreateControllers()
beans::PropertyValue aPropValue;
std::vector< uno::Any > aPropVector;
- aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CommandURL" ));
+ aPropValue.Name = "CommandURL";
aPropValue.Value <<= aCommandURL;
aPropVector.push_back( uno::makeAny( aPropValue ) );
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 4c64d0ff3e56..4cff1966bdce 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -905,7 +905,7 @@ void ToolBarManager::CreateControllers()
aPropValue.Name = OUString( "ParentWindow" );
aPropValue.Value <<= xToolbarWindow;
aPropertyVector.push_back( makeAny( aPropValue ));
- aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Identifier" ));
+ aPropValue.Name = "Identifier";
aPropValue.Value = uno::makeAny( nId );
aPropertyVector.push_back( uno::makeAny( aPropValue ) );
@@ -1021,7 +1021,7 @@ void ToolBarManager::CreateControllers()
aPropValue.Name = OUString( "ModuleIdentifier" );
aPropValue.Value <<= m_aModuleIdentifier;
aPropertyVector.push_back( makeAny( aPropValue ));
- aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Identifier" ));
+ aPropValue.Name = "Identifier";
aPropValue.Value = uno::makeAny( nId );
aPropertyVector.push_back( uno::makeAny( aPropValue ) );
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index d73f3cec6504..1f3917c14e99 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -726,7 +726,7 @@ void SAL_CALL ToolbarsMenuController::itemSelected( const css::awt::MenuEvent& r
sal_Int32 nIndex = aCmd.indexOf( '=' );
if (( nIndex > 0 ) && (( nIndex+1 ) < aCmd.getLength() ))
{
- OUStringBuffer aBuf( OUString( RTL_CONSTASCII_USTRINGPARAM( STATIC_PRIVATE_TB_RESOURCE) ));
+ OUStringBuffer aBuf( STATIC_PRIVATE_TB_RESOURCE );
aBuf.append( aCmd.copy( nIndex+1 ));
sal_Bool bShow( !pVCLPopupMenu->IsItemChecked( rEvent.MenuId ));
diff --git a/framework/source/uifactory/uicontrollerfactory.cxx b/framework/source/uifactory/uicontrollerfactory.cxx
index b5b48e7af31f..0eedfa73f40d 100644
--- a/framework/source/uifactory/uicontrollerfactory.cxx
+++ b/framework/source/uifactory/uicontrollerfactory.cxx
@@ -229,7 +229,7 @@ DEFINE_INIT_SERVICE ( PopupMenuControllerFactory, {} )
PopupMenuControllerFactory::PopupMenuControllerFactory( const Reference< XComponentContext >& xContext ) :
UIControllerFactory(
xContext,
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PopupMenu" )) )
+ OUString( "PopupMenu") )
{
}
@@ -244,7 +244,7 @@ DEFINE_INIT_SERVICE ( ToolbarControllerFactory, {} )
ToolbarControllerFactory::ToolbarControllerFactory( const Reference< XComponentContext >& xContext ) :
UIControllerFactory(
xContext,
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ToolBar" )))
+ OUString( "ToolBar" ))
{
}
@@ -259,7 +259,7 @@ DEFINE_INIT_SERVICE ( StatusbarControllerFactory, {} )
StatusbarControllerFactory::StatusbarControllerFactory( const Reference< XComponentContext >& xContext ) :
UIControllerFactory(
xContext,
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StatusBar" )) )
+ OUString( "StatusBar" ) )
{
}