diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-06-29 23:57:38 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-06-30 04:58:49 +0000 |
| commit | 710f41b7aec8e7d35a0da8be332aa289f98942af (patch) | |
| tree | b894ef2d3f06a63a85f423b2713a654ea57f9c69 /sd | |
| parent | 1ca3beae12a7f222c987481e07a544845fc9fd46 (diff) | |
Clean String and sal_Bool in tools
Change-Id: I6a92196f33d7a5278c7dcc426112e9c56d582655
Reviewed-on: https://gerrit.libreoffice.org/4627
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/filter/eppt/pptexsoundcollection.cxx | 9 | ||||
| -rw-r--r-- | sd/source/filter/html/htmlex.cxx | 2 | ||||
| -rw-r--r-- | sd/source/filter/html/htmlex.hxx | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/sd/source/filter/eppt/pptexsoundcollection.cxx b/sd/source/filter/eppt/pptexsoundcollection.cxx index 78f606e67c2c..8f02c29bcebd 100644 --- a/sd/source/filter/eppt/pptexsoundcollection.cxx +++ b/sd/source/filter/eppt/pptexsoundcollection.cxx @@ -20,6 +20,7 @@ #include <pptexsoundcollection.hxx> #include "epptdef.hxx" #include <tools/urlobj.hxx> +#include <tools/string.hxx> #include <ucbhelper/content.hxx> #include <comphelper/processfactory.hxx> #include <cppuhelper/proptypehlp.hxx> @@ -56,9 +57,11 @@ OUString ExSoundEntry::ImplGetName() const OUString ExSoundEntry::ImplGetExtension() const { INetURLObject aTmp( aSoundURL ); - String aExtension( aTmp.GetExtension() ); - if ( aExtension.Len() ) - aExtension.Insert( (sal_Unicode)'.', 0 ); + OUString aExtension( aTmp.GetExtension() ); + if ( !aExtension.isEmpty() ) + { + aExtension = "." + aExtension; + } return aExtension; } diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index 5d636b532170..3bbbf63522ef 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -3283,7 +3283,7 @@ HtmlErrorContext::HtmlErrorContext(Window *_pWin) // ===================================================================== -sal_Bool HtmlErrorContext::GetString( sal_uLong, OUString& rCtxStr ) +bool HtmlErrorContext::GetString( sal_uLong, OUString& rCtxStr ) { DBG_ASSERT( mnResId != 0, "No error context set" ); if( mnResId == 0 ) diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx index 4bffc1e1718d..248a461e654a 100644 --- a/sd/source/filter/html/htmlex.hxx +++ b/sd/source/filter/html/htmlex.hxx @@ -70,7 +70,7 @@ public: HtmlErrorContext(Window *pWin=0); ~HtmlErrorContext() {}; - virtual sal_Bool GetString( sal_uLong nErrId, OUString& rCtxStr ); + virtual bool GetString( sal_uLong nErrId, OUString& rCtxStr ); void SetContext( sal_uInt16 nResId, const String& rURL ); void SetContext( sal_uInt16 nResId, const String& rURL1, const String& rURL2 ); |