sw/source/ui/inc/basesh.hxx | 3 --- sw/source/ui/shells/basesh.cxx | 11 +++-------- 2 files changed, 3 insertions(+), 11 deletions(-)
New commits: commit ee77e4a776de74de06ffb51ebe3a9f597e532e8a Author: Ivan Timofeev <timofeev....@gmail.com> Date: Tue Mar 6 19:26:34 2012 +0400 repair the "No Fill" button which sets a transparent background in Writer see commit 836d98646203e0d9d3916571ed55d6572c2cb3dc diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx index b700bf7..e78f2a3 100644 --- a/sw/source/ui/shells/basesh.cxx +++ b/sw/source/ui/shells/basesh.cxx @@ -2263,6 +2263,11 @@ void SwBaseShell::ExecBckCol(SfxRequest& rReq) aBrushItem.SetColor( rNewColor ); GetView().GetViewFrame()->GetBindings().SetState(rNewColorItem); } + else + { + aBrushItem.SetColor( COL_TRANSPARENT ); + rReq.AppendItem( SvxColorItem( Color( COL_TRANSPARENT ), nSlot ) ); + } } break; commit f57e65477038e0151e1d69599351173ed2fdd044 Author: Winfried Donkers <o...@dci-electronics.nl> Date: Sat Mar 3 09:55:11 2012 +0100 fdo#45671 writer par. bg color simplified code diff --git a/sw/source/ui/inc/basesh.hxx b/sw/source/ui/inc/basesh.hxx index d544922..93ef626 100644 --- a/sw/source/ui/inc/basesh.hxx +++ b/sw/source/ui/inc/basesh.hxx @@ -50,7 +50,6 @@ struct DBTextStruct_Impl; class SwBaseShell: public SfxShell { SwView &rView; - static Color mBackgroundColor; // DragMode static FlyMode eFrameMode; @@ -121,8 +120,6 @@ public: static void SetFrmMode( FlyMode eMode, SwWrtShell *pShell ); // with update! static void _SetFrmMode( FlyMode eMode ) { eFrameMode = eMode; } static FlyMode GetFrmMode() { return eFrameMode; } - Color GetBackgroundColor() { return mBackgroundColor; } - void SetBackgroundColor( const Color& clr ) { mBackgroundColor = clr; } }; diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx index f8369bf..b700bf7 100644 --- a/sw/source/ui/shells/basesh.cxx +++ b/sw/source/ui/shells/basesh.cxx @@ -1927,9 +1927,6 @@ void SwBaseShell::SetFrmMode(FlyMode eMode, SwWrtShell *pSh ) /*-------------------------------------------------------------------- Beschreibung: Ctor --------------------------------------------------------------------*/ -// STATIC DATA ----------------------------------------------------------- -Color SwBaseShell::mBackgroundColor = COL_TRANSPARENT; -// ----------------------------------------------------------- SwBaseShell::SwBaseShell(SwView& rVw) : SfxShell( &rVw ), @@ -2264,15 +2261,8 @@ void SwBaseShell::ExecBckCol(SfxRequest& rReq) pArgs->Get(SID_BACKGROUND_COLOR); const Color& rNewColor = rNewColorItem.GetValue(); aBrushItem.SetColor( rNewColor ); - SetBackgroundColor( rNewColor ); GetView().GetViewFrame()->GetBindings().SetState(rNewColorItem); } - else - { - // call without arguments, use last used background color - aBrushItem.SetColor( GetBackgroundColor() ); - rReq.AppendItem( SvxColorItem( GetBackgroundColor(), nSlot ) ); - } } break; _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits