diff options
author | Brij Mohan Lal Srivastava <contactbrijmohan@gmail.com> | 2014-11-12 14:24:10 +0530 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-11-14 09:20:38 +0100 |
commit | d32be3ace8c8fd430bbecdf69f88a116b0ee91d1 (patch) | |
tree | b373c084cb124434e0498867b24bc7bb333155dd /sfx2/source | |
parent | f5e86ebc097f0f8bc5b282511149cb026710ecde (diff) |
fdo#86023 - O[U]String needs a 'clear' method
Added clear() method to OString and OUString class, Updated appropriate call-sites.
Change-Id: I0ba97fa6dc7af3e31b605953089a4e8e9c3e61ac
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sfx2/source')
-rw-r--r-- | sfx2/source/appl/imagemgr.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/appl/newhelp.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/appl/sfxhelp.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/appl/shutdowniconw32.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/config/evntconf.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/control/templatelocalview.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/dialog/mgetempl.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/DocumentMetadataAccess.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/docfilt.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/frmdescr.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/objmisc.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/doc/objstor.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/sidebar/CommandInfoProvider.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/sidebar/ResourceManager.cxx | 8 | ||||
-rw-r--r-- | sfx2/source/view/frmload.cxx | 2 |
15 files changed, 19 insertions, 19 deletions
diff --git a/sfx2/source/appl/imagemgr.cxx b/sfx2/source/appl/imagemgr.cxx index 8444682ac3c5..3cfe055323c1 100644 --- a/sfx2/source/appl/imagemgr.cxx +++ b/sfx2/source/appl/imagemgr.cxx @@ -101,7 +101,7 @@ Image SAL_CALL GetImage( aCommandURL += OUString::createFromAscii( pSlot->GetUnoName() ); } else - aCommandURL = OUString(); + aCommandURL.clear(); } Reference< XImageManager > xDocImgMgr; diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index f2d935fb3635..baec605a2cad 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -647,7 +647,7 @@ void IndexTabPage_Impl::InitializeIndex() } } else - aIndex = OUString(); + aIndex.clear(); // Assume the token is trimed UNIFY_AND_INSERT_TOKEN( aKeywordPair ); diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index e9cab42faad7..5cd81b44b9f7 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -463,7 +463,7 @@ OUString SfxHelp::GetHelpText( const OUString& aCommandURL, const vcl::Window* p } if (bIsDebug && sHelpText.isEmpty()) - aNewHelpId = OString(); + aNewHelpId.clear(); } // add some debug information? diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx index 30c2df5afce2..e20eb0d011d1 100644 --- a/sfx2/source/appl/shutdowniconw32.cxx +++ b/sfx2/source/appl/shutdowniconw32.cxx @@ -249,7 +249,7 @@ static void deleteSystrayMenu( HMENU hMenu ) pMyItem = (MYITEM*) mi.dwItemData; if( pMyItem ) { - pMyItem->text = OUString(); + (pMyItem->text).clear(); delete pMyItem; } mi.fMask = MIIM_DATA; diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx index e84f772c943e..33ab223a27a3 100644 --- a/sfx2/source/config/evntconf.cxx +++ b/sfx2/source/config/evntconf.cxx @@ -102,7 +102,7 @@ bool SfxEventNamesItem::GetPresentation( SfxItemPresentation, OUString &rText, const IntlWrapper* ) const { - rText = OUString(); + rText.clear(); return false; } diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx index 28e9be991a25..ea3ed0249991 100644 --- a/sfx2/source/control/templatelocalview.cxx +++ b/sfx2/source/control/templatelocalview.cxx @@ -125,7 +125,7 @@ void TemplateLocalView::showRootRegion() { mnHeaderHeight = 0; mnCurRegionId = 0; - maCurRegionName = OUString(); + maCurRegionName.clear(); // Clone root region items so they dont get invalidated when we open another region std::vector<ThumbnailViewItem*> items(maRegions.size()); diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index 10bec557a1cf..c7a70ca630d9 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -570,7 +570,7 @@ int SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet ) OUString aParentEntry( m_pBaseLb->GetSelectEntry() ); if ( SfxResId(STR_NONE).toString().equals(aParentEntry) || aParentEntry == pStyle->GetName() ) - aParentEntry = OUString(); + aParentEntry.clear(); if ( pStyle->GetParent() != aParentEntry ) { diff --git a/sfx2/source/doc/DocumentMetadataAccess.cxx b/sfx2/source/doc/DocumentMetadataAccess.cxx index 6c999dc88f72..cff6c8ca14b2 100644 --- a/sfx2/source/doc/DocumentMetadataAccess.cxx +++ b/sfx2/source/doc/DocumentMetadataAccess.cxx @@ -249,7 +249,7 @@ splitPath(OUString const & i_rPath, { const sal_Int32 idx(i_rPath.indexOf(static_cast<sal_Unicode>('/'))); if (idx < 0 || idx >= i_rPath.getLength()) { - o_rDir = OUString(); + o_rDir.clear(); o_rRest = i_rPath; return true; } else if (idx == 0 || idx == i_rPath.getLength() - 1) { diff --git a/sfx2/source/doc/docfilt.cxx b/sfx2/source/doc/docfilt.cxx index 2e8e65ff75fb..cbbf0b7a5eac 100644 --- a/sfx2/source/doc/docfilt.cxx +++ b/sfx2/source/doc/docfilt.cxx @@ -186,7 +186,7 @@ OUString SfxFilter::GetTypeFromStorage( if ( pFilterName ) { aName = *pFilterName; - *pFilterName = OUString(); + pFilterName->clear(); } com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xProps( xStorage, com::sun::star::uno::UNO_QUERY ); diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx index 7066374169db..3a257c63c30a 100644 --- a/sfx2/source/doc/frmdescr.cxx +++ b/sfx2/source/doc/frmdescr.cxx @@ -207,7 +207,7 @@ bool SfxFrameDescriptorItem::GetPresentation const IntlWrapper * ) const { - rText = OUString(); + rText.clear(); return false; } diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index f3e2001790d9..c8993f47d11d 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -574,7 +574,7 @@ bool SfxObjectShell::SwitchToShared( bool bShared, bool bSave ) { OUString aTempFileURL = pMedium->GetURLObject().GetMainURL( INetURLObject::NO_DECODE ); GetMedium()->SwitchDocumentToFile( GetSharedFileURL() ); - pImp->m_aSharedFileURL = OUString(); + (pImp->m_aSharedFileURL).clear(); // now remove the temporary file the document was based on ::utl::UCBContentHelper::Kill( aTempFileURL ); @@ -650,7 +650,7 @@ void SfxObjectShell::FreeSharedFile( const OUString& aTempFileURL ) // now remove the temporary file the document is based currently on ::utl::UCBContentHelper::Kill( aTempFileURL ); - pImp->m_aSharedFileURL = OUString(); + (pImp->m_aSharedFileURL).clear(); } } diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 9ab266871d06..aad386757fb7 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -288,7 +288,7 @@ OUString SfxObjectShell::CreateTempCopyOfStorage_Impl( const uno::Reference< emb SAL_WARN( "sfx.doc", "Creation of a storage copy is failed!" ); ::utl::UCBContentHelper::Kill( aTempURL ); - aTempURL = OUString(); + aTempURL.clear(); // TODO/LATER: may need error code setting based on exception SetError( ERRCODE_IO_GENERAL, OUString( OSL_LOG_PREFIX ) ); diff --git a/sfx2/source/sidebar/CommandInfoProvider.cxx b/sfx2/source/sidebar/CommandInfoProvider.cxx index 1909a9d24443..5e9fb2a81aea 100644 --- a/sfx2/source/sidebar/CommandInfoProvider.cxx +++ b/sfx2/source/sidebar/CommandInfoProvider.cxx @@ -145,7 +145,7 @@ void CommandInfoProvider::SetFrame (const Reference<frame::XFrame>& rxFrame) // Release objects that are tied to the old frame. mxCachedDocumentAcceleratorConfiguration = NULL; mxCachedModuleAcceleratorConfiguration = NULL; - msCachedModuleIdentifier = OUString(); + msCachedModuleIdentifier.clear(); mxCachedDataFrame = rxFrame; // Connect to the new frame. diff --git a/sfx2/source/sidebar/ResourceManager.cxx b/sfx2/source/sidebar/ResourceManager.cxx index 1b4971f4ea86..3220762be330 100644 --- a/sfx2/source/sidebar/ResourceManager.cxx +++ b/sfx2/source/sidebar/ResourceManager.cxx @@ -529,8 +529,8 @@ void ResourceManager::ReadLegacyAddons (const Reference<frame::XFrame>& rxFrame) rDeckDescriptor.msId = rsNodeName; rDeckDescriptor.msIconURL = ::comphelper::getString(aChildNode.getNodeValue("ImageURL")); rDeckDescriptor.msHighContrastIconURL = rDeckDescriptor.msIconURL; - rDeckDescriptor.msTitleBarIconURL = OUString(); - rDeckDescriptor.msHighContrastTitleBarIconURL = OUString(); + rDeckDescriptor.msTitleBarIconURL.clear(); + rDeckDescriptor.msHighContrastTitleBarIconURL.clear(); rDeckDescriptor.msHelpURL = ::comphelper::getString(aChildNode.getNodeValue("HelpURL")); rDeckDescriptor.msHelpText = rDeckDescriptor.msTitle; rDeckDescriptor.mbIsEnabled = true; @@ -542,8 +542,8 @@ void ResourceManager::ReadLegacyAddons (const Reference<frame::XFrame>& rxFrame) rPanelDescriptor.mbIsTitleBarOptional = true; rPanelDescriptor.msId = rsNodeName; rPanelDescriptor.msDeckId = rsNodeName; - rPanelDescriptor.msTitleBarIconURL = OUString(); - rPanelDescriptor.msHighContrastTitleBarIconURL = OUString(); + rPanelDescriptor.msTitleBarIconURL.clear(); + rPanelDescriptor.msHighContrastTitleBarIconURL.clear(); rPanelDescriptor.msHelpURL = ::comphelper::getString(aChildNode.getNodeValue("HelpURL")); rPanelDescriptor.msImplementationURL = rsNodeName; rPanelDescriptor.mnOrderIndex = 100000 + nReadIndex; diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx index 044fb1c15e5f..644c37b5eaa4 100644 --- a/sfx2/source/view/frmload.cxx +++ b/sfx2/source/view/frmload.cxx @@ -241,7 +241,7 @@ const SfxFilter* SfxFrameLoader_Impl::impl_detectFilterForURL( const OUString& s catch( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); - sFilter = OUString(); + sFilter.clear(); } const SfxFilter* pFilter = 0; |