summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-11-15 11:05:19 +0200
committerNoel Grandin <noel@peralex.com>2013-11-19 10:29:31 +0200
commit610b2b94b33b0fc2d79cd515f9e293ca1c2610e8 (patch)
tree6eab2639cb8104ca54daa3f7a2ebd83ef1566cf0 /framework
parent2c35fff7eca3a143d28dc75e6a73fe1101d2af77 (diff)
remove unnecessary use of OUString constructor when assigning
change code like aStr = OUString("xxxx"); to aStr = "xxxx"; Change-Id: Ib981a5cc735677ec5dba76ef9279a107d22e99d4
Diffstat (limited to 'framework')
-rw-r--r--framework/source/classes/menumanager.cxx24
-rw-r--r--framework/source/fwe/classes/addonsoptions.cxx56
-rw-r--r--framework/source/fwe/helper/actiontriggerhelper.cxx3
-rw-r--r--framework/source/layoutmanager/layoutmanager.cxx4
-rw-r--r--framework/source/layoutmanager/toolbarlayoutmanager.cxx26
-rw-r--r--framework/source/services/taskcreatorsrv.cxx4
-rw-r--r--framework/source/uiconfiguration/globalsettings.cxx4
-rw-r--r--framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx6
-rw-r--r--framework/source/uiconfiguration/uicategorydescription.cxx4
-rw-r--r--framework/source/uiconfiguration/uiconfigurationmanager.cxx4
-rw-r--r--framework/source/uiconfiguration/windowstateconfiguration.cxx6
-rw-r--r--framework/source/uielement/addonstoolbarmanager.cxx16
-rw-r--r--framework/source/uielement/buttontoolbarcontroller.cxx2
-rw-r--r--framework/source/uielement/comboboxtoolbarcontroller.cxx6
-rw-r--r--framework/source/uielement/complextoolbarcontroller.cxx6
-rw-r--r--framework/source/uielement/dropdownboxtoolbarcontroller.cxx6
-rw-r--r--framework/source/uielement/edittoolbarcontroller.cxx4
-rw-r--r--framework/source/uielement/fontmenucontroller.cxx4
-rw-r--r--framework/source/uielement/fontsizemenucontroller.cxx4
-rw-r--r--framework/source/uielement/generictoolbarcontroller.cxx4
-rw-r--r--framework/source/uielement/headermenucontroller.cxx4
-rw-r--r--framework/source/uielement/imagebuttontoolbarcontroller.cxx2
-rw-r--r--framework/source/uielement/langselectionmenucontroller.cxx8
-rw-r--r--framework/source/uielement/menubarmanager.cxx19
-rw-r--r--framework/source/uielement/newmenucontroller.cxx2
-rw-r--r--framework/source/uielement/spinfieldtoolbarcontroller.cxx4
-rw-r--r--framework/source/uielement/statusbarmanager.cxx12
-rw-r--r--framework/source/uielement/togglebuttontoolbarcontroller.cxx8
-rw-r--r--framework/source/uielement/toolbarmanager.cxx30
-rw-r--r--framework/source/uielement/uicommanddescription.cxx6
-rw-r--r--framework/source/uifactory/addonstoolboxfactory.cxx6
-rw-r--r--framework/source/uifactory/factoryconfiguration.cxx2
-rw-r--r--framework/source/uifactory/menubarfactory.cxx8
-rw-r--r--framework/source/uifactory/uicontrollerfactory.cxx2
-rw-r--r--framework/source/uifactory/uielementfactorymanager.cxx2
35 files changed, 148 insertions, 160 deletions
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index 486651540234..13f2aec7ddac 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -162,9 +162,7 @@ MenuManager::MenuManager(
pPopupMenu->SetPopupMenu( ITEMID_ADDONLIST, pSubMenu );
// Set item command for popup menu to enable it for GetImageFromURL
- const static OUString aSlotString( "slot:" );
- aItemCommand = aSlotString;
- aItemCommand += OUString::number( ITEMID_ADDONLIST );
+ aItemCommand = "slot:" + OUString::number( ITEMID_ADDONLIST );
pPopupMenu->SetItemCommand( ITEMID_ADDONLIST, aItemCommand );
AddMenu(pSubMenu,OUString(),nItemId,sal_True,sal_False);
@@ -559,7 +557,7 @@ void MenuManager::UpdateSpecialFileMenu( Menu* pMenu )
if ( i <= 9 )
{
if ( i == 9 )
- aMenuShortCut = OUString( "1~0: " );
+ aMenuShortCut = "1~0: ";
else
{
menuShortCut[1] = (char)( '1' + i );
@@ -688,11 +686,11 @@ void MenuManager::CreatePicklistArguments( Sequence< PropertyValue >& aArgsList,
Any a;
aArgsList.realloc( NUM_OF_PICKLIST_ARGS );
- aArgsList[0].Name = OUString( "FileName" );
+ aArgsList[0].Name = "FileName";
a <<= pMenuItemHandler->aMenuItemURL;
aArgsList[0].Value = a;
- aArgsList[1].Name = OUString( "Referer" );
+ aArgsList[1].Name = "Referer";
a <<= OUString( "private:user" );
aArgsList[1].Value = a;
@@ -706,7 +704,7 @@ void MenuManager::CreatePicklistArguments( Sequence< PropertyValue >& aArgsList,
if ( nPos < ( aFilter.getLength() - 1 ) )
aFilterOptions = aFilter.copy( nPos+1 );
- aArgsList[2].Name = OUString( "FilterOptions" );
+ aArgsList[2].Name = "FilterOptions";
a <<= aFilterOptions;
aArgsList[2].Value = a;
@@ -714,7 +712,7 @@ void MenuManager::CreatePicklistArguments( Sequence< PropertyValue >& aArgsList,
aArgsList.realloc( ++NUM_OF_PICKLIST_ARGS );
}
- aArgsList[NUM_OF_PICKLIST_ARGS-1].Name = OUString( "FilterName" );
+ aArgsList[NUM_OF_PICKLIST_ARGS-1].Name = "FilterName";
a <<= aFilter;
aArgsList[NUM_OF_PICKLIST_ARGS-1].Value = a;
}
@@ -792,9 +790,7 @@ IMPL_LINK( MenuManager, Activate, Menu *, pMenu )
OUString aItemCommand = pMenu->GetItemCommand( pMenuItemHandler->nItemId );
if ( aItemCommand.isEmpty() )
{
- const static OUString aSlotString( "slot:" );
- aItemCommand = aSlotString;
- aItemCommand += OUString::number( pMenuItemHandler->nItemId );
+ aItemCommand = "slot:" + OUString::number( pMenuItemHandler->nItemId );
pMenu->SetItemCommand( pMenuItemHandler->nItemId, aItemCommand );
}
@@ -893,7 +889,7 @@ IMPL_LINK( MenuManager, Select, Menu *, pMenu )
{
// bookmark menu item selected
aArgs.realloc( 1 );
- aArgs[0].Name = OUString( "Referer" );
+ aArgs[0].Name = "Referer";
aArgs[0].Value <<= OUString( "private:user" );
}
@@ -942,9 +938,7 @@ sal_uInt16 MenuManager::FillItemCommand(OUString& _rItemCommand, Menu* _pMenu,sa
_rItemCommand = _pMenu->GetItemCommand( nItemId );
if ( _rItemCommand.isEmpty() )
{
- const static OUString aSlotString( "slot:" );
- _rItemCommand = aSlotString;
- _rItemCommand += OUString::number( nItemId );
+ _rItemCommand = "slot:" + OUString::number( nItemId );
_pMenu->SetItemCommand( nItemId, _rItemCommand );
}
return nItemId;
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index bebbd953a8b6..c0d5ff0c9ee2 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -467,7 +467,7 @@ AddonsOptions_Impl::AddonsOptions_Impl()
// Enable notification mechanism of ouer baseclass.
// We need it to get information about changes outside these class on ouer used configuration keys!
Sequence< OUString > aNotifySeq( 1 );
- aNotifySeq[0] = OUString( "AddonUI" );
+ aNotifySeq[0] = "AddonUI";
EnableNotification( aNotifySeq );
}
@@ -1056,7 +1056,7 @@ sal_Bool AddonsOptions_Impl::ReadMergeMenuData( const OUString& aMergeAddonInstr
// extend the node names to have full path strings
for ( sal_uInt32 i = 0; i < (sal_uInt32)aSubMenuNodeNames.getLength(); i++ )
- aSubMenuNodeNames[i] = OUString( aMergeMenuBaseNode + aSubMenuNodeNames[i] );
+ aSubMenuNodeNames[i] = aMergeMenuBaseNode + aSubMenuNodeNames[i];
return ReadSubMenuEntries( aSubMenuNodeNames, rMergeMenu );
}
@@ -1321,7 +1321,7 @@ sal_Bool AddonsOptions_Impl::ReadMenuItem( const OUString& aMenuNodeName, Sequen
Sequence< Sequence< PropertyValue > > aSubMenuSeq;
OUString aSubMenuRootNodeName( aRootSubMenuName + m_aPathDelimiter );
for ( sal_uInt32 n = 0; n < (sal_uInt32)aRootSubMenuNodeNames.getLength(); n++ )
- aRootSubMenuNodeNames[n] = OUString( aSubMenuRootNodeName + aRootSubMenuNodeNames[n] );
+ aRootSubMenuNodeNames[n] = aSubMenuRootNodeName + aRootSubMenuNodeNames[n];
ReadSubMenuEntries( aRootSubMenuNodeNames, aSubMenuSeq );
aMenuItem[ OFFSET_MENUITEM_SUBMENU ].Value <<= aSubMenuSeq;
bResult = sal_True;
@@ -1389,7 +1389,7 @@ sal_Bool AddonsOptions_Impl::ReadPopupMenu( const OUString& aPopupMenuNodeName,
Sequence< Sequence< PropertyValue > > aSubMenuSeq;
OUString aSubMenuRootNodeName( aRootSubMenuName + m_aPathDelimiter );
for ( sal_uInt32 n = 0; n < (sal_uInt32)aRootSubMenuNodeNames.getLength(); n++ )
- aRootSubMenuNodeNames[n] = OUString( aSubMenuRootNodeName + aRootSubMenuNodeNames[n] );
+ aRootSubMenuNodeNames[n] = aSubMenuRootNodeName + aRootSubMenuNodeNames[n];
ReadSubMenuEntries( aRootSubMenuNodeNames, aSubMenuSeq );
aPopupMenu[ OFFSET_POPUPMENU_SUBMENU ].Value <<= aSubMenuSeq;
bResult = sal_True;
@@ -1677,12 +1677,12 @@ Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesMenuItem( const OUStrin
Sequence< OUString > lResult( PROPERTYCOUNT_MENUITEM );
// Create property names dependent from the root node name
- lResult[OFFSET_MENUITEM_URL] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_URL ] );
- lResult[OFFSET_MENUITEM_TITLE] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_TITLE ] );
- lResult[OFFSET_MENUITEM_IMAGEIDENTIFIER] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_IMAGEIDENTIFIER ] );
- lResult[OFFSET_MENUITEM_TARGET] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_TARGET ] );
- lResult[OFFSET_MENUITEM_CONTEXT] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_CONTEXT ] );
- lResult[OFFSET_MENUITEM_SUBMENU] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_SUBMENU ] );
+ lResult[OFFSET_MENUITEM_URL] = aPropertyRootNode + m_aPropNames[ INDEX_URL ] ;
+ lResult[OFFSET_MENUITEM_TITLE] = aPropertyRootNode + m_aPropNames[ INDEX_TITLE ];
+ lResult[OFFSET_MENUITEM_IMAGEIDENTIFIER] = aPropertyRootNode + m_aPropNames[ INDEX_IMAGEIDENTIFIER ];
+ lResult[OFFSET_MENUITEM_TARGET] = aPropertyRootNode + m_aPropNames[ INDEX_TARGET ];
+ lResult[OFFSET_MENUITEM_CONTEXT] = aPropertyRootNode + m_aPropNames[ INDEX_CONTEXT ];
+ lResult[OFFSET_MENUITEM_SUBMENU] = aPropertyRootNode + m_aPropNames[ INDEX_SUBMENU ];
return lResult;
}
@@ -1696,9 +1696,9 @@ Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesPopupMenu( const OUStri
Sequence< OUString > lResult( PROPERTYCOUNT_POPUPMENU-1 );
// Create property names dependent from the root node name
- lResult[OFFSET_POPUPMENU_TITLE] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_TITLE ] );
- lResult[OFFSET_POPUPMENU_CONTEXT] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_CONTEXT ] );
- lResult[OFFSET_POPUPMENU_SUBMENU] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_SUBMENU ] );
+ lResult[OFFSET_POPUPMENU_TITLE] = aPropertyRootNode + m_aPropNames[ INDEX_TITLE ];
+ lResult[OFFSET_POPUPMENU_CONTEXT] = aPropertyRootNode + m_aPropNames[ INDEX_CONTEXT ];
+ lResult[OFFSET_POPUPMENU_SUBMENU] = aPropertyRootNode + m_aPropNames[ INDEX_SUBMENU ];
return lResult;
}
@@ -1711,13 +1711,13 @@ Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesToolBarItem( const OUSt
Sequence< OUString > lResult( PROPERTYCOUNT_TOOLBARITEM );
// Create property names dependent from the root node name
- lResult[0] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_URL ] );
- lResult[1] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_TITLE ] );
- lResult[2] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_IMAGEIDENTIFIER] );
- lResult[3] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_TARGET ] );
- lResult[4] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_CONTEXT ] );
- lResult[5] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_CONTROLTYPE ] );
- lResult[6] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_WIDTH ] );
+ lResult[0] = aPropertyRootNode + m_aPropNames[ INDEX_URL ];
+ lResult[1] = aPropertyRootNode + m_aPropNames[ INDEX_TITLE ];
+ lResult[2] = aPropertyRootNode + m_aPropNames[ INDEX_IMAGEIDENTIFIER];
+ lResult[3] = aPropertyRootNode + m_aPropNames[ INDEX_TARGET ];
+ lResult[4] = aPropertyRootNode + m_aPropNames[ INDEX_CONTEXT ];
+ lResult[5] = aPropertyRootNode + m_aPropNames[ INDEX_CONTROLTYPE ];
+ lResult[6] = aPropertyRootNode + m_aPropNames[ INDEX_WIDTH ];
return lResult;
}
@@ -1746,14 +1746,14 @@ Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesImages( const OUString&
Sequence< OUString > lResult( PROPERTYCOUNT_IMAGES );
// Create property names dependent from the root node name
- lResult[0] = OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_SMALL ] );
- lResult[1] = OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_BIG ] );
- lResult[2] = OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_SMALLHC ] );
- lResult[3] = OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_BIGHC ] );
- lResult[4] = OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_SMALL_URL ] );
- lResult[5] = OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_BIG_URL ] );
- lResult[6] = OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_SMALLHC_URL] );
- lResult[7] = OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_BIGHC_URL ] );
+ lResult[0] = aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_SMALL ];
+ lResult[1] = aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_BIG ];
+ lResult[2] = aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_SMALLHC ];
+ lResult[3] = aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_BIGHC ];
+ lResult[4] = aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_SMALL_URL ];
+ lResult[5] = aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_BIG_URL ];
+ lResult[6] = aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_SMALLHC_URL];
+ lResult[7] = aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_BIGHC_URL ];
return lResult;
}
diff --git a/framework/source/fwe/helper/actiontriggerhelper.cxx b/framework/source/fwe/helper/actiontriggerhelper.cxx
index 36f0cf679187..6ccd422bfeeb 100644
--- a/framework/source/fwe/helper/actiontriggerhelper.cxx
+++ b/framework/source/fwe/helper/actiontriggerhelper.cxx
@@ -266,8 +266,7 @@ Reference< XPropertySet > CreateActionTrigger( sal_uInt16 nItemId, const Menu* p
if ( aCommandURL.isEmpty() )
{
- aCommandURL = OUString( "slot:" );
- aCommandURL += OUString::number( nItemId );
+ aCommandURL = "slot:" + OUString::number( nItemId );
}
a <<= aCommandURL;
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index ede067e2f05c..e52f4ed4c4b3 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -711,9 +711,9 @@ Reference< XUIElement > LayoutManager::implts_createElement( const OUString& aNa
ReadGuard aReadLock( m_aLock );
Sequence< PropertyValue > aPropSeq( 2 );
- aPropSeq[0].Name = OUString( "Frame" );
+ aPropSeq[0].Name = "Frame";
aPropSeq[0].Value <<= m_xFrame;
- aPropSeq[1].Name = OUString( "Persistent" );
+ aPropSeq[1].Name = "Persistent";
aPropSeq[1].Value <<= sal_True;
try
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index 97cfa764c72b..4ffab50fa625 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -996,9 +996,9 @@ void ToolbarLayoutManager::implts_createAddonsToolBars()
OUString aElementType( "toolbar" );
uno::Sequence< beans::PropertyValue > aPropSeq( 2 );
- aPropSeq[0].Name = OUString( "Frame" );
+ aPropSeq[0].Name = "Frame";
aPropSeq[0].Value <<= xFrame;
- aPropSeq[1].Name = OUString( "ConfigurationData" );
+ aPropSeq[1].Name = "ConfigurationData";
for ( sal_uInt32 i = 0; i < nCount; i++ )
{
OUString aAddonToolBarName( aAddonsToolBarStaticName + m_pAddonOptions->GetAddonsToolbarResourceName(i) );
@@ -1399,9 +1399,9 @@ uno::Reference< ui::XUIElement > ToolbarLayoutManager::implts_createElement( con
ReadGuard aReadLock( m_aLock );
uno::Sequence< beans::PropertyValue > aPropSeq( 2 );
- aPropSeq[0].Name = OUString( "Frame" );
+ aPropSeq[0].Name = "Frame";
aPropSeq[0].Value <<= m_xFrame;
- aPropSeq[1].Name = OUString( "Persistent" );
+ aPropSeq[1].Name = "Persistent";
aPropSeq[1].Value <<= true;
uno::Reference< ui::XUIElementFactory > xUIElementFactory( m_xUIElementFactoryManager );
aReadLock.unlock();
@@ -1614,28 +1614,28 @@ void ToolbarLayoutManager::implts_writeWindowStateData( const UIElement& rElemen
{
uno::Sequence< beans::PropertyValue > aWindowState( 9 );
- aWindowState[0].Name = OUString::createFromAscii( WINDOWSTATE_PROPERTY_DOCKED );
+ aWindowState[0].Name = WINDOWSTATE_PROPERTY_DOCKED;
aWindowState[0].Value = ::uno::makeAny( sal_Bool( !rElementData.m_bFloating ));
- aWindowState[1].Name = OUString::createFromAscii( WINDOWSTATE_PROPERTY_VISIBLE );
+ aWindowState[1].Name = WINDOWSTATE_PROPERTY_VISIBLE;
aWindowState[1].Value = uno::makeAny( sal_Bool( rElementData.m_bVisible ));
- aWindowState[2].Name = OUString::createFromAscii( WINDOWSTATE_PROPERTY_DOCKINGAREA );
+ aWindowState[2].Name = WINDOWSTATE_PROPERTY_DOCKINGAREA;
aWindowState[2].Value = uno::makeAny( static_cast< ui::DockingArea >( rElementData.m_aDockedData.m_nDockedArea ) );
awt::Point aPos = rElementData.m_aDockedData.m_aPos;
- aWindowState[3].Name = OUString::createFromAscii( WINDOWSTATE_PROPERTY_DOCKPOS );
+ aWindowState[3].Name = WINDOWSTATE_PROPERTY_DOCKPOS;
aWindowState[3].Value <<= aPos;
aPos = rElementData.m_aFloatingData.m_aPos;
- aWindowState[4].Name = OUString::createFromAscii( WINDOWSTATE_PROPERTY_POS );
+ aWindowState[4].Name = WINDOWSTATE_PROPERTY_POS;
aWindowState[4].Value <<= aPos;
- aWindowState[5].Name = OUString::createFromAscii( WINDOWSTATE_PROPERTY_SIZE );
+ aWindowState[5].Name = WINDOWSTATE_PROPERTY_SIZE;
aWindowState[5].Value <<= rElementData.m_aFloatingData.m_aSize;
- aWindowState[6].Name = OUString::createFromAscii( WINDOWSTATE_PROPERTY_UINAME );
+ aWindowState[6].Name = WINDOWSTATE_PROPERTY_UINAME;
aWindowState[6].Value = uno::makeAny( rElementData.m_aUIName );
- aWindowState[7].Name = OUString::createFromAscii( WINDOWSTATE_PROPERTY_LOCKED );
+ aWindowState[7].Name = WINDOWSTATE_PROPERTY_LOCKED;
aWindowState[7].Value = uno::makeAny( rElementData.m_aDockedData.m_bLocked );
- aWindowState[8].Name = ::rtl::OUString::createFromAscii( WINDOWSTATE_PROPERTY_STYLE );
+ aWindowState[8].Name = WINDOWSTATE_PROPERTY_STYLE;
aWindowState[8].Value = uno::makeAny( rElementData.m_nStyle );
OUString aName = rElementData.m_aName;
diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx
index 8e9014f07992..e81b25dd6e83 100644
--- a/framework/source/services/taskcreatorsrv.cxx
+++ b/framework/source/services/taskcreatorsrv.cxx
@@ -209,7 +209,7 @@ css::uno::Reference< css::awt::XWindow > TaskCreatorService::implts_createContai
if (bTopWindow)
{
aDescriptor.Type = css::awt::WindowClass_TOP ;
- aDescriptor.WindowServiceName = OUString("window");
+ aDescriptor.WindowServiceName = "window";
aDescriptor.ParentIndex = -1 ;
aDescriptor.Parent = css::uno::Reference< css::awt::XWindowPeer >() ;
aDescriptor.Bounds = aPosSize ;
@@ -222,7 +222,7 @@ css::uno::Reference< css::awt::XWindow > TaskCreatorService::implts_createContai
else
{
aDescriptor.Type = css::awt::WindowClass_TOP ;
- aDescriptor.WindowServiceName = OUString("dockingwindow");
+ aDescriptor.WindowServiceName = "dockingwindow";
aDescriptor.ParentIndex = 1 ;
aDescriptor.Parent = xParentWindowPeer ;
aDescriptor.Bounds = aPosSize ;
diff --git a/framework/source/uiconfiguration/globalsettings.cxx b/framework/source/uiconfiguration/globalsettings.cxx
index 79c6aa732ca7..b75b7fd66451 100644
--- a/framework/source/uiconfiguration/globalsettings.cxx
+++ b/framework/source/uiconfiguration/globalsettings.cxx
@@ -241,10 +241,10 @@ sal_Bool GlobalSettings_Access::impl_initConfigAccess()
css::uno::Reference< css::lang::XMultiServiceFactory > xConfigProvider =
css::configuration::theDefaultProvider::get( m_xContext );
- aPropValue.Name = OUString( "nodepath" );
+ aPropValue.Name = "nodepath";
aPropValue.Value = css::uno::makeAny( OUString( GLOBALSETTINGS_ROOT_ACCESS ));
aArgs[0] = css::uno::makeAny( aPropValue );
- aPropValue.Name = OUString( "lazywrite" );
+ aPropValue.Name = "lazywrite";
aPropValue.Value = css::uno::makeAny( sal_True );
aArgs[1] = css::uno::makeAny( aPropValue );
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index 7b2d0fa39591..f67b5c459453 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -1316,13 +1316,13 @@ Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getImageManager()
Sequence< Any > aPropSeq( 3 );
PropertyValue aPropValue;
- aPropValue.Name = OUString( "UserConfigStorage" );
+ aPropValue.Name = "UserConfigStorage";
aPropValue.Value = makeAny( m_xUserConfigStorage );
aPropSeq[0] = makeAny( aPropValue );
- aPropValue.Name = OUString( "ModuleIdentifier" );
+ aPropValue.Name = "ModuleIdentifier";
aPropValue.Value = makeAny( m_aModuleIdentifier );
aPropSeq[1] = makeAny( aPropValue );
- aPropValue.Name = OUString( "UserRootCommit" );
+ aPropValue.Name = "UserRootCommit";
aPropValue.Value = makeAny( m_xUserRootCommit );
aPropSeq[2] = makeAny( aPropValue );
diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx
index 51b87846c2b0..d93cfe2c28b0 100644
--- a/framework/source/uiconfiguration/uicategorydescription.cxx
+++ b/framework/source/uiconfiguration/uicategorydescription.cxx
@@ -144,7 +144,7 @@ ConfigurationAccess_UICategory::ConfigurationAccess_UICategory( const OUString&
{
// Create configuration hierachical access name
m_aConfigCategoryAccess += aModuleName;
- m_aConfigCategoryAccess += OUString( CONFIGURATION_CATEGORY_ELEMENT_ACCESS );
+ m_aConfigCategoryAccess += CONFIGURATION_CATEGORY_ELEMENT_ACCESS;
m_xConfigProvider = theDefaultProvider::get( rxContext );
}
@@ -341,7 +341,7 @@ sal_Bool ConfigurationAccess_UICategory::initializeConfigAccess()
try
{
- aPropValue.Name = OUString( "nodepath" );
+ aPropValue.Name = "nodepath";
aPropValue.Value <<= m_aConfigCategoryAccess;
aArgs[0] <<= aPropValue;
diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index bbfc28288bd8..82dfc41fc3bf 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -1028,10 +1028,10 @@ Reference< XInterface > SAL_CALL UIConfigurationManager::getImageManager() throw
Sequence< Any > aPropSeq( 2 );
PropertyValue aPropValue;
- aPropValue.Name = OUString( "UserConfigStorage" );
+ aPropValue.Name = "UserConfigStorage";
aPropValue.Value = makeAny( m_xDocConfigStorage );
aPropSeq[0] = makeAny( aPropValue );
- aPropValue.Name = OUString( "ModuleIdentifier" );
+ aPropValue.Name = "ModuleIdentifier";
aPropValue.Value = makeAny( m_aModuleIdentifier );
aPropSeq[1] = makeAny( aPropValue );
diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx
index cad090bd4748..baca1f567f93 100644
--- a/framework/source/uiconfiguration/windowstateconfiguration.cxx
+++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx
@@ -256,7 +256,7 @@ ConfigurationAccess_WindowState::ConfigurationAccess_WindowState( const OUString
{
// Create configuration hierachical access name
m_aConfigWindowAccess += aModuleName;
- m_aConfigWindowAccess += OUString( CONFIGURATION_WINDOWSTATE_ACCESS );
+ m_aConfigWindowAccess += CONFIGURATION_WINDOWSTATE_ACCESS;
m_xConfigProvider = theDefaultProvider::get( rxContext );
// Initialize access array with property names.
@@ -1261,10 +1261,10 @@ sal_Bool ConfigurationAccess_WindowState::impl_initializeConfigAccess()
try
{
- aPropValue.Name = OUString( "nodepath" );
+ aPropValue.Name = "nodepath";
aPropValue.Value <<= m_aConfigWindowAccess;
aArgs[0] <<= aPropValue;
- aPropValue.Name = OUString( "lazywrite" );
+ aPropValue.Name = "lazywrite";
aPropValue.Value <<= sal_True;
aArgs[1] <<= aPropValue;
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx
index 24e002ee2841..f7299658b692 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.cxx
@@ -282,19 +282,19 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue
Sequence< Any > aArgs(5);
PropertyValue aPropValue;
- aPropValue.Name = OUString( "ModuleIdentifier" );
+ aPropValue.Name = "ModuleIdentifier";
aPropValue.Value <<= m_aModuleIdentifier;
aArgs[0] <<= aPropValue;
- aPropValue.Name = OUString( "Frame" );
+ aPropValue.Name = "Frame";
aPropValue.Value <<= m_xFrame;
aArgs[1] <<= aPropValue;
- aPropValue.Name = OUString( "ServiceManager" );
+ aPropValue.Name = "ServiceManager";
aPropValue.Value <<= Reference<XMultiServiceFactory>(m_xContext->getServiceManager(), UNO_QUERY_THROW);
aArgs[2] <<= aPropValue;
- aPropValue.Name = OUString( "ParentWindow" );
+ aPropValue.Name = "ParentWindow";
aPropValue.Value <<= xToolbarWindow;
aArgs[3] <<= aPropValue;
- aPropValue.Name = OUString( "ItemId" );
+ aPropValue.Name = "ItemId";
aPropValue.Value = makeAny( sal_Int32( nId ));
aArgs[4] <<= aPropValue;
@@ -325,13 +325,13 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue
{
PropertyValue aPropValue;
Sequence< Any > aArgs( 3 );
- aPropValue.Name = OUString( "Frame" );
+ aPropValue.Name = "Frame";
aPropValue.Value <<= m_xFrame;
aArgs[0] <<= aPropValue;
- aPropValue.Name = OUString( "CommandURL" );
+ aPropValue.Name = "CommandURL";
aPropValue.Value <<= aURL;
aArgs[1] <<= aPropValue;
- aPropValue.Name = OUString( "ServiceManager" );
+ aPropValue.Name = "ServiceManager";
aPropValue.Value <<= Reference<XMultiServiceFactory>(m_xContext->getServiceManager(), UNO_QUERY_THROW);
aArgs[2] <<= aPropValue;
try
diff --git a/framework/source/uielement/buttontoolbarcontroller.cxx b/framework/source/uielement/buttontoolbarcontroller.cxx
index 0b8ffb186c7c..09a70da6b292 100644
--- a/framework/source/uielement/buttontoolbarcontroller.cxx
+++ b/framework/source/uielement/buttontoolbarcontroller.cxx
@@ -252,7 +252,7 @@ throw (::com::sun::star::uno::RuntimeException)
Sequence<PropertyValue> aArgs( 1 );
// Provide key modifier information to dispatch function
- aArgs[0].Name = OUString( "KeyModifier" );
+ aArgs[0].Name = "KeyModifier";
aArgs[0].Value <<= KeyModifier;
xDispatch->dispatch( aTargetURL, aArgs );
diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx
index cf3d22834272..54bc4c2b088d 100644
--- a/framework/source/uielement/comboboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx
@@ -187,9 +187,9 @@ Sequence<PropertyValue> ComboboxToolbarController::getExecuteArgs(sal_Int16 KeyM
OUString aSelectedText = m_pComboBox->GetText();
// Add key modifier to argument list
- aArgs[0].Name = OUString( "KeyModifier" );
+ aArgs[0].Name = "KeyModifier";
aArgs[0].Value <<= KeyModifier;
- aArgs[1].Name = OUString( "Text" );
+ aArgs[1].Name = "Text";
aArgs[1].Value <<= aSelectedText;
return aArgs;
}
@@ -294,7 +294,7 @@ void ComboboxToolbarController::executeControlCommand( const ::com::sun::star::f
// send notification
uno::Sequence< beans::NamedValue > aInfo( 1 );
- aInfo[0].Name = OUString( "List" );
+ aInfo[0].Name = "List";
aInfo[0].Value <<= aList;
addNotifyInfo( OUString( "ListChanged" ),
getDispatchFromCommand( m_aCommandURL ),
diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx
index 589bfd8a4107..1a987d984ee0 100644
--- a/framework/source/uielement/complextoolbarcontroller.cxx
+++ b/framework/source/uielement/complextoolbarcontroller.cxx
@@ -92,7 +92,7 @@ Sequence<PropertyValue> ComplexToolbarController::getExecuteArgs(sal_Int16 KeyMo
Sequence<PropertyValue> aArgs( 1 );
// Add key modifier to argument list
- aArgs[0].Name = OUString( "KeyModifier" );
+ aArgs[0].Name = "KeyModifier";
aArgs[0].Value <<= KeyModifier;
return aArgs;
}
@@ -273,7 +273,7 @@ void ComplexToolbarController::addNotifyInfo(
sal_Int32 nCount = rInfo.getLength();
uno::Sequence< beans::NamedValue > aInfoSeq( rInfo );
aInfoSeq.realloc( nCount+1 );
- aInfoSeq[nCount].Name = OUString( "Source" );
+ aInfoSeq[nCount].Name = "Source";
aInfoSeq[nCount].Value = uno::makeAny( getFrameInterface() );
pNotifyInfo->aInfoSeq = aInfoSeq;
@@ -343,7 +343,7 @@ void ComplexToolbarController::notifyTextChanged( const OUString& aText )
{
// send text changed notification
uno::Sequence< beans::NamedValue > aInfo( 1 );
- aInfo[0].Name = OUString( "Text" );
+ aInfo[0].Name = "Text";
aInfo[0].Value <<= aText;
addNotifyInfo( OUString( "TextChanged" ),
getDispatchFromCommand( m_aCommandURL ),
diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
index fc9ff2f094b6..b87987b8d1eb 100644
--- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
@@ -171,9 +171,9 @@ Sequence<PropertyValue> DropdownToolbarController::getExecuteArgs(sal_Int16 KeyM
OUString aSelectedText = m_pListBoxControl->GetSelectEntry();
// Add key modifier to argument list
- aArgs[0].Name = OUString( "KeyModifier" );
+ aArgs[0].Name = "KeyModifier";
aArgs[0].Value <<= KeyModifier;
- aArgs[1].Name = OUString( "Text" );
+ aArgs[1].Name = "Text";
aArgs[1].Value <<= aSelectedText;
return aArgs;
}
@@ -231,7 +231,7 @@ void DropdownToolbarController::executeControlCommand( const ::com::sun::star::f
// send notification
uno::Sequence< beans::NamedValue > aInfo( 1 );
- aInfo[0].Name = OUString( "List" );
+ aInfo[0].Name = "List";
aInfo[0].Value <<= aList;
addNotifyInfo( OUString( "ListChanged" ),
getDispatchFromCommand( m_aCommandURL ),
diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx
index a0ead9aaaae0..d4bb63311f63 100644
--- a/framework/source/uielement/edittoolbarcontroller.cxx
+++ b/framework/source/uielement/edittoolbarcontroller.cxx
@@ -168,9 +168,9 @@ Sequence<PropertyValue> EditToolbarController::getExecuteArgs(sal_Int16 KeyModif
OUString aSelectedText = m_pEditControl->GetText();
// Add key modifier to argument list
- aArgs[0].Name = OUString( "KeyModifier" );
+ aArgs[0].Name = "KeyModifier";
aArgs[0].Value <<= KeyModifier;
- aArgs[1].Name = OUString( "Text" );
+ aArgs[1].Name = "Text";
aArgs[1].Value <<= aSelectedText;
return aArgs;
}
diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx
index fd5186c42047..3881275f8a55 100644
--- a/framework/source/uielement/fontmenucontroller.cxx
+++ b/framework/source/uielement/fontmenucontroller.cxx
@@ -201,7 +201,7 @@ void FontMenuController::impl_setPopupMenu()
com::sun::star::util::URL aTargetURL;
// Register for font list updates to get the current font list from the controller
- aTargetURL.Complete = OUString( ".uno:FontNameList" );
+ aTargetURL.Complete = ".uno:FontNameList";
m_xURLTransformer->parseStrict( aTargetURL );
m_xFontListDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 );
}
@@ -213,7 +213,7 @@ void SAL_CALL FontMenuController::updatePopupMenu() throw ( ::com::sun::star::un
osl::ClearableMutexGuard aLock( m_aMutex );
Reference< XDispatch > xDispatch( m_xFontListDispatch );
com::sun::star::util::URL aTargetURL;
- aTargetURL.Complete = OUString( ".uno:FontNameList" );
+ aTargetURL.Complete = ".uno:FontNameList";
m_xURLTransformer->parseStrict( aTargetURL );
aLock.clear();
diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx
index bbdab8158f80..72f5c7e73627 100644
--- a/framework/source/uielement/fontsizemenucontroller.cxx
+++ b/framework/source/uielement/fontsizemenucontroller.cxx
@@ -298,7 +298,7 @@ void FontSizeMenuController::impl_setPopupMenu()
Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
com::sun::star::util::URL aTargetURL;
// Register for font name updates which gives us info about the current font!
- aTargetURL.Complete = OUString( ".uno:CharFontName" );
+ aTargetURL.Complete = ".uno:CharFontName";
m_xURLTransformer->parseStrict( aTargetURL );
m_xCurrentFontDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 );
}
@@ -311,7 +311,7 @@ void SAL_CALL FontSizeMenuController::updatePopupMenu() throw ( ::com::sun::star
Reference< XDispatch > xDispatch( m_xCurrentFontDispatch );
com::sun::star::util::URL aTargetURL;
- aTargetURL.Complete = OUString( ".uno:CharFontName" );
+ aTargetURL.Complete = ".uno:CharFontName";
m_xURLTransformer->parseStrict( aTargetURL );
aLock.clear();
diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx
index 5b9af9d44c52..c8df613f4da0 100644
--- a/framework/source/uielement/generictoolbarcontroller.cxx
+++ b/framework/source/uielement/generictoolbarcontroller.cxx
@@ -162,7 +162,7 @@ throw ( RuntimeException )
Sequence<PropertyValue> aArgs( 1 );
// Add key modifier to argument list
- aArgs[0].Name = OUString( "KeyModifier" );
+ aArgs[0].Name = "KeyModifier";
aArgs[0].Value <<= KeyModifier;
aTargetURL.Complete = aCommandURL;
@@ -228,7 +228,7 @@ throw ( RuntimeException )
if ( aStrValue.matchAsciiL( "($1)", 4 ))
{
OUString aTmp(FwkResId(STR_UPDATEDOC));
- aTmp += OUString( " " );
+ aTmp += " ";
aTmp += aStrValue.copy( 4 );
aStrValue = aTmp;
}
diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx
index 1eb35521b17f..cb37064d5612 100644
--- a/framework/source/uielement/headermenucontroller.cxx
+++ b/framework/source/uielement/headermenucontroller.cxx
@@ -95,8 +95,8 @@ void HeaderMenuController::fillPopupMenu( const Reference< ::com::sun::star::fra
OUString aHeaderFooterIsOnStr( "HeaderIsOn" );
if ( m_bFooter )
{
- aCmd = OUString( ".uno:InsertPageFooter" );
- aHeaderFooterIsOnStr = OUString( "FooterIsOn" );
+ aCmd = ".uno:InsertPageFooter";
+ aHeaderFooterIsOnStr = "FooterIsOn";
}
const OUString aIsPhysicalStr( "IsPhysical" );
const OUString aDisplayNameStr( "DisplayName" );
diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
index 533d96f2d529..0abd71760c19 100644
--- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
@@ -156,7 +156,7 @@ void ImageButtonToolbarController::executeControlCommand( const ::com::sun::star
// send notification
uno::Sequence< beans::NamedValue > aInfo( 1 );
- aInfo[0].Name = OUString( "URL" );
+ aInfo[0].Name = "URL";
aInfo[0].Value <<= aURL;
addNotifyInfo( OUString( "ImageChanged" ),
getDispatchFromCommand( m_aCommandURL ),
diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx
index 3c38e1945467..be0a75d6e0dd 100644
--- a/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/framework/source/uielement/langselectionmenucontroller.cxx
@@ -242,7 +242,7 @@ void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopup
for (it = aLangItems.begin(); it != aLangItems.end(); ++it)
{
const OUString & rStr( *it );
- if (rStr != OUString( aLanguageTable.GetString( LANGUAGE_NONE ) )&&
+ if (rStr != aLanguageTable.GetString( LANGUAGE_NONE ) &&
rStr != sAsterix &&
rStr != sEmpty)
{
@@ -324,10 +324,10 @@ void SAL_CALL LanguageSelectionMenuController::initialize( const Sequence< Any >
if ( m_bInitialized )
{
- m_aLangStatusCommandURL = OUString( ".uno:LanguageStatus" );
+ m_aLangStatusCommandURL = ".uno:LanguageStatus";
m_aMenuCommandURL_Lang = m_aLangStatusCommandURL;
- m_aMenuCommandURL_Font = OUString( ".uno:FontDialog" );
- m_aMenuCommandURL_CharDlgForParagraph = OUString( ".uno:FontDialogForParagraph" );
+ m_aMenuCommandURL_Font = ".uno:FontDialog";
+ m_aMenuCommandURL_CharDlgForParagraph = ".uno:FontDialogForParagraph";
}
}
}
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index a344d3b3b6c2..866ea133a4bf 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -499,7 +499,7 @@ throw ( RuntimeException )
if ( aItemText.matchAsciiL( "($1)", 4 ))
{
OUString aTmp(FWK_RESSTR(STR_UPDATEDOC));
- aTmp += OUString( " " );
+ aTmp += " ";
aTmp += aItemText.copy( 4 );
aItemText = aTmp;
}
@@ -899,8 +899,7 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
OUString aItemCommand = pMenu->GetItemCommand( pMenuItemHandler->nItemId );
if ( aItemCommand.isEmpty() )
{
- aItemCommand = OUString( "slot:" );
- aItemCommand += OUString::number( pMenuItemHandler->nItemId );
+ aItemCommand = "slot:" + OUString::number( pMenuItemHandler->nItemId );
pMenu->SetItemCommand( pMenuItemHandler->nItemId, aItemCommand );
}
@@ -1072,7 +1071,7 @@ IMPL_LINK( MenuBarManager, Select, Menu *, pMenu )
{
// bookmark menu item selected
aArgs.realloc( 1 );
- aArgs[0].Name = OUString( "Referer" );
+ aArgs[0].Name = "Referer";
aArgs[0].Value <<= OUString( "private:user" );
}
@@ -1158,10 +1157,10 @@ sal_Bool MenuBarManager::CreatePopupMenuController( MenuItemHandler* pMenuItemHa
Sequence< Any > aSeq( 2 );
PropertyValue aPropValue;
- aPropValue.Name = OUString( "ModuleIdentifier" );
+ aPropValue.Name = "ModuleIdentifier";
aPropValue.Value <<= m_aModuleIdentifier;
aSeq[0] <<= aPropValue;
- aPropValue.Name = OUString( "Frame" );
+ aPropValue.Name = "Frame";
aPropValue.Value <<= m_xFrame;
aSeq[1] <<= aPropValue;
@@ -1333,9 +1332,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
pPopup->SetPopupMenu( ITEMID_ADDONLIST, pSubMenu );
// Set item command for popup menu to enable it for GetImageFromURL
- const OUString aSlotString( "slot:" );
- OUString aNewItemCommand( aSlotString );
- aNewItemCommand += OUString::number( ITEMID_ADDONLIST );
+ OUString aNewItemCommand = "slot:" + OUString::number( ITEMID_ADDONLIST );
pPopup->SetItemCommand( ITEMID_ADDONLIST, aNewItemCommand );
}
else
@@ -1950,9 +1947,7 @@ sal_uInt16 MenuBarManager::FillItemCommand(OUString& _rItemCommand, Menu* _pMenu
_rItemCommand = _pMenu->GetItemCommand( nItemId );
if ( _rItemCommand.isEmpty() )
{
- const static OUString aSlotString( "slot:" );
- _rItemCommand = aSlotString;
- _rItemCommand += OUString::number( nItemId );
+ _rItemCommand = "slot:" + OUString::number( nItemId );
_pMenu->SetItemCommand( nItemId, _rItemCommand );
}
return nItemId;
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index 7028a8098fb7..63c4976c4b0d 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -417,7 +417,7 @@ void SAL_CALL NewMenuController::itemSelected( const css::awt::MenuEvent& rEvent
xURLTransformer->parseStrict( aTargetURL );
- aArgsList[0].Name = OUString( "Referer" );
+ aArgsList[0].Name = "Referer";
aArgsList[0].Value = makeAny( OUString( "private:user" ));
OUString aTargetFrame( m_aTargetFrame );
diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
index 39c0cef03baf..26480d1d7768 100644
--- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx
+++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
@@ -229,9 +229,9 @@ Sequence<PropertyValue> SpinfieldToolbarController::getExecuteArgs(sal_Int16 Key
OUString aSpinfieldText = m_pSpinfieldControl->GetText();
// Add key modifier to argument list
- aArgs[0].Name = OUString( "KeyModifier" );
+ aArgs[0].Name = "KeyModifier";
aArgs[0].Value <<= KeyModifier;
- aArgs[1].Name = OUString( "Value" );
+ aArgs[1].Name = "Value";
if ( m_bFloat )
aArgs[1].Value <<= aSpinfieldText.toDouble();
else
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx
index da44a22d4e8c..587c85d0eca2 100644
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -336,29 +336,29 @@ void StatusBarManager::CreateControllers()
aPropValue.Value <<= aCommandURL;
aPropVector.push_back( uno::makeAny( aPropValue ) );
- aPropValue.Name = OUString( "ModuleIdentifier" );
+ aPropValue.Name = "ModuleIdentifier";
aPropValue.Value <<= m_aModuleIdentifier;
aPropVector.push_back( uno::makeAny( aPropValue ) );
- aPropValue.Name = OUString( "Frame" );
+ aPropValue.Name = "Frame";
aPropValue.Value <<= m_xFrame;
aPropVector.push_back( uno::makeAny( aPropValue ) );
// TODO remove this
- aPropValue.Name = OUString( "ServiceManager" );
+ aPropValue.Name = "ServiceManager";
aPropValue.Value = uno::makeAny( uno::Reference<lang::XMultiServiceFactory>(m_xContext->getServiceManager(), uno::UNO_QUERY_THROW) );
aPropVector.push_back( uno::makeAny( aPropValue ) );
- aPropValue.Name = OUString( "ParentWindow" );
+ aPropValue.Name = "ParentWindow";
aPropValue.Value <<= xStatusbarWindow;
aPropVector.push_back( uno::makeAny( aPropValue ) );
// TODO still needing with the css::ui::XStatusbarItem?
- aPropValue.Name = OUString( "Identifier" );
+ aPropValue.Name = "Identifier";
aPropValue.Value <<= nId;
aPropVector.push_back( uno::makeAny( aPropValue ) );
- aPropValue.Name = OUString( "StatusbarItem" );
+ aPropValue.Name = "StatusbarItem";
aPropValue.Value <<= xStatusbarItem;
aPropVector.push_back( uno::makeAny( aPropValue ) );
diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
index dde27445fa09..b015338148d2 100644
--- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
@@ -93,9 +93,9 @@ Sequence<PropertyValue> ToggleButtonToolbarController::getExecuteArgs(sal_Int16
Sequence<PropertyValue> aArgs( 2 );
// Add key modifier to argument list
- aArgs[0].Name = OUString( "KeyModifier" );
+ aArgs[0].Name = "KeyModifier";
aArgs[0].Value <<= KeyModifier;
- aArgs[1].Name = OUString( "Text" );
+ aArgs[1].Name = "Text";
aArgs[1].Value <<= m_aCurrentSelection;
return aArgs;
}
@@ -157,7 +157,7 @@ void ToggleButtonToolbarController::executeControlCommand( const ::com::sun::sta
// send notification
uno::Sequence< beans::NamedValue > aInfo( 1 );
- aInfo[0].Name = OUString( "List" );
+ aInfo[0].Name = "List";
aInfo[0].Value <<= aList;
addNotifyInfo( OUString( "ListChanged" ),
getDispatchFromCommand( m_aCommandURL ),
@@ -184,7 +184,7 @@ void ToggleButtonToolbarController::executeControlCommand( const ::com::sun::sta
// send notification
uno::Sequence< beans::NamedValue > aInfo( 1 );
- aInfo[0].Name = OUString( "ItemChecked" );
+ aInfo[0].Name = "ItemChecked";
aInfo[0].Value <<= nPos;
addNotifyInfo( OUString( "Pos" ),
getDispatchFromCommand( m_aCommandURL ),
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 4cff1966bdce..3a2617b6dd64 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -892,17 +892,17 @@ void ToolBarManager::CreateControllers()
PropertyValue aPropValue;
std::vector< Any > aPropertyVector;
- aPropValue.Name = OUString( "ModuleIdentifier" );
+ aPropValue.Name = "ModuleIdentifier";
aPropValue.Value <<= m_aModuleIdentifier;
aPropertyVector.push_back( makeAny( aPropValue ));
- aPropValue.Name = OUString( "Frame" );
+ aPropValue.Name = "Frame";
aPropValue.Value <<= m_xFrame;
aPropertyVector.push_back( makeAny( aPropValue ));
- aPropValue.Name = OUString( "ServiceManager" );
+ aPropValue.Name = "ServiceManager";
Reference<XMultiServiceFactory> xMSF(m_xContext->getServiceManager(), UNO_QUERY_THROW);
aPropValue.Value <<= xMSF;
aPropertyVector.push_back( makeAny( aPropValue ));
- aPropValue.Name = OUString( "ParentWindow" );
+ aPropValue.Name = "ParentWindow";
aPropValue.Value <<= xToolbarWindow;
aPropertyVector.push_back( makeAny( aPropValue ));
aPropValue.Name = "Identifier";
@@ -911,7 +911,7 @@ void ToolBarManager::CreateControllers()
if ( nWidth > 0 )
{
- aPropValue.Name = OUString( "Width" );
+ aPropValue.Name = "Width";
aPropValue.Value <<= nWidth;
aPropertyVector.push_back( makeAny( aPropValue ));
}
@@ -1005,20 +1005,20 @@ void ToolBarManager::CreateControllers()
PropertyValue aPropValue;
std::vector< Any > aPropertyVector;
- aPropValue.Name = OUString( "Frame" );
+ aPropValue.Name = "Frame";
aPropValue.Value <<= m_xFrame;
aPropertyVector.push_back( makeAny( aPropValue ));
- aPropValue.Name = OUString( "CommandURL" );
+ aPropValue.Name = "CommandURL";
aPropValue.Value <<= aCommandURL;
aPropertyVector.push_back( makeAny( aPropValue ));
- aPropValue.Name = OUString( "ServiceManager" );
+ aPropValue.Name = "ServiceManager";
Reference<XMultiServiceFactory> xMSF(m_xContext->getServiceManager(), UNO_QUERY_THROW);
aPropValue.Value <<= xMSF;
aPropertyVector.push_back( makeAny( aPropValue ));
- aPropValue.Name = OUString( "ParentWindow" );
+ aPropValue.Name = "ParentWindow";
aPropValue.Value <<= xToolbarWindow;
aPropertyVector.push_back( makeAny( aPropValue ));
- aPropValue.Name = OUString( "ModuleIdentifier" );
+ aPropValue.Name = "ModuleIdentifier";
aPropValue.Value <<= m_aModuleIdentifier;
aPropertyVector.push_back( makeAny( aPropValue ));
aPropValue.Name = "Identifier";
@@ -1027,7 +1027,7 @@ void ToolBarManager::CreateControllers()
if ( nWidth > 0 )
{
- aPropValue.Name = OUString( "Width" );
+ aPropValue.Name = "Width";
aPropValue.Value <<= nWidth;
aPropertyVector.push_back( makeAny( aPropValue ));
}
@@ -1297,9 +1297,9 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
OUString sShortCut;
if( RetrieveShortcut( aCommandURL, sShortCut ) )
{
- sQuickHelp += OUString( " (" );
+ sQuickHelp += " (";
sQuickHelp += sShortCut;
- sQuickHelp += OUString( ")" );
+ sQuickHelp += ")";
}
m_pToolBar->SetQuickHelpText( nId, sQuickHelp );
@@ -1680,7 +1680,7 @@ bool ToolBarManager::MenuItemAllowed( sal_uInt16 ) const
if ( m_xFrame.is() )
{
Reference< XDispatchProvider > xProv( m_xFrame, UNO_QUERY );
- aURL.Complete = OUString( ".uno:ConfigureDialog" );
+ aURL.Complete = ".uno:ConfigureDialog";
m_xURLTransformer->parseStrict( aURL );
if ( xProv.is() )
xDisp = xProv->queryDispatch( aURL, OUString(), 0 );
@@ -1840,7 +1840,7 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu )
if ( m_xFrame.is() )
{
Reference< XDispatchProvider > xProv( m_xFrame, UNO_QUERY );
- aURL.Complete = OUString( ".uno:ConfigureDialog" );
+ aURL.Complete = ".uno:ConfigureDialog";
m_xURLTransformer->parseStrict( aURL );
if ( xProv.is() )
xDisp = xProv->queryDispatch( aURL, OUString(), 0 );
diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx
index d930bc58cfd6..fb39ab5f4200 100644
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.cxx
@@ -206,12 +206,12 @@ ConfigurationAccess_UICommand::ConfigurationAccess_UICommand( const OUString& aM
{
// Create configuration hierachical access name
m_aConfigCmdAccess += aModuleName;
- m_aConfigCmdAccess += OUString( CONFIGURATION_CMD_ELEMENT_ACCESS );
+ m_aConfigCmdAccess += CONFIGURATION_CMD_ELEMENT_ACCESS;
m_xConfigProvider = theDefaultProvider::get( rxContext );
m_aConfigPopupAccess += aModuleName;
- m_aConfigPopupAccess += OUString( CONFIGURATION_POP_ELEMENT_ACCESS );
+ m_aConfigPopupAccess += CONFIGURATION_POP_ELEMENT_ACCESS;
}
ConfigurationAccess_UICommand::~ConfigurationAccess_UICommand()
@@ -524,7 +524,7 @@ sal_Bool ConfigurationAccess_UICommand::initializeConfigAccess()
try
{
- aPropValue.Name = OUString( "nodepath" );
+ aPropValue.Name = "nodepath";
aPropValue.Value <<= m_aConfigCmdAccess;
aArgs[0] <<= aPropValue;
diff --git a/framework/source/uifactory/addonstoolboxfactory.cxx b/framework/source/uifactory/addonstoolboxfactory.cxx
index 990f32d06d62..1a7822b58364 100644
--- a/framework/source/uifactory/addonstoolboxfactory.cxx
+++ b/framework/source/uifactory/addonstoolboxfactory.cxx
@@ -175,13 +175,13 @@ throw ( ::com::sun::star::container::NoSuchElementException,
{
PropertyValue aPropValue;
Sequence< Any > aPropSeq( 3 );
- aPropValue.Name = OUString( "Frame" );
+ aPropValue.Name = "Frame";
aPropValue.Value <<= xFrame;
aPropSeq[0] <<= aPropValue;
- aPropValue.Name = OUString( "ConfigurationData" );
+ aPropValue.Name = "ConfigurationData";
aPropValue.Value <<= aConfigData;
aPropSeq[1] <<= aPropValue;
- aPropValue.Name = OUString( "ResourceURL" );
+ aPropValue.Name = "ResourceURL";
aPropValue.Value <<= aResourceURL;
aPropSeq[2] <<= aPropValue;
diff --git a/framework/source/uifactory/factoryconfiguration.cxx b/framework/source/uifactory/factoryconfiguration.cxx
index 4dddf510e7c5..dd61fa55ef7b 100644
--- a/framework/source/uifactory/factoryconfiguration.cxx
+++ b/framework/source/uifactory/factoryconfiguration.cxx
@@ -211,7 +211,7 @@ void ConfigurationAccess_ControllerFactory::readConfigurationData()
Sequence< Any > aArgs( 1 );
PropertyValue aPropValue;
- aPropValue.Name = OUString( "nodepath" );
+ aPropValue.Name = "nodepath";
aPropValue.Value <<= m_sRoot;
aArgs[0] <<= aPropValue;
diff --git a/framework/source/uifactory/menubarfactory.cxx b/framework/source/uifactory/menubarfactory.cxx
index be4ec8943223..cbda3ce4d6fc 100644
--- a/framework/source/uifactory/menubarfactory.cxx
+++ b/framework/source/uifactory/menubarfactory.cxx
@@ -159,16 +159,16 @@ void MenuBarFactory::CreateUIElement(const OUString& ResourceURL
PropertyValue aPropValue;
Sequence< Any > aPropSeq( _pExtraMode ? 5 : 4);
- aPropValue.Name = OUString( "Frame" );
+ aPropValue.Name = "Frame";
aPropValue.Value <<= xFrame;
aPropSeq[0] <<= aPropValue;
- aPropValue.Name = OUString( "ConfigurationSource" );
+ aPropValue.Name = "ConfigurationSource";
aPropValue.Value <<= xCfgMgr;
aPropSeq[1] <<= aPropValue;
- aPropValue.Name = OUString( "ResourceURL" );
+ aPropValue.Name = "ResourceURL";
aPropValue.Value <<= aResourceURL;
aPropSeq[2] <<= aPropValue;
- aPropValue.Name = OUString( "Persistent" );
+ aPropValue.Name = "Persistent";
aPropValue.Value <<= bPersistent;
aPropSeq[3] <<= aPropValue;
if ( _pExtraMode )
diff --git a/framework/source/uifactory/uicontrollerfactory.cxx b/framework/source/uifactory/uicontrollerfactory.cxx
index 0eedfa73f40d..2303bebf89e4 100644
--- a/framework/source/uifactory/uicontrollerfactory.cxx
+++ b/framework/source/uifactory/uicontrollerfactory.cxx
@@ -120,7 +120,7 @@ throw (Exception, RuntimeException)
// Append the command URL to the Arguments sequence so that one controller can be
// used for more than one command URL.
- aPropValue.Name = OUString( "CommandURL" );
+ aPropValue.Name = "CommandURL";
aPropValue.Value <<= ServiceSpecifier;
aNewArgs[nAppendIndex] <<= aPropValue;
diff --git a/framework/source/uifactory/uielementfactorymanager.cxx b/framework/source/uifactory/uielementfactorymanager.cxx
index 1c203db3bcaf..d1dd274e3501 100644
--- a/framework/source/uifactory/uielementfactorymanager.cxx
+++ b/framework/source/uifactory/uielementfactorymanager.cxx
@@ -282,7 +282,7 @@ void ConfigurationAccess_FactoryManager::readConfigurationData()
Sequence< Any > aArgs( 1 );
PropertyValue aPropValue;
- aPropValue.Name = OUString( "nodepath" );
+ aPropValue.Name = "nodepath";
aPropValue.Value <<= m_sRoot;
aArgs[0] <<= aPropValue;