From 1bf97d99e7529f1a69688522ac271636059a3391 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Sat, 25 Jun 2016 23:03:53 +0200
Subject: loplugin:singlevalfields in sw(part1)

Change-Id: I0c6f545a8818da1f226c3958580abeeff0dc87b7
Reviewed-on: https://gerrit.libreoffice.org/26664
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
---
 sw/source/ui/config/optpage.cxx | 8 --------
 sw/source/ui/frmdlg/frmpage.cxx | 4 +---
 2 files changed, 1 insertion(+), 11 deletions(-)

(limited to 'sw/source/ui')

diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 84c3cf26df57..2369aa04b729 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -549,7 +549,6 @@ SwStdFontTabPage::SwStdFontTabPage( vcl::Window* pParent,
     m_bSetLabelDefault(true),
     m_bIdxDefault(false),
     m_bSetIdxDefault(true),
-    m_bDeletePrinter(false),
 
     m_bListHeightDefault    (false),
     m_bSetListHeightDefault (false),
@@ -611,8 +610,6 @@ SwStdFontTabPage::~SwStdFontTabPage()
 void SwStdFontTabPage::dispose()
 {
     delete m_pFontList;
-    if (m_bDeletePrinter)
-        m_pPrt.disposeAndClear();
     m_pLabelFT.clear();
     m_pStandardBox.clear();
     m_pStandardHeightLB.clear();
@@ -802,11 +799,6 @@ void SwStdFontTabPage::Reset( const SfxItemSet* rSet)
 
     const SfxPoolItem* pItem;
 
-    if (m_bDeletePrinter)
-    {
-        m_pPrt.disposeAndClear();
-    }
-
     if(SfxItemState::SET == rSet->GetItemState(FN_PARAM_PRINTER, false, &pItem))
     {
         m_pPrt = static_cast<SfxPrinter*>(static_cast<const SwPtrItem*>(pItem)->GetValue());
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index df4760deb996..7f90f17dec1a 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -2627,7 +2627,6 @@ BmpWindow::BmpWindow(vcl::Window* pPar, WinBits nStyle)
     , bHorz(false)
     , bVert(false)
     , bGraphic(false)
-    , bLeftAlign(false)
 {
 }
 
@@ -2675,8 +2674,7 @@ void BmpWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
         else
             aPntSz.Width() = aPntSz.Height() * nRelGrf /100;
 
-        if (!bLeftAlign)
-            aPntPos.X() += nWidth - aPntSz.Width() ;
+        aPntPos.X() += nWidth - aPntSz.Width() ;
     }
 
     // #i119307# clear window background, the graphic might have transparency
-- 
cgit v1.2.3