summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-06-24 15:21:03 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-06-27 05:19:44 +0000
commitc47d85be7839d0721a09f2eb100c4ab0abb7a985 (patch)
treef5d6343c1dc0a96f2292cbd36dfe6da8e2dca908 /svx
parentd6d1fc2683eeb88a569795e6bd27ad5db035f511 (diff)
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>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/svdraw/svdmodel.cxx14
-rw-r--r--svx/source/svdraw/svdmrkv.cxx3
-rw-r--r--svx/source/svdraw/svdobj.cxx6
-rw-r--r--svx/source/svdraw/svdoedge.cxx4
-rw-r--r--svx/source/svdraw/svdogrp.cxx2
-rw-r--r--svx/source/unodraw/unoshap4.cxx8
6 files changed, 3 insertions, 34 deletions
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index ed9b0f79a1d2..5edce8f8b453 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 94d2c9ae2de6..2c5535e11e2b 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 b2124b5cbe17..defafc5ab92b 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 2630f754121e..04621c952552 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 4bbd9b518377..77fa19561479 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 35b367abb0da..392d0b4a198b 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;