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 /cui | |
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 'cui')
-rw-r--r-- | cui/source/customize/acccfg.cxx | 2 | ||||
-rw-r--r-- | cui/source/customize/cfgutil.cxx | 10 | ||||
-rw-r--r-- | cui/source/customize/selector.cxx | 2 | ||||
-rw-r--r-- | cui/source/dialogs/insdlg.cxx | 2 | ||||
-rw-r--r-- | cui/source/options/treeopt.cxx | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index d324dfebad23..94f7d79f1926 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -1090,7 +1090,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RemoveHdl) // remove function name from selected entry sal_uInt16 nCol = m_pEntriesBox->TabCount() - 1; m_pEntriesBox->SetEntryText( OUString(), nPos, nCol ); - pEntry->m_sCommand = OUString(); + (pEntry->m_sCommand).clear(); ((Link &) m_pFunctionBox->GetSelectHdl()).Call( m_pFunctionBox ); return 0; diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index 9f63afd4e447..6cb2357d1ed0 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -103,8 +103,8 @@ bool SfxStylesInfo_Impl::parseStyleCommand(SfxStyleInfo_Impl& aStyle) if (!aStyle.sCommand.startsWith(CMDURL_STYLEPROT_ONLY)) return false; - aStyle.sFamily = OUString(); - aStyle.sStyle = OUString(); + aStyle.sFamily.clear(); + aStyle.sStyle.clear(); sal_Int32 nCmdLen = aStyle.sCommand.getLength(); OUString sCmdArgs = aStyle.sCommand.copy(LEN_STYLEPROT, nCmdLen-LEN_STYLEPROT); @@ -148,14 +148,14 @@ void SfxStylesInfo_Impl::getLabel4Style(SfxStyleInfo_Impl& aStyle) if (xStyleSet.is()) xStyleSet->getByName(aStyle.sStyle) >>= xStyle; - aStyle.sLabel = OUString(); + aStyle.sLabel.clear(); if (xStyle.is()) xStyle->getPropertyValue(STYLEPROP_UINAME) >>= aStyle.sLabel; } catch(const css::uno::RuntimeException&) { throw; } catch(const css::uno::Exception&) - { aStyle.sLabel = OUString(); } + { aStyle.sLabel.clear(); } if (aStyle.sLabel.isEmpty()) { @@ -839,7 +839,7 @@ OUString SfxConfigGroupListBox::MapCommand2UIName(const OUString& sCommand) catch(const css::uno::RuntimeException&) { throw; } catch(css::uno::Exception&) - { sUIName = OUString(); } + { sUIName.clear(); } // fallback for missing UINames !? if (sUIName.isEmpty()) diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx index 5541697f4380..4bb467a41b6c 100644 --- a/cui/source/customize/selector.cxx +++ b/cui/source/customize/selector.cxx @@ -422,7 +422,7 @@ void SvxConfigGroupListBox::Init(bool bShowSlots, const Reference< frame::XFrame try{ aModuleId = xModuleManager->identify( m_xFrame ); }catch(const uno::Exception&) - { aModuleId = OUString(); } + { aModuleId.clear(); } Reference< container::XNameAccess > const xNameAccess( frame::theUICommandDescription::get(xContext) ); diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index cf22d8d858a7..10fa9967c587 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -421,7 +421,7 @@ static void Plugin_ImplFillCommandSequence( const OUString& aCommands, uno::Sequ short SvInsertPlugInDialog::Execute() { short nRet = RET_OK; - m_aCommands = OUString(); + m_aCommands.clear(); DBG_ASSERT( m_xStorage.is(), "No storage!"); if ( m_xStorage.is() && ( nRet = Dialog::Execute() ) == RET_OK ) { diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 3e0644c0b70f..fd7810c7ada2 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -226,7 +226,7 @@ static void deleteGroupNames() { sal_uInt16 nIndex = 0; while ( ModuleMap[ nIndex ].m_pModule ) - ModuleMap[ nIndex++ ].m_sGroupName = OUString(); + ModuleMap[ nIndex++ ].m_sGroupName.clear(); } static sal_uInt16 getGroupNodeId( const OUString& rModule ) |