[Libreoffice-commits] core.git: drawinglayer/source

[Stephan Bergmann (via logerrit)]

 drawinglayer/source/primitive2d/textlayoutdevice.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit a879b15d59618e73797ad779666f72cd040ff99a
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Aug 21 09:20:11 2020 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Aug 21 10:39:17 2020 +0200

    -Werror,-Wunused-variable (clang-cl)
    
    Change-Id: Ic783ab10a3bc2139eef65351d515814374431e59
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101131
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
index de2f76cb74f6..fe541c04a9b3 100644
--- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx
+++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
@@ -369,8 +369,6 @@ namespace drawinglayer::primitive2d
         {
             // detect FontScaling
             const sal_uInt32 nHeight(basegfx::fround(fabs(fFontScaleY)));
-            const sal_uInt32 nWidth(basegfx::fround(fabs(fFontScaleX)));
-            const bool bFontIsScaled(nHeight != nWidth);
 
 #ifdef _WIN32
             // for WIN32 systems, start with creating an unscaled font. If FontScaling
@@ -380,12 +378,15 @@ namespace drawinglayer::primitive2d
                 rFontAttribute.getFamilyName(),
                 rFontAttribute.getStyleName(),
                 Size(0, nHeight));
+            (void)fFontScaleX;
 #else
             // for non-WIN32 systems things are easier since these accept a Font creation
             // with initially nWidth != nHeight for FontScaling. Despite that, use zero for
             // FontWidth when no scaling is used to explicitly have that zero when e.g. the
             // Font would be recorded in a MetaFile (The MetaFile FontAction WILL record a
             // set FontWidth; import that in a WIN32 system, and trouble is there)
+            const sal_uInt32 nWidth(basegfx::fround(fabs(fFontScaleX)));
+            const bool bFontIsScaled(nHeight != nWidth);
             vcl::Font aRetval(
                 rFontAttribute.getFamilyName(),
                 rFontAttribute.getStyleName(),