[Libreoffice-commits] core.git: Branch 'feature/borderline3' - svx/source

[Armin Le Grand]

 svx/source/dialog/framelink.cxx            |    2 +-
 svx/source/table/viewcontactoftableobj.cxx |    2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit ca5a5a8ffb3d0702a8c7541d7407795d5929d6a7
Author: Armin Le Grand <Armin.Le.Grand at cib.de>
Date:   Wed Sep 13 09:20:26 2017 +0200

    borderline: clang/linux build corrections
    
    Change-Id: Ifc0bb3e0099a9ae5bdebd8cb615828c5cd7ecfd4

diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx
index ce7168040228..c7a6377ab3e8 100644
--- a/svx/source/dialog/framelink.cxx
+++ b/svx/source/dialog/framelink.cxx
@@ -88,7 +88,7 @@ void Style::SetPatternScale( double fScale )
 {
     if(!maImplStyle)
     {
-        if(1.0 == fScale)
+        if(rtl::math::approxEqual(1.0, fScale))
         {
             return;
         }
diff --git a/svx/source/table/viewcontactoftableobj.cxx b/svx/source/table/viewcontactoftableobj.cxx
index 87f44432713e..52d6ce42b943 100644
--- a/svx/source/table/viewcontactoftableobj.cxx
+++ b/svx/source/table/viewcontactoftableobj.cxx
@@ -206,7 +206,6 @@ namespace sdr
             svx::frame::StyleVectorTable aStart;
             svx::frame::StyleVectorTable aEnd;
             const basegfx::B2DVector aY(basegfx::getNormalizedPerpendicular(rX));
-            const double fTwipsToMM(127.0 / 72.0);
 
             /// Fill top-left Style Table
             if(rLeftA.IsUsed()) aStart.push_back(svx::frame::StyleVectorCombination(rLeftA, -aY, bHor ? true : false));
@@ -350,7 +349,6 @@ namespace sdr
                                         const basegfx::B2DPoint aOrigin(aCellMatrix * basegfx::B2DPoint(0.0, 0.0));
                                         const basegfx::B2DVector aX(aCellMatrix * basegfx::B2DVector(1.0, 0.0));
                                         const basegfx::B2DVector aY(aCellMatrix * basegfx::B2DVector(0.0, 1.0));
-                                        const double fTwipsToMM(127.0 / 72.0);
 
                                         if(aLeftLine.IsUsed())
                                         {