[Libreoffice-commits] core.git: include/svx svx/source

[Libreoffice Gerrit user]

 include/svx/dlgctrl.hxx         |    5 -----
 include/svx/float3d.hxx         |    1 -
 include/svx/view3d.hxx          |    2 --
 svx/source/dialog/dlgctrl.cxx   |   16 ++++++----------
 svx/source/engine3d/float3d.cxx |    2 --
 svx/source/engine3d/view3d.cxx  |    3 +--
 6 files changed, 7 insertions(+), 22 deletions(-)

New commits:
commit f6b3b696ad9d454f7acbe930439cccc052e9fce2
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Tue Nov 13 08:40:57 2018 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Nov 13 09:41:54 2018 +0100

    loplugin:singlevalfields in svx
    
    Change-Id: I94d21bb868c54638b843c6abaab370a05ec3471e
    Reviewed-on: https://gerrit.libreoffice.org/63317
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx
index c5c155011aeb..52c1f4f20ca7 100644
--- a/include/svx/dlgctrl.hxx
+++ b/include/svx/dlgctrl.hxx
@@ -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
diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx
index 16891e8b344f..cd907090c750 100644
--- a/include/svx/float3d.hxx
+++ b/include/svx/float3d.hxx
@@ -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;
diff --git a/include/svx/view3d.hxx b/include/svx/view3d.hxx
index 9b92023e5596..9a385d45ecd8 100644
--- a/include/svx/view3d.hxx
+++ b/include/svx/view3d.hxx
@@ -47,8 +47,6 @@ protected:
     Color                       aDefaultLightColor;             // The parameters for the last colors
     Color                       aDefaultAmbientColor;
 
-    E3dDragConstraint           eDragConstraint;
-
     // Migrate selections
     std::unique_ptr<Impl3DMirrorConstructOverlay> mpMirrorOverlay;
 
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index d91160e4aa1e..9b3d6f8eb135 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -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
 
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index 85df3f93938e..8d0a72d11923 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
     , 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();
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index a601f1b27791..ce6e3c831027 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -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;