summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-11-14 08:16:35 +0200
committerNoel Grandin <noel@peralex.com>2013-11-14 08:17:32 +0200
commitd366c9b20ec86f3fe521812a0c22def3bfd1f05e (patch)
tree4bd09438c8cd8f0dbcd0881fc923d56a0a721fc5 /sd
parentd2fa59e4025050c9b668ecff379d668f0db52639 (diff)
remove unnecessary sal_Unicode casts in various places
Change-Id: Ibf04062ca86ed866202d748c3b62a210d30ed6ec
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/annotations/annotationtag.cxx2
-rw-r--r--sd/source/ui/dlg/copydlg.cxx2
-rw-r--r--sd/source/ui/framework/configuration/ResourceId.cxx4
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.cxx4
-rw-r--r--sd/source/ui/unoidl/unoobj.cxx16
-rw-r--r--sd/source/ui/unoidl/unopage.cxx8
-rw-r--r--sd/source/ui/view/frmview.cxx12
7 files changed, 24 insertions, 24 deletions
diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx
index 7ee5715c34e6..a2dcb380fef8 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 40145feaf3d3..e7b18944fa43 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 285ac6bf0edf..330951f722e6 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 7d6c44b1ed22..b974ceb8671d 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 8ff7ff2866da..0843cae29785 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 185daab2a77d..9ad34730d968 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
index 0f30d4148c46..1c3ff4d7adc4 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -400,17 +400,17 @@ static OUString createHelpLinesString( const SdrHelpLineList& rHelpLines )
switch( rHelpLine.GetKind() )
{
case SDRHELPLINE_POINT:
- aLines.append( (sal_Unicode)'P' );
+ aLines.append( 'P' );
aLines.append( (sal_Int32)rPos.X() );
- aLines.append( (sal_Unicode)',' );
+ aLines.append( ',' );
aLines.append( (sal_Int32)rPos.Y() );
break;
case SDRHELPLINE_VERTICAL:
- aLines.append( (sal_Unicode)'V' );
+ aLines.append( 'V' );
aLines.append( (sal_Int32)rPos.X() );
break;
case SDRHELPLINE_HORIZONTAL:
- aLines.append( (sal_Unicode)'H' );
+ aLines.append( 'H' );
aLines.append( (sal_Int32)rPos.Y() );
break;
default:
@@ -537,7 +537,7 @@ static void createHelpLinesFromString( const OUString& rLines, SdrHelpLineList&
pStr++;
- while( (*pStr >= sal_Unicode('0') && *pStr <= sal_Unicode('9')) || (*pStr == '+') || (*pStr == '-') )
+ while( (*pStr >= '0' && *pStr <= '9') || (*pStr == '+') || (*pStr == '-') )
{
sBuffer.append( *pStr++ );
}
@@ -557,7 +557,7 @@ static void createHelpLinesFromString( const OUString& rLines, SdrHelpLineList&
if( *pStr++ != ',' )
return;
- while( (*pStr >= sal_Unicode('0') && *pStr <= sal_Unicode('9')) || (*pStr == '+') || (*pStr == '-') )
+ while( (*pStr >= '0' && *pStr <= '9') || (*pStr == '+') || (*pStr == '-') )
{
sBuffer.append( *pStr++ );
}