summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-06-20 12:09:51 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-06-21 08:42:41 +0200
commit742c0838f29bd09505e2cb9ca35debf401c18c23 (patch)
treea224af9ead35435e613ac03c03ee0f74173c01e5 /svx
parent528632660b72b105345945c13c5b68060d94a91b (diff)
loplugin:unusedfields in svx part1
Change-Id: I6621e0dda5a5dc3e68c7b1613975c075e2879912 Reviewed-on: https://gerrit.libreoffice.org/39006 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/engine3d/obj3d.cxx5
-rw-r--r--svx/source/engine3d/view3d.cxx7
-rw-r--r--svx/source/fmcomp/gridcell.cxx2
-rw-r--r--svx/source/inc/gridcell.hxx1
-rw-r--r--svx/source/sdr/properties/textproperties.cxx3
-rw-r--r--svx/source/sidebar/possize/PosSizePropertyPanel.cxx2
-rw-r--r--svx/source/sidebar/possize/PosSizePropertyPanel.hxx1
-rw-r--r--svx/source/svdraw/svdedxv.cxx3
-rw-r--r--svx/source/svdraw/svdoashp.cxx1
-rw-r--r--svx/source/svdraw/svdobj.cxx6
-rw-r--r--svx/source/svdraw/svdocapt.cxx4
-rw-r--r--svx/source/svdraw/svdocirc.cxx5
-rw-r--r--svx/source/svdraw/svdoedge.cxx1
-rw-r--r--svx/source/svdraw/svdograf.cxx1
-rw-r--r--svx/source/svdraw/svdogrp.cxx2
-rw-r--r--svx/source/svdraw/svdomeas.cxx24
-rw-r--r--svx/source/svdraw/svdomedia.cxx2
-rw-r--r--svx/source/svdraw/svdoole2.cxx6
-rw-r--r--svx/source/svdraw/svdopage.cxx1
-rw-r--r--svx/source/svdraw/svdorect.cxx4
-rw-r--r--svx/source/svdraw/svdotext.cxx7
-rw-r--r--svx/source/svdraw/svdouno.cxx1
-rw-r--r--svx/source/svdraw/svdpntv.cxx1
-rw-r--r--svx/source/svdraw/svdview.cxx20
-rw-r--r--svx/source/table/svdotable.cxx3
-rw-r--r--svx/source/table/tableundo.cxx2
-rw-r--r--svx/source/table/tableundo.hxx3
-rw-r--r--svx/source/tbxctrls/extrusioncontrols.cxx4
-rw-r--r--svx/source/tbxctrls/extrusioncontrols.hxx2
-rw-r--r--svx/source/tbxctrls/layctrl.cxx5
-rw-r--r--svx/source/xoutdev/xattrbmp.cxx1
31 files changed, 4 insertions, 126 deletions
diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx
index 52b553d50d30..a16935602c15 100644
--- a/svx/source/engine3d/obj3d.cxx
+++ b/svx/source/engine3d/obj3d.cxx
@@ -270,11 +270,6 @@ void E3dObject::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
// no transparence for 3d objects
rInfo.bTransparenceAllowed = false;
- // gradient depends on fillstyle
- // BM *** check if SetItem is NULL ***
- drawing::FillStyle eFillStyle = static_cast<const XFillStyleItem&>(GetMergedItem(XATTR_FILLSTYLE)).GetValue();
- rInfo.bGradientAllowed = (eFillStyle == drawing::FillStyle_GRADIENT);
-
// Convert 3D objects in a group of polygons:
// At first not only possible, because the creation of a group of
// 2D polygons would be required which need to be sorted by depth,
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index 9540d3f1cd52..0995dd13f7f2 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -1514,17 +1514,10 @@ void E3dView::ResetCreationActive ()
void E3dView::InitView ()
{
eDragConstraint = E3dDragConstraint::XYZ;
- fDefaultScaleX =
fDefaultScaleY =
fDefaultScaleZ = 1.0;
- fDefaultRotateX =
fDefaultRotateY =
fDefaultRotateZ = 0.0;
- fDefaultExtrusionDeepth = 1000; // old: 2000;
- fDefaultLightIntensity = 0.8; // old: 0.6;
- fDefaultAmbientIntensity = 0.4;
- nHDefaultSegments = 12;
- nVDefaultSegments = 12;
aDefaultLightColor = RGB_Color(COL_WHITE);
aDefaultAmbientColor = RGB_Color(COL_BLACK);
mpMirrorOverlay = nullptr;
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index b66dee52e38d..58dd644deedd 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -2662,7 +2662,6 @@ DbFilterField::DbFilterField(const Reference< XComponentContext >& rxContext,DbG
,m_nControlClass(css::form::FormComponentType::TEXTFIELD)
,m_bFilterList(false)
,m_bFilterListFilled(false)
- ,m_bBound(false)
{
setAlignedController( false );
@@ -2715,7 +2714,6 @@ void DbFilterField::SetList(const Any& rItems, bool bComboBox)
pField->InsertEntry(*pStrings);
m_rColumn.getModel()->getPropertyValue(FM_PROP_VALUE_SEQ) >>= m_aValueList;
- m_bBound = m_aValueList.getLength() > 0;
}
}
}
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx
index 371a16c11938..151a1f19f2eb 100644
--- a/svx/source/inc/gridcell.hxx
+++ b/svx/source/inc/gridcell.hxx
@@ -667,7 +667,6 @@ class DbFilterField
sal_Int16 m_nControlClass;
bool m_bFilterList : 1;
bool m_bFilterListFilled : 1;
- bool m_bBound : 1;
public:
DbFilterField(const css::uno::Reference< css::uno::XComponentContext >& rxContext, DbGridColumn& _rColumn);
diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx
index 76317ca6683c..1b7c7fca711a 100644
--- a/svx/source/sdr/properties/textproperties.cxx
+++ b/svx/source/sdr/properties/textproperties.cxx
@@ -555,8 +555,6 @@ namespace sdr
if(SfxHintId::DataChanged == nId)
{
- rObj.SetPortionInfoChecked(false);
-
sal_Int32 nText = rTextProvider.getTextCount();
while (nText--)
{
@@ -579,7 +577,6 @@ namespace sdr
if(SfxHintId::Dying == nId)
{
- rObj.SetPortionInfoChecked(false);
sal_Int32 nText = rTextProvider.getTextCount();
while (nText--)
{
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index d94f52d4211b..4d9a5da4e1cf 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -80,7 +80,6 @@ PosSizePropertyPanel::PosSizePropertyPanel(
mbAutoWidth(false),
mbAutoHeight(false),
mbAdjustEnabled(false),
- mbIsFlip(false),
mxSidebar(rxSidebar)
{
get( mpFtPosX, "horizontallabel" );
@@ -312,7 +311,6 @@ void PosSizePropertyPanel::HandleContextChange(
// Flip
mpFtFlip->Show(bShowFlip);
mpFlipTbx->Show(bShowFlip);
- mbIsFlip = bShowFlip;
if (mxSidebar.is())
mxSidebar->requestLayout();
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
index 9892f14204ca..9ae618bc893a 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
@@ -143,7 +143,6 @@ private:
bool mbAutoWidth : 1;
bool mbAutoHeight : 1;
bool mbAdjustEnabled : 1;
- bool mbIsFlip : 1;
css::uno::Reference<css::ui::XSidebar> mxSidebar;
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 37d1a2a609cc..2643788d7e2c 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -1962,7 +1962,6 @@ void SdrObjEditView::ImpMacroDown(const Point& rDownPos)
aHitRec.nTol=nMacroTol;
aHitRec.pVisiLayer=&pMacroPV->GetVisibleLayers();
aHitRec.pPageView=pMacroPV;
- aHitRec.bDown=true;
aHitRec.pOut=pMacroWin.get();
pMacroObj->PaintMacro(*pMacroWin,tools::Rectangle(),aHitRec);
bMacroDown=true;
@@ -1978,7 +1977,6 @@ void SdrObjEditView::MovMacroObj(const Point& rPnt)
aHitRec.nTol=nMacroTol;
aHitRec.pVisiLayer=&pMacroPV->GetVisibleLayers();
aHitRec.pPageView=pMacroPV;
- aHitRec.bDown=bMacroDown;
aHitRec.pOut=pMacroWin.get();
bool bDown=pMacroObj->IsMacroHit(aHitRec);
if (bDown) ImpMacroDown(rPnt);
@@ -2006,7 +2004,6 @@ bool SdrObjEditView::EndMacroObj()
aHitRec.nTol=nMacroTol;
aHitRec.pVisiLayer=&pMacroPV->GetVisibleLayers();
aHitRec.pPageView=pMacroPV;
- aHitRec.bDown=true;
aHitRec.pOut=pMacroWin.get();
bool bRet=pMacroObj->DoMacro(aHitRec);
pMacroObj=nullptr;
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 1be76ee3b955..da385ef00df5 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -1319,7 +1319,6 @@ void SdrObjCustomShape::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
rInfo.bMirror45Allowed =true;
rInfo.bMirror90Allowed =true;
rInfo.bTransparenceAllowed = false;
- rInfo.bGradientAllowed = false;
rInfo.bShearAllowed =true;
rInfo.bEdgeRadiusAllowed=false;
rInfo.bNoContortion =true;
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index bcbeb9f2e2ce..863329b4ed2d 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -152,8 +152,7 @@ SdrObjMacroHitRec::SdrObjMacroHitRec() :
pOut(nullptr),
pVisiLayer(nullptr),
pPageView(nullptr),
- nTol(0),
- bDown(false) {}
+ nTol(0) {}
SdrObjUserData::SdrObjUserData(SdrInventor nInv, sal_uInt16 nId) :
@@ -182,7 +181,6 @@ SdrObjGeoData::~SdrObjGeoData()
}
SdrObjTransformInfoRec::SdrObjTransformInfoRec() :
- bSelectAllowed(true),
bMoveAllowed(true),
bResizeFreeAllowed(true),
bResizePropAllowed(true),
@@ -192,7 +190,6 @@ SdrObjTransformInfoRec::SdrObjTransformInfoRec() :
bMirror45Allowed(true),
bMirror90Allowed(true),
bTransparenceAllowed(true),
- bGradientAllowed(true),
bShearAllowed(true),
bEdgeRadiusAllowed(true),
bNoOrthoDesired(true),
@@ -548,7 +545,6 @@ void SdrObject::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
rInfo.bRotateFreeAllowed=false;
rInfo.bMirrorFreeAllowed=false;
rInfo.bTransparenceAllowed = false;
- rInfo.bGradientAllowed = false;
rInfo.bShearAllowed =false;
rInfo.bEdgeRadiusAllowed=false;
rInfo.bCanConvToPath =false;
diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx
index 0eb46c8bec69..a29fbc1eb876 100644
--- a/svx/source/svdraw/svdocapt.cxx
+++ b/svx/source/svdraw/svdocapt.cxx
@@ -67,7 +67,6 @@ class ImpCaptParams
{
public:
SdrCaptionType eType;
- long nAngle;
long nGap;
long nEscRel;
long nEscAbs;
@@ -82,7 +81,6 @@ public:
{
eType =SdrCaptionType::Type3;
bFixedAngle=false;
- nAngle =4500;
nGap =0;
eEscDir =SdrCaptionEscDir::Horizontal;
bEscRel =true;
@@ -220,7 +218,6 @@ void SdrCaptionObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
rInfo.bMirror45Allowed =false;
rInfo.bMirror90Allowed =false;
rInfo.bTransparenceAllowed = false;
- rInfo.bGradientAllowed = false;
rInfo.bShearAllowed =false;
rInfo.bEdgeRadiusAllowed=false;
rInfo.bCanConvToPath =true;
@@ -420,7 +417,6 @@ void SdrCaptionObj::ImpGetCaptParams(ImpCaptParams& rPara) const
const SfxItemSet& rSet = GetObjectItemSet();
rPara.eType =static_cast<const SdrCaptionTypeItem&> (rSet.Get(SDRATTR_CAPTIONTYPE )).GetValue();
rPara.bFixedAngle=static_cast<const SdrOnOffItem&> (rSet.Get(SDRATTR_CAPTIONFIXEDANGLE)).GetValue();
- rPara.nAngle =static_cast<const SdrCaptionAngleItem&> (rSet.Get(SDRATTR_CAPTIONANGLE )).GetValue();
rPara.nGap =static_cast<const SdrCaptionGapItem&> (rSet.Get(SDRATTR_CAPTIONGAP )).GetValue();
rPara.eEscDir =static_cast<const SdrCaptionEscDirItem&> (rSet.Get(SDRATTR_CAPTIONESCDIR )).GetValue();
rPara.bEscRel =static_cast<const SdrCaptionEscIsRelItem&> (rSet.Get(SDRATTR_CAPTIONESCISREL )).GetValue();
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index cce0f010e2b5..dc5d7a8f8a43 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -355,7 +355,6 @@ struct ImpCircUser : public SdrDragStatUserData
Point aCenter;
Point aP1;
Point aP2;
- long nMaxRad;
long nHgt;
long nWdt;
long nStart;
@@ -363,8 +362,7 @@ struct ImpCircUser : public SdrDragStatUserData
public:
ImpCircUser()
- : nMaxRad(0),
- nHgt(0),
+ : nHgt(0),
nWdt(0),
nStart(0),
nEnd(0)
@@ -616,7 +614,6 @@ void ImpCircUser::SetCreateParams(SdrDragStat& rStat)
aCenter=aR.Center();
nWdt=aR.Right()-aR.Left();
nHgt=aR.Bottom()-aR.Top();
- nMaxRad=((nWdt>nHgt ? nWdt : nHgt)+1) /2;
nStart=0;
nEnd=36000;
if (rStat.GetPointCount()>2) {
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index 0d629da52ccf..9cd9502902dd 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -356,7 +356,6 @@ void SdrEdgeObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
rInfo.bMirror45Allowed = true;
rInfo.bMirror90Allowed = true;
rInfo.bTransparenceAllowed = false;
- rInfo.bGradientAllowed = false;
rInfo.bShearAllowed = true;
rInfo.bEdgeRadiusAllowed = false;
bool bCanConv=!HasText() || ImpCanConvTextToCurve();
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 4e943e82a4a9..8c8d584e9abe 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -678,7 +678,6 @@ void SdrGrafObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
rInfo.bMirror45Allowed = bNoPresGrf;
rInfo.bMirror90Allowed = !bEmptyPresObj;
rInfo.bTransparenceAllowed = false;
- rInfo.bGradientAllowed = false;
// #i118485# Shear allowed and possible now
rInfo.bShearAllowed = true;
diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx
index a469144b4319..eb60afd57349 100644
--- a/svx/source/svdraw/svdogrp.cxx
+++ b/svx/source/svdraw/svdogrp.cxx
@@ -117,7 +117,6 @@ void SdrObjGroup::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
rInfo.bMirror45Allowed =false;
rInfo.bMirror90Allowed =false;
rInfo.bTransparenceAllowed = false;
- rInfo.bGradientAllowed = false;
rInfo.bShearAllowed =false;
rInfo.bEdgeRadiusAllowed=false;
rInfo.bNoContortion =true;
@@ -126,7 +125,6 @@ void SdrObjGroup::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
// only allowed if single object selected
rInfo.bTransparenceAllowed = false;
- rInfo.bGradientAllowed = false;
}
}
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index 5cf7a420f137..9b1de06053ff 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -230,7 +230,6 @@ SdrMeasureObj::~SdrMeasureObj()
void SdrMeasureObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
- rInfo.bSelectAllowed =true;
rInfo.bMoveAllowed =true;
rInfo.bResizeFreeAllowed=true;
rInfo.bResizePropAllowed=true;
@@ -240,7 +239,6 @@ void SdrMeasureObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
rInfo.bMirror45Allowed =true;
rInfo.bMirror90Allowed =true;
rInfo.bTransparenceAllowed = false;
- rInfo.bGradientAllowed = false;
rInfo.bShearAllowed =true;
rInfo.bEdgeRadiusAllowed=false;
rInfo.bNoOrthoDesired =true;
@@ -261,7 +259,6 @@ struct ImpMeasureRec : public SdrDragStatUserData
{
Point aPt1;
Point aPt2;
- SdrMeasureKind eKind;
css::drawing::MeasureTextHorzPos eWantTextHPos;
css::drawing::MeasureTextVertPos eWantTextVPos;
long nLineDist;
@@ -272,15 +269,10 @@ struct ImpMeasureRec : public SdrDragStatUserData
bool bBelowRefEdge;
bool bTextRota90;
bool bTextUpsideDown;
- long nMeasureOverhang;
- FieldUnit eMeasureUnit;
Fraction aMeasureScale;
- bool bShowUnit;
OUString aFormatString;
bool bTextAutoAngle;
long nTextAutoAngleView;
- bool bTextIsFixedAngle;
- long nTextFixedAngle;
};
struct ImpLineRec
@@ -303,8 +295,6 @@ struct ImpMeasurePoly
long nHlpAngle;
double nLineSin;
double nLineCos;
- double nHlpSin;
- double nHlpCos;
sal_uInt16 nMainlineAnz;
css::drawing::MeasureTextHorzPos eUsedTextHPos;
css::drawing::MeasureTextVertPos eUsedTextVPos;
@@ -314,10 +304,7 @@ struct ImpMeasurePoly
long nArrow1Wdt; // width of 1st arrow
long nArrow2Wdt; // width of 2nd arrow
long nShortLineLen; // line length, if PfeileAussen (arrowheads on the outside)
- bool bArrow1Center; // arrowhead 1 centered?
- bool bArrow2Center; // arrowhead 2 centered?
bool bAutoUpsideDown; // UpsideDown via automation
- bool bPfeileAussen; // arrowheads on the outside
bool bBreakedLine;
};
@@ -327,7 +314,6 @@ void SdrMeasureObj::ImpTakeAttr(ImpMeasureRec& rRec) const
rRec.aPt2 = aPt2;
const SfxItemSet& rSet = GetObjectItemSet();
- rRec.eKind =static_cast<const SdrMeasureKindItem& >(rSet.Get(SDRATTR_MEASUREKIND )).GetValue();
rRec.eWantTextHPos =static_cast<const SdrMeasureTextHPosItem& >(rSet.Get(SDRATTR_MEASURETEXTHPOS )).GetValue();
rRec.eWantTextVPos =static_cast<const SdrMeasureTextVPosItem& >(rSet.Get(SDRATTR_MEASURETEXTVPOS )).GetValue();
rRec.nLineDist =static_cast<const SdrMetricItem& >(rSet.Get(SDRATTR_MEASURELINEDIST )).GetValue();
@@ -338,15 +324,10 @@ void SdrMeasureObj::ImpTakeAttr(ImpMeasureRec& rRec) const
rRec.bBelowRefEdge =static_cast<const SdrMeasureBelowRefEdgeItem& >(rSet.Get(SDRATTR_MEASUREBELOWREFEDGE )).GetValue();
rRec.bTextRota90 =static_cast<const SdrMeasureTextRota90Item& >(rSet.Get(SDRATTR_MEASURETEXTROTA90 )).GetValue();
rRec.bTextUpsideDown =static_cast<const SdrMeasureTextUpsideDownItem& >(rSet.Get(SDRATTR_MEASURETEXTUPSIDEDOWN )).GetValue();
- rRec.nMeasureOverhang =static_cast<const SdrMeasureOverhangItem& >(rSet.Get(SDRATTR_MEASUREOVERHANG )).GetValue();
- rRec.eMeasureUnit =static_cast<const SdrMeasureUnitItem& >(rSet.Get(SDRATTR_MEASUREUNIT )).GetValue();
rRec.aMeasureScale =static_cast<const SdrMeasureScaleItem& >(rSet.Get(SDRATTR_MEASURESCALE )).GetValue();
- rRec.bShowUnit =static_cast<const SdrYesNoItem& >(rSet.Get(SDRATTR_MEASURESHOWUNIT )).GetValue();
rRec.aFormatString =static_cast<const SdrMeasureFormatStringItem& >(rSet.Get(SDRATTR_MEASUREFORMATSTRING )).GetValue();
rRec.bTextAutoAngle =static_cast<const SdrMeasureTextAutoAngleItem& >(rSet.Get(SDRATTR_MEASURETEXTAUTOANGLE )).GetValue();
rRec.nTextAutoAngleView=static_cast<const SdrMeasureTextAutoAngleViewItem&>(rSet.Get(SDRATTR_MEASURETEXTAUTOANGLEVIEW)).GetValue();
- rRec.bTextIsFixedAngle =static_cast<const SdrMeasureTextIsFixedAngleItem& >(rSet.Get(SDRATTR_MEASURETEXTISFIXEDANGLE )).GetValue();
- rRec.nTextFixedAngle =static_cast<const SdrMeasureTextFixedAngleItem& >(rSet.Get(SDRATTR_MEASURETEXTFIXEDANGLE )).GetValue();
}
long impGetLineStartEndDistance(const basegfx::B2DPolyPolygon& rPolyPolygon, long nNewWidth, bool bCenter)
@@ -439,11 +420,8 @@ void SdrMeasureObj::ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly&
rPol.nArrow1Wdt=nArrow1Wdt;
rPol.nArrow2Wdt=nArrow2Wdt;
rPol.nShortLineLen=nShortLen;
- rPol.bPfeileAussen=bPfeileAussen;
rPol.nArrow1Len=nArrow1Len;
- rPol.bArrow1Center=bArrow1Center;
rPol.nArrow2Len=nArrow2Len;
- rPol.bArrow2Center=bArrow2Center;
rPol.nLineAngle=GetAngle(aDelt);
double a=rPol.nLineAngle*nPi180;
@@ -475,8 +453,6 @@ void SdrMeasureObj::ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly&
nHlpSin=-nHlpSin;
nHlpCos=-nHlpCos;
}
- rPol.nHlpSin=nHlpSin;
- rPol.nHlpCos=nHlpCos;
long nLineDist=rRec.nLineDist;
long nOverhang=rRec.nHelplineOverhang;
diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx
index 3e0ae0fa02d7..73314a652095 100644
--- a/svx/source/svdraw/svdomedia.cxx
+++ b/svx/source/svdraw/svdomedia.cxx
@@ -104,7 +104,6 @@ sdr::contact::ViewContact* SdrMediaObj::CreateObjectSpecificViewContact()
void SdrMediaObj::TakeObjInfo( SdrObjTransformInfoRec& rInfo ) const
{
- rInfo.bSelectAllowed = true;
rInfo.bMoveAllowed = true;
rInfo.bResizeFreeAllowed = true;
rInfo.bResizePropAllowed = true;
@@ -114,7 +113,6 @@ void SdrMediaObj::TakeObjInfo( SdrObjTransformInfoRec& rInfo ) const
rInfo.bMirror45Allowed = false;
rInfo.bMirror90Allowed = false;
rInfo.bTransparenceAllowed = false;
- rInfo.bGradientAllowed = false;
rInfo.bShearAllowed = false;
rInfo.bEdgeRadiusAllowed = false;
rInfo.bNoOrthoDesired = false;
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 480cba941e5f..00f89070dd9c 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -600,7 +600,6 @@ public:
SdrLightEmbeddedClient_Impl* pLightClient; // must be registered as client only using AddOwnLightClient() call
bool mbFrame:1; // Due to compatibility at SdrTextObj for now
- bool mbInDestruction:1;
bool mbSuppressSetVisAreaSize:1; // #i118524#
mutable bool mbTypeAsked:1;
mutable bool mbIsChart:1;
@@ -615,7 +614,6 @@ public:
explicit SdrOle2ObjImpl( bool bFrame ) :
pLightClient (nullptr),
mbFrame(bFrame),
- mbInDestruction(false),
mbSuppressSetVisAreaSize(false),
mbTypeAsked(false),
mbIsChart(false),
@@ -630,7 +628,6 @@ public:
mxObjRef(rObjRef),
pLightClient (nullptr),
mbFrame(bFrame),
- mbInDestruction(false),
mbSuppressSetVisAreaSize(false),
mbTypeAsked(false),
mbIsChart(false),
@@ -711,8 +708,6 @@ OUString SdrOle2Obj::GetStyleString()
SdrOle2Obj::~SdrOle2Obj()
{
- mpImpl->mbInDestruction = true;
-
if ( mpImpl->mbConnected )
Disconnect();
@@ -1406,7 +1401,6 @@ void SdrOle2Obj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
rInfo.bMirror45Allowed = true;
rInfo.bMirror90Allowed = true;
rInfo.bTransparenceAllowed = true;
- rInfo.bGradientAllowed = true;
rInfo.bShearAllowed = true;
rInfo.bEdgeRadiusAllowed = false;
rInfo.bNoOrthoDesired = false;
diff --git a/svx/source/svdraw/svdopage.cxx b/svx/source/svdraw/svdopage.cxx
index d1117caff580..027abf46149c 100644
--- a/svx/source/svdraw/svdopage.cxx
+++ b/svx/source/svdraw/svdopage.cxx
@@ -135,7 +135,6 @@ void SdrPageObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
rInfo.bMirror45Allowed =false;
rInfo.bMirror90Allowed =false;
rInfo.bTransparenceAllowed = false;
- rInfo.bGradientAllowed = false;
rInfo.bShearAllowed =false;
rInfo.bEdgeRadiusAllowed=false;
rInfo.bNoOrthoDesired =false;
diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index 52b706497f8e..b1e585add4c5 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -172,10 +172,6 @@ void SdrRectObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
// allow transparency
rInfo.bTransparenceAllowed = true;
- // gradient depends on fillstyle
- drawing::FillStyle eFillStyle = static_cast<const XFillStyleItem&>(GetObjectItem(XATTR_FILLSTYLE)).GetValue();
- rInfo.bGradientAllowed = (eFillStyle == drawing::FillStyle_GRADIENT);
-
rInfo.bShearAllowed =bNoTextFrame;
rInfo.bEdgeRadiusAllowed=true;
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 3ee0475d31f9..d6226922ed9d 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -89,7 +89,6 @@ SdrTextObj::SdrTextObj()
{
bTextSizeDirty=false;
bTextFrame=false;
- bPortionInfoChecked=false;
bNoShear=false;
bNoMirror=false;
bDisableAutoWidthOnDragging=false;
@@ -112,7 +111,6 @@ SdrTextObj::SdrTextObj(const tools::Rectangle& rNewRect)
{
bTextSizeDirty=false;
bTextFrame=false;
- bPortionInfoChecked=false;
bNoShear=false;
bNoMirror=false;
bDisableAutoWidthOnDragging=false;
@@ -135,7 +133,6 @@ SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind)
{
bTextSizeDirty=false;
bTextFrame=true;
- bPortionInfoChecked=false;
bNoShear=true;
bNoMirror=true;
bDisableAutoWidthOnDragging=false;
@@ -158,7 +155,6 @@ SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind, const tools::Rectangle& rNewRect
{
bTextSizeDirty=false;
bTextFrame=true;
- bPortionInfoChecked=false;
bNoShear=true;
bNoMirror=true;
bDisableAutoWidthOnDragging=false;
@@ -428,9 +424,6 @@ void SdrTextObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
// allow transparency
rInfo.bTransparenceAllowed = true;
- // gradient depends on fillstyle
- drawing::FillStyle eFillStyle = static_cast<const XFillStyleItem&>(GetObjectItem(XATTR_FILLSTYLE)).GetValue();
- rInfo.bGradientAllowed = (eFillStyle == drawing::FillStyle_GRADIENT);
rInfo.bShearAllowed =bNoTextFrame;
rInfo.bEdgeRadiusAllowed=true;
bool bCanConv=ImpCanConvTextToCurve();
diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx
index 4199f69921b7..9312569bc14e 100644
--- a/svx/source/svdraw/svdouno.cxx
+++ b/svx/source/svdraw/svdouno.cxx
@@ -201,7 +201,6 @@ void SdrUnoObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
rInfo.bMirror45Allowed = false;
rInfo.bMirror90Allowed = false;
rInfo.bTransparenceAllowed = false;
- rInfo.bGradientAllowed = false;
rInfo.bShearAllowed = false;
rInfo.bEdgeRadiusAllowed = false;
rInfo.bNoOrthoDesired = false;
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index b24b96f7222b..7642a1ce2e7b 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -169,7 +169,6 @@ void SdrPaintView::ImpClearVars()
mpDragWin=nullptr;
mpDefaultStyleSheet=nullptr;
mbSomeObjChgdFlag=false;
- mnGraphicManagerDrawMode = GraphicManagerDrawFlags::STANDARD;
maComeBackIdle.SetPriority(TaskPriority::REPAINT);
maComeBackIdle.SetInvokeHandler(LINK(this,SdrPaintView,ImpComeBackHdl));
maComeBackIdle.SetDebugName( "svx::SdrPaintView aComeBackIdle" );
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index c8d6f6b2d740..9bce8d9c970e 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -60,7 +60,6 @@ SdrViewEvent::SdrViewEvent()
pURLField(nullptr),
eHit(SdrHitKind::NONE),
eEvent(SdrEventKind::NONE),
- eEndCreateCmd(SdrCreateCmd::NextPoint),
nMouseClicks(0),
nMouseMode(MouseEventModifiers::NONE),
nMouseCode(0),
@@ -70,15 +69,10 @@ SdrViewEvent::SdrViewEvent()
bMouseUp(false),
bIsAction(false),
bIsTextEdit(false),
- bTextEditHit(false),
bAddMark(false),
bUnmark(false),
bPrevNextMark(false),
- bMarkPrev(false),
- bInsPointNewObj(false),
- bDragWithCopy(false),
- bCaptureMouse(false),
- bReleaseMouse(false)
+ bMarkPrev(false)
{
}
@@ -156,11 +150,8 @@ SdrView::SdrView(SdrModel* pModel1, OutputDevice* pOut)
: SdrCreateView(pModel1,pOut),
bNoExtendedMouseDispatcher(false),
bNoExtendedKeyDispatcher(false),
- bNoExtendedCommandDispatcher(false),
mbMasterPagePaintCaching(false)
{
- bTextEditOnObjectsWithoutTextIfTextTool=false;
-
maAccessibilityOptions.AddListener(this);
onAccessibilityOptionsChanged();
@@ -568,14 +559,10 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
if (IsDragObj())
{
eEvent=SdrEventKind::EndDrag;
- rVEvt.bDragWithCopy=MODKEY_CopyDrag;
}
else if (IsCreateObj() || IsInsObjPoint())
{
eEvent=IsCreateObj() ? SdrEventKind::EndCreate : SdrEventKind::EndInsertObjPoint;
- rVEvt.eEndCreateCmd=SdrCreateCmd::NextPoint;
- if (MODKEY_PolyPoly) rVEvt.eEndCreateCmd=SdrCreateCmd::NextObject;
- if (rVEvt.nMouseClicks>1) rVEvt.eEndCreateCmd=SdrCreateCmd::ForceEnd;
}
else if (IsMarking())
{
@@ -652,7 +639,6 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
else if (bInsPolyPt && (MODKEY_PolyPoly || (!MODKEY_MultiMark && !MODKEY_DeepMark)))
{
eEvent=SdrEventKind::BeginInsertObjPoint;
- rVEvt.bInsPointNewObj=MODKEY_PolyPoly;
}
else if (bInsGluePt && !MODKEY_MultiMark && !MODKEY_DeepMark)
{
@@ -718,7 +704,6 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
}
rVEvt.bIsAction=bIsAction;
rVEvt.bIsTextEdit=bIsTextEdit;
- rVEvt.bTextEditHit=bTextEditHit;
rVEvt.aLogicPos=aLocalLogicPosition;
rVEvt.pHdl=pHdl;
rVEvt.pObj=pObj;
@@ -729,8 +714,6 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
rVEvt.nGlueId=nGlueId;
rVEvt.eHit=eHit;
rVEvt.eEvent=eEvent;
- rVEvt.bCaptureMouse=bMouseLeft && bMouseDown && eEvent!=SdrEventKind::NONE;
- rVEvt.bReleaseMouse=bMouseLeft && bMouseUp;
#ifdef DGB_UTIL
if (rVEvt.pRootObj!=NULL) {
if (rVEvt.pRootObj->GetObjList()!=rVEvt.pPV->GetObjList()) {
@@ -956,7 +939,6 @@ Pointer SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDevice*
aHitRec.pVisiLayer=&pMacroPV->GetVisibleLayers();
aHitRec.pPageView=pMacroPV;
aHitRec.pOut=pMacroWin.get();
- aHitRec.bDown=bMacroDown;
return pMacroObj->GetMacroPointer(aHitRec);
}
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 98ff74e07471..422755b414a6 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -1338,9 +1338,6 @@ void SdrTableObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
// allow transparence
rInfo.bTransparenceAllowed = true;
- // gradient depends on fillstyle
- drawing::FillStyle eFillStyle = static_cast<const XFillStyleItem&>(GetObjectItem(XATTR_FILLSTYLE)).GetValue();
- rInfo.bGradientAllowed = (eFillStyle == drawing::FillStyle_GRADIENT);
rInfo.bShearAllowed =false;
rInfo.bEdgeRadiusAllowed=false;
rInfo.bCanConvToPath =false;
diff --git a/svx/source/table/tableundo.cxx b/svx/source/table/tableundo.cxx
index 665254521c9d..70d5a2acea35 100644
--- a/svx/source/table/tableundo.cxx
+++ b/svx/source/table/tableundo.cxx
@@ -140,8 +140,6 @@ void CellUndo::getDataFromCell( Data& rData )
else
rData.mpOutlinerParaObject = nullptr;
- rData.mnCellContentType = mxCell->mnCellContentType;
-
rData.msFormula = mxCell->msFormula;
rData.mfValue = mxCell->mfValue;
rData.mnError = mxCell->mnError;
diff --git a/svx/source/table/tableundo.hxx b/svx/source/table/tableundo.hxx
index 608643ec1ea5..2f1d48844f29 100644
--- a/svx/source/table/tableundo.hxx
+++ b/svx/source/table/tableundo.hxx
@@ -58,8 +58,6 @@ private:
sdr::properties::TextProperties* mpProperties;
OutlinerParaObject* mpOutlinerParaObject;
- css::table::CellContentType mnCellContentType;
-
OUString msFormula;
double mfValue;
::sal_Int32 mnError;
@@ -70,7 +68,6 @@ private:
Data()
: mpProperties(nullptr)
, mpOutlinerParaObject(nullptr)
- , mnCellContentType(css::table::CellContentType_EMPTY)
, mfValue(0)
, mnError(0)
, mbMerged(false)
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index aa2c71aa31d4..4b25c99c98cd 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -581,8 +581,6 @@ ExtrusionLightingWindow::ExtrusionLightingWindow(svt::ToolboxController& rContro
, maImgBright(BitmapEx(RID_SVXBMP_LIGHTING_BRIGHT))
, maImgNormal(BitmapEx(RID_SVXBMP_LIGHTING_NORMAL))
, maImgDim(BitmapEx(RID_SVXBMP_LIGHTING_DIM))
- , mnLevel(0)
- , mbLevelEnabled(false)
, mnDirection(FROM_FRONT)
, mbDirectionEnabled(false)
{
@@ -643,8 +641,6 @@ void ExtrusionLightingWindow::dispose()
void ExtrusionLightingWindow::implSetIntensity( int nLevel, bool bEnabled )
{
- mnLevel = nLevel;
- mbLevelEnabled = bEnabled;
for (int i = 0; i < 3; ++i)
{
checkEntry( i, (i == nLevel) && bEnabled );
diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx
index cdd9c6b6c597..03c536e0a477 100644
--- a/svx/source/tbxctrls/extrusioncontrols.hxx
+++ b/svx/source/tbxctrls/extrusioncontrols.hxx
@@ -142,8 +142,6 @@ private:
Image maImgNormal;
Image maImgDim;
- int mnLevel;
- bool mbLevelEnabled;
int mnDirection;
bool mbDirectionEnabled;
diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index 33da56fe3227..f6fac3b05832 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -52,9 +52,8 @@ private:
::Color aBackgroundColor;
long nCol;
long nLine;
- bool m_bMod1;
Reference< XFrame > mxFrame;
- OUString maCommand;
+ OUString maCommand;
static const long TABLE_CELLS_HORIZ;
static const long TABLE_CELLS_VERT;
@@ -106,7 +105,6 @@ TableWindow::TableWindow( sal_uInt16 nSlotId, const OUString& rCmd, const OUStri
, aTableButton( VclPtr<PushButton>::Create(this) )
, nCol( 0 )
, nLine( 0 )
- , m_bMod1(false)
, mxFrame( rFrame )
, maCommand( rCmd )
, mnTablePosX(2)
@@ -226,7 +224,6 @@ void TableWindow::KeyInput( const KeyEvent& rKEvt )
}
else if(KEY_MOD1 == nModifier && KEY_RETURN == nKey)
{
- m_bMod1 = true;
EndPopupMode( FloatWinPopupEndFlags::CloseAll );
}
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index e6c35df791eb..bba8961f8b28 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -45,7 +45,6 @@
using namespace ::com::sun::star;
XOBitmap::XOBitmap( const Bitmap& rBmp ) :
- eType ( XBitmapType::Import ),
xGraphicObject (new GraphicObject(rBmp)),
bGraphicDirty ( false )
{