remove type decorations on char literals

they are only needed where type deduction fails.
left them in defines for now.

Change-Id: I7f002dd6bc7acc083c73b6c64076de6dd28d0b09
Reviewed-on: https://gerrit.libreoffice.org/35893
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

6 files changed, 16 insertions, 16 deletions

diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 35995897fa88..25ea2c450920 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -431,7 +431,7 @@ bool ImplSdPPTImport::Import()
                                             do
                                             {
                                                 aStringAry[nTokenCount] =
-                                                    OUStringToOString(aString.getToken( 0, (sal_Unicode)',', nPos ), RTL_TEXTENCODING_UTF8);
+                                                    OUStringToOString(aString.getToken( 0, ',', nPos ), RTL_TEXTENCODING_UTF8);
                                             }
                                             while ( ++nTokenCount < SAL_N_ELEMENTS(aStringAry) && nPos >= 0 );
 
diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx
index 7e67d544226e..74491b321742 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -758,18 +758,18 @@ bool AnimationImporter::convertAnimationValue( oox::ppt::MS_AttributeNames eAttr
                 aString = aString.copy( 4, aString.getLength() - 5 );
                 Color aColor;
                 sal_Int32 index = 0;
-                aColor.SetRed( (sal_uInt8)aString.getToken( 0, (sal_Unicode)',', index ).toInt32() );
-                aColor.SetGreen( (sal_uInt8)aString.getToken( 0, (sal_Unicode)',', index ).toInt32() );
-                aColor.SetRed( (sal_uInt8)aString.getToken( 0, (sal_Unicode)',', index ).toInt32() );
+                aColor.SetRed( (sal_uInt8)aString.getToken( 0, ',', index ).toInt32() );
+                aColor.SetGreen( (sal_uInt8)aString.getToken( 0, ',', index ).toInt32() );
+                aColor.SetRed( (sal_uInt8)aString.getToken( 0, ',', index ).toInt32() );
                 rValue <<= (sal_Int32)aColor.GetColor();
                 bRet = true;
             }
             else if( aString.startsWith( "hsl(" ) )
             {
                 sal_Int32 index = 0;
-                sal_Int32 nA = aString.getToken( 0, (sal_Unicode)',', index ).toInt32();
-                sal_Int32 nB = aString.getToken( 0, (sal_Unicode)',', index ).toInt32();
-                sal_Int32 nC = aString.getToken( 0, (sal_Unicode)',', index ).toInt32();
+                sal_Int32 nA = aString.getToken( 0, ',', index ).toInt32();
+                sal_Int32 nB = aString.getToken( 0, ',', index ).toInt32();
+                sal_Int32 nC = aString.getToken( 0, ',', index ).toInt32();
                 dump( "hsl(%ld", nA );
                 dump( ",%ld", nB );
                 dump( ",%ld)", nC );
@@ -1097,7 +1097,7 @@ void AnimationImporter::fillNode( Reference< XAnimationNode >& xNode, const Anim
                 sal_Int32 fromIndex = 0;
                 while(true)
                 {
-                    fromIndex = aString.indexOf( (sal_Unicode)';', fromIndex );
+                    fromIndex = aString.indexOf( ';', fromIndex );
                     if( fromIndex == -1 )
                         break;
 
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index 2cac897a19a0..21e28d46a8e0 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -147,8 +147,8 @@ OUString getShapeDescription( const Reference< XShape >& xShape, bool bWithText
             {
                 aDescription += ": ";
 
-                aText = aText.replace( (sal_Unicode)'\n', (sal_Unicode)' ' );
-                aText = aText.replace( (sal_Unicode)'\r', (sal_Unicode)' ' );
+                aText = aText.replace( '\n', ' ' );
+                aText = aText.replace( '\r', ' ' );
 
                 aDescription += aText;
             }
diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
index 5014da6d0ec6..ebc201d46505 100644
--- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
@@ -515,7 +515,7 @@ std::shared_ptr<SdTransferable::UserData> Clipboard::CreateTransferableUserData
         if ( ! aDataHelper.GetINetBookmark(SotClipboardFormatId::NETSCAPE_BOOKMARK, aINetBookmark))
             break;
         const OUString sURL (aINetBookmark.GetURL());
-        const sal_Int32 nIndex (sURL.indexOf((sal_Unicode)'#'));
+        const sal_Int32 nIndex (sURL.indexOf('#'));
         if (nIndex == -1)
             break;
         OUString sBookmark (sURL.copy(nIndex+1));
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index 83455c409233..357623295654 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -472,13 +472,13 @@ static void createHelpLinesFromString( const OUString& rLines, SdrHelpLineList&
 
         switch( *pStr )
         {
-        case (sal_Unicode)'P':
+        case 'P':
             aNewHelpLine.SetKind( SdrHelpLineKind::Point );
             break;
-        case (sal_Unicode)'V':
+        case 'V':
             aNewHelpLine.SetKind( SdrHelpLineKind::Vertical );
             break;
-        case (sal_Unicode)'H':
+        case 'H':
             aNewHelpLine.SetKind( SdrHelpLineKind::Horizontal );
             break;
         default:
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index 1c693043badd..0b1cab132db3 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -732,7 +732,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt,
 
                                 presentation::ClickAction eClickAction = presentation::ClickAction_DOCUMENT;
 
-                                sal_Int32 nIndex = aBookmark.indexOf( (sal_Unicode)'#' );
+                                sal_Int32 nIndex = aBookmark.indexOf( '#' );
                                 if( nIndex != -1 )
                                 {
                                     const OUString aDocName( aBookmark.copy( 0, nIndex ) );
@@ -815,7 +815,7 @@ IMPL_LINK( View, ExecuteNavigatorDrop, void*, p, void )
             aPos = pSdNavigatorDropEvent->mpTargetWindow->PixelToLogic( pSdNavigatorDropEvent->maPosPixel );
 
         const OUString aURL( aINetBookmark.GetURL() );
-        sal_Int32 nIndex = aURL.indexOf( (sal_Unicode)'#' );
+        sal_Int32 nIndex = aURL.indexOf( '#' );
         if( nIndex != -1 )
             aBookmark = aURL.copy( nIndex+1 );