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>

2 files changed, 18 insertions, 18 deletions

diff --git a/oox/source/docprop/docprophandler.cxx b/oox/source/docprop/docprophandler.cxx
index 6ff528df1e95..43fd8bc12de6 100644
--- a/oox/source/docprop/docprophandler.cxx
+++ b/oox/source/docprop/docprophandler.cxx
@@ -99,25 +99,25 @@ util::DateTime OOXMLDocPropHandler::GetDateTimeFromW3CDTF( const OUString& aChar
     {
         aOslDTime.Year = (sal_Int16)aChars.copy( 0, 4 ).toInt32();
 
-        if ( nLen >= 7 && aChars[4] == (sal_Unicode)'-' )
+        if ( nLen >= 7 && aChars[4] == '-' )
         {
             aOslDTime.Month = (sal_uInt16)aChars.copy( 5, 2 ).toInt32();
 
-            if ( nLen >= 10 && aChars[7] == (sal_Unicode)'-' )
+            if ( nLen >= 10 && aChars[7] == '-' )
             {
                 aOslDTime.Day = (sal_uInt16)aChars.copy( 8, 2 ).toInt32();
 
-                if ( nLen >= 16 && aChars[10] == (sal_Unicode)'T' && aChars[13] == (sal_Unicode)':' )
+                if ( nLen >= 16 && aChars[10] == 'T' && aChars[13] == ':' )
                 {
                     aOslDTime.Hours = (sal_uInt16)aChars.copy( 11, 2 ).toInt32();
                     aOslDTime.Minutes = (sal_uInt16)aChars.copy( 14, 2 ).toInt32();
 
                     sal_Int32 nOptTime = 0;
-                    if ( nLen >= 19 && aChars[16] == (sal_Unicode)':' )
+                    if ( nLen >= 19 && aChars[16] == ':' )
                     {
                         aOslDTime.Seconds = (sal_uInt16)aChars.copy( 17, 2 ).toInt32();
                         nOptTime += 3;
-                        if ( nLen >= 20 && aChars[19] == (sal_Unicode)'.' )
+                        if ( nLen >= 20 && aChars[19] == '.' )
                         {
                             nOptTime += 1;
                             sal_Int32 digitPos = 20;
@@ -158,12 +158,12 @@ util::DateTime OOXMLDocPropHandler::GetDateTimeFromW3CDTF( const OUString& aChar
                     sal_Int32 nModif = 0;
                     if ( nLen >= 16 + nOptTime + 6 )
                     {
-                        if ( ( aChars[16 + nOptTime] == (sal_Unicode)'+' || aChars[16 + nOptTime] == (sal_Unicode)'-' )
-                          && aChars[16 + nOptTime + 3] == (sal_Unicode)':' )
+                        if ( ( aChars[16 + nOptTime] == '+' || aChars[16 + nOptTime] == '-' )
+                          && aChars[16 + nOptTime + 3] == ':' )
                         {
                             nModif = aChars.copy( 16 + nOptTime + 1, 2 ).toInt32() * 3600;
                             nModif += aChars.copy( 16 + nOptTime + 4, 2 ).toInt32() * 60;
-                            if ( aChars[16 + nOptTime] == (sal_Unicode)'-' )
+                            if ( aChars[16 + nOptTime] == '-' )
                                 nModif *= -1;
                         }
                     }
diff --git a/oox/source/ppt/animvariantcontext.cxx b/oox/source/ppt/animvariantcontext.cxx
index 7cd57abd9819..f80fca009037 100644
--- a/oox/source/ppt/animvariantcontext.cxx
+++ b/oox/source/ppt/animvariantcontext.cxx
@@ -68,28 +68,28 @@ namespace oox { namespace ppt {
                 {
                     switch(rString[nIndex + 4])
                     {
-                    case (sal_Unicode)'h': // we found ppt_h
+                    case 'h': // we found ppt_h
                         // if it was #ppt_h we already copied the #
                         // which we do not want in the target, so remove it
-                        if(nIndex && (rString[nIndex - 1] == (sal_Unicode)'#'))
+                        if(nIndex && (rString[nIndex - 1] == '#'))
                         {
                             sRes.remove(sRes.getLength() - 1, 1);
                         }
                         sRes.append("height");
                         bRet = true;
                         break;
-                    case (sal_Unicode)'w':
-                        if(nIndex && (rString[nIndex - 1] == (sal_Unicode)'#'))
+                    case 'w':
+                        if(nIndex && (rString[nIndex - 1] == '#'))
                         {
                             sRes.remove(sRes.getLength() - 1, 1);
                         }
                         sRes.append("width");
                         bRet = true;
                         break;
-                    case (sal_Unicode)'x':
-                        if(nIndex && (rString[nIndex - 1] == (sal_Unicode)'#'))
+                    case 'x':
+                        if(nIndex && (rString[nIndex - 1] == '#'))
                         {
-                            sRes[sRes.getLength() - 1] = (sal_Unicode)'x';
+                            sRes[sRes.getLength() - 1] = 'x';
                         }
                         else
                         {
@@ -97,10 +97,10 @@ namespace oox { namespace ppt {
                         }
                         bRet = true;
                         break;
-                    case (sal_Unicode)'y':
-                        if(nIndex && (rString[nIndex - 1] == (sal_Unicode)'#'))
+                    case 'y':
+                        if(nIndex && (rString[nIndex - 1] == '#'))
                         {
-                            sRes[sRes.getLength() - 1] = (sal_Unicode)'y';
+                            sRes[sRes.getLength() - 1] = 'y';
                         }
                         else
                         {