summaryrefslogtreecommitdiff
path: root/include/svx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-06-24 15:56:44 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-06-27 05:20:12 +0000
commit78ca0ce54a2cd79736247ea8cf69ad5fc797ee1a (patch)
treed6ea35c8f740c3ae4d09f68b8ff975daa765596c /include/svx
parentc47d85be7839d0721a09f2eb100c4ab0abb7a985 (diff)
loplugin:singlevalfields in svx(part3)
Change-Id: I6b7a33b5f1297309a7225cac8150dbf1175506b6 Reviewed-on: https://gerrit.libreoffice.org/26642 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'include/svx')
-rw-r--r--include/svx/svddrgv.hxx40
-rw-r--r--include/svx/svdedtv.hxx2
-rw-r--r--include/svx/svdedxv.hxx4
-rw-r--r--include/svx/svdetc.hxx7
4 files changed, 3 insertions, 50 deletions
diff --git a/include/svx/svddrgv.hxx b/include/svx/svddrgv.hxx
index 91fd524a6702..b96fb2745f4a 100644
--- a/include/svx/svddrgv.hxx
+++ b/include/svx/svddrgv.hxx
@@ -48,9 +48,7 @@ protected:
bool mbDragLimit : 1; // Limit on SnapRect instead of BoundRect
bool mbDragHdl : 1; // TRUE: RefPt is slid
bool mbDragStripes : 1; // Persistent
- bool mbMirrRefDragObj : 1; // Persistent - During the drag, show the mirror axis of the mirrored objects as Xor
bool mbSolidDragging : 1; // allow solid create/drag of objects
- bool mbMouseHideWhileDraggingPoints : 1;
bool mbResizeAtCenter : 1;
bool mbCrookAtCenter : 1;
bool mbDragWithCopy : 1;
@@ -58,10 +56,6 @@ protected:
bool mbInsObjPointMode : 1;
bool mbInsGluePointMode : 1;
bool mbNoDragXorPolys : 1;
- bool mbAutoVertexCon : 1; // automatic generation of connectors at the vertices
- bool mbAutoCornerCon : 1; // automatic generation of connectors at the corners
- bool mbRubberEdgeDragging : 1;
- bool mbDetailedEdgeDragging : 1;
private:
SVX_DLLPRIVATE void ImpClearVars();
@@ -145,14 +139,6 @@ public:
void SetDragStripes(bool bOn);
bool IsDragStripes() const { return mbDragStripes; }
- // hide handles during dragging
- //HMHvoid SetDragHdlHide(bool bOn);
- //HMHBOOL IsDragHdlHide() const { return bNoDragHdl; }
-
- // Hide the mouse when dragging polygon points or glue points.
- // Default=false
- bool IsMouseHideWhileDraggingPoints() const { return mbMouseHideWhileDraggingPoints; }
-
// As a general rule, the contours of the selected objects
// are displayed as Xor-polygons. If this flag is set, only one
// Xor-Frame is drawn (e.g. in case of multiple selection).
@@ -178,32 +164,6 @@ public:
void SetSolidDragging(bool bOn);
bool IsSolidDragging() const;
- // Dragging/Creation of connectors:
- // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- // Stick Connectors to vertices
- // Default=true=Yes
- bool IsAutoVertexConnectors() const { return mbAutoVertexCon; }
-
- // Stick Connectors to Corners
- // Default=false=No
- bool IsAutoCornerConnectors() const { return mbAutoCornerCon; }
-
- // Dragging of connected objects (Nodes):
- // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- // DetailedEdgeDraggingLimit: like RubberEdgeDraggingLimit,
- // but this limit refers to the detailed depiction, i.e. not
- // only rubber bands but total recalculations are visible while
- // dragging. This detailed depiction is only possible in MoveDrag.
- // Default value: 10
- bool IsDetailedEdgeDragging() const { return mbDetailedEdgeDragging; }
-
- // EdgeDraggingLimit: If more than nEdgeObjCount edges are affected,
- // they are not shown in the interactive dragging.
- // This here talks about the "rubber bands", which take less computing time
- // than the complete recalculations in the DetailedEdgeDragging.
- // default value: 100
- bool IsRubberEdgeDragging() const { return mbRubberEdgeDragging; }
-
// Connector handling is thus as follows (when using default settings):
// - If at most 10 Connectors are affected, they are recalculated
// on each MouseMove.
diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx
index 6b5caa9b5016..71c1fd2ac8df 100644
--- a/include/svx/svdedtv.hxx
+++ b/include/svx/svdedtv.hxx
@@ -96,8 +96,6 @@ protected:
bool bOneOrMoreMovable : 1; // at least one object is moveable
bool bMoreThanOneNoMovRot : 1; // more then one object is not movable nor turnable (Crook)
bool bContortionPossible : 1; // all polygones (grouped if necessary)
- bool bAllPolys : 1; // all polygones (not grouped)
- bool bOneOrMorePolys : 1; // at least one polygon (not grouped)
bool bMoveAllowed : 1;
bool bResizeFreeAllowed : 1;
bool bResizePropAllowed : 1;
diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx
index 519ba6eb5e2e..78ed1e0fcdd7 100644
--- a/include/svx/svdedxv.hxx
+++ b/include/svx/svdedxv.hxx
@@ -84,7 +84,6 @@ protected:
bool bTextEditOnlyOneView : 1; // a single OutlinerView (f. spellchecking)
bool bTextEditNewObj : 1; // current edited object was just recreated
bool bQuickTextEditMode : 1; // persistent(->CrtV). Default=TRUE
- bool bMacroMode : 1; // persistent(->CrtV). Default=TRUE
bool bMacroDown : 1;
rtl::Reference< sdr::SelectionController > mxSelectionController;
@@ -242,9 +241,6 @@ public:
// Object-MacroModus (e.g. rect as button or sth. like that):
- // Persistent. Default TRUE. SvDraw evaluates the flag e.g. at SdrView::GetPreferredPointer().
- // Has only effect, if the document has draw-objects with macrofunctionality (SdrObject::HasMacro()==sal_True).
- bool IsMacroMode() const { return bMacroMode; }
bool BegMacroObj(const Point& rPnt, short nTol, SdrObject* pObj, SdrPageView* pPV, vcl::Window* pWin);
void BegMacroObj(const Point& rPnt, SdrObject* pObj, SdrPageView* pPV, vcl::Window* pWin) { BegMacroObj(rPnt,-2,pObj,pPV,pWin); }
void MovMacroObj(const Point& rPnt);
diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx
index 577a1d93571d..9beca6f4ac18 100644
--- a/include/svx/svdetc.hxx
+++ b/include/svx/svdetc.hxx
@@ -64,10 +64,9 @@ SVX_DLLPUBLIC SdrOutliner* SdrMakeOutliner(OutlinerMode nOutlinerMode, SdrModel&
class SVX_DLLPUBLIC SdrEngineDefaults
{
friend class SdrAttrObj;
- Color aFontColor;
+ Color aFontColor;
sal_uIntPtr nFontHeight;
- MapUnit eMapUnit;
- Fraction aMapFraction;
+ Fraction aMapFraction;
private:
static SdrEngineDefaults& GetDefaults();
@@ -87,7 +86,7 @@ public:
// The MapMode is needed for the global Outliner.
// Incidentally, every newly instantiated SdrModel is assigned this MapMode by default.
// Default MapUnit is MAP_100TH_MM
- static MapUnit GetMapUnit() { return GetDefaults().eMapUnit; }
+ static MapUnit GetMapUnit() { return MAP_100TH_MM; }
// Default MapFraction is 1/1.
static Fraction GetMapFraction() { return GetDefaults().aMapFraction; }