diff options
| author | Winfried Donkers <osc@dci-electronics.nl> | 2012-03-03 09:55:11 +0100 |
|---|---|---|
| committer | Ivan Timofeev <timofeev.i.s@gmail.com> | 2012-03-06 19:59:45 +0400 |
| commit | f57e65477038e0151e1d69599351173ed2fdd044 (patch) | |
| tree | 20cbcaf24c64db1ddd6581aa99c90a65eb6f92da /sw | |
| parent | Resolves: rhbz#800272 complain about unknown command-line options (diff) | |
| download | core-f57e65477038e0151e1d69599351173ed2fdd044.tar.gz core-f57e65477038e0151e1d69599351173ed2fdd044.zip | |
fdo#45671 writer par. bg color simplified code
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/inc/basesh.hxx | 3 | ||||
| -rw-r--r-- | sw/source/ui/shells/basesh.cxx | 10 |
2 files changed, 0 insertions, 13 deletions
diff --git a/sw/source/ui/inc/basesh.hxx b/sw/source/ui/inc/basesh.hxx index d5449227cacc..93ef62683d40 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 f8369bfeec2d..b700bf7ccd58 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; |