From da56de9ac4824eb365af20b351719395e725be39 Mon Sep 17 00:00:00 2001 From: Jochen Nitschke Date: Thu, 30 Mar 2017 09:36:06 +0200 Subject: 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 Reviewed-by: Stephan Bergmann --- basic/source/basmgr/basmgr.cxx | 4 ++-- basic/source/classes/eventatt.cxx | 4 ++-- basic/source/runtime/methods.cxx | 6 +++--- basic/source/runtime/runtime.cxx | 2 +- basic/source/sbx/sbxform.cxx | 8 ++++---- basic/source/sbx/sbxscan.cxx | 4 ++-- basic/source/uno/namecont.cxx | 20 ++++++++++---------- 7 files changed, 24 insertions(+), 24 deletions(-) (limited to 'basic') diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index c6225a615523..8e9e47025ca4 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -1485,8 +1485,8 @@ namespace SbMethod* lcl_queryMacro( BasicManager* i_manager, OUString const& i_fullyQualifiedName ) { sal_Int32 nLast = 0; - OUString sLibName = i_fullyQualifiedName.getToken( (sal_Int32)0, (sal_Unicode)'.', nLast ); - OUString sModule = i_fullyQualifiedName.getToken( (sal_Int32)0, (sal_Unicode)'.', nLast ); + OUString sLibName = i_fullyQualifiedName.getToken( (sal_Int32)0, '.', nLast ); + OUString sModule = i_fullyQualifiedName.getToken( (sal_Int32)0, '.', nLast ); OUString sMacro; if(nLast >= 0) { diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx index bb7b77c2ddf2..eea4b67060eb 100644 --- a/basic/source/classes/eventatt.cxx +++ b/basic/source/classes/eventatt.cxx @@ -192,9 +192,9 @@ void BasicScriptListener_Impl::firing_impl( const ScriptEvent& aScriptEvent, Any if( comphelper::string::getTokenCount(aMacro, '.') == 3 ) { sal_Int32 nLast = 0; - OUString aFullLibName = aMacro.getToken( (sal_Int32)0, (sal_Unicode)'.', nLast ); + OUString aFullLibName = aMacro.getToken( (sal_Int32)0, '.', nLast ); - sal_Int32 nIndex = aFullLibName.indexOf( (sal_Unicode)':' ); + sal_Int32 nIndex = aFullLibName.indexOf( ':' ); if (nIndex >= 0) { aLocation = aFullLibName.copy( 0, nIndex ); diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index 3371d6eecd3f..304e6c76b482 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -2711,8 +2711,8 @@ RTLFUNC(IsMissing) // Function looks for wildcards, removes them and always returns the pure path OUString implSetupWildcard( const OUString& rFileParam, SbiRTLData* pRTLData ) { - static sal_Char cDelim1 = (sal_Char)'/'; - static sal_Char cDelim2 = (sal_Char)'\\'; + static sal_Char cDelim1 = '/'; + static sal_Char cDelim2 = '\\'; static sal_Char cWild1 = '*'; static sal_Char cWild2 = '?'; @@ -2807,7 +2807,7 @@ bool isRootDir( const OUString& aDirURLStr ) { OUString aSeg1 = aDirURLObj.getName( 0, true, INetURLObject::DecodeMechanism::WithCharset ); - if( aSeg1[1] == (sal_Unicode)':' ) + if( aSeg1[1] == ':' ) { bRoot = true; } diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index 19e380b7cba6..a2cab4a629a5 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -2757,7 +2757,7 @@ void SbiRuntime::StepLOADNC( sal_uInt32 nOp1 ) // #57844 use localized function OUString aStr = pImg->GetString( static_cast( nOp1 ) ); // also allow , !!! - sal_Int32 iComma = aStr.indexOf((sal_Unicode)','); + sal_Int32 iComma = aStr.indexOf(','); if( iComma >= 0 ) { aStr = aStr.replaceAt(iComma, 1, "."); diff --git a/basic/source/sbx/sbxform.cxx b/basic/source/sbx/sbxform.cxx index f42b804d436f..748a083f7d82 100644 --- a/basic/source/sbx/sbxform.cxx +++ b/basic/source/sbx/sbxform.cxx @@ -180,7 +180,7 @@ void SbxBasicFormater::StrRoundDigit( OUStringBuffer& sStrg, short nPos, bool& b if( nPos==-1 ) { ShiftString( sStrg, 0 ); - sStrg[0] = (sal_Unicode)'1'; + sStrg[0] = '1'; bOverflow = true; } else @@ -190,7 +190,7 @@ void SbxBasicFormater::StrRoundDigit( OUStringBuffer& sStrg, short nPos, bool& b { if( c2 == '9' ) { - sStrg[nPos] = (sal_Unicode)'0'; + sStrg[nPos] = '0'; StrRoundDigit( sStrg, nPos - 1, bOverflow ); } else @@ -201,7 +201,7 @@ void SbxBasicFormater::StrRoundDigit( OUStringBuffer& sStrg, short nPos, bool& b else { ShiftString( sStrg,nPos+1 ); - sStrg[nPos + 1] = (sal_Unicode)'1'; + sStrg[nPos + 1] = '1'; bOverflow = true; } } @@ -218,7 +218,7 @@ void SbxBasicFormater::ParseBack( OUStringBuffer& sStrg, const OUString& sFormat short nFormatPos ) { for( sal_Int32 i = nFormatPos; - i>0 && sFormatStrg[ i ] == (sal_Unicode)'#' && sStrg[sStrg.getLength() - 1] == (sal_Unicode)'0'; + i>0 && sFormatStrg[ i ] == '#' && sStrg[sStrg.getLength() - 1] == '0'; i-- ) { sStrg.setLength(sStrg.getLength() - 1 ); diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx index b311c0336718..bee6af2a88b9 100644 --- a/basic/source/sbx/sbxscan.cxx +++ b/basic/source/sbx/sbxscan.cxx @@ -472,13 +472,13 @@ bool ImpConvStringExt( OUString& rSrc, SbxDataType eTargetType ) ImpGetIntntlSep( cDecimalSep, cThousandSep ); aNewString = rSrc; - if( cDecimalSep != (sal_Unicode)'.' ) + if( cDecimalSep != '.' ) { sal_Int32 nPos = aNewString.indexOf( cDecimalSep ); if( nPos != -1 ) { sal_Unicode* pStr = const_cast(aNewString.getStr()); - pStr[nPos] = (sal_Unicode)'.'; + pStr[nPos] = '.'; bChanged = true; } } diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index 15d27b713cb2..a2bb84a8bcd2 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -751,11 +751,11 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL, { if( nPass == 1 ) { - pLibInfoInetObj.reset(new INetURLObject( maLibraryPath.getToken(0, (sal_Unicode)';') )); + pLibInfoInetObj.reset(new INetURLObject( maLibraryPath.getToken(0, ';') )); } else { - pLibInfoInetObj.reset(new INetURLObject( maLibraryPath.getToken(1, (sal_Unicode)';') )); + pLibInfoInetObj.reset(new INetURLObject( maLibraryPath.getToken(1, ';') )); } pLibInfoInetObj->insertName( maInfoFileName, false, INetURLObject::LAST_SEGMENT, INetURLObject::EncodeMechanism::All ); pLibInfoInetObj->setExtension( "xlc" ); @@ -775,7 +775,7 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL, // Old variant? if( !xInput.is() && nPass == 0 ) { - INetURLObject aLibInfoInetObj( maLibraryPath.getToken(1, (sal_Unicode)';') ); + INetURLObject aLibInfoInetObj( maLibraryPath.getToken(1, ';') ); aLibInfoInetObj.insertName( maOldInfoFileName, false, INetURLObject::LAST_SEGMENT, INetURLObject::EncodeMechanism::All ); aLibInfoInetObj.setExtension( "xli" ); aFileName = aLibInfoInetObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ); @@ -833,7 +833,7 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL, } else { - aLibraryPath = maLibraryPath.getToken(1, (sal_Unicode)';'); + aLibraryPath = maLibraryPath.getToken(1, ';'); } INetURLObject aInetObj( aLibraryPath ); @@ -848,7 +848,7 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL, else if( rLib.bLink ) { // Check "share" path - INetURLObject aShareInetObj( maLibraryPath.getToken(0, (sal_Unicode)';') ); + INetURLObject aShareInetObj( maLibraryPath.getToken(0, ';') ); aShareInetObj.insertName( rLib.aName, true, INetURLObject::LAST_SEGMENT, INetURLObject::EncodeMechanism::All ); OUString aShareLibDirPath = aShareInetObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ); @@ -993,7 +993,7 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL, if( meInitMode == DEFAULT ) { - INetURLObject aUserBasicInetObj( maLibraryPath.getToken(1, (sal_Unicode)';') ); + INetURLObject aUserBasicInetObj( maLibraryPath.getToken(1, ';') ); OUString aStandardStr("Standard"); INetURLObject aPrevUserBasicInetObj_1( aUserBasicInetObj ); @@ -1347,7 +1347,7 @@ OUString SfxLibraryContainer::createAppLibraryFolder( SfxLibrary* pLib, const OU OUString aLibDirPath = pLib->maStorageURL; if( aLibDirPath.isEmpty() ) { - INetURLObject aInetObj( maLibraryPath.getToken(1, (sal_Unicode)';') ); + INetURLObject aInetObj( maLibraryPath.getToken(1, ';') ); aInetObj.insertName( aName, true, INetURLObject::LAST_SEGMENT, INetURLObject::EncodeMechanism::All ); checkStorageURL( aInetObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ), pLib->maLibInfoFileURL, pLib->maStorageURL, pLib->maUnexpandedStorageURL ); @@ -2093,7 +2093,7 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto else { // Create Output stream - INetURLObject aLibInfoInetObj( maLibraryPath.getToken(1, (sal_Unicode)';') ); + INetURLObject aLibInfoInetObj( maLibraryPath.getToken(1, ';') ); aLibInfoInetObj.insertName( maInfoFileName, false, INetURLObject::LAST_SEGMENT, INetURLObject::EncodeMechanism::All ); aLibInfoInetObj.setExtension( "xlc" ); OUString aLibInfoPath( aLibInfoInetObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ) ); @@ -2286,7 +2286,7 @@ void SAL_CALL SfxLibraryContainer::removeLibrary( const OUString& Name ) catch(const Exception& ) {} // Delete folder if empty - INetURLObject aInetObj( maLibraryPath.getToken(1, (sal_Unicode)';') ); + INetURLObject aInetObj( maLibraryPath.getToken(1, ';') ); aInetObj.insertName( Name, true, INetURLObject::LAST_SEGMENT, INetURLObject::EncodeMechanism::All ); OUString aLibDirPath = aInetObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ); @@ -2545,7 +2545,7 @@ void SAL_CALL SfxLibraryContainer::renameLibrary( const OUString& Name, const OU OUString aLibDirPath = pImplLib->maStorageURL; - INetURLObject aDestInetObj( maLibraryPath.getToken(1, (sal_Unicode)';')); + INetURLObject aDestInetObj( maLibraryPath.getToken(1, ';')); aDestInetObj.insertName( NewName, true, INetURLObject::LAST_SEGMENT, INetURLObject::EncodeMechanism::All ); OUString aDestDirPath = aDestInetObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ); -- cgit