summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-11-13 15:59:38 +0200
committerNoel Grandin <noel@peralex.com>2013-11-14 08:17:30 +0200
commit3cabbf37b965a11e7d63de05eaacfbdb29b67b74 (patch)
tree24a9c4eb35edc388ee9d8281bd2e584454bd0d61 /vcl
parent3acca4c859b7198bc3caf4c690bfc653883e61b7 (diff)
remove unnecessary sal_Unicode casts in VCL module
Change-Id: I79da72097e8bc86891075d1484a59b5599a063d0
Diffstat (limited to 'vcl')
-rw-r--r--vcl/aqua/source/window/salframe.cxx20
-rw-r--r--vcl/aqua/source/window/salmenu.cxx4
-rw-r--r--vcl/generic/fontmanager/helper.cxx4
-rw-r--r--vcl/generic/print/genprnpsp.cxx2
-rw-r--r--vcl/source/gdi/outdev3.cxx2
-rw-r--r--vcl/source/gdi/pdfwriter_impl.cxx4
-rw-r--r--vcl/source/window/menu.cxx2
-rw-r--r--vcl/source/window/printdlg.cxx2
-rw-r--r--vcl/unx/generic/printer/cupsmgr.cxx2
-rw-r--r--vcl/unx/generic/printer/ppdparser.cxx12
-rw-r--r--vcl/unx/generic/window/salframe.cxx6
-rw-r--r--vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx2
-rw-r--r--vcl/unx/gtk/gdi/salprn-gtk.cxx4
-rw-r--r--vcl/unx/x11/x11sys.cxx4
-rw-r--r--vcl/win/source/app/salinfo.cxx2
15 files changed, 36 insertions, 36 deletions
diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx
index 8092e9feae72..078fc1d74e54 100644
--- a/vcl/aqua/source/window/salframe.cxx
+++ b/vcl/aqua/source/window/salframe.cxx
@@ -1047,7 +1047,7 @@ OUString AquaSalFrame::GetKeyName( sal_uInt16 nKeyCode )
for( i = KEY_F1; i <= KEY_F26; i++ )
{
OUStringBuffer aKey( 3 );
- aKey.append( sal_Unicode( 'F' ) );
+ aKey.append( 'F' );
aKey.append( sal_Int32( i - KEY_F1 + 1 ) );
aKeyMap[ i ] = aKey.makeStringAndClear();
}
@@ -1066,15 +1066,15 @@ OUString AquaSalFrame::GetKeyName( sal_uInt16 nKeyCode )
aKeyMap[ KEY_BACKSPACE ]= OUString( sal_Unicode( 0x232b ) );
aKeyMap[ KEY_SPACE ] = OUString( sal_Unicode( 0x2423 ) );
aKeyMap[ KEY_DELETE ] = OUString( sal_Unicode( 0x2326 ) );
- aKeyMap[ KEY_ADD ] = OUString( sal_Unicode( '+' ) );
- aKeyMap[ KEY_SUBTRACT ] = OUString( sal_Unicode( '-' ) );
- aKeyMap[ KEY_DIVIDE ] = OUString( sal_Unicode( '/' ) );
- aKeyMap[ KEY_MULTIPLY ] = OUString( sal_Unicode( '*' ) );
- aKeyMap[ KEY_POINT ] = OUString( sal_Unicode( '.' ) );
- aKeyMap[ KEY_COMMA ] = OUString( sal_Unicode( ',' ) );
- aKeyMap[ KEY_LESS ] = OUString( sal_Unicode( '<' ) );
- aKeyMap[ KEY_GREATER ] = OUString( sal_Unicode( '>' ) );
- aKeyMap[ KEY_EQUAL ] = OUString( sal_Unicode( '=' ) );
+ aKeyMap[ KEY_ADD ] = OUString( '+' );
+ aKeyMap[ KEY_SUBTRACT ] = OUString( '-' );
+ aKeyMap[ KEY_DIVIDE ] = OUString( '/' );
+ aKeyMap[ KEY_MULTIPLY ] = OUString( '*' );
+ aKeyMap[ KEY_POINT ] = OUString( '.' );
+ aKeyMap[ KEY_COMMA ] = OUString( ',' );
+ aKeyMap[ KEY_LESS ] = OUString( '<' );
+ aKeyMap[ KEY_GREATER ] = OUString( '>' );
+ aKeyMap[ KEY_EQUAL ] = OUString( '=' );
aKeyMap[ KEY_OPEN ] = OUString( sal_Unicode( 0x23cf ) );
/* yet unmapped KEYCODES:
diff --git a/vcl/aqua/source/window/salmenu.cxx b/vcl/aqua/source/window/salmenu.cxx
index 09dc2ac9410a..6ec003c2afa2 100644
--- a/vcl/aqua/source/window/salmenu.cxx
+++ b/vcl/aqua/source/window/salmenu.cxx
@@ -683,10 +683,10 @@ void AquaSalMenu::SetItemText( unsigned /*i_nPos*/, SalMenuItem* i_pSalMenuItem,
*/
if( mbMenuBar )
{
- sal_Int32 nPos = aText.lastIndexOf( sal_Unicode( '(' ) );
+ sal_Int32 nPos = aText.lastIndexOf( '(' );
if( nPos != -1 )
{
- sal_Int32 nPos2 = aText.indexOf( sal_Unicode( ')' ) );
+ sal_Int32 nPos2 = aText.indexOf( ')' );
if( nPos2 != -1 )
aText = aText.replaceAt( nPos, nPos2-nPos+1, "" );
}
diff --git a/vcl/generic/fontmanager/helper.cxx b/vcl/generic/fontmanager/helper.cxx
index bf09d6058cc8..729d5268c0a6 100644
--- a/vcl/generic/fontmanager/helper.cxx
+++ b/vcl/generic/fontmanager/helper.cxx
@@ -121,7 +121,7 @@ void psp::getPrinterPathList( std::list< OUString >& rPathList, const char* pSub
aPathBuffer.appendAscii( "/" LIBO_SHARE_FOLDER "/psprint" );
if( pSubDir )
{
- aPathBuffer.append( sal_Unicode('/') );
+ aPathBuffer.append( '/' );
aPathBuffer.appendAscii( pSubDir );
}
rPathList.push_back( aPathBuffer.makeStringAndClear() );
@@ -133,7 +133,7 @@ void psp::getPrinterPathList( std::list< OUString >& rPathList, const char* pSub
aPathBuffer.appendAscii( "/user/psprint" );
if( pSubDir )
{
- aPathBuffer.append( sal_Unicode('/') );
+ aPathBuffer.append( '/' );
aPathBuffer.appendAscii( pSubDir );
}
rPathList.push_back( aPathBuffer.makeStringAndClear() );
diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx
index 62e7b79af2e8..1f080a22d196 100644
--- a/vcl/generic/print/genprnpsp.cxx
+++ b/vcl/generic/print/genprnpsp.cxx
@@ -1270,7 +1270,7 @@ sal_Bool PspSalPrinter::StartJob( const OUString* i_pFileName, const OUString& i
aBuf.append( i_rJobName );
if( i > 0 || nCurJob > 0 )
{
- aBuf.append( sal_Unicode(' ') );
+ aBuf.append( ' ' );
aBuf.append( sal_Int32( i + nCurJob * aPDFFiles.size() ) );
}
PrinterInfoManager::get().endSpool( pPrinter->GetName(), aBuf.makeStringAndClear(), fp, m_aJobData, bFirstJob );
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 2737159a7259..afe06f706b52 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -4815,7 +4815,7 @@ long OutputDevice::ImplGetTextLines( ImplMultiTextLineInfo& rLineInfo,
long nW = 0;
do
{
- nSpacePos = rStr.lastIndexOf( sal_Unicode(' '), nSpacePos );
+ nSpacePos = rStr.lastIndexOf( ' ', nSpacePos );
if( nSpacePos != -1 )
{
if( nSpacePos > nPos )
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index b6001cb38fba..572d4b9928d8 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -2742,7 +2742,7 @@ sal_Int32 PDFWriterImpl::emitStructure( PDFStructureElement& rEle )
aLocBuf.append( aLanguage );
if( !aCountry.isEmpty() )
{
- aLocBuf.append( sal_Unicode('-') );
+ aLocBuf.append( '-' );
aLocBuf.append( aCountry );
}
aLine.append( "/Lang" );
@@ -5801,7 +5801,7 @@ bool PDFWriterImpl::emitCatalog()
aLocBuf.append( aLanguage );
if( !aCountry.isEmpty() )
{
- aLocBuf.append( sal_Unicode('-') );
+ aLocBuf.append( '-' );
aLocBuf.append( aCountry );
}
aLine.append( "/Lang" );
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 6083554f09dd..4a3e784f81a0 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -2607,7 +2607,7 @@ static OUString getShortenedString( const OUString& i_rLong, Window* i_pWin, lon
{
OUStringBuffer aBuf( i_rLong.getLength() );
aBuf.append( aNonMnem.copy( 0, nPos) );
- aBuf.append( sal_Unicode('~') );
+ aBuf.append( '~' );
aBuf.append( aNonMnem.copy(nPos) );
aNonMnem = aBuf.makeStringAndClear();
}
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 42c04113d0a2..b8cb188bde4d 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -237,7 +237,7 @@ void PrintDialog::PrintPreviewWindow::setPreview( const GDIMetaFile& i_rNewPrevi
{
aBuf.appendAscii( " (" );
aBuf.append( i_rPaperName );
- aBuf.append( sal_Unicode(')') );
+ aBuf.append( ')' );
}
maHorzDim.SetText( aBuf.makeStringAndClear() );
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx
index a5705c31bd30..15e1ca63bdb0 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -306,7 +306,7 @@ void CUPSManager::initialize()
{
OUStringBuffer aBuf( 256 );
aBuf.append( aPrinterName );
- aBuf.append( sal_Unicode( '/' ) );
+ aBuf.append( '/' );
aBuf.append( OStringToOUString( pDest->instance, aEncoding ) );
aPrinterName = aBuf.makeStringAndClear();
}
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index 7d286e03ed8c..b29b8645f5fe 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -169,12 +169,12 @@ namespace psp
aKey.append( i_rKey );
if( !i_rOption.isEmpty() || !i_rValue.isEmpty() )
{
- aKey.append( sal_Unicode( ':' ) );
+ aKey.append( ':' );
aKey.append( i_rOption );
}
if( !i_rValue.isEmpty() )
{
- aKey.append( sal_Unicode( ':' ) );
+ aKey.append( ':' );
aKey.append( i_rValue );
}
if( !aKey.isEmpty() && !i_rTranslation.isEmpty() )
@@ -202,12 +202,12 @@ namespace psp
aKey.append( i_rKey );
if( !i_rOption.isEmpty() || !i_rValue.isEmpty() )
{
- aKey.append( sal_Unicode( ':' ) );
+ aKey.append( ':' );
aKey.append( i_rOption );
}
if( !i_rValue.isEmpty() )
{
- aKey.append( sal_Unicode( ':' ) );
+ aKey.append( ':' );
aKey.append( i_rValue );
}
if( !aKey.isEmpty() )
@@ -523,13 +523,13 @@ OUString PPDParser::getPPDFile( const OUString& rFile )
// some PPD files contain dots beside the extension, so try name first
// and cut of points after that
OUString aBase( rFile );
- sal_Int32 nLastIndex = aBase.lastIndexOf( sal_Unicode( '/' ) );
+ sal_Int32 nLastIndex = aBase.lastIndexOf( '/' );
if( nLastIndex >= 0 )
aBase = aBase.copy( nLastIndex+1 );
do
{
it = rPPDCache.pAllPPDFiles->find( aBase );
- nLastIndex = aBase.lastIndexOf( sal_Unicode( '.' ) );
+ nLastIndex = aBase.lastIndexOf( '.' );
if( nLastIndex > 0 )
aBase = aBase.copy( 0, nLastIndex );
} while( it == rPPDCache.pAllPPDFiles->end() && nLastIndex > 0 );
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 2859993bd86b..3255f859c776 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -2989,9 +2989,9 @@ bool X11SalFrame::appendUnicodeSequence( sal_Unicode c )
if( !rSeq.isEmpty() )
{
// range check
- if( (c >= sal_Unicode('0') && c <= sal_Unicode('9')) ||
- (c >= sal_Unicode('a') && c <= sal_Unicode('f')) ||
- (c >= sal_Unicode('A') && c <= sal_Unicode('F')) )
+ if( (c >= '0' && c <= '9') ||
+ (c >= 'a' && c <= 'f') ||
+ (c >= 'A' && c <= 'F') )
{
OUStringBuffer aBuf( rSeq.getLength() + 1 );
aBuf.append( rSeq );
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index 487ebc67d42e..184741946556 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -1995,7 +1995,7 @@ void SalGtkFilePicker::SetFilters()
for (std::set<OUString>::const_iterator aIter = aAllFormats.begin(); aIter != aEnd; ++aIter)
{
if (!sAllFilter.isEmpty())
- sAllFilter += OUString(sal_Unicode(';'));
+ sAllFilter += OUString(';');
sAllFilter += *aIter;
}
sPseudoFilter = getResString(FILE_PICKER_ALLFORMATS);
diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx
index 85404f1e6fb9..5378194ccada 100644
--- a/vcl/unx/gtk/gdi/salprn-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx
@@ -1089,12 +1089,12 @@ GtkPrintDialog::updateControllerPrintRange()
sBuf.append(sal_Int32(pRanges[i].start+1));
if (pRanges[i].start != pRanges[i].end)
{
- sBuf.append(sal_Unicode('-'));
+ sBuf.append('-');
sBuf.append(sal_Int32(pRanges[i].end+1));
}
if (i != num_ranges-1)
- sBuf.append(sal_Unicode(','));
+ sBuf.append(',');
}
pVal->Value <<= sBuf.makeStringAndClear();
}
diff --git a/vcl/unx/x11/x11sys.cxx b/vcl/unx/x11/x11sys.cxx
index e1d8be657c33..6d6f5b9b405a 100644
--- a/vcl/unx/x11/x11sys.cxx
+++ b/vcl/unx/x11/x11sys.cxx
@@ -97,7 +97,7 @@ OUString X11SalSystem::GetDisplayScreenName( unsigned int nScreen )
aBuf.append( OStringToOUString( OString( DisplayString( pSalDisp->GetDisplay() ) ), osl_getThreadTextEncoding() ) );
aBuf.appendAscii( " [" );
aBuf.append( static_cast<sal_Int32>(nScreen) );
- aBuf.append( sal_Unicode(']') );
+ aBuf.append( ']' );
aScreenName = aBuf.makeStringAndClear();
}
else
@@ -118,7 +118,7 @@ OUString X11SalSystem::GetDisplayScreenName( unsigned int nScreen )
if( nPos < aBuf.getLength() )
aBuf.setLength( nPos+1 );
else
- aBuf.append( sal_Unicode('.') );
+ aBuf.append( '.' );
aBuf.append( static_cast<sal_Int32>(nScreen) );
aScreenName = aBuf.makeStringAndClear();
}
diff --git a/vcl/win/source/app/salinfo.cxx b/vcl/win/source/app/salinfo.cxx
index 7d9579b46cb9..fdb5cc57b2d7 100644
--- a/vcl/win/source/app/salinfo.cxx
+++ b/vcl/win/source/app/salinfo.cxx
@@ -145,7 +145,7 @@ bool WinSalSystem::initMonitors()
aBuf.append( rDev );
aBuf.appendAscii( " (" );
aBuf.append( sal_Int32( nInstance ) );
- aBuf.append( sal_Unicode(')') );
+ aBuf.append( ')' );
m_aMonitors[ i ].m_aName = aBuf.makeStringAndClear();
}
}