diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2017-04-28 17:55:27 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-04-28 18:26:56 +0200 |
commit | a5993e41410d278233298dcccd34ece04872ee7d (patch) | |
tree | abcc46eb3eaefde6b82d8533f74292b758e411e0 | |
parent | afacb9850bde58918ba6a5305320e90124454154 (diff) |
loplugin:salunicodeliteral: sc
Change-Id: I7f63388d3c0214be8f69095fe5ec0030df59a416
-rw-r--r-- | sc/source/core/data/dociter.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/data/funcdesc.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/data/table3.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/tool/compiler.cxx | 6 | ||||
-rw-r--r-- | sc/source/filter/excel/xecontent.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/ftools/ftools.cxx | 4 | ||||
-rw-r--r-- | sc/source/filter/oox/stylesbuffer.cxx | 42 | ||||
-rw-r--r-- | sc/source/ui/app/inputhdl.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/optdlg/tpformula.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/optdlg/tpusrlst.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/unoobj/filtuno.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/cellsh2.cxx | 2 |
12 files changed, 36 insertions, 36 deletions
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx index 098220582e92..901496de75d6 100644 --- a/sc/source/core/data/dociter.cxx +++ b/sc/source/core/data/dociter.cxx @@ -1710,7 +1710,7 @@ bool ScQueryCellIterator::BinarySearch() ::std::numeric_limits<double>::max(); OUString aLastInRangeString; if (!bLessEqual) - aLastInRangeString = OUString(sal_Unicode(0xFFFF)); + aLastInRangeString = OUString(u'\xFFFF'); aCellData = aIndexer.getCell(nLastInRange); aCell = aCellData.first; diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx index 6db1bb73bf26..a5c825a462dc 100644 --- a/sc/source/core/data/funcdesc.cxx +++ b/sc/source/core/data/funcdesc.cxx @@ -228,7 +228,7 @@ OUString ScFuncDesc::getSignature() const aSig.append( "( " ); aSig.append(aParamList); // U+00A0 (NBSP) prevents automatic line break - aSig.append( static_cast< sal_Unicode >(0xA0) ); + aSig.append( u'\x00A0' ); aSig.append( ")" ); } else diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx index cc6477b6dff7..2044a33b7708 100644 --- a/sc/source/core/data/table3.cxx +++ b/sc/source/core/data/table3.cxx @@ -3013,7 +3013,7 @@ SCSIZE ScTable::Query(ScQueryParam& rParamOrg, bool bKeepSub) GetString(k, j, aCellStr); OUStringBuffer aBuf(aStr); aBuf.append(aCellStr); - aBuf.append(static_cast<sal_Unicode>(1)); + aBuf.append(u'\x0001'); aStr = aBuf.makeStringAndClear(); } diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index 42317b1a3a5c..9131f6ee3bbc 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -881,7 +881,7 @@ struct ConventionOOO_A1 : public Convention_A1 return '.'; } - return sal_Unicode(0); + return u'\0'; } virtual bool parseExternalName( const OUString& rSymbol, OUString& rFile, OUString& rName, @@ -1114,11 +1114,11 @@ struct ConventionXL switch (eSymType) { case ScCompiler::Convention::ABS_SHEET_PREFIX: - return sal_Unicode(0); + return u'\0'; case ScCompiler::Convention::SHEET_SEPARATOR: return '!'; } - return sal_Unicode(0); + return u'\0'; } static bool parseExternalName( const OUString& rSymbol, OUString& rFile, OUString& rName, diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx index 427a8b3108fe..81fe1e9a922b 100644 --- a/sc/source/filter/excel/xecontent.cxx +++ b/sc/source/filter/excel/xecontent.cxx @@ -1663,7 +1663,7 @@ XclExpDV::XclExpDV( const XclExpRoot& rRoot, sal_uLong nScHandle ) : OUString aToken( aString.getToken( 0, '\n', nStringIx ) ); if( nToken > 0 ) { - mxString1->Append(OUString(static_cast<sal_Unicode>('\0'))); + mxString1->Append(OUString(u'\0')); sFormulaBuf.append( ',' ); } mxString1->Append( aToken ); diff --git a/sc/source/filter/ftools/ftools.cxx b/sc/source/filter/ftools/ftools.cxx index 0bd43ae9778e..e3ebc5597730 100644 --- a/sc/source/filter/ftools/ftools.cxx +++ b/sc/source/filter/ftools/ftools.cxx @@ -149,8 +149,8 @@ Color ScfTools::GetMixedColor( const Color& rFore, const Color& rBack, sal_uInt8 OUString ScfTools::ConvertToScDefinedName(const OUString& rName ) { //fdo#37872: we don't allow points in range names any more - OUString sName = rName.replace(static_cast<sal_Unicode>('.'), - static_cast<sal_Unicode>('_')); + OUString sName = rName.replace(u'.', + u'_'); sal_Int32 nLen = sName.getLength(); if( nLen && !ScCompiler::IsCharFlagAllConventions( sName, 0, ScCharFlags::CharName ) ) sName = sName.replaceAt( 0, 1, "_" ); diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx index c2a9cb82ca25..25fca16c643e 100644 --- a/sc/source/filter/oox/stylesbuffer.cxx +++ b/sc/source/filter/oox/stylesbuffer.cxx @@ -784,29 +784,29 @@ void Font::finalizeImport() { // #91658# CJK fonts bool bHasAsian = - xFont->hasGlyphs( OUString( sal_Unicode( 0x3041 ) ) ) || // 3040-309F: Hiragana - xFont->hasGlyphs( OUString( sal_Unicode( 0x30A1 ) ) ) || // 30A0-30FF: Katakana - xFont->hasGlyphs( OUString( sal_Unicode( 0x3111 ) ) ) || // 3100-312F: Bopomofo - xFont->hasGlyphs( OUString( sal_Unicode( 0x3131 ) ) ) || // 3130-318F: Hangul Compatibility Jamo - xFont->hasGlyphs( OUString( sal_Unicode( 0x3301 ) ) ) || // 3300-33FF: CJK Compatibility - xFont->hasGlyphs( OUString( sal_Unicode( 0x3401 ) ) ) || // 3400-4DBF: CJK Unified Ideographs Extension A - xFont->hasGlyphs( OUString( sal_Unicode( 0x4E01 ) ) ) || // 4E00-9FAF: CJK Unified Ideographs - xFont->hasGlyphs( OUString( sal_Unicode( 0x7E01 ) ) ) || // 4E00-9FAF: CJK unified ideographs - xFont->hasGlyphs( OUString( sal_Unicode( 0xA001 ) ) ) || // A001-A48F: Yi Syllables - xFont->hasGlyphs( OUString( sal_Unicode( 0xAC01 ) ) ) || // AC00-D7AF: Hangul Syllables - xFont->hasGlyphs( OUString( sal_Unicode( 0xCC01 ) ) ) || // AC00-D7AF: Hangul Syllables - xFont->hasGlyphs( OUString( sal_Unicode( 0xF901 ) ) ) || // F900-FAFF: CJK Compatibility Ideographs - xFont->hasGlyphs( OUString( sal_Unicode( 0xFF71 ) ) ); // FF00-FFEF: Halfwidth/Fullwidth Forms + xFont->hasGlyphs( OUString( u'\x3041' ) ) || // 3040-309F: Hiragana + xFont->hasGlyphs( OUString( u'\x30A1' ) ) || // 30A0-30FF: Katakana + xFont->hasGlyphs( OUString( u'\x3111' ) ) || // 3100-312F: Bopomofo + xFont->hasGlyphs( OUString( u'\x3131' ) ) || // 3130-318F: Hangul Compatibility Jamo + xFont->hasGlyphs( OUString( u'\x3301' ) ) || // 3300-33FF: CJK Compatibility + xFont->hasGlyphs( OUString( u'\x3401' ) ) || // 3400-4DBF: CJK Unified Ideographs Extension A + xFont->hasGlyphs( OUString( u'\x4E01' ) ) || // 4E00-9FAF: CJK Unified Ideographs + xFont->hasGlyphs( OUString( u'\x7E01' ) ) || // 4E00-9FAF: CJK unified ideographs + xFont->hasGlyphs( OUString( u'\xA001' ) ) || // A001-A48F: Yi Syllables + xFont->hasGlyphs( OUString( u'\xAC01' ) ) || // AC00-D7AF: Hangul Syllables + xFont->hasGlyphs( OUString( u'\xCC01' ) ) || // AC00-D7AF: Hangul Syllables + xFont->hasGlyphs( OUString( u'\xF901' ) ) || // F900-FAFF: CJK Compatibility Ideographs + xFont->hasGlyphs( OUString( u'\xFF71' ) ); // FF00-FFEF: Halfwidth/Fullwidth Forms // #113783# CTL fonts bool bHasCmplx = - xFont->hasGlyphs( OUString( sal_Unicode( 0x05D1 ) ) ) || // 0590-05FF: Hebrew - xFont->hasGlyphs( OUString( sal_Unicode( 0x0631 ) ) ) || // 0600-06FF: Arabic - xFont->hasGlyphs( OUString( sal_Unicode( 0x0721 ) ) ) || // 0700-074F: Syriac - xFont->hasGlyphs( OUString( sal_Unicode( 0x0911 ) ) ) || // 0900-0DFF: Indic scripts - xFont->hasGlyphs( OUString( sal_Unicode( 0x0E01 ) ) ) || // 0E00-0E7F: Thai - xFont->hasGlyphs( OUString( sal_Unicode( 0xFB21 ) ) ) || // FB1D-FB4F: Hebrew Presentation Forms - xFont->hasGlyphs( OUString( sal_Unicode( 0xFB51 ) ) ) || // FB50-FDFF: Arabic Presentation Forms-A - xFont->hasGlyphs( OUString( sal_Unicode( 0xFE71 ) ) ); // FE70-FEFF: Arabic Presentation Forms-B + xFont->hasGlyphs( OUString( u'\x05D1' ) ) || // 0590-05FF: Hebrew + xFont->hasGlyphs( OUString( u'\x0631' ) ) || // 0600-06FF: Arabic + xFont->hasGlyphs( OUString( u'\x0721' ) ) || // 0700-074F: Syriac + xFont->hasGlyphs( OUString( u'\x0911' ) ) || // 0900-0DFF: Indic scripts + xFont->hasGlyphs( OUString( u'\x0E01' ) ) || // 0E00-0E7F: Thai + xFont->hasGlyphs( OUString( u'\xFB21' ) ) || // FB1D-FB4F: Hebrew Presentation Forms + xFont->hasGlyphs( OUString( u'\xFB51' ) ) || // FB50-FDFF: Arabic Presentation Forms-A + xFont->hasGlyphs( OUString( u'\xFE71' ) ); // FE70-FEFF: Arabic Presentation Forms-B // Western fonts bool bHasLatin = (!bHasAsian && !bHasCmplx) || diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index bcfcef3f2126..e914894145e3 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -1006,7 +1006,7 @@ void ScInputHandler::ShowArgumentsTip( OUString& rSelText ) { OUStringBuffer aBuf; aBuf.append(aNew.copy(0, nStartPosition)); - aBuf.append(static_cast<sal_Unicode>(0x25BA)); + aBuf.append(u'\x25BA'); aBuf.append(aNew.copy(nStartPosition)); nArgs = ppFDesc->getParameterCount(); sal_Int16 nVarArgsSet = 0; diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx index 104661b61ddb..dd047ff813ff 100644 --- a/sc/source/ui/optdlg/tpformula.cxx +++ b/sc/source/ui/optdlg/tpformula.cxx @@ -71,7 +71,7 @@ ScTpFormulaOptions::ScTpFormulaOptions(vcl::Window* pParent, const SfxItemSet& r // Get the decimal separator for current locale. OUString aSep = ScGlobal::GetpLocaleData()->getNumDecimalSep(); - mnDecSep = aSep.isEmpty() ? sal_Unicode('.') : aSep[0]; + mnDecSep = aSep.isEmpty() ? u'.' : aSep[0]; maSavedDocOptions = ScDocOptions( static_cast<const ScTpCalcItem&>(rCoreAttrs.Get( diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx index 6a4f823d3bd9..ae2425345311 100644 --- a/sc/source/ui/optdlg/tpusrlst.cxx +++ b/sc/source/ui/optdlg/tpusrlst.cxx @@ -35,8 +35,8 @@ #include "globstr.hrc" #include "tpusrlst.hxx" -#define CR (sal_Unicode)13 -#define LF (sal_Unicode)10 +#define CR u'\x000D' +#define LF u'\x000A' static const sal_Unicode cDelimiter = ','; diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx index 451f3974189d..7b805717aae6 100644 --- a/sc/source/ui/unoobj/filtuno.cxx +++ b/sc/source/ui/unoobj/filtuno.cxx @@ -202,7 +202,7 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() aBuf.append(OUString::number(static_cast<sal_uInt16>(eLang))); aBuf.append(' '); - aBuf.append(pDlg->IsDateConversionSet() ? sal_Unicode('1') : sal_Unicode('0')); + aBuf.append(pDlg->IsDateConversionSet() ? u'1' : u'0'); aFilterOptions = aBuf.makeStringAndClear(); nRet = ui::dialogs::ExecutableDialogResults::OK; } diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx index 3d4277e984a3..91b5c5effe12 100644 --- a/sc/source/ui/view/cellsh2.cxx +++ b/sc/source/ui/view/cellsh2.cxx @@ -971,7 +971,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) aExport.SetExportTextOptions( ScExportTextOptions( ScExportTextOptions::None, 0, false ) ); // #i87703# text to columns fails with tab separator - aExport.SetDelimiter( static_cast< sal_Unicode >( 0 ) ); + aExport.SetDelimiter( u'\0' ); SvMemoryStream aStream; aStream.SetStreamCharSet( RTL_TEXTENCODING_UNICODE ); |