[Libreoffice-commits] core.git: 9 commits - avmedia/source basctl/source basegfx/source basic/source binaryurp/source chart2/source configmgr/qa configmgr/source connectivity/source dbaccess/source desktop/source editeng/qa editeng/source extensions/source filter/source forms/source formula/source fpicker/source framework/source i18npool/source lingucomponent/source lotuswordpro/source mysqlc/source oox/source padmin/source registry/source reportdesign/source sal/osl sal/qa sal/rtl sax/source sc/source sdext/source sd/source sfx2/source starmath/source stoc/source svgio/source svl/source svtools/source svx/source sw/qa sw/source tools/source ucbhelper/source ucb/source unotools/source unoxml/source uui/source vbahelper/source vcl/aqua vcl/generic vcl/source vcl/unx vcl/win writerfilter/source xmlhelp/source
Noel Grandin
noel at peralex.com
Wed Nov 13 22:18:12 PST 2013
avmedia/source/framework/mediaitem.cxx | 2
basctl/source/basicide/bastypes.cxx | 2
basegfx/source/polygon/b2dsvgpolypolygon.cxx | 4
basegfx/source/tools/stringconversiontools.cxx | 28 -
basic/source/classes/sbunoobj.cxx | 4
basic/source/sbx/sbxcurr.cxx | 10
binaryurp/source/bridge.cxx | 2
chart2/source/tools/DataSeriesHelper.cxx | 6
chart2/source/tools/ObjectIdentifier.cxx | 8
chart2/source/tools/PotentialRegressionCurveCalculator.cxx | 4
chart2/source/tools/RegressionEquation.cxx | 2
chart2/source/tools/StatisticsHelper.cxx | 6
chart2/source/tools/XMLRangeHelper.cxx | 6
chart2/source/view/main/ShapeFactory.cxx | 2
configmgr/qa/unit/test.cxx | 2
configmgr/source/access.cxx | 10
configmgr/source/childaccess.cxx | 2
configmgr/source/data.cxx | 10
connectivity/source/commontools/filtermanager.cxx | 4
connectivity/source/parse/sqlnode.cxx | 38 -
dbaccess/source/core/dataaccess/documentcontainer.cxx | 2
dbaccess/source/core/dataaccess/documentdefinition.cxx | 4
dbaccess/source/core/recovery/dbdocrecovery.cxx | 8
dbaccess/source/core/recovery/storagetextstream.cxx | 2
dbaccess/source/ext/macromigration/migrationlog.cxx | 12
dbaccess/source/ui/app/AppDetailPageHelper.cxx | 2
dbaccess/source/ui/browser/unodatbr.cxx | 2
dbaccess/source/ui/control/tabletree.cxx | 4
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 8
dbaccess/source/ui/querydesign/querycontroller.cxx | 4
desktop/source/migration/migration.cxx | 2
editeng/qa/lookuptree/lookuptree_test.cxx | 8
editeng/source/editeng/eehtml.cxx | 2
editeng/source/items/bulitem.cxx | 2
editeng/source/items/flditem.cxx | 4
editeng/source/items/svxfont.cxx | 2
editeng/source/items/xmlcnitm.cxx | 2
editeng/source/lookuptree/LatinLookupTree.cxx | 8
editeng/source/lookuptree/LatinTreeNode.cxx | 4
editeng/source/lookuptree/Trie.cxx | 8
extensions/source/logging/loggerconfig.cxx | 2
extensions/source/propctrlr/eventhandler.cxx | 4
extensions/source/update/feed/updatefeed.cxx | 2
filter/source/svg/svgexport.cxx | 4
filter/source/svg/svgreader.cxx | 8
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 2
forms/source/component/DatabaseForm.cxx | 16
forms/source/xforms/convert.cxx | 8
forms/source/xforms/datatypes.cxx | 12
forms/source/xforms/model_ui.cxx | 20
formula/source/core/api/FormulaCompiler.cxx | 12
fpicker/source/office/iodlg.cxx | 2
framework/source/services/urltransformer.cxx | 12
i18npool/source/indexentry/genindex_data.cxx | 2
i18npool/source/indexentry/indexentrysupplier_default.cxx | 10
i18npool/source/localedata/LocaleNode.cxx | 2
i18npool/source/localedata/localedata.cxx | 4
i18npool/source/textconversion/genconv_dict.cxx | 8
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx | 2
lingucomponent/source/lingutil/lingutil.cxx | 2
lotuswordpro/source/filter/lwptools.cxx | 4
mysqlc/source/mysqlc_connection.cxx | 2
mysqlc/source/mysqlc_resultsetmetadata.cxx | 2
oox/source/core/relations.cxx | 2
oox/source/drawingml/chart/chartconverter.cxx | 2
oox/source/drawingml/chart/titleconverter.cxx | 2
oox/source/drawingml/lineproperties.cxx | 2
oox/source/dump/dumperbase.cxx | 18
oox/source/helper/storagebase.cxx | 2
oox/source/ole/olehelper.cxx | 12
oox/source/ole/vbacontrol.cxx | 6
oox/source/ole/vbamodule.cxx | 6
oox/source/vml/vmlshape.cxx | 2
oox/source/vml/vmltextboxcontext.cxx | 2
padmin/source/adddlg.cxx | 2
registry/source/keyimpl.cxx | 2
reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx | 2
reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx | 6
reportdesign/source/ui/misc/FunctionHelper.cxx | 10
sal/osl/unx/process_impl.cxx | 2
sal/qa/rtl/math/test-rtl-math.cxx | 8
sal/rtl/bootstrap.cxx | 2
sax/source/fastparser/fastparser.cxx | 2
sax/source/tools/converter.cxx | 204 +++++-----
sc/source/core/data/dpcache.cxx | 2
sc/source/core/data/dptabres.cxx | 4
sc/source/core/data/dputil.cxx | 4
sc/source/core/data/formulacell.cxx | 8
sc/source/core/data/funcdesc.cxx | 16
sc/source/core/data/postit.cxx | 2
sc/source/core/tool/chartarr.cxx | 8
sc/source/core/tool/chgtrack.cxx | 32 -
sc/source/core/tool/compiler.cxx | 116 ++---
sc/source/core/tool/dbdata.cxx | 2
sc/source/core/tool/doubleref.cxx | 12
sc/source/core/tool/formulaopt.cxx | 10
sc/source/core/tool/interpr1.cxx | 6
sc/source/core/tool/rangeutl.cxx | 20
sc/source/core/tool/stringutil.cxx | 6
sc/source/filter/dif/difexp.cxx | 8
sc/source/filter/excel/xehelper.cxx | 4
sc/source/filter/excel/xepivot.cxx | 2
sc/source/filter/excel/xicontent.cxx | 2
sc/source/filter/excel/xipivot.cxx | 2
sc/source/filter/excel/xltools.cxx | 4
sc/source/filter/oox/autofilterbuffer.cxx | 6
sc/source/filter/oox/commentsbuffer.cxx | 2
sc/source/filter/oox/formulabase.cxx | 6
sc/source/filter/oox/pagesettings.cxx | 2
sc/source/filter/oox/querytablebuffer.cxx | 4
sc/source/filter/oox/sheetdatabuffer.cxx | 4
sc/source/filter/oox/stylesbuffer.cxx | 4
sc/source/filter/oox/worksheetbuffer.cxx | 6
sc/source/filter/oox/worksheethelper.cxx | 4
sc/source/filter/xml/xmlcelli.cxx | 2
sc/source/filter/xml/xmlexprt.cxx | 10
sc/source/ui/app/inputhdl.cxx | 6
sc/source/ui/collab/sendfunc.cxx | 8
sc/source/ui/dbgui/dbnamdlg.cxx | 4
sc/source/ui/dbgui/pfiltdlg.cxx | 2
sc/source/ui/docshell/docsh.cxx | 4
sc/source/ui/docshell/impex.cxx | 4
sc/source/ui/miscdlgs/acredlin.cxx | 14
sc/source/ui/miscdlgs/linkarea.cxx | 2
sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx | 2
sc/source/ui/unoobj/chart2uno.cxx | 4
sc/source/ui/unoobj/filtuno.cxx | 2
sc/source/ui/vba/vbahyperlink.cxx | 2
sc/source/ui/vba/vbarange.cxx | 2
sc/source/ui/vba/vbasheetobject.cxx | 2
sc/source/ui/view/dbfunc3.cxx | 12
sc/source/ui/view/formatsh.cxx | 2
sc/source/ui/view/output2.cxx | 4
sc/source/ui/view/viewfun2.cxx | 2
sc/source/ui/view/viewfun6.cxx | 4
sc/source/ui/view/viewutil.cxx | 2
sd/source/ui/annotations/annotationtag.cxx | 2
sd/source/ui/dlg/copydlg.cxx | 2
sd/source/ui/framework/configuration/ResourceId.cxx | 4
sd/source/ui/slideshow/slideshowimpl.cxx | 4
sd/source/ui/unoidl/unoobj.cxx | 16
sd/source/ui/unoidl/unopage.cxx | 8
sd/source/ui/view/frmview.cxx | 12
sdext/source/pdfimport/filterdet.cxx | 2
sdext/source/pdfimport/misc/pdfihelper.cxx | 8
sdext/source/pdfimport/tree/drawtreevisiting.cxx | 8
sdext/source/pdfimport/tree/writertreevisiting.cxx | 16
sdext/source/pdfimport/wrapper/wrapper.cxx | 4
sfx2/source/appl/newhelp.cxx | 12
starmath/source/rect.cxx | 2
stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx | 2
svgio/source/svgreader/svgcharacternode.cxx | 4
svgio/source/svgreader/svggradientnode.cxx | 2
svgio/source/svgreader/svgnode.cxx | 6
svgio/source/svgreader/svgpatternnode.cxx | 2
svgio/source/svgreader/svgstyleattributes.cxx | 10
svgio/source/svgreader/svgstylenode.cxx | 10
svgio/source/svgreader/svgtextpathnode.cxx | 2
svgio/source/svgreader/svgtools.cxx | 158 +++----
svgio/source/svgreader/svgtrefnode.cxx | 2
svgio/source/svgreader/svgusenode.cxx | 2
svl/source/misc/ownlist.cxx | 12
svl/source/numbers/zformat.cxx | 118 ++---
svl/source/passwordcontainer/passwordcontainer.cxx | 8
svl/source/passwordcontainer/syscreds.cxx | 4
svtools/source/contnr/simptabl.cxx | 2
svx/source/accessibility/DescriptionGenerator.cxx | 36 -
svx/source/accessibility/lookupcolorname.cxx | 2
svx/source/dialog/relfld.cxx | 4
svx/source/svdraw/svdattr.cxx | 2
svx/source/svdraw/svdibrow.cxx | 10
svx/source/svdraw/svdmodel.cxx | 10
svx/source/svdraw/svdocirc.cxx | 4
svx/source/svdraw/svdorect.cxx | 2
sw/qa/core/uwriter.cxx | 2
sw/source/core/unocore/XMLRangeHelper.cxx | 8
sw/source/core/unocore/unoobj.cxx | 2
sw/source/filter/ww8/docxattributeoutput.cxx | 8
sw/source/filter/xml/xmlexpit.cxx | 18
sw/source/filter/xml/xmlimpit.cxx | 10
sw/source/ui/app/docsh2.cxx | 2
sw/source/ui/shells/textsh.cxx | 2
sw/source/ui/vba/vbalisthelper.cxx | 88 ++--
sw/source/ui/vba/vbaoptions.cxx | 4
sw/source/ui/vba/vbatemplate.cxx | 4
tools/source/fsys/urlobj.cxx | 12
tools/source/memtools/multisel.cxx | 8
ucb/source/core/ucb.cxx | 6
ucb/source/regexp/regexp.cxx | 4
ucb/source/ucp/ext/ucpext_content.cxx | 2
ucb/source/ucp/ext/ucpext_datasupplier.cxx | 2
ucb/source/ucp/ext/ucpext_provider.cxx | 4
ucb/source/ucp/file/bc.cxx | 12
ucb/source/ucp/file/filglob.cxx | 2
ucb/source/ucp/file/shell.cxx | 6
ucb/source/ucp/ftp/ftpurl.cxx | 42 +-
ucb/source/ucp/webdav-neon/DAVProperties.cxx | 4
ucb/source/ucp/webdav-neon/NeonSession.cxx | 4
ucb/source/ucp/webdav-neon/NeonUri.cxx | 4
ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx | 6
ucb/source/ucp/webdav/DAVProperties.cxx | 6
ucb/source/ucp/webdav/SerfSession.cxx | 4
ucb/source/ucp/webdav/SerfUri.cxx | 4
ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx | 6
ucb/source/ucp/webdav/webdavcontent.cxx | 2
ucb/source/ucp/webdav/webdavresponseparser.cxx | 6
ucbhelper/source/client/proxydecider.cxx | 6
ucbhelper/source/provider/providerhelper.cxx | 18
unotools/source/config/configpaths.cxx | 4
unotools/source/config/fontcfg.cxx | 2
unotools/source/config/syslocaleoptions.cxx | 2
unotools/source/misc/datetime.cxx | 10
unotools/source/ucbhelper/tempfile.cxx | 2
unoxml/source/dom/element.cxx | 6
uui/source/iahndl-ssl.cxx | 2
uui/source/secmacrowarnings.cxx | 2
vbahelper/source/vbahelper/vbacommandbarhelper.cxx | 4
vcl/aqua/source/window/salframe.cxx | 20
vcl/aqua/source/window/salmenu.cxx | 4
vcl/generic/fontmanager/helper.cxx | 4
vcl/generic/print/genprnpsp.cxx | 2
vcl/source/gdi/outdev3.cxx | 2
vcl/source/gdi/pdfwriter_impl.cxx | 4
vcl/source/window/menu.cxx | 2
vcl/source/window/printdlg.cxx | 2
vcl/unx/generic/printer/cupsmgr.cxx | 2
vcl/unx/generic/printer/ppdparser.cxx | 12
vcl/unx/generic/window/salframe.cxx | 6
vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 2
vcl/unx/gtk/gdi/salprn-gtk.cxx | 4
vcl/unx/x11/x11sys.cxx | 4
vcl/win/source/app/salinfo.cxx | 2
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 2
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 2
xmlhelp/source/cxxhelp/provider/databases.cxx | 30 -
xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx | 2
xmlhelp/source/cxxhelp/provider/urlparameter.cxx | 14
xmlhelp/source/treeview/tvread.cxx | 14
238 files changed, 1038 insertions(+), 1048 deletions(-)
New commits:
commit d366c9b20ec86f3fe521812a0c22def3bfd1f05e
Author: Noel Grandin <noel at peralex.com>
Date: Thu Nov 14 08:16:35 2013 +0200
remove unnecessary sal_Unicode casts in various places
Change-Id: Ibf04062ca86ed866202d748c3b62a210d30ed6ec
diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx
index 8f6b067..4ef8b4e 100644
--- a/avmedia/source/framework/mediaitem.cxx
+++ b/avmedia/source/framework/mediaitem.cxx
@@ -396,7 +396,7 @@ lcl_CreateStream(uno::Reference<embed::XStorage> const& xStorage,
{
OUString basename;
OUString suffix;
- sal_Int32 const nIndex(rFilename.lastIndexOf(sal_Unicode('.')));
+ sal_Int32 const nIndex(rFilename.lastIndexOf('.'));
if (0 < nIndex)
{
basename = rFilename.copy(0, nIndex);
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index 98a9f62..b175f21 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -800,7 +800,7 @@ bool QueryDel( const OUString& rName, const ResId& rId, Window* pParent )
OUString aQuery(rId.toString());
OUStringBuffer aNameBuf( rName );
aNameBuf.append('\'');
- aNameBuf.insert(sal_Int32(0), sal_Unicode('\''));
+ aNameBuf.insert(0, '\'');
aQuery = aQuery.replaceAll("XX", aNameBuf.makeStringAndClear());
QueryBox aQueryBox( pParent, WB_YES_NO | WB_DEF_YES, aQuery );
return ( aQueryBox.Execute() == RET_YES );
diff --git a/basegfx/source/polygon/b2dsvgpolypolygon.cxx b/basegfx/source/polygon/b2dsvgpolypolygon.cxx
index 4667564..62e7014 100644
--- a/basegfx/source/polygon/b2dsvgpolypolygon.cxx
+++ b/basegfx/source/polygon/b2dsvgpolypolygon.cxx
@@ -674,11 +674,11 @@ namespace basegfx
if(a)
{
- aResult.append(sal_Unicode(' '));
+ aResult.append(' ');
}
::basegfx::internal::lcl_putNumberChar(aResult, aPoint.getX());
- aResult.append(sal_Unicode(','));
+ aResult.append(',');
::basegfx::internal::lcl_putNumberChar(aResult, aPoint.getY());
}
diff --git a/basegfx/source/tools/stringconversiontools.cxx b/basegfx/source/tools/stringconversiontools.cxx
index bc5cfb2..211f899 100644
--- a/basegfx/source/tools/stringconversiontools.cxx
+++ b/basegfx/source/tools/stringconversiontools.cxx
@@ -29,7 +29,7 @@ namespace basegfx
const sal_Int32 nLen)
{
while( io_rPos < nLen &&
- sal_Unicode(' ') == rStr[io_rPos] )
+ ' ' == rStr[io_rPos] )
{
++io_rPos;
}
@@ -40,7 +40,7 @@ namespace basegfx
const sal_Int32 nLen)
{
while(io_rPos < nLen
- && (sal_Unicode(' ') == rStr[io_rPos] || sal_Unicode(',') == rStr[io_rPos]))
+ && (' ' == rStr[io_rPos] || ',' == rStr[io_rPos]))
{
++io_rPos;
}
@@ -54,35 +54,35 @@ namespace basegfx
OUStringBuffer sNumberString;
bool separator_seen=false;
- if(sal_Unicode('+') == aChar || sal_Unicode('-') == aChar)
+ if('+' == aChar || '-' == aChar)
{
sNumberString.append(rStr[io_rPos]);
aChar = rStr[++io_rPos];
}
- while((sal_Unicode('0') <= aChar && sal_Unicode('9') >= aChar)
- || (!separator_seen && sal_Unicode('.') == aChar))
+ while(('0' <= aChar && '9' >= aChar)
+ || (!separator_seen && '.' == aChar))
{
- if (sal_Unicode('.') == aChar) separator_seen = true;
+ if ('.' == aChar) separator_seen = true;
sNumberString.append(rStr[io_rPos]);
io_rPos++;
aChar = io_rPos < rStr.getLength() ? rStr[io_rPos] : 0;
}
- if(sal_Unicode('e') == aChar || sal_Unicode('E') == aChar)
+ if('e' == aChar || 'E' == aChar)
{
sNumberString.append(rStr[io_rPos]);
io_rPos++;
aChar = io_rPos < rStr.getLength() ? rStr[io_rPos] : 0;
- if(sal_Unicode('+') == aChar || sal_Unicode('-') == aChar)
+ if('+' == aChar || '-' == aChar)
{
sNumberString.append(rStr[io_rPos]);
io_rPos++;
aChar = io_rPos < rStr.getLength() ? rStr[io_rPos] : 0;
}
- while(sal_Unicode('0') <= aChar && sal_Unicode('9') >= aChar)
+ while('0' <= aChar && '9' >= aChar)
{
sNumberString.append(rStr[io_rPos]);
io_rPos++;
@@ -94,8 +94,8 @@ namespace basegfx
{
rtl_math_ConversionStatus eStatus;
o_fRetval = ::rtl::math::stringToDouble( sNumberString.makeStringAndClear(),
- (sal_Unicode)('.'),
- (sal_Unicode)(','),
+ '.',
+ ',',
&eStatus,
NULL );
return ( eStatus == rtl_math_ConversionStatus_Ok );
@@ -124,12 +124,12 @@ namespace basegfx
{
sal_Unicode aChar( rStr[io_rPos] );
- if(sal_Unicode('0') == aChar)
+ if('0' == aChar)
{
o_nRetval = 0;
++io_rPos;
}
- else if (sal_Unicode('1') == aChar)
+ else if ('1' == aChar)
{
o_nRetval = 1;
++io_rPos;
@@ -156,7 +156,7 @@ namespace basegfx
if( lcl_isOnNumberChar(rStr[aLen - 1], false) &&
fValue >= 0.0 )
{
- rStr.append( sal_Unicode(' ') );
+ rStr.append( ' ' );
}
}
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 9811383..667d7ab 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -1736,11 +1736,11 @@ bool checkUnoObjectType( SbUnoObject* pUnoObj, const OUString& rClass )
sal_Int32 nClassNameDot = rClass.lastIndexOf( '.' );
if( nClassNameDot >= 0 )
{
- aClassName += rClass.copy( 0, nClassNameDot + 1 ) + OUString( sal_Unicode( 'X' ) ) + rClass.copy( nClassNameDot + 1 );
+ aClassName += rClass.copy( 0, nClassNameDot + 1 ) + OUString( 'X' ) + rClass.copy( nClassNameDot + 1 );
}
else
{
- aClassName += OUString( sal_Unicode( 'X' ) ) + rClass;
+ aClassName += OUString( 'X' ) + rClass;
}
}
else // assume extended type declaration support for basic ( can't get here
diff --git a/basic/source/sbx/sbxcurr.cxx b/basic/source/sbx/sbxcurr.cxx
index 571eeb7..aac9e33 100644
--- a/basic/source/sbx/sbxcurr.cxx
+++ b/basic/source/sbx/sbxcurr.cxx
@@ -92,10 +92,10 @@ static OUString ImpCurrencyToString( const sal_Int64 &rVal )
// 0 0.0000 0
// 0.1 0.1000 0.1
- aBuf[nInsertIndex--] = (sal_Unicode)'0';
+ aBuf[nInsertIndex--] = '0';
}
if ( isNeg )
- aBuf[nInsertIndex] = (sal_Unicode)'-';
+ aBuf[nInsertIndex] = '-';
aAbsStr = aBuf.makeStringAndClear();
return aAbsStr;
@@ -107,8 +107,8 @@ static sal_Int64 ImpStringToCurrency( const OUString &rStr )
sal_Int32 nFractDigit = 4;
- sal_Unicode cDeciPnt = sal_Unicode('.');
- sal_Unicode c1000Sep = sal_Unicode(',');
+ sal_Unicode cDeciPnt = '.';
+ sal_Unicode c1000Sep = ',';
#ifdef MAYBEFUTURE
sal_Unicode cLocaleDeciPnt, cLocale1000Sep;
@@ -202,7 +202,7 @@ static sal_Int64 ImpStringToCurrency( const OUString &rStr )
SbxBase::SetError( SbxERR_CONVERSION );
while( nFractDigit )
{
- sNormalisedNumString.append( sal_Unicode('0') );
+ sNormalisedNumString.append( '0' );
nFractDigit--;
}
diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx
index 31fc342..cb69b0c 100644
--- a/binaryurp/source/bridge.cxx
+++ b/binaryurp/source/bridge.cxx
@@ -907,7 +907,7 @@ OUString Bridge::getName() throw (css::uno::RuntimeException) {
OUString Bridge::getDescription() throw (css::uno::RuntimeException) {
OUStringBuffer b(name_);
- b.append(sal_Unicode(':'));
+ b.append(':');
b.append(connection_->getDescription());
return b.makeStringAndClear();
}
diff --git a/chart2/source/tools/DataSeriesHelper.cxx b/chart2/source/tools/DataSeriesHelper.cxx
index 1bff4c3..8b6b4a7 100644
--- a/chart2/source/tools/DataSeriesHelper.cxx
+++ b/chart2/source/tools/DataSeriesHelper.cxx
@@ -272,7 +272,7 @@ OUString lcl_getDataSequenceLabel( const Reference< chart2::data::XDataSequence
{
aBuf.append( aSeq[i] );
if( i < nMax )
- aBuf.append( sal_Unicode( ' ' ));
+ aBuf.append( ' ');
}
aResult = aBuf.makeStringAndClear();
}
@@ -291,13 +291,13 @@ OUString lcl_getDataSequenceLabel( const Reference< chart2::data::XDataSequence
{
aBuf.append( aVal );
if( i < nMax )
- aBuf.append( sal_Unicode( ' ' ));
+ aBuf.append( ' ');
}
else if( aSeq[ i ] >>= fNum )
{
aBuf.append( fNum );
if( i < nMax )
- aBuf.append( sal_Unicode( ' ' ));
+ aBuf.append( ' ');
}
}
aResult = aBuf.makeStringAndClear();
diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx
index b6da8e8..a5052c9 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -602,13 +602,13 @@ OUString ObjectIdentifier::createPieSegmentDragParameterString(
, const awt::Point& rMaximumPosition )
{
OUStringBuffer aRet( OUString::number( nOffsetPercent ) );
- aRet.append( sal_Unicode( ',' ));
+ aRet.append( ',');
aRet.append( OUString::number( rMinimumPosition.X ) );
- aRet.append( sal_Unicode( ',' ));
+ aRet.append( ',');
aRet.append( OUString::number( rMinimumPosition.Y ) );
- aRet.append( sal_Unicode( ',' ));
+ aRet.append( ',');
aRet.append( OUString::number( rMaximumPosition.X ) );
- aRet.append( sal_Unicode( ',' ));
+ aRet.append( ',');
aRet.append( OUString::number( rMaximumPosition.Y ) );
return aRet.makeStringAndClear();
}
diff --git a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx
index 31b42d8..d22138c 100644
--- a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx
@@ -138,7 +138,7 @@ OUString PotentialRegressionCurveCalculator::ImplGetRepresentation(
if( m_fIntercept == 0.0 )
{
- aBuf.append( sal_Unicode( '0' ));
+ aBuf.append( '0');
}
else if( m_fSlope == 0.0 )
{
@@ -149,7 +149,7 @@ OUString PotentialRegressionCurveCalculator::ImplGetRepresentation(
if( ! rtl::math::approxEqual( m_fIntercept, 1.0 ) )
{
aBuf.append( getFormattedString( xNumFormatter, nNumberFormatKey, m_fIntercept ));
- aBuf.append( sal_Unicode( ' ' ));
+ aBuf.append( ' ');
}
if( m_fSlope != 0.0 )
{
diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx
index 2093be4..acbc9e5 100644
--- a/chart2/source/tools/RegressionEquation.cxx
+++ b/chart2/source/tools/RegressionEquation.cxx
@@ -112,7 +112,7 @@ private:
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_EQUATION_SHOW, false );
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_EQUATION_SHOW_CORRELATION_COEFF, false );
- //::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_EQUATION_SEPARATOR, OUString( sal_Unicode( '\n' )));
+ //::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_EQUATION_SEPARATOR, OUString( '\n' ));
// override other defaults
::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::FillProperties::PROP_FILL_STYLE, drawing::FillStyle_NONE );
diff --git a/chart2/source/tools/StatisticsHelper.cxx b/chart2/source/tools/StatisticsHelper.cxx
index 99d9e42..724e01c 100644
--- a/chart2/source/tools/StatisticsHelper.cxx
+++ b/chart2/source/tools/StatisticsHelper.cxx
@@ -81,13 +81,13 @@ Reference< chart2::data::XLabeledDataSequence > lcl_getErrorBarLabeledSequence(
{
OUStringBuffer aRole( "error-bars-");
if( bYError )
- aRole.append( sal_Unicode( 'y' ));
+ aRole.append( 'y');
else
- aRole.append( sal_Unicode( 'x' ));
+ aRole.append( 'x');
OUString aPlainRole = aRole.makeStringAndClear();
aRole.append( aPlainRole );
- aRole.append( sal_Unicode( '-' ));
+ aRole.append( '-' );
if( bPositiveValue )
aRole = aRole.appendAscii( "positive" );
diff --git a/chart2/source/tools/XMLRangeHelper.cxx b/chart2/source/tools/XMLRangeHelper.cxx
index 227b3e0c..b66a2c7 100644
--- a/chart2/source/tools/XMLRangeHelper.cxx
+++ b/chart2/source/tools/XMLRangeHelper.cxx
@@ -77,9 +77,9 @@ void lcl_getXMLStringForCell( const ::chart::XMLRangeHelper::Cell & rCell, OUStr
return;
sal_Int32 nCol = rCell.nColumn;
- output->append( (sal_Unicode)'.' );
+ output->append( '.' );
if( ! rCell.bRelativeColumn )
- output->append( (sal_Unicode)'$' );
+ output->append( '$' );
// get A, B, C, ..., AA, AB, ... representation of column number
if( nCol < 26 )
@@ -98,7 +98,7 @@ void lcl_getXMLStringForCell( const ::chart::XMLRangeHelper::Cell & rCell, OUStr
// write row number as number
if( ! rCell.bRelativeRow )
- output->append( (sal_Unicode)'$' );
+ output->append( '$' );
output->append( rCell.nRow + (sal_Int32)1 );
}
diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx
index c3629da..92cb7de 100644
--- a/chart2/source/view/main/ShapeFactory.cxx
+++ b/chart2/source/view/main/ShapeFactory.cxx
@@ -2190,7 +2190,7 @@ OUString ShapeFactory::getStackedString( const OUString& rString, bool bStacked
for( sal_Int32 nPosSrc=0; nPosSrc < nLen; nPosSrc++ )
{
if( nPosSrc )
- aStackStr.append( sal_Unicode('\r') );
+ aStackStr.append( '\r' );
aStackStr.append(rString[nPosSrc]);
}
return aStackStr.makeStringAndClear();
diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx
index fa32488..bc8f09c 100644
--- a/configmgr/qa/unit/test.cxx
+++ b/configmgr/qa/unit/test.cxx
@@ -67,7 +67,7 @@ void normalize(
*name = relative;
} else {
OUStringBuffer buf(path);
- buf.append(sal_Unicode('/'));
+ buf.append('/');
buf.append(relative.copy(0, i));
*normalizedPath = buf.makeStringAndClear();
*name = relative.copy(i + 1);
diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx
index 2b047df..280f053 100644
--- a/configmgr/source/access.cxx
+++ b/configmgr/source/access.cxx
@@ -550,7 +550,7 @@ OUString Access::getHierarchicalName() throw (css::uno::RuntimeException) {
}
OUString rel(getRelativePathRepresentation());
if (!path.isEmpty() && !rel.isEmpty()) {
- path.append(sal_Unicode('/'));
+ path.append('/');
}
path.append(rel);
return path.makeStringAndClear();
@@ -572,7 +572,7 @@ OUString Access::composeHierarchicalName(
}
OUStringBuffer path(getRelativePathRepresentation());
if (!path.isEmpty()) {
- path.append(sal_Unicode('/'));
+ path.append('/');
}
path.append(aRelativeName);
return path.makeStringAndClear();
@@ -1845,7 +1845,7 @@ void Access::initBroadcasterAndChanges(
if (allChanges != 0) {
OUStringBuffer path(getRelativePathRepresentation());
if (!path.isEmpty()) {
- path.append(sal_Unicode('/'));
+ path.append('/');
}
path.append(Data::createSegment("*", i->first));
allChanges->push_back(
@@ -1904,7 +1904,7 @@ void Access::initBroadcasterAndChanges(
OUStringBuffer path(
getRelativePathRepresentation());
if (!path.isEmpty()) {
- path.append(sal_Unicode('/'));
+ path.append('/');
}
path.append(i->first);
allChanges->push_back(
@@ -1941,7 +1941,7 @@ void Access::initBroadcasterAndChanges(
OUStringBuffer path(
getRelativePathRepresentation());
if (!path.isEmpty()) {
- path.append(sal_Unicode('/'));
+ path.append('/');
}
path.append(Data::createSegment("*", i->first));
allChanges->push_back(
diff --git a/configmgr/source/childaccess.cxx b/configmgr/source/childaccess.cxx
index dec5c46..9e80d1b 100644
--- a/configmgr/source/childaccess.cxx
+++ b/configmgr/source/childaccess.cxx
@@ -114,7 +114,7 @@ OUString ChildAccess::getRelativePathRepresentation() {
if (parent.is()) {
path.append(parent->getRelativePathRepresentation());
if (!path.isEmpty()) {
- path.append(sal_Unicode('/'));
+ path.append('/');
}
}
path.append(Data::createSegment(node_->getTemplateName(), name_));
diff --git a/configmgr/source/data.cxx b/configmgr/source/data.cxx
index dfca764..8d98699 100644
--- a/configmgr/source/data.cxx
+++ b/configmgr/source/data.cxx
@@ -57,13 +57,13 @@ bool decode(
sal_Unicode c = encoded[begin++];
if (c == '&') {
if (encoded.match("amp;", begin)) {
- buf.append(sal_Unicode('&'));
+ buf.append('&');
begin += RTL_CONSTASCII_LENGTH("amp;");
} else if (encoded.match("quot;", begin)) {
- buf.append(sal_Unicode('"'));
+ buf.append('"');
begin += RTL_CONSTASCII_LENGTH("quot;");
} else if (encoded.match("apos;", begin)) {
- buf.append(sal_Unicode('\''));
+ buf.append('\'');
begin += RTL_CONSTASCII_LENGTH("apos;");
} else {
return false;
@@ -159,7 +159,7 @@ OUString Data::fullTemplateName(
css::uno::Reference< css::uno::XInterface >());
}
OUStringBuffer buf(component);
- buf.append(sal_Unicode(':'));
+ buf.append(':');
buf.append(name);
return buf.makeStringAndClear();
}
@@ -232,7 +232,7 @@ rtl::Reference< Node > Data::resolvePathRepresentation(
return p;
}
if (canonicRepresentation != 0) {
- canonic.append(sal_Unicode('/'));
+ canonic.append('/');
canonic.append(createSegment(templateName, seg));
}
if (path != 0) {
diff --git a/connectivity/source/commontools/filtermanager.cxx b/connectivity/source/commontools/filtermanager.cxx
index 7d074df..e8a4a2d 100644
--- a/connectivity/source/commontools/filtermanager.cxx
+++ b/connectivity/source/commontools/filtermanager.cxx
@@ -111,8 +111,8 @@ namespace dbtools
{
if ( !io_appendTo.isEmpty() )
{
- io_appendTo.insert( 0, sal_Unicode( '(' ) );
- io_appendTo.insert( 1, sal_Unicode( ' ' ) );
+ io_appendTo.insert( 0, '(' );
+ io_appendTo.insert( 1, ' ' );
io_appendTo.appendAscii( " ) AND " );
}
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index 0b33396..e818d3e 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -2296,10 +2296,10 @@ void OSQLParseNode::showParseTree( OUStringBuffer& _inout_rBuffer, sal_uInt32 nL
// Rule name as rule
_inout_rBuffer.appendAscii( "RULE_ID: " );
_inout_rBuffer.append( (sal_Int32)getRuleID() );
- _inout_rBuffer.append( sal_Unicode( '(' ) );
+ _inout_rBuffer.append( '(' );
_inout_rBuffer.append( OSQLParser::RuleIDToStr( getRuleID() ) );
- _inout_rBuffer.append( sal_Unicode( ')' ) );
- _inout_rBuffer.append( sal_Unicode( '\n' ) );
+ _inout_rBuffer.append( ')' );
+ _inout_rBuffer.append( '\n' );
// Get the first sub tree
for ( OSQLParseNodes::const_iterator i = m_aChildren.begin();
@@ -2317,53 +2317,53 @@ void OSQLParseNode::showParseTree( OUStringBuffer& _inout_rBuffer, sal_uInt32 nL
case SQL_NODE_KEYWORD:
_inout_rBuffer.appendAscii( "SQL_KEYWORD: " );
_inout_rBuffer.append( OStringToOUString( OSQLParser::TokenIDToStr( getTokenID() ), RTL_TEXTENCODING_UTF8 ) );
- _inout_rBuffer.append( sal_Unicode( '\n' ) );
+ _inout_rBuffer.append( '\n' );
break;
case SQL_NODE_COMPARISON:
_inout_rBuffer.appendAscii( "SQL_COMPARISON: " );
_inout_rBuffer.append( m_aNodeValue );
- _inout_rBuffer.append( sal_Unicode( '\n' ) );
+ _inout_rBuffer.append( '\n' );
break;
case SQL_NODE_NAME:
_inout_rBuffer.appendAscii( "SQL_NAME: " );
- _inout_rBuffer.append( sal_Unicode( '"' ) );
+ _inout_rBuffer.append( '"' );
_inout_rBuffer.append( m_aNodeValue );
- _inout_rBuffer.append( sal_Unicode( '"' ) );
- _inout_rBuffer.append( sal_Unicode( '\n' ) );
+ _inout_rBuffer.append( '"' );
+ _inout_rBuffer.append( '\n' );
break;
case SQL_NODE_STRING:
_inout_rBuffer.appendAscii( "SQL_STRING: " );
- _inout_rBuffer.append( sal_Unicode( '\'' ) );
+ _inout_rBuffer.append( '\'' );
_inout_rBuffer.append( m_aNodeValue );
- _inout_rBuffer.append( sal_Unicode( '\'' ) );
- _inout_rBuffer.append( sal_Unicode( '\n' ) );
+ _inout_rBuffer.append( '\'' );
+ _inout_rBuffer.append( '\n' );
break;
case SQL_NODE_INTNUM:
_inout_rBuffer.appendAscii( "SQL_INTNUM: " );
_inout_rBuffer.append( m_aNodeValue );
- _inout_rBuffer.append( sal_Unicode( '\n' ) );
+ _inout_rBuffer.append( '\n' );
break;
case SQL_NODE_APPROXNUM:
_inout_rBuffer.appendAscii( "SQL_APPROXNUM: " );
_inout_rBuffer.append( m_aNodeValue );
- _inout_rBuffer.append( sal_Unicode( '\n' ) );
+ _inout_rBuffer.append( '\n' );
break;
case SQL_NODE_PUNCTUATION:
_inout_rBuffer.appendAscii( "SQL_PUNCTUATION: " );
_inout_rBuffer.append( m_aNodeValue );
- _inout_rBuffer.append( sal_Unicode( '\n' ) );
+ _inout_rBuffer.append( '\n' );
break;
case SQL_NODE_AMMSC:
_inout_rBuffer.appendAscii( "SQL_AMMSC: " );
_inout_rBuffer.append( m_aNodeValue );
- _inout_rBuffer.append( sal_Unicode( '\n' ) );
+ _inout_rBuffer.append( '\n' );
break;
case SQL_NODE_EQUAL:
@@ -2373,24 +2373,24 @@ void OSQLParseNode::showParseTree( OUStringBuffer& _inout_rBuffer, sal_uInt32 nL
case SQL_NODE_GREATEQ:
case SQL_NODE_NOTEQUAL:
_inout_rBuffer.append( m_aNodeValue );
- _inout_rBuffer.append( sal_Unicode( '\n' ) );
+ _inout_rBuffer.append( '\n' );
break;
case SQL_NODE_ACCESS_DATE:
_inout_rBuffer.appendAscii( "SQL_ACCESS_DATE: " );
_inout_rBuffer.append( m_aNodeValue );
- _inout_rBuffer.append( sal_Unicode( '\n' ) );
+ _inout_rBuffer.append( '\n' );
break;
case SQL_NODE_DATE:
_inout_rBuffer.appendAscii( "SQL_DATE: " );
_inout_rBuffer.append( m_aNodeValue );
- _inout_rBuffer.append( sal_Unicode( '\n' ) );
+ _inout_rBuffer.append( '\n' );
break;
case SQL_NODE_CONCAT:
_inout_rBuffer.appendAscii( "||" );
- _inout_rBuffer.append( sal_Unicode( '\n' ) );
+ _inout_rBuffer.append( '\n' );
break;
default:
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index f8f3153..3b3c6a5 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -836,7 +836,7 @@ void MigrationImpl::copyConfig() {
i->first, RTL_TEXTENCODING_UTF8).getStr());
goto next;
}
- buf.append(sal_Unicode('/'));
+ buf.append('/');
buf.append(enc);
} while (n >= 0);
buf.appendAscii(".xcu");
diff --git a/editeng/qa/lookuptree/lookuptree_test.cxx b/editeng/qa/lookuptree/lookuptree_test.cxx
index 4722bb1..ab2f814 100644
--- a/editeng/qa/lookuptree/lookuptree_test.cxx
+++ b/editeng/qa/lookuptree/lookuptree_test.cxx
@@ -182,9 +182,9 @@ void LookupTreeTest::testLookupTree()
a->gotoNode( "ne" );
CPPUNIT_ASSERT_EQUAL( OUString("u"), a->suggestAutoCompletion() );
- a->advance( sal_Unicode('u') );
- a->advance( sal_Unicode('e') );
- a->advance( sal_Unicode('r') );
+ a->advance( 'u' );
+ a->advance( 'e' );
+ a->advance( 'r' );
a->insert();
CPPUNIT_ASSERT ( a->suggestAutoCompletion().isEmpty() );
@@ -201,7 +201,7 @@ void LookupTreeTest::testLookupTree()
OUString aQueryString = OStringToOUString( "H\xC3\xA4llo", RTL_TEXTENCODING_UTF8 );
a->insert( aQueryString );
a->returnToRoot();
- a->advance( sal_Unicode('H') );
+ a->advance( 'H' );
OUString aAutocompletedString = a->suggestAutoCompletion();
OUString aExpectedString = OStringToOUString( "\xC3\xA4llo", RTL_TEXTENCODING_UTF8 );
diff --git a/editeng/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx
index 7106ee4..b945521 100644
--- a/editeng/source/editeng/eehtml.cxx
+++ b/editeng/source/editeng/eehtml.cxx
@@ -178,7 +178,7 @@ void EditHTMLParser::NextToken( int nToken )
{
// Each token represents a single line.
maStyleSource.append(aToken);
- maStyleSource.append(sal_Unicode('\n'));
+ maStyleSource.append('\n');
}
break;
case HTML_TEXTTOKEN:
diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx
index 5e1e37f..1f23708 100644
--- a/editeng/source/items/bulitem.cxx
+++ b/editeng/source/items/bulitem.cxx
@@ -222,7 +222,7 @@ void SvxBulletItem::SetDefaults_Impl()
nStart = 1;
nStyle = BS_123;
nJustify = BJ_HLEFT | BJ_VCENTER;
- cSymbol = sal_Unicode(' ');
+ cSymbol = ' ';
nScale = 75;
}
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index 1394c07..8eb506a 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -165,7 +165,7 @@ SvxFieldData* SvxFieldData::Create(const uno::Reference<text::XTextContent>& xTe
if (!aPresentation.isEmpty())
aContent = aPresentation;
- sal_Int32 nPos = aContent.lastIndexOf(sal_Unicode(' '), 0);
+ sal_Int32 nPos = aContent.lastIndexOf(' ', 0);
if (nPos > 0)
{
aFirstName = aContent.copy(0, nPos);
@@ -1255,7 +1255,7 @@ OUString SvxDateTimeField::GetFormatted(
OUStringBuffer aBuf(aRet);
if (!aRet.isEmpty())
- aBuf.append(sal_Unicode(' '));
+ aBuf.append(' ');
aBuf.append(
SvxExtTimeField::GetFormatted(rTime, eTimeFormat, rFormatter, eLanguage));
diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx
index 40f0420..cd379cf 100644
--- a/editeng/source/items/svxfont.cxx
+++ b/editeng/source/items/svxfont.cxx
@@ -28,7 +28,7 @@
#include <editeng/svxfont.hxx>
#include <editeng/escapementitem.hxx>
-const sal_Unicode CH_BLANK = sal_Unicode(' '); // ' ' Space character
+const sal_Unicode CH_BLANK = ' '; // ' ' Space character
SvxFont::SvxFont()
diff --git a/editeng/source/items/xmlcnitm.cxx b/editeng/source/items/xmlcnitm.cxx
index d63487b..8cd6de2 100644
--- a/editeng/source/items/xmlcnitm.cxx
+++ b/editeng/source/items/xmlcnitm.cxx
@@ -132,7 +132,7 @@ bool SvXMLAttrContainerItem::PutValue( const com::sun::star::uno::Any& rVal, sal
return sal_False;
pData = (AttributeData*)aAny.getValue();
- sal_Int32 pos = aName.indexOf( sal_Unicode(':') );
+ sal_Int32 pos = aName.indexOf( ':' );
if( pos != -1 )
{
const OUString aPrefix( aName.copy( 0, pos ));
diff --git a/editeng/source/lookuptree/LatinLookupTree.cxx b/editeng/source/lookuptree/LatinLookupTree.cxx
index 0762044..cdc0a0b 100644
--- a/editeng/source/lookuptree/LatinLookupTree.cxx
+++ b/editeng/source/lookuptree/LatinLookupTree.cxx
@@ -146,8 +146,8 @@ void LatinLookupTree::clear()
bool LatinLookupTree::isSeparatedlyHandled(const sal_Unicode cKey) const
{
return
- ( cKey >= sal_Unicode('a') && cKey <= sal_Unicode('z') )
- || ( cKey >= sal_Unicode('A') && cKey <= sal_Unicode('Z') );
+ ( cKey >= 'a' && cKey <= 'z' )
+ || ( cKey >= 'A' && cKey <= 'Z' );
}
Node*& LatinLookupTree::getChildRef(const sal_Unicode cKey, bool bCreatePlaceholder)
@@ -155,11 +155,11 @@ Node*& LatinLookupTree::getChildRef(const sal_Unicode cKey, bool bCreatePlacehol
int pos = -1;
// determine position in array if possible
- if ( cKey >= sal_Unicode('a') && cKey <= sal_Unicode('z') )
+ if ( cKey >= 'a' && cKey <= 'z' )
{
pos = cKey - our_nLowerCaseA;
}
- else if ( cKey >= sal_Unicode('A') && cKey <= sal_Unicode('Z') )
+ else if ( cKey >= 'A' && cKey <= 'Z' )
{
pos = cKey - our_nUpperCaseA + 26;
}
diff --git a/editeng/source/lookuptree/LatinTreeNode.cxx b/editeng/source/lookuptree/LatinTreeNode.cxx
index b68e039..a7f10aa 100644
--- a/editeng/source/lookuptree/LatinTreeNode.cxx
+++ b/editeng/source/lookuptree/LatinTreeNode.cxx
@@ -36,13 +36,13 @@ LatinTreeNode::~LatinTreeNode()
bool LatinTreeNode::isSeparatedlyHandled(const sal_Unicode cKey) const
{
- return ( cKey >= sal_Unicode('a') && cKey <= sal_Unicode('z') );
+ return ( cKey >= 'a' && cKey <= 'z' );
}
Node*& LatinTreeNode::getChildRef(const sal_Unicode cKey, bool bCreatePlaceholder)
{
// determine position in array if possible
- if ( cKey >= sal_Unicode('a') && cKey <= sal_Unicode('z') )
+ if ( cKey >= 'a' && cKey <= 'z' )
{
return m_pLeaves[cKey - LatinLookupTree::our_nLowerCaseA];
}
diff --git a/editeng/source/lookuptree/Trie.cxx b/editeng/source/lookuptree/Trie.cxx
index 4fbc194..9314069 100644
--- a/editeng/source/lookuptree/Trie.cxx
+++ b/editeng/source/lookuptree/Trie.cxx
@@ -68,8 +68,8 @@ void TrieNode::markWord()
void TrieNode::addNewChild(TrieNode* pChild)
{
- if (pChild->mCharacter >= sal_Unicode('a') &&
- pChild->mCharacter <= sal_Unicode('z'))
+ if (pChild->mCharacter >= 'a' &&
+ pChild->mCharacter <= 'z')
{
mLatinArray[pChild->mCharacter - sal_Unicode('a')] = pChild;
}
@@ -81,8 +81,8 @@ void TrieNode::addNewChild(TrieNode* pChild)
TrieNode* TrieNode::findChild(sal_Unicode aInputCharacter)
{
- if (aInputCharacter >= sal_Unicode('a') &&
- aInputCharacter <= sal_Unicode('z'))
+ if (aInputCharacter >= 'a' &&
+ aInputCharacter <= 'z')
{
return mLatinArray[aInputCharacter - sal_Unicode('a')];
}
diff --git a/extensions/source/logging/loggerconfig.cxx b/extensions/source/logging/loggerconfig.cxx
index e00a386..0e3d19b 100644
--- a/extensions/source/logging/loggerconfig.cxx
+++ b/extensions/source/logging/loggerconfig.cxx
@@ -121,7 +121,7 @@ namespace logging
rtl::OUStringBuffer aBuff;
aBuff.append( sDate );
- aBuff.append( sal_Unicode( '.' ) );
+ aBuff.append( '.' );
aBuff.append( sTime );
rtl::OUString sDateTime = aBuff.makeStringAndClear();
diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx
index 8d826f8..6b157f9 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -228,7 +228,7 @@ namespace pcr
{
OUStringBuffer aPropertyName;
aPropertyName.append( _rListenerClassName );
- aPropertyName.append( (sal_Unicode)';' );
+ aPropertyName.append( ';' );
aPropertyName.append( _rMethodName.getStr() );
return aPropertyName.makeStringAndClear();
}
@@ -727,7 +727,7 @@ namespace pcr
aComposeBuffer.append( sLanguage );
}
- aComposeBuffer.append( sal_Unicode( ')' ) );
+ aComposeBuffer.append( ')' );
}
sScript = aComposeBuffer.makeStringAndClear();
diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx
index 2274ad5..9e842ce 100644
--- a/extensions/source/update/feed/updatefeed.cxx
+++ b/extensions/source/update/feed/updatefeed.cxx
@@ -334,7 +334,7 @@ UpdateInformationProvider::UpdateInformationProvider(
xConfigurationProvider,
"org.openoffice.Setup/Product",
"ooName"));
- buf.append(sal_Unicode(' '));
+ buf.append(' ');
buf.append(
getConfigurationItem(
xConfigurationProvider,
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 96f3423..d9f12c5 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -838,7 +838,7 @@ OUString implGenerateFieldId( std::vector< TextField* > & aFieldSet,
}
}
OUString sFieldId( sOOOElemField );
- sFieldId += OUString( sal_Unicode('_') );
+ sFieldId += OUString( '_' );
if( !bFound )
{
aFieldSet.push_back( new TextFieldType( aField ) );
@@ -920,7 +920,7 @@ sal_Bool SVGFilter::implGenerateMetaData()
Reference< XMasterPageTarget > xMasterPageTarget( xDrawPage, UNO_QUERY );
Reference< XDrawPage > xMasterPage( xMasterPageTarget->getMasterPage(), UNO_QUERY );
OUString aSlideId( aId );
- aSlideId += OUString( sal_Unicode('_') );
+ aSlideId += OUString( '_' );
aSlideId += OUString::number( i );
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", aSlideId );
diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
index cd4a393..b1c5916 100644
--- a/filter/source/svg/svgreader.cxx
+++ b/filter/source/svg/svgreader.cxx
@@ -400,15 +400,15 @@ struct AnnotatingVisitor
const sal_uInt8 nRed ( toByteColor(rColor.r) );
const sal_uInt8 nGreen( toByteColor(rColor.g) );
const sal_uInt8 nBlue ( toByteColor(rColor.b) );
- aBuf.append( sal_Unicode('#') );
+ aBuf.append( '#' );
if( nRed < 0x10 )
- aBuf.append( sal_Unicode('0') );
+ aBuf.append( '0' );
aBuf.append( sal_Int32(nRed), 16 );
if( nGreen < 0x10 )
- aBuf.append( sal_Unicode('0') );
+ aBuf.append( '0' );
aBuf.append( sal_Int32(nGreen), 16 );
if( nBlue < 0x10 )
- aBuf.append( sal_Unicode('0') );
+ aBuf.append( '0' );
aBuf.append( sal_Int32(nBlue), 16 );
// TODO(F3): respect alpha transparency (polygons etc.)
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index 4754ddc..dca5823 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -285,7 +285,7 @@ static Sequence< OUString > createExtensionsSequence( const OUString& rExtension
int i;
for( i = 0; i < nLength; i++, pString++ )
{
- if( *pString == sal_Unicode( ';' ) )
+ if( *pString == ';' )
nExtensions++;
}
}
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index dbb9235..250d54f 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -516,13 +516,13 @@ OUString ODatabaseForm::GetDataEncoded(bool _bURLEncoded,const Reference<XContro
Encode( aValue );
aResult.append(aName);
- aResult.append(sal_Unicode('='));
+ aResult.append('=');
aResult.append(aValue);
if (pSuccObj < aSuccObjList.end() - 1)
{
if ( _bURLEncoded )
- aResult.append(sal_Unicode('&'));
+ aResult.append('&');
else
aResult.appendAscii("\r\n");
}
@@ -602,7 +602,7 @@ namespace
sal_Int32 nCurLen = _rOut.getLength();
_rOut.append( _nNumber );
while ( _rOut.getLength() - nCurLen < nDigits )
- _rOut.insert( nCurLen, (sal_Unicode)'0' );
+ _rOut.insert( nCurLen, '0' );
}
}
@@ -794,9 +794,9 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc
::Date aDate( nInt32Val );
OUStringBuffer aBuffer;
appendDigits( aDate.GetMonth(), 2, aBuffer );
- aBuffer.append( (sal_Unicode)'-' );
+ aBuffer.append( '-' );
appendDigits( aDate.GetDay(), 2, aBuffer );
- aBuffer.append( (sal_Unicode)'-' );
+ aBuffer.append( '-' );
appendDigits( aDate.GetYear(), 4, aBuffer );
aText = aBuffer.makeStringAndClear();
}
@@ -817,9 +817,9 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc
::Time aTime(nInt32Val);
OUStringBuffer aBuffer;
appendDigits( aTime.GetHour(), 2, aBuffer );
- aBuffer.append( (sal_Unicode)'-' );
+ aBuffer.append( '-' );
appendDigits( aTime.GetMin(), 2, aBuffer );
- aBuffer.append( (sal_Unicode)'-' );
+ aBuffer.append( '-' );
appendDigits( aTime.GetSec(), 2, aBuffer );
aText = aBuffer.makeStringAndClear();
}
@@ -971,7 +971,7 @@ void ODatabaseForm::Encode( OUString& rString ) const
nCharCode = rString[nCurPos];
// Handle chars, which are not an alphanumeric character and character codes > 127
- if( (!isalnum(nCharCode) && nCharCode != (sal_Unicode)' ') || nCharCode > 127 )
+ if( (!isalnum(nCharCode) && nCharCode != ' ') || nCharCode > 127 )
{
switch( nCharCode )
{
diff --git a/forms/source/xforms/convert.cxx b/forms/source/xforms/convert.cxx
index 4bdfe21..47e1a57 100644
--- a/forms/source/xforms/convert.cxx
+++ b/forms/source/xforms/convert.cxx
@@ -235,7 +235,7 @@ namespace
{
rtl_math_ConversionStatus eStatus;
double f = rtl::math::stringToDouble(
- rString, sal_Unicode('.'), sal_Unicode(','), &eStatus, NULL );
+ rString, '.', ',', &eStatus, NULL );
return ( eStatus == rtl_math_ConversionStatus_Ok ) ? makeAny( f ) : Any();
}
@@ -243,11 +243,11 @@ namespace
void lcl_appendInt32ToBuffer( const sal_Int32 _nValue, OUStringBuffer& _rBuffer, sal_Int16 _nMinDigits )
{
if ( ( _nMinDigits >= 4 ) && ( _nValue < 1000 ) )
- _rBuffer.append( (sal_Unicode)'0' );
+ _rBuffer.append( '0' );
if ( ( _nMinDigits >= 3 ) && ( _nValue < 100 ) )
- _rBuffer.append( (sal_Unicode)'0' );
+ _rBuffer.append( '0' );
if ( ( _nMinDigits >= 2 ) && ( _nValue < 10 ) )
- _rBuffer.append( (sal_Unicode)'0' );
+ _rBuffer.append( '0' );
_rBuffer.append( _nValue );
}
diff --git a/forms/source/xforms/datatypes.cxx b/forms/source/xforms/datatypes.cxx
index a4f522e..f2fdb79 100644
--- a/forms/source/xforms/datatypes.cxx
+++ b/forms/source/xforms/datatypes.cxx
@@ -421,7 +421,7 @@ namespace xforms
rtl_math_ConversionStatus eStatus;
sal_Int32 nEnd;
double f = ::rtl::math::stringToDouble(
- rValue, sal_Unicode('.'), sal_Unicode(0), &eStatus, &nEnd );
+ rValue, '.', sal_Unicode(0), &eStatus, &nEnd );
// error checking...
bool bReturn = false;
@@ -691,13 +691,13 @@ namespace xforms
sal_Int32 nTotalDigits = 0;
sal_Int32 nFractionDigits = 0;
const sal_Unicode* pValue = rValue.getStr();
- for( ; pValue[n] != sal_Unicode('.') && n < nLength; n++ )
- if( pValue[n] >= sal_Unicode('0')
- && pValue[n] <= sal_Unicode('9'))
+ for( ; pValue[n] != '.' && n < nLength; n++ )
+ if( pValue[n] >= '0'
+ && pValue[n] <= '9')
nTotalDigits++;
for( ; n < nLength; n++ )
- if( pValue[n] >= sal_Unicode('0')
- && pValue[n] <= sal_Unicode('9'))
+ if( pValue[n] >= '0'
+ && pValue[n] <= '9')
nFractionDigits++;
nTotalDigits += nFractionDigits;
diff --git a/forms/source/xforms/model_ui.cxx b/forms/source/xforms/model_ui.cxx
index 281638e..5a1124e 100644
--- a/forms/source/xforms/model_ui.cxx
+++ b/forms/source/xforms/model_ui.cxx
@@ -152,9 +152,9 @@ static void lcl_OutPosition( OUStringBuffer& rBuffer,
// output position (if necessary)
if( nFound > 1 )
{
- rBuffer.insert( 0, sal_Unicode(']') );
+ rBuffer.insert( 0, ']' );
rBuffer.insert( 0, nPosition );
- rBuffer.insert( 0, sal_Unicode('[') );
+ rBuffer.insert( 0, '[' );
}
}
@@ -165,7 +165,7 @@ static void lcl_OutName( OUStringBuffer& rBuffer,
OUString sPrefix = xNode->getPrefix();
if( !sPrefix.isEmpty() )
{
- rBuffer.insert( 0, sal_Unicode(':') );
+ rBuffer.insert( 0, ':' );
rBuffer.insert( 0, sPrefix );
}
}
@@ -220,7 +220,7 @@ OUString Model::getDefaultBindingExpressionForNode(
{
// insert a '/' for every step except the first
if( !aBuffer.isEmpty() )
- aBuffer.insert( 0, sal_Unicode('/') );
+ aBuffer.insert( 0, '/' );
switch( xCurrent->getNodeType() )
{
@@ -236,7 +236,7 @@ OUString Model::getDefaultBindingExpressionForNode(
case NodeType_ATTRIBUTE_NODE:
lcl_OutName( aBuffer, xCurrent );
- aBuffer.insert( 0, sal_Unicode('@') );
+ aBuffer.insert( 0, '@' );
break;
case NodeType_DOCUMENT_NODE:
@@ -250,7 +250,7 @@ OUString Model::getDefaultBindingExpressionForNode(
xCurrent.set( NULL );
aBuffer.makeStringAndClear();
// we'll remove the slash below
- aBuffer.insert( 0, sal_Unicode('/') );
+ aBuffer.insert( 0, '/' );
break;
}
}
@@ -307,12 +307,12 @@ OUString Model::getNodeDisplayName( const XNode_t& xNode,
case NodeType_ATTRIBUTE_NODE:
lcl_OutName( aBuffer, xNode );
- aBuffer.insert( 0, sal_Unicode('@') );
+ aBuffer.insert( 0, '@' );
break;
case NodeType_DOCUMENT_NODE:
if( xNode == getDefaultInstance() )
- aBuffer.append( sal_Unicode('/') );
+ aBuffer.append( '/' );
else
lcl_OutInstance( aBuffer, xNode, this );
break;
@@ -846,7 +846,7 @@ static OUString lcl_serializeForDisplay( const Reference<XNodeList>& xNodes )
&& !sLine.startsWith( "<?xml" ) )
{
aBuffer.append( sLine );
- aBuffer.append( sal_Unicode('\n') );
+ aBuffer.append( '\n' );
}
}
sResult = aBuffer.makeStringAndClear();
@@ -929,7 +929,7 @@ OUString Model::getResultForExpression(
{
aExpression.evaluate( *aIter );
aBuffer.append( lcl_serializeForDisplay(aExpression.getXPath()) );
- aBuffer.append( sal_Unicode('\n') );
+ aBuffer.append( '\n' );
}
}
return aBuffer.makeStringAndClear();
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index d099042..c42ee06 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -1724,7 +1724,7 @@ void FormulaCompiler::CreateStringFromTokenArray( OUStringBuffer& rBuffer )
rBuffer.ensureCapacity( pArr->GetLen() * 5 );
if ( pArr->IsRecalcModeForced() )
- rBuffer.append( sal_Unicode('='));
+ rBuffer.append( '=');
FormulaToken* t = pArr->First();
while( t )
t = CreateStringFromToken( rBuffer, t, true );
@@ -1761,7 +1761,7 @@ FormulaToken* FormulaCompiler::CreateStringFromToken( OUStringBuffer& rBuffer, F
bSpaces = ( !t || t->GetOpCode() != ocOpen );
}
if( bSpaces )
- rBuffer.append( sal_Unicode(' '));
+ rBuffer.append( ' ');
if( eOp == ocSpaces )
{
@@ -1784,7 +1784,7 @@ FormulaToken* FormulaCompiler::CreateStringFromToken( OUStringBuffer& rBuffer, F
sal_uInt8 n = t->GetByte();
for ( sal_uInt8 j=0; j<n; ++j )
{
- rBuffer.append( sal_Unicode(' '));
+ rBuffer.append( ' ');
}
}
}
@@ -1864,7 +1864,7 @@ FormulaToken* FormulaCompiler::CreateStringFromToken( OUStringBuffer& rBuffer, F
}
}
if( bSpaces )
- rBuffer.append( sal_Unicode(' '));
+ rBuffer.append( ' ');
if ( bAllowArrAdvance )
{
if( bNext )
@@ -1901,7 +1901,7 @@ void FormulaCompiler::AppendBoolean( OUStringBuffer& rBuffer, bool bVal )
void FormulaCompiler::AppendString( OUStringBuffer& rBuffer, const OUString & rStr )
{
- rBuffer.append( sal_Unicode('"'));
+ rBuffer.append( '"');
if ( lcl_UnicodeStrChr( rStr.getStr(), '"' ) == NULL )
rBuffer.append( rStr );
else
@@ -1909,7 +1909,7 @@ void FormulaCompiler::AppendString( OUStringBuffer& rBuffer, const OUString & rS
OUString aStr = rStr.replaceAll( "\"", "\"\"" );
rBuffer.append(aStr);
}
- rBuffer.append( sal_Unicode('"'));
+ rBuffer.append( '"');
}
void FormulaCompiler::UpdateSeparatorsNative(
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 379df0d..f35ca3b 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -177,7 +177,7 @@ namespace
{
const sal_Unicode* p0 = rFile.getStr();
const sal_Unicode* p1 = p0 + rFile.getLength() - 1;
- while ( p1 >= p0 && *p1 != sal_Unicode( '.' ) )
+ while ( p1 >= p0 && *p1 != '.' )
p1--;
if ( p1 >= p0 )
// remove old extension
diff --git a/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx
index b9c27a8..971f8c6 100644
--- a/framework/source/services/urltransformer.cxx
+++ b/framework/source/services/urltransformer.cxx
@@ -85,12 +85,12 @@ namespace
OUStringBuffer aPath;
for ( sal_Int32 nIndex = 0; nIndex < nCount; nIndex++ )
{
- aPath.append( sal_Unicode( '/' ));
+ aPath.append( '/');
aPath.append( _rParser.getName( nIndex, false, INetURLObject::NO_DECODE ));
}
if ( nCount > 0 )
- aPath.append( sal_Unicode( '/' )); // final slash!
+ aPath.append( '/' ); // final slash!
_rURL.Path = aPath.makeStringAndClear();
_rURL.Name = _rParser.getName( INetURLObject::LAST_SEGMENT, false, INetURLObject::NO_DECODE );
@@ -128,7 +128,7 @@ sal_Bool SAL_CALL URLTransformer::parseStrict( URL& aURL ) throw( RuntimeExcepti
return sal_False;
}
// Try to extract the protocol
- sal_Int32 nURLIndex = aURL.Complete.indexOf( sal_Unicode( ':' ));
+ sal_Int32 nURLIndex = aURL.Complete.indexOf( ':' );
OUString aProtocol;
if ( nURLIndex > 1 )
{
@@ -200,7 +200,7 @@ sal_Bool SAL_CALL URLTransformer::parseSmart( URL& aURL
if ( INetURLObject::CompareProtocolScheme( sSmartProtocol ) == INET_PROT_NOT_VALID )
{
// Try to extract the protocol
- sal_Int32 nIndex = aURL.Complete.indexOf( sal_Unicode( ':' ));
+ sal_Int32 nIndex = aURL.Complete.indexOf( ':' );
OUString aProtocol;
if ( nIndex > 1 )
{
@@ -244,12 +244,12 @@ sal_Bool SAL_CALL URLTransformer::assemble( URL& aURL ) throw( RuntimeException
// Concat the name if it is provided, just support a final slash
if ( !aURL.Name.isEmpty() )
{
- sal_Int32 nIndex = aURL.Path.lastIndexOf( sal_Unicode('/') );
+ sal_Int32 nIndex = aURL.Path.lastIndexOf( '/' );
if ( nIndex == ( aURL.Path.getLength() -1 ))
aCompletePath.append( aURL.Name );
else
{
- aCompletePath.append( sal_Unicode( '/' ) );
+ aCompletePath.append( '/' );
aCompletePath.append( aURL.Name );
}
}
diff --git a/i18npool/source/indexentry/genindex_data.cxx b/i18npool/source/indexentry/genindex_data.cxx
index 03bdd4e..f3fa9c6 100644
--- a/i18npool/source/indexentry/genindex_data.cxx
+++ b/i18npool/source/indexentry/genindex_data.cxx
@@ -49,7 +49,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
sal_Int32 i, j, k;
sal_Int32 address[MAX_ADDRESS];
for (i=0; i<MAX_ADDRESS; i++) address[i]=-1;
- OUString sep=OUString(sal_Unicode('|'));
+ OUString sep=OUString('|');
OUString result=sep;
sal_Int32 max=0;
diff --git a/i18npool/source/indexentry/indexentrysupplier_default.cxx b/i18npool/source/indexentry/indexentrysupplier_default.cxx
index cb54e22..8edd4b2 100644
--- a/i18npool/source/indexentry/indexentrysupplier_default.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier_default.cxx
@@ -180,7 +180,7 @@ void Index::makeIndexKeys(const lang::Locale &rLocale, const OUString &algorithm
for (i = 0; i < len && key_count < MAX_KEYS; i++)
{
sal_Unicode curr = keyStr[i];
- sal_Unicode close = sal_Unicode(')');
+ sal_Unicode close = ')';
if (unicode::isWhiteSpace(curr))
continue;
@@ -196,10 +196,10 @@ void Index::makeIndexKeys(const lang::Locale &rLocale, const OUString &algorithm
throw RuntimeException();
break;
case sal_Unicode('['):
- for (i++; i < len && keyStr[i] != sal_Unicode(']'); i++) {
+ for (i++; i < len && keyStr[i] != ']'; i++) {
if (unicode::isWhiteSpace(keyStr[i])) {
continue;
- } else if (keyStr[i] == sal_Unicode('_')) {
+ } else if (keyStr[i] == '_') {
for (curr=keyStr[i-1]+1; curr <= keyStr[i+1]; curr++)
skipping_chars+=OUString(curr);
i+=2;
@@ -209,7 +209,7 @@ void Index::makeIndexKeys(const lang::Locale &rLocale, const OUString &algorithm
}
break;
case sal_Unicode('{'):
- close = sal_Unicode('}');
+ close = '}';
case sal_Unicode('('):
if (key_count > 0) {
sal_Int16 end = i+1;
@@ -217,7 +217,7 @@ void Index::makeIndexKeys(const lang::Locale &rLocale, const OUString &algorithm
if (end >= len) // no found
throw RuntimeException();
- if (close == sal_Unicode(')'))
+ if (close == ')')
keys[key_count-1].desc = keyStr.copy(i+1, end-i-1);
else {
mkeys[mkey_count++]=key_count;
diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx
index ff4ce97..2e1043a 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -713,7 +713,7 @@ void LCFormatNode::generateCode (const OFileWriter &of) const
// Ensure only one default per usage and type.
if (bDefault)
{
- OUString aKey( aUsage + OUString( sal_Unicode(',')) + aType);
+ OUString aKey( aUsage + OUString( ',') + aType);
if (!aDefaultsSet.insert( aKey).second)
{
OUString aStr( "Duplicated default for usage=\"");
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index b621737..a8a6d3f 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -294,8 +294,8 @@ static const struct {
#endif
-static const sal_Unicode cUnder = sal_Unicode('_');
-static const sal_Unicode cHyphen = sal_Unicode('-');
+static const sal_Unicode cUnder = '_';
+static const sal_Unicode cHyphen = '-';
static const sal_Int16 nbOfLocales = SAL_N_ELEMENTS(aLibTable);
diff --git a/i18npool/source/textconversion/genconv_dict.cxx b/i18npool/source/textconversion/genconv_dict.cxx
index 77a676f..fbd6b0e 100644
--- a/i18npool/source/textconversion/genconv_dict.cxx
+++ b/i18npool/source/textconversion/genconv_dict.cxx
@@ -193,7 +193,7 @@ void make_stc_char(FILE *sfp, FILE *cfp)
OUString Ostr((const sal_Char *)Cstr, strlen(Cstr) - 1, RTL_TEXTENCODING_UTF8);
const sal_Unicode *Ustr = Ostr.getStr();
sal_Int32 len = Ostr.getLength();
- if (Ustr[1] == sal_Unicode('v'))
+ if (Ustr[1] == 'v')
SChinese2VChineseData[Ustr[0]] = Ustr[2];
else {
SChinese2TChineseData[Ustr[0]] = Ustr[2];
@@ -363,9 +363,9 @@ void make_stc_word(FILE *sfp, FILE *cfp)
return;
}
sal_Int32 sep=-1, eq=-1, gt=-1, lt=-1;
- if (((sep = eq = Ostr.indexOf(sal_Unicode('='))) > 0) ||
- ((sep = gt = Ostr.indexOf(sal_Unicode('>'))) > 0) ||
- ((sep = lt = Ostr.indexOf(sal_Unicode('<'))) > 0)) {
+ if (((sep = eq = Ostr.indexOf('=')) > 0) ||
+ ((sep = gt = Ostr.indexOf('>')) > 0) ||
+ ((sep = lt = Ostr.indexOf('<')) > 0)) {
if (eq > 0 || gt > 0) {
STC_WordEntry_S2T[count_S2T].address = sal::static_int_cast<sal_uInt16>( char_total );
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
index c9428f1..63cda19 100644
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
@@ -674,7 +674,7 @@ Reference< XPossibleHyphens > SAL_CALL Hyphenator::createPossibleHyphens( const
if (hyphens[i]&1 && (!rep || !rep[i]))
{
pPos[nHyphCount] = i;
- hyphenatedWordBuffer.append(sal_Unicode('='));
+ hyphenatedWordBuffer.append('=');
nHyphCount++;
}
}
diff --git a/lingucomponent/source/lingutil/lingutil.cxx b/lingucomponent/source/lingutil/lingutil.cxx
index 8c4e04f..c0ef851 100644
--- a/lingucomponent/source/lingutil/lingutil.cxx
+++ b/lingucomponent/source/lingutil/lingutil.cxx
@@ -139,7 +139,7 @@ std::vector< SvtLinguConfigDictionaryEntry > GetOldStyleDics( const char *pDicTy
OUString sPath = aFileStatus.getFileURL();
if (sPath.endsWith(aSystemSuffix))
{
- sal_Int32 nStartIndex = sPath.lastIndexOf(sal_Unicode('/')) + 1;
+ sal_Int32 nStartIndex = sPath.lastIndexOf('/') + 1;
if (!sPath.match(aSystemPrefix, nStartIndex))
continue;
OUString sChunk = sPath.copy(nStartIndex + aSystemPrefix.getLength(),
diff --git a/lotuswordpro/source/filter/lwptools.cxx b/lotuswordpro/source/filter/lwptools.cxx
index ea5a6e7..a87fb16 100644
--- a/lotuswordpro/source/filter/lwptools.cxx
+++ b/lotuswordpro/source/filter/lwptools.cxx
@@ -162,7 +162,7 @@ sal_uInt16 LwpTools::QuickReadUnicode(LwpObjectStream* pObjStrm,
flag = sal_False;
if(sublen)
{
- unibuf[sublen] = sal_Unicode('\0');
+ unibuf[sublen] = '\0';
strBuf.append( OUString(unibuf) );
sublen = 0;
}
@@ -173,7 +173,7 @@ sal_uInt16 LwpTools::QuickReadUnicode(LwpObjectStream* pObjStrm,
}
if(sublen>=1023 || readLen==strlen)
{
- unibuf[sublen] = sal_Unicode('\0');
+ unibuf[sublen] = '\0';
strBuf.append( OUString(unibuf) );
sublen = 0;
}
diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx
index ede0a63..8816cb2 100644
--- a/mysqlc/source/mysqlc_connection.cxx
+++ b/mysqlc/source/mysqlc_connection.cxx
@@ -660,7 +660,7 @@ OUString OConnection::getMysqlVariable(const char *varname)
OUStringBuffer aStatement;
aStatement.appendAscii( "SHOW SESSION VARIABLES LIKE '" );
aStatement.appendAscii( varname );
- aStatement.append( sal_Unicode( '\'' ) );
+ aStatement.append( '\'' );
try {
XStatement * stmt = new OStatement(this, m_settings.cppConnection->createStatement());
diff --git a/mysqlc/source/mysqlc_resultsetmetadata.cxx b/mysqlc/source/mysqlc_resultsetmetadata.cxx
index 0d0c273..0369842 100644
--- a/mysqlc/source/mysqlc_resultsetmetadata.cxx
+++ b/mysqlc/source/mysqlc_resultsetmetadata.cxx
@@ -440,7 +440,7 @@ void OResultSetMetaData::checkColumnIndex(sal_Int32 columnIndex)
buf.append( sal_Int32( meta->getColumnCount() ) );
buf.appendAscii( ", got " );
buf.append( sal_Int32( columnIndex ) );
- buf.append( sal_Unicode( '.' ) );
+ buf.append( '.' );
throw SQLException( buf.makeStringAndClear(), *this, OUString(), 1, Any() );
}
}
diff --git a/padmin/source/adddlg.cxx b/padmin/source/adddlg.cxx
index 1ac7294..379d73c 100644
--- a/padmin/source/adddlg.cxx
+++ b/padmin/source/adddlg.cxx
@@ -268,7 +268,7 @@ IMPL_LINK( APChooseDriverPage, ClickBtnHdl, PushButton*, pButton )
::std::list< OUString > aFiles;
::std::list< OUString >::iterator file;
OUStringBuffer aDir( *dir );
- aDir.append( sal_Unicode( '/' ) );
+ aDir.append( '/' );
aDir.appendAscii( PRINTER_PPDDIR );
OUString aPPDDir( aDir.makeStringAndClear() );
FindFiles( aPPDDir, aFiles, OUString( "PS;PPD;PS.GZ;PPD.GZ" ), true );
diff --git a/registry/source/keyimpl.cxx b/registry/source/keyimpl.cxx
index 36d6cae..ae9605e 100644
--- a/registry/source/keyimpl.cxx
+++ b/registry/source/keyimpl.cxx
@@ -1051,7 +1051,7 @@ OUString ORegKey::getFullPath(OUString const & path) const {
}
} else {
if (path[0] != '/') {
- b.append(sal_Unicode('/'));
+ b.append('/');
}
b.append(path);
}
diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
index 7f10693..6e91557 100644
--- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
@@ -53,7 +53,7 @@ OUString lcl_createAttribute(const xmloff::token::XMLTokenEnum& _eNamespace,cons
OUStringBuffer sQName;
// ...if it's in our map, make the prefix
sQName.append ( xmloff::token::GetXMLToken(_eNamespace) );
- sQName.append ( sal_Unicode(':') );
+ sQName.append ( ':' );
sQName.append ( xmloff::token::GetXMLToken(_eAttribute) );
return sQName.makeStringAndClear();
}
diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
index 418557e..ddad2e3 100644
--- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
@@ -170,7 +170,7 @@ void SAL_CALL ImportDocumentHandler::startElement(const OUString & _sName, const
{
OUString sLocalName;
const OUString sAttrName = _xAttrList->getNameByIndex( i );
- const sal_Int32 nColonPos = sAttrName.indexOf( sal_Unicode(':') );
+ const sal_Int32 nColonPos = sAttrName.indexOf( ':' );
if( -1L == nColonPos )
sLocalName = sAttrName;
else
@@ -221,7 +221,7 @@ void SAL_CALL ImportDocumentHandler::startElement(const OUString & _sName, const
{
OUString sLocalName;
const OUString sAttrName = _xAttrList->getNameByIndex( i );
- const sal_Int32 nColonPos = sAttrName.indexOf( sal_Unicode(':') );
+ const sal_Int32 nColonPos = sAttrName.indexOf( ':' );
if( -1L == nColonPos )
sLocalName = sAttrName;
else
@@ -266,7 +266,7 @@ void SAL_CALL ImportDocumentHandler::startElement(const OUString & _sName, const
{
OUString sLocalName;
const OUString sAttrName = _xAttrList->getNameByIndex( i );
- const sal_Int32 nColonPos = sAttrName.indexOf( sal_Unicode(':') );
+ const sal_Int32 nColonPos = sAttrName.indexOf( ':' );
if( -1L == nColonPos )
sLocalName = sAttrName;
else
diff --git a/reportdesign/source/ui/misc/FunctionHelper.cxx b/reportdesign/source/ui/misc/FunctionHelper.cxx
index 19ce7b8..0b8ed51 100644
--- a/reportdesign/source/ui/misc/FunctionHelper.cxx
+++ b/reportdesign/source/ui/misc/FunctionHelper.cxx
@@ -38,15 +38,15 @@ sal_Unicode FunctionManager::getSingleToken(const formula::IFunctionManager::ETo
switch(_eToken)
{
case eOk:
- return sal_Unicode('(');
+ return '(';
case eClose:
- return sal_Unicode(')');
+ return ')';
case eSep:
- return sal_Unicode(';');
+ return ';';
case eArrayOpen:
- return sal_Unicode('{');
+ return '{';
case eArrayClose:
- return sal_Unicode('}');
+ return '}';
}
return 0;
}
diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx
index 6d1694d..dab4d99 100644
--- a/sal/osl/unx/process_impl.cxx
+++ b/sal/osl/unx/process_impl.cxx
@@ -241,7 +241,7 @@ void SAL_CALL osl_setCommandArgs (int argc, char ** argv)
{
#if !defined(ANDROID) && !defined(IOS) // No use searching PATH on Android or iOS
/* see @ osl_getExecutableFile(). */
- if (rtl_ustr_indexOfChar (rtl_uString_getStr(ppArgs[0]), sal_Unicode('/')) == -1)
+ if (rtl_ustr_indexOfChar (rtl_uString_getStr(ppArgs[0]), '/') == -1)
{
const rtl::OUString PATH ("PATH");
diff --git a/sal/qa/rtl/math/test-rtl-math.cxx b/sal/qa/rtl/math/test-rtl-math.cxx
index c0ccaaa..13b936e 100644
--- a/sal/qa/rtl/math/test-rtl-math.cxx
+++ b/sal/qa/rtl/math/test-rtl-math.cxx
@@ -55,7 +55,7 @@ public:
sal_Int32 end;
double res = rtl::math::stringToDouble(
rtl::OUString(" +1.E01foo"),
- sal_Unicode('.'), sal_Unicode(','), &status, &end);
+ '.', ',', &status, &end);
CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
CPPUNIT_ASSERT_EQUAL(sal_Int32(RTL_CONSTASCII_LENGTH(" +1.E01")), end);
CPPUNIT_ASSERT_EQUAL(10.0, res);
@@ -66,7 +66,7 @@ public:
sal_Int32 end;
double res = rtl::math::stringToDouble(
rtl::OUString(" +Efoo"),
- sal_Unicode('.'), sal_Unicode(','), &status, &end);
+ '.', ',', &status, &end);
CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), end);
CPPUNIT_ASSERT_EQUAL(0.0, res);
@@ -77,13 +77,13 @@ public:
sal_Int32 end;
double res = rtl::math::stringToDouble(
rtl::OUString("1e"),
- sal_Unicode('.'), sal_Unicode(','), &status, &end);
+ '.', ',', &status, &end);
CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
CPPUNIT_ASSERT_EQUAL(sal_Int32(RTL_CONSTASCII_LENGTH("1")), end);
CPPUNIT_ASSERT_EQUAL(1.0, res);
res = rtl::math::stringToDouble(
rtl::OUString("0e"),
- sal_Unicode('.'), sal_Unicode(','), &status, &end);
+ '.', ',', &status, &end);
CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
CPPUNIT_ASSERT_EQUAL(sal_Int32(RTL_CONSTASCII_LENGTH("1")), end);
CPPUNIT_ASSERT_EQUAL(0.0, res);
diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx
index a4169b3..3826a2b 100644
--- a/sal/rtl/bootstrap.cxx
+++ b/sal/rtl/bootstrap.cxx
@@ -889,7 +889,7 @@ void rtl_bootstrap_encode( rtl_uString const * value, rtl_uString ** encoded )
for (sal_Int32 i = 0; i < value->length; ++i) {
sal_Unicode c = value->buffer[i];
if (c == '$' || c == '\\') {
- b.append(sal_Unicode('\\'));
+ b.append('\\');
}
b.append(c);
}
diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx
index ddade74..5d64a10 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -759,7 +759,7 @@ OUString lclGetErrorMessage( XML_Error xmlE, const OUString& sSystemId, sal_Int3
default:;
}
- OUStringBuffer aBuffer( sal_Unicode( '[' ) );
+ OUStringBuffer aBuffer( '[' );
aBuffer.append( sSystemId );
aBuffer.append( " line " );
aBuffer.append( nLine );
diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
index 6d8f80f..a2b3dd0 100644
--- a/sax/source/tools/converter.cxx
+++ b/sax/source/tools/converter.cxx
@@ -64,10 +64,10 @@ bool Converter::convertMeasure( sal_Int32& rValue,
sal_Int32 const nLen = rString.getLength();
// skip white space
- while( (nPos < nLen) && (rString[nPos] <= sal_Unicode(' ')) )
+ while( (nPos < nLen) && (rString[nPos] <= ' ') )
nPos++;
- if( nPos < nLen && sal_Unicode('-') == rString[nPos] )
+ if( nPos < nLen && '-' == rString[nPos] )
{
bNeg = true;
nPos++;
@@ -75,32 +75,32 @@ bool Converter::convertMeasure( sal_Int32& rValue,
// get number
while( nPos < nLen &&
- sal_Unicode('0') <= rString[nPos] &&
- sal_Unicode('9') >= rString[nPos] )
+ '0' <= rString[nPos] &&
+ '9' >= rString[nPos] )
{
// TODO: check overflow!
nVal *= 10;
- nVal += (rString[nPos] - sal_Unicode('0'));
+ nVal += (rString[nPos] - '0');
nPos++;
}
double nDiv = 1.;
- if( nPos < nLen && sal_Unicode('.') == rString[nPos] )
+ if( nPos < nLen && '.' == rString[nPos] )
{
nPos++;
while( nPos < nLen &&
- sal_Unicode('0') <= rString[nPos] &&
- sal_Unicode('9') >= rString[nPos] )
+ '0' <= rString[nPos] &&
+ '9' >= rString[nPos] )
{
// TODO: check overflow!
nDiv *= 10;
- nVal += ( ((double)(rString[nPos] - sal_Unicode('0'))) / nDiv );
+ nVal += ( ((double)(rString[nPos] - '0')) / nDiv );
nPos++;
}
}
// skip white space
- while( (nPos < nLen) && (rString[nPos] <= sal_Unicode(' ')) )
+ while( (nPos < nLen) && (rString[nPos] <= ' ') )
nPos++;
if( nPos < nLen )
@@ -108,16 +108,16 @@ bool Converter::convertMeasure( sal_Int32& rValue,
if( MeasureUnit::PERCENT == nTargetUnit )
{
- if( sal_Unicode('%') != rString[nPos] )
+ if( '%' != rString[nPos] )
return false;
}
else if( MeasureUnit::PIXEL == nTargetUnit )
{
if( nPos + 1 >= nLen ||
- (sal_Unicode('p') != rString[nPos] &&
- sal_Unicode('P') != rString[nPos])||
- (sal_Unicode('x') != rString[nPos+1] &&
- sal_Unicode('X') != rString[nPos+1]) )
+ ('p' != rString[nPos] &&
+ 'P' != rString[nPos])||
+ ('x' != rString[nPos+1] &&
+ 'X' != rString[nPos+1]) )
return false;
}
else
@@ -269,7 +269,7 @@ void Converter::convertMeasure( OUStringBuffer& rBuffer,
"MeasureUnit::PERCENT only maps to MeasureUnit::PERCENT!" );
rBuffer.append( nMeasure );
- rBuffer.append( sal_Unicode('%' ) );
+ rBuffer.append( '%' );
return;
}
@@ -277,7 +277,7 @@ void Converter::convertMeasure( OUStringBuffer& rBuffer,
if( nMeasure < 0 )
{
nMeasure = -nMeasure;
- rBuffer.append( sal_Unicode('-') );
+ rBuffer.append( '-' );
}
// The new length is (nVal * nMul)/(nDiv*nFac*10)
@@ -402,7 +402,7 @@ void Converter::convertMeasure( OUStringBuffer& rBuffer,
rBuffer.append( static_cast<sal_Int64>(nValue / nFac) );
if (nFac > 1 && (nValue % nFac) != 0)
{
- rBuffer.append( sal_Unicode('.') );
+ rBuffer.append( '.' );
while (nFac > 1 && (nValue % nFac) != 0)
{
nFac /= 10;
@@ -450,7 +450,7 @@ bool Converter::convertPercent( sal_Int32& rPercent, const OUString& rString )
void Converter::convertPercent( OUStringBuffer& rBuffer, sal_Int32 nValue )
{
rBuffer.append( nValue );
- rBuffer.append( sal_Unicode('%' ) );
+ rBuffer.append( '%' );
}
/** convert string to pixel measure */
@@ -463,8 +463,8 @@ bool Converter::convertMeasurePx( sal_Int32& rPixel, const OUString& rString )
void Converter::convertMeasurePx( OUStringBuffer& rBuffer, sal_Int32 nValue )
{
rBuffer.append( nValue );
- rBuffer.append( sal_Unicode('p' ) );
- rBuffer.append( sal_Unicode('x' ) );
+ rBuffer.append( 'p' );
+ rBuffer.append( 'x' );
}
int lcl_gethex( int nChar )
@@ -501,7 +501,7 @@ static const sal_Char aHexTab[] = "0123456789abcdef";
/** convert color to string */
void Converter::convertColor( OUStringBuffer& rBuffer, sal_Int32 nColor )
{
- rBuffer.append( sal_Unicode( '#' ) );
+ rBuffer.append( '#' );
sal_uInt8 nCol = (sal_uInt8)(nColor >> 16);
rBuffer.append( sal_Unicode( aHexTab[ nCol >> 4 ] ) );
@@ -547,10 +547,10 @@ bool Converter::convertNumber64( sal_Int64& rValue,
sal_Int32 const nLen = rString.getLength();
// skip white space
- while( (nPos < nLen) && (rString[nPos] <= sal_Unicode(' ')) )
+ while( (nPos < nLen) && (rString[nPos] <= ' ') )
nPos++;
- if( nPos < nLen && sal_Unicode('-') == rString[nPos] )
+ if( nPos < nLen && '-' == rString[nPos] )
{
bNeg = true;
nPos++;
@@ -558,8 +558,8 @@ bool Converter::convertNumber64( sal_Int64& rValue,
// get number
while( nPos < nLen &&
- sal_Unicode('0') <= rString[nPos] &&
- sal_Unicode('9') >= rString[nPos] )
+ '0' <= rString[nPos] &&
+ '9' >= rString[nPos] )
{
// TODO: check overflow!
rValue *= 10;
@@ -590,7 +590,7 @@ void Converter::convertDouble( OUStringBuffer& rBuffer,
OSL_ENSURE( nTargetUnit == MeasureUnit::PERCENT, "MeasureUnit::PERCENT only maps to MeasureUnit::PERCENT!" );
::rtl::math::doubleToUStringBuffer( rBuffer, fNumber, rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, '.', true);
if(bWriteUnits)
- rBuffer.append(sal_Unicode('%'));
+ rBuffer.append('%');
}
else
{
@@ -615,7 +615,7 @@ bool Converter::convertDouble(double& rValue,
const OUString& rString, sal_Int16 nSourceUnit, sal_Int16 nTargetUnit)
{
rtl_math_ConversionStatus eStatus;
- rValue = ::rtl::math::stringToDouble( rString, (sal_Unicode)('.'), (sal_Unicode)(','), &eStatus, NULL );
+ rValue = ::rtl::math::stringToDouble( rString, '.', ',', &eStatus, NULL );
if(eStatus == rtl_math_ConversionStatus_Ok)
{
@@ -634,7 +634,7 @@ bool Converter::convertDouble(double& rValue,
bool Converter::convertDouble(double& rValue, const OUString& rString)
{
rtl_math_ConversionStatus eStatus;
- rValue = ::rtl::math::stringToDouble( rString, (sal_Unicode)('.'), (sal_Unicode)(','), &eStatus, NULL );
+ rValue = ::rtl::math::stringToDouble( rString, '.', ',', &eStatus, NULL );
return ( eStatus == rtl_math_ConversionStatus_Ok );
}
@@ -648,7 +648,7 @@ void Converter::convertDuration(OUStringBuffer& rBuffer,
// XML Schema, W3C Working Draft 07 April 2000, section 3.2.6.1
if (fValue < 0.0)
{
- rBuffer.append(sal_Unicode('-'));
+ rBuffer.append('-');
fValue = - fValue;
}
@@ -685,15 +685,15 @@ void Converter::convertDuration(OUStringBuffer& rBuffer,
}
if (fHoursValue < 10)
- rBuffer.append( sal_Unicode('0'));
+ rBuffer.append( '0');
rBuffer.append( sal_Int32( fHoursValue));
- rBuffer.append( sal_Unicode('H'));
+ rBuffer.append( 'H');
if (fMinsValue < 10)
- rBuffer.append( sal_Unicode('0'));
+ rBuffer.append( '0');
rBuffer.append( sal_Int32( fMinsValue));
- rBuffer.append( sal_Unicode('M'));
+ rBuffer.append( 'M');
if (fSecsValue < 10)
- rBuffer.append( sal_Unicode('0'));
+ rBuffer.append( '0');
rBuffer.append( sal_Int32( fSecsValue));
if (fNanoSecsValue > 0.0)
{
@@ -702,11 +702,11 @@ void Converter::convertDuration(OUStringBuffer& rBuffer,
true));
if ( aNS.getLength() > 2 )
{
- rBuffer.append( sal_Unicode('.'));
+ rBuffer.append( '.');
rBuffer.append( aNS.copy( 2 ) ); // strip "0."
}
}
- rBuffer.append( sal_Unicode('S'));
+ rBuffer.append( 'S');
}
/** convert ISO "duration" string to double; negative durations allowed */
@@ -718,13 +718,13 @@ bool Converter::convertDuration(double& rfTime,
// negative time duration?
bool bIsNegativeDuration = false;
- if ( sal_Unicode('-') == (*pStr) )
+ if ( '-' == (*pStr) )
{
bIsNegativeDuration = true;
pStr++;
}
- if ( *(pStr++) != sal_Unicode('P') ) // duration must start with "P"
+ if ( *(pStr++) != 'P' ) // duration must start with "P"
return false;
OUString sDoubleStr;
@@ -743,7 +743,7 @@ bool Converter::convertDuration(double& rfTime,
sal_Unicode c = *(pStr++);
if ( !c ) // end
bDone = true;
- else if ( sal_Unicode('0') <= c && sal_Unicode('9') >= c )
+ else if ( '0' <= c && '9' >= c )
{
if ( nTemp >= SAL_MAX_INT32 / 10 )
bSuccess = false;
@@ -762,24 +762,24 @@ bool Converter::convertDuration(double& rfTime,
}
else if ( bTimePart )
{
- if ( c == sal_Unicode('H') )
+ if ( c == 'H' )
{
nHours = nTemp;
nTemp = 0;
}
- else if ( c == sal_Unicode('M') )
+ else if ( c == 'M' )
{
nMins = nTemp;
nTemp = 0;
}
- else if ( (c == sal_Unicode(',')) || (c == sal_Unicode('.')) )
+ else if ( (c == ',') || (c == '.') )
{
nSecs = nTemp;
nTemp = 0;
bIsFraction = true;
sDoubleStr = "0.";
}
- else if ( c == sal_Unicode('S') )
+ else if ( c == 'S' )
{
if ( !bIsFraction )
{
@@ -793,14 +793,14 @@ bool Converter::convertDuration(double& rfTime,
}
else
{
- if ( c == sal_Unicode('T') ) // "T" starts time part
+ if ( c == 'T' ) // "T" starts time part
bTimePart = true;
- else if ( c == sal_Unicode('D') )
+ else if ( c == 'D' )
{
nDays = nTemp;
nTemp = 0;
}
- else if ( c == sal_Unicode('Y') || c == sal_Unicode('M') )
+ else if ( c == 'Y' || c == 'M' )
{
//! how many days is a year or month?
@@ -843,42 +843,42 @@ void Converter::convertDuration(OUStringBuffer& rBuffer,
{
if (rDuration.Negative)
{
- rBuffer.append(sal_Unicode('-'));
+ rBuffer.append('-');
}
- rBuffer.append(sal_Unicode('P'));
+ rBuffer.append('P');
const bool bHaveDate(rDuration.Years != 0 ||
rDuration.Months != 0 ||
rDuration.Days != 0);
if (rDuration.Years)
{
rBuffer.append(static_cast<sal_Int32>(rDuration.Years));
- rBuffer.append(sal_Unicode('Y'));
+ rBuffer.append('Y');
}
if (rDuration.Months)
{
rBuffer.append(static_cast<sal_Int32>(rDuration.Months));
- rBuffer.append(sal_Unicode('M'));
+ rBuffer.append('M');
}
if (rDuration.Days)
{
rBuffer.append(static_cast<sal_Int32>(rDuration.Days));
- rBuffer.append(sal_Unicode('D'));
+ rBuffer.append('D');
}
if ( rDuration.Hours != 0
|| rDuration.Minutes != 0
|| rDuration.Seconds != 0
|| rDuration.NanoSeconds != 0 )
{
- rBuffer.append(sal_Unicode('T')); // time separator
+ rBuffer.append('T'); // time separator
if (rDuration.Hours)
{
rBuffer.append(static_cast<sal_Int32>(rDuration.Hours));
- rBuffer.append(sal_Unicode('H'));
+ rBuffer.append('H');
}
if (rDuration.Minutes)
{
rBuffer.append(static_cast<sal_Int32>(rDuration.Minutes));
- rBuffer.append(sal_Unicode('M'));
+ rBuffer.append('M');
}
if (rDuration.Seconds != 0 || rDuration.NanoSeconds != 0)
{
@@ -894,14 +894,14 @@ void Converter::convertDuration(OUStringBuffer& rBuffer,
ostr << rDuration.NanoSeconds;
rBuffer.append(OUString::createFromAscii(ostr.str().c_str()));
}
- rBuffer.append(sal_Unicode('S'));
+ rBuffer.append('S');
}
}
else if (!bHaveDate)
{
// zero duration: XMLSchema-2 says there must be at least one component
- rBuffer.append(sal_Unicode('0'));
- rBuffer.append(sal_Unicode('D'));
+ rBuffer.append('0');
+ rBuffer.append('D');
}
}
@@ -918,7 +918,7 @@ readUnsignedNumber(const OUString & rString,
while (nPos < rString.getLength())
{
const sal_Unicode c = rString[nPos];
- if ((sal_Unicode('0') <= c) && (c <= sal_Unicode('9')))
+ if (('0' <= c) && (c <= '9'))
{
nTemp *= 10;
nTemp += (c - sal_Unicode('0'));
@@ -958,7 +958,7 @@ readUnsignedNumberMaxDigits(int maxDigits,
while (nPos < rString.getLength())
{
const sal_Unicode c = rString[nPos];
- if ((sal_Unicode('0') <= c) && (c <= sal_Unicode('9')))
+ if (('0' <= c) && (c <= '9'))
{
if (maxDigits > 0)
{
@@ -993,7 +993,7 @@ static bool
readDurationT(const OUString & rString, sal_Int32 & io_rnPos)
{
if ((io_rnPos < rString.getLength()) &&
- (rString[io_rnPos] == sal_Unicode('T')))
+ (rString[io_rnPos] == 'T'))
{
++io_rnPos;
return true;
@@ -1039,14 +1039,14 @@ bool Converter::convertDuration(util::Duration& rDuration,
sal_Int32 nPos(0);
bool bIsNegativeDuration(false);
- if (!string.isEmpty() && (sal_Unicode('-') == string[0]))
+ if (!string.isEmpty() && ('-' == string[0]))
{
bIsNegativeDuration = true;
++nPos;
}
if ((nPos < string.getLength())
- && (string[nPos] != sal_Unicode('P'))) // duration must start with "P"
+ && (string[nPos] != 'P')) // duration must start with "P"
{
return false;
}
@@ -1071,19 +1071,19 @@ bool Converter::convertDuration(util::Duration& rDuration,
if (!bTimePart && bSuccess)
{
bSuccess = readDurationComponent(string, nPos, nTemp, bTimePart,
- nYears, sal_Unicode('Y'));
+ nYears, 'Y');
}
if (!bTimePart && bSuccess)
{
bSuccess = readDurationComponent(string, nPos, nTemp, bTimePart,
- nMonths, sal_Unicode('M'));
+ nMonths, 'M');
}
if (!bTimePart && bSuccess)
{
bSuccess = readDurationComponent(string, nPos, nTemp, bTimePart,
- nDays, sal_Unicode('D'));
+ nDays, 'D');
}
if (bTimePart)
@@ -1096,20 +1096,20 @@ bool Converter::convertDuration(util::Duration& rDuration,
if (bSuccess)
{
bSuccess = readDurationComponent(string, nPos, nTemp, bTimePart,
- nHours, sal_Unicode('H'));
+ nHours, 'H');
}
if (bSuccess)
{
bSuccess = readDurationComponent(string, nPos, nTemp, bTimePart,
- nMinutes, sal_Unicode('M'));
+ nMinutes, 'M');
}
// eeek! seconds are icky.
if ((nPos < string.getLength()) && bSuccess)
{
- if (string[nPos] == sal_Unicode('.') ||
- string[nPos] == sal_Unicode(','))
+ if (string[nPos] == '.' ||
+ string[nPos] == ',')
{
++nPos;
if (-1 != nTemp)
@@ -1126,7 +1126,7 @@ bool Converter::convertDuration(util::Duration& rDuration,
OSL_ENSURE(nDigits > 0, "bad code monkey: negative digits");
nNanoSeconds=static_cast<double>(nTemp)*(1000000000.0/pow(10.0,nDigits));
nTemp=-1;
- if (sal_Unicode('S') == string[nPos])
+ if ('S' == string[nPos])
{
++nPos;
}
@@ -1146,7 +1146,7 @@ bool Converter::convertDuration(util::Duration& rDuration,
bSuccess = false;
}
}
- else if (sal_Unicode('S') == string[nPos])
+ else if ('S' == string[nPos])
{
++nPos;
if (-1 != nTemp)
@@ -1193,17 +1193,17 @@ lcl_AppendTimezone(OUStringBuffer & i_rBuffer, sal_Int16 const nOffset)
{
if (0 == nOffset)
{
- i_rBuffer.append(sal_Unicode('Z'));
+ i_rBuffer.append('Z');
}
else
{
if (0 < nOffset)
{
- i_rBuffer.append(sal_Unicode('+'));
+ i_rBuffer.append('+');
}
else
{
- i_rBuffer.append(sal_Unicode('-'));
+ i_rBuffer.append('-');
}
const sal_Int32 nHours (abs(nOffset) / 60);
const sal_Int32 nMinutes(abs(nOffset) % 60);
@@ -1452,7 +1452,7 @@ bool Converter::parseDateOrDateTime(
sal_Int32 nPos(0);
if (string.getLength() > nPos)
{
- if (sal_Unicode('-') == string[nPos])
+ if ('-' == string[nPos])
{
isNegative = true;
++nPos;
@@ -1468,7 +1468,7 @@ bool Converter::parseDateOrDateTime(
bSuccess &= (0 < nYear);
bSuccess &= (nPos < string.getLength()); // not last token
}
- if (bSuccess && (sal_Unicode('-') != string[nPos])) // separator
+ if (bSuccess && ('-' != string[nPos])) // separator
{
bSuccess = false;
}
@@ -1484,7 +1484,7 @@ bool Converter::parseDateOrDateTime(
bSuccess &= (0 < nMonth) && (nMonth <= 12);
bSuccess &= (nPos < string.getLength()); // not last token
}
- if (bSuccess && (sal_Unicode('-') != string[nPos])) // separator
+ if (bSuccess && ('-' != string[nPos])) // separator
{
bSuccess = false;
}
@@ -1503,7 +1503,7 @@ bool Converter::parseDateOrDateTime(
bool bHaveTime(false);
if (bSuccess && (nPos < string.getLength()))
{
- if (sal_Unicode('T') == string[nPos]) // time separator
+ if ('T' == string[nPos]) // time separator
{
bHaveTime = true;
++nPos;
@@ -1521,7 +1521,7 @@ bool Converter::parseDateOrDateTime(
bSuccess &= (0 <= nHours) && (nHours <= 24);
bSuccess &= (nPos < string.getLength()); // not last token
}
- if (bSuccess && (sal_Unicode(':') != string[nPos])) // separator
+ if (bSuccess && (':' != string[nPos])) // separator
{
bSuccess = false;
}
@@ -1536,7 +1536,7 @@ bool Converter::parseDateOrDateTime(
bSuccess &= (0 <= nMinutes) && (nMinutes < 60);
bSuccess &= (nPos < string.getLength()); // not last token
}
- if (bSuccess && (sal_Unicode(':') != string[nPos])) // separator
+ if (bSuccess && (':' != string[nPos])) // separator
{
bSuccess = false;
}
@@ -1551,7 +1551,7 @@ bool Converter::parseDateOrDateTime(
bSuccess &= (0 <= nSeconds) && (nSeconds < 60);
}
if (bSuccess && (nPos < string.getLength()) &&
- (sal_Unicode('.') == string[nPos] || sal_Unicode(',') == string[nPos])) // fraction separator
+ ('.' == string[nPos] || ',' == string[nPos])) // fraction separator
{
++nPos;
const sal_Int32 nStart(nPos);
@@ -1583,19 +1583,19 @@ bool Converter::parseDateOrDateTime(
if (bSuccess && (nPos < string.getLength()))
{
const sal_Unicode c(string[nPos]);
- if (sal_Unicode('+') == c)
+ if ('+' == c)
{
bHaveTimezone = true;
bHaveTimezonePlus = true;
++nPos;
}
- else if (sal_Unicode('-') == c)
+ else if ('-' == c)
{
bHaveTimezone = true;
bHaveTimezoneMinus = true;
++nPos;
}
- else if (sal_Unicode('Z') == c)
+ else if ('Z' == c)
{
bHaveTimezone = true;
++nPos;
@@ -1613,7 +1613,7 @@ bool Converter::parseDateOrDateTime(
string, nPos, nTimezoneHours, 2, true);
bSuccess &= (0 <= nTimezoneHours) && (nTimezoneHours <= 14);
bSuccess &= (nPos < string.getLength()); // not last token
- if (bSuccess && (sal_Unicode(':') != string[nPos])) // separator
+ if (bSuccess && (':' != string[nPos])) // separator
{
bSuccess = false;
}
@@ -2281,26 +2281,26 @@ sal_Int16 Converter::GetUnitFromString(const OUString& rString, sal_Int16 nDefau
sal_Int16 nRetUnit = nDefaultUnit;
// skip white space
- while( nPos < nLen && sal_Unicode(' ') == rString[nPos] )
+ while( nPos < nLen && ' ' == rString[nPos] )
nPos++;
// skip negative
- if( nPos < nLen && sal_Unicode('-') == rString[nPos] )
+ if( nPos < nLen && '-' == rString[nPos] )
nPos++;
// skip number
- while( nPos < nLen && sal_Unicode('0') <= rString[nPos] && sal_Unicode('9') >= rString[nPos] )
+ while( nPos < nLen && '0' <= rString[nPos] && '9' >= rString[nPos] )
nPos++;
- if( nPos < nLen && sal_Unicode('.') == rString[nPos] )
+ if( nPos < nLen && '.' == rString[nPos] )
{
nPos++;
- while( nPos < nLen && sal_Unicode('0') <= rString[nPos] && sal_Unicode('9') >= rString[nPos] )
+ while( nPos < nLen && '0' <= rString[nPos] && '9' >= rString[nPos] )
nPos++;
}
// skip white space
- while( nPos < nLen && sal_Unicode(' ') == rString[nPos] )
+ while( nPos < nLen && ' ' == rString[nPos] )
nPos++;
if( nPos < nLen )
@@ -2315,8 +2315,8 @@ sal_Int16 Converter::GetUnitFromString(const OUString& rString, sal_Int16 nDefau
case sal_Unicode('c'):
case sal_Unicode('C'):
{
- if(nPos+1 < nLen && (rString[nPos+1] == sal_Unicode('m')
- || rString[nPos+1] == sal_Unicode('M')))
+ if(nPos+1 < nLen && (rString[nPos+1] == 'm'
+ || rString[nPos+1] == 'M'))
nRetUnit = MeasureUnit::CM;
break;
}
@@ -2329,27 +2329,27 @@ sal_Int16 Converter::GetUnitFromString(const OUString& rString, sal_Int16 nDefau
case sal_Unicode('i'):
case sal_Unicode('I'):
{
- if(nPos+1 < nLen && (rString[nPos+1] == sal_Unicode('n')
- || rString[nPos+1] == sal_Unicode('n')))
+ if(nPos+1 < nLen && (rString[nPos+1] == 'n'
+ || rString[nPos+1] == 'n'))
nRetUnit = MeasureUnit::INCH;
break;
}
case sal_Unicode('m'):
case sal_Unicode('M'):
{
- if(nPos+1 < nLen && (rString[nPos+1] == sal_Unicode('m')
- || rString[nPos+1] == sal_Unicode('M')))
+ if(nPos+1 < nLen && (rString[nPos+1] == 'm'
+ || rString[nPos+1] == 'M'))
nRetUnit = MeasureUnit::MM;
break;
}
case sal_Unicode('p'):
case sal_Unicode('P'):
{
- if(nPos+1 < nLen && (rString[nPos+1] == sal_Unicode('t')
- || rString[nPos+1] == sal_Unicode('T')))
+ if(nPos+1 < nLen && (rString[nPos+1] == 't'
+ || rString[nPos+1] == 'T'))
nRetUnit = MeasureUnit::POINT;
- if(nPos+1 < nLen && (rString[nPos+1] == sal_Unicode('c')
- || rString[nPos+1] == sal_Unicode('C')))
+ if(nPos+1 < nLen && (rString[nPos+1] == 'c'
+ || rString[nPos+1] == 'C'))
nRetUnit = MeasureUnit::TWIP;
break;
}
diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx
index 7ee5715..a2dcb38 100644
--- a/sd/source/ui/annotations/annotationtag.cxx
+++ b/sd/source/ui/annotations/annotationtag.cxx
@@ -588,7 +588,7 @@ BitmapEx AnnotationTag::CreateAnnotationBitmap( bool bSelected )
VirtualDevice aVDev;
OUString sAuthor( getInitials( mxAnnotation->getAuthor() ) );
- sAuthor += OUString( sal_Unicode( ' ' ) );
+ sAuthor += OUString( ' ' );
sAuthor += OUString::number( mnIndex );
aVDev.SetFont( mrFont );
diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx
index 40145fe..e7b1894 100644
--- a/sd/source/ui/dlg/copydlg.cxx
+++ b/sd/source/ui/dlg/copydlg.cxx
@@ -40,7 +40,7 @@
namespace sd {
-#define TOKEN (sal_Unicode(';'))
+#define TOKEN ';'
CopyDlg::CopyDlg(::Window* pWindow, const SfxItemSet& rInAttrs,
const XColorListRef &pColList, ::sd::View* pInView)
diff --git a/sd/source/ui/framework/configuration/ResourceId.cxx b/sd/source/ui/framework/configuration/ResourceId.cxx
index 285ac6b..330951f 100644
--- a/sd/source/ui/framework/configuration/ResourceId.cxx
+++ b/sd/source/ui/framework/configuration/ResourceId.cxx
@@ -247,9 +247,9 @@ OUString SAL_CALL
// Get the prefix that ends with the second "/".
const OUString& rsResourceURL (maResourceURLs[0]);
- sal_Int32 nPrefixEnd (rsResourceURL.indexOf(sal_Unicode('/'), 0));
+ sal_Int32 nPrefixEnd (rsResourceURL.indexOf('/', 0));
if (nPrefixEnd >= 0)
- nPrefixEnd = rsResourceURL.indexOf(sal_Unicode('/'), nPrefixEnd+1) + 1;
+ nPrefixEnd = rsResourceURL.indexOf('/', nPrefixEnd+1) + 1;
else
nPrefixEnd = 0;
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 7d6c44b..b974ceb 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -1576,7 +1576,7 @@ void SlideshowImpl::click( const Reference< XShape >& xShape, const ::com::sun::
{
OUString aBookmark( pEvent->maStrBookmark );
- sal_Int32 nPos = aBookmark.indexOf( sal_Unicode('#') );
+ sal_Int32 nPos = aBookmark.indexOf( '#' );
if( nPos >= 0 )
{
OUString aURL( aBookmark.copy( 0, nPos+1 ) );
@@ -1688,7 +1688,7 @@ void SlideshowImpl::hyperLinkClicked( OUString const& aHyperLink ) throw (Runtim
{
OUString aBookmark( aHyperLink );
- sal_Int32 nPos = aBookmark.indexOf( sal_Unicode('#') );
+ sal_Int32 nPos = aBookmark.indexOf( '#' );
if( nPos >= 0 )
{
OUString aURL( aBookmark.copy( 0, nPos+1 ) );
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index 8ff7ff2..0843cae 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -753,7 +753,7 @@ void SAL_CALL SdXShape::setPropertyValue( const OUString& aPropertyName, const :
else
{
aString = pInfo->GetBookmark() ;
- sal_Int32 nPos = aString.lastIndexOf( sal_Unicode('#') );
+ sal_Int32 nPos = aString.lastIndexOf( '#' );
if( nPos >= 0 )
{
OUString aURL( aString.copy( 0, nPos+1 ) );
@@ -1351,7 +1351,7 @@ void SAL_CALL SdUnoEventsAccess::replaceByName( const OUString& aName, const uno
}
else if( eClickAction == presentation::ClickAction_DOCUMENT )
{
- sal_Int32 nPos = aStrBookmark.lastIndexOf( sal_Unicode('#') );
+ sal_Int32 nPos = aStrBookmark.lastIndexOf( '#' );
if( nPos >= 0 )
{
OUString aURL( aStrBookmark.copy( 0, nPos+1 ) );
@@ -1432,11 +1432,11 @@ void SAL_CALL SdUnoEventsAccess::replaceByName( const OUString& aName, const uno
OUStringBuffer sBuffer;
sBuffer.append( aMacroName );
- sBuffer.append( sal_Unicode('.') );
+ sBuffer.append( '.' );
sBuffer.append( aModulName );
- sBuffer.append( sal_Unicode('.') );
+ sBuffer.append( '.' );
sBuffer.append( aLibName );
- sBuffer.append( sal_Unicode('.') );
+ sBuffer.append( '.' );
if ( aStrLibrary == "StarOffice" )
{
@@ -1547,9 +1547,9 @@ uno::Any SAL_CALL SdUnoEventsAccess::getByName( const OUString& aName )
OUStringBuffer sBuffer;
sBuffer.append( aLibName );
- sBuffer.append( sal_Unicode('.') );
+ sBuffer.append( '.' );
sBuffer.append( aModulName );
- sBuffer.append( sal_Unicode('.') );
+ sBuffer.append( '.' );
sBuffer.append( aMacroName );
aAny <<= OUString( sBuffer.makeStringAndClear() );
@@ -1606,7 +1606,7 @@ uno::Any SAL_CALL SdUnoEventsAccess::getByName( const OUString& aName )
case presentation::ClickAction_PROGRAM:
{
OUString aString( pInfo->GetBookmark());
- sal_Int32 nPos = aString.lastIndexOf( sal_Unicode('#') );
+ sal_Int32 nPos = aString.lastIndexOf( '#' );
if( nPos >= 0 )
{
OUString aURL( aString.copy( 0, nPos+1 ) );
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 185daab..9ad3473 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -1516,7 +1516,7 @@ OUString SdGenericDrawPage::getBookmarkURL() const
{
const OUString aBookmarkName( SdDrawPage::getPageApiNameFromUiName( static_cast<SdPage*>(SvxFmDrawPage::mpPage)->GetBookmarkName() ) );
aRet.append( aFileName );
- aRet.append( (sal_Unicode)'#' );
+ aRet.append( '#' );
aRet.append( aBookmarkName );
}
}
@@ -1529,7 +1529,7 @@ void SdGenericDrawPage::setBookmarkURL( OUString& rURL )
{
if( SvxFmDrawPage::mpPage )
{
- sal_Int32 nIndex = rURL.indexOf( (sal_Unicode)'#' );
+ sal_Int32 nIndex = rURL.indexOf( '#' );
if( nIndex != -1 )
{
const OUString aFileName( rURL.copy( 0, nIndex ) );
@@ -2198,7 +2198,7 @@ OUString getUiNameFromPageApiNameImpl( const OUString& rApiName )
sal_Int32 nChar;
for( nChar = 0; nChar < nChars; nChar++, pString++ )
{
- if((*pString < sal_Unicode('0')) || (*pString > sal_Unicode('9')))
+ if((*pString < '0') || (*pString > '9'))
{
// found a non number character, so this is not the default
// name for this page
@@ -2211,7 +2211,7 @@ OUString getUiNameFromPageApiNameImpl( const OUString& rApiName )
{
OUStringBuffer sBuffer;
sBuffer.append( SD_RESSTR(STR_PAGE) );
- sBuffer.append( sal_Unicode( ' ' ) );
+ sBuffer.append( ' ' );
sBuffer.append( aNumber );
return sBuffer.makeStringAndClear();
}
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list