diff options
| author | Noel Grandin <noel@peralex.com> | 2013-10-31 17:37:03 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-11-08 08:44:33 +0200 |
| commit | 913b4e7d856ad6392588886a4124d05676e8968d (patch) | |
| tree | 0657c6a9bacb68cbc30a93e394c207086f317938 | |
| parent | a5536d9a0eac922d18f9008122034ca943d50148 (diff) | |
remove unnecessary use of OUString constructor in SVX module
Change-Id: I1506daaa4a3b736ee6bbb00100fca24df8368298
34 files changed, 133 insertions, 143 deletions
diff --git a/svx/source/core/graphichelper.cxx b/svx/source/core/graphichelper.cxx index fb50173af11d..df3015eaa071 100644 --- a/svx/source/core/graphichelper.cxx +++ b/svx/source/core/graphichelper.cxx @@ -253,7 +253,7 @@ void GraphicHelper::SaveShapeAsGraphic( const Reference< drawing::XShape >& xSha } if( aDefaultFormatName.getLength() == 0 ) - aDefaultFormatName = OUString( "PNG - Portable Network Graphic" ); + aDefaultFormatName = "PNG - Portable Network Graphic"; xFilterManager->setCurrentFilter( aDefaultFormatName ); @@ -280,9 +280,9 @@ void GraphicHelper::SaveShapeAsGraphic( const Reference< drawing::XShape >& xSha Reference<css::drawing::XGraphicExportFilter> xGraphicExporter = css::drawing::GraphicExportFilter::create( xContext ); Sequence<PropertyValue> aDescriptor( 2 ); - aDescriptor[0].Name = OUString("MediaType"); + aDescriptor[0].Name = "MediaType"; aDescriptor[0].Value <<= aExportMimeType; - aDescriptor[1].Name = OUString("URL"); + aDescriptor[1].Name = "URL"; aDescriptor[1].Value <<= sPath; Reference< XComponent > xSourceDocument = Reference< XComponent >( xShape, UNO_QUERY_THROW ); diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index b12caee37534..a2586fc1ca7e 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -1432,7 +1432,7 @@ void BrokenRecoveryDialog::impl_refresh() sal_uInt16 nPos = m_aFileListLB.InsertEntry(rInfo.DisplayName, rInfo.StandardImage ); m_aFileListLB.SetEntryData( nPos, (void*)&rInfo ); } - m_sSavePath = OUString(); + m_sSavePath = ""; m_aOkBtn.GrabFocus(); } @@ -1926,11 +1926,11 @@ void BrokenRecoveryDialog::impl_askForSavePath() { #if defined(WNT) - OUString ustrValue = OUString("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/bootstrap.ini:UserInstallation}"); + OUString ustrValue = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/bootstrap.ini:UserInstallation}"; #elif defined( MACOSX ) - OUString ustrValue = OUString("~"); + OUString ustrValue = "~"; #else - OUString ustrValue = OUString("$SYSUSERCONFIG"); + OUString ustrValue = "$SYSUSERCONFIG"; #endif Bootstrap::expandMacros( ustrValue ); @@ -1948,11 +1948,7 @@ void BrokenRecoveryDialog::impl_askForSavePath() static OUString GetPreviewURL() { - OUString aURL = GetCrashConfigDir(); - - aURL += OUString( "/" ); - aURL += OUString( PRVFILE ); - + OUString aURL = GetCrashConfigDir() + "/" + PRVFILE; return aURL; } diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 42a1b1c6547f..0b2fcad8d50b 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -122,12 +122,12 @@ struct SearchDlg_Impl m_pSearchFormats->SetStyle(m_pSearchFormats->GetStyle() | WB_PATHELLIPSIS); pParent->get(m_pReplaceFormats, "replaceformat"); m_pReplaceFormats->SetStyle(m_pReplaceFormats->GetStyle() | WB_PATHELLIPSIS); - aCommand1URL.Complete = aCommand1URL.Main = OUString("vnd.sun.search:SearchViaComponent1"); - aCommand1URL.Protocol = OUString("vnd.sun.search:"); - aCommand1URL.Path = OUString("SearchViaComponent1"); - aCommand2URL.Complete = aCommand2URL.Main = OUString("vnd.sun.search:SearchViaComponent2"); - aCommand2URL.Protocol = OUString("vnd.sun.search:"); - aCommand2URL.Path = OUString("SearchViaComponent2"); + aCommand1URL.Complete = aCommand1URL.Main = "vnd.sun.search:SearchViaComponent1"; + aCommand1URL.Protocol = "vnd.sun.search:"; + aCommand1URL.Path = "SearchViaComponent1"; + aCommand2URL.Complete = aCommand2URL.Main = "vnd.sun.search:SearchViaComponent2"; + aCommand2URL.Protocol = "vnd.sun.search:"; + aCommand2URL.Path = "SearchViaComponent2"; } ~SearchDlg_Impl() { delete[] pRanges; } }; @@ -1352,9 +1352,9 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn ) { uno::Sequence < beans::PropertyValue > aArgs(2); beans::PropertyValue* pArgs = aArgs.getArray(); - pArgs[0].Name = OUString("SearchString"); + pArgs[0].Name = "SearchString"; pArgs[0].Value <<= OUString(m_pSearchLB->GetText()); - pArgs[1].Name = OUString("ParentWindow"); + pArgs[1].Name = "ParentWindow"; pArgs[1].Value <<= VCLUnoHelper::GetInterface( this ); if(pBtn == m_pSearchComponent1PB) { diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index 31e83a00b582..331ff4d6bdb6 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -301,9 +301,9 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) } Sequence< PropertyValue > aProperties(2); PropertyValue* pProperties = aProperties.getArray(); - pProperties[0].Name = OUString("NumberingType"); + pProperties[0].Name = "NumberingType"; pProperties[0].Value <<= aNumberingTypes[i]; - pProperties[1].Name = OUString("Value"); + pProperties[1].Name = "Value"; pProperties[1].Value <<= (sal_Int32)1; try { diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index 939069f13375..cd399cecde62 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -423,7 +423,7 @@ OUString SAL_CALL FmXGridControl::getImplementationName() throw() { Sequence< OUString > aServiceNames(2); aServiceNames[0] = FM_SUN_CONTROL_GRIDCONTROL; - aServiceNames[1] = OUString("com.sun.star.awt.UnoControl"); + aServiceNames[1] = "com.sun.star.awt.UnoControl"; return aServiceNames; } @@ -1110,8 +1110,7 @@ namespace fmgridif { const OUString getDataModeIdentifier() { - static OUString s_sDataModeIdentifier = OUString( "DataMode" ); - return s_sDataModeIdentifier; + return OUString("DataMode"); } } using namespace fmgridif; @@ -2468,8 +2467,8 @@ OUString FmXGridPeer::getMode() throw( RuntimeException ) { aModes.realloc(2); OUString* pModes = aModes.getArray(); - pModes[0] = OUString( "DataMode" ); - pModes[1] = OUString( "FilterMode" ); + pModes[0] = "DataMode"; + pModes[1] = "FilterMode"; } return aModes; } diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 2a1cd955cdd7..a18e92969462 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -511,9 +511,9 @@ sal_Bool IsSearchableControl( const ::com::sun::star::uno::Reference< ::com::sun { switch ( (::TriState)xCheckBox->getState() ) { - case STATE_NOCHECK: *_pCurrentText = OUString("0" ); break; - case STATE_CHECK: *_pCurrentText = OUString("1" ); break; - default: *_pCurrentText = OUString(); break; + case STATE_NOCHECK: *_pCurrentText = "0"; break; + case STATE_CHECK: *_pCurrentText = "1"; break; + default: *_pCurrentText = ""; break; } } return sal_True; @@ -677,7 +677,7 @@ FmXFormShell::FmXFormShell( FmFormShell& _rShell, SfxViewFrame* _pViewFrame ) implAdjustConfigCache(); // and register for changes on this settings Sequence< OUString > aNames(1); - aNames[0] = OUString("FormControlPilotsEnabled"); + aNames[0] = "FormControlPilotsEnabled"; EnableNotification(aNames); } @@ -3442,7 +3442,7 @@ void FmXFormShell::CreateExternalView() aColumnProps.realloc(pColumnProps - aColumnProps.getArray()); // columns props are a dispatch argument - pDispatchArgs->Name = OUString("ColumnProperties"); // TODO : fmurl.* + pDispatchArgs->Name = "ColumnProperties"; // TODO : fmurl.* pDispatchArgs->Value = makeAny(aColumnProps); ++pDispatchArgs; DBG_ASSERT(nDispatchArgs == (pDispatchArgs - aDispatchArgs.getConstArray()), @@ -3529,7 +3529,7 @@ void FmXFormShell::CreateExternalView() ++pDispatchArgs; // the - pDispatchArgs->Name = OUString("ColumnProperties"); // TODO : fmurl.* + pDispatchArgs->Name = "ColumnProperties"; // TODO : fmurl.* pDispatchArgs->Value = makeAny(aListBoxDescription); ++pDispatchArgs; DBG_ASSERT(nDispatchArgs == (pDispatchArgs - aDispatchArgs.getConstArray()), @@ -3580,7 +3580,7 @@ void FmXFormShell::implAdjustConfigCache() { // get (cache) the wizard usage flag Sequence< OUString > aNames(1); - aNames[0] = OUString("FormControlPilotsEnabled"); + aNames[0] = "FormControlPilotsEnabled"; Sequence< Any > aFlags = GetProperties(aNames); if (1 == aFlags.getLength()) m_bUseWizards = ::cppu::any2bool(aFlags[0]); @@ -3612,7 +3612,7 @@ void FmXFormShell::SetWizardUsing(sal_Bool _bUseThem) m_bUseWizards = _bUseThem; Sequence< OUString > aNames(1); - aNames[0] = OUString("FormControlPilotsEnabled"); + aNames[0] = "FormControlPilotsEnabled"; Sequence< Any > aValues(1); aValues[0] = ::cppu::bool2any(m_bUseWizards); PutProperties(aNames, aValues); @@ -4056,7 +4056,7 @@ sal_Bool SearchableControlIterator::ShouldHandleElement(const Reference< XInterf Any aClassId( xProperties->getPropertyValue(FM_PROP_CLASSID) ); if (::comphelper::getINT16(aClassId) == FormComponentType::GRIDCONTROL) { - m_sCurrentValue = OUString(); + m_sCurrentValue = ""; return sal_True; } } diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index f4e5e0002649..ed1516077759 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -699,7 +699,7 @@ Sequence< OUString> SAL_CALL FormController::getSupportedServiceNames(void) thro // service names which are supported only, but cannot be used to created an // instance at a service factory Sequence< OUString > aNonCreatableServiceNames( 1 ); - aNonCreatableServiceNames[ 0 ] = OUString( "com.sun.star.form.FormControllerDispatcher" ); + aNonCreatableServiceNames[ 0 ] = "com.sun.star.form.FormControllerDispatcher"; // services which can be used to created an instance at a service factory Sequence< OUString > aCreatableServiceNames( getSupportedServiceNames_Static() ); @@ -727,8 +727,8 @@ Sequence< OUString> FormController::getSupportedServiceNames_Static(void) if (!aServices.getLength()) { aServices.realloc(2); - aServices.getArray()[0] = OUString( "com.sun.star.form.runtime.FormController" ); - aServices.getArray()[1] = OUString("com.sun.star.awt.control.TabController"); + aServices.getArray()[0] = "com.sun.star.form.runtime.FormController"; + aServices.getArray()[1] = "com.sun.star.awt.control.TabController"; } return aServices; } @@ -3530,9 +3530,8 @@ Sequence< OUString > SAL_CALL FormController::getSupportedModes(void) throw( Run if (!aModes.getLength()) { aModes.realloc(2); - OUString* pModes = aModes.getArray(); - pModes[0] = OUString( "DataMode" ); - pModes[1] = OUString( "FilterMode" ); + aModes[0] = "DataMode"; + aModes[1] = "FilterMode"; } return aModes; } diff --git a/svx/source/form/legacyformcontroller.cxx b/svx/source/form/legacyformcontroller.cxx index df97d8fe57d7..211bf65f168b 100644 --- a/svx/source/form/legacyformcontroller.cxx +++ b/svx/source/form/legacyformcontroller.cxx @@ -192,8 +192,8 @@ namespace svxform Sequence< OUString > SAL_CALL LegacyFormController::getSupportedServiceNames( ) throw (RuntimeException) { Sequence< OUString > aServices(2); - aServices.getArray()[0] = OUString( "com.sun.star.form.FormController" ); - aServices.getArray()[1] = OUString("com.sun.star.awt.control.TabController"); + aServices.getArray()[0] = "com.sun.star.form.FormController"; + aServices.getArray()[1] = "com.sun.star.awt.control.TabController"; return aServices; } diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index e7cea796a683..12f2a0a00392 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -231,7 +231,7 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbDirIsR ::ucbhelper::Content aCnt( rBaseURL.GetMainURL( INetURLObject::NO_DECODE ), xEnv, comphelper::getProcessComponentContext() ); uno::Sequence< OUString > aProps( 1 ); - aProps.getArray()[ 0 ] = OUString("Url"); + aProps.getArray()[ 0 ] = "Url"; uno::Reference< sdbc::XResultSet > xResultSet( aCnt.createCursor( aProps, ::ucbhelper::INCLUDE_DOCUMENTS_ONLY ) ); diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index 1b3409be063d..b1214d5f96e4 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -267,8 +267,8 @@ sal_Bool CreateDir( const INetURLObject& rURL ) uno::Sequence< OUString > aProps( 1 ); uno::Sequence< uno::Any > aValues( 1 ); - aProps.getArray()[ 0 ] = OUString("Title"); - aValues.getArray()[ 0 ] = uno::makeAny( OUString( aNewFolderURL.GetName() ) ); + aProps[0] = "Title"; + 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 ); diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index dc2f48ad336c..bcc4e5a27a5d 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -1138,7 +1138,7 @@ sal_Bool GalleryTheme::InsertFileOrDirURL( const INetURLObject& rFileOrDirURL, s if( bFolder ) { uno::Sequence< OUString > aProps( 1 ); - aProps.getArray()[ 0 ] = OUString("Url"); + aProps[ 0 ] = "Url"; uno::Reference< sdbc::XResultSet > xResultSet( aCnt.createCursor( aProps, ::ucbhelper::INCLUDE_DOCUMENTS_ONLY ) ); uno::Reference< ucb::XContentAccess > xContentAccess( xResultSet, uno::UNO_QUERY ); if( xContentAccess.is() ) diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx index ef305aa8f3e9..95798fef8e8c 100644 --- a/svx/source/items/rotmodit.cxx +++ b/svx/source/items/rotmodit.cxx @@ -71,7 +71,7 @@ SfxItemPresentation SvxRotateModeItem::GetPresentation( SfxMapUnit /*eCoreUnit*/, SfxMapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper * ) const { - rText = OUString(); + rText = ""; switch ( ePres ) { @@ -98,7 +98,7 @@ OUString SvxRotateModeItem::GetValueText( sal_uInt16 nVal ) const case SVX_ROTATE_MODE_TOP: case SVX_ROTATE_MODE_CENTER: case SVX_ROTATE_MODE_BOTTOM: - aText = OUString("..."); + aText = "..."; break; default: OSL_FAIL("SvxRotateModeItem: falscher enum"); diff --git a/svx/source/sdr/overlay/overlaymanager.cxx b/svx/source/sdr/overlay/overlaymanager.cxx index 2509d16bbbaf..6bb912ecff92 100644 --- a/svx/source/sdr/overlay/overlaymanager.cxx +++ b/svx/source/sdr/overlay/overlaymanager.cxx @@ -135,7 +135,7 @@ namespace sdr if(bUseReducedDisplayQualityForDrag) { uno::Sequence< beans::PropertyValue > xProperties(1); - xProperties[0].Name = OUString("ReducedDisplayQuality"); + xProperties[0].Name = "ReducedDisplayQuality"; xProperties[0].Value <<= true; maViewInformation2D = drawinglayer::geometry::ViewInformation2D(xProperties); } diff --git a/svx/source/sdr/primitive2d/primitivefactory2d.cxx b/svx/source/sdr/primitive2d/primitivefactory2d.cxx index 23c93203b865..e549d79b3565 100644 --- a/svx/source/sdr/primitive2d/primitivefactory2d.cxx +++ b/svx/source/sdr/primitive2d/primitivefactory2d.cxx @@ -111,7 +111,7 @@ namespace drawinglayer if(!aSeq.getLength()) { aSeq.realloc(1L); - aSeq.getArray()[0L] = OUString("com.sun.star.graphic.PrimitiveFactory2D"); + aSeq[0] = "com.sun.star.graphic.PrimitiveFactory2D"; } return aSeq; diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx index 77ee1f57d256..dbda6ecaf055 100644 --- a/svx/source/sidebar/nbdtmg.cxx +++ b/svx/source/sidebar/nbdtmg.cxx @@ -422,7 +422,7 @@ sal_Bool BulletsTypeMgr::RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_ pActualBullets[nIndex]->bIsCustomized = sal_True; OUString aStrFromRES = SVX_RESSTR( RID_SVXSTR_NUMBULLET_CUSTOM_BULLET_DESCRIPTION); - OUString aReplace = OUString("%LIST_NUM"); + OUString aReplace = "%LIST_NUM"; OUString sNUM = OUString::number( nIndex + 1 ); aStrFromRES = aStrFromRES.replaceFirst(aReplace,sNUM); pActualBullets[nIndex]->sDescription = aStrFromRES; @@ -1367,7 +1367,7 @@ void NumberingTypeMgr::Init() { aLevel.realloc(aLevel.getLength() + 1); PropertyValue& rValue = aLevel.getArray()[aLevel.getLength() - 1]; - rValue.Name = OUString("Value"); + rValue.Name = "Value"; rValue.Value <<= (sal_Int32)(j + 1); if (j!=0) diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index 2fa8e6070116..a8f4eb1cd828 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -309,7 +309,7 @@ OUString _SdrItemBrowserControl::GetCellText(long _nRow, sal_uInt16 _nColId) con } else { - sRet = OUString("???"); + sRet = "???"; switch (_nColId) { case ITEMBROWSER_WHICHCOL_ID: @@ -1016,7 +1016,7 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem } else { - aEntry.aValue = OUString("InvalidItem"); + aEntry.aValue = "InvalidItem"; } ImpSetEntry(aEntry,nEntryNum); nEntryNum++; diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 2a25406595e7..f7976e8ab12b 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -447,16 +447,16 @@ void SvxStyleBox_Impl::Select() Sequence< PropertyValue > aArgs( 2 ); aArgs[0].Value = makeAny( OUString( aSearchEntry ) ); - aArgs[1].Name = OUString("Family"); + aArgs[1].Name = "Family"; aArgs[1].Value = makeAny( sal_Int16( eStyleFamily )); if( bCreateNew ) { - aArgs[0].Name = OUString("Param"); + aArgs[0].Name = "Param"; SfxToolBoxControl::Dispatch( m_xDispatchProvider, OUString(".uno:StyleNewByExample"), aArgs); } else { - aArgs[0].Name = OUString("Template"); + aArgs[0].Name = "Template"; SfxToolBoxControl::Dispatch( m_xDispatchProvider, m_aCommand, aArgs ); } } @@ -995,7 +995,7 @@ void SvxFontNameBox_Impl::UserDraw( const UserDrawEvent& rUDEvt ) aInfo.GetCharSet(), SID_ATTR_CHAR_FONT ); aFontItem.QueryValue( aArgs[0].Value ); - aArgs[0].Name = OUString( "CharPreviewFontName" ); + aArgs[0].Name = "CharPreviewFontName"; SfxToolBoxControl::Dispatch( m_xDispatchProvider, OUString( ".uno:CharPreviewFontName" ), aArgs ); @@ -1035,7 +1035,7 @@ void SvxFontNameBox_Impl::Select() EndPreview(); if ( pFontItem.get() ) { - aArgs[0].Name = OUString( "CharFontName" ); + aArgs[0].Name = "CharFontName"; SfxToolBoxControl::Dispatch( m_xDispatchProvider, OUString( ".uno:CharFontName" ), aArgs ); @@ -1050,7 +1050,7 @@ void SvxFontNameBox_Impl::Select() } if ( pFontItem.get() ) { - aArgs[0].Name = OUString( "CharPreviewFontName" ); + aArgs[0].Name = "CharPreviewFontName"; SfxToolBoxControl::Dispatch( m_xDispatchProvider, OUString( ".uno:CharPreviewFontName" ), aArgs ); @@ -1438,10 +1438,10 @@ IMPL_LINK_NOARG(SvxFrameWindow_Impl, SelectHdl) Any a; Sequence< PropertyValue > aArgs( 2 ); - aArgs[0].Name = OUString( "OuterBorder" ); + aArgs[0].Name = "OuterBorder"; aBorderOuter.QueryValue( a ); aArgs[0].Value = a; - aArgs[1].Name = OUString( "InnerBorder" ); + aArgs[1].Name = "InnerBorder"; aBorderInner.QueryValue( a ); aArgs[1].Value = a; @@ -1611,7 +1611,7 @@ IMPL_LINK_NOARG(SvxLineWindow_Impl, SelectHdl) Any a; Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = OUString( "LineStyle" ); + aArgs[0].Name = "LineStyle"; aLineItem.QueryValue( a, m_bIsWriter ? CONVERT_TWIPS : 0 ); aArgs[0].Value = a; @@ -2587,29 +2587,29 @@ void SvxColorExtToolBoxControl::Select( sal_Bool ) { case SID_ATTR_CHAR_COLOR2 : bNoArgs = true; - aCommand = OUString( ".uno:CharColorExt" ); - aParamName = OUString( "CharColorExt" ); + aCommand = ".uno:CharColorExt"; + aParamName = "CharColorExt"; break; case SID_ATTR_CHAR_COLOR : - aCommand = OUString( ".uno:Color" ); - aParamName = OUString( "Color" ); + aCommand = ".uno:Color"; + aParamName = "Color"; break; case SID_BACKGROUND_COLOR : - aCommand = OUString( ".uno:BackgroundColor" ); - aParamName = OUString( "BackgroundColor" ); + aCommand = ".uno:BackgroundColor"; + aParamName = "BackgroundColor"; break; case SID_ATTR_CHAR_COLOR_BACKGROUND : bNoArgs = true; - aCommand = OUString( ".uno:CharBackgroundExt" ); - aParamName = OUString( "CharBackgroundExt" ); + aCommand = ".uno:CharBackgroundExt"; + aParamName = "CharBackgroundExt"; break; case SID_FRAME_LINECOLOR : - aCommand = OUString( ".uno:FrameLineColor" ); - aParamName = OUString( "FrameLineColor" ); + aCommand = ".uno:FrameLineColor"; + aParamName = "FrameLineColor"; break; } diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index e1bac23aad38..6089e39f5423 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -395,7 +395,7 @@ css::uno::Sequence< OUString > SAL_CALL FindTextToolbarController::getSupportedS css::uno::Sequence< OUString > FindTextToolbarController::getSupportedServiceNames_Static() throw() { css::uno::Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString( "com.sun.star.frame.ToolbarController" ); + aSNS[0] = "com.sun.star.frame.ToolbarController"; return aSNS; } @@ -561,7 +561,7 @@ css::uno::Sequence< OUString > SAL_CALL UpDownSearchToolboxController::getSuppor css::uno::Sequence< OUString > UpDownSearchToolboxController::getSupportedServiceNames_Static() throw() { css::uno::Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString("com.sun.star.frame.ToolbarController"); + aSNS[0] = "com.sun.star.frame.ToolbarController"; return aSNS; } @@ -662,7 +662,7 @@ css::uno::Sequence< OUString > SAL_CALL MatchCaseToolboxController::getSupported css::uno::Sequence< OUString > MatchCaseToolboxController::getSupportedServiceNames_Static() throw() { css::uno::Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString( "com.sun.star.frame.ToolbarController" ); + aSNS[0] = "com.sun.star.frame.ToolbarController"; return aSNS; } @@ -774,7 +774,7 @@ css::uno::Sequence< OUString > SAL_CALL FindAllToolboxController::getSupportedSe css::uno::Sequence< OUString > FindAllToolboxController::getSupportedServiceNames_Static() throw() { css::uno::Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString("com.sun.star.frame.ToolbarController"); + aSNS[0] = "com.sun.star.frame.ToolbarController"; return aSNS; } @@ -869,7 +869,7 @@ css::uno::Sequence< OUString > SAL_CALL ExitSearchToolboxController::getSupporte css::uno::Sequence< OUString > ExitSearchToolboxController::getSupportedServiceNames_Static() throw() { css::uno::Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString("com.sun.star.frame.ToolbarController"); + aSNS[0] = "com.sun.star.frame.ToolbarController"; return aSNS; } @@ -977,8 +977,8 @@ css::uno::Sequence< OUString > SAL_CALL FindbarDispatcher::getSupportedServiceNa css::uno::Sequence< OUString > FindbarDispatcher::getSupportedServiceNames_Static() throw() { css::uno::Sequence< OUString > aSNS( 2 ); - aSNS.getArray()[0] = OUString( "com.sun.star.comp.svx.FindbarDispatcher" ); - aSNS.getArray()[1] = OUString( "com.sun.star.frame.ProtocolHandler" ); + aSNS[0] = "com.sun.star.comp.svx.FindbarDispatcher"; + aSNS[1] = "com.sun.star.frame.ProtocolHandler"; return aSNS; } diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index bee7d668beae..5b9d90a216eb 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -501,14 +501,14 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( Window* pParent ) OUString aNameTo_Simplified("ChineseT2S"); OUString aNameTo_Traditional("ChineseS2T"); lang::Locale aLocale; - aLocale.Language = OUString("zh"); + aLocale.Language = "zh"; if( xContainer->hasByName( aNameTo_Simplified ) ) xDictionary_To_Simplified = Reference< linguistic2::XConversionDictionary >( xContainer->getByName( aNameTo_Simplified ), UNO_QUERY ); else { - aLocale.Country = OUString("TW"); + aLocale.Country = "TW"; xDictionary_To_Simplified = Reference< linguistic2::XConversionDictionary >( xDictionaryList->addNewDictionary( aNameTo_Simplified , aLocale, linguistic2::ConversionDictionaryType::SCHINESE_TCHINESE @@ -523,7 +523,7 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( Window* pParent ) xContainer->getByName( aNameTo_Traditional ), UNO_QUERY ); else { - aLocale.Country = OUString("CN"); + aLocale.Country = "CN"; xDictionary_To_Traditional = Reference< linguistic2::XConversionDictionary >( xDictionaryList->addNewDictionary( aNameTo_Traditional , aLocale, linguistic2::ConversionDictionaryType::SCHINESE_TCHINESE diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx index cff819f6fb58..af28cbb6ddbd 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx @@ -91,7 +91,7 @@ uno::Sequence< OUString > SAL_CALL ChineseTranslation_UnoDialog::getSupportedSer uno::Sequence< OUString > ChineseTranslation_UnoDialog::getSupportedServiceNames_Static() { uno::Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[ 0 ] = OUString("com.sun.star.linguistic2.ChineseTranslationDialog"); + aSNS[ 0 ] = "com.sun.star.linguistic2.ChineseTranslationDialog"; return aSNS; } diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx index ce51832b621b..986afe7d8695 100644 --- a/svx/source/unodraw/recoveryui.cxx +++ b/svx/source/unodraw/recoveryui.cxx @@ -140,7 +140,7 @@ OUString RecoveryUI::st_getImplementationName() css::uno::Sequence< OUString > RecoveryUI::st_getSupportedServiceNames() { css::uno::Sequence< OUString > lServiceNames(1); - lServiceNames.getArray() [0] = OUString("com.sun.star.dialog.RecoveryUI"); + lServiceNames[0] = "com.sun.star.dialog.RecoveryUI"; return lServiceNames; } @@ -154,11 +154,11 @@ static OUString GetCrashConfigDir() { #if defined(WNT) - OUString ustrValue = OUString("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/bootstrap.ini:UserInstallation}"); + OUString ustrValue = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/bootstrap.ini:UserInstallation}"; #elif defined(MACOSX) - OUString ustrValue = OUString("~"); + OUString ustrValue = "~"; #else - OUString ustrValue = OUString("$SYSUSERCONFIG"); + OUString ustrValue = "$SYSUSERCONFIG"; #endif Bootstrap::expandMacros( ustrValue ); @@ -179,11 +179,7 @@ static OUString GetCrashConfigDir() static OUString GetUnsentURL() { - OUString aURL = GetCrashConfigDir(); - - aURL += "/"; - aURL += OUString( LCKFILE ); - + OUString aURL = GetCrashConfigDir() + "/" + LCKFILE; return aURL; } diff --git a/svx/source/unodraw/unobtabl.cxx b/svx/source/unodraw/unobtabl.cxx index 398ebc9cc621..a5014b13bc47 100644 --- a/svx/source/unodraw/unobtabl.cxx +++ b/svx/source/unodraw/unobtabl.cxx @@ -87,7 +87,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoBitmapTable::getSupportedServiceNames( throw( uno::RuntimeException ) { uno::Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString("com.sun.star.drawing.BitmapTable" ); + aSNS[0] = "com.sun.star.drawing.BitmapTable"; return aSNS; } diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx index 82baea9440b2..e059060b3d11 100644 --- a/svx/source/unodraw/unoctabl.cxx +++ b/svx/source/unodraw/unoctabl.cxx @@ -110,7 +110,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoColorTable::getSupportedServiceNames() uno::Sequence< OUString > SvxUnoColorTable::getSupportedServiceNames_Static(void) throw() { uno::Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString("com.sun.star.drawing.ColorTable" ); + aSNS.getArray()[0] = "com.sun.star.drawing.ColorTable"; return aSNS; } diff --git a/svx/source/unodraw/unodtabl.cxx b/svx/source/unodraw/unodtabl.cxx index e6e89129f06c..c55a118a3216 100644 --- a/svx/source/unodraw/unodtabl.cxx +++ b/svx/source/unodraw/unodtabl.cxx @@ -68,7 +68,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoDashTable::getSupportedServiceNames( ) throw( uno::RuntimeException ) { uno::Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString("com.sun.star.drawing.DashTable" ); + aSNS.getArray()[0] = "com.sun.star.drawing.DashTable"; return aSNS; } diff --git a/svx/source/unodraw/unogtabl.cxx b/svx/source/unodraw/unogtabl.cxx index 5cc1f9bf225c..d74685b140a8 100644 --- a/svx/source/unodraw/unogtabl.cxx +++ b/svx/source/unodraw/unogtabl.cxx @@ -67,7 +67,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoGradientTable::getSupportedServiceNames throw( uno::RuntimeException ) { uno::Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString("com.sun.star.drawing.GradientTable" ); + aSNS.getArray()[0] = "com.sun.star.drawing.GradientTable"; return aSNS; } diff --git a/svx/source/unodraw/unohtabl.cxx b/svx/source/unodraw/unohtabl.cxx index 2e4b1ba7ec73..de476db6c16a 100644 --- a/svx/source/unodraw/unohtabl.cxx +++ b/svx/source/unodraw/unohtabl.cxx @@ -67,7 +67,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoHatchTable::getSupportedServiceNames( throw( uno::RuntimeException ) { uno::Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString("com.sun.star.drawing.HatchTable" ); + aSNS.getArray()[0] = "com.sun.star.drawing.HatchTable"; return aSNS; } diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx index 85b2e77d3075..0c9eddea63c9 100644 --- a/svx/source/unodraw/unomod.cxx +++ b/svx/source/unodraw/unomod.cxx @@ -131,23 +131,23 @@ sal_Bool SvxUnoDrawMSFactory::createEvent( const SdrModel* pDoc, const SdrHint* // #115423# // case HINT_PAGECHG: // Page geaendert -// aEvent.EventName = OUString( "PageModified" ); +// aEvent.EventName = "PageModified"; // pPage = pSdrHint->GetPage(); // break; case HINT_PAGEORDERCHG: // Reihenfolge der Seiten (Zeichenseiten oder Masterpages) geaendert (Insert/Remove/ChangePos) - aEvent.EventName = OUString( "PageOrderModified" ); + aEvent.EventName = "PageOrderModified"; pPage = pSdrHint->GetPage(); break; case HINT_OBJCHG: // Objekt geaendert - aEvent.EventName = OUString( "ShapeModified" ); + aEvent.EventName = "ShapeModified"; pObj = pSdrHint->GetObject(); break; case HINT_OBJINSERTED: // Neues Zeichenobjekt eingefuegt - aEvent.EventName = OUString( "ShapeInserted" ); + aEvent.EventName = "ShapeInserted"; pObj = pSdrHint->GetObject(); break; case HINT_OBJREMOVED: // Zeichenobjekt aus Liste entfernt - aEvent.EventName = OUString( "ShapeRemoved" ); + aEvent.EventName = "ShapeRemoved"; pObj = pSdrHint->GetObject(); break; // HINT_DEFAULTTABCHG, // Default Tabulatorweite geaendert @@ -517,28 +517,28 @@ uno::Sequence< OUString > SAL_CALL SvxUnoDrawingModel::getAvailableServiceNames( sal_uInt16 i = 0; - aSNS[i++] = OUString("com.sun.star.drawing.DashTable"); - aSNS[i++] = OUString("com.sun.star.drawing.GradientTable"); - aSNS[i++] = OUString("com.sun.star.drawing.HatchTable"); - aSNS[i++] = OUString("com.sun.star.drawing.BitmapTable"); - aSNS[i++] = OUString("com.sun.star.drawing.TransparencyGradientTable"); - aSNS[i++] = OUString("com.sun.star.drawing.MarkerTable"); - aSNS[i++] = OUString("com.sun.star.text.NumberingRules"); - aSNS[i++] = OUString("com.sun.star.image.ImageMapRectangleObject"); - aSNS[i++] = OUString("com.sun.star.image.ImageMapCircleObject"); - aSNS[i++] = OUString("com.sun.star.image.ImageMapPolygonObject"); - - aSNS[i++] = OUString("com.sun.star.presentation.TitleTextShape"); - aSNS[i++] = OUString("com.sun.star.presentation.OutlinerShape"); - aSNS[i++] = OUString("com.sun.star.presentation.SubtitleShape"); - aSNS[i++] = OUString("com.sun.star.presentation.GraphicObjectShape"); - aSNS[i++] = OUString("com.sun.star.presentation.ChartShape"); - aSNS[i++] = OUString("com.sun.star.presentation.PageShape"); - aSNS[i++] = OUString("com.sun.star.presentation.OLE2Shape"); - aSNS[i++] = OUString("com.sun.star.presentation.TableShape"); - aSNS[i++] = OUString("com.sun.star.presentation.OrgChartShape"); - aSNS[i++] = OUString("com.sun.star.presentation.NotesShape"); - aSNS[i++] = OUString("com.sun.star.presentation.HandoutShape"); + aSNS[i++] = "com.sun.star.drawing.DashTable"; + aSNS[i++] = "com.sun.star.drawing.GradientTable"; + aSNS[i++] = "com.sun.star.drawing.HatchTable"; + aSNS[i++] = "com.sun.star.drawing.BitmapTable"; + aSNS[i++] = "com.sun.star.drawing.TransparencyGradientTable"; + aSNS[i++] = "com.sun.star.drawing.MarkerTable"; + aSNS[i++] = "com.sun.star.text.NumberingRules"; + aSNS[i++] = "com.sun.star.image.ImageMapRectangleObject"; + aSNS[i++] = "com.sun.star.image.ImageMapCircleObject"; + aSNS[i++] = "com.sun.star.image.ImageMapPolygonObject"; + + aSNS[i++] = "com.sun.star.presentation.TitleTextShape"; + aSNS[i++] = "com.sun.star.presentation.OutlinerShape"; + aSNS[i++] = "com.sun.star.presentation.SubtitleShape"; + aSNS[i++] = "com.sun.star.presentation.GraphicObjectShape"; + aSNS[i++] = "com.sun.star.presentation.ChartShape"; + aSNS[i++] = "com.sun.star.presentation.PageShape"; + aSNS[i++] = "com.sun.star.presentation.OLE2Shape"; + aSNS[i++] = "com.sun.star.presentation.TableShape"; + aSNS[i++] = "com.sun.star.presentation.OrgChartShape"; + aSNS[i++] = "com.sun.star.presentation.NotesShape"; + aSNS[i++] = "com.sun.star.presentation.HandoutShape"; DBG_ASSERT( i == aSNS.getLength(), "Sequence overrun!" ); diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx index 76c3e1b5a334..ff9e4b2689a8 100644 --- a/svx/source/unodraw/unomtabl.cxx +++ b/svx/source/unodraw/unomtabl.cxx @@ -144,7 +144,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoMarkerTable::getSupportedServiceNames( throw( uno::RuntimeException ) { uno::Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString("com.sun.star.drawing.MarkerTable" ); + aSNS.getArray()[0] = "com.sun.star.drawing.MarkerTable"; return aSNS; } diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx index b0550a93cb14..ee6ba75547ea 100644 --- a/svx/source/unodraw/unopage.cxx +++ b/svx/source/unodraw/unopage.cxx @@ -822,7 +822,7 @@ sal_Bool SAL_CALL SvxDrawPage::supportsService( const OUString& ServiceName ) uno::Sequence< OUString > SAL_CALL SvxDrawPage::getSupportedServiceNames() throw( uno::RuntimeException ) { uno::Sequence< OUString > aSeq( 1 ); - aSeq.getArray()[0] = OUString("com.sun.star.drawing.ShapeCollection" ); + aSeq.getArray()[0] = "com.sun.star.drawing.ShapeCollection"; return aSeq; } diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx index 8686e0a55f1e..ace5ca0042e0 100644 --- a/svx/source/unodraw/unopool.cxx +++ b/svx/source/unodraw/unopool.cxx @@ -408,7 +408,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoDrawPool::getSupportedServiceNames( ) throw( uno::RuntimeException ) { uno::Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString("com.sun.star.drawing.Defaults" ); + aSNS.getArray()[0] = "com.sun.star.drawing.Defaults"; return aSNS; } diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index d26546f89d48..46981b5dda3c 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -366,7 +366,7 @@ bool SvxOle2Shape::getPropertyValueImpl( const OUString& rName, const SfxItemPro { ::comphelper::IEmbeddedHelper *pPersist = mpObj->GetModel()->GetPersist(); if( (NULL == pPersist) || !pPersist->getEmbeddedObjectContainer().HasEmbeddedObject( pOle->GetPersistName() ) ) - aPersistName = OUString(); + aPersistName = ""; } } @@ -461,14 +461,14 @@ sal_Bool SvxOle2Shape::createLink( const OUString& aLinkURL ) ::comphelper::IEmbeddedHelper* pPersist = mpModel->GetPersist(); uno::Sequence< beans::PropertyValue > aMediaDescr( 1 ); - aMediaDescr[0].Name = OUString("URL"); + aMediaDescr[0].Name = "URL"; aMediaDescr[0].Value <<= aLinkURL; uno::Reference< task::XInteractionHandler > xInteraction = pPersist->getInteractionHandler(); if ( xInteraction.is() ) { aMediaDescr.realloc( 2 ); - aMediaDescr[1].Name = OUString( "InteractionHandler" ); + aMediaDescr[1].Name = "InteractionHandler"; aMediaDescr[1].Value <<= xInteraction; } @@ -535,7 +535,7 @@ const SvGlobalName SvxOle2Shape::GetClassName_Impl(OUString& rHexCLSID) if( pOle2Obj ) { - rHexCLSID = OUString(); + rHexCLSID = ""; if( pOle2Obj->IsEmpty() ) { diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx index 739ee752ee5b..2850e1efb958 100644 --- a/svx/source/unodraw/unoshcol.cxx +++ b/svx/source/unodraw/unoshcol.cxx @@ -232,8 +232,8 @@ uno::Sequence< OUString > SAL_CALL SvxShapeCollection::getSupportedServiceNames( uno::Sequence< OUString > SvxShapeCollection::getSupportedServiceNames_Static() { uno::Sequence< OUString > aSeq(2); - aSeq.getArray()[0] = OUString("com.sun.star.drawing.Shapes"); - aSeq.getArray()[1] = OUString("com.sun.star.drawing.ShapeCollection"); + aSeq.getArray()[0] = "com.sun.star.drawing.Shapes"; + aSeq.getArray()[1] = "com.sun.star.drawing.ShapeCollection"; return aSeq; } diff --git a/svx/source/unodraw/unottabl.cxx b/svx/source/unodraw/unottabl.cxx index 26c532f7e7e3..f2d8e5d2e101 100644 --- a/svx/source/unodraw/unottabl.cxx +++ b/svx/source/unodraw/unottabl.cxx @@ -67,7 +67,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTransGradientTable::getSupportedService throw( uno::RuntimeException ) { uno::Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString("com.sun.star.drawing.TransparencyGradientTable" ); + aSNS.getArray()[0] = "com.sun.star.drawing.TransparencyGradientTable"; return aSNS; } diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx index 7b47ddb74e89..6feddd42a055 100644 --- a/svx/source/xml/xmleohlp.cxx +++ b/svx/source/xml/xmleohlp.cxx @@ -190,7 +190,7 @@ void SvXMLEmbeddedObjectHelper::splitObjectURL(OUString aURLNoPar, sal_Int32 _nPos = aURLNoPar.lastIndexOf( '/' ); if( -1 == _nPos ) { - rContainerStorageName = OUString(); + rContainerStorageName = ""; rObjectStorageName = aURLNoPar; } else @@ -292,7 +292,7 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplGetStorageNames( nPos = aURLNoPar.lastIndexOf( '/' ); if( -1 == nPos ) { - rContainerStorageName = OUString(); + rContainerStorageName = ""; rObjectStorageName = aURLNoPar.copy( nPathStart ); } else if( nPos > nPathStart ) @@ -494,11 +494,11 @@ OUString SvXMLEmbeddedObjectHelper::ImplInsertEmbeddedObjectURL( else { // Objects are written using ::comphelper::IEmbeddedHelper::SaveAs - sRetURL = OUString("./"); + sRetURL = "./"; if( !aContainerStorageName.isEmpty() ) { sRetURL += aContainerStorageName; - sRetURL += OUString( '/' ); + sRetURL += "/"; } sRetURL += aObjectStorageName; } @@ -680,7 +680,7 @@ Any SAL_CALL SvXMLEmbeddedObjectHelper::getByName( mxTempStorage = comphelper::OStorageHelper::GetTemporaryStorage(); Sequence < beans::PropertyValue > aDummy( 0 ), aEmbDescr( 1 ); - aEmbDescr[0].Name = OUString( "StoreVisualReplacement" ); + aEmbDescr[0].Name = "StoreVisualReplacement"; aEmbDescr[0].Value <<= (sal_Bool)(!bOasisFormat); if ( !bOasisFormat ) { @@ -688,7 +688,7 @@ Any SAL_CALL SvXMLEmbeddedObjectHelper::getByName( if ( xGrInStream.is() ) { aEmbDescr.realloc( 2 ); - aEmbDescr[1].Name = OUString( "VisualReplacement" ); + aEmbDescr[1].Name = "VisualReplacement"; aEmbDescr[1].Value <<= xGrInStream; } } |