diff options
author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-03-30 09:36:06 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-03-30 12:21:40 +0000 |
commit | da56de9ac4824eb365af20b351719395e725be39 (patch) | |
tree | f19ad159f5e12b9e62b2ee50f39016819b7a7c5c /filter | |
parent | 8d1a56c206e5c2ed6c331049198bb8ebc6176171 (diff) |
remove type decorations on char literals
they are only needed where type deduction fails.
left them in defines for now.
Change-Id: I7f002dd6bc7acc083c73b6c64076de6dd28d0b09
Reviewed-on: https://gerrit.libreoffice.org/35893
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'filter')
-rw-r--r-- | filter/source/config/cache/filtercache.cxx | 8 | ||||
-rw-r--r-- | filter/source/placeware/exporter.cxx | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index 1b1f53232ccf..7a6b8ca41a91 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -2031,10 +2031,10 @@ void FilterCache::impl_interpretDataVal4Type(const OUString& sValue, case 2: rItem[PROPNAME_CLIPBOARDFORMAT] <<= ::rtl::Uri::decode(sValue, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8); break; // URLPattern - case 3: rItem[PROPNAME_URLPATTERN] <<= comphelper::containerToSequence(impl_tokenizeString(sValue, (sal_Unicode)';')); + case 3: rItem[PROPNAME_URLPATTERN] <<= comphelper::containerToSequence(impl_tokenizeString(sValue, ';')); break; // Extensions - case 4: rItem[PROPNAME_EXTENSIONS] <<= comphelper::containerToSequence(impl_tokenizeString(sValue, (sal_Unicode)';')); + case 4: rItem[PROPNAME_EXTENSIONS] <<= comphelper::containerToSequence(impl_tokenizeString(sValue, ';')); break; } } @@ -2069,7 +2069,7 @@ void FilterCache::impl_interpretDataVal4Filter(const OUString& sValue, case 4: rItem[PROPNAME_FLAGS] <<= sValue.toInt32(); break; // UserData - case 5: rItem[PROPNAME_USERDATA] <<= comphelper::containerToSequence(impl_tokenizeString(sValue, (sal_Unicode)';')); + case 5: rItem[PROPNAME_USERDATA] <<= comphelper::containerToSequence(impl_tokenizeString(sValue, ';')); break; // FileFormatVersion case 6: rItem[PROPNAME_FILEFORMATVERSION] <<= sValue.toInt32(); @@ -2154,7 +2154,7 @@ CacheItem FilterCache::impl_readOldItem(const css::uno::Reference< css::containe OUString sData; OUStringList lData; xItem->getByName( "Data" ) >>= sData; - lData = impl_tokenizeString(sData, (sal_Unicode)','); + lData = impl_tokenizeString(sData, ','); if ( (sData.isEmpty()) || (lData.size()<1 ) diff --git a/filter/source/placeware/exporter.cxx b/filter/source/placeware/exporter.cxx index 7b9bef9b8318..d655890172b5 100644 --- a/filter/source/placeware/exporter.cxx +++ b/filter/source/placeware/exporter.cxx @@ -188,10 +188,10 @@ static void createSlideFile( const Reference< XComponent >& xDoc, PlacewareZipFi aTemp = xDocProps->getTitle(); if( aTemp.isEmpty() ) { - sal_Int32 nPos1 = rURL.lastIndexOf( (sal_Unicode)'/' ); + sal_Int32 nPos1 = rURL.lastIndexOf( '/' ); if( -1 != nPos1 ) { - sal_Int32 nPos2 = rURL.lastIndexOf( (sal_Unicode)'.' ); + sal_Int32 nPos2 = rURL.lastIndexOf( '.' ); if( nPos2 > nPos1 ) { aTemp = rURL.copy( nPos1 + 1, nPos2 - nPos1 - 1 ); |