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

[Katarina Behrens]

 svx/source/sdr/contact/viewcontactofsdrpage.cxx       |    4 +++-
 svx/source/sdr/contact/viewobjectcontactofpageobj.cxx |    3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 5f15c7866ef03d7cbbd967e341651fa0c7b64bcd
Author: Katarina Behrens <katarina.behr...@cib.de>
Date:   Wed Mar 30 14:17:18 2016 +0200

    tdf#89420: Honour doc boundaries (in)visible also in Impress/Draw
    
    I haven't figured out how NOT to draw the frame at all, so let's at
    least draw it using the same colour as document background
    
    Change-Id: I3e31bec65ab34772bd2f8137be7e5e5258758184
    Reviewed-on: https://gerrit.libreoffice.org/23652
    Reviewed-by: Katarina Behrens <katarina.behr...@cib.de>
    Tested-by: Jenkins <c...@libreoffice.org>

diff --git a/svx/source/sdr/contact/viewcontactofsdrpage.cxx 
b/svx/source/sdr/contact/viewcontactofsdrpage.cxx
index dd12242..607eae0 100644
--- a/svx/source/sdr/contact/viewcontactofsdrpage.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrpage.cxx
@@ -360,7 +360,9 @@ drawinglayer::primitive2d::Primitive2DContainer 
ViewContactOfInnerPageBorder::cr
     }
     else
     {
-        aBorderColor = 
aColorConfig.GetColorValue(svtools::DOCBOUNDARIES).nColor;
+        svtools::ColorConfigValue aBorderConfig = 
aColorConfig.GetColorValue(svtools::DOCBOUNDARIES);
+        aBorderColor = aBorderConfig.bIsVisible ? aBorderConfig.nColor :
+                           
aColorConfig.GetColorValue(svtools::DOCCOLOR).nColor;
     }
 
     // create page outer border primitive
diff --git a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx 
b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
index 6f30fb7..c6c1757 100644
--- a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
@@ -230,7 +230,8 @@ drawinglayer::primitive2d::Primitive2DContainer 
ViewObjectContactOfPageObj::crea
             // Recursion is possible. Create a replacement primitive
             xPageContent.resize(2);
             const Color 
aDocColor(aColorConfig.GetColorValue(svtools::DOCCOLOR).nColor);
-            const Color 
aBorderColor(aColorConfig.GetColorValue(svtools::DOCBOUNDARIES).nColor);
+            svtools::ColorConfigValue aBorderConfig = 
aColorConfig.GetColorValue(svtools::DOCBOUNDARIES);
+            const Color aBorderColor = aBorderConfig.bIsVisible ? 
aBorderConfig.nColor : aDocColor;
             const basegfx::B2DRange aPageBound(0.0, 0.0, fPageWidth, 
fPageHeight);
             const basegfx::B2DPolygon 
aOutline(basegfx::tools::createPolygonFromRect(aPageBound));
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits