summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-02-19 13:06:07 +0200
committerNoel Grandin <noel@peralex.com>2016-02-22 08:18:08 +0200
commitf17f977d0ad5b4c51a8f58b43901f72de001a56d (patch)
tree24e25caa72db9d21b1728f52f17758ab103e9c76 /svx
parentacd1c51791bdf522d7ffd8dd225fb59cd2eb17ff (diff)
loplugin:write only fields
Change-Id: I45895e9845a9037da207f001fece427452ed499f
Diffstat (limited to 'svx')
-rw-r--r--svx/inc/sdr/overlay/overlaymanagerbuffered.hxx2
-rw-r--r--svx/source/dialog/frmsel.cxx2
-rw-r--r--svx/source/dialog/imapwnd.hxx6
-rw-r--r--svx/source/engine3d/float3d.cxx2
-rw-r--r--svx/source/engine3d/viewpt3d2.cxx2
-rw-r--r--svx/source/sdr/overlay/overlaymanager.cxx7
-rw-r--r--svx/source/sdr/overlay/overlaymanagerbuffered.cxx5
-rw-r--r--svx/source/svdraw/sdrpaintwindow.cxx4
-rw-r--r--svx/source/svdraw/svdobj.cxx8
-rw-r--r--svx/source/svdraw/svdotext.cxx6
-rw-r--r--svx/source/svdraw/svdotxln.cxx2
11 files changed, 14 insertions, 32 deletions
diff --git a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx
index dcebfce2e91c..8257419cd7fe 100644
--- a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx
+++ b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx
@@ -63,13 +63,11 @@ namespace sdr
OverlayManagerBuffered(
OutputDevice& rOutputDevice,
- const SdrModel* pModel,
bool bRefreshWithPreRendering = false);
virtual ~OverlayManagerBuffered();
public:
static rtl::Reference<OverlayManager> create(OutputDevice& rOutputDevice,
- const SdrModel* pModel,
bool bRefreshWithPreRendering = false);
// complete redraw
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index 7a67870b548e..3268bb502523 100644
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -208,7 +208,7 @@ FrameSelectorImpl::FrameSelectorImpl( FrameSelector& rFrameSel ) :
Resource( SVX_RES( RID_SVXSTR_BORDER_CONTROL ) ),
mrFrameSel( rFrameSel ),
mpVirDev( VclPtr<VirtualDevice>::Create() ),
- maILArrows( 16 ),
+ maILArrows(),
maLeft( FRAMEBORDER_LEFT ),
maRight( FRAMEBORDER_RIGHT ),
maTop( FRAMEBORDER_TOP ),
diff --git a/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx
index 727eda88a3fc..9ab5114dd8ec 100644
--- a/svx/source/dialog/imapwnd.hxx
+++ b/svx/source/dialog/imapwnd.hxx
@@ -61,15 +61,15 @@ class IMapUserData : public SdrObjUserData
public:
IMapUserData() :
- SdrObjUserData ( IMapInventor, SVD_IMAP_USERDATA, 0 ),
+ SdrObjUserData ( IMapInventor, SVD_IMAP_USERDATA ),
mpObj ( ) {}
explicit IMapUserData( const IMapObjectPtr& rIMapObj ) :
- SdrObjUserData ( IMapInventor, SVD_IMAP_USERDATA, 0 ),
+ SdrObjUserData ( IMapInventor, SVD_IMAP_USERDATA ),
mpObj ( rIMapObj ) {}
IMapUserData( const IMapUserData& rIMapUserData ) :
- SdrObjUserData ( IMapInventor, SVD_IMAP_USERDATA, 0 ),
+ SdrObjUserData ( IMapInventor, SVD_IMAP_USERDATA ),
mpObj ( rIMapUserData.mpObj ) {}
virtual ~IMapUserData() { }
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index edaec94b8ab1..b461bb7a64df 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -92,7 +92,6 @@ Svx3DWin::Svx3DWin(SfxBindings* pInBindings, SfxChildWindow *pCW, vcl::Window* p
, eViewType(VIEWTYPE_GEO)
, pModel(nullptr)
, pVDev(nullptr)
- , p3DView(nullptr)
, pBindings(pInBindings)
, pControllerItem(nullptr)
, pConvertTo3DItem(nullptr)
@@ -328,7 +327,6 @@ Svx3DWin::~Svx3DWin()
void Svx3DWin::dispose()
{
- delete p3DView;
pVDev.disposeAndClear();
delete pModel;
diff --git a/svx/source/engine3d/viewpt3d2.cxx b/svx/source/engine3d/viewpt3d2.cxx
index 743b60d41a12..10961245a431 100644
--- a/svx/source/engine3d/viewpt3d2.cxx
+++ b/svx/source/engine3d/viewpt3d2.cxx
@@ -27,8 +27,6 @@ Viewport3D::Viewport3D() :
aVUV(0, 1, 1),
aPRP(0, 0, 2),
fVPD(-3),
- fNearClipDist (0.0),
- fFarClipDist (0.0),
eProjection(PR_PERSPECTIVE),
eAspectMapping(AS_NO_MAPPING),
aDeviceRect(Point(0,0), Size(-1,-1)),
diff --git a/svx/source/sdr/overlay/overlaymanager.cxx b/svx/source/sdr/overlay/overlaymanager.cxx
index f162c2b7c80b..479310f83226 100644
--- a/svx/source/sdr/overlay/overlaymanager.cxx
+++ b/svx/source/sdr/overlay/overlaymanager.cxx
@@ -114,10 +114,9 @@ namespace sdr
return mfDiscreteOne;
}
- OverlayManager::OverlayManager(OutputDevice& rOutputDevice, const SdrModel* pModel)
+ OverlayManager::OverlayManager(OutputDevice& rOutputDevice)
: Scheduler(),
mrOutputDevice(rOutputDevice),
- mpModel(pModel),
maOverlayObjects(),
maStripeColorA(Color(COL_BLACK)),
maStripeColorB(Color(COL_WHITE)),
@@ -140,9 +139,9 @@ namespace sdr
}
}
- rtl::Reference<OverlayManager> OverlayManager::create(OutputDevice& rOutputDevice, const SdrModel* pModel)
+ rtl::Reference<OverlayManager> OverlayManager::create(OutputDevice& rOutputDevice)
{
- return rtl::Reference<OverlayManager>(new OverlayManager(rOutputDevice, pModel));
+ return rtl::Reference<OverlayManager>(new OverlayManager(rOutputDevice));
}
const drawinglayer::geometry::ViewInformation2D OverlayManager::getCurrentViewInformation2D() const
diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
index 6b3def9d6f9c..6fe69de9636a 100644
--- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
+++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
@@ -375,9 +375,8 @@ namespace sdr
OverlayManagerBuffered::OverlayManagerBuffered(
OutputDevice& rOutputDevice,
- const SdrModel* pModel,
bool bRefreshWithPreRendering)
- : OverlayManager(rOutputDevice, pModel),
+ : OverlayManager(rOutputDevice),
mpBufferDevice(VclPtr<VirtualDevice>::Create()),
mpOutputBufferDevice(VclPtr<VirtualDevice>::Create()),
mbRefreshWithPreRendering(bRefreshWithPreRendering)
@@ -389,11 +388,9 @@ namespace sdr
rtl::Reference<OverlayManager> OverlayManagerBuffered::create(
OutputDevice& rOutputDevice,
- const SdrModel* pModel,
bool bRefreshWithPreRendering)
{
return rtl::Reference<OverlayManager>(new OverlayManagerBuffered(rOutputDevice,
- pModel,
bRefreshWithPreRendering));
}
diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx
index c18bfa5f3a46..21c771ec239b 100644
--- a/svx/source/svdraw/sdrpaintwindow.cxx
+++ b/svx/source/svdraw/sdrpaintwindow.cxx
@@ -203,7 +203,7 @@ void SdrPaintWindow::impCreateOverlayManager()
// whether that refresh itself will use a 2nd vdev to avoid flickering.
// Also hand over the old OverlayManager if existent; this means to take over
// the registered OverlayObjects from it
- mxOverlayManager = sdr::overlay::OverlayManagerBuffered::create(GetOutputDevice(), GetPaintView().GetModel(), true);
+ mxOverlayManager = sdr::overlay::OverlayManagerBuffered::create(GetOutputDevice(), true);
}
else
{
@@ -211,7 +211,7 @@ void SdrPaintWindow::impCreateOverlayManager()
// take place
// Also hand over the old OverlayManager if existent; this means to take over
// the registered OverlayObjects from it
- mxOverlayManager = sdr::overlay::OverlayManager::create(GetOutputDevice(), GetPaintView().GetModel());
+ mxOverlayManager = sdr::overlay::OverlayManager::create(GetOutputDevice());
}
OSL_ENSURE(mxOverlayManager.is(), "SdrPaintWindow::SdrPaintWindow: Could not allocate an overlayManager (!)");
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 5d2c35b85eee..7e2c4d90a07b 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -157,15 +157,13 @@ SdrObjMacroHitRec::SdrObjMacroHitRec() :
bDown(false) {}
-SdrObjUserData::SdrObjUserData(sal_uInt32 nInv, sal_uInt16 nId, sal_uInt16 nVer) :
+SdrObjUserData::SdrObjUserData(sal_uInt32 nInv, sal_uInt16 nId) :
nInventor(nInv),
- nIdentifier(nId),
- nVersion(nVer) {}
+ nIdentifier(nId) {}
SdrObjUserData::SdrObjUserData(const SdrObjUserData& rData) :
nInventor(rData.nInventor),
- nIdentifier(rData.nIdentifier),
- nVersion(rData.nVersion) {}
+ nIdentifier(rData.nIdentifier) {}
SdrObjUserData::~SdrObjUserData() {}
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 2c694390ecd8..11a535d78892 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -85,7 +85,6 @@ SdrTextObj::SdrTextObj()
: SdrAttrObj(),
mpText(nullptr),
pEdtOutl(nullptr),
- pFormTextBoundRect(nullptr),
eTextKind(OBJ_TEXT)
{
bTextSizeDirty=false;
@@ -114,7 +113,6 @@ SdrTextObj::SdrTextObj(const Rectangle& rNewRect)
maRect(rNewRect),
mpText(nullptr),
pEdtOutl(nullptr),
- pFormTextBoundRect(nullptr),
eTextKind(OBJ_TEXT)
{
bTextSizeDirty=false;
@@ -143,7 +141,6 @@ SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind)
: SdrAttrObj(),
mpText(nullptr),
pEdtOutl(nullptr),
- pFormTextBoundRect(nullptr),
eTextKind(eNewTextKind)
{
bTextSizeDirty=false;
@@ -172,7 +169,6 @@ SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect)
maRect(rNewRect),
mpText(nullptr),
pEdtOutl(nullptr),
- pFormTextBoundRect(nullptr),
eTextKind(eNewTextKind)
{
bTextSizeDirty=false;
@@ -208,8 +204,6 @@ SdrTextObj::~SdrTextObj()
delete mpText;
- delete pFormTextBoundRect;
-
ImpLinkAbmeldung();
}
diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx
index 7374491a40ed..6ced8dc58c7f 100644
--- a/svx/source/svdraw/svdotxln.cxx
+++ b/svx/source/svdraw/svdotxln.cxx
@@ -101,7 +101,7 @@ void ImpSdrObjTextLink::Closed()
ImpSdrObjTextLinkUserData::ImpSdrObjTextLinkUserData():
- SdrObjUserData(SdrInventor,SDRUSERDATA_OBJTEXTLINK,0),
+ SdrObjUserData(SdrInventor,SDRUSERDATA_OBJTEXTLINK),
aFileDate0( DateTime::EMPTY ),
pLink(nullptr),
eCharSet(RTL_TEXTENCODING_DONTKNOW)