diff options
| author | Noel Grandin <noel@peralex.com> | 2016-06-27 15:11:50 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-06-28 06:25:28 +0000 |
| commit | 4391d400e01e4a756d03d357d81e9769c34ae83b (patch) | |
| tree | be0c136884f5c77d3494e9bce492937fde79bb2a /svx/source/dialog/fntctrl.cxx | |
| parent | 2a4c68a6ffa46eb7b6d7fafdf5e9c19970cdd6a5 (diff) | |
loplugin:singlevalfields in svx
Change-Id: I7a2d11e1343f6382c3556c4536fc8ae40e210b74
Reviewed-on: https://gerrit.libreoffice.org/26710
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'svx/source/dialog/fntctrl.cxx')
| -rw-r--r-- | svx/source/dialog/fntctrl.cxx | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index 897fe70532ef..367b3be927a4 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -153,7 +153,6 @@ class FontPrevWin_Impl bool mbSelection : 1; bool mbGetSelection : 1; bool mbUseResText : 1; - bool mbPreviewBackgroundToCharacter : 1; bool mbTwoLines : 1; bool mbUseFontNameAsText : 1; bool mbTextInited : 1; @@ -175,7 +174,6 @@ public: mbSelection(false), mbGetSelection(false), mbUseResText(false), - mbPreviewBackgroundToCharacter(false), mbTwoLines(false), mbUseFontNameAsText(false), mbTextInited(false) @@ -1302,7 +1300,7 @@ void SvxFontPrevWindow::Init(const SfxItemSet& rSet) // Background bool bTransparent; - nWhich = rSet.GetPool()->GetWhich(pImpl->mbPreviewBackgroundToCharacter ? SID_ATTR_BRUSH : SID_ATTR_BRUSH_CHAR); + nWhich = SID_ATTR_BRUSH_CHAR; if (ISITEMSET) { const SvxBrushItem& rBrush = static_cast<const SvxBrushItem&>( rSet.Get( nWhich ) ); @@ -1320,15 +1318,12 @@ void SvxFontPrevWindow::Init(const SfxItemSet& rSet) rCTLFont.SetTransparent( bTransparent ); Color aBackCol( COL_TRANSPARENT ); - if (!pImpl->mbPreviewBackgroundToCharacter) + nWhich = rSet.GetPool()->GetWhich( SID_ATTR_BRUSH ); + if (ISITEMSET) { - nWhich = rSet.GetPool()->GetWhich( SID_ATTR_BRUSH ); - if (ISITEMSET) - { - const SvxBrushItem& rBrush = static_cast<const SvxBrushItem&>(rSet.Get(nWhich)); - if (GPOS_NONE == rBrush.GetGraphicPos()) - aBackCol = rBrush.GetColor(); - } + const SvxBrushItem& rBrush = static_cast<const SvxBrushItem&>(rSet.Get(nWhich)); + if (GPOS_NONE == rBrush.GetGraphicPos()) + aBackCol = rBrush.GetColor(); } SetBackColor(aBackCol); |