[Libreoffice-commits] core.git: 5 commits - include/svx svx/source
Noel Grandin
noel.grandin at collabora.co.uk
Tue Feb 14 06:00:22 UTC 2017
include/svx/svdhdl.hxx | 1 -
include/svx/svdmodel.hxx | 1 -
include/svx/svdoashp.hxx | 1 -
include/svx/svdobj.hxx | 1 -
include/svx/svdpage.hxx | 1 -
include/svx/svdtypes.hxx | 1 -
svx/source/engine3d/view3d.cxx | 1 -
svx/source/form/fmpage.cxx | 2 +-
svx/source/svdraw/svddrgv.cxx | 4 ++--
svx/source/svdraw/svdedxv.cxx | 6 ------
svx/source/svdraw/svdhdl.cxx | 11 ++---------
svx/source/svdraw/svdoashp.cxx | 29 -----------------------------
svx/source/svdraw/svdobj.cxx | 4 ----
svx/source/svdraw/svdview.cxx | 2 +-
14 files changed, 6 insertions(+), 59 deletions(-)
New commits:
commit 93837254b7085c6632d76244d9ac466503ef47e0
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon Feb 13 14:11:10 2017 +0200
remove unused GlueDeselected enumerator from SdrHdlKind enum
Change-Id: Ie55ca0fd04bd7cc9c781faca6ebbf642518b2194
Reviewed-on: https://gerrit.libreoffice.org/34210
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx
index 5725be1..413164c 100644
--- a/include/svx/svdhdl.hxx
+++ b/include/svx/svdhdl.hxx
@@ -67,7 +67,6 @@ enum class SdrHdlKind
Ref2, // Reference point 2, e.g. endpoint of mirror axis
MirrorAxis, // Mirror axis
Glue, // GluePoint
- GlueDeselected, // GluePoint
Anchor, // Anchor symbol (SD, SW)
Transparence, // Interactive transparence
Gradient, // Interactive gradient
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index c8e89cb..174b964 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -507,11 +507,6 @@ void SdrHdl::CreateB2dIAObject()
eKindOfMarker = BitmapMarkerKind::Glue;
break;
}
- case SdrHdlKind::GlueDeselected:
- {
- eKindOfMarker = BitmapMarkerKind::Glue_Deselected;
- break;
- }
case SdrHdlKind::Anchor:
{
eKindOfMarker = BitmapMarkerKind::Anchor;
@@ -1018,7 +1013,6 @@ Pointer SdrHdl::GetPointer() const
case SdrHdlKind::Ref2 : ePtr=PointerStyle::RefHand; break;
case SdrHdlKind::BezierWeight : ePtr=PointerStyle::MoveBezierWeight; break;
case SdrHdlKind::Glue : ePtr=PointerStyle::MovePoint; break;
- case SdrHdlKind::GlueDeselected : ePtr=PointerStyle::MovePoint; break;
case SdrHdlKind::CustomShape1 : ePtr=PointerStyle::Hand; break;
default:
break;
@@ -1055,7 +1049,6 @@ bool SdrHdl::IsFocusHdl() const
case SdrHdlKind::Ref1: // reference point 1, e. g. center of rotation
case SdrHdlKind::Ref2: // reference point 2, e. g. endpoint of reflection axis
case SdrHdlKind::Glue: // glue point
- case SdrHdlKind::GlueDeselected: // deselected glue point, used to be a little blue cross
// for SJ and the CustomShapeHandles:
case SdrHdlKind::CustomShape1:
@@ -1836,11 +1829,11 @@ static bool ImpSdrHdlListSorter(SdrHdl* const& lhs, SdrHdl* const& rhs)
if (eKind1!=eKind2)
{
if (eKind1==SdrHdlKind::Ref1 || eKind1==SdrHdlKind::Ref2 || eKind1==SdrHdlKind::MirrorAxis) n1=5;
- else if (eKind1==SdrHdlKind::Glue || eKind1==SdrHdlKind::GlueDeselected) n1=2;
+ else if (eKind1==SdrHdlKind::Glue) n1=2;
else if (eKind1==SdrHdlKind::User) n1=3;
else if (eKind1==SdrHdlKind::SmartTag) n1=0;
if (eKind2==SdrHdlKind::Ref1 || eKind2==SdrHdlKind::Ref2 || eKind2==SdrHdlKind::MirrorAxis) n2=5;
- else if (eKind2==SdrHdlKind::Glue || eKind2==SdrHdlKind::GlueDeselected) n2=2;
+ else if (eKind2==SdrHdlKind::Glue) n2=2;
else if (eKind2==SdrHdlKind::User) n2=3;
else if (eKind2==SdrHdlKind::SmartTag) n2=0;
}
commit df49f966fad67992ceedc755993c560eaf3148d6
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon Feb 13 13:43:09 2017 +0200
remove unused ModelSaved enumerator from SdrHintKind enum
Change-Id: I0a236705efdcbc5f44cad8517f7f8f80d326934d
Reviewed-on: https://gerrit.libreoffice.org/34209
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index d2b4ef8..e53a422 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -114,7 +114,6 @@ enum class SdrHintKind
RefDeviceChange, // RefDevice changed
DefaultTabChange, // Default tabulator width changed
DefaultFontHeightChange, // Default FontHeight changed
- ModelSaved, // Document was saved
SwitchToPage, // #94278# UNDO/REDO at an object evtl. on another page
BeginEdit, // Is called after the object has entered text edit mode
EndEdit // Is called after the object has left text edit mode
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 9b4faf0..408413a 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -227,12 +227,6 @@ void SdrObjEditView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
if (eKind==SdrHintKind::DefaultTabChange) {
pTextEditOutliner->SetDefTab(mpModel->GetDefaultTabulator());
}
- if (eKind==SdrHintKind::DefaultFontHeightChange) {
-
- }
- if (eKind==SdrHintKind::ModelSaved) {
- pTextEditOutliner->ClearModifyFlag();
- }
}
}
}
commit 45090bee25d624770f34bf827337ade21b8671bb
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon Feb 13 13:13:44 2017 +0200
remove unused Handles enumerator from DefaultType enum
Change-Id: Iabda70ec3bc3204d5d383bcb93e174d90e405620
Reviewed-on: https://gerrit.libreoffice.org/34208
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx
index 57314da..c0670b6 100644
--- a/include/svx/svdoashp.hxx
+++ b/include/svx/svdoashp.hxx
@@ -178,7 +178,6 @@ public:
StretchX,
StretchY,
Equations,
- Handles,
TextFrames
};
bool IsDefaultGeometry( const DefaultType eDefaultType ) const;
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 5f053ca..71253ac 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -1305,35 +1305,6 @@ bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) cons
bIsDefaultGeometry = true;
}
break;
-
- case DefaultType::Handles :
- {
- const OUString sHandles( "Handles" );
- pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sHandles );
- if ( pAny && pDefCustomShape && pDefCustomShape->nHandles && pDefCustomShape->pHandles )
- {
- css::uno::Sequence< css::beans::PropertyValues > seqHandles1, seqHandles2;
- if ( *pAny >>= seqHandles1 )
- {
- sal_Int32 i, nCount = pDefCustomShape->nHandles;
- const SvxMSDffHandle* pData = pDefCustomShape->pHandles;
- seqHandles2.realloc( nCount );
- for ( i = 0; i < nCount; i++, pData++ )
- {
- sal_Int32 nPropertiesNeeded;
- css::beans::PropertyValues& rPropValues = seqHandles2[ i ];
- nPropertiesNeeded = GetNumberOfProperties( pData );
- rPropValues.realloc( nPropertiesNeeded );
- lcl_ShapePropertiesFromDFF( pData, rPropValues );
- }
- if ( seqHandles1 == seqHandles2 )
- bIsDefaultGeometry = true;
- }
- }
- else if ( pDefCustomShape && ( ( pDefCustomShape->nHandles == 0 ) || ( pDefCustomShape->pHandles == nullptr ) ) )
- bIsDefaultGeometry = true;
- }
- break;
}
return bIsDefaultGeometry;
}
commit 9778a2c9d04abf4f3017ac6730fdefa7fb7fd81b
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon Feb 13 13:08:12 2017 +0200
remove unused Copy enumerator from SdrUserCallType enum
Change-Id: I72f5ab1e903de96389fd7b085f9ebd76c26cf926
Reviewed-on: https://gerrit.libreoffice.org/34207
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index c5988e7..9c3d4e1 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -161,7 +161,6 @@ enum class SdrUserCallType {
Resize, // size and maybe position changed
ChangeAttr, // attribute changed. Eventually new size, because of line width
Delete, // object is going to be deleted soon, no attributes anymore
- Copy, // assign operator called, everything can be changed
Inserted, // inserted into an object list (e.g. Page)
Removed, // removed from an object list
ChildMoveOnly, // a child within a group has changed
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index f62dd31..de6e898 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -2768,10 +2768,6 @@ void SdrObject::SendUserCall(SdrUserCallType eUserCall, const Rectangle& rBoundR
eChildUserType = SdrUserCallType::ChildDelete;
break;
- case SdrUserCallType::Copy:
- eChildUserType = SdrUserCallType::ChildCopy;
- break;
-
case SdrUserCallType::Inserted:
eChildUserType = SdrUserCallType::ChildInserted;
break;
commit da817770df3f1ca68efff6ff096f961ef9934f76
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon Feb 13 13:04:01 2017 +0200
drop unused Streaming enumerator from SdrInsertReasonKind enum
Change-Id: Ia186fd54a8e1165a3bae5266f1248881e3057d83
Reviewed-on: https://gerrit.libreoffice.org/34206
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx
index 71befa1..2df5360 100644
--- a/include/svx/svdpage.hxx
+++ b/include/svx/svdpage.hxx
@@ -53,7 +53,6 @@ class SfxStyleSheet;
class SvxUnoDrawPagesAccess;
enum class SdrInsertReasonKind {
- Streaming, /// importing document
Undo, /// from Undo
Copy, /// something copied...
ViewCall /// via SdrView::Group(), ...
diff --git a/include/svx/svdtypes.hxx b/include/svx/svdtypes.hxx
index 7f800ea..ec10522 100644
--- a/include/svx/svdtypes.hxx
+++ b/include/svx/svdtypes.hxx
@@ -38,7 +38,6 @@ enum class SdrDragMode
Mirror,
Shear,
Crook,
- Distort, // Free deform (transform Rect in arbitrary quad)
// new modes for interactive transparence and gradient tools
Transparence,
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index 7b78e62..d79d00d 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -1275,7 +1275,6 @@ bool E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut,
// later on
case SdrDragMode::Mirror:
case SdrDragMode::Crook:
- case SdrDragMode::Distort:
case SdrDragMode::Transparence:
case SdrDragMode::Gradient:
default:
diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx
index 0027c7a..dc35dad 100644
--- a/svx/source/form/fmpage.cxx
+++ b/svx/source/form/fmpage.cxx
@@ -133,7 +133,7 @@ void FmFormPage::InsertObject(SdrObject* pObj, size_t nPos,
const SdrInsertReason* pReason)
{
SdrPage::InsertObject( pObj, nPos, pReason );
- if (GetModel() && (!pReason || pReason->GetReason() != SdrInsertReasonKind::Streaming))
+ if (GetModel())
static_cast<FmFormModel*>(GetModel())->GetUndoEnv().Inserted(pObj);
}
diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx
index 9c517a5..65a92c5 100644
--- a/svx/source/svdraw/svddrgv.cxx
+++ b/svx/source/svdraw/svddrgv.cxx
@@ -259,7 +259,7 @@ bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
{
switch (meDragMode)
{
- case SdrDragMode::Rotate: case SdrDragMode::Shear: case SdrDragMode::Distort:
+ case SdrDragMode::Rotate: case SdrDragMode::Shear:
{
switch (meDragHdl)
{
@@ -283,7 +283,7 @@ bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
case SdrHdlKind::UpperLeft: case SdrHdlKind::UpperRight:
case SdrHdlKind::LowerLeft: case SdrHdlKind::LowerRight:
{
- if (meDragMode==SdrDragMode::Shear || meDragMode==SdrDragMode::Distort)
+ if (meDragMode==SdrDragMode::Shear)
{
if (!IsDistortAllowed(true) && !IsDistortAllowed()) return false;
mpCurrentSdrDragMethod = new SdrDragDistort(*this);
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index f69d592..3b602c5 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -1076,7 +1076,7 @@ Pointer SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDevice*
if (bMov)
return Pointer(PointerStyle::Rotate);
} break;
- case SdrDragMode::Shear: case SdrDragMode::Distort: {
+ case SdrDragMode::Shear: {
if (bCorner) {
if (!IsDistortAllowed(true) && !IsDistortAllowed()) return Pointer(PointerStyle::NotAllowed);
else return Pointer(PointerStyle::RefHand);
More information about the Libreoffice-commits
mailing list