diff options
| author | Armin Le Grand <alg@apache.org> | 2012-05-14 15:16:00 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-03-16 09:19:40 +0000 |
| commit | 12dfca2ea61116665a7abefd43a9a4caa2b8920b (patch) | |
| tree | 841ad324a9b7000c9f84b047c2be069d002bfe1a | |
| parent | 61a194fbc1bd2624d46ccd2d71e5f1422ef522f1 (diff) | |
Resolves: #i119307# added deletion of sw's BmpWindow control...
...due to the fact that graphics may be transparent
Conflicts:
sw/source/ui/frmdlg/frmpage.cxx
Change-Id: I049cc5a6abf1a19ef181991bb1015e0708dc1cc2
| -rw-r--r-- | sw/source/ui/frmdlg/frmpage.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 48a9dbf190b6..a387a377cde6 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -2525,8 +2525,8 @@ BmpWindow::BmpWindow( Window* pPar, sal_uInt16 nId, bGraphic(sal_False), bLeftAlign(false) { - SetBackground(); - SetPaintTransparent(sal_True); + // #i119307# use background, the graphic might have transparency + SetBackground(Wallpaper(Color(COL_WHITE))); } void BmpWindow::Paint( const Rectangle& ) @@ -2573,6 +2573,9 @@ void BmpWindow::Paint( const Rectangle& ) aPntSz.Width() *= -1; } + // #i119307# clear window background, the graphic might have transparency + Erase(); + if ( bGraphic ) aGraphic.Draw( this, aPntPos, aPntSz ); else |