diff options
author | Noel Grandin <noel@peralex.com> | 2013-11-15 11:05:19 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-11-19 10:29:31 +0200 |
commit | 610b2b94b33b0fc2d79cd515f9e293ca1c2610e8 (patch) | |
tree | 6eab2639cb8104ca54daa3f7a2ebd83ef1566cf0 /svx | |
parent | 2c35fff7eca3a143d28dc75e6a73fe1101d2af77 (diff) |
remove unnecessary use of OUString constructor when assigning
change code like
aStr = OUString("xxxx");
to
aStr = "xxxx";
Change-Id: Ib981a5cc735677ec5dba76ef9279a107d22e99d4
Diffstat (limited to 'svx')
35 files changed, 107 insertions, 109 deletions
diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx index fd913e6f1403..c6e4794d4de3 100644 --- a/svx/source/accessibility/AccessibleFrameSelector.cxx +++ b/svx/source/accessibility/AccessibleFrameSelector.cxx @@ -567,9 +567,9 @@ Sequence< OUString > AccFrameSelector::getSupportedServiceNames( ) { Sequence< OUString > aRet(3); OUString* pArray = aRet.getArray(); - pArray[0] = OUString( "Accessible" ); - pArray[1] = OUString( "AccessibleContext" ); - pArray[2] = OUString( "AccessibleComponent" ); + pArray[0] = "Accessible"; + pArray[1] = "AccessibleContext"; + pArray[2] = "AccessibleComponent"; return aRet; } diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx index 92e8775868fb..50266e8c069c 100644 --- a/svx/source/form/databaselocationinput.cxx +++ b/svx/source/form/databaselocationinput.cxx @@ -194,7 +194,7 @@ namespace svx if ( m_aFilterExtensions.getLength() == 0 ) { m_aFilterExtensions.realloc(1); - m_aFilterExtensions[0] = OUString( "*.odb" ); + m_aFilterExtensions[0] = "*.odb"; } } diff --git a/svx/source/form/fmcontrollayout.cxx b/svx/source/form/fmcontrollayout.cxx index dc930f295173..1a2a3b8fe449 100644 --- a/svx/source/form/fmcontrollayout.cxx +++ b/svx/source/form/fmcontrollayout.cxx @@ -101,20 +101,20 @@ namespace svxform || xDocumentSI->supportsService("com.sun.star.text.WebDocument") ) { - _rFamilyName = OUString( "ParagraphStyles" ); - _rStyleName = OUString( "Standard" ); + _rFamilyName = "ParagraphStyles"; + _rStyleName = "Standard"; } else if ( xDocumentSI->supportsService("com.sun.star.sheet.SpreadsheetDocument") ) { - _rFamilyName = OUString( "CellStyles" ); - _rStyleName = OUString( "Default" ); + _rFamilyName = "CellStyles"; + _rStyleName = "Default"; } else if ( xDocumentSI->supportsService("com.sun.star.drawing.DrawingDocument") || xDocumentSI->supportsService("com.sun.star.presentation.PresentationDocument") ) { - _rFamilyName = OUString( "graphics" ); - _rStyleName = OUString( "standard" ); + _rFamilyName = "graphics"; + _rStyleName = "standard"; } else bSuccess = false; @@ -163,7 +163,7 @@ namespace svxform // fall back to CharLocale property at the style if ( aDocumentCharLocale.Language.isEmpty() ) { - sCharLocalePropertyName = OUString( "CharLocale" ); + sCharLocalePropertyName = "CharLocale"; if ( xStylePSI->hasPropertyByName( sCharLocalePropertyName ) ) { OSL_VERIFY( xStyle->getPropertyValue( sCharLocalePropertyName ) >>= aDocumentCharLocale ); @@ -282,7 +282,7 @@ namespace svxform //-------------------------------------------------------------------- ::utl::OConfigurationNode ControlLayouter::getLayoutSettings( DocumentType _eDocType ) { - OUString sConfigName = OUString( "/org.openoffice.Office.Common/Forms/ControlLayout/" ); + OUString sConfigName = "/org.openoffice.Office.Common/Forms/ControlLayout/"; sConfigName += DocumentClassification::getModuleIdentifierForDocumentType( _eDocType ); return OConfigurationTreeRoot::createWithComponentContext( ::comphelper::getProcessComponentContext(), // TODO diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx index 070cdb8dd60e..3e4374f25ee6 100644 --- a/svx/source/form/fmscriptingenv.cxx +++ b/svx/source/form/fmscriptingenv.cxx @@ -986,9 +986,9 @@ namespace svxform { // legacy format: use the app-wide Basic, if it has a respective method, otherwise fall back to the doc's Basic if ( SFX_APP()->GetBasicManager()->HasMacro( sScriptCode ) ) - sMacroLocation = OUString( "application" ); + sMacroLocation = "application"; else - sMacroLocation = OUString( "document" ); + sMacroLocation = "document"; } OUStringBuffer aScriptURI; diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index 5d251b67fb4a..a2e2530ef745 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -455,7 +455,7 @@ namespace svx if ( pAsciiUnoName ) { - sSlotUnoName = OUString( ".uno:" ); + sSlotUnoName = ".uno:"; sSlotUnoName += OUString::createFromAscii( pAsciiUnoName ); } #if OSL_DEBUG_LEVEL > 0 @@ -533,7 +533,7 @@ namespace svx Reference< XPropertySetInfo > xPSI; if ( xModelProps.is() ) xPSI = xModelProps->getPropertySetInfo(); - OUString sRichTextPropertyName = OUString( "RichText" ); + OUString sRichTextPropertyName = "RichText"; if ( xPSI.is() && xPSI->hasPropertyByName( sRichTextPropertyName ) ) { OSL_VERIFY( xModelProps->getPropertyValue( sRichTextPropertyName ) >>= bIsRichText ); @@ -596,7 +596,7 @@ namespace svx if ( SFX_APP() ) sUnoSlotName = lcl_getUnoSlotName( *SFX_APP(), nSlotId ); else - sUnoSlotName = OUString( "<unknown>" ); + sUnoSlotName = "<unknown>"; OString sUnoSlotNameAscii( "\"" ); sUnoSlotNameAscii += OString( sUnoSlotName.getStr(), sUnoSlotName.getLength(), RTL_TEXTENCODING_ASCII_US ); sUnoSlotNameAscii += "\""; @@ -731,7 +731,7 @@ namespace svx if ( pBoolItem ) { aArgs.realloc( 1 ); - aArgs[ 0 ].Name = OUString( "Enable" ); + aArgs[ 0 ].Name = "Enable"; aArgs[ 0 ].Value <<= (sal_Bool)pBoolItem->GetValue(); } } diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx index ab79fe9575de..bc6eab52b840 100644 --- a/svx/source/form/tbxform.cxx +++ b/svx/source/form/tbxform.cxx @@ -85,7 +85,7 @@ void SvxFmAbsRecWin::FirePosition( sal_Bool _bForce ) Any a; Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = OUString( "Position" ); + aArgs[0].Name = "Position"; aPositionParam.QueryValue( a ); aArgs[0].Value = a; m_pController->Dispatch( OUString( ".uno:AbsoluteRecord" ), @@ -191,8 +191,7 @@ void SvxFmTbxCtlConfig::StateChanged(sal_uInt16 nSID, SfxItemState eState, const case SID_FM_SCROLLBAR: case SID_FM_SPINBUTTON: { // set a new image, matching to this slot - OUString aSlotURL( "slot:" ); - aSlotURL += OUString::number( nSlot); + OUString aSlotURL = "slot:" + OUString::number( nSlot); Image aImage = GetImage( m_xFrame, aSlotURL, hasBigImages() ); GetToolBox().SetItemImage( GetId(), aImage ); nLastSlot = nSlot; diff --git a/svx/source/form/xfm_addcondition.cxx b/svx/source/form/xfm_addcondition.cxx index c16e67ed5d14..b5456c487e7f 100644 --- a/svx/source/form/xfm_addcondition.cxx +++ b/svx/source/form/xfm_addcondition.cxx @@ -53,7 +53,7 @@ namespace svxform Sequence< OUString > SAL_CALL OAddConditionDialog_GetSupportedServiceNames() { ::comphelper::StringSequence aSupported( 1 ); - aSupported.getArray()[0] = OUString( "com.sun.star.xforms.ui.dialogs.AddCondition" ); + aSupported.getArray()[0] = "com.sun.star.xforms.ui.dialogs.AddCondition"; return aSupported; } diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index 59a0a4a196d4..a8dafac8533d 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -376,17 +376,17 @@ IMPL_LINK( GalleryThemePopup, BackgroundMenuSelectHdl, Menu*, pMenu ) OUString aFilterName( mpBrowser->GetFilterName() ); css::uno::Sequence< css::beans::PropertyValue > aArgs( 6 ); - aArgs[0].Name = OUString( "Background.Transparent" ); + aArgs[0].Name = "Background.Transparent"; aArgs[0].Value <<= sal_Int32( 0 ); // 0 - 100 - aArgs[1].Name = OUString( "Background.BackColor" ); + aArgs[1].Name = "Background.BackColor"; aArgs[1].Value <<= sal_Int32( - 1 ); - aArgs[2].Name = OUString( "Background.URL" ); + aArgs[2].Name = "Background.URL"; aArgs[2].Value <<= aURL; - aArgs[3].Name = OUString( "Background.Filtername" ); // FIXME should be FilterName + aArgs[3].Name = "Background.Filtername"; // FIXME should be FilterName aArgs[3].Value <<= aFilterName; - aArgs[4].Name = OUString( "Background.Position" ); + aArgs[4].Name = "Background.Position"; aArgs[4].Value <<= css::style::GraphicLocation_TILED; - aArgs[5].Name = OUString( "Position" ); + aArgs[5].Name = "Position"; aArgs[5].Value <<= nPos; const CommandInfoMap::const_iterator it = m_aCommandInfo.find( SID_GALLERY_BG_BRUSH ); @@ -1101,7 +1101,7 @@ void GalleryBrowser2::Dispatch( if ( !xDispatchProvider.is() || !m_xTransformer.is() ) return; - aURL.Complete = OUString( CMD_SID_GALLERY_FORMATS ); + aURL.Complete = CMD_SID_GALLERY_FORMATS; m_xTransformer->parseStrict( aURL ); xDispatch = xDispatchProvider->queryDispatch( aURL, @@ -1146,19 +1146,19 @@ void GalleryBrowser2::Dispatch( css::uno::Sequence< css::beans::PropertyValue > aSeq( SVXGALLERYITEM_PARAMS ); - aSeq[0].Name = OUString( SVXGALLERYITEM_TYPE ); + aSeq[0].Name = SVXGALLERYITEM_TYPE; aSeq[0].Value <<= nType; - aSeq[1].Name = OUString( SVXGALLERYITEM_URL ); + aSeq[1].Name = SVXGALLERYITEM_URL; aSeq[1].Value <<= aFileURL; - aSeq[2].Name = OUString( SVXGALLERYITEM_FILTER ); + aSeq[2].Name = SVXGALLERYITEM_FILTER; aSeq[2].Value <<= aFilterName; - aSeq[3].Name = OUString( SVXGALLERYITEM_DRAWING ); + aSeq[3].Name = SVXGALLERYITEM_DRAWING; aSeq[3].Value <<= xDrawing; - aSeq[4].Name = OUString( SVXGALLERYITEM_GRAPHIC ); + aSeq[4].Name = SVXGALLERYITEM_GRAPHIC; aSeq[4].Value <<= xGraphic; css::uno::Sequence< css::beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = OUString( SVXGALLERYITEM_ARGNAME ); + aArgs[0].Name = SVXGALLERYITEM_ARGNAME; aArgs[0].Value <<= aSeq; DispatchInfo *pInfo = new DispatchInfo; diff --git a/svx/source/mnuctrls/clipboardctl.cxx b/svx/source/mnuctrls/clipboardctl.cxx index b3f9d057406c..b1019314a073 100644 --- a/svx/source/mnuctrls/clipboardctl.cxx +++ b/svx/source/mnuctrls/clipboardctl.cxx @@ -95,7 +95,7 @@ SfxPopupWindow* SvxClipBoardControl::CreatePopupWindow() Any a; Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = OUString( "SelectedFormat" ); + aArgs[0].Name = "SelectedFormat"; aItem.QueryValue( a ); aArgs[0].Value = a; Dispatch( OUString( ".uno:ClipboardFormatItems" ), diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx index ccf81f154a1c..7139d6879e41 100644 --- a/svx/source/stbctrls/insctrl.cxx +++ b/svx/source/stbctrls/insctrl.cxx @@ -80,7 +80,7 @@ void SvxInsertStatusBarControl::Click() ::com::sun::star::uno::Any a; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = OUString( "InsertMode" ); + aArgs[0].Name = "InsertMode"; aIns.QueryValue( a ); aArgs[0].Value = a; diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index 8330399e1851..ad9c22b99286 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -324,7 +324,7 @@ void SvxPosSizeStatusBarControl::Command( const CommandEvent& rCEvt ) SfxUInt16Item aItem( SID_PSZ_FUNCTION, nSelect ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = OUString( "StatusBarFunc" ); + aArgs[0].Name = "StatusBarFunc"; aItem.QueryValue( a ); aArgs[0].Value = a; diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx index 64d46bed51a2..fc72cb621f8c 100644 --- a/svx/source/stbctrls/zoomsliderctrl.cxx +++ b/svx/source/stbctrls/zoomsliderctrl.cxx @@ -353,7 +353,7 @@ sal_Bool SvxZoomSliderControl::MouseButtonDown( const MouseEvent & rEvt ) aZoomSliderItem.QueryValue( a ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = OUString( "ZoomSlider" ); + aArgs[0].Name = "ZoomSlider"; aArgs[0].Value = a; execute( aArgs ); @@ -396,7 +396,7 @@ sal_Bool SvxZoomSliderControl::MouseMove( const MouseEvent & rEvt ) aZoomSliderItem.QueryValue( a ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = OUString( "ZoomSlider" ); + aArgs[0].Name = "ZoomSlider"; aArgs[0].Value = a; execute( aArgs ); diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 9a96952f7c3d..ff644a5f0276 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -126,7 +126,7 @@ const Graphic ImpLoadLinkedGraphic( const OUString& aFileName, const OUString& a // As this is a linked graphic the GfxLink is not needed if saving/loading our own format. // But this link is required by some filters to access the native graphic (PDF export/MS export), // there we should create a new service to provide this data if needed - aFilterData[ 0 ].Name = OUString( "CreateNativeLink" ); + aFilterData[ 0 ].Name = "CreateNativeLink"; aFilterData[ 0 ].Value = Any( true ); rGF.ImportGraphic( aGraphic, aEmptyStr, *pInStrm, nFilter, NULL, 0, &aFilterData ); } @@ -673,9 +673,9 @@ void SdrGrafObj::SetGraphicLink(const OUString& rFileName, const OUString& rRefe void SdrGrafObj::ReleaseGraphicLink() { ImpLinkAbmeldung(); - aFileName = OUString(); + aFileName = ""; aReferer = ""; - aFilterName = OUString(); + aFilterName = ""; } bool SdrGrafObj::IsLinkedGraphic() const diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index 0c30e7ac9039..292925213f61 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -917,7 +917,7 @@ sal_Bool SdrOle2Obj::UpdateLinkURL_Impl() // TODO/LATER: there should be possible to get current mediadescriptor settings from the object uno::Sequence< beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = OUString( "URL" ); + aArgs[0].Name = "URL"; aArgs[0].Value <<= OUString( aNewLinkURL ); xPersObj->reload( aArgs, uno::Sequence< beans::PropertyValue >() ); diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index 0ab0bd5f24ce..d4f199bf07e6 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -896,8 +896,8 @@ Sequence< OUString > SAL_CALL Cell::getSupportedServiceNames( ) throw (RuntimeE Sequence< OUString > aSeq( SvxUnoTextBase::getSupportedServiceNames() ); sal_Int32 nIndex = aSeq.getLength(); aSeq.realloc( nIndex + 2 ); - aSeq[nIndex++] = OUString( "com.sun.star.table.cell" ); - aSeq[nIndex++] = OUString( "com.sun.star.drawing.cell" ); + aSeq[nIndex++] = "com.sun.star.table.cell"; + aSeq[nIndex++] = "com.sun.star.drawing.cell"; return aSeq; } diff --git a/svx/source/table/tablecolumn.cxx b/svx/source/table/tablecolumn.cxx index ca3212ceeb8a..5ab1030a7e96 100644 --- a/svx/source/table/tablecolumn.cxx +++ b/svx/source/table/tablecolumn.cxx @@ -253,32 +253,32 @@ rtl::Reference< FastPropertySetInfo > TableColumn::getStaticPropertySetInfo() { PropertyVector aProperties(6); - aProperties[0].Name = OUString( "Width" ); + aProperties[0].Name = "Width"; aProperties[0].Handle = Property_Width; aProperties[0].Type = ::getCppuType((const sal_Int32*)0); aProperties[0].Attributes = 0; - aProperties[1].Name = OUString( "OptimalWidth" ); + aProperties[1].Name = "OptimalWidth"; aProperties[1].Handle = Property_OptimalWidth; aProperties[1].Type = ::getBooleanCppuType(); aProperties[1].Attributes = 0; - aProperties[2].Name = OUString( "IsVisible" ); + aProperties[2].Name = "IsVisible"; aProperties[2].Handle = Property_IsVisible; aProperties[2].Type = ::getBooleanCppuType(); aProperties[2].Attributes = 0; - aProperties[3].Name = OUString( "IsStartOfNewPage" ); + aProperties[3].Name = "IsStartOfNewPage"; aProperties[3].Handle = Property_IsStartOfNewPage; aProperties[3].Type = ::getBooleanCppuType(); aProperties[3].Attributes = 0; - aProperties[4].Name = OUString( "Size" ); + aProperties[4].Name = "Size"; aProperties[4].Handle = Property_Width; aProperties[4].Type = ::getCppuType((const sal_Int32*)0); aProperties[4].Attributes = 0; - aProperties[5].Name = OUString( "OptimalSize" ); + aProperties[5].Name = "OptimalSize"; aProperties[5].Handle = Property_OptimalWidth; aProperties[5].Type = ::getBooleanCppuType(); aProperties[5].Attributes = 0; diff --git a/svx/source/table/tablerow.cxx b/svx/source/table/tablerow.cxx index 936c9ca05237..ab77a38b8997 100644 --- a/svx/source/table/tablerow.cxx +++ b/svx/source/table/tablerow.cxx @@ -327,32 +327,32 @@ rtl::Reference< FastPropertySetInfo > TableRow::getStaticPropertySetInfo() { PropertyVector aProperties(6); - aProperties[0].Name = OUString( "Height" ); + aProperties[0].Name = "Height"; aProperties[0].Handle = Property_Height; aProperties[0].Type = ::getCppuType((const sal_Int32*)0); aProperties[0].Attributes = 0; - aProperties[1].Name = OUString( "OptimalHeight" ); + aProperties[1].Name = "OptimalHeight"; aProperties[1].Handle = Property_OptimalHeight; aProperties[1].Type = ::getBooleanCppuType(); aProperties[1].Attributes = 0; - aProperties[2].Name = OUString( "IsVisible" ); + aProperties[2].Name = "IsVisible"; aProperties[2].Handle = Property_IsVisible; aProperties[2].Type = ::getBooleanCppuType(); aProperties[2].Attributes = 0; - aProperties[3].Name = OUString( "IsStartOfNewPage" ); + aProperties[3].Name = "IsStartOfNewPage"; aProperties[3].Handle = Property_IsStartOfNewPage; aProperties[3].Type = ::getBooleanCppuType(); aProperties[3].Attributes = 0; - aProperties[4].Name = OUString( "Size" ); + aProperties[4].Name = "Size"; aProperties[4].Handle = Property_Height; aProperties[4].Type = ::getCppuType((const sal_Int32*)0); aProperties[4].Attributes = 0; - aProperties[5].Name = OUString( "OptimalSize" ); + aProperties[5].Name = "OptimalSize"; aProperties[5].Handle = Property_OptimalHeight; aProperties[5].Type = ::getBooleanCppuType(); aProperties[5].Attributes = 0; diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index 8f4e8e855259..9a98163f0879 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -267,7 +267,7 @@ OUString SAL_CALL ExtrusionDirectionControl_getImplementationName() Sequence< OUString > SAL_CALL ExtrusionDirectionControl_getSupportedServiceNames() throw( RuntimeException ) { Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString( "com.sun.star.frame.ToolbarController" ); + aSNS.getArray()[0] = "com.sun.star.frame.ToolbarController"; return aSNS; } @@ -462,9 +462,9 @@ IMPL_LINK_NOARG(ExtrusionDepthWindow, SelectHdl) const OUString aCommand( ".uno:ExtrusionDepthDialog" ); Sequence< PropertyValue > aArgs( 2 ); - aArgs[0].Name = OUString( "Depth" ); + aArgs[0].Name = "Depth"; aArgs[0].Value <<= mfDepth; - aArgs[1].Name = OUString( "Metric" ); + aArgs[1].Name = "Metric"; aArgs[1].Value <<= static_cast<sal_Int32>( meUnit ); mrController.dispatchCommand( aCommand, aArgs ); @@ -532,7 +532,7 @@ OUString SAL_CALL ExtrusionDepthController_getImplementationName() Sequence< OUString > SAL_CALL ExtrusionDepthController_getSupportedServiceNames() throw( RuntimeException ) { Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString( "com.sun.star.frame.ToolbarController" ); + aSNS.getArray()[0] = "com.sun.star.frame.ToolbarController"; return aSNS; } @@ -793,7 +793,7 @@ OUString SAL_CALL ExtrusionLightingControl_getImplementationName() Sequence< OUString > SAL_CALL ExtrusionLightingControl_getSupportedServiceNames() throw( RuntimeException ) { Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString( "com.sun.star.frame.ToolbarController" ); + aSNS.getArray()[0] = "com.sun.star.frame.ToolbarController"; return aSNS; } @@ -938,7 +938,7 @@ OUString SAL_CALL ExtrusionSurfaceControl_getImplementationName() Sequence< OUString > SAL_CALL ExtrusionSurfaceControl_getSupportedServiceNames() throw( RuntimeException ) { Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString( "com.sun.star.frame.ToolbarController" ); + aSNS.getArray()[0] = "com.sun.star.frame.ToolbarController"; return aSNS; } diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index f6beef210d03..fd370d9423a7 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -656,7 +656,7 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox ) Sequence< PropertyValue > aArgs( 1 ); // First set the style - aArgs[0].Name = OUString( "FillStyle" ); + aArgs[0].Name = "FillStyle"; aXFillStyleItem.QueryValue( a ); aArgs[0].Value = a; ((SvxFillToolBoxControl*)GetData())->Dispatch( @@ -701,7 +701,7 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox ) XGradient aGradient = aItem.GetGradientList()->GetGradient( nPos )->GetGradient(); XFillGradientItem aXFillGradientItem( pLbFillAttr->GetSelectEntry(), aGradient ); - aArgs[0].Name = OUString( "FillGradient" ); + aArgs[0].Name = "FillGradient"; aXFillGradientItem.QueryValue( a ); aArgs[0].Value = a; ((SvxFillToolBoxControl*)GetData())->Dispatch( OUString( ".uno:FillGradient" ), @@ -724,7 +724,7 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox ) XHatch aHatch = aItem.GetHatchList()->GetHatch( nPos )->GetHatch(); XFillHatchItem aXFillHatchItem( pLbFillAttr->GetSelectEntry(), aHatch ); - aArgs[0].Name = OUString( "FillHatch" ); + aArgs[0].Name = "FillHatch"; aXFillHatchItem.QueryValue( a ); aArgs[0].Value = a; ((SvxFillToolBoxControl*)GetData())->Dispatch( OUString( ".uno:FillHatch" ), @@ -748,7 +748,7 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox ) const XBitmapEntry* pXBitmapEntry = aItem.GetBitmapList()->GetBitmap(nPos); const XFillBitmapItem aXFillBitmapItem(pLbFillAttr->GetSelectEntry(), pXBitmapEntry->GetGraphicObject()); - aArgs[0].Name = OUString( "FillBitmap" ); + aArgs[0].Name = "FillBitmap"; aXFillBitmapItem.QueryValue( a ); aArgs[0].Value = a; ((SvxFillToolBoxControl*)GetData())->Dispatch(OUString(".uno:FillBitmap"), aArgs); diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index 9101a5e55af5..db5131b4b0e8 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -465,7 +465,7 @@ OUString SAL_CALL FontworkAlignmentControl_getImplementationName() Sequence< OUString > SAL_CALL FontworkAlignmentControl_getSupportedServiceNames() throw( RuntimeException ) { Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString( "com.sun.star.frame.ToolbarController" ); + aSNS.getArray()[0] = "com.sun.star.frame.ToolbarController"; return aSNS; } @@ -701,7 +701,7 @@ OUString SAL_CALL FontworkCharacterSpacingControl_getImplementationName() Sequence< OUString > SAL_CALL FontworkCharacterSpacingControl_getSupportedServiceNames() throw( RuntimeException ) { Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString( "com.sun.star.frame.ToolbarController" ); + aSNS.getArray()[0] = "com.sun.star.frame.ToolbarController"; return aSNS; } diff --git a/svx/source/tbxctrls/formatpaintbrushctrl.cxx b/svx/source/tbxctrls/formatpaintbrushctrl.cxx index 63eb13c4de40..ff4c35e5c103 100644 --- a/svx/source/tbxctrls/formatpaintbrushctrl.cxx +++ b/svx/source/tbxctrls/formatpaintbrushctrl.cxx @@ -61,7 +61,7 @@ FormatPaintBrushToolBoxControl::~FormatPaintBrushToolBoxControl() void FormatPaintBrushToolBoxControl::impl_executePaintBrush() { Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = OUString( "PersistentCopy" ); + aArgs[0].Name = "PersistentCopy"; aArgs[0].Value = makeAny( static_cast<sal_Bool>(m_bPersistentCopy) ); Dispatch( OUString( ".uno:FormatPaintbrush" ) , aArgs ); diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 38d2ec8ddb54..4eea7bddce37 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -354,7 +354,7 @@ void ImplGrafModeControl::Select() if ( !IsTravelSelect() ) { Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = OUString( "GrafMode" ); + aArgs[0].Name = "GrafMode"; aArgs[0].Value = makeAny( sal_Int16( GetSelectEntryPos() )); /* #i33380# DR 2004-09-03 Moved the following line above the Dispatch() call. diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index 3d10cb337d33..5cc75f622055 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -129,7 +129,7 @@ void SvxLineBox::Select() Any a; Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = OUString( "LineDash" ); + aArgs[0].Name = "LineDash"; aLineDashItem.QueryValue ( a ); aArgs[0].Value = a; SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ), @@ -143,7 +143,7 @@ void SvxLineBox::Select() XLineStyleItem aLineStyleItem( eXLS ); Any a; Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = OUString( "XLineStyle" ); + aArgs[0].Name = "XLineStyle"; aLineStyleItem.QueryValue ( a ); aArgs[0].Value = a; SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ), @@ -504,7 +504,7 @@ void SvxMetricField::Modify() Any a; Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = OUString( "LineWidth" ); + aArgs[0].Name = "LineWidth"; aLineWidthItem.QueryValue( a ); aArgs[0].Value = a; SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ), diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index 71b723605381..f004fe310e1d 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -325,9 +325,9 @@ void TableWindow::PopupModeEnd() if ( !IsPopupModeCanceled() && nCol && nLine ) { Sequence< PropertyValue > aArgs( 2 ); - aArgs[0].Name = OUString( "Columns" ); + aArgs[0].Name = "Columns"; aArgs[0].Value = makeAny( sal_Int16( nCol )); - aArgs[1].Name = OUString( "Rows" ); + aArgs[1].Name = "Rows"; aArgs[1].Value = makeAny( sal_Int16( nLine )); TableDialog( aArgs ); @@ -685,9 +685,9 @@ void ColumnsWindow::PopupModeEnd() pParent->UserEvent(SVX_EVENT_COLUM_WINDOW_EXECUTE, reinterpret_cast<void*>(nId)); Sequence< PropertyValue > aArgs( 2 ); - aArgs[0].Name = OUString( "Columns" ); + aArgs[0].Name = "Columns"; aArgs[0].Value = makeAny( sal_Int16( nCol )); - aArgs[1].Name = OUString( "Modifier" ); + aArgs[1].Name = "Modifier"; aArgs[1].Value = makeAny( sal_Int16( m_bMod1 ? KEY_MOD1 : 0 )); SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ), diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index 4db2dbce6a52..a1f112f4cddb 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -464,13 +464,13 @@ IMPL_LINK_NOARG(SvxLineEndWindow, SelectHdl) if ( pLineStartItem ) { - aArgs[0].Name = OUString( "LineStart" ); + aArgs[0].Name = "LineStart"; pLineStartItem->QueryValue( a ); aArgs[0].Value = a; } else { - aArgs[0].Name = OUString( "LineEnd" ); + aArgs[0].Name = "LineEnd"; pLineEndItem->QueryValue( a ); aArgs[0].Value = a; } diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx index e3401615d00a..36e257e5d876 100644 --- a/svx/source/tbxctrls/tbunocontroller.cxx +++ b/svx/source/tbxctrls/tbunocontroller.cxx @@ -121,7 +121,7 @@ void SvxFontSizeBox_Impl::Select() float fSelVal = float( nSelVal ) / 10; uno::Sequence< beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = OUString( "FontHeight.Height" ); + aArgs[0].Name = "FontHeight.Height"; aArgs[0].Value = uno::makeAny( fSelVal ); /* #i33380# DR 2004-09-03 Moved the following line above the Dispatch() call. @@ -297,7 +297,7 @@ uno::Sequence< OUString > FontHeightToolBoxControl::getSupportedServiceNames_Sta throw() { uno::Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString( "com.sun.star.frame.ToolbarController" ); + aSNS.getArray()[0] = "com.sun.star.frame.ToolbarController"; return aSNS; } @@ -396,7 +396,7 @@ void FontHeightToolBoxControl::dispatchCommand( uno::Reference< frame::XDispatch > xDispatch; uno::Reference< util::XURLTransformer > xURLTransformer = getURLTransformer(); - aURL.Complete = OUString( ".uno:FontHeight" ); + aURL.Complete = ".uno:FontHeight"; xURLTransformer->parseStrict( aURL ); xDispatch = xDispatchProvider->queryDispatch( aURL, OUString(), 0 ); if ( xDispatch.is() ) diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index 21a55605d270..71d013cfb035 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -190,7 +190,7 @@ namespace svx throw() { Sequence< OUString > aSupportedServiceNames( 1 ); - aSupportedServiceNames[0] = OUString( "com.sun.star.drawing.GraphicExportFilter" ); + aSupportedServiceNames[0] = "com.sun.star.drawing.GraphicExportFilter"; return aSupportedServiceNames; } @@ -561,12 +561,12 @@ void GraphicExporter::ParseSettings( const Sequence< PropertyValue >& aDescripto else if( pDataValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Width" ) ) ) // for compatibility reasons, deprecated { pDataValues->Value >>= rSettings.mnWidth; - pDataValues->Name = OUString( "PixelWidth" ); + pDataValues->Name = "PixelWidth"; } else if( pDataValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Height" ) ) ) // for compatibility reasons, deprecated { pDataValues->Value >>= rSettings.mnHeight; - pDataValues->Name = OUString( "PixelHeight" ); + pDataValues->Name = "PixelHeight"; } else if ( pDataValues->Name == "ExportOnlyBackground" ) { diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx index af77a5269b1f..f1bf74f0f262 100644 --- a/svx/source/unodraw/UnoNamespaceMap.cxx +++ b/svx/source/unodraw/UnoNamespaceMap.cxx @@ -82,7 +82,7 @@ namespace svx throw() { Sequence< OUString > aSupportedServiceNames( 1 ); - aSupportedServiceNames[0] = OUString( "com.sun.star.xml.NamespaceMap" ); + aSupportedServiceNames[0] = "com.sun.star.xml.NamespaceMap"; return aSupportedServiceNames; } diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx index 620ee9fcfdd6..8398d75204d6 100644 --- a/svx/source/unogallery/unogalitem.cxx +++ b/svx/source/unogallery/unogalitem.cxx @@ -139,7 +139,7 @@ uno::Sequence< OUString > GalleryItem::getSupportedServiceNames_Static() { uno::Sequence< OUString > aSeq( 1 ); - aSeq.getArray()[ 0 ] = OUString( "com.sun.star.gallery.GalleryItem" ); + aSeq.getArray()[ 0 ] = "com.sun.star.gallery.GalleryItem"; return aSeq; } diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx index eb03c477f361..692305232dbc 100644 --- a/svx/source/unogallery/unogaltheme.cxx +++ b/svx/source/unogallery/unogaltheme.cxx @@ -84,7 +84,7 @@ uno::Sequence< OUString > GalleryTheme::getSupportedServiceNames_Static() { uno::Sequence< OUString > aSeq( 1 ); - aSeq.getArray()[ 0 ] = OUString( "com.sun.star.gallery.GalleryTheme" ); + aSeq.getArray()[ 0 ] = "com.sun.star.gallery.GalleryTheme"; return aSeq; } diff --git a/svx/source/unogallery/unogalthemeprovider.cxx b/svx/source/unogallery/unogalthemeprovider.cxx index af3a15ea8268..e5ad2d89002a 100644 --- a/svx/source/unogallery/unogalthemeprovider.cxx +++ b/svx/source/unogallery/unogalthemeprovider.cxx @@ -90,7 +90,7 @@ SVX_DLLPUBLIC uno::Sequence< OUString > GalleryThemeProvider::getSupportedServic { uno::Sequence< OUString > aSeq( 1 ); - aSeq.getArray()[ 0 ] = OUString( "com.sun.star.gallery.GalleryThemeProvider" ); + aSeq.getArray()[ 0 ] = "com.sun.star.gallery.GalleryThemeProvider"; return aSeq; } diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index b26c811b7e15..b325dc016d31 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -786,7 +786,7 @@ OUString SAL_CALL SvXMLGraphicHelper::resolveGraphicObjectURL( const OUString& r sal_Int32 nUser = rURL.indexOf( '?', 0 ); if ( nUser >= 0 ) { - aURL = OUString( rURL.copy( 0, nUser ) ); + aURL = rURL.copy( 0, nUser ); nUser++; aUserData = rURL.copy( nUser, rURL.getLength() - nUser ); } @@ -875,7 +875,7 @@ OUString SAL_CALL SvXMLGraphicHelper::resolveOutputStream( const Reference< XOut if( !aId.isEmpty() ) { - aRet = OUString( XML_GRAPHICOBJECT_URL_BASE ); + aRet = XML_GRAPHICOBJECT_URL_BASE; aRet += aId; } } @@ -1049,8 +1049,8 @@ Sequence< OUString > SAL_CALL SvXMLGraphicImportHelper_getSupportedServiceNames( { // XGraphicObjectResolver and XBinaryStreamResolver are not part of any service Sequence< OUString > aSupportedServiceNames( 2 ); - aSupportedServiceNames[0] = OUString( "com.sun.star.document.GraphicObjectResolver" ); - aSupportedServiceNames[1] = OUString( "com.sun.star.document.BinaryStreamResolver" ); + aSupportedServiceNames[0] = "com.sun.star.document.GraphicObjectResolver"; + aSupportedServiceNames[1] = "com.sun.star.document.BinaryStreamResolver"; return aSupportedServiceNames; } @@ -1070,8 +1070,8 @@ Sequence< OUString > SAL_CALL SvXMLGraphicExportHelper_getSupportedServiceNames( { // XGraphicObjectResolver and XBinaryStreamResolver are not part of any service Sequence< OUString > aSupportedServiceNames( 2 ); - aSupportedServiceNames[0] = OUString( "com.sun.star.document.GraphicObjectResolver" ); - aSupportedServiceNames[1] = OUString( "com.sun.star.document.BinaryStreamResolver" ); + aSupportedServiceNames[0] = "com.sun.star.document.GraphicObjectResolver"; + aSupportedServiceNames[1] = "com.sun.star.document.BinaryStreamResolver"; return aSupportedServiceNames; } diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index acb51e8ecedf..23fd6de0beb0 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -792,9 +792,9 @@ bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMem aLineDash.Distance = rXD.GetDistance(); OUString aApiName = SvxUnogetApiNameForItem(Which(), GetName()); - aPropSeq[0].Name = OUString( "Name" ); + aPropSeq[0].Name = "Name"; aPropSeq[0].Value = uno::makeAny( aApiName ); - aPropSeq[1].Name = OUString( "LineDash" ); + aPropSeq[1].Name = "LineDash"; aPropSeq[1].Value = uno::makeAny( aLineDash ); rVal = uno::makeAny( aPropSeq ); break; @@ -2712,9 +2712,9 @@ bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 aGradient2.StepCount = aXGradient.GetSteps(); OUString aApiName = SvxUnogetApiNameForItem(Which(), GetName()); - aPropSeq[0].Name = OUString( "Name" ); + aPropSeq[0].Name = "Name"; aPropSeq[0].Value = uno::makeAny( aApiName ); - aPropSeq[1].Name = OUString( "FillGradient" ); + aPropSeq[1].Name = "FillGradient"; aPropSeq[1].Value = uno::makeAny( aGradient2 ); rVal = uno::makeAny( aPropSeq ); break; @@ -3197,9 +3197,9 @@ bool XFillHatchItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMe aUnoHatch.Angle = aHatch.GetAngle(); OUString aApiName = SvxUnogetApiNameForItem(Which(), GetName()); - aPropSeq[0].Name = OUString( "Name" ); + aPropSeq[0].Name = "Name"; aPropSeq[0].Value = uno::makeAny( aApiName ); - aPropSeq[1].Name = OUString( "FillHatch" ); + aPropSeq[1].Name = "FillHatch"; aPropSeq[1].Value = uno::makeAny( aUnoHatch ); rVal = uno::makeAny( aPropSeq ); break; diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index e98c4d5bbbea..f8c53d795217 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -430,8 +430,7 @@ bool XFillBitmapItem::QueryValue(::com::sun::star::uno::Any& rVal, sal_uInt8 nMe if( nMemberId == MID_GRAFURL || nMemberId == 0 ) { - aURL = OUString( - UNO_NAME_GRAPHOBJ_URLPREFIX); + aURL = UNO_NAME_GRAPHOBJ_URLPREFIX; aURL += OStringToOUString( GetGraphicObject().GetUniqueID(), RTL_TEXTENCODING_ASCII_US); @@ -454,11 +453,11 @@ bool XFillBitmapItem::QueryValue(::com::sun::star::uno::Any& rVal, sal_uInt8 nMe DBG_ASSERT( nMemberId == 0, "invalid member-id" ); uno::Sequence< beans::PropertyValue > aPropSeq( 3 ); - aPropSeq[0].Name = OUString( "Name" ); + aPropSeq[0].Name = "Name"; aPropSeq[0].Value = uno::makeAny( aInternalName ); - aPropSeq[1].Name = OUString( "FillBitmapURL" ); + aPropSeq[1].Name = "FillBitmapURL"; aPropSeq[1].Value = uno::makeAny( aURL ); - aPropSeq[2].Name = OUString( "Bitmap" ); + aPropSeq[2].Name = "Bitmap"; aPropSeq[2].Value = uno::makeAny( xBmp ); rVal <<= aPropSeq; diff --git a/svx/workben/msview/xmlconfig.cxx b/svx/workben/msview/xmlconfig.cxx index e182ed64e5d1..c88ec428ed65 100644 --- a/svx/workben/msview/xmlconfig.cxx +++ b/svx/workben/msview/xmlconfig.cxx @@ -516,7 +516,7 @@ OUString ElementConfigContainer::format( SvStream& rStream, sal_Size& nLength ) } else { - aValue = OUString( "<empty!?>" ); + aValue = "<empty!?>"; } aRet += aValue; |