[Libreoffice-commits] core.git: include/svx svx/source
Noel Grandin
noel.grandin at collabora.co.uk
Thu May 17 09:19:49 UTC 2018
include/svx/ctredlin.hxx | 1
include/svx/fontlb.hxx | 2 -
include/svx/galmisc.hxx | 1
include/svx/imapdlg.hxx | 1
include/svx/svdotext.hxx | 1
include/svx/tbxcolorupdate.hxx | 1
svx/source/dialog/_contdlg.cxx | 2 -
svx/source/dialog/contimp.hxx | 1
svx/source/dialog/ctredlin.cxx | 6 ++--
svx/source/dialog/fontlb.cxx | 6 ++--
svx/source/dialog/imapdlg.cxx | 2 -
svx/source/gallery2/galmisc.cxx | 7 ++---
svx/source/svdraw/svdotext.cxx | 5 ---
svx/source/table/svdotable.cxx | 1
svx/source/tbxctrls/extrusioncontrols.cxx | 42 +++++++++++++++---------------
svx/source/tbxctrls/extrusioncontrols.hxx | 14 ----------
svx/source/tbxctrls/fontworkgallery.cxx | 27 +++++++------------
svx/source/tbxctrls/tbxcolorupdate.cxx | 5 +--
18 files changed, 46 insertions(+), 79 deletions(-)
New commits:
commit 2d866c25214f2f87ab5d350a252fc844fc1e10a2
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed May 16 11:18:20 2018 +0200
loplugin:unusedfields in svx
Change-Id: I2e34b3819c576072beaacb87cb99d73457667dc3
Reviewed-on: https://gerrit.libreoffice.org/54449
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx
index 8c25a1a272ac..b778bd8015bc 100644
--- a/include/svx/ctredlin.hxx
+++ b/include/svx/ctredlin.hxx
@@ -357,7 +357,6 @@ private:
VclPtr<SvxTPFilter> pTPFilter;
VclPtr<SvxTPView> pTPView;
- sal_uInt16 m_nViewPageId;
sal_uInt16 m_nFilterPageId;
public:
diff --git a/include/svx/fontlb.hxx b/include/svx/fontlb.hxx
index f0d7d75a1e8b..d905cb861867 100644
--- a/include/svx/fontlb.hxx
+++ b/include/svx/fontlb.hxx
@@ -56,8 +56,6 @@ public:
class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxFontListBox : public SvTabListBox
{
private:
- vcl::Font maStdFont; /// Used for entries without specific font.
-
// The following members are used to store additional parameters for InitEntry().
vcl::Font maEntryFont; /// Current entry font used in InitEntry().
const Color* mpEntryColor; /// Current entry color used in InitEntry().
diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx
index d48f144ec514..6228aa173a46 100644
--- a/include/svx/galmisc.hxx
+++ b/include/svx/galmisc.hxx
@@ -121,7 +121,6 @@ class GraphicFilter;
class SVX_DLLPUBLIC GalleryProgress
{
css::uno::Reference< css::awt::XProgressBar > mxProgressBar;
- GraphicFilter* mpFilter;
public:
diff --git a/include/svx/imapdlg.hxx b/include/svx/imapdlg.hxx
index 836d357b1eee..aa2c85496de8 100644
--- a/include/svx/imapdlg.hxx
+++ b/include/svx/imapdlg.hxx
@@ -111,7 +111,6 @@ class SVX_DLLPUBLIC SvxIMapDlg : public SfxModelessDialog // SfxFloatingWindow
sal_uInt16 mnPropertyId;
sal_uInt16 mnCloseId;
- Size aLastSize;
VclPtr<IMapWindow> pIMapWnd;
IMapOwnData* pOwnData;
void* pCheckObj;
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index daa749d2bf08..912780c12320 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -228,7 +228,6 @@ protected:
// bTextFrame=sal_True.
bool bTextFrame : 1;
bool bNoShear : 1; // disable shearing (->graphic+Ole+TextFrame)
- bool bNoMirror : 1; // disable mirroring (->Ole,TextFrame)
bool bTextSizeDirty : 1;
bool mbInEditMode : 1; // Is this text object in edit mode?
diff --git a/include/svx/tbxcolorupdate.hxx b/include/svx/tbxcolorupdate.hxx
index 8d0d3abbed96..2de39549063f 100644
--- a/include/svx/tbxcolorupdate.hxx
+++ b/include/svx/tbxcolorupdate.hxx
@@ -55,7 +55,6 @@ namespace svx
bool mbWideButton;
sal_uInt16 mnBtnId;
- sal_uInt16 mnSlotId;
VclPtr<ToolBox> mpTbx;
Color maCurColor;
tools::Rectangle maUpdRect;
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index 08ae8de6a660..a8a9d47708f1 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -279,7 +279,7 @@ SvxSuperContourDlg::SvxSuperContourDlg(SfxBindings *_pBindings, SfxChildWindow *
m_pMtfTolerance->SetPosPixel( aPos );
m_pMtfTolerance->SetValue( 10 );
- SetMinOutputSizePixel( aLastSize = GetOutputSizePixel() );
+ SetMinOutputSizePixel( GetOutputSizePixel() );
m_pStbStatus->InsertItem( 1, 130, StatusBarItemBits::Left | StatusBarItemBits::In | StatusBarItemBits::AutoSize );
m_pStbStatus->InsertItem( 2, 10 + GetTextWidth( " 9999,99 cm / 9999,99 cm " ) );
diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx
index efc25ad375c7..8a077da01871 100644
--- a/svx/source/dialog/contimp.hxx
+++ b/svx/source/dialog/contimp.hxx
@@ -51,7 +51,6 @@ class SvxSuperContourDlg : public SvxContourDlg
tools::PolyPolygon aUpdatePolyPoly;
Idle aUpdateIdle;
Idle aCreateIdle;
- Size aLastSize;
void* pUpdateEditingObject;
void* pCheckObj;
SvxContourDlgItem aContourItem;
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index 61f97846caa6..4d475541fb98 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -1060,14 +1060,14 @@ SvxAcceptChgCtr::SvxAcceptChgCtr(vcl::Window* pParent, VclBuilderContainer* pTop
pTPFilter = VclPtr<SvxTPFilter>::Create(this);
pTPView = VclPtr<SvxTPView>::Create(this, pTopLevel);
- m_nViewPageId = GetPageId("view");
+ sal_uInt16 nViewPageId = GetPageId("view");
m_nFilterPageId = GetPageId("filter");
- SetTabPage(m_nViewPageId, pTPView);
+ SetTabPage(nViewPageId, pTPView);
SetTabPage(m_nFilterPageId, pTPFilter);
pTPFilter->SetRedlinTable(pTPView->GetTableControl());
- SetCurPageId(m_nViewPageId);
+ SetCurPageId(nViewPageId);
Show();
}
diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx
index a2e4b6dde8c3..20a9ede5555b 100644
--- a/svx/source/dialog/fontlb.cxx
+++ b/svx/source/dialog/fontlb.cxx
@@ -79,12 +79,12 @@ void SvLBoxFontString::InitViewData( SvTreeListBox* pView, SvTreeListEntry* pEnt
SvxFontListBox::SvxFontListBox(vcl::Window* pParent, WinBits nStyle)
: SvTabListBox(pParent, nStyle)
- , maStdFont(GetFont())
, mpEntryColor(nullptr)
, mbUseFont(false)
{
- maStdFont.SetTransparent(true);
- maEntryFont = maStdFont;
+ vcl::Font aStdFont(GetFont()); // Used for entries without specific font.
+ aStdFont.SetTransparent(true);
+ maEntryFont = aStdFont;
}
VCL_BUILDER_FACTORY_CONSTRUCTOR(SvxFontListBox, WB_TABSTOP)
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index 3824265961b2..111635cabb79 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -187,7 +187,7 @@ SvxIMapDlg::SvxIMapDlg(SfxBindings *_pBindings, SfxChildWindow *pCW, vcl::Window
m_pTbxIMapDlg1->CheckItem( mnSelectId );
TbxClickHdl( m_pTbxIMapDlg1 );
- SetMinOutputSizePixel( aLastSize = GetOutputSizePixel() );
+ SetMinOutputSizePixel( GetOutputSizePixel() );
m_pStbStatus->InsertItem( 1, 130, StatusBarItemBits::Left | StatusBarItemBits::In | StatusBarItemBits::AutoSize );
m_pStbStatus->InsertItem( 2, 10 + GetTextWidth( " 9999,99 cm / 9999,99 cm " ) );
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index 94abe00ce6b5..99b2b2628537 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -330,8 +330,7 @@ bool KillFile( const INetURLObject& rURL )
}
-GalleryProgress::GalleryProgress( GraphicFilter* pFilter ) :
- mpFilter( pFilter )
+GalleryProgress::GalleryProgress( GraphicFilter* pFilter )
{
uno::Reference< lang::XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() );
@@ -347,10 +346,10 @@ GalleryProgress::GalleryProgress( GraphicFilter* pFilter ) :
{
OUString aProgressText;
- if( mpFilter )
+ if( pFilter )
{
aProgressText = SvxResId(RID_SVXSTR_GALLERY_FILTER);
-// mpFilter->SetUpdatePercentHdl( LINK( this, GalleryProgress, Update ) ); // sj: progress wasn't working up from SO7 at all
+// pFilter->SetUpdatePercentHdl( LINK( this, GalleryProgress, Update ) ); // sj: progress wasn't working up from SO7 at all
// // so I am removing this. The gallery progress should
// // be changed to use the XStatusIndicator instead of XProgressMonitor
}
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 8576b406370e..686a1b76e5d1 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -84,7 +84,6 @@ SdrTextObj::SdrTextObj(SdrModel& rSdrModel)
bTextSizeDirty=false;
bTextFrame=false;
bNoShear=false;
- bNoMirror=false;
bDisableAutoWidthOnDragging=false;
mbInEditMode = false;
@@ -108,7 +107,6 @@ SdrTextObj::SdrTextObj(
bTextSizeDirty=false;
bTextFrame=false;
bNoShear=false;
- bNoMirror=false;
bDisableAutoWidthOnDragging=false;
ImpJustifyRect(maRect);
@@ -132,7 +130,6 @@ SdrTextObj::SdrTextObj(
bTextSizeDirty=false;
bTextFrame=true;
bNoShear=true;
- bNoMirror=true;
bDisableAutoWidthOnDragging=false;
mbInEditMode = false;
@@ -157,7 +154,6 @@ SdrTextObj::SdrTextObj(
bTextSizeDirty=false;
bTextFrame=true;
bNoShear=true;
- bNoMirror=true;
bDisableAutoWidthOnDragging=false;
ImpJustifyRect(maRect);
@@ -1030,7 +1026,6 @@ SdrTextObj& SdrTextObj::operator=(const SdrTextObj& rObj)
// Not all of the necessary parameters were copied yet.
bNoShear = rObj.bNoShear;
- bNoMirror = rObj.bNoMirror;
bDisableAutoWidthOnDragging = rObj.bDisableAutoWidthOnDragging;
SdrText* pText = getActiveText();
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index c1ea8b2f9daf..369a04b7437a 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -1774,7 +1774,6 @@ SdrTableObj& SdrTableObj::operator=(const SdrTableObj& rObj)
aTextSize = rObj.aTextSize;
bTextSizeDirty = rObj.bTextSizeDirty;
bNoShear = rObj.bNoShear;
- bNoMirror = rObj.bNoMirror;
bDisableAutoWidthOnDragging = rObj.bDisableAutoWidthOnDragging;
// use SdrTableObjImpl::operator= now to
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index 71e4a56eec34..93cea5a897ab 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -375,12 +375,6 @@ ExtrusionDepthWindow::ExtrusionDepthWindow(
vcl::Window* pParentWindow
) : ToolbarMenu( rController.getFrameInterface(), pParentWindow, WB_STDPOPUP )
, mrController( rController )
- , maImgDepth0(BitmapEx(RID_SVXBMP_DEPTH_0))
- , maImgDepth1(BitmapEx(RID_SVXBMP_DEPTH_1))
- , maImgDepth2(BitmapEx(RID_SVXBMP_DEPTH_2))
- , maImgDepth3(BitmapEx(RID_SVXBMP_DEPTH_3))
- , maImgDepth4(BitmapEx(RID_SVXBMP_DEPTH_4))
- , maImgDepthInfinity(BitmapEx(RID_SVXBMP_DEPTH_INFINITY))
, meUnit(FUNIT_NONE)
, mfDepth( -1.0 )
, msExtrusionDepth( ".uno:ExtrusionDepth" )
@@ -388,12 +382,19 @@ ExtrusionDepthWindow::ExtrusionDepthWindow(
{
SetSelectHdl( LINK( this, ExtrusionDepthWindow, SelectHdl ) );
- appendEntry(0, "", maImgDepth0);
- appendEntry(1, "", maImgDepth1);
- appendEntry(2, "", maImgDepth2);
- appendEntry(3, "", maImgDepth3);
- appendEntry(4, "", maImgDepth4);
- appendEntry(5, SvxResId(RID_SVXSTR_INFINITY), maImgDepthInfinity);
+ Image aImgDepth0(BitmapEx(RID_SVXBMP_DEPTH_0));
+ Image aImgDepth1(BitmapEx(RID_SVXBMP_DEPTH_1));
+ Image aImgDepth2(BitmapEx(RID_SVXBMP_DEPTH_2));
+ Image aImgDepth3(BitmapEx(RID_SVXBMP_DEPTH_3));
+ Image aImgDepth4(BitmapEx(RID_SVXBMP_DEPTH_4));
+ Image aImgDepthInfinity(BitmapEx(RID_SVXBMP_DEPTH_INFINITY));
+
+ appendEntry(0, "", aImgDepth0);
+ appendEntry(1, "", aImgDepth1);
+ appendEntry(2, "", aImgDepth2);
+ appendEntry(3, "", aImgDepth3);
+ appendEntry(4, "", aImgDepth4);
+ appendEntry(5, SvxResId(RID_SVXSTR_INFINITY), aImgDepthInfinity);
appendEntry(6, SvxResId(RID_SVXSTR_CUSTOM));
SetOutputSizePixel( getMenuSize() );
@@ -863,17 +864,18 @@ ExtrusionSurfaceWindow::ExtrusionSurfaceWindow(
vcl::Window* pParentWindow)
: ToolbarMenu(rController.getFrameInterface(), pParentWindow, WB_STDPOPUP)
, mrController(rController)
- , maImgSurface1(BitmapEx(RID_SVXBMP_WIRE_FRAME))
- , maImgSurface2(BitmapEx(RID_SVXBMP_MATTE))
- , maImgSurface3(BitmapEx(RID_SVXBMP_PLASTIC))
- , maImgSurface4(BitmapEx(RID_SVXBMP_METAL))
{
SetSelectHdl( LINK( this, ExtrusionSurfaceWindow, SelectHdl ) );
- appendEntry(0, SvxResId(RID_SVXSTR_WIREFRAME), maImgSurface1);
- appendEntry(1, SvxResId(RID_SVXSTR_MATTE), maImgSurface2);
- appendEntry(2, SvxResId(RID_SVXSTR_PLASTIC), maImgSurface3);
- appendEntry(3, SvxResId(RID_SVXSTR_METAL), maImgSurface4);
+ Image aImgSurface1(BitmapEx(RID_SVXBMP_WIRE_FRAME));
+ Image aImgSurface2(BitmapEx(RID_SVXBMP_MATTE));
+ Image aImgSurface3(BitmapEx(RID_SVXBMP_PLASTIC));
+ Image aImgSurface4(BitmapEx(RID_SVXBMP_METAL));
+
+ appendEntry(0, SvxResId(RID_SVXSTR_WIREFRAME), aImgSurface1);
+ appendEntry(1, SvxResId(RID_SVXSTR_MATTE), aImgSurface2);
+ appendEntry(2, SvxResId(RID_SVXSTR_PLASTIC), aImgSurface3);
+ appendEntry(3, SvxResId(RID_SVXSTR_METAL), aImgSurface4);
SetOutputSizePixel( getMenuSize() );
diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx
index 1dfb6f521ad9..eec41088e312 100644
--- a/svx/source/tbxctrls/extrusioncontrols.hxx
+++ b/svx/source/tbxctrls/extrusioncontrols.hxx
@@ -105,17 +105,8 @@ class ExtrusionDepthWindow : public svtools::ToolbarMenu
{
private:
svt::ToolboxController& mrController;
-
- Image maImgDepth0;
- Image maImgDepth1;
- Image maImgDepth2;
- Image maImgDepth3;
- Image maImgDepth4;
- Image maImgDepthInfinity;
-
FieldUnit meUnit;
double mfDepth;
-
const OUString msExtrusionDepth;
const OUString msMetricUnit;
@@ -204,11 +195,6 @@ class ExtrusionSurfaceWindow : public svtools::ToolbarMenu
private:
svt::ToolboxController& mrController;
- Image maImgSurface1;
- Image maImgSurface2;
- Image maImgSurface3;
- Image maImgSurface4;
-
DECL_LINK( SelectHdl, ToolbarMenu*, void );
void implSetSurface( int nSurface, bool bEnabled );
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index 2efa87a1592d..06c0da159507 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -273,12 +273,6 @@ public:
private:
svt::ToolboxController& mrController;
- Image maImgAlgin1;
- Image maImgAlgin2;
- Image maImgAlgin3;
- Image maImgAlgin4;
- Image maImgAlgin5;
-
const OUString msFontworkAlignment;
DECL_LINK( SelectHdl, ToolbarMenu*, void );
@@ -289,20 +283,21 @@ private:
FontworkAlignmentWindow::FontworkAlignmentWindow(svt::ToolboxController& rController, vcl::Window* pParentWindow)
: ToolbarMenu(rController.getFrameInterface(), pParentWindow, WB_STDPOPUP)
, mrController(rController)
- , maImgAlgin1(BitmapEx(RID_SVXBMP_FONTWORK_ALIGN_LEFT))
- , maImgAlgin2(BitmapEx(RID_SVXBMP_FONTWORK_ALIGN_CENTER))
- , maImgAlgin3(BitmapEx(RID_SVXBMP_FONTWORK_ALIGN_RIGHT))
- , maImgAlgin4(BitmapEx(RID_SVXBMP_FONTWORK_ALIGN_WORD))
- , maImgAlgin5(BitmapEx(RID_SVXBMP_FONTWORK_ALIGN_STRETCH))
, msFontworkAlignment(".uno:FontworkAlignment")
{
SetSelectHdl( LINK( this, FontworkAlignmentWindow, SelectHdl ) );
- appendEntry(0, SvxResId(RID_SVXSTR_ALIGN_LEFT), maImgAlgin1);
- appendEntry(1, SvxResId(RID_SVXSTR_ALIGN_CENTER), maImgAlgin2);
- appendEntry(2, SvxResId(RID_SVXSTR_ALIGN_RIGHT), maImgAlgin3);
- appendEntry(3, SvxResId(RID_SVXSTR_ALIGN_WORD), maImgAlgin4);
- appendEntry(4, SvxResId(RID_SVXSTR_ALIGN_STRETCH), maImgAlgin5);
+ Image aImgAlgin1(BitmapEx(RID_SVXBMP_FONTWORK_ALIGN_LEFT));
+ Image aImgAlgin2(BitmapEx(RID_SVXBMP_FONTWORK_ALIGN_CENTER));
+ Image aImgAlgin3(BitmapEx(RID_SVXBMP_FONTWORK_ALIGN_RIGHT));
+ Image aImgAlgin4(BitmapEx(RID_SVXBMP_FONTWORK_ALIGN_WORD));
+ Image aImgAlgin5(BitmapEx(RID_SVXBMP_FONTWORK_ALIGN_STRETCH));
+
+ appendEntry(0, SvxResId(RID_SVXSTR_ALIGN_LEFT), aImgAlgin1);
+ appendEntry(1, SvxResId(RID_SVXSTR_ALIGN_CENTER), aImgAlgin2);
+ appendEntry(2, SvxResId(RID_SVXSTR_ALIGN_RIGHT), aImgAlgin3);
+ appendEntry(3, SvxResId(RID_SVXSTR_ALIGN_WORD), aImgAlgin4);
+ appendEntry(4, SvxResId(RID_SVXSTR_ALIGN_STRETCH), aImgAlgin5);
SetOutputSizePixel( getMenuSize() );
diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx
index 07d952e42368..eb877795c3ae 100644
--- a/svx/source/tbxctrls/tbxcolorupdate.cxx
+++ b/svx/source/tbxctrls/tbxcolorupdate.cxx
@@ -31,16 +31,15 @@
namespace svx
{
ToolboxButtonColorUpdater::ToolboxButtonColorUpdater(
- sal_uInt16 nId, sal_uInt16 nTbxBtnId, ToolBox* pToolBox, bool bWideButton)
+ sal_uInt16 nSlotId, sal_uInt16 nTbxBtnId, ToolBox* pToolBox, bool bWideButton)
: mbWideButton(bWideButton)
, mnBtnId(nTbxBtnId)
- , mnSlotId(nId)
, mpTbx(pToolBox)
, maCurColor(COL_TRANSPARENT)
{
DBG_ASSERT(pToolBox, "ToolBox not found :-(");
mbWasHiContrastMode = pToolBox && pToolBox->GetSettings().GetStyleSettings().GetHighContrastMode();
- switch (mnSlotId)
+ switch (nSlotId)
{
case SID_ATTR_CHAR_COLOR:
case SID_ATTR_CHAR_COLOR2:
More information about the Libreoffice-commits
mailing list