summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-06-30 16:29:48 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-06-30 16:31:49 +0100
commit1caad856de1c1c5b0a8c31d2226416a2db9632cd (patch)
tree750edb2cd848a0bb822c3121303d4313ae91c09f
parent01da41b3085d4873dd69fd053102506de861db57 (diff)
Resolves: fdo#80681 widget is not transparent
regression from 12dfca2ea61116665a7abefd43a9a4caa2b8920b Author: Armin Le Grand <alg@apache.org> Date: Mon May 14 15:16:00 2012 +0000 Resolves: #i119307# added deletion of sw's BmpWindow control... ...due to the fact that graphics may be transparent Change-Id: I7eb2ee8ed53f0ef907a4573a735c71de43b6e8d3
-rw-r--r--sw/source/ui/frmdlg/frmpage.cxx10
1 files changed, 7 insertions, 3 deletions
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 6ef28119b7b6..3197345f9527 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -2606,8 +2606,12 @@ BmpWindow::BmpWindow(Window* pPar, WinBits nStyle)
, bGraphic(false)
, bLeftAlign(false)
{
- // #i119307# use background, the graphic might have transparency
- SetBackground(Wallpaper(Color(COL_WHITE)));
+ SetBackground();
+ SetPaintTransparent(sal_True);
+ // #i119307# the graphic might have transparency, set up white as the color
+ // to use when drawing a rectangle under the image
+ SetLineColor(COL_WHITE);
+ SetFillColor(COL_WHITE);
}
Size BmpWindow::GetOptimalSize() const
@@ -2665,7 +2669,7 @@ void BmpWindow::Paint( const Rectangle& )
}
// #i119307# clear window background, the graphic might have transparency
- Erase();
+ DrawRect(Rectangle(aPntPos, aPntSz));
if ( bGraphic )
aGraphic.Draw( this, aPntPos, aPntSz );