diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-06 09:37:52 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-06 09:37:52 +0100 |
commit | 2f88f0adf0f787ae1e1a2a5ac2156b347984fd4a (patch) | |
tree | 4c238035556820792d0909ae1dc6a7a5dae43825 /svx | |
parent | b183742d3f8cb0edc59d4a60132ca0036d3f41c9 (diff) |
loplugin:stringconstant: elide explicit ctor usage (automatic rewrite)
Change-Id: I72d11153ffccc51633aec78c802822173dd7f5ed
Diffstat (limited to 'svx')
40 files changed, 138 insertions, 138 deletions
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index 047fff7735bb..47a5556840bb 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -277,8 +277,8 @@ SvxSuperContourDlg::SvxSuperContourDlg(SfxBindings *_pBindings, SfxChildWindow * SetMinOutputSizePixel( aLastSize = GetOutputSizePixel() ); m_pStbStatus->InsertItem( 1, 130, SIB_LEFT | SIB_IN | SIB_AUTOSIZE ); - m_pStbStatus->InsertItem( 2, 10 + GetTextWidth( OUString(" 9999,99 cm / 9999,99 cm ") ) ); - m_pStbStatus->InsertItem( 3, 10 + GetTextWidth( OUString(" 9999,99 cm x 9999,99 cm ") ) ); + m_pStbStatus->InsertItem( 2, 10 + GetTextWidth( " 9999,99 cm / 9999,99 cm " ) ); + m_pStbStatus->InsertItem( 3, 10 + GetTextWidth( " 9999,99 cm x 9999,99 cm " ) ); m_pStbStatus->InsertItem( 4, 20 ); Resize(); diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx index b28055bc173a..b57fb3290b26 100644 --- a/svx/source/dialog/compressgraphicdialog.cxx +++ b/svx/source/dialog/compressgraphicdialog.cxx @@ -108,7 +108,7 @@ void CompressGraphicsDialog::Initialize() get(m_pBtnCalculate, "calculate"); get(m_pInterpolationCombo, "interpolation-method-combo"); - m_pInterpolationCombo->SelectEntry( OUString("Lanczos") ); + m_pInterpolationCombo->SelectEntry( "Lanczos" ); m_pMFNewWidth->SetModifyHdl( LINK( this, CompressGraphicsDialog, NewWidthModifiedHdl )); m_pMFNewHeight->SetModifyHdl( LINK( this, CompressGraphicsDialog, NewHeightModifiedHdl )); @@ -283,7 +283,7 @@ void CompressGraphicsDialog::Compress(SvStream& aStream) OUString aGraphicFormatName = m_pLosslessRB->IsChecked() ? OUString( "png" ) : OUString( "jpg" ); sal_uInt16 nFilterFormat = rFilter.GetExportFormatNumberForShortName( aGraphicFormatName ); - rFilter.ExportGraphic( aScaledGraphic, OUString( "none" ), aStream, nFilterFormat, &aFilterData ); + rFilter.ExportGraphic( aScaledGraphic, "none", aStream, nFilterFormat, &aFilterData ); } IMPL_LINK_NOARG_TYPED( CompressGraphicsDialog, NewWidthModifiedHdl, Edit&, void ) diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index e4bdfee0fb52..697d08883c4a 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -192,8 +192,8 @@ SvxIMapDlg::SvxIMapDlg(SfxBindings *_pBindings, SfxChildWindow *pCW, vcl::Window SetMinOutputSizePixel( aLastSize = GetOutputSizePixel() ); m_pStbStatus->InsertItem( 1, 130, SIB_LEFT | SIB_IN | SIB_AUTOSIZE ); - m_pStbStatus->InsertItem( 2, 10 + GetTextWidth( OUString(" 9999,99 cm / 9999,99 cm ") ) ); - m_pStbStatus->InsertItem( 3, 10 + GetTextWidth( OUString(" 9999,99 cm x 9999,99 cm ") ) ); + m_pStbStatus->InsertItem( 2, 10 + GetTextWidth( " 9999,99 cm / 9999,99 cm " ) ); + m_pStbStatus->InsertItem( 3, 10 + GetTextWidth( " 9999,99 cm x 9999,99 cm " ) ); m_pFtURL->Disable(); m_pURLBox->Disable(); diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 49faa4561a17..e1a7b9d8b8e6 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -881,7 +881,7 @@ void RubyPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle& /*r break; case RubyAdjust_INDENT_BLOCK: { - long nCharWidth = GetTextWidth(OUString("X")); + long nCharWidth = GetTextWidth("X"); if (nOutTextWidth < (nRightEnd - nLeftStart - nCharWidth)) { nCharWidth /= 2; diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx index ba99ac23460f..0773a1407754 100644 --- a/svx/source/dialog/swframeexample.cxx +++ b/svx/source/dialog/swframeexample.cxx @@ -177,7 +177,7 @@ void SvxSwFrameExample::InitAllRects_Impl(vcl::RenderContext& rRenderContext) { aFont.SetSize(Size(0, aParaPrtArea.GetHeight() - 2)); SetFont(aFont); - aParaPrtArea.SetSize(Size(GetTextWidth(OUString(DEMOTEXT)), GetTextHeight())); + aParaPrtArea.SetSize(Size(GetTextWidth(DEMOTEXT), GetTextHeight())); } else { @@ -223,7 +223,7 @@ void SvxSwFrameExample::InitAllRects_Impl(vcl::RenderContext& rRenderContext) } else { - sal_uIntPtr nFreeWidth = aPagePrtArea.GetWidth() - GetTextWidth(OUString(DEMOTEXT)); + sal_uIntPtr nFreeWidth = aPagePrtArea.GetWidth() - GetTextWidth(DEMOTEXT); aFrmSize = Size(nFreeWidth / 2, (aTextLine.GetHeight() + 2) * 3); aDrawObj.SetSize(Size(std::max(5L, (long)nFreeWidth / 3L), std::max(5L, aFrmSize.Height() * 3L))); diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx index cc49e5c252d5..b4e22f72eb06 100644 --- a/svx/source/fmcomp/dbaexchange.cxx +++ b/svx/source/fmcomp/dbaexchange.cxx @@ -154,7 +154,7 @@ namespace svx static SotClipboardFormatId s_nFormat = static_cast<SotClipboardFormatId>(-1); if (static_cast<SotClipboardFormatId>(-1) == s_nFormat) { - s_nFormat = SotExchange::RegisterFormatName(OUString("application/x-openoffice;windows_formatname=\"dbaccess.ColumnDescriptorTransfer\"")); + s_nFormat = SotExchange::RegisterFormatName("application/x-openoffice;windows_formatname=\"dbaccess.ColumnDescriptorTransfer\""); OSL_ENSURE(static_cast<SotClipboardFormatId>(-1) != s_nFormat, "OColumnTransferable::getDescriptorFormatId: bad exchange id!"); } return s_nFormat; @@ -616,7 +616,7 @@ namespace svx static SotClipboardFormatId s_nFormat = static_cast<SotClipboardFormatId>(-1); if (static_cast<SotClipboardFormatId>(-1) == s_nFormat) { - s_nFormat = SotExchange::RegisterFormatName(OUString("application/x-openoffice;windows_formatname=\"dbaccess.MultipleColumnDescriptorTransfer\"")); + s_nFormat = SotExchange::RegisterFormatName("application/x-openoffice;windows_formatname=\"dbaccess.MultipleColumnDescriptorTransfer\""); OSL_ENSURE(static_cast<SotClipboardFormatId>(-1) != s_nFormat, "OColumnTransferable::getDescriptorFormatId: bad exchange id!"); } return s_nFormat; diff --git a/svx/source/fmcomp/dbaobjectex.cxx b/svx/source/fmcomp/dbaobjectex.cxx index 04e7698bb3cd..699d17a378f7 100644 --- a/svx/source/fmcomp/dbaobjectex.cxx +++ b/svx/source/fmcomp/dbaobjectex.cxx @@ -58,12 +58,12 @@ namespace svx static SotClipboardFormatId s_nFormFormat = static_cast<SotClipboardFormatId>(-1); if ( _bExtractForm && static_cast<SotClipboardFormatId>(-1) == s_nFormFormat ) { - s_nFormFormat = SotExchange::RegisterFormatName(OUString("application/x-openoffice;windows_formatname=\"dbaccess.FormComponentDescriptorTransfer\"" )); + s_nFormFormat = SotExchange::RegisterFormatName("application/x-openoffice;windows_formatname=\"dbaccess.FormComponentDescriptorTransfer\""); OSL_ENSURE(static_cast<SotClipboardFormatId>(-1) != s_nFormFormat, "OComponentTransferable::getDescriptorFormatId: bad exchange id!"); } else if ( !_bExtractForm && static_cast<SotClipboardFormatId>(-1) == s_nReportFormat) { - s_nReportFormat = SotExchange::RegisterFormatName(OUString("application/x-openoffice;windows_formatname=\"dbaccess.ReportComponentDescriptorTransfer\"")); + s_nReportFormat = SotExchange::RegisterFormatName("application/x-openoffice;windows_formatname=\"dbaccess.ReportComponentDescriptorTransfer\""); OSL_ENSURE(static_cast<SotClipboardFormatId>(-1) != s_nReportFormat, "OComponentTransferable::getDescriptorFormatId: bad exchange id!"); } return _bExtractForm ? s_nFormFormat : s_nReportFormat; diff --git a/svx/source/fmcomp/xmlexchg.cxx b/svx/source/fmcomp/xmlexchg.cxx index 3b6f0431e69e..c1cb11e17b8d 100644 --- a/svx/source/fmcomp/xmlexchg.cxx +++ b/svx/source/fmcomp/xmlexchg.cxx @@ -42,7 +42,7 @@ namespace svx const SotClipboardFormatId nFormatId = SotExchange::GetFormat( _rFlavor ); if ( SotClipboardFormatId::XFORMS == nFormatId ) { - return SetString(OUString("XForms-Transferable"), _rFlavor); + return SetString("XForms-Transferable", _rFlavor); } return false; } diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx index 08c766c22d79..80d8459a9ed2 100644 --- a/svx/source/form/databaselocationinput.cxx +++ b/svx/source/form/databaselocationinput.cxx @@ -159,7 +159,7 @@ namespace svx ::utl::OConfigurationTreeRoot aConfig( ::utl::OConfigurationTreeRoot::createWithComponentContext( m_xContext, - OUString( "/org.openoffice.Setup/Office/Factories/com.sun.star.sdb.OfficeDatabaseDocument" ) + "/org.openoffice.Setup/Office/Factories/com.sun.star.sdb.OfficeDatabaseDocument" ) ); OUString sDatabaseFilter; OSL_VERIFY( aConfig.getNodeValue( "ooSetupFactoryActualFilter" ) >>= sDatabaseFilter ); diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 0262ecb58752..4de50cfad24b 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -3409,7 +3409,7 @@ namespace svxform css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 ); INetURLObject aFile( SvtPathOptions().GetWorkPath() ); - aDlg.AddFilter( m_sAllFilterName, OUString(FILEDIALOG_FILTER_ALL) ); + aDlg.AddFilter( m_sAllFilterName, FILEDIALOG_FILTER_ALL ); OUString sFilterName( "XML" ); aDlg.AddFilter( sFilterName, "*.xml" ); aDlg.SetCurrentFilter( sFilterName ); diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 6adbb55a188c..2f2310d935e3 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -122,7 +122,7 @@ SotClipboardFormatId OFilterItemExchange::getFormatId() static SotClipboardFormatId s_nFormat = static_cast<SotClipboardFormatId>(-1); if (static_cast<SotClipboardFormatId>(-1) == s_nFormat) { - s_nFormat = SotExchange::RegisterFormatName(OUString("application/x-openoffice;windows_formatname=\"form.FilterControlExchange\"")); + s_nFormat = SotExchange::RegisterFormatName("application/x-openoffice;windows_formatname=\"form.FilterControlExchange\""); DBG_ASSERT(static_cast<SotClipboardFormatId>(-1) != s_nFormat, "OFilterExchangeHelper::getFormatId: bad exchange id!"); } return s_nFormat; diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx index af817752bd7c..b4fcca3c956b 100644 --- a/svx/source/form/fmexch.cxx +++ b/svx/source/form/fmexch.cxx @@ -320,7 +320,7 @@ namespace svxform static SotClipboardFormatId s_nFormat = static_cast<SotClipboardFormatId>(-1); if (static_cast<SotClipboardFormatId>(-1) == s_nFormat) { - s_nFormat = SotExchange::RegisterFormatName(OUString("application/x-openoffice;windows_formatname=\"svxform.ControlPathExchange\"")); + s_nFormat = SotExchange::RegisterFormatName("application/x-openoffice;windows_formatname=\"svxform.ControlPathExchange\""); DBG_ASSERT(static_cast<SotClipboardFormatId>(-1) != s_nFormat, "OControlExchange::getControlPathFormatId: bad exchange id!"); } return s_nFormat; @@ -332,7 +332,7 @@ namespace svxform static SotClipboardFormatId s_nFormat = static_cast<SotClipboardFormatId>(-1); if (static_cast<SotClipboardFormatId>(-1) == s_nFormat) { - s_nFormat = SotExchange::RegisterFormatName(OUString("application/x-openoffice;windows_formatname=\"svxform.HiddenControlModelsExchange\"")); + s_nFormat = SotExchange::RegisterFormatName("application/x-openoffice;windows_formatname=\"svxform.HiddenControlModelsExchange\""); DBG_ASSERT(static_cast<SotClipboardFormatId>(-1) != s_nFormat, "OControlExchange::getHiddenControlModelsFormatId: bad exchange id!"); } return s_nFormat; @@ -344,7 +344,7 @@ namespace svxform static SotClipboardFormatId s_nFormat = static_cast<SotClipboardFormatId>(-1); if (static_cast<SotClipboardFormatId>(-1) == s_nFormat) { - s_nFormat = SotExchange::RegisterFormatName(OUString("application/x-openoffice;windows_formatname=\"svxform.FieldNameExchange\"")); + s_nFormat = SotExchange::RegisterFormatName("application/x-openoffice;windows_formatname=\"svxform.FieldNameExchange\""); DBG_ASSERT(static_cast<SotClipboardFormatId>(-1) != s_nFormat, "OControlExchange::getFieldExchangeFormatId: bad exchange id!"); } return s_nFormat; diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index 629a94667b50..5cbca72bf1dd 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -215,7 +215,7 @@ FmFormShell::FmFormShell( SfxViewShell* _pParent, FmFormView* pView ) { m_pImpl->acquire(); SetPool( &SfxGetpApp()->GetPool() ); - SetName( OUString("Form") ); + SetName( "Form" ); SetView(m_pFormView); } @@ -763,7 +763,7 @@ void FmFormShell::Execute(SfxRequest &rReq) } if ( nRecord != -1 ) - rController->execute( nSlot, OUString( "Position" ), makeAny( (sal_Int32)nRecord ) ); + rController->execute( nSlot, "Position", makeAny( (sal_Int32)nRecord ) ); rReq.Done(); } break; diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx index dd8f6ace33f5..fbdf616121c2 100644 --- a/svx/source/form/tbxform.cxx +++ b/svx/source/form/tbxform.cxx @@ -76,7 +76,7 @@ void SvxFmAbsRecWin::FirePosition( bool _bForce ) aArgs[0].Name = "Position"; aPositionParam.QueryValue( a ); aArgs[0].Value = a; - m_pController->Dispatch( OUString( ".uno:AbsoluteRecord" ), + m_pController->Dispatch( ".uno:AbsoluteRecord", aArgs ); m_pController->updateStatus(); diff --git a/svx/source/form/xfm_addcondition.cxx b/svx/source/form/xfm_addcondition.cxx index c905e9a3b8d3..b9727fc950c1 100644 --- a/svx/source/form/xfm_addcondition.cxx +++ b/svx/source/form/xfm_addcondition.cxx @@ -68,7 +68,7 @@ namespace svxform :OAddConditionDialogBase( _rxORB ) { registerProperty( - OUString( "Binding" ), + "Binding", PROPERTY_ID_BINDING, PropertyAttribute::TRANSIENT, &m_xBinding, @@ -76,7 +76,7 @@ namespace svxform ); registerProperty( - OUString( "FacetName" ), + "FacetName", PROPERTY_ID_FACET_NAME, PropertyAttribute::TRANSIENT, &m_sFacetName, @@ -84,7 +84,7 @@ namespace svxform ); registerProperty( - OUString( "ConditionValue" ), + "ConditionValue", PROPERTY_ID_CONDITION_VALUE, PropertyAttribute::TRANSIENT, &m_sConditionValue, @@ -92,7 +92,7 @@ namespace svxform ); registerProperty( - OUString( "FormModel" ), + "FormModel", PROPERTY_ID_FORM_MODEL, PropertyAttribute::TRANSIENT, &m_xWorkModel, diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index 46b6036af998..397814f330c1 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -283,7 +283,7 @@ bool CreateDir( const INetURLObject& rURL ) aValues[0] = uno::makeAny( OUString( aNewFolderURL.GetName() ) ); ::ucbhelper::Content aContent( aNewFolderURL.GetMainURL( INetURLObject::NO_DECODE ), aCmdEnv, comphelper::getProcessComponentContext() ); - bRet = aParent.insertNewContent( OUString("application/vnd.sun.staroffice.fsys-folder"), aProps, aValues, aContent ); + bRet = aParent.insertNewContent( "application/vnd.sun.staroffice.fsys-folder", aProps, aValues, aContent ); } catch( const ucb::ContentCreationException& ) { @@ -307,7 +307,7 @@ bool CopyFile( const INetURLObject& rSrcURL, const INetURLObject& rDstURL ) { ::ucbhelper::Content aDestPath( rDstURL.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - aDestPath.executeCommand( OUString("transfer"), + aDestPath.executeCommand( "transfer", uno::makeAny( ucb::TransferInfo( sal_False, rSrcURL.GetMainURL( INetURLObject::NO_DECODE ), rDstURL.GetName(), ucb::NameClash::OVERWRITE ) ) ); bRet = true; @@ -334,7 +334,7 @@ bool KillFile( const INetURLObject& rURL ) try { ::ucbhelper::Content aCnt( rURL.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - aCnt.executeCommand( OUString("delete"), uno::makeAny( true ) ); + aCnt.executeCommand( "delete", uno::makeAny( true ) ); } catch( const ucb::ContentCreationException& ) { diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index 11e78dd0d7e0..6c8e980499e1 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -248,10 +248,10 @@ INetURLObject GalleryTheme::ImplCreateUniqueURL( SgaObjKind eObjKind, ConvertDat sal_Char const* pExt = NULL; bool bExists; - aDir.Append( OUString("dragdrop") ); + aDir.Append( "dragdrop" ); CreateDir( aDir ); - aInfoFileURL.Append( OUString("sdddndx1") ); + aInfoFileURL.Append( "sdddndx1" ); // read next possible number if( FileExists( aInfoFileURL ) ) diff --git a/svx/source/mnuctrls/clipboardctl.cxx b/svx/source/mnuctrls/clipboardctl.cxx index 721e0ce4be51..44f35b17cec0 100644 --- a/svx/source/mnuctrls/clipboardctl.cxx +++ b/svx/source/mnuctrls/clipboardctl.cxx @@ -47,7 +47,7 @@ SvxClipBoardControl::SvxClipBoardControl( pPopup( 0 ), bDisabled( false ) { - addStatusListener( OUString( ".uno:ClipboardFormatItems" )); + addStatusListener( ".uno:ClipboardFormatItems"); ToolBox& rBox = GetToolBox(); rBox.SetItemBits( nId, ToolBoxItemBits::DROPDOWN | rBox.GetItemBits( nId ) ); rBox.Invalidate(); @@ -98,7 +98,7 @@ VclPtr<SfxPopupWindow> SvxClipBoardControl::CreatePopupWindow() aArgs[0].Name = "SelectedFormat"; aItem.QueryValue( a ); aArgs[0].Value = a; - Dispatch( OUString( ".uno:ClipboardFormatItems" ), + Dispatch( ".uno:ClipboardFormatItems", aArgs ); } diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx index ee40b27472f9..2a3777f22d33 100644 --- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx @@ -154,8 +154,8 @@ void AreaPropertyPanelBase::Initialize() maGradientRect = maGradientLinear; maGradientRect.SetGradientStyle(css::awt::GradientStyle_RECT); - mpLbFillType->SetAccessibleName(OUString( "Fill")); //wj acc - mpLbFillAttr->SetAccessibleName(OUString( "Fill")); //wj acc + mpLbFillType->SetAccessibleName("Fill"); //wj acc + mpLbFillAttr->SetAccessibleName("Fill"); //wj acc mpLbFillType->SetSelectHdl( LINK( this, AreaPropertyPanelBase, SelectFillTypeHdl ) ); @@ -166,12 +166,12 @@ void AreaPropertyPanelBase::Initialize() mpLbFillGradTo->SetSelectHdl( aLink ); mpLBTransType->SetSelectHdl(LINK(this, AreaPropertyPanelBase, ChangeTrgrTypeHdl_Impl)); - mpLBTransType->SetAccessibleName(OUString( "Transparency")); //wj acc + mpLBTransType->SetAccessibleName("Transparency"); //wj acc SetTransparency( 50 ); mpMTRTransparent->SetModifyHdl(LINK(this, AreaPropertyPanelBase, ModifyTransparentHdl_Impl)); mpSldTransparent->SetSlideHdl(LINK(this, AreaPropertyPanelBase, ModifyTransSliderHdl)); - mpMTRTransparent->SetAccessibleName(OUString( "Transparency")); //wj acc + mpMTRTransparent->SetAccessibleName("Transparency"); //wj acc const sal_uInt16 nIdGradient = mpBTNGradient->GetItemId(UNO_SIDEBARGRADIENT); mpBTNGradient->SetItemBits( nIdGradient, mpBTNGradient->GetItemBits( nIdGradient ) | ToolBoxItemBits::DROPDOWNONLY ); diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx index 50f3d308fa5d..1f0513ab25ad 100644 --- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx +++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx @@ -99,18 +99,18 @@ void GraphicPropertyPanel::dispose() void GraphicPropertyPanel::Initialize() { mpMtrBrightness->SetModifyHdl( LINK( this, GraphicPropertyPanel, ModifyBrightnessHdl ) ); - mpMtrBrightness->SetAccessibleName(::rtl::OUString( "Brightness")); + mpMtrBrightness->SetAccessibleName("Brightness"); mpMtrContrast->SetModifyHdl( LINK( this, GraphicPropertyPanel, ModifyContrastHdl ) ); - mpMtrContrast->SetAccessibleName(::rtl::OUString( "Contrast")); + mpMtrContrast->SetAccessibleName("Contrast"); mpMtrTrans->SetModifyHdl( LINK( this, GraphicPropertyPanel, ModifyTransHdl ) ); - mpMtrTrans->SetAccessibleName(::rtl::OUString( "Transparency")); + mpMtrTrans->SetAccessibleName("Transparency"); mpLBColorMode->InsertEntry(SVX_RESSTR(RID_SVXSTR_GRAFMODE_STANDARD)); mpLBColorMode->InsertEntry(SVX_RESSTR(RID_SVXSTR_GRAFMODE_GREYS)); mpLBColorMode->InsertEntry(SVX_RESSTR(RID_SVXSTR_GRAFMODE_MONO)); mpLBColorMode->InsertEntry(SVX_RESSTR(RID_SVXSTR_GRAFMODE_WATERMARK)); mpLBColorMode->SetSelectHdl( LINK( this, GraphicPropertyPanel, ClickColorModeHdl )); - mpLBColorMode->SetAccessibleName(::rtl::OUString( "Color mode")); + mpLBColorMode->SetAccessibleName("Color mode"); mpMtrRed->SetModifyHdl( LINK( this, GraphicPropertyPanel, RedHdl ) ); mpMtrGreen->SetModifyHdl( LINK( this, GraphicPropertyPanel, GreenHdl ) ); @@ -119,7 +119,7 @@ void GraphicPropertyPanel::Initialize() mpMtrRed->SetAccessibleName(mpMtrRed->GetQuickHelpText()); mpMtrGreen->SetAccessibleName(mpMtrGreen->GetQuickHelpText()); mpMtrBlue->SetAccessibleName(mpMtrBlue->GetQuickHelpText()); - mpMtrGamma->SetAccessibleName(::rtl::OUString( "Gamma value")); + mpMtrGamma->SetAccessibleName("Gamma value"); mpMtrRed->SetAccessibleRelationLabeledBy(mpMtrRed); mpMtrGreen->SetAccessibleRelationLabeledBy(mpMtrGreen); diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx b/svx/source/sidebar/line/LinePropertyPanelBase.cxx index 3e09d8c93e06..a2831c4aa888 100644 --- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx +++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx @@ -240,7 +240,7 @@ void LinePropertyPanelBase::Initialize() FillLineStyleList(); SelectLineStyle(); mpLBStyle->SetSelectHdl( LINK( this, LinePropertyPanelBase, ChangeLineStyleHdl ) ); - mpLBStyle->SetAccessibleName(OUString( "Style")); + mpLBStyle->SetAccessibleName("Style"); mpLBStyle->AdaptDropDownLineCountToMaximum(); const sal_uInt16 nIdWidth = mpTBWidth->GetItemId(UNO_SELECTWIDTH); @@ -254,24 +254,24 @@ void LinePropertyPanelBase::Initialize() SelectEndStyle(true); SelectEndStyle(false); mpLBStart->SetSelectHdl( LINK( this, LinePropertyPanelBase, ChangeStartHdl ) ); - mpLBStart->SetAccessibleName(OUString("Beginning Style")); //wj acc + mpLBStart->SetAccessibleName("Beginning Style"); //wj acc mpLBStart->AdaptDropDownLineCountToMaximum(); mpLBEnd->SetSelectHdl( LINK( this, LinePropertyPanelBase, ChangeEndHdl ) ); - mpLBEnd->SetAccessibleName(OUString("Ending Style")); //wj acc + mpLBEnd->SetAccessibleName("Ending Style"); //wj acc mpLBEnd->AdaptDropDownLineCountToMaximum(); mpMFTransparent->SetModifyHdl(LINK(this, LinePropertyPanelBase, ChangeTransparentHdl)); - mpMFTransparent->SetAccessibleName(OUString("Transparency")); //wj acc + mpMFTransparent->SetAccessibleName("Transparency"); //wj acc mpTBWidth->SetAccessibleRelationLabeledBy(mpFTWidth); mpMFTransparent->SetAccessibleRelationLabeledBy(mpFTTransparency); mpLBEnd->SetAccessibleRelationLabeledBy(mpLBEnd); mpLBEdgeStyle->SetSelectHdl( LINK( this, LinePropertyPanelBase, ChangeEdgeStyleHdl ) ); - mpLBEdgeStyle->SetAccessibleName(OUString("Corner Style")); + mpLBEdgeStyle->SetAccessibleName("Corner Style"); mpLBCapStyle->SetSelectHdl( LINK( this, LinePropertyPanelBase, ChangeCapStyleHdl ) ); - mpLBCapStyle->SetAccessibleName(OUString("Cap Style")); + mpLBCapStyle->SetAccessibleName("Cap Style"); } void LinePropertyPanelBase::DataChanged(const DataChangedEvent& /*rEvent*/) diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx index d340655c1d5b..cd3b0d36f6bd 100644 --- a/svx/source/sidebar/nbdtmg.cxx +++ b/svx/source/sidebar/nbdtmg.cxx @@ -772,7 +772,7 @@ MixBulletsTypeMgr::MixBulletsTypeMgr() } //Initial the first time to store the default value. Then do it again for customized value Init(); - ImplLoad(OUString("standard.sya")); + ImplLoad("standard.sya"); } class theMixBulletsTypeMgr : public rtl::Static<MixBulletsTypeMgr, theMixBulletsTypeMgr> {}; @@ -815,7 +815,7 @@ MixBulletsTypeMgr::MixBulletsTypeMgr(const MixBulletsTypeMgr& aTypeMgr): } } } - ImplLoad(OUString("standard.sya")); + ImplLoad("standard.sya"); } void MixBulletsTypeMgr::Init() { @@ -1126,7 +1126,7 @@ bool MixBulletsTypeMgr::RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_u pEntry->sDescription = GetDescription(nIndex,true); } } - ImplStore(OUString("standard.sya")); + ImplStore("standard.sya"); return true; } @@ -1262,7 +1262,7 @@ NumberingTypeMgr::NumberingTypeMgr() pNumberSettingsArr = new NumberSettingsArr_Impl; //Initial the first time to store the default value. Then do it again for customized value Init(); - ImplLoad(OUString("standard.syb")); + ImplLoad("standard.syb"); } NumberingTypeMgr::NumberingTypeMgr(const NumberingTypeMgr& rTypeMgr) @@ -1270,7 +1270,7 @@ NumberingTypeMgr::NumberingTypeMgr(const NumberingTypeMgr& rTypeMgr) , pNumberSettingsArr (new NumberSettingsArr_Impl) , pDefaultNumberSettingsArr(NULL) { - ImplLoad(OUString("standard.syb")); + ImplLoad("standard.syb"); } NumberingTypeMgr::~NumberingTypeMgr() @@ -1395,7 +1395,7 @@ bool NumberingTypeMgr::RelplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_ } else { _pSet->sDescription = GetDescription(nIndex,true); } - ImplStore(OUString("standard.syb")); + ImplStore("standard.syb"); return true; } @@ -1473,7 +1473,7 @@ OutlineTypeMgr::OutlineTypeMgr() } //Initial the first time to store the default value. Then do it again for customized value Init(); - ImplLoad(OUString("standard.syc")); + ImplLoad("standard.syc"); } OutlineTypeMgr::OutlineTypeMgr(const OutlineTypeMgr& aTypeMgr) @@ -1486,7 +1486,7 @@ OutlineTypeMgr::OutlineTypeMgr(const OutlineTypeMgr& aTypeMgr) } //Initial the first time to store the default value. Then do it again for customized value Init(); - ImplLoad(OUString("standard.syc")); + ImplLoad("standard.syc"); } class theOutlineTypeMgr : public rtl::Static<OutlineTypeMgr, theOutlineTypeMgr> {}; @@ -1685,7 +1685,7 @@ bool OutlineTypeMgr::RelplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uI } else { pItemArr->sDescription = GetDescription(nIndex,true); } - ImplStore(OUString("standard.syc")); + ImplStore("standard.syc"); return true; } diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx index 4783507cdfaa..6721a7919995 100644 --- a/svx/source/stbctrls/modctrl.cxx +++ b/svx/source/stbctrls/modctrl.cxx @@ -165,7 +165,7 @@ void SvxModifyControl::Click() return; Sequence<PropertyValue> aArgs; - execute(OUString(".uno:Save"), aArgs); + execute(".uno:Save", aArgs); } diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index 32f449f44f43..96dd1bd84d78 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -182,9 +182,9 @@ SvxPosSizeStatusBarControl::SvxPosSizeStatusBarControl( sal_uInt16 _nSlotId, pImp->aSizeImage = Image(b); } - addStatusListener( OUString( STR_POSITION )); // SID_ATTR_POSITION - addStatusListener( OUString( STR_TABLECELL )); // SID_TABLE_CELL - addStatusListener( OUString( STR_FUNC )); // SID_PSZ_FUNCTION + addStatusListener( STR_POSITION); // SID_ATTR_POSITION + addStatusListener( STR_TABLECELL); // SID_TABLE_CELL + addStatusListener( STR_FUNC); // SID_PSZ_FUNCTION } @@ -332,7 +332,7 @@ void SvxPosSizeStatusBarControl::Command( const CommandEvent& rCEvt ) aItem.QueryValue( a ); aArgs[0].Value = a; - execute( OUString( ".uno:StatusBarFunc" ), aArgs ); + execute( ".uno:StatusBarFunc", aArgs ); // GetBindings().GetDispatcher()->Execute( SID_PSZ_FUNCTION, SfxCallMode::RECORD, &aItem, 0L ); } } diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index 0029a8fb049f..90e9e38da989 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -247,25 +247,25 @@ void _SdrItemBrowserControl::ImpCtor() InsertDataColumn( ITEMBROWSER_WHICHCOL_ID, - OUString("Which"), - GetTextWidth(OUString(" Which ")) + 2); + "Which", + GetTextWidth(" Which ") + 2); InsertDataColumn( ITEMBROWSER_STATECOL_ID, - OUString("State"), - std::max(GetTextWidth(OUString(" State ")) + 2 , - GetTextWidth(OUString("DontCare")) + 2)); + "State", + std::max(GetTextWidth(" State ") + 2 , + GetTextWidth("DontCare") + 2)); InsertDataColumn( ITEMBROWSER_TYPECOL_ID , - OUString("Type"), - GetTextWidth(OUString(" Type_ ")) + 2); + "Type", + GetTextWidth(" Type_ ") + 2); InsertDataColumn( ITEMBROWSER_NAMECOL_ID , - OUString("Name"), + "Name", 150); InsertDataColumn( ITEMBROWSER_VALUECOL_ID, - OUString("Value"), - GetTextWidth(OUString("12345678901234567890"))); + "Value", + GetTextWidth("12345678901234567890")); SetDataRowHeight( GetTextHeight()); @@ -1046,7 +1046,7 @@ _SdrItemBrowserWindow::_SdrItemBrowserWindow(vcl::Window* pParent, WinBits nBits aBrowse(VclPtr<_SdrItemBrowserControl>::Create(this)) { SetOutputSizePixel(aBrowse->GetSizePixel()); - SetText(OUString("Joe's ItemBrowser")); + SetText("Joe's ItemBrowser"); aBrowse->Show(); } diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index 5895e8e9c53f..678f3ba80d4c 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -67,14 +67,14 @@ SvxFillToolBoxControl::SvxFillToolBoxControl( , mnLastPosHatch(0) , mnLastPosBitmap(0) { - addStatusListener( OUString( ".uno:FillColor" )); - addStatusListener( OUString( ".uno:FillGradient" )); - addStatusListener( OUString( ".uno:FillHatch" )); - addStatusListener( OUString( ".uno:FillBitmap" )); - addStatusListener( OUString( ".uno:ColorTableState" )); - addStatusListener( OUString( ".uno:GradientListState" )); - addStatusListener( OUString( ".uno:HatchListState" )); - addStatusListener( OUString( ".uno:BitmapListState" )); + addStatusListener( ".uno:FillColor"); + addStatusListener( ".uno:FillGradient"); + addStatusListener( ".uno:FillHatch"); + addStatusListener( ".uno:FillBitmap"); + addStatusListener( ".uno:ColorTableState"); + addStatusListener( ".uno:GradientListState"); + addStatusListener( ".uno:HatchListState"); + addStatusListener( ".uno:BitmapListState"); } SvxFillToolBoxControl::~SvxFillToolBoxControl() diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index 126612e0055e..ea9e89ee9264 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -554,7 +554,7 @@ IMPL_LINK_NOARG_TYPED(FontworkCharacterSpacingWindow, SelectHdl,ToolbarMenu*, vo aArgs[0].Name = msFontworkCharacterSpacing.copy(5); aArgs[0].Value <<= (sal_Int32)nCharacterSpacing; - mrController.dispatchCommand( OUString( ".uno:FontworkCharacterSpacingDialog" ), aArgs ); + mrController.dispatchCommand( ".uno:FontworkCharacterSpacingDialog", aArgs ); } else if ( nSelection == 6 ) // KernCharacterPairs { diff --git a/svx/source/tbxctrls/formatpaintbrushctrl.cxx b/svx/source/tbxctrls/formatpaintbrushctrl.cxx index 410398432d8b..63a388ccf779 100644 --- a/svx/source/tbxctrls/formatpaintbrushctrl.cxx +++ b/svx/source/tbxctrls/formatpaintbrushctrl.cxx @@ -59,7 +59,7 @@ void FormatPaintBrushToolBoxControl::impl_executePaintBrush() Sequence< PropertyValue > aArgs( 1 ); aArgs[0].Name = "PersistentCopy"; aArgs[0].Value = makeAny( m_bPersistentCopy ); - Dispatch( OUString( ".uno:FormatPaintbrush" ) + Dispatch( ".uno:FormatPaintbrush" , aArgs ); } diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 54310a35c702..7ebce656d60a 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -108,7 +108,7 @@ ImplGrafMetricField::ImplGrafMetricField( vcl::Window* pParent, const OUString& maCommand( rCmd ), mxFrame( rFrame ) { - Size aSize( GetTextWidth( OUString("-100 %") ), GetTextHeight() ); + Size aSize( GetTextWidth( "-100 %" ), GetTextHeight() ); aSize.Width() += 20, aSize.Height() += 6; SetSizePixel( aSize ); @@ -359,7 +359,7 @@ void ImplGrafModeControl::Select() SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ), - OUString( ".uno:GrafMode" ), + ".uno:GrafMode", aArgs ); } } diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index bbd4556c6f84..36a007647faa 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -122,7 +122,7 @@ void SvxLineBox::Select() aLineDashItem.QueryValue ( a ); aArgs[0].Value = a; SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ), - OUString( ".uno:LineDash" ), + ".uno:LineDash", aArgs ); } } @@ -136,7 +136,7 @@ void SvxLineBox::Select() aLineStyleItem.QueryValue ( a ); aArgs[0].Value = a; SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ), - OUString( ".uno:XLineStyle" ), + ".uno:XLineStyle", aArgs ); nCurPos = GetSelectEntryPos(); @@ -253,7 +253,7 @@ SvxMetricField::SvxMetricField( , ePoolUnit(SFX_MAPUNIT_CM) , mxFrame(rFrame) { - Size aSize(GetTextWidth( OUString("99,99mm") ),GetTextHeight()); + Size aSize(GetTextWidth( "99,99mm" ),GetTextHeight()); aSize.Width() += 20; aSize.Height() += 6; SetSizePixel( aSize ); @@ -297,7 +297,7 @@ void SvxMetricField::Modify() aLineWidthItem.QueryValue( a ); aArgs[0].Value = a; SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ), - OUString( ".uno:LineWidth" ), + ".uno:LineWidth", aArgs ); } diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx index c6a85cf72f50..fd0bb050b3e1 100644 --- a/svx/source/tbxctrls/lboxctrl.cxx +++ b/svx/source/tbxctrls/lboxctrl.cxx @@ -270,9 +270,9 @@ VclPtr<SfxPopupWindow> SvxUndoRedoControl::CreatePopupWindow() DBG_ASSERT(( SID_UNDO == GetSlotId() || SID_REDO == GetSlotId() ), "mismatching ids" ); if ( m_aCommandURL == ".uno:Undo" ) - updateStatus( OUString( ".uno:GetUndoStrings" )); + updateStatus( ".uno:GetUndoStrings"); else - updateStatus( OUString( ".uno:GetRedoStrings" )); + updateStatus( ".uno:GetRedoStrings"); ToolBox& rBox = GetToolBox(); diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index 56c80ee2133a..5282bbefbe5d 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -58,8 +58,8 @@ SvxLineStyleToolBoxControl::SvxLineStyleToolBoxControl( sal_uInt16 nSlotId, pDashItem ( NULL ), bUpdate ( false ) { - addStatusListener( OUString( ".uno:LineDash" )); - addStatusListener( OUString( ".uno:DashListState" )); + addStatusListener( ".uno:LineDash"); + addStatusListener( ".uno:DashListState"); } @@ -192,7 +192,7 @@ SvxLineWidthToolBoxControl::SvxLineWidthToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ) { - addStatusListener( OUString( ".uno:MetricUnit" )); + addStatusListener( ".uno:MetricUnit"); } @@ -314,7 +314,7 @@ void SvxLineEndWindow::implInit() // ValueSet fill with entries of LineEndList FillValueSet(); - AddStatusListener( OUString( ".uno:LineEndListState" )); + AddStatusListener( ".uno:LineEndListState"); //ChangeHelpId( HID_POPUP_LINEENDSTYLE ); aLineEndSet->Show(); @@ -381,7 +381,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineEndWindow, SelectHdl, ValueSet*, void) aLineEndSet->SetNoSelection(); SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ), - OUString( ".uno:LineEndStyle" ), + ".uno:LineEndStyle", aArgs ); } diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index b1658c159ad7..a92a81cb5090 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -191,7 +191,7 @@ private: { Sequence< PropertyValue > aArgs; SfxToolBoxControl::Dispatch( m_xDispatchProvider, - OUString( ".uno:CharEndPreviewFontName" ), + ".uno:CharEndPreviewFontName", aArgs ); } DECL_DLLPRIVATE_LINK_TYPED( CheckAndMarkUnknownFont, VclWindowEvent&, void ); @@ -385,13 +385,13 @@ IMPL_LINK_TYPED( SvxStyleBox_Impl, MenuSelectHdl, Menu*, pMenu, bool) case RID_SVX_UPDATE_STYLE: { SfxToolBoxControl::Dispatch( m_xDispatchProvider, - OUString( ".uno:StyleUpdateByExample" ), aArgs ); + ".uno:StyleUpdateByExample", aArgs ); break; } case RID_SVX_MODIFY_STYLE: { SfxToolBoxControl::Dispatch( m_xDispatchProvider, - OUString( ".uno:EditStyle" ), aArgs ); + ".uno:EditStyle", aArgs ); break; } } @@ -415,7 +415,7 @@ void SvxStyleBox_Impl::Select() bClear = true; //not only apply default style but also call 'ClearFormatting' Sequence< PropertyValue > aEmptyVals; - SfxToolBoxControl::Dispatch( m_xDispatchProvider, OUString(".uno:ResetAttributes"), + SfxToolBoxControl::Dispatch( m_xDispatchProvider, ".uno:ResetAttributes", aEmptyVals); } else if( aSearchEntry == aMoreKey && GetSelectEntryPos() == ( GetEntryCount() - 1 ) ) @@ -470,7 +470,7 @@ void SvxStyleBox_Impl::Select() if( bCreateNew ) { aArgs[0].Name = "Param"; - SfxToolBoxControl::Dispatch( m_xDispatchProvider, OUString(".uno:StyleNewByExample"), aArgs); + SfxToolBoxControl::Dispatch( m_xDispatchProvider, ".uno:StyleNewByExample", aArgs); } else { @@ -1152,7 +1152,7 @@ void SvxFontNameBox_Impl::UserDraw( const UserDrawEvent& rUDEvt ) aFontItem.QueryValue( aArgs[0].Value ); aArgs[0].Name = "CharPreviewFontName"; SfxToolBoxControl::Dispatch( m_xDispatchProvider, - OUString( ".uno:CharPreviewFontName" ), + ".uno:CharPreviewFontName", aArgs ); } } @@ -1192,7 +1192,7 @@ void SvxFontNameBox_Impl::Select() { aArgs[0].Name = "CharFontName"; SfxToolBoxControl::Dispatch( m_xDispatchProvider, - OUString( ".uno:CharFontName" ), + ".uno:CharFontName", aArgs ); } } @@ -1207,7 +1207,7 @@ void SvxFontNameBox_Impl::Select() { aArgs[0].Name = "CharPreviewFontName"; SfxToolBoxControl::Dispatch( m_xDispatchProvider, - OUString( ".uno:CharPreviewFontName" ), + ".uno:CharPreviewFontName", aArgs ); } } @@ -1575,7 +1575,7 @@ SvxFrameWindow_Impl::SvxFrameWindow_Impl( sal_uInt16 nId, const Reference< XFram bParagraphMode(false) { BindListener(); - AddStatusListener(OUString(".uno:BorderReducedMode")); + AddStatusListener(".uno:BorderReducedMode"); aImgList = ImageList( SVX_RES( RID_SVXIL_FRAME ) ); if( pParentWindow->GetDPIScaleFactor() > 1 ) @@ -1776,7 +1776,7 @@ IMPL_LINK_NOARG_TYPED(SvxFrameWindow_Impl, SelectHdl, ValueSet*, void) aFrameSet->SetNoSelection(); SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( GetFrame()->getController(), UNO_QUERY ), - OUString( ".uno:SetBorderStyle" ), + ".uno:SetBorderStyle", aArgs ); } @@ -1921,7 +1921,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineWindow_Impl, SelectHdl, ListBox&, void) aArgs[0].Value = a; SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( GetFrame()->getController(), UNO_QUERY ), - OUString( ".uno:LineStyle" ), + ".uno:LineStyle", aArgs ); } @@ -2548,51 +2548,51 @@ SvxColorToolBoxControl::SvxColorToolBoxControl( switch( nSlotId ) { case SID_ATTR_CHAR_COLOR: - addStatusListener( OUString( ".uno:Color" )); + addStatusListener( ".uno:Color"); mPaletteManager.SetLastColor( COL_RED ); bSidebarType = false; break; case SID_ATTR_CHAR_COLOR2: - addStatusListener( OUString( ".uno:CharColorExt" )); + addStatusListener( ".uno:CharColorExt"); mPaletteManager.SetLastColor( COL_RED ); bSidebarType = false; break; case SID_BACKGROUND_COLOR: - addStatusListener( OUString( ".uno:BackgroundColor" )); + addStatusListener( ".uno:BackgroundColor"); mPaletteManager.SetLastColor( COL_YELLOW ); break; case SID_ATTR_CHAR_COLOR_BACKGROUND: - addStatusListener( OUString( ".uno:CharBackgroundExt" )); + addStatusListener( ".uno:CharBackgroundExt"); mPaletteManager.SetLastColor( COL_YELLOW ); bSidebarType = false; break; case SID_ATTR_CHAR_BACK_COLOR: - addStatusListener( OUString( ".uno:CharBackColor" )); + addStatusListener( ".uno:CharBackColor"); mPaletteManager.SetLastColor( COL_YELLOW ); break; case SID_FRAME_LINECOLOR: - addStatusListener( OUString( ".uno:FrameLineColor" )); - addStatusListener( OUString( ".uno:BorderTLBR" )); - addStatusListener( OUString( ".uno:BorderBLTR" )); + addStatusListener( ".uno:FrameLineColor"); + addStatusListener( ".uno:BorderTLBR"); + addStatusListener( ".uno:BorderBLTR"); mPaletteManager.SetLastColor( COL_BLUE ); break; case SID_EXTRUSION_3D_COLOR: - addStatusListener( OUString( ".uno:Extrusion3DColor")); + addStatusListener( ".uno:Extrusion3DColor"); break; case SID_ATTR_LINE_COLOR: - addStatusListener( OUString( ".uno:XLineColor" )); + addStatusListener( ".uno:XLineColor"); mPaletteManager.SetLastColor( COL_BLACK ); break; case SID_ATTR_FILL_COLOR: - addStatusListener( OUString( ".uno:FillColor" )); + addStatusListener( ".uno:FillColor"); mPaletteManager.SetLastColor( COL_DEFAULT_SHAPE_FILLING ); break; } diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx index 61e060953a45..4a9d658ee131 100644 --- a/svx/source/tbxctrls/tbunocontroller.cxx +++ b/svx/source/tbxctrls/tbunocontroller.cxx @@ -278,7 +278,7 @@ FontHeightToolBoxControl::FontHeightToolBoxControl( const uno::Reference< uno::X OUString( ".uno:FontHeight" ) ), m_pBox( NULL ) { - addStatusListener( OUString( ".uno:CharFontName" )); + addStatusListener( ".uno:CharFontName"); } FontHeightToolBoxControl::~FontHeightToolBoxControl() diff --git a/svx/source/tbxctrls/verttexttbxctrl.cxx b/svx/source/tbxctrls/verttexttbxctrl.cxx index d9834b5ccb6f..dce2e51c909e 100644 --- a/svx/source/tbxctrls/verttexttbxctrl.cxx +++ b/svx/source/tbxctrls/verttexttbxctrl.cxx @@ -33,13 +33,13 @@ SFX_IMPL_TOOLBOX_CONTROL(SvxVertTextTbxCtrl, SfxBoolItem); SvxCTLTextTbxCtrl::SvxCTLTextTbxCtrl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SvxVertCTLTextTbxCtrl( nSlotId, nId, rTbx ) { - addStatusListener( OUString( ".uno:CTLFontState" )); + addStatusListener( ".uno:CTLFontState"); } SvxVertTextTbxCtrl::SvxVertTextTbxCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SvxVertCTLTextTbxCtrl( nSlotId, nId, rTbx ) { - addStatusListener( OUString( ".uno:VerticalTextState" )); + addStatusListener( ".uno:VerticalTextState"); } SvxVertCTLTextTbxCtrl::SvxVertCTLTextTbxCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : diff --git a/svx/source/unodraw/tableshape.cxx b/svx/source/unodraw/tableshape.cxx index fa5daca04b82..4a3c961b14f6 100644 --- a/svx/source/unodraw/tableshape.cxx +++ b/svx/source/unodraw/tableshape.cxx @@ -40,7 +40,7 @@ using namespace ::com::sun::star::beans; SvxTableShape::SvxTableShape( SdrObject* pObj ) throw() : SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_TABLE), getSvxMapProvider().GetPropertySet(SVXMAP_TABLE, SdrObject::GetGlobalDrawObjectItemPool()) ) { - SetShapeType( OUString( "com.sun.star.drawing.TableShape" ) ); + SetShapeType( "com.sun.star.drawing.TableShape" ); } diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index d089d09153b2..1b414e54b995 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -1399,7 +1399,7 @@ comphelper::PropertySetInfo* SvxPropertySetInfoPool::getOrCreate( sal_Int32 nSer break; case SVXUNO_SERVICEID_COM_SUN_STAR_DRAWING_DEFAULTS_WRITER: mpInfos[SVXUNO_SERVICEID_COM_SUN_STAR_DRAWING_DEFAULTS_WRITER]->add( ImplGetSvxDrawingDefaultsPropertyMap() ); - mpInfos[SVXUNO_SERVICEID_COM_SUN_STAR_DRAWING_DEFAULTS_WRITER]->remove( OUString( UNO_NAME_EDIT_PARA_IS_HANGING_PUNCTUATION ) ); + mpInfos[SVXUNO_SERVICEID_COM_SUN_STAR_DRAWING_DEFAULTS_WRITER]->remove( UNO_NAME_EDIT_PARA_IS_HANGING_PUNCTUATION ); // OD 13.10.2003 #i18732# - add property map for writer item 'IsFollowingTextFlow' mpInfos[SVXUNO_SERVICEID_COM_SUN_STAR_DRAWING_DEFAULTS_WRITER]->add( ImplGetAdditionalWriterDrawingDefaultsPropertyMap() ); break; diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index d1b4a6516c52..4f3bc05a5bf3 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -575,7 +575,7 @@ const SvGlobalName SvxOle2Shape::GetClassName_Impl(OUString& rHexCLSID) SvxAppletShape::SvxAppletShape( SdrObject* pObject ) throw() : SvxOle2Shape( pObject, getSvxMapProvider().GetMap(SVXMAP_APPLET), getSvxMapProvider().GetPropertySet(SVXMAP_APPLET, SdrObject::GetGlobalDrawObjectItemPool()) ) { - SetShapeType( OUString( "com.sun.star.drawing.AppletShape" ) ); + SetShapeType( "com.sun.star.drawing.AppletShape" ); } SvxAppletShape::~SvxAppletShape() throw() @@ -587,7 +587,7 @@ void SvxAppletShape::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage ) SvxShape::Create( pNewObj, pNewPage ); const SvGlobalName aAppletClassId( SO3_APPLET_CLASSID ); createObject(aAppletClassId); - SetShapeType( OUString( "com.sun.star.drawing.AppletShape" ) ); + SetShapeType( "com.sun.star.drawing.AppletShape" ); } void SAL_CALL SvxAppletShape::setPropertyValue( const OUString& aPropertyName, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) @@ -648,7 +648,7 @@ bool SvxAppletShape::getPropertyValueImpl( const OUString& rName, const SfxItemP SvxPluginShape::SvxPluginShape( SdrObject* pObject ) throw() : SvxOle2Shape( pObject, getSvxMapProvider().GetMap(SVXMAP_PLUGIN), getSvxMapProvider().GetPropertySet(SVXMAP_PLUGIN, SdrObject::GetGlobalDrawObjectItemPool()) ) { - SetShapeType( OUString( "com.sun.star.drawing.PluginShape" ) ); + SetShapeType( "com.sun.star.drawing.PluginShape" ); } SvxPluginShape::~SvxPluginShape() throw() @@ -660,7 +660,7 @@ void SvxPluginShape::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage ) SvxShape::Create( pNewObj, pNewPage ); const SvGlobalName aPluginClassId( SO3_PLUGIN_CLASSID ); createObject(aPluginClassId); - SetShapeType( OUString( "com.sun.star.drawing.PluginShape" ) ); + SetShapeType( "com.sun.star.drawing.PluginShape" ); } void SAL_CALL SvxPluginShape::setPropertyValue( const OUString& aPropertyName, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) @@ -721,7 +721,7 @@ bool SvxPluginShape::getPropertyValueImpl( const OUString& rName, const SfxItemP SvxFrameShape::SvxFrameShape( SdrObject* pObject ) throw() : SvxOle2Shape( pObject, getSvxMapProvider().GetMap(SVXMAP_FRAME), getSvxMapProvider().GetPropertySet(SVXMAP_FRAME, SdrObject::GetGlobalDrawObjectItemPool()) ) { - SetShapeType( OUString( "com.sun.star.drawing.FrameShape" ) ); + SetShapeType( "com.sun.star.drawing.FrameShape" ); } SvxFrameShape::~SvxFrameShape() throw() @@ -733,7 +733,7 @@ void SvxFrameShape::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage ) throw (u SvxShape::Create( pNewObj, pNewPage ); const SvGlobalName aIFrameClassId( SO3_IFRAME_CLASSID ); createObject(aIFrameClassId); - SetShapeType( OUString( "com.sun.star.drawing.FrameShape" ) ); + SetShapeType( "com.sun.star.drawing.FrameShape" ); } void SAL_CALL SvxFrameShape::setPropertyValue( const OUString& aPropertyName, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) @@ -797,7 +797,7 @@ SvxMediaShape::SvxMediaShape( SdrObject* pObj, OUString const & referer ) throw( : SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_MEDIA), getSvxMapProvider().GetPropertySet(SVXMAP_MEDIA, SdrObject::GetGlobalDrawObjectItemPool()) ), referer_(referer) { - SetShapeType( OUString( "com.sun.star.drawing.MediaShape" ) ); + SetShapeType( "com.sun.star.drawing.MediaShape" ); } diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx index 05dd5974a7b9..02113f61b2d7 100644 --- a/svx/source/xml/xmlxtimp.cxx +++ b/svx/source/xml/xmlxtimp.cxx @@ -332,16 +332,16 @@ SvxXMLXTableImport::SvxXMLXTableImport( { SetGraphicResolver( xGrfResolver ); - GetNamespaceMap().Add( OUString( sXML_np__ooo ), GetXMLToken(XML_N_OOO), XML_NAMESPACE_OOO ); - GetNamespaceMap().Add( OUString( sXML_np__office ), GetXMLToken(XML_N_OFFICE), XML_NAMESPACE_OFFICE ); - GetNamespaceMap().Add( OUString( sXML_np__draw ), GetXMLToken(XML_N_DRAW), XML_NAMESPACE_DRAW ); - GetNamespaceMap().Add( OUString( sXML_np__xlink ), GetXMLToken(XML_N_XLINK), XML_NAMESPACE_XLINK ); + GetNamespaceMap().Add( sXML_np__ooo, GetXMLToken(XML_N_OOO), XML_NAMESPACE_OOO ); + GetNamespaceMap().Add( sXML_np__office, GetXMLToken(XML_N_OFFICE), XML_NAMESPACE_OFFICE ); + GetNamespaceMap().Add( sXML_np__draw, GetXMLToken(XML_N_DRAW), XML_NAMESPACE_DRAW ); + GetNamespaceMap().Add( sXML_np__xlink, GetXMLToken(XML_N_XLINK), XML_NAMESPACE_XLINK ); // OOo namespaces for reading OOo 1.1 files - GetNamespaceMap().Add( OUString( sXML_np__office_ooo ), + GetNamespaceMap().Add( sXML_np__office_ooo, GetXMLToken(XML_N_OFFICE_OOO), XML_NAMESPACE_OFFICE ); - GetNamespaceMap().Add( OUString( sXML_np__draw_ooo ), + GetNamespaceMap().Add( sXML_np__draw_ooo, GetXMLToken(XML_N_DRAW_OOO), XML_NAMESPACE_DRAW ); } diff --git a/svx/workben/pixelctl.cxx b/svx/workben/pixelctl.cxx index e16a45820277..564d2b55ae81 100644 --- a/svx/workben/pixelctl.cxx +++ b/svx/workben/pixelctl.cxx @@ -101,7 +101,7 @@ public: void Main() { ScopedVclPtrInstance< MyWin > aMainWin( nullptr, WB_STDWORK ); - aMainWin->SetText( OUString( "SvxPixelCtl" ) ); + aMainWin->SetText( "SvxPixelCtl" ); aMainWin->Show(); Application::Execute(); |