Kaydet (Commit) f6b3b696 authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:singlevalfields in svx

Change-Id: I94d21bb868c54638b843c6abaab370a05ec3471e
Reviewed-on: https://gerrit.libreoffice.org/63317
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 21b0bd63
......@@ -229,15 +229,10 @@ public:
class SAL_WARN_UNUSED SVX_DLLPUBLIC LineLB : public ListBox
{
private:
/// defines if standard fields (none, solid) are added, default is true
bool mbAddStandardFields : 1;
public:
LineLB(vcl::Window* pParent);
void Fill(const XDashListRef &pList);
bool getAddStandardFields() const { return mbAddStandardFields; }
};
class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxLineLB
......
......@@ -171,7 +171,6 @@ private:
// Model, Page, View etc. for favourites
std::unique_ptr<FmFormModel> pModel;
VclPtr<VirtualDevice> pVDev;
SfxBindings* const pBindings;
std::unique_ptr<Svx3DCtrlItem> pControllerItem;
......
......@@ -47,8 +47,6 @@ protected:
Color aDefaultLightColor; // The parameters for the last colors
Color aDefaultAmbientColor;
E3dDragConstraint eDragConstraint;
// Migrate selections
std::unique_ptr<Impl3DMirrorConstructOverlay> mpMirrorOverlay;
......
......@@ -923,8 +923,7 @@ void FillTypeLB::Fill()
}
LineLB::LineLB(vcl::Window* pParent)
: ListBox(pParent, WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL),
mbAddStandardFields(true)
: ListBox(pParent, WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL)
{
// No EdgeBlending for LineStyle/Dash SetEdgeBlending(true);
}
......@@ -938,15 +937,12 @@ void LineLB::Fill( const XDashListRef &pList )
if( !pList.is() )
return;
if(getAddStandardFields())
{
// entry for 'none'
InsertEntry(pList->GetStringForUiNoLine());
// entry for 'none'
InsertEntry(pList->GetStringForUiNoLine());
// entry for solid line
InsertEntry(pList->GetStringForUiSolidLine(),
Image(pList->GetBitmapForUISolidLine()));
}
// entry for solid line
InsertEntry(pList->GetStringForUiSolidLine(),
Image(pList->GetBitmapForUISolidLine()));
// entries for dashed lines
......
......@@ -92,7 +92,6 @@ Svx3DWin::Svx3DWin(SfxBindings* pInBindings, SfxChildWindow *pCW, vcl::Window* p
, aImgLightOff(BitmapEx(RID_SVXBMP_LAMP_OFF))
, bUpdate(false)
, eViewType(ViewType3D::Geo)
, pVDev(nullptr)
, pBindings(pInBindings)
, mpImpl(new Svx3DWinImpl)
, ePoolUnit(MapUnit::MapMM)
......@@ -324,7 +323,6 @@ Svx3DWin::~Svx3DWin()
void Svx3DWin::dispose()
{
pVDev.disposeAndClear();
pModel.reset();
pControllerItem.reset();
......
......@@ -1255,7 +1255,7 @@ bool E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut,
}
// do not mask the allowed rotations
eConstraint = E3dDragConstraint(eConstraint& eDragConstraint);
eConstraint &= E3dDragConstraint::XYZ;
pForcedMeth = new E3dDragRotate(*this, GetMarkedObjectList(), eConstraint, IsSolidDragging());
}
break;
......@@ -1506,7 +1506,6 @@ void E3dView::ResetCreationActive ()
void E3dView::InitView ()
{
eDragConstraint = E3dDragConstraint::XYZ;
aDefaultLightColor = COL_WHITE;
aDefaultAmbientColor = COL_BLACK;
mpMirrorOverlay = nullptr;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment