[Libreoffice-commits] core.git: sd/source
Jan Holesovsky
kendy at collabora.com
Thu Jan 14 14:32:04 PST 2016
sd/source/ui/view/drviews4.cxx | 3 +++
sd/source/ui/view/drviewsa.cxx | 3 +++
2 files changed, 6 insertions(+)
New commits:
commit ce953d164223adcec07d18109d447125ec758ce6
Author: Jan Holesovsky <kendy at collabora.com>
Date: Thu Jan 14 23:29:23 2016 +0100
sd lok: More places where we need to force the transparent color for bg.
Change-Id: Ic6e0ed45b118b27a86f8657671ae877ce494c5d4
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index a252176..93e698e 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -20,6 +20,7 @@
#include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
#include "DrawViewShell.hxx"
+#include <comphelper/lok.hxx>
#include <vcl/msgbox.hxx>
#include <svl/urlbmk.hxx>
#include <svx/svdpagv.hxx>
@@ -345,6 +346,8 @@ void DrawViewShell::MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin)
Color aFillColor;
aFillColor = Color( aColorConfig.GetColorValue( svtools::APPBACKGROUND ).nColor );
+ if (comphelper::LibreOfficeKit::isActive())
+ aFillColor = COL_TRANSPARENT;
mpDrawView->SetApplicationBackgroundColor(aFillColor);
}
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index fd7de69..7545856 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -20,6 +20,7 @@
#include "DrawViewShell.hxx"
#include <com/sun/star/scanner/ScannerManager.hpp>
#include <cppuhelper/implbase.hxx>
+#include <comphelper/lok.hxx>
#include <comphelper/processfactory.hxx>
#include <editeng/sizeitem.hxx>
#include <svx/svdlayer.hxx>
@@ -208,6 +209,8 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
svtools::ColorConfig aColorConfig;
mnAppBackgroundColor = Color( aColorConfig.GetColorValue( svtools::APPBACKGROUND ).nColor );
+ if (comphelper::LibreOfficeKit::isActive())
+ mnAppBackgroundColor = COL_TRANSPARENT;
mpFrameView->Connect();
More information about the Libreoffice-commits
mailing list