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 /package | |
| 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 'package')
| -rw-r--r-- | package/source/manifest/ManifestImport.cxx | 2 | ||||
| -rw-r--r-- | package/source/zippackage/ZipPackage.cxx | 2 | ||||
| -rw-r--r-- | package/source/zippackage/ZipPackageFolder.cxx | 2 | ||||
| -rw-r--r-- | package/source/zippackage/zipfileaccess.cxx | 8 |
4 files changed, 7 insertions, 7 deletions
diff --git a/package/source/manifest/ManifestImport.cxx b/package/source/manifest/ManifestImport.cxx index ebf93bff36f0..ec34c750858f 100644 --- a/package/source/manifest/ManifestImport.cxx +++ b/package/source/manifest/ManifestImport.cxx @@ -375,7 +375,7 @@ OUString ManifestImport::ConvertNameWithNamespace( const OUString& aName, const OUString aNsAlias; OUString aPureName = aName; - sal_Int32 nInd = aName.indexOf( ( sal_Unicode )':' ); + sal_Int32 nInd = aName.indexOf( ':' ); if ( nInd != -1 && nInd < aName.getLength() ) { aNsAlias = aName.copy( 0, nInd ); aPureName = aName.copy( nInd + 1 ); diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx index 97a216297382..4be31db59be5 100644 --- a/package/source/zippackage/ZipPackage.cxx +++ b/package/source/zippackage/ZipPackage.cxx @@ -443,7 +443,7 @@ void ZipPackage::parseContentType() for ( nInd = 0; nInd < aContentTypeInfo[1].getLength(); nInd++ ) { OUString aPath; - if ( aContentTypeInfo[1][nInd].First.toChar() == ( sal_Unicode )'/' ) + if ( aContentTypeInfo[1][nInd].First.toChar() == '/' ) aPath = aContentTypeInfo[1][nInd].First.copy( 1 ); else aPath = aContentTypeInfo[1][nInd].First; diff --git a/package/source/zippackage/ZipPackageFolder.cxx b/package/source/zippackage/ZipPackageFolder.cxx index e7f0cca9813c..ca09ef5a6288 100644 --- a/package/source/zippackage/ZipPackageFolder.cxx +++ b/package/source/zippackage/ZipPackageFolder.cxx @@ -135,7 +135,7 @@ bool ZipPackageFolder::LookForUnexpectedODF12Streams( const OUString& aPath ) void ZipPackageFolder::setChildStreamsTypeByExtension( const beans::StringPair& aPair ) { OUString aExt; - if ( aPair.First.toChar() == (sal_Unicode)'.' ) + if ( aPair.First.toChar() == '.' ) aExt = aPair.First; else aExt = "." + aPair.First; diff --git a/package/source/zippackage/zipfileaccess.cxx b/package/source/zippackage/zipfileaccess.cxx index f7c40f29a012..983bfa6579fc 100644 --- a/package/source/zippackage/zipfileaccess.cxx +++ b/package/source/zippackage/zipfileaccess.cxx @@ -80,16 +80,16 @@ uno::Sequence< OUString > OZipFileAccess::GetPatternsFromString_Impl( const OUSt const sal_Unicode* pString = aString.getStr(); while( *pString ) { - if ( *pString == (sal_Unicode)'\\' ) + if ( *pString == '\\' ) { pString++; - if ( *pString == (sal_Unicode)'\\' ) + if ( *pString == '\\' ) { aPattern[nInd] += "\\"; pString++; } - else if ( *pString == (sal_Unicode)'*' ) + else if ( *pString == '*' ) { aPattern[nInd] += "*"; pString++; @@ -100,7 +100,7 @@ uno::Sequence< OUString > OZipFileAccess::GetPatternsFromString_Impl( const OUSt aPattern[nInd] += "\\"; } } - else if ( *pString == (sal_Unicode)'*' ) + else if ( *pString == '*' ) { aPattern.realloc( ( ++nInd ) + 1 ); pString++; |