diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-06-30 16:29:48 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-07-01 12:23:57 +0000 |
| commit | 1ad76412e3fa74f2b7547d7cc283933775b2760e (patch) | |
| tree | 376e44319726bd9fa348ce15f704c6d6abdfbe7d /sw | |
| parent | c14063522433306c9b7f598b623d54fefd2a443d (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
(cherry picked from commit 1caad856de1c1c5b0a8c31d2226416a2db9632cd)
Reviewed-on: https://gerrit.libreoffice.org/9987
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/frmdlg/frmpage.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index de476b5ef73c..0fbdfb94ae97 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -2595,8 +2595,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 @@ -2654,7 +2658,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 ); |