summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJochen Nitschke <j.nitschke+logerrit@ok.de>2018-06-30 20:34:35 +0200
committerJochen Nitschke <j.nitschke+logerrit@ok.de>2018-07-01 00:34:54 +0200
commitb0e291a7efcd3af2a72d0b622b1f1b84723f011f (patch)
tree1bb33da0869ded0be442f8de70b3fa27e7ee29db
parentefd08467b41365dff4a270393efb588de765eaef (diff)
cppcheck: variableScope
Change-Id: I06fc0e6cba1e5754f9b801e55e27fcde4457eb72 Reviewed-on: https://gerrit.libreoffice.org/56768 Tested-by: Jenkins Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
-rw-r--r--writerfilter/source/rtftok/rtfsdrimport.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx
index f5a96a3efada..f2ea5d920be1 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -717,10 +717,12 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap
else if (rProperty.first == "pctHoriz" || rProperty.first == "pctVert")
{
sal_Int16 nPercentage = rtl::math::round(rProperty.second.toDouble() / 10);
- boost::optional<sal_Int16>& rPercentage
- = rProperty.first == "pctHoriz" ? oRelativeWidth : oRelativeHeight;
if (nPercentage)
+ {
+ boost::optional<sal_Int16>& rPercentage
+ = rProperty.first == "pctHoriz" ? oRelativeWidth : oRelativeHeight;
rPercentage = nPercentage;
+ }
}
else if (rProperty.first == "sizerelh")
{