diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-03-30 09:36:06 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-03-30 12:21:40 +0000 |
| commit | da56de9ac4824eb365af20b351719395e725be39 (patch) | |
| tree | f19ad159f5e12b9e62b2ee50f39016819b7a7c5c /oox/source/ppt | |
| parent | 8d1a56c206e5c2ed6c331049198bb8ebc6176171 (diff) | |
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>
Diffstat (limited to 'oox/source/ppt')
| -rw-r--r-- | oox/source/ppt/animvariantcontext.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
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 { |