diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-02-22 10:22:12 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-02-22 11:12:00 +0100 |
commit | b1facbf894a9870f501049409effa937a4ff3488 (patch) | |
tree | 2679cd1802ed8557f53ac4e436a4ae2e1e052f82 /svx | |
parent | f7acbfe2322477b25e5a21b414fd5f5e129eafb1 (diff) |
loplugin:unusedfields in svx
Change-Id: I9f6a21066224c449d3fcc8a0d97cb32dae0a65f6
Reviewed-on: https://gerrit.libreoffice.org/68193
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx')
-rw-r--r-- | svx/inc/GalleryControl.hxx | 1 | ||||
-rw-r--r-- | svx/source/customshapes/EnhancedCustomShape3d.cxx | 1 | ||||
-rw-r--r-- | svx/source/dialog/dlgctl3d.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/paraprev.cxx | 1 | ||||
-rw-r--r-- | svx/source/engine3d/camera3d.cxx | 13 | ||||
-rw-r--r-- | svx/source/engine3d/obj3d.cxx | 14 | ||||
-rw-r--r-- | svx/source/engine3d/view3d.cxx | 3 | ||||
-rw-r--r-- | svx/source/form/dataaccessdescriptor.cxx | 11 | ||||
-rw-r--r-- | svx/source/form/sqlparserclient.cxx | 1 | ||||
-rw-r--r-- | svx/source/gallery2/GalleryControl.cxx | 3 | ||||
-rw-r--r-- | svx/source/inc/sqlparserclient.hxx | 3 | ||||
-rw-r--r-- | svx/source/items/galleryitem.cxx | 1 | ||||
-rw-r--r-- | svx/source/svdraw/svddrgmt.cxx | 1 | ||||
-rw-r--r-- | svx/source/svdraw/svdedxv.cxx | 8 | ||||
-rw-r--r-- | svx/source/svdraw/svdmrkv.cxx | 1 | ||||
-rw-r--r-- | svx/source/svdraw/svdobj.cxx | 1 | ||||
-rw-r--r-- | svx/source/svdraw/svdocirc.cxx | 5 | ||||
-rw-r--r-- | svx/source/svdraw/svdomeas.cxx | 4 | ||||
-rw-r--r-- | svx/source/svdraw/svdview.cxx | 5 | ||||
-rw-r--r-- | svx/source/unodraw/unopage.cxx | 1 | ||||
-rw-r--r-- | svx/source/unodraw/unoshap3.cxx | 1 |
21 files changed, 4 insertions, 77 deletions
diff --git a/svx/inc/GalleryControl.hxx b/svx/inc/GalleryControl.hxx index 5ca673a2dffe..ca56dd2f8788 100644 --- a/svx/inc/GalleryControl.hxx +++ b/svx/inc/GalleryControl.hxx @@ -48,7 +48,6 @@ private: VclPtr<GallerySplitter> mpSplitter; VclPtr<GalleryBrowser1> mpBrowser1; VclPtr<GalleryBrowser2> mpBrowser2; - Size maLastSize; bool mbIsInitialResize; void InitSettings(); diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx index 9601fd4c88da..aac531dd26a3 100644 --- a/svx/source/customshapes/EnhancedCustomShape3d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx @@ -595,7 +595,6 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( rCamera.SetViewWindow( -fW / 2, - fH / 2, fW, fH); basegfx::B3DPoint aLookAt( 0.0, 0.0, 0.0 ); basegfx::B3DPoint aCamPos( 0.0, 0.0, 100.0 ); - rCamera.SetDefaults( basegfx::B3DPoint( 0.0, 0.0, 100.0 ), aLookAt ); rCamera.SetPosAndLookAt( aCamPos, aLookAt ); rCamera.SetFocalLength( 1.0 ); rCamera.SetProjection( eProjectionType ); diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx index 48e6cdb78f01..7dea82cde3f4 100644 --- a/svx/source/dialog/dlgctl3d.cxx +++ b/svx/source/dialog/dlgctl3d.cxx @@ -116,7 +116,6 @@ void Svx3DPreviewControl::Construct() rCamera.SetPosAndLookAt(aCamPos, aLookAt); double fDefaultCamFocal = mp3DView->GetDefaultCamFocal(); rCamera.SetFocalLength(fDefaultCamFocal); - rCamera.SetDefaults(basegfx::B3DPoint(0.0, 0.0, fDefaultCamPosZ), aLookAt); mpScene->SetCamera( rCamera ); mpFmPage->InsertObject( mpScene ); @@ -355,7 +354,6 @@ void Svx3DLightControl::Construct2() rCamera.SetPosAndLookAt(aCamPos, aLookAt); double fDefaultCamFocal = mp3DView->GetDefaultCamFocal(); rCamera.SetFocalLength(fDefaultCamFocal); - rCamera.SetDefaults(basegfx::B3DPoint(0.0, 0.0, fDefaultCamPosZ), aLookAt); mpScene->SetCamera( rCamera ); diff --git a/svx/source/dialog/paraprev.cxx b/svx/source/dialog/paraprev.cxx index 97eb87ecc64e..db8beec709db 100644 --- a/svx/source/dialog/paraprev.cxx +++ b/svx/source/dialog/paraprev.cxx @@ -194,7 +194,6 @@ void SvxParaPrevWindow::DrawParagraph(vcl::RenderContext& rRenderContext) tools::Rectangle aRect(aPnt, aSiz); rRenderContext.DrawRect( aRect ); - Lines[i] = aRect; if (5 == i) { diff --git a/svx/source/engine3d/camera3d.cxx b/svx/source/engine3d/camera3d.cxx index b9ea65e56313..91138d91b33b 100644 --- a/svx/source/engine3d/camera3d.cxx +++ b/svx/source/engine3d/camera3d.cxx @@ -22,8 +22,6 @@ Camera3D::Camera3D(const basegfx::B3DPoint& rPos, const basegfx::B3DPoint& rLookAt, double fFocalLen) : - aResetPos(rPos), - aResetLookAt(rLookAt), fBankAngle(0), bAutoAdjustProjection(true) { @@ -33,21 +31,12 @@ Camera3D::Camera3D(const basegfx::B3DPoint& rPos, const basegfx::B3DPoint& rLook } Camera3D::Camera3D() - : aResetPos(0.0, 0.0, 1.0) - , fFocalLength(35.0) + : fFocalLength(35.0) , fBankAngle(0.0) , bAutoAdjustProjection(false) { } -// Set default values for reset - -void Camera3D::SetDefaults(const basegfx::B3DPoint& rPos, const basegfx::B3DPoint& rLookAt) -{ - aResetPos = rPos; - aResetLookAt = rLookAt; -} - // Set ViewWindow and adjust PRP void Camera3D::SetViewWindow(double fX, double fY, double fW, double fH) diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx index 297719c09435..ed27d7d6953d 100644 --- a/svx/source/engine3d/obj3d.cxx +++ b/svx/source/engine3d/obj3d.cxx @@ -492,17 +492,8 @@ std::unique_ptr<sdr::properties::BaseProperties> E3dCompoundObject::CreateObject } E3dCompoundObject::E3dCompoundObject(SdrModel& rSdrModel) -: E3dObject(rSdrModel), - aMaterialAmbientColor() +: E3dObject(rSdrModel) { - // Set defaults - SetDefaultAttributes(); -} - -void E3dCompoundObject::SetDefaultAttributes() -{ - // Set defaults - aMaterialAmbientColor = COL_BLACK; } E3dCompoundObject::~E3dCompoundObject () @@ -644,9 +635,6 @@ E3dCompoundObject& E3dCompoundObject::operator=(const E3dCompoundObject& rObj) if( this == &rObj ) return *this; E3dObject::operator=(rObj); - - aMaterialAmbientColor = rObj.aMaterialAmbientColor; - return *this; } diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx index a3b3af4d41b7..cb7deb16a2fd 100644 --- a/svx/source/engine3d/view3d.cxx +++ b/svx/source/engine3d/view3d.cxx @@ -1308,7 +1308,6 @@ void E3dView::InitScene(E3dScene* pScene, double fW, double fH, double fCamZ) aCam.SetPosAndLookAt(aCamPos, aLookAt); aCam.SetFocalLength(GetDefaultCamFocal()); - aCam.SetDefaults(basegfx::B3DPoint(0.0, 0.0, fDefaultCamPosZ), aLookAt); pScene->SetCamera(aCam); } @@ -1493,8 +1492,6 @@ void E3dView::ResetCreationActive () void E3dView::InitView () { - aDefaultLightColor = COL_WHITE; - aDefaultAmbientColor = COL_BLACK; mpMirrorOverlay = nullptr; } diff --git a/svx/source/form/dataaccessdescriptor.cxx b/svx/source/form/dataaccessdescriptor.cxx index 04c9976d61ee..09cf6eee3c8b 100644 --- a/svx/source/form/dataaccessdescriptor.cxx +++ b/svx/source/form/dataaccessdescriptor.cxx @@ -44,7 +44,6 @@ namespace svx typedef ::std::map< DataAccessDescriptorProperty, Any > DescriptorValues; DescriptorValues m_aValues; Sequence< PropertyValue > m_aAsSequence; - Reference< XPropertySet > m_xAsSet; typedef ::std::map< OUString, DataAccessDescriptorProperty > MapString2PropertyEntry; @@ -85,8 +84,6 @@ namespace svx ,m_bSequenceOutOfDate( _rSource.m_bSequenceOutOfDate ) ,m_aValues( _rSource.m_aValues ) { - if (!m_bSetOutOfDate) - m_xAsSet = _rSource.m_xAsSet; if (!m_bSequenceOutOfDate) m_aAsSequence = _rSource.m_aAsSequence; } @@ -150,13 +147,7 @@ namespace svx } bool bValidPropsOnly = buildFrom(aValues); - if (bValidPropsOnly) - { - m_xAsSet = _rxValues; - m_bSetOutOfDate = false; - } - else - m_bSetOutOfDate = true; + m_bSetOutOfDate = !bValidPropsOnly; return bValidPropsOnly; } diff --git a/svx/source/form/sqlparserclient.cxx b/svx/source/form/sqlparserclient.cxx index 6bc957270b92..f1cd230a8e0d 100644 --- a/svx/source/form/sqlparserclient.cxx +++ b/svx/source/form/sqlparserclient.cxx @@ -34,7 +34,6 @@ namespace svxform OSQLParserClient::OSQLParserClient(const Reference< XComponentContext >& rxContext) : m_pParser(new OSQLParser(rxContext, getParseContext())) { - m_xContext = rxContext; } std::unique_ptr< ::connectivity::OSQLParseNode > OSQLParserClient::predicateTree( diff --git a/svx/source/gallery2/GalleryControl.cxx b/svx/source/gallery2/GalleryControl.cxx index f54034aa88da..83979938b00d 100644 --- a/svx/source/gallery2/GalleryControl.cxx +++ b/svx/source/gallery2/GalleryControl.cxx @@ -48,7 +48,6 @@ GalleryControl::GalleryControl ( [this] () { return mpBrowser2->SelectTheme(mpBrowser1->GetSelectedTheme()); })), mpBrowser2(VclPtr<GalleryBrowser2>::Create(this, mpGallery)), - maLastSize(GetOutputSizePixel()), mbIsInitialResize(true) { mpBrowser1->SelectTheme(0); @@ -171,8 +170,6 @@ void GalleryControl::Resize() Point( nFrameLen, nSplitPos + nSplitSize ), Size( aNewSize.Width() - nFrameLen2, aNewSize.Height() - nSplitSize - nSplitPos - nFrameLen )); } - - maLastSize = aNewSize; } bool GalleryControl::GalleryKeyInput( const KeyEvent& rKEvt ) diff --git a/svx/source/inc/sqlparserclient.hxx b/svx/source/inc/sqlparserclient.hxx index 7873c41bbf99..231554265a83 100644 --- a/svx/source/inc/sqlparserclient.hxx +++ b/svx/source/inc/sqlparserclient.hxx @@ -41,9 +41,6 @@ namespace svxform class SVX_DLLPUBLIC OSQLParserClient : public ::svxform::OParseContextClient { - private: - css::uno::Reference< css::uno::XComponentContext > m_xContext; - protected: mutable std::shared_ptr< ::connectivity::OSQLParser > m_pParser; diff --git a/svx/source/items/galleryitem.cxx b/svx/source/items/galleryitem.cxx index f5cf28f06906..e03cc9f3417a 100644 --- a/svx/source/items/galleryitem.cxx +++ b/svx/source/items/galleryitem.cxx @@ -114,7 +114,6 @@ bool SvxGalleryItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /* nMemberId m_nType = nType; m_aURL = aURL; - m_aFilterName = aFilterName; m_xDrawing = xDrawing; m_xGraphic = xGraphic; diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index ecb81a3e1299..e6509a6f1a2d 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -3374,7 +3374,6 @@ bool SdrDragCrook::EndSdrDrag(bool bCopy) if (bDoCrook) { getSdrDragView().CrookMarkedObj(aCenter,aRad,eMode,bVertical,!bContortion,bCopy); - getSdrDragView().SetLastCrookCenter(aCenter); } if (bResize && bUndo) diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index aa8eb6f687ed..b498ec5c50fc 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -2290,11 +2290,9 @@ void SdrObjEditView::ImpMacroUp(const Point& rUpPos) { SdrObjMacroHitRec aHitRec; aHitRec.aPos=rUpPos; - aHitRec.aDownPos=aMacroDownPos; aHitRec.nTol=nMacroTol; aHitRec.pVisiLayer=&pMacroPV->GetVisibleLayers(); aHitRec.pPageView=pMacroPV; - aHitRec.pOut=pMacroWin.get(); pMacroObj->PaintMacro(*pMacroWin,tools::Rectangle(),aHitRec); bMacroDown=false; } @@ -2306,11 +2304,9 @@ void SdrObjEditView::ImpMacroDown(const Point& rDownPos) { SdrObjMacroHitRec aHitRec; aHitRec.aPos=rDownPos; - aHitRec.aDownPos=aMacroDownPos; aHitRec.nTol=nMacroTol; aHitRec.pVisiLayer=&pMacroPV->GetVisibleLayers(); aHitRec.pPageView=pMacroPV; - aHitRec.pOut=pMacroWin.get(); pMacroObj->PaintMacro(*pMacroWin,tools::Rectangle(),aHitRec); bMacroDown=true; } @@ -2321,11 +2317,9 @@ void SdrObjEditView::MovMacroObj(const Point& rPnt) if (pMacroObj!=nullptr) { SdrObjMacroHitRec aHitRec; aHitRec.aPos=rPnt; - aHitRec.aDownPos=aMacroDownPos; aHitRec.nTol=nMacroTol; aHitRec.pVisiLayer=&pMacroPV->GetVisibleLayers(); aHitRec.pPageView=pMacroPV; - aHitRec.pOut=pMacroWin.get(); bool bDown=pMacroObj->IsMacroHit(aHitRec); if (bDown) ImpMacroDown(rPnt); else ImpMacroUp(rPnt); @@ -2348,11 +2342,9 @@ bool SdrObjEditView::EndMacroObj() ImpMacroUp(aMacroDownPos); SdrObjMacroHitRec aHitRec; aHitRec.aPos=aMacroDownPos; - aHitRec.aDownPos=aMacroDownPos; aHitRec.nTol=nMacroTol; aHitRec.pVisiLayer=&pMacroPV->GetVisibleLayers(); aHitRec.pPageView=pMacroPV; - aHitRec.pOut=pMacroWin.get(); bool bRet=pMacroObj->DoMacro(aHitRec); pMacroObj=nullptr; pMacroPV=nullptr; diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index d4f0448baf0b..554b3ce7f7fe 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -2033,7 +2033,6 @@ SdrObject* SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrPageView*& rpP if (pObj!=nullptr && (nOptions & SdrSearchOptions::TESTMACRO)) { SdrObjMacroHitRec aHitRec; aHitRec.aPos=rPnt; - aHitRec.aDownPos=rPnt; aHitRec.nTol=nTol; aHitRec.pVisiLayer=&pPV->GetVisibleLayers(); aHitRec.pPageView=pPV; diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 74170fa2edb4..f183b888f0fc 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -149,7 +149,6 @@ void SdrObjUserCall::Changed(const SdrObject& /*rObj*/, SdrUserCallType /*eType* } SdrObjMacroHitRec::SdrObjMacroHitRec() : - pOut(nullptr), pVisiLayer(nullptr), pPageView(nullptr), nTol(0) {} diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx index f31ee2d2f81a..29611e2315ba 100644 --- a/svx/source/svdraw/svdocirc.cxx +++ b/svx/source/svdraw/svdocirc.cxx @@ -378,7 +378,6 @@ struct ImpCircUser : public SdrDragStatUserData tools::Rectangle aR; Point aCenter; Point aP1; - Point aP2; long nHgt; long nWdt; long nStart; @@ -654,7 +653,6 @@ void ImpCircUser::SetCreateParams(SdrDragStat const & rStat) } aP1 = GetAnglePnt(aR,nStart); nEnd=nStart; - aP2=aP1; } else aP1=aCenter; if (rStat.GetPointCount()>3) { Point aP(rStat.GetPoint(3)-aCenter); @@ -673,8 +671,7 @@ void ImpCircUser::SetCreateParams(SdrDragStat const & rStat) nEnd=NormAngle36000(nEnd); } } - aP2 = GetAnglePnt(aR,nEnd); - } else aP2=aCenter; + } } void SdrCircObj::ImpSetCreateParams(SdrDragStat& rStat) diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index e9da43ba2cde..91cacf12ea97 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -266,8 +266,6 @@ struct ImpMeasureRec : public SdrDragStatUserData bool bBelowRefEdge; bool bTextRota90; bool bTextUpsideDown; - Fraction aMeasureScale; - OUString aFormatString; bool bTextAutoAngle; long nTextAutoAngleView; }; @@ -321,8 +319,6 @@ void SdrMeasureObj::ImpTakeAttr(ImpMeasureRec& rRec) const rRec.bBelowRefEdge =rSet.Get(SDRATTR_MEASUREBELOWREFEDGE ).GetValue(); rRec.bTextRota90 =rSet.Get(SDRATTR_MEASURETEXTROTA90 ).GetValue(); rRec.bTextUpsideDown =static_cast<const SdrMeasureTextUpsideDownItem& >(rSet.Get(SDRATTR_MEASURETEXTUPSIDEDOWN )).GetValue(); - rRec.aMeasureScale =rSet.Get(SDRATTR_MEASURESCALE ).GetValue(); - rRec.aFormatString =rSet.Get(SDRATTR_MEASUREFORMATSTRING ).GetValue(); rRec.bTextAutoAngle =rSet.Get(SDRATTR_MEASURETEXTAUTOANGLE ).GetValue(); rRec.nTextAutoAngleView=static_cast<const SdrMeasureTextAutoAngleViewItem&>(rSet.Get(SDRATTR_MEASURETEXTAUTOANGLEVIEW)).GetValue(); } diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index bdddaae54bb9..7c7f8289a053 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -420,7 +420,6 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co { SdrObjMacroHitRec aHitRec; aHitRec.aPos=aLocalLogicPosition; - aHitRec.aDownPos=aLocalLogicPosition; aHitRec.nTol=mnHitTolLog; aHitRec.pVisiLayer=&pPV->GetVisibleLayers(); aHitRec.pPageView=pPV; @@ -961,11 +960,9 @@ PointerStyle SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDe if (IsMacroObj()) { SdrObjMacroHitRec aHitRec; aHitRec.aPos=pOut->LogicToPixel(rMousePos); - aHitRec.aDownPos=aMacroDownPos; aHitRec.nTol=nMacroTol; aHitRec.pVisiLayer=&pMacroPV->GetVisibleLayers(); aHitRec.pPageView=pMacroPV; - aHitRec.pOut=pMacroWin.get(); return pMacroObj->GetMacroPointer(aHitRec); } @@ -1020,11 +1017,9 @@ PointerStyle SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDe { SdrObjMacroHitRec aHitRec; aHitRec.aPos=aVEvt.aLogicPos; - aHitRec.aDownPos=aHitRec.aPos; aHitRec.nTol=mnHitTolLog; aHitRec.pVisiLayer=&aVEvt.pPV->GetVisibleLayers(); aHitRec.pPageView=aVEvt.pPV; - aHitRec.pOut=const_cast<OutputDevice*>(pOut); return aVEvt.pObj->GetMacroPointer(aHitRec); } default: break; diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx index bdf97d473321..7982ddced061 100644 --- a/svx/source/unodraw/unopage.cxx +++ b/svx/source/unodraw/unopage.cxx @@ -529,7 +529,6 @@ SdrObject* SvxDrawPage::CreateSdrObject_(const Reference< drawing::XShape > & xS basegfx::B3DPoint aCamPos(0.0, 0.0, 10000.0); aCam.SetPosAndLookAt(aCamPos, aLookAt); aCam.SetFocalLength(100.0); - aCam.SetDefaults(aCamPos, aLookAt); pScene->SetCamera(aCam); pScene->SetRectsDirty(); diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx index 571a1d74ffb5..394300ebae6d 100644 --- a/svx/source/unodraw/unoshap3.cxx +++ b/svx/source/unodraw/unoshap3.cxx @@ -317,7 +317,6 @@ bool Svx3DSceneObject::setPropertyValueImpl( const OUString& rName, const SfxIte basegfx::B3DPoint aCamPos(0.0, 0.0, fCamPosZ); aCam.SetPosAndLookAt(aCamPos, aLookAt); aCam.SetFocalLength(fCamFocal / 100.0); - aCam.SetDefaults(basegfx::B3DPoint(0.0, 0.0, fCamPosZ), aLookAt); aCam.SetDeviceWindow(tools::Rectangle(0, 0, static_cast<long>(fW), static_cast<long>(fH))); // set at scene |