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 /framework/source/jobs | |
| 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 'framework/source/jobs')
| -rw-r--r-- | framework/source/jobs/helponstartup.cxx | 6 | ||||
| -rw-r--r-- | framework/source/jobs/joburl.cxx | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/framework/source/jobs/helponstartup.cxx b/framework/source/jobs/helponstartup.cxx index 6f53eb69aa38..198af2d038af 100644 --- a/framework/source/jobs/helponstartup.cxx +++ b/framework/source/jobs/helponstartup.cxx @@ -207,7 +207,7 @@ OUString HelpOnStartup::its_getModuleIdFromEnv(const css::uno::Sequence< css::be catch(const css::uno::RuntimeException&) { throw; } catch(const css::uno::Exception&) - { sModuleId = OUString(); } + { sModuleId.clear(); } return sModuleId; } @@ -248,7 +248,7 @@ OUString HelpOnStartup::its_getCurrentHelpURL() catch(const css::uno::RuntimeException&) { throw; } catch(const css::uno::Exception&) - { sCurrentHelpURL = OUString(); } + { sCurrentHelpURL.clear(); } return sCurrentHelpURL; } @@ -331,7 +331,7 @@ OUString HelpOnStartup::its_checkIfHelpEnabledAndGetURL(const OUString& sModule) catch(const css::uno::RuntimeException&) { throw; } catch(const css::uno::Exception&) - { sHelpURL = OUString(); } + { sHelpURL.clear(); } return sHelpURL; } diff --git a/framework/source/jobs/joburl.cxx b/framework/source/jobs/joburl.cxx index fae5556ec31f..2dacc370893b 100644 --- a/framework/source/jobs/joburl.cxx +++ b/framework/source/jobs/joburl.cxx @@ -128,7 +128,7 @@ bool JobURL::getEvent( /*OUT*/ OUString& sEvent ) const { SolarMutexGuard g; - sEvent = OUString(); + sEvent.clear(); bool bSet = ((m_eRequest & E_EVENT) == E_EVENT); if (bSet) sEvent = m_sEvent; @@ -156,7 +156,7 @@ bool JobURL::getAlias( /*OUT*/ OUString& sAlias ) const { SolarMutexGuard g; - sAlias = OUString(); + sAlias.clear(); bool bSet = ((m_eRequest & E_ALIAS) == E_ALIAS); if (bSet) sAlias = m_sAlias; @@ -184,7 +184,7 @@ bool JobURL::getService( /*OUT*/ OUString& sService ) const { SolarMutexGuard g; - sService = OUString(); + sService.clear(); bool bSet = ((m_eRequest & E_SERVICE) == E_SERVICE); if (bSet) sService = m_sService; @@ -541,7 +541,7 @@ sal_Bool JobURL::getServiceArgs( /*OUT*/ OUString& sServiceArgs ) const { SolarMutexGuard g; - sServiceArgs = OUString(); + sServiceArgs.clear(); sal_Bool bSet = ((m_eRequest & E_SERVICE) == E_SERVICE); if (bSet) sServiceArgs = m_sServiceArgs; @@ -553,7 +553,7 @@ sal_Bool JobURL::getEventArgs( /*OUT*/ OUString& sEventArgs ) const { SolarMutexGuard g; - sEventArgs = OUString(); + sEventArgs.clear(); sal_Bool bSet = ((m_eRequest & E_EVENT) == E_EVENT); if (bSet) sEventArgs = m_sEventArgs; @@ -565,7 +565,7 @@ sal_Bool JobURL::getAliasArgs( /*OUT*/ OUString& sAliasArgs ) const { SolarMutexGuard g; - sAliasArgs = OUString(); + sAliasArgs.clear(); sal_Bool bSet = ((m_eRequest & E_ALIAS) == E_ALIAS); if (bSet) sAliasArgs = m_sAliasArgs; |