diff options
author | Julien Nabet <serval2412@yahoo.fr> | 2017-12-08 18:57:27 +0100 |
---|---|---|
committer | Julien Nabet <serval2412@yahoo.fr> | 2017-12-08 23:14:49 +0100 |
commit | 2ec698b43313c18522b45b28895cd5688a84a700 (patch) | |
tree | 13fe01cd548f8820e32435adbe1d346fd164ff34 /filter/source/msfilter/msdffimp.cxx | |
parent | We already have the type, use it (diff) | |
download | core-2ec698b43313c18522b45b28895cd5688a84a700.tar.gz core-2ec698b43313c18522b45b28895cd5688a84a700.zip |
cppcheck: fix some reports
variableScope reports in comphelper/drawinglayer/editeng
+filter/framework/l10ntools
Change-Id: I4575428773e8b9b3efedabb44fdcd6d8175ac46a
Reviewed-on: https://gerrit.libreoffice.org/46116
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'filter/source/msfilter/msdffimp.cxx')
-rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index c3b1a95349c4..28f151060d30 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -4424,7 +4424,6 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r aSet.Put(makeSdrTextAutoGrowHeightItem(false)); aSet.Put(makeSdrTextAutoGrowWidthItem(false)); - double fRatio = 0; VclPtr<VirtualDevice> pDevice = VclPtr<VirtualDevice>::Create(); vcl::Font aFont = pDevice->GetFont(); aFont.SetFamilyName( aFontName ); @@ -4436,7 +4435,7 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r if ( nTextWidth && aObjData.eShapeType == mso_sptTextPlainText && aObjName.match( "PowerPlusWaterMarkObject" ) ) { - fRatio = (double)pDevice->GetTextHeight() / nTextWidth; + double fRatio = (double)pDevice->GetTextHeight() / nTextWidth; sal_Int32 nNewHeight = fRatio * aObjData.aBoundRect.getWidth(); sal_Int32 nPaddingY = aObjData.aBoundRect.getHeight() - nNewHeight; |