loplugin:singlevalfields in svx(part2)
Change-Id: I1a1db1bdd446879a3abba3cb76a4ca575f859c1f
Reviewed-on: https://gerrit.libreoffice.org/26640
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 709844d..3f617c2 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -168,9 +168,6 @@ protected:
SdrOutliner* pChainingOutliner; // an Outliner for chaining overflowing text
sal_uIntPtr nDefTextHgt; // Default text height in logical units
VclPtr<OutputDevice> pRefOutDev; // ReferenceDevice for the EditEngine
sal_uIntPtr nProgressAkt; // for the
sal_uIntPtr nProgressMax; // ProgressBar-
sal_uIntPtr nProgressOfs; // -Handler
rtl::Reference< SfxStyleSheetBasePool > mxStyleSheetPool;
SfxStyleSheet* pDefaultStyleSheet;
SfxStyleSheet* mpDefaultStyleSheetForSdrGrafObjAndSdrOle2Obj; // #i119287#
@@ -179,26 +176,18 @@ protected:
std::deque<SfxUndoAction*>* pRedoStack;
SdrUndoGroup* pAktUndoGroup; // for deeper
sal_uInt16 nUndoLevel; // undo nesting
sal_uInt16 nProgressPercent; // for the ProgressBar-Handler
sal_uInt16 nLoadVersion; // version number of the loaded file
bool bMyPool:1; // to clean up pMyPool from 303a
bool bUIOnlyKomma:1; // see eUIUnit
bool mbUndoEnabled:1; // If false no undo is recorded or we are during the execution of an undo action
bool bExtColorTable:1; // ne separate ColorTable
bool mbChanged:1;
bool bInfoChanged:1;
bool bPagNumsDirty:1;
bool bMPgNumsDirty:1;
bool bTransportContainer:1; // doc is temporary object container, no display (e.g. clipboard)
bool bSavePortable:1; // save metafiles portably
bool bNoBitmapCaching:1; // cache bitmaps for screen output
bool bReadOnly:1;
bool bTransparentTextFrames:1;
bool bSaveCompressed:1;
bool bSwapGraphics:1;
bool bPasteResize:1; // Objects are being resized due to Paste with different MapMode
bool bSaveOLEPreview:1; // save preview metafile of OLE objects
bool bSaveNative:1;
bool bStarDrawPreviewMode:1;
bool mbDisableTextEditUsesCommonUndoManager:1;
SvStreamEndian nStreamNumberFormat;
@@ -208,12 +197,6 @@ protected:
TextChain* pTextChain;
// sdr::Comment interface
private:
// the next unique comment ID, used for counting added comments. Initialized
// to 0. UI shows one more due to the fact that 0 is a no-no for users.
sal_uInt32 mnUniqueCommentID;
public:
sal_uInt16 nStarDrawPreviewMasterPageNum;
rtl::Reference<SvxForbiddenCharactersTable> mpForbiddenCharactersTable;
@@ -225,8 +208,6 @@ public:
std::unique_ptr<SdrModelImpl> mpImpl;
sal_uInt16 mnCharCompressType;
sal_uInt16 mnHandoutPageCount;
sal_uInt16 nReserveUInt6;
sal_uInt16 nReserveUInt7;
bool mbModelLocked;
bool mbKernAsianPunctuation;
bool mbAddExtLeading;
@@ -428,8 +409,6 @@ public:
void SetSwapGraphicsMode(SdrSwapGraphicsMode nMode) { nSwapGraphicsMode = nMode; }
SdrSwapGraphicsMode GetSwapGraphicsMode() const { return nSwapGraphicsMode; }
bool IsSaveOLEPreview() const { return bSaveOLEPreview; }
// Text frames without filling can be select with a mouse click by default (sal_False).
// With this flag set to true you can hit them only in the area in which text is to be
// found.
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx
index 2a62ec8..7cc230a 100644
--- a/include/svx/svdmrkv.hxx
+++ b/include/svx/svdmrkv.hxx
@@ -117,16 +117,14 @@ protected:
Rectangle maMarkedPointsRect;
Rectangle maMarkedGluePointsRect;
sal_uInt16 mnFrameHandlesLimit;
sal_uInt16 mnFrameHandlesLimit;
sal_uIntPtr mnInsPointNum; // Number of the InsPoint
sal_uIntPtr mnMarkableObjCount;
SdrDragMode meDragMode; // Persistent
SdrViewEditMode meEditMode; // Persistent
SdrViewEditMode meEditMode0; // Persistent
//HMHbool bHdlShown : 1;
bool mbRefHdlShownOnly : 1; // Axis of reflextion during dragging (ni)
bool mbDesignMode : 1; // DesignMode for SdrUnoObj
bool mbForceFrameHandles : 1; // Persistent - FrameDrag also for single objects
bool mbPlusHdlAlways : 1; // Persistent
@@ -135,7 +133,6 @@ protected:
bool mbMarkedObjRectDirty : 1;
bool mbMrkPntDirty : 1;
bool mbMarkedPointsRectsDirty : 1;
bool mbMarkableObjCountDirty : 1;
// flag to completely disable handles at the view
bool mbMarkHandlesHidden : 1;
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 27357e2..b17dc91 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -315,9 +315,7 @@ protected:
// object is only pointing to another one
bool bVirtObj : 1;
bool bSnapRectDirty : 1;
bool bNetLock : 1; // ni
bool bInserted : 1; // only if set to true, there are RepaintBroadcast & SetModify
bool bGrouped : 1; // member of a group object?
// the following flags will be streamed
bool bMovProt : 1; // if true, the position is protected
diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx
index adb093e..3b910c6 100644
--- a/include/svx/svdoedge.hxx
+++ b/include/svx/svdoedge.hxx
@@ -48,15 +48,11 @@ class SdrObjConnection
protected:
Point aObjOfs; // Wird beim Draggen eines Knotens gesetzt
SdrObject* pObj; // Referenziertes Objekt
long nXDist; // Hor. Objektabstand wenn bXDistOvr=TRUE
long nYDist; // Vert. Objektabstand wenn bYDistOvr=TRUE
sal_uInt16 nConId; // Konnektornummer
sal_uInt16 nConId; // Konnektornummer
// bitfield
bool bBestConn : 1; // sal_True= es wird der guenstigste Konnektor gesucht
bool bBestVertex : 1; // sal_True= es wird der guenstigste Scheitelpunkt zum konnekten gesucht
bool bXDistOvr : 1; // sal_True= Hor. Objektabstand wurde gedragt (Overwrite)
bool bYDistOvr : 1; // sal_True= Vert. Objektabstand wurde gedragt (Overwrite)
bool bAutoVertex : 1; // AutoConnector am Scheitelpunkt nCon
bool bAutoCorner : 1; // AutoConnector am Eckpunkt nCon
diff --git a/include/svx/svdogrp.hxx b/include/svx/svdogrp.hxx
index d8e16d5..7ebcc8e 100644
--- a/include/svx/svdogrp.hxx
+++ b/include/svx/svdogrp.hxx
@@ -44,7 +44,6 @@ protected:
SdrObjList* pSub; // Subliste (Kinder)
Point aRefPoint; // Referenzpunkt innerhalb der Objektgruppe
bool bRefPoint; // Ist ein RefPoint gesetzt?
public:
SdrObjGroup();
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index ed9b0f7..5edce8f 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -126,35 +126,23 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe
pDrawOutliner=nullptr;
pHitTestOutliner=nullptr;
pRefOutDev=nullptr;
nProgressAkt=0;
nProgressMax=0;
nProgressOfs=0;
pDefaultStyleSheet=nullptr;
mpDefaultStyleSheetForSdrGrafObjAndSdrOle2Obj = nullptr;
pLinkManager=nullptr;
pUndoStack=nullptr;
pRedoStack=nullptr;
nMaxUndoCount=16;
mnUniqueCommentID=0;
pAktUndoGroup=nullptr;
nUndoLevel=0;
mbUndoEnabled=true;
nProgressPercent=0;
nLoadVersion=0;
bExtColorTable=false;
mbChanged = false;
bInfoChanged=false;
bPagNumsDirty=false;
bMPgNumsDirty=false;
bTransportContainer = false;
bSavePortable=false;
bSaveCompressed=false;
bSaveNative=false;
bSwapGraphics=false;
nSwapGraphicsMode=SdrSwapGraphicsMode::DEFAULT;
bSaveOLEPreview=false;
bPasteResize=false;
bNoBitmapCaching=false;
bReadOnly=false;
nStreamNumberFormat=SvStreamEndian::BIG;
nDefaultTabulator=0;
@@ -168,8 +156,6 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe
mbKernAsianPunctuation = false;
mbAddExtLeading = false;
mnHandoutPageCount = 0;
nReserveUInt6 = 0;
nReserveUInt7 = 0;
mbDisableTextEditUsesCommonUndoManager = false;
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 94d2c9ae..2c5535e 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -128,7 +128,6 @@ void ImplMarkingOverlay::SetSecondPosition(const basegfx::B2DPoint& rNewPosition
void SdrMarkView::ImpClearVars()
{
meDragMode=SDRDRAG_MOVE;
mbRefHdlShownOnly=false;
meEditMode=SDREDITMODE_EDIT;
meEditMode0=SDREDITMODE_EDIT;
mbDesignMode=false;
@@ -144,8 +143,6 @@ void SdrMarkView::ImpClearVars()
mbMarkHandlesHidden = false;
mbMrkPntDirty=false;
mbMarkHdlWhenTextEdit=false;
mbMarkableObjCountDirty=false; // not yet implemented
mnMarkableObjCount=0; // not yet implemented
// Migrate selections
BrkMarkObj();
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index b2124b5c..defafc5 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -308,9 +308,7 @@ SdrObject::SdrObject() :
{
bVirtObj =false;
bSnapRectDirty =true;
bNetLock =false;
bInserted =false;
bGrouped =false;
bMovProt =false;
bSizProt =false;
bNoPrint =false;
@@ -1723,9 +1721,9 @@ OString SdrObject::stringify() const
append(bNoPrint).
append(bSizProt).
append(bMovProt).
append(bGrouped).
append(false).
append(bInserted).
append(bNetLock).
append(false).
append(bVirtObj).
//append(maBLIPSizeRectangle).
append(mnLayerID);
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index 2630f75..04621c9 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -57,12 +57,8 @@ void SdrObjConnection::ResetVars()
{
pObj=nullptr;
nConId=0;
nXDist=0;
nYDist=0;
bBestConn=true;
bBestVertex=true;
bXDistOvr=false;
bYDistOvr=false;
bAutoVertex=false;
bAutoCorner=false;
}
diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx
index 4bbd9b5..77fa195 100644
--- a/svx/source/svdraw/svdogrp.cxx
+++ b/svx/source/svdraw/svdogrp.cxx
@@ -72,7 +72,6 @@ SdrObjGroup::SdrObjGroup()
pSub=new SdrObjList(nullptr,nullptr);
pSub->SetOwnerObj(this);
pSub->SetListKind(SDROBJLIST_GROUPOBJ);
bRefPoint=false;
bClosedObj=false;
}
@@ -265,7 +264,6 @@ SdrObjGroup& SdrObjGroup::operator=(const SdrObjGroup& rObj)
// copy local parameters
aRefPoint = rObj.aRefPoint;
bRefPoint = rObj.bRefPoint;
return *this;
}
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index 35b367a..392d0b4 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -334,17 +334,11 @@ bool SvxOle2Shape::getPropertyValueImpl( const OUString& rName, const SfxItemPro
{
const Graphic* pGraphic = pOle->GetGraphic();
// if there isn't already a preview graphic set, check if we need to generate
// one if model says so
if( pGraphic == nullptr && !pOle->IsEmptyPresObj() && mpModel->IsSaveOLEPreview() )
pGraphic = pOle->GetGraphic();
if( pGraphic )
{
GraphicObject aObj( *pGraphic );
aURL = UNO_NAME_GRAPHOBJ_URLPREFIX;
aURL += OStringToOUString(aObj.GetUniqueID(),
RTL_TEXTENCODING_ASCII_US);
aURL += OStringToOUString(aObj.GetUniqueID(), RTL_TEXTENCODING_ASCII_US);
}
}
rValue <<= aURL;
