[Libreoffice-commits] core.git: 4 commits - basctl/source chart2/source filter/source include/svx reportdesign/source sc/source sd/source svx/source sw/inc sw/source
Noel Grandin
noel at peralex.com
Mon Aug 22 06:26:02 UTC 2016
basctl/source/accessibility/accessibledialogwindow.cxx | 4
chart2/source/controller/drawinglayer/DrawViewWrapper.cxx | 4
chart2/source/controller/main/ChartController_Window.cxx | 2
chart2/source/view/main/ChartView.cxx | 10 -
filter/source/msfilter/escherex.cxx | 16 +-
include/svx/AccessibleTextHelper.hxx | 6
include/svx/svdmodel.hxx | 53 +++---
include/svx/svdmrkv.hxx | 50 +++---
include/svx/svdoashp.hxx | 20 +-
include/svx/svdpntv.hxx | 2
reportdesign/source/ui/report/SectionView.cxx | 4
reportdesign/source/ui/report/dlgedfunc.cxx | 10 -
sc/source/core/data/drwlayer.cxx | 6
sc/source/ui/Accessibility/AccessibleDocument.cxx | 6
sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx | 2
sc/source/ui/Accessibility/AccessibleEditObject.cxx | 2
sc/source/ui/Accessibility/AccessibleText.cxx | 8 -
sc/source/ui/drawfunc/fuconpol.cxx | 4
sc/source/ui/drawfunc/fudraw.cxx | 2
sc/source/ui/drawfunc/fusel.cxx | 4
sc/source/ui/drawfunc/graphsh.cxx | 2
sc/source/ui/view/drawvie3.cxx | 2
sc/source/ui/view/gridwin5.cxx | 2
sc/source/ui/view/prevwsh2.cxx | 2
sd/source/core/drawdoc.cxx | 2
sd/source/core/drawdoc3.cxx | 8 -
sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx | 2
sd/source/ui/accessibility/AccessibleSlideSorterView.cxx | 2
sd/source/ui/app/sdxfer.cxx | 2
sd/source/ui/dlg/SpellDialogChildWindow.cxx | 2
sd/source/ui/func/fuconbez.cxx | 8 -
sd/source/ui/func/fuconstr.cxx | 4
sd/source/ui/func/fudraw.cxx | 14 -
sd/source/ui/func/fuediglu.cxx | 16 +-
sd/source/ui/func/fuformatpaintbrush.cxx | 2
sd/source/ui/func/fusel.cxx | 20 +-
sd/source/ui/func/futext.cxx | 48 +++---
sd/source/ui/sidebar/MasterPageObserver.cxx | 2
sd/source/ui/slidesorter/controller/SlsListener.cxx | 4
sd/source/ui/tools/EventMultiplexer.cxx | 12 -
sd/source/ui/unoidl/unomodel.cxx | 4
sd/source/ui/unoidl/unopback.cxx | 2
sd/source/ui/view/drawview.cxx | 6
svx/source/accessibility/AccessibleEmptyEditSource.cxx | 2
svx/source/accessibility/AccessibleTextHelper.cxx | 4
svx/source/accessibility/GraphCtlAccessibleContext.cxx | 8 -
svx/source/core/extedit.cxx | 4
svx/source/dialog/graphctl.cxx | 2
svx/source/form/fmshimp.cxx | 2
svx/source/form/fmundo.cxx | 4
svx/source/form/fmvwimp.cxx | 2
svx/source/form/navigatortreemodel.cxx | 4
svx/source/svdraw/svdcrtv.cxx | 6
svx/source/svdraw/svdedxv.cxx | 17 --
svx/source/svdraw/svdlayer.cxx | 6
svx/source/svdraw/svdmodel.cxx | 53 +++---
svx/source/svdraw/svdmrkv.cxx | 10 -
svx/source/svdraw/svdoashp.cxx | 18 +-
svx/source/svdraw/svdobj.cxx | 9 -
svx/source/svdraw/svdoedge.cxx | 2
svx/source/svdraw/svdpage.cxx | 23 +--
svx/source/svdraw/svdpntv.cxx | 4
svx/source/svdraw/svdundo.cxx | 6
svx/source/svdraw/svdview.cxx | 84 +++++------
svx/source/table/tablecontroller.cxx | 6
svx/source/unodraw/UnoNameItemTable.cxx | 2
svx/source/unodraw/unomod.cxx | 18 +-
svx/source/unodraw/unomtabl.cxx | 2
svx/source/unodraw/unoshape.cxx | 12 -
svx/source/unodraw/unoshtxt.cxx | 12 -
sw/inc/fesh.hxx | 2
sw/source/core/draw/drawdoc.cxx | 2
sw/source/core/frmedt/feshview.cxx | 8 -
sw/source/uibase/docvw/edtwin.cxx | 26 +--
sw/source/uibase/inc/edtwin.hxx | 3
sw/source/uibase/ribbar/conform.cxx | 2
sw/source/uibase/ribbar/drawbase.cxx | 14 -
77 files changed, 371 insertions(+), 391 deletions(-)
New commits:
commit 0552ec9828ad65b1cf90f4e5253f0108facd5bf3
Author: Noel Grandin <noel at peralex.com>
Date: Mon Aug 22 08:24:14 2016 +0200
convert SdrHintKind to scoped enum
Change-Id: I77ad33425d440263a71bc94f41d8e141f16dfb78
diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx
index 18e07bc..6092d46 100644
--- a/basctl/source/accessibility/accessibledialogwindow.cxx
+++ b/basctl/source/accessibility/accessibledialogwindow.cxx
@@ -477,7 +477,7 @@ void AccessibleDialogWindow::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
switch ( pSdrHint->GetKind() )
{
- case HINT_OBJINSERTED:
+ case SdrHintKind::ObjectInserted:
{
if (DlgEdObj const* pDlgEdObj = dynamic_cast<DlgEdObj const*>(pSdrHint->GetObject()))
{
@@ -487,7 +487,7 @@ void AccessibleDialogWindow::Notify( SfxBroadcaster&, const SfxHint& rHint )
}
}
break;
- case HINT_OBJREMOVED:
+ case SdrHintKind::ObjectRemoved:
{
if (DlgEdObj const* pDlgEdObj = dynamic_cast<DlgEdObj const*>(pSdrHint->GetObject()))
RemoveChild( ChildDescriptor(const_cast<DlgEdObj*>(pDlgEdObj)) );
diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
index b96c3f3..f885911 100644
--- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
+++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
@@ -334,7 +334,7 @@ void DrawViewWrapper::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
if( pSdrHint != nullptr )
{
SdrHintKind eKind = pSdrHint->GetKind();
- if( eKind == HINT_BEGEDIT )
+ if( eKind == SdrHintKind::BeginEdit )
{
// #i79965# remember map mode
OSL_ASSERT( ! m_bRestoreMapMode );
@@ -345,7 +345,7 @@ void DrawViewWrapper::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
m_bRestoreMapMode = true;
}
}
- else if( eKind == HINT_ENDEDIT )
+ else if( eKind == SdrHintKind::EndEdit )
{
// #i79965# scroll back view when ending text edit
OSL_ASSERT( m_bRestoreMapMode );
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index b52ca24..f04bcf7 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -2812,19 +2812,19 @@ void ChartView::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
bool bShapeChanged = false;
switch( pSdrHint->GetKind() )
{
- case HINT_OBJCHG:
+ case SdrHintKind::ObjectChange:
bShapeChanged = true;
break;
- case HINT_OBJINSERTED:
+ case SdrHintKind::ObjectInserted:
bShapeChanged = true;
break;
- case HINT_OBJREMOVED:
+ case SdrHintKind::ObjectRemoved:
bShapeChanged = true;
break;
- case HINT_MODELCLEARED:
+ case SdrHintKind::ModelCleared:
bShapeChanged = true;
break;
- case HINT_ENDEDIT:
+ case SdrHintKind::EndEdit:
bShapeChanged = true;
break;
default:
diff --git a/include/svx/AccessibleTextHelper.hxx b/include/svx/AccessibleTextHelper.hxx
index effd533..5fd8394 100644
--- a/include/svx/AccessibleTextHelper.hxx
+++ b/include/svx/AccessibleTextHelper.hxx
@@ -166,9 +166,9 @@ namespace accessibility
edit/non-edit mode (i.e. there are times when
SvxEditSource::GetEditViewForwarder(sal_False) returns
NULL), then the two additional hints are required:
- HINT_BEGEDIT and HINT_ENDEDIT. When the
- AccessibleTextHelper receives a HINT_BEGEDIT, it expects
- the SvxEditSource already in edit mode. On a HINT_ENDEDIT,
+ SdrHintKind::BeginEdit and SdrHintKind::EndEdit. When the
+ AccessibleTextHelper receives a SdrHintKind::BeginEdit, it expects
+ the SvxEditSource already in edit mode. On a SdrHintKind::EndEdit,
edit mode must already been left. The rationale for these
events are the fact that focus and selection have to be
updated in edit mode, and completely relinquished and
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 30084a8..e44ba06 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -101,44 +101,43 @@ namespace o3tl
}
-enum SdrHintKind
+enum class SdrHintKind
{
- HINT_UNKNOWN, // Unknown
- HINT_LAYERCHG, // changed layer definition
- HINT_LAYERORDERCHG, // order of layer changed (Insert/Remove/ChangePos)
- HINT_PAGEORDERCHG, // order of pages (object pages or master pages) changed (Insert/Remove/ChangePos)
- HINT_OBJCHG, // object changed
- HINT_OBJINSERTED, // new object inserted
- HINT_OBJREMOVED, // symbol object removed from list
- HINT_MODELCLEARED, // deleted the whole model (no pages exist anymore). not impl.
- HINT_REFDEVICECHG, // RefDevice changed
- HINT_DEFAULTTABCHG, // Default tabulator width changed
- HINT_DEFFONTHGTCHG, // Default FontHeight changed
- HINT_MODELSAVED, // Document was saved
- HINT_SWITCHTOPAGE, // #94278# UNDO/REDO at an object evtl. on another page
- HINT_BEGEDIT, // Is called after the object has entered text edit mode
- HINT_ENDEDIT // Is called after the object has left text edit mode
+ Unknown, // Unknown
+ LayerChange, // changed layer definition
+ LayerOrderChange, // order of layer changed (Insert/Remove/ChangePos)
+ PageOrderChange, // order of pages (object pages or master pages) changed (Insert/Remove/ChangePos)
+ ObjectChange, // object changed
+ ObjectInserted, // new object inserted
+ ObjectRemoved, // symbol object removed from list
+ ModelCleared, // deleted the whole model (no pages exist anymore). not impl.
+ 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
};
class SVX_DLLPUBLIC SdrHint: public SfxHint
{
-public:
- Rectangle maRectangle;
- const SdrPage* mpPage;
- const SdrObject* mpObj;
+private:
SdrHintKind meHint;
+ const SdrObject* mpObj;
+ const SdrPage* mpPage;
+ Rectangle maRectangle;
public:
explicit SdrHint(SdrHintKind eNewHint);
- explicit SdrHint(const SdrObject& rNewObj);
-
- void SetPage(const SdrPage* pNewPage);
- void SetObject(const SdrObject* pNewObj);
- void SetKind(SdrHintKind eNewKind);
+ explicit SdrHint(SdrHintKind eNewHint, const SdrObject& rNewObj);
+ explicit SdrHint(SdrHintKind eNewHint, const SdrPage* pPage);
+ explicit SdrHint(SdrHintKind eNewHint, const SdrObject& rNewObj, const SdrPage* pPage);
- const SdrPage* GetPage() const { return mpPage;}
+ const SdrPage* GetPage() const { return mpPage;}
const SdrObject* GetObject() const { return mpObj;}
- SdrHintKind GetKind() const { return meHint;}
+ SdrHintKind GetKind() const { return meHint;}
+ const Rectangle& GetRectangle() const { return maRectangle;}
};
diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index 331f387..b687bd6 100644
--- a/include/svx/svdpntv.hxx
+++ b/include/svx/svdpntv.hxx
@@ -244,7 +244,7 @@ protected:
virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override;
void GlueInvalidate() const;
- // ModelHasChanged is called, as soon as the system is idle again after many HINT_OBJCHG.
+ // ModelHasChanged is called, as soon as the system is idle again after many SdrHintKind::ObjectChange.
//
// Any sub-class override this method, MUST call the base class' ModelHasChanged() method
virtual void ModelHasChanged();
diff --git a/reportdesign/source/ui/report/SectionView.cxx b/reportdesign/source/ui/report/SectionView.cxx
index bb01d28..d7796c7 100644
--- a/reportdesign/source/ui/report/SectionView.cxx
+++ b/reportdesign/source/ui/report/SectionView.cxx
@@ -132,9 +132,9 @@ void OSectionView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
const SdrObject* pObj = pSdrHint->GetObject();
const SdrHintKind eKind = pSdrHint->GetKind();
// check for change of selected object
- if(HINT_OBJCHG == eKind && pObj && IsObjMarked(const_cast<SdrObject*>(pObj)))
+ if(SdrHintKind::ObjectChange == eKind && pObj && IsObjMarked(const_cast<SdrObject*>(pObj)))
AdjustMarkHdl();
- else if ( eKind == HINT_OBJREMOVED )
+ else if ( eKind == SdrHintKind::ObjectRemoved )
ObjectRemovedInAliveMode(pObj);
}
}
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 7d7edbf..c537eae 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -162,7 +162,7 @@ void ScUndoAnchorData::Undo()
// Trigger Object Change
if (pObj->IsInserted() && pObj->GetPage() && pObj->GetModel())
{
- SdrHint aHint(*pObj);
+ SdrHint aHint(SdrHintKind::ObjectChange, *pObj);
pObj->GetModel()->Broadcast(aHint);
}
@@ -182,7 +182,7 @@ void ScUndoAnchorData::Redo()
// Trigger Object Change
if (pObj->IsInserted() && pObj->GetPage() && pObj->GetModel())
{
- SdrHint aHint(*pObj);
+ SdrHint aHint(SdrHintKind::ObjectChange, *pObj);
pObj->GetModel()->Broadcast(aHint);
}
}
@@ -336,7 +336,7 @@ ScDrawLayer::ScDrawLayer( ScDocument* pDocument, const OUString& rName ) :
ScDrawLayer::~ScDrawLayer()
{
- Broadcast(SdrHint(HINT_MODELCLEARED));
+ Broadcast(SdrHint(SdrHintKind::ModelCleared));
ClearModel(true);
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index cc6eff8..9c78759 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -411,7 +411,7 @@ void ScChildrenShapes::Notify(SfxBroadcaster&, const SfxHint& rHint)
{
switch (pSdrHint->GetKind())
{
- case HINT_OBJCHG : // Objekt geaendert
+ case SdrHintKind::ObjectChange : // Objekt geaendert
{
uno::Reference<drawing::XShape> xShape (pObj->getUnoShape(), uno::UNO_QUERY);
if (xShape.is())
@@ -422,14 +422,14 @@ void ScChildrenShapes::Notify(SfxBroadcaster&, const SfxHint& rHint)
}
}
break;
- case HINT_OBJINSERTED : // Neues Zeichenobjekt eingefuegt
+ case SdrHintKind::ObjectInserted : // Neues Zeichenobjekt eingefuegt
{
uno::Reference<drawing::XShape> xShape (pObj->getUnoShape(), uno::UNO_QUERY);
if (xShape.is())
AddShape(xShape, true);
}
break;
- case HINT_OBJREMOVED : // Zeichenobjekt aus Liste entfernt
+ case SdrHintKind::ObjectRemoved : // Zeichenobjekt aus Liste entfernt
{
uno::Reference<drawing::XShape> xShape (pObj->getUnoShape(), uno::UNO_QUERY);
if (xShape.is())
diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
index 4e6aa39..604eb89 100644
--- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
@@ -706,7 +706,7 @@ void ScShapeChildren::Notify(SfxBroadcaster&, const SfxHint& rHint)
{
switch (pSdrHint->GetKind())
{
- case HINT_OBJCHG : // Objekt geaendert
+ case SdrHintKind::ObjectChange : // Objekt geaendert
{
}
break;
diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx
index 0aa7255..6666284 100644
--- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx
+++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx
@@ -387,7 +387,7 @@ void ScAccessibleEditObject::CreateTextHelper()
// do not activate cell object, if top edit line is active
if( pInputHdl && !pInputHdl->IsTopMode() )
{
- SdrHint aHint( HINT_BEGEDIT );
+ SdrHint aHint( SdrHintKind::BeginEdit );
mpTextHelper->GetEditSource().GetBroadcaster().Broadcast( aHint );
}
}
diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx
index 5c4e0c1..35a6a01 100644
--- a/sc/source/ui/Accessibility/AccessibleText.cxx
+++ b/sc/source/ui/Accessibility/AccessibleText.cxx
@@ -1170,15 +1170,15 @@ void ScAccessibleEditLineTextData::StartEdit()
ResetEditMode();
mpEditView = nullptr;
- // send HINT_BEGEDIT
- SdrHint aHint(HINT_BEGEDIT);
+ // send SdrHintKind::BeginEdit
+ SdrHint aHint(SdrHintKind::BeginEdit);
GetBroadcaster().Broadcast( aHint );
}
void ScAccessibleEditLineTextData::EndEdit()
{
- // send HINT_ENDEDIT
- SdrHint aHint(HINT_ENDEDIT);
+ // send SdrHintKind::EndEdit
+ SdrHint aHint(SdrHintKind::EndEdit);
GetBroadcaster().Broadcast( aHint );
ResetEditMode();
diff --git a/sc/source/ui/view/drawvie3.cxx b/sc/source/ui/view/drawvie3.cxx
index 8522854..cae79d1 100644
--- a/sc/source/ui/view/drawvie3.cxx
+++ b/sc/source/ui/view/drawvie3.cxx
@@ -139,7 +139,7 @@ namespace {
*/
void adjustAnchoredPosition(const SdrHint& rHint, const ScDocument& rDoc, SCTAB nTab)
{
- if (rHint.GetKind() != HINT_OBJCHG && rHint.GetKind() != HINT_OBJINSERTED)
+ if (rHint.GetKind() != SdrHintKind::ObjectChange && rHint.GetKind() != SdrHintKind::ObjectInserted)
return;
SdrObject* pObj = const_cast<SdrObject*>(rHint.GetObject());
diff --git a/sc/source/ui/view/prevwsh2.cxx b/sc/source/ui/view/prevwsh2.cxx
index 0b8af5d..da0df15 100644
--- a/sc/source/ui/view/prevwsh2.cxx
+++ b/sc/source/ui/view/prevwsh2.cxx
@@ -59,7 +59,7 @@ void ScPreviewShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
else if (dynamic_cast<const SdrHint*>(&rHint))
{
// SdrHints are no longer used for invalidating, thus react on objectchange instead
- if(HINT_OBJCHG == static_cast<const SdrHint&>(rHint).GetKind())
+ if(SdrHintKind::ObjectChange == static_cast<const SdrHint&>(rHint).GetKind())
bDataChanged = true;
}
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index 2b06a98..bdf3395 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -373,7 +373,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
// Destructor
SdDrawDocument::~SdDrawDocument()
{
- Broadcast(SdrHint(HINT_MODELCLEARED));
+ Broadcast(SdrHint(SdrHintKind::ModelCleared));
if (mpWorkStartupTimer)
{
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index 5321eb9..2c090c0 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -847,13 +847,11 @@ bool SdDrawDocument::InsertBookmarkAsPage(
// Get the name to use from Exchange list
OUString aExchangeName(*pExchangeIter);
pRefPage->SetName(aExchangeName);
- SdrHint aHint(HINT_PAGEORDERCHG);
- aHint.SetPage(pRefPage);
- Broadcast(aHint);
+ Broadcast(SdrHint(SdrHintKind::PageOrderChange, pRefPage));
+
SdPage* pNewNotesPage = GetSdPage(nSdPage, PK_NOTES);
pNewNotesPage->SetName(aExchangeName);
- aHint.SetPage(pNewNotesPage);
- Broadcast(aHint);
+ Broadcast(SdrHint(SdrHintKind::PageOrderChange, pNewNotesPage));
++pExchangeIter;
}
diff --git a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx
index f9e9d2c..a586545 100644
--- a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx
+++ b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx
@@ -186,7 +186,7 @@ namespace accessibility
{
const SdrHint* pSdrHint = dynamic_cast< const SdrHint* >( &rHint );
- if( pSdrHint && ( pSdrHint->GetKind() == HINT_MODELCLEARED ) )
+ if( pSdrHint && ( pSdrHint->GetKind() == SdrHintKind::ModelCleared ) )
{
// model is dying under us, going defunc
bDispose = true;
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
index 1afc650..3380de7 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
@@ -853,7 +853,7 @@ void AccessibleSlideSorterView::Implementation::Notify (
{
switch (pSdrHint->GetKind())
{
- case HINT_PAGEORDERCHG:
+ case SdrHintKind::PageOrderChange:
RequestUpdateChildren();
break;
default:
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index 2091166..6f07464 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -801,7 +801,7 @@ void SdTransferable::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
const SdrHint* pSdrHint = dynamic_cast< const SdrHint* >( &rHint );
if( pSdrHint )
{
- if( HINT_MODELCLEARED == pSdrHint->GetKind() )
+ if( SdrHintKind::ModelCleared == pSdrHint->GetKind() )
{
EndListening(*mpSourceDoc);
mpSourceDoc = nullptr;
diff --git a/sd/source/ui/dlg/SpellDialogChildWindow.cxx b/sd/source/ui/dlg/SpellDialogChildWindow.cxx
index 6870683..5dcd4b7 100644
--- a/sd/source/ui/dlg/SpellDialogChildWindow.cxx
+++ b/sd/source/ui/dlg/SpellDialogChildWindow.cxx
@@ -115,7 +115,7 @@ void SpellDialogChildWindow::Notify(SfxBroadcaster&, const SfxHint& rHint)
{
if (const SdrHint* pSdrHint = dynamic_cast<const SdrHint*>(&rHint))
{
- if (HINT_MODELCLEARED == pSdrHint->GetKind())
+ if (SdrHintKind::ModelCleared == pSdrHint->GetKind())
{
EndSpellingAndClearOutliner();
}
diff --git a/sd/source/ui/sidebar/MasterPageObserver.cxx b/sd/source/ui/sidebar/MasterPageObserver.cxx
index cc32177..4b2db78 100644
--- a/sd/source/ui/sidebar/MasterPageObserver.cxx
+++ b/sd/source/ui/sidebar/MasterPageObserver.cxx
@@ -226,7 +226,7 @@ void MasterPageObserver::Implementation::Notify(
{
switch (pSdrHint->GetKind())
{
- case HINT_PAGEORDERCHG:
+ case SdrHintKind::PageOrderChange:
// Process the modified set of pages only when the number of
// standard and notes master pages are equal. This test
// filters out events that are sent in between the insertion
diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx
index 22e6f71..a775b80 100644
--- a/sd/source/ui/slidesorter/controller/SlsListener.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx
@@ -282,14 +282,14 @@ void Listener::Notify (
{
switch (pSdrHint->GetKind())
{
- case HINT_MODELCLEARED:
+ case SdrHintKind::ModelCleared:
if (&rBroadcaster == mrSlideSorter.GetModel().GetDocument())
{ // rhbz#965646 stop listening to dying document
EndListening(rBroadcaster);
return;
}
break;
- case HINT_PAGEORDERCHG:
+ case SdrHintKind::PageOrderChange:
if (&rBroadcaster == mrSlideSorter.GetModel().GetDocument())
HandleModelChange(pSdrHint->GetPage());
break;
diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx
index 7a505ee..3b048ae 100644
--- a/sd/source/ui/tools/EventMultiplexer.cxx
+++ b/sd/source/ui/tools/EventMultiplexer.cxx
@@ -641,26 +641,26 @@ void EventMultiplexer::Implementation::Notify (
{
switch (pSdrHint->GetKind())
{
- case HINT_MODELCLEARED:
- case HINT_PAGEORDERCHG:
+ case SdrHintKind::ModelCleared:
+ case SdrHintKind::PageOrderChange:
CallListeners (EventMultiplexerEvent::EID_PAGE_ORDER);
break;
- case HINT_SWITCHTOPAGE:
+ case SdrHintKind::SwitchToPage:
CallListeners (EventMultiplexerEvent::EID_CURRENT_PAGE);
break;
- case HINT_OBJCHG:
+ case SdrHintKind::ObjectChange:
CallListeners(EventMultiplexerEvent::EID_SHAPE_CHANGED,
const_cast<void*>(static_cast<const void*>(pSdrHint->GetPage())));
break;
- case HINT_OBJINSERTED:
+ case SdrHintKind::ObjectInserted:
CallListeners(EventMultiplexerEvent::EID_SHAPE_INSERTED,
const_cast<void*>(static_cast<const void*>(pSdrHint->GetPage())));
break;
- case HINT_OBJREMOVED:
+ case SdrHintKind::ObjectRemoved:
CallListeners(EventMultiplexerEvent::EID_SHAPE_REMOVED,
const_cast<void*>(static_cast<const void*>(pSdrHint->GetPage())));
break;
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 0f14dfb..27fd3ce 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -158,7 +158,7 @@ void SdUnoForbiddenCharsTable::Notify( SfxBroadcaster&, const SfxHint& rHint ) t
if( pSdrHint )
{
- if( HINT_MODELCLEARED == pSdrHint->GetKind() )
+ if( SdrHintKind::ModelCleared == pSdrHint->GetKind() )
{
mpModel = nullptr;
}
@@ -417,7 +417,7 @@ void SdXImpressDocument::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
notifyEvent( aEvent );
}
- if( pSdrHint->GetKind() == HINT_MODELCLEARED )
+ if( pSdrHint->GetKind() == SdrHintKind::ModelCleared )
{
if( mpDoc )
EndListening( *mpDoc );
diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx
index 06941d2..77b63c0 100644
--- a/sd/source/ui/unoidl/unopback.cxx
+++ b/sd/source/ui/unoidl/unopback.cxx
@@ -85,7 +85,7 @@ void SdUnoPageBackground::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
// delete item set if document is dying because then the pool
// will also die
- if( pSdrHint->GetKind() == HINT_MODELCLEARED )
+ if( pSdrHint->GetKind() == SdrHintKind::ModelCleared )
{
delete mpSet;
mpSet = nullptr;
diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index a05aa94..f2f0bcf 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -377,17 +377,17 @@ void DrawView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
{
SdrHintKind eHintKind = static_cast<const SdrHint&>(rHint).GetKind();
- if ( mnPOCHSmph == 0 && eHintKind == HINT_PAGEORDERCHG )
+ if ( mnPOCHSmph == 0 && eHintKind == SdrHintKind::PageOrderChange )
{
mpDrawViewShell->ResetActualPage();
}
- else if ( eHintKind == HINT_LAYERCHG || eHintKind == HINT_LAYERORDERCHG )
+ else if ( eHintKind == SdrHintKind::LayerChange || eHintKind == SdrHintKind::LayerOrderChange )
{
mpDrawViewShell->ResetActualLayer();
}
// switch to that page when it's not a master page
- if(HINT_SWITCHTOPAGE == eHintKind)
+ if(SdrHintKind::SwitchToPage == eHintKind)
{
const SdrPage* pPage = static_cast<const SdrHint&>(rHint).GetPage();
diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx
index c18da6d..ebad3d6 100644
--- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx
+++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx
@@ -309,7 +309,7 @@ namespace accessibility
{
const SdrHint* pSdrHint = dynamic_cast<const SdrHint*>( &rHint );
- if( pSdrHint && pSdrHint->GetKind() == HINT_BEGEDIT &&
+ if( pSdrHint && pSdrHint->GetKind() == SdrHintKind::BeginEdit &&
&mrObj == pSdrHint->GetObject() && mpEditSource.get() )
{
// switch edit source, if not yet done. This is necessary
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx
index b31023ba..444c088 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -1275,7 +1275,7 @@ namespace accessibility
{
switch( pSdrHint->GetKind() )
{
- case HINT_BEGEDIT:
+ case SdrHintKind::BeginEdit:
{
if(!IsActive())
{
@@ -1289,7 +1289,7 @@ namespace accessibility
break;
}
- case HINT_ENDEDIT:
+ case SdrHintKind::EndEdit:
{
// focused child now loses focus
ESelection aSelection;
diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
index 827078b..46b6c31 100644
--- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
+++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
@@ -740,7 +740,7 @@ void SvxGraphCtrlAccessibleContext::Notify( SfxBroadcaster& /*rBC*/, const SfxHi
{
switch( pSdrHint->GetKind() )
{
- case HINT_OBJCHG:
+ case SdrHintKind::ObjectChange:
{
ShapesMapType::iterator iter = mxShapes.find( pSdrHint->GetObject() );
@@ -755,13 +755,13 @@ void SvxGraphCtrlAccessibleContext::Notify( SfxBroadcaster& /*rBC*/, const SfxHi
}
break;
- case HINT_OBJINSERTED:
+ case SdrHintKind::ObjectInserted:
CommitChange( AccessibleEventId::CHILD, makeAny( getAccessible( pSdrHint->GetObject() ) ) , uno::Any());
break;
- case HINT_OBJREMOVED:
+ case SdrHintKind::ObjectRemoved:
CommitChange( AccessibleEventId::CHILD, uno::Any(), makeAny( getAccessible( pSdrHint->GetObject() ) ) );
break;
- case HINT_MODELCLEARED:
+ case SdrHintKind::ModelCleared:
dispose();
break;
default:
diff --git a/svx/source/core/extedit.cxx b/svx/source/core/extedit.cxx
index 8ef1662..d87cc92 100644
--- a/svx/source/core/extedit.cxx
+++ b/svx/source/core/extedit.cxx
@@ -167,9 +167,9 @@ void SdrExternalToolEdit::Notify(SfxBroadcaster & rBC, SfxHint const& rHint)
{
SdrHint const*const pSdrHint(dynamic_cast<SdrHint const*>(&rHint));
if (pSdrHint
- && (HINT_MODELCLEARED == pSdrHint->GetKind()
+ && (SdrHintKind::ModelCleared == pSdrHint->GetKind()
|| (pSdrHint->GetObject() == m_pObj
- && HINT_OBJREMOVED == pSdrHint->GetKind())))
+ && SdrHintKind::ObjectRemoved == pSdrHint->GetKind())))
{
m_pView = nullptr;
m_pObj = nullptr;
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index 22476b5..9059a14 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -290,12 +290,12 @@ void FmXUndoEnvironment::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
{
switch (pSdrHint->GetKind())
{
- case HINT_OBJINSERTED:
+ case SdrHintKind::ObjectInserted:
{
SdrObject* pSdrObj = const_cast<SdrObject*>(pSdrHint->GetObject());
Inserted( pSdrObj );
} break;
- case HINT_OBJREMOVED:
+ case SdrHintKind::ObjectRemoved:
{
SdrObject* pSdrObj = const_cast<SdrObject*>(pSdrHint->GetObject());
Removed( pSdrObj );
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 649676f..f330a64 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -1699,7 +1699,7 @@ FmXFormView::ObjectRemoveListener::ObjectRemoveListener( FmXFormView* pParent )
void FmXFormView::ObjectRemoveListener::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
{
const SdrHint* pSdrHint = dynamic_cast<const SdrHint*>(&rHint);
- if (pSdrHint && pSdrHint->GetKind() == HINT_OBJREMOVED)
+ if (pSdrHint && pSdrHint->GetKind() == SdrHintKind::ObjectRemoved)
m_pParent->ObjectRemovedInAliveMode(pSdrHint->GetObject());
}
diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx
index bec558d..675cad5 100644
--- a/svx/source/form/navigatortreemodel.cxx
+++ b/svx/source/form/navigatortreemodel.cxx
@@ -690,10 +690,10 @@ namespace svxform
{
switch( pSdrHint->GetKind() )
{
- case HINT_OBJINSERTED:
+ case SdrHintKind::ObjectInserted:
InsertSdrObj(pSdrHint->GetObject());
break;
- case HINT_OBJREMOVED:
+ case SdrHintKind::ObjectRemoved:
RemoveSdrObj(pSdrHint->GetObject());
break;
default:
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 39d68b2..c00db04 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -224,16 +224,16 @@ void SdrObjEditView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
const SdrHint* pSdrHint = dynamic_cast<const SdrHint*>(&rHint);
if (pSdrHint!=nullptr && pTextEditOutliner!=nullptr) {
SdrHintKind eKind=pSdrHint->GetKind();
- if (eKind==HINT_REFDEVICECHG) {
+ if (eKind==SdrHintKind::RefDeviceChange) {
pTextEditOutliner->SetRefDevice(mpModel->GetRefDevice());
}
- if (eKind==HINT_DEFAULTTABCHG) {
+ if (eKind==SdrHintKind::DefaultTabChange) {
pTextEditOutliner->SetDefTab(mpModel->GetDefaultTabulator());
}
- if (eKind==HINT_DEFFONTHGTCHG) {
+ if (eKind==SdrHintKind::DefaultFontHeightChange) {
}
- if (eKind==HINT_MODELSAVED) {
+ if (eKind==SdrHintKind::ModelSaved) {
pTextEditOutliner->ClearModifyFlag();
}
}
@@ -941,8 +941,7 @@ bool SdrObjEditView::SdrBeginTextEdit(
if( GetModel() )
{
- SdrHint aHint(*pTextObj);
- aHint.SetKind(HINT_BEGEDIT);
+ SdrHint aHint(SdrHintKind::BeginEdit, *pTextObj);
GetModel()->Broadcast(aHint);
}
@@ -1076,8 +1075,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool bDontDeleteReally)
if( GetModel() && mxTextEditObj.is() )
{
- SdrHint aHint(*mxTextEditObj.get());
- aHint.SetKind(HINT_ENDEDIT);
+ SdrHint aHint(SdrHintKind::EndEdit, *mxTextEditObj.get());
GetModel()->Broadcast(aHint);
}
@@ -1255,8 +1253,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool bDontDeleteReally)
!pTEObj->GetModel()->isLocked() &&
pTEObj->GetBroadcaster())
{
- SdrHint aHint(HINT_ENDEDIT);
- aHint.SetObject(pTEObj);
+ SdrHint aHint(SdrHintKind::EndEdit, *pTEObj);
const_cast<SfxBroadcaster*>(pTEObj->GetBroadcaster())->Broadcast(aHint);
}
diff --git a/svx/source/svdraw/svdlayer.cxx b/svx/source/svdraw/svdlayer.cxx
index 329308b..1b2cfd2 100644
--- a/svx/source/svdraw/svdlayer.cxx
+++ b/svx/source/svdraw/svdlayer.cxx
@@ -102,7 +102,7 @@ void SdrLayer::SetStandardLayer()
nType=(sal_uInt16)true;
maName = ImpGetResStr(STR_StandardLayerName);
if (pModel!=nullptr) {
- SdrHint aHint(HINT_LAYERCHG);
+ SdrHint aHint(SdrHintKind::LayerChange);
pModel->Broadcast(aHint);
pModel->SetChanged();
}
@@ -118,7 +118,7 @@ void SdrLayer::SetName(const OUString& rNewName)
if (pModel)
{
- SdrHint aHint(HINT_LAYERCHG);
+ SdrHint aHint(SdrHintKind::LayerChange);
pModel->Broadcast(aHint);
pModel->SetChanged();
}
@@ -187,7 +187,7 @@ void SdrLayerAdmin::SetModel(SdrModel* pNewModel)
void SdrLayerAdmin::Broadcast() const
{
if (pModel!=nullptr) {
- SdrHint aHint(HINT_LAYERORDERCHG);
+ SdrHint aHint(SdrHintKind::LayerOrderChange);
pModel->Broadcast(aHint);
pModel->SetChanged();
}
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 47c3263..8361185 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -249,7 +249,7 @@ SdrModel::~SdrModel()
mbInDestruction = true;
- Broadcast(SdrHint(HINT_MODELCLEARED));
+ Broadcast(SdrHint(SdrHintKind::ModelCleared));
delete mpOutlinerCache;
@@ -898,7 +898,7 @@ void SdrModel::BurnInStyleSheetAttributes()
void SdrModel::RefDeviceChanged()
{
- Broadcast(SdrHint(HINT_REFDEVICECHG));
+ Broadcast(SdrHint(SdrHintKind::RefDeviceChange));
ImpReformatAllTextObjects();
}
@@ -906,7 +906,7 @@ void SdrModel::SetDefaultFontHeight(sal_uIntPtr nVal)
{
if (nVal!=nDefTextHgt) {
nDefTextHgt=nVal;
- Broadcast(SdrHint(HINT_DEFFONTHGTCHG));
+ Broadcast(SdrHint(SdrHintKind::DefaultFontHeightChange));
ImpReformatAllTextObjects();
}
}
@@ -917,7 +917,7 @@ void SdrModel::SetDefaultTabulator(sal_uInt16 nVal)
nDefaultTabulator=nVal;
Outliner& rOutliner=GetDrawOutliner();
rOutliner.SetDefTab(nVal);
- Broadcast(SdrHint(HINT_DEFAULTTABCHG));
+ Broadcast(SdrHint(SdrHintKind::DefaultTabChange));
ImpReformatAllTextObjects();
}
}
@@ -1397,8 +1397,7 @@ void SdrModel::InsertPage(SdrPage* pPage, sal_uInt16 nPos)
pPage->SetModel(this);
if (nPos<nCount) bPagNumsDirty=true;
SetChanged();
- SdrHint aHint(HINT_PAGEORDERCHG);
- aHint.SetPage(pPage);
+ SdrHint aHint(SdrHintKind::PageOrderChange, pPage);
Broadcast(aHint);
}
@@ -1418,8 +1417,7 @@ SdrPage* SdrModel::RemovePage(sal_uInt16 nPgNum)
}
bPagNumsDirty=true;
SetChanged();
- SdrHint aHint(HINT_PAGEORDERCHG);
- aHint.SetPage(pPg);
+ SdrHint aHint(SdrHintKind::PageOrderChange, pPg);
Broadcast(aHint);
return pPg;
}
@@ -1450,8 +1448,7 @@ void SdrModel::InsertMasterPage(SdrPage* pPage, sal_uInt16 nPos)
bMPgNumsDirty=true;
}
SetChanged();
- SdrHint aHint(HINT_PAGEORDERCHG);
- aHint.SetPage(pPage);
+ SdrHint aHint(SdrHintKind::PageOrderChange, pPage);
Broadcast(aHint);
}
@@ -1482,8 +1479,7 @@ SdrPage* SdrModel::RemoveMasterPage(sal_uInt16 nPgNum)
bMPgNumsDirty=true;
SetChanged();
- SdrHint aHint(HINT_PAGEORDERCHG);
- aHint.SetPage(pRetPg);
+ SdrHint aHint(SdrHintKind::PageOrderChange, pRetPg);
Broadcast(aHint);
return pRetPg;
}
@@ -1500,8 +1496,7 @@ void SdrModel::MoveMasterPage(sal_uInt16 nPgNum, sal_uInt16 nNewPos)
}
bMPgNumsDirty=true;
SetChanged();
- SdrHint aHint(HINT_PAGEORDERCHG);
- aHint.SetPage(pPg);
+ SdrHint aHint(SdrHintKind::PageOrderChange, pPg);
Broadcast(aHint);
}
@@ -2085,34 +2080,32 @@ const css::uno::Sequence< sal_Int8 >& SdrModel::getUnoTunnelImplementationId()
SdrHint::SdrHint(SdrHintKind eNewHint)
-: mpPage(nullptr),
+: meHint(eNewHint),
mpObj(nullptr),
- meHint(eNewHint)
+ mpPage(nullptr)
{
}
-SdrHint::SdrHint(const SdrObject& rNewObj)
-: mpPage(rNewObj.GetPage()),
+SdrHint::SdrHint(SdrHintKind eNewHint, const SdrObject& rNewObj)
+: meHint(eNewHint),
mpObj(&rNewObj),
- meHint(HINT_OBJCHG)
+ mpPage(rNewObj.GetPage()),
+ maRectangle(rNewObj.GetLastBoundRect())
{
- maRectangle = rNewObj.GetLastBoundRect();
}
-void SdrHint::SetPage(const SdrPage* pNewPage)
-{
- mpPage = pNewPage;
-}
-
-void SdrHint::SetObject(const SdrObject* pNewObj)
+SdrHint::SdrHint(SdrHintKind eNewHint, const SdrPage* pPage)
+: meHint(eNewHint),
+ mpObj(nullptr),
+ mpPage(pPage)
{
- mpObj = pNewObj;
}
-void SdrHint::SetKind(SdrHintKind eNewKind)
+SdrHint::SdrHint(SdrHintKind eNewHint, const SdrObject& rNewObj, const SdrPage* pPage)
+: meHint(eNewHint),
+ mpObj(&rNewObj),
+ mpPage(pPage)
{
- meHint = eNewKind;
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 4cceb51..72ec65f 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -179,7 +179,7 @@ void SdrMarkView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
{
SdrHintKind eKind=pSdrHint->GetKind();
- if (eKind==HINT_OBJCHG || eKind==HINT_OBJINSERTED || eKind==HINT_OBJREMOVED)
+ if (eKind==SdrHintKind::ObjectChange || eKind==SdrHintKind::ObjectInserted || eKind==SdrHintKind::ObjectRemoved)
{
mbMarkedObjRectDirty=true;
mbMarkedPointsRectsDirty=true;
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index cf39f0a..d7b37c2 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -890,7 +890,7 @@ void SdrObject::BroadcastObjectChange() const
if(bPlusDataBroadcast || bObjectChange)
{
- SdrHint aHint(*this);
+ SdrHint aHint(SdrHintKind::ObjectChange, *this);
if(bPlusDataBroadcast)
{
@@ -2628,8 +2628,7 @@ void SdrObject::SetInserted(bool bIns)
else SendUserCall(SdrUserCallType::Removed,aBoundRect0);
if (pPlusData!=nullptr && pPlusData->pBroadcast!=nullptr) {
- SdrHint aHint(*this);
- aHint.SetKind(bIns?HINT_OBJINSERTED:HINT_OBJREMOVED);
+ SdrHint aHint(bIns?SdrHintKind::ObjectInserted:SdrHintKind::ObjectRemoved, *this);
pPlusData->pBroadcast->Broadcast(aHint);
}
}
@@ -2665,7 +2664,7 @@ void SdrObject::SetPrintable(bool bPrn)
SetChanged();
if (IsInserted() && pModel!=nullptr)
{
- SdrHint aHint(*this);
+ SdrHint aHint(SdrHintKind::ObjectChange, *this);
pModel->Broadcast(aHint);
}
}
@@ -2679,7 +2678,7 @@ void SdrObject::SetVisible(bool bVisible)
SetChanged();
if (IsInserted() && pModel!=nullptr)
{
- SdrHint aHint(*this);
+ SdrHint aHint(SdrHintKind::ObjectChange, *this);
pModel->Broadcast(aHint);
}
}
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index 1a8f1a2..30b766e 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -1586,7 +1586,7 @@ void SdrEdgeObj::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
if (bDataChg ||
(bObj1 && aCon1.pObj->GetPage()==pPage) ||
(bObj2 && aCon2.pObj->GetPage()==pPage) ||
- (pSdrHint && pSdrHint->GetKind()==HINT_OBJREMOVED))
+ (pSdrHint && pSdrHint->GetKind()==SdrHintKind::ObjectRemoved))
{
// broadcasting only, if on the same page
Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetCurrentBoundRect();
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index 2fa3614..141f2f7 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -235,9 +235,7 @@ void SdrObjList::Clear()
// sent remove hint (after removal, see RemoveObject())
if(pModel)
{
- SdrHint aHint(*pObj);
- aHint.SetKind(HINT_OBJREMOVED);
- aHint.SetPage(pPage);
+ SdrHint aHint(SdrHintKind::ObjectRemoved, *pObj, pPage);
pModel->Broadcast(aHint);
}
@@ -385,9 +383,7 @@ void SdrObjList::InsertObject(SdrObject* pObj, size_t nPos, const SdrInsertReaso
// Repaint from object number ... (heads-up: GroupObj)
if(pObj->GetPage())
{
- SdrHint aHint(*pObj);
-
- aHint.SetKind(HINT_OBJINSERTED);
+ SdrHint aHint(SdrHintKind::ObjectInserted, *pObj);
pModel->Broadcast(aHint);
}
@@ -449,8 +445,7 @@ SdrObject* SdrObjList::RemoveObject(size_t nObjNum)
if (pModel!=nullptr) {
// TODO: We need a different broadcast here.
if (pObj->GetPage()!=nullptr) {
- SdrHint aHint(*pObj);
- aHint.SetKind(HINT_OBJREMOVED);
+ SdrHint aHint(SdrHintKind::ObjectRemoved, *pObj);
pModel->Broadcast(aHint);
}
pModel->SetChanged();
@@ -530,8 +525,7 @@ SdrObject* SdrObjList::ReplaceObject(SdrObject* pNewObj, size_t nObjNum)
if (pModel!=nullptr) {
// TODO: We need a different broadcast here.
if (pObj->GetPage()!=nullptr) {
- SdrHint aHint(*pObj);
- aHint.SetKind(HINT_OBJREMOVED);
+ SdrHint aHint(SdrHintKind::ObjectRemoved, *pObj);
pModel->Broadcast(aHint);
}
}
@@ -555,8 +549,7 @@ SdrObject* SdrObjList::ReplaceObject(SdrObject* pNewObj, size_t nObjNum)
if (pModel!=nullptr) {
// TODO: We need a different broadcast here.
if (pNewObj->GetPage()!=nullptr) {
- SdrHint aHint(*pNewObj);
- aHint.SetKind(HINT_OBJINSERTED);
+ SdrHint aHint(SdrHintKind::ObjectInserted, *pNewObj);
pModel->Broadcast(aHint);
}
pModel->SetChanged();
@@ -592,7 +585,8 @@ SdrObject* SdrObjList::SetObjectOrdNum(size_t nOldObjNum, size_t nNewObjNum)
if (pModel!=nullptr)
{
// TODO: We need a different broadcast here.
- if (pObj->GetPage()!=nullptr) pModel->Broadcast(SdrHint(*pObj));
+ if (pObj->GetPage()!=nullptr)
+ pModel->Broadcast(SdrHint(SdrHintKind::ObjectChange, *pObj));
pModel->SetChanged();
}
}
@@ -1080,8 +1074,7 @@ void ImpPageChange(SdrPage& rSdrPage)
if(rSdrPage.GetModel())
{
rSdrPage.GetModel()->SetChanged();
- SdrHint aHint(HINT_PAGEORDERCHG);
- aHint.SetPage(&rSdrPage);
+ SdrHint aHint(SdrHintKind::PageOrderChange, &rSdrPage);
rSdrPage.GetModel()->Broadcast(aHint);
}
}
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index 04e8735..f9b2b19 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -247,7 +247,7 @@ void SdrPaintView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
return;
SdrHintKind eKind = pSdrHint->GetKind();
- if (eKind==HINT_OBJCHG || eKind==HINT_OBJINSERTED || eKind==HINT_OBJREMOVED)
+ if (eKind==SdrHintKind::ObjectChange || eKind==SdrHintKind::ObjectInserted || eKind==SdrHintKind::ObjectRemoved)
{
bool bObjChg = !mbSomeObjChgdFlag; // if true, evaluate for ComeBack timer
if (bObjChg)
@@ -257,7 +257,7 @@ void SdrPaintView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
}
}
- if (eKind==HINT_PAGEORDERCHG)
+ if (eKind==SdrHintKind::PageOrderChange)
{
const SdrPage* pPg=pSdrHint->GetPage();
if (pPg && !pPg->IsInserted())
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index 1362de3..0f5c6ab 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -247,11 +247,7 @@ void SdrUndoObj::ImpShowPageOfThisObject()
{
if(pObj && pObj->IsInserted() && pObj->GetPage() && pObj->GetModel())
{
- SdrHint aHint(HINT_SWITCHTOPAGE);
-
- aHint.SetObject(pObj);
- aHint.SetPage(pObj->GetPage());
-
+ SdrHint aHint(SdrHintKind::SwitchToPage, *pObj, pObj->GetPage());
pObj->GetModel()->Broadcast(aHint);
}
}
diff --git a/svx/source/unodraw/UnoNameItemTable.cxx b/svx/source/unodraw/UnoNameItemTable.cxx
index 7107b9d..f6e7539 100644
--- a/svx/source/unodraw/UnoNameItemTable.cxx
+++ b/svx/source/unodraw/UnoNameItemTable.cxx
@@ -69,7 +69,7 @@ void SvxUnoNameItemTable::Notify( SfxBroadcaster&, const SfxHint& rHint ) throw(
{
const SdrHint* pSdrHint = dynamic_cast<const SdrHint*>(&rHint);
- if( pSdrHint && HINT_MODELCLEARED == pSdrHint->GetKind() )
+ if( pSdrHint && SdrHintKind::ModelCleared == pSdrHint->GetKind() )
dispose();
}
diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index a2504fa..e30f2cb 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -120,8 +120,8 @@ bool SvxUnoDrawMSFactory::createEvent( const SdrModel* pDoc, const SdrHint* pSdr
switch( pSdrHint->GetKind() )
{
-// case HINT_LAYERCHG: // layer definition changed
-// case HINT_LAYERORDERCHG: // layer order changed (Insert/Remove/ChangePos)
+// case SdrHintKind::LayerChange: // layer definition changed
+// case SdrHintKind::LayerOrderChange: // layer order changed (Insert/Remove/ChangePos)
// case HINT_LAYERSETCHG: // layer set changed
// case HINT_LAYERSETORDERCHG: // layer set order changed (Insert/Remove/ChangePos)
@@ -129,25 +129,25 @@ bool SvxUnoDrawMSFactory::createEvent( const SdrModel* pDoc, const SdrHint* pSdr
// aEvent.EventName = "PageModified";
// pPage = pSdrHint->GetPage();
// break;
- case HINT_PAGEORDERCHG: // draw or master page order changed (Insert/Remove/ChangePos)
+ case SdrHintKind::PageOrderChange: // draw or master page order changed (Insert/Remove/ChangePos)
aEvent.EventName = "PageOrderModified";
pPage = pSdrHint->GetPage();
break;
- case HINT_OBJCHG: // object changed
+ case SdrHintKind::ObjectChange: // object changed
aEvent.EventName = "ShapeModified";
pObj = pSdrHint->GetObject();
break;
- case HINT_OBJINSERTED: // add new draw object
+ case SdrHintKind::ObjectInserted: // add new draw object
aEvent.EventName = "ShapeInserted";
pObj = pSdrHint->GetObject();
break;
- case HINT_OBJREMOVED: // removed draw object from list
+ case SdrHintKind::ObjectRemoved: // removed draw object from list
aEvent.EventName = "ShapeRemoved";
pObj = pSdrHint->GetObject();
break;
-// HINT_DEFAULTTABCHG, // default tab width changed
-// HINT_DEFFONTHGTCHG, // default FontHeight changed
-// HINT_SWITCHTOPAGE, // #94278# UNDO/REDO at an object evtl. on another page
+// SdrHintKind::DefaultTabChange, // default tab width changed
+// SdrHintKind::DefaultFontHeightChange, // default FontHeight changed
+// SdrHintKind::SwitchToPage, // #94278# UNDO/REDO at an object evtl. on another page
// HINT_OBJLISTCLEAR // Is called before an SdrObjList will be cleared
default:
return false;
diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx
index 5ed42a7..39cfe7d 100644
--- a/svx/source/unodraw/unomtabl.cxx
+++ b/svx/source/unodraw/unomtabl.cxx
@@ -125,7 +125,7 @@ void SvxUnoMarkerTable::Notify( SfxBroadcaster&, const SfxHint& rHint ) throw()
{
const SdrHint* pSdrHint = dynamic_cast<const SdrHint*>(&rHint);
- if( pSdrHint && HINT_MODELCLEARED == pSdrHint->GetKind() )
+ if( pSdrHint && SdrHintKind::ModelCleared == pSdrHint->GetKind() )
dispose();
}
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 9713732..1b6e627 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -1005,13 +1005,13 @@ void SvxShape::Notify( SfxBroadcaster&, const SfxHint& rHint ) throw()
if( !mpObj.is() )
return;
- // #i55919# HINT_OBJCHG is only interesting if it's for this object
+ // #i55919# SdrHintKind::ObjectChange is only interesting if it's for this object
const SdrHint* pSdrHint = dynamic_cast<const SdrHint*>(&rHint);
- if (!pSdrHint || ( /* (pSdrHint->GetKind() != HINT_OBJREMOVED) && */
- (pSdrHint->GetKind() != HINT_MODELCLEARED) &&
+ if (!pSdrHint || ( /* (pSdrHint->GetKind() != SdrHintKind::ObjectRemoved) && */
+ (pSdrHint->GetKind() != SdrHintKind::ModelCleared) &&
// #110094#-9 (pSdrHint->GetKind() != HINT_OBJLISTCLEAR) &&
- ((pSdrHint->GetKind() != HINT_OBJCHG || pSdrHint->GetObject() != mpObj.get() ))))
+ ((pSdrHint->GetKind() != SdrHintKind::ObjectChange || pSdrHint->GetObject() != mpObj.get() ))))
return;
uno::Reference< uno::XInterface > xSelf( mpObj->getWeakUnoShape() );
@@ -1025,12 +1025,12 @@ void SvxShape::Notify( SfxBroadcaster&, const SfxHint& rHint ) throw()
switch( pSdrHint->GetKind() )
{
- case HINT_OBJCHG:
+ case SdrHintKind::ObjectChange:
{
updateShapeKind();
break;
}
- case HINT_MODELCLEARED:
+ case SdrHintKind::ModelCleared:
{
bClearMe = true;
mpModel = nullptr;
diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx
index 7f84e67..3d527c3 100644
--- a/svx/source/unodraw/unoshtxt.cxx
+++ b/svx/source/unodraw/unoshtxt.cxx
@@ -99,7 +99,7 @@ private:
bool mbNeedsUpdate;
bool mbOldUndoMode;
bool mbForwarderIsEditMode; // have to reflect that, since ENDEDIT can happen more often
- bool mbShapeIsEditMode; // #104157# only true, if HINT_BEGEDIT was received
+ bool mbShapeIsEditMode; // #104157# only true, if SdrHintKind::BeginEdit was received
bool mbNotificationsDisabled; // prevent EditEngine/Outliner notifications (e.g. when setting up forwarder)
SvxUnoTextRangeBaseList maTextRanges;
@@ -340,7 +340,7 @@ void SvxTextEditSourceImpl::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
{
switch( pSdrHint->GetKind() )
{
- case HINT_OBJCHG:
+ case SdrHintKind::ObjectChange:
{
mbDataValid = false; // Text muss neu geholt werden
@@ -359,10 +359,10 @@ void SvxTextEditSourceImpl::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
break;
}
- case HINT_BEGEDIT:
+ case SdrHintKind::BeginEdit:
if( mpObject == pSdrHint->GetObject() )
{
- // Once HINT_BEGEDIT is broadcast, each EditSource of
+ // Once SdrHintKind::BeginEdit is broadcast, each EditSource of
// AccessibleCell will handle it here and call below:
// mpView->GetTextEditOutliner()->SetNotifyHdl(), which
// will replace the Notifer for current editable cell. It
@@ -403,7 +403,7 @@ void SvxTextEditSourceImpl::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
}
break;
- case HINT_ENDEDIT:
+ case SdrHintKind::EndEdit:
if( mpObject == pSdrHint->GetObject() )
{
Broadcast( *pSdrHint );
@@ -434,7 +434,7 @@ void SvxTextEditSourceImpl::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
}
break;
- case HINT_MODELCLEARED:
+ case SdrHintKind::ModelCleared:
dispose();
break;
default:
diff --git a/sw/source/core/draw/drawdoc.cxx b/sw/source/core/draw/drawdoc.cxx
index 73155da..abe22af 100644
--- a/sw/source/core/draw/drawdoc.cxx
+++ b/sw/source/core/draw/drawdoc.cxx
@@ -105,7 +105,7 @@ SwDrawModel::SwDrawModel(SwDoc *const pDoc)
SwDrawModel::~SwDrawModel()
{
- Broadcast(SdrHint(HINT_MODELCLEARED));
+ Broadcast(SdrHint(SdrHintKind::ModelCleared));
ClearModel(true);
}
commit 2309217a55c8d5e6bdde2a6d4775f10415505fcd
Author: Noel Grandin <noel at peralex.com>
Date: Fri Aug 19 14:31:46 2016 +0200
convert SdrViewEditMode to scoped enum
Change-Id: I1f58efceaee7346187f92c7ebaf901abc305ac33
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx
index db67b26a..a4217bf 100644
--- a/include/svx/svdmrkv.hxx
+++ b/include/svx/svdmrkv.hxx
@@ -72,9 +72,11 @@ enum class SdrHitKind
Cell // hit on a cell inside a table shape (outside of the cells text area)
};
-enum SdrViewEditMode {SDREDITMODE_EDIT, // Also known as arrow or pointer mode
- SDREDITMODE_CREATE, // Tool for object creation
- SDREDITMODE_GLUEPOINTEDIT}; // Glue point editing mode
+enum class SdrViewEditMode {
+ Edit, // Also known as arrow or pointer mode
+ Create, // Tool for object creation
+ GluePointEdit // Glue point editing mode
+};
/** options for ImpTakeDescriptionStr() */
enum class ImpTakeDescriptionOptions
@@ -204,12 +206,12 @@ public:
void SetEditMode(SdrViewEditMode eMode);
SdrViewEditMode GetEditMode() const { return meEditMode; }
- void SetEditMode(bool bOn=true) { SetEditMode(bOn?SDREDITMODE_EDIT:SDREDITMODE_CREATE); }
- bool IsEditMode() const { return meEditMode==SDREDITMODE_EDIT; }
- void SetCreateMode(bool bOn=true) { SetEditMode(bOn?SDREDITMODE_CREATE:SDREDITMODE_EDIT); }
- bool IsCreateMode() const { return meEditMode==SDREDITMODE_CREATE; }
- void SetGluePointEditMode(bool bOn=true) { SetEditMode(bOn?SDREDITMODE_GLUEPOINTEDIT:meEditMode0); }
- bool IsGluePointEditMode() const { return meEditMode==SDREDITMODE_GLUEPOINTEDIT; }
+ void SetEditMode(bool bOn=true) { SetEditMode(bOn?SdrViewEditMode::Edit:SdrViewEditMode::Create); }
+ bool IsEditMode() const { return meEditMode==SdrViewEditMode::Edit; }
+ void SetCreateMode(bool bOn=true) { SetEditMode(bOn?SdrViewEditMode::Create:SdrViewEditMode::Edit); }
+ bool IsCreateMode() const { return meEditMode==SdrViewEditMode::Create; }
+ void SetGluePointEditMode(bool bOn=true) { SetEditMode(bOn?SdrViewEditMode::GluePointEdit:meEditMode0); }
+ bool IsGluePointEditMode() const { return meEditMode==SdrViewEditMode::GluePointEdit; }
void SetDesignMode(bool bOn = true);
bool IsDesignMode() const { return mbDesignMode; }
diff --git a/sc/source/ui/drawfunc/fuconpol.cxx b/sc/source/ui/drawfunc/fuconpol.cxx
index 06f16eb..5bf7345 100644
--- a/sc/source/ui/drawfunc/fuconpol.cxx
+++ b/sc/source/ui/drawfunc/fuconpol.cxx
@@ -188,7 +188,7 @@ void FuConstPolygon::Activate()
pView->SetCurrentObj(sal::static_int_cast<sal_uInt16>(eKind));
- pView->SetEditMode(SDREDITMODE_CREATE);
+ pView->SetEditMode(SdrViewEditMode::Create);
FuConstruct::Activate();
@@ -205,7 +205,7 @@ void FuConstPolygon::Activate()
void FuConstPolygon::Deactivate()
{
- pView->SetEditMode(SDREDITMODE_EDIT);
+ pView->SetEditMode(SdrViewEditMode::Edit);
pView->EnableExtendedMouseEventDispatcher(false);
diff --git a/sc/source/ui/drawfunc/graphsh.cxx b/sc/source/ui/drawfunc/graphsh.cxx
index b5f2cc6..254cb06 100644
--- a/sc/source/ui/drawfunc/graphsh.cxx
+++ b/sc/source/ui/drawfunc/graphsh.cxx
@@ -247,7 +247,7 @@ void ScGraphicShell::ExecuteCropGraphic( SfxRequest& )
if( pObj && dynamic_cast<const SdrGrafObj*>( pObj) != nullptr && static_cast<SdrGrafObj*>(pObj)->GetGraphicType() == GraphicType::Bitmap )
{
- pView->SetEditMode(SDREDITMODE_EDIT);
+ pView->SetEditMode(SdrViewEditMode::Edit);
pView->SetDragMode(SdrDragMode::Crop);
}
}
diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx
index 58432e8..a3e09bd 100644
--- a/sd/source/ui/func/fuconbez.cxx
+++ b/sd/source/ui/func/fuconbez.cxx
@@ -79,11 +79,11 @@ bool FuConstructBezierPolygon::MouseButtonDown(const MouseEvent& rMEvt)
if (eHit == SdrHitKind::Handle || rMEvt.IsMod1())
{
- mpView->SetEditMode(SDREDITMODE_EDIT);
+ mpView->SetEditMode(SdrViewEditMode::Edit);
}
else
{
- mpView->SetEditMode(SDREDITMODE_CREATE);
+ mpView->SetEditMode(SdrViewEditMode::Create);
}
if (aVEvt.eEvent == SdrEventKind::BeginTextEdit)
diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx
index de0972e..7b48cef 100644
--- a/sd/source/ui/func/fuconstr.cxx
+++ b/sd/source/ui/func/fuconstr.cxx
@@ -228,14 +228,14 @@ bool FuConstruct::KeyInput(const KeyEvent& rKEvt)
void FuConstruct::Activate()
{
- mpView->SetEditMode(SDREDITMODE_CREATE);
+ mpView->SetEditMode(SdrViewEditMode::Create);
FuDraw::Activate();
}
void FuConstruct::Deactivate()
{
FuDraw::Deactivate();
- mpView->SetEditMode(SDREDITMODE_EDIT);
+ mpView->SetEditMode(SdrViewEditMode::Edit);
}
/**
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index d5f309d..f161acc 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -205,7 +205,7 @@ bool FuDraw::MouseButtonDown(const MouseEvent& rMEvt)
if ( bHelpLine
&& !mpView->IsCreateObj()
- && ((mpView->GetEditMode() == SDREDITMODE_EDIT && !bHitHdl) || (rMEvt.IsShift() && bSnapModPressed)) )
+ && ((mpView->GetEditMode() == SdrViewEditMode::Edit && !bHitHdl) || (rMEvt.IsShift() && bSnapModPressed)) )
{
mpWindow->CaptureMouse();
mpView->BegDragHelpLine(nHelpLine, pPV);
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index 9e62290..d5d61ee 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -1013,7 +1013,7 @@ void FuSelection::Activate()
{
SdrDragMode eMode;
mpView->ResetCreationActive();
- mpView->SetEditMode(SDREDITMODE_EDIT);
+ mpView->SetEditMode(SdrViewEditMode::Edit);
switch( nSlotId )
{
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index 0bd8273..e86d391 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -187,7 +187,7 @@ void FuText::DoExecute( SfxRequest& )
RID_DRAW_TEXT_TOOLBOX);
mpView->SetCurrentObj(OBJ_TEXT);
- mpView->SetEditMode(SDREDITMODE_EDIT);
+ mpView->SetEditMode(SdrViewEditMode::Edit);
MouseEvent aMEvt(mpWindow->GetPointerPosPixel());
@@ -284,7 +284,7 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt)
}
mpView->SetCurrentObj(OBJ_TEXT);
- mpView->SetEditMode(SDREDITMODE_EDIT);
+ mpView->SetEditMode(SdrViewEditMode::Edit);
}
if (rMEvt.IsLeft() || rMEvt.IsRight())
@@ -416,7 +416,7 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt)
{
// create object
mpView->SetCurrentObj(OBJ_TEXT);
- mpView->SetEditMode(SDREDITMODE_CREATE);
+ mpView->SetEditMode(SdrViewEditMode::Create);
sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() );
mpView->BegCreateObj(aMDPos, nullptr, nDrgLog);
}
@@ -761,7 +761,7 @@ bool FuText::MouseButtonUp(const MouseEvent& rMEvt)
{
// text body (left-justified AutoGrow)
mpView->SetCurrentObj(OBJ_TEXT);
- mpView->SetEditMode(SDREDITMODE_CREATE);
+ mpView->SetEditMode(SdrViewEditMode::Create);
sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() );
mpView->BegCreateObj(aMDPos, nullptr, nDrgLog);
@@ -957,7 +957,7 @@ bool FuText::KeyInput(const KeyEvent& rKEvt)
if( bPermanent )
{
mpView->SetCurrentObj(OBJ_TEXT);
- mpView->SetEditMode(SDREDITMODE_CREATE);
+ mpView->SetEditMode(SdrViewEditMode::Create);
}
if (!bReturn)
@@ -984,7 +984,7 @@ void FuText::Activate()
FuConstruct::Activate();
if( pOLV )
- mpView->SetEditMode(SDREDITMODE_EDIT);
+ mpView->SetEditMode(SdrViewEditMode::Edit);
}
void FuText::Deactivate()
@@ -1010,9 +1010,9 @@ void FuText::SetInEditMode(const MouseEvent& rMEvt, bool bQuickDrag)
mpView->SetCurrentObj(OBJ_TEXT);
if( bPermanent )
- mpView->SetEditMode(SDREDITMODE_CREATE);
+ mpView->SetEditMode(SdrViewEditMode::Create);
else
- mpView->SetEditMode(SDREDITMODE_EDIT);
+ mpView->SetEditMode(SdrViewEditMode::Edit);
bool bEmptyOutliner = false;
@@ -1334,7 +1334,7 @@ bool FuText::cancel()
mxTextObj.reset(nullptr);
mpView->SetCurrentObj(OBJ_TEXT);
- mpView->SetEditMode(SDREDITMODE_EDIT);
+ mpView->SetEditMode(SdrViewEditMode::Edit);
return true;
}
else
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index bd68921..b5098b7 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -333,17 +333,17 @@ bool SdrCreateView::MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin)
bool SdrCreateView::IsTextTool() const
{
- return meEditMode==SDREDITMODE_CREATE && nAktInvent==SdrInventor && (nAktIdent==OBJ_TEXT || nAktIdent==OBJ_TEXTEXT || nAktIdent==OBJ_TITLETEXT || nAktIdent==OBJ_OUTLINETEXT);
+ return meEditMode==SdrViewEditMode::Create && nAktInvent==SdrInventor && (nAktIdent==OBJ_TEXT || nAktIdent==OBJ_TEXTEXT || nAktIdent==OBJ_TITLETEXT || nAktIdent==OBJ_OUTLINETEXT);
}
bool SdrCreateView::IsEdgeTool() const
{
- return meEditMode==SDREDITMODE_CREATE && nAktInvent==SdrInventor && (nAktIdent==OBJ_EDGE);
+ return meEditMode==SdrViewEditMode::Create && nAktInvent==SdrInventor && (nAktIdent==OBJ_EDGE);
}
bool SdrCreateView::IsMeasureTool() const
{
- return meEditMode==SDREDITMODE_CREATE && nAktInvent==SdrInventor && (nAktIdent==OBJ_MEASURE);
+ return meEditMode==SdrViewEditMode::Create && nAktInvent==SdrInventor && (nAktIdent==OBJ_MEASURE);
}
void SdrCreateView::SetCurrentObj(sal_uInt16 nIdent, sal_uInt32 nInvent)
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 7f19a67..4cceb51 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -129,8 +129,8 @@ void ImplMarkingOverlay::SetSecondPosition(const basegfx::B2DPoint& rNewPosition
void SdrMarkView::ImpClearVars()
{
meDragMode=SdrDragMode::Move;
- meEditMode=SDREDITMODE_EDIT;
- meEditMode0=SDREDITMODE_EDIT;
+ meEditMode=SdrViewEditMode::Edit;
+ meEditMode0=SdrViewEditMode::Edit;
mbDesignMode=false;
mpMarkedObj=nullptr;
mpMarkedPV=nullptr;
@@ -1336,11 +1336,11 @@ void SdrMarkView::SetFrameHandles(bool bOn)
void SdrMarkView::SetEditMode(SdrViewEditMode eMode)
{
if (eMode!=meEditMode) {
- bool bGlue0=meEditMode==SDREDITMODE_GLUEPOINTEDIT;
+ bool bGlue0=meEditMode==SdrViewEditMode::GluePointEdit;
bool bEdge0=static_cast<SdrCreateView*>(this)->IsEdgeTool();
meEditMode0=meEditMode;
meEditMode=eMode;
- bool bGlue1=meEditMode==SDREDITMODE_GLUEPOINTEDIT;
+ bool bGlue1=meEditMode==SdrViewEditMode::GluePointEdit;
bool bEdge1=static_cast<SdrCreateView*>(this)->IsEdgeTool();
// avoid flickering when switching between GlueEdit and EdgeTool
if (bGlue1 && !bGlue0) ImpSetGlueVisible2(bGlue1);
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index c935fb6..ab936db 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -1150,7 +1150,7 @@ Pointer SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDevice*
return Pointer(PointerStyle::Move);
}
}
- if (meEditMode==SDREDITMODE_CREATE) return aAktCreatePointer;
+ if (meEditMode==SdrViewEditMode::Create) return aAktCreatePointer;
return Pointer(PointerStyle::Arrow);
}
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index 9dd9050..ae8b848 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -1954,7 +1954,7 @@ void SvxTableController::StopTextEdit()
{
mpView->SdrEndTextEdit();
mpView->SetCurrentObj(OBJ_TABLE);
- mpView->SetEditMode(SDREDITMODE_EDIT);
+ mpView->SetEditMode(SdrViewEditMode::Edit);
}
}
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index ac26e80..50369c9 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -656,7 +656,7 @@ void SwFEShell::StartCropImage()
}
// Activate CROP mode
- pView->SetEditMode( SDREDITMODE_EDIT );
+ pView->SetEditMode( SdrViewEditMode::Edit );
SetDragMode( SdrDragMode::Crop );
}
commit e382aa144561dab9295b17c4d5b29d4bd33ad687
Author: Noel Grandin <noel at peralex.com>
Date: Fri Aug 19 14:11:18 2016 +0200
convert SdrHitKind to scoped enum
Change-Id: Ia7a18814fed7787e47ac2d3c02654a3648c5491e
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index 12b8341..d28252d 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -581,7 +581,7 @@ void ChartController::execute_MouseButtonDown( const MouseEvent& rMEvt )
SdrViewEvent aVEvt;
if ( pDrawViewWrapper->IsTextEditHit( aMPos ) ||
// #i12587# support for shapes in chart
- ( rMEvt.IsRight() && pDrawViewWrapper->PickAnything( rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt ) == SDRHIT_MARKEDOBJECT ) )
+ ( rMEvt.IsRight() && pDrawViewWrapper->PickAnything( rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt ) == SdrHitKind::MarkedObject ) )
{
pDrawViewWrapper->MouseButtonDown(rMEvt,m_pChartWindow);
return;
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx
index 3bfc6eb..db67b26a 100644
--- a/include/svx/svdmrkv.hxx
+++ b/include/svx/svdmrkv.hxx
@@ -56,19 +56,21 @@ namespace o3tl
template<> struct typed_flags<SdrSearchOptions> : is_typed_flags<SdrSearchOptions, 0xbfff> {};
}
-enum SdrHitKind {SDRHIT_NONE, // No hit
- SDRHIT_OBJECT, // Hit
- /*SDRHIT_REFPOINT*/ // Reference point (Rotation axis, axis of reflextion) hit
- SDRHIT_HANDLE, // Marking handle
- SDRHIT_HELPLINE, // Reference line
- SDRHIT_GLUEPOINT, // Glue point
- SDRHIT_TEXTEDIT, // Open OutlinerView was hit
- SDRHIT_TEXTEDITOBJ, // Object for SdrBeginTextEdit (Textbereich)
- SDRHIT_URLFIELD, // Field in TextObj was hit (while it is currently not edited)
- SDRHIT_MACRO, // Object for BegMacroObj
- SDRHIT_MARKEDOBJECT, // Marked object (e.g. for dragging)
- SDRHIT_UNMARKEDOBJECT, // non-marked Object (e.g. for marking)
- SDRHIT_CELL}; // hit on a cell inside a table shape (outside of the cells text area)
+enum class SdrHitKind
+{
+ NONE, // No hit
+ Object, // Hit
+ Handle, // Marking handle
+ HelpLine, // Reference line
+ Gluepoint, // Glue point
+ TextEdit, // Open OutlinerView was hit
+ TextEditObj, // Object for SdrBeginTextEdit (Textbereich)
+ UrlField, // Field in TextObj was hit (while it is currently not edited)
+ Macro, // Object for BegMacroObj
+ MarkedObject, // Marked object (e.g. for dragging)
+ UnmarkedObject, // non-marked Object (e.g. for marking)
+ Cell // hit on a cell inside a table shape (outside of the cells text area)
+};
enum SdrViewEditMode {SDREDITMODE_EDIT, // Also known as arrow or pointer mode
SDREDITMODE_CREATE, // Tool for object creation
diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx
index b8bf38e..cf583d7 100644
--- a/reportdesign/source/ui/report/dlgedfunc.cxx
+++ b/reportdesign/source/ui/report/dlgedfunc.cxx
@@ -202,7 +202,7 @@ bool DlgEdFunc::MouseButtonDown( const MouseEvent& rMEvt )
{
SdrPageView* pPV = m_rView.GetSdrPageView();
SdrViewEvent aVEvt;
- if ( m_rView.PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt) != SDRHIT_MARKEDOBJECT && !rMEvt.IsShift() )
+ if ( m_rView.PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt) != SdrHitKind::MarkedObject && !rMEvt.IsShift() )
m_pParent->getSectionWindow()->getViewsWindow()->unmarkAllObjects(nullptr);
if ( aVEvt.pRootObj )
m_rView.MarkObj(aVEvt.pRootObj, pPV);
@@ -490,7 +490,7 @@ void DlgEdFunc::unColorizeOverlappedObj()
bool DlgEdFunc::isOverlapping(const MouseEvent& rMEvt)
{
SdrViewEvent aVEvt;
- bool bOverlapping = m_rView.PickAnything(rMEvt, SdrMouseEventKind::BUTTONUP, aVEvt) != SDRHIT_NONE;
+ bool bOverlapping = m_rView.PickAnything(rMEvt, SdrMouseEventKind::BUTTONUP, aVEvt) != SdrHitKind::NONE;
if (bOverlapping && aVEvt.pObj)
{
colorizeOverlappedObject(aVEvt.pObj);
@@ -570,7 +570,7 @@ bool DlgEdFunc::isRectangleHit(const MouseEvent& rMEvt)
SdrViewEvent aVEvt;
const SdrHitKind eHit = m_rView.PickAnything(rMEvt, SdrMouseEventKind::MOVE, aVEvt);
- bool bIsSetPoint = (eHit == SDRHIT_UNMARKEDOBJECT);
+ bool bIsSetPoint = (eHit == SdrHitKind::UnmarkedObject);
if ( !bIsSetPoint )
{
// no drag rect, we have to check every single select rect
@@ -660,7 +660,7 @@ bool DlgEdFuncInsert::MouseButtonDown( const MouseEvent& rMEvt )
const SdrHitKind eHit = m_rView.PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt);
- if (eHit == SDRHIT_UNMARKEDOBJECT && nId != OBJ_CUSTOMSHAPE)
+ if (eHit == SdrHitKind::UnmarkedObject && nId != OBJ_CUSTOMSHAPE)
{
// there is an object under the mouse cursor, but not a customshape
m_pParent->getSectionWindow()->getViewsWindow()->BrkAction();
@@ -797,7 +797,7 @@ bool DlgEdFuncSelect::MouseButtonDown( const MouseEvent& rMEvt )
SdrViewEvent aVEvt;
const SdrHitKind eHit = m_rView.PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt);
- if( eHit == SDRHIT_UNMARKEDOBJECT )
+ if( eHit == SdrHitKind::UnmarkedObject )
{
// if not multi selection, unmark all
if ( !rMEvt.IsShift() )
diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx
index 862f480..c09dc2b 100644
--- a/sc/source/ui/drawfunc/fudraw.cxx
+++ b/sc/source/ui/drawfunc/fudraw.cxx
@@ -676,7 +676,7 @@ static bool lcl_UrlHit( SdrView* pView, const Point& rPosPixel, vcl::Window* pWi
MouseEvent aMEvt( rPosPixel, 1, MouseEventModifiers::NONE, MOUSE_LEFT );
SdrHitKind eHit = pView->PickAnything( aMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt );
- if ( eHit != SDRHIT_NONE && aVEvt.pObj != nullptr )
+ if ( eHit != SdrHitKind::NONE && aVEvt.pObj != nullptr )
{
if ( ScDrawLayer::GetIMapInfo( aVEvt.pObj ) && ScDrawLayer::GetHitIMapObject(
aVEvt.pObj, pWindow->PixelToLogic(rPosPixel), *pWindow ) )
diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx
index 8141c0e..df0c18b 100644
--- a/sc/source/ui/drawfunc/fusel.cxx
+++ b/sc/source/ui/drawfunc/fusel.cxx
@@ -225,7 +225,7 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
SdrViewEvent aVEvt;
if ( !bAlt &&
- pView->PickAnything( rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt ) != SDRHIT_NONE &&
+ pView->PickAnything( rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt ) != SdrHitKind::NONE &&
aVEvt.pObj != nullptr )
{
if ( ScDrawLayer::GetIMapInfo( aVEvt.pObj ) ) // ImageMap
@@ -498,7 +498,7 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
SdrViewEvent aVEvt;
SdrHitKind eHit = pView->PickAnything( rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt );
- if (eHit != SDRHIT_NONE && aVEvt.pObj == pObj && pViewShell)
+ if (eHit != SdrHitKind::NONE && aVEvt.pObj == pObj && pViewShell)
{
sal_uInt16 nSdrObjKind = pObj->GetObjIdentifier();
diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxx
index 19ef338..2424bd7 100644
--- a/sc/source/ui/view/gridwin5.cxx
+++ b/sc/source/ui/view/gridwin5.cxx
@@ -302,7 +302,7 @@ void ScGridWindow::RequestHelp(const HelpEvent& rHEvt)
MouseEvent aMEvt( aPosPixel, 1, MouseEventModifiers::NONE, MOUSE_LEFT );
SdrHitKind eHit = pDrView->PickAnything( aMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt );
- if ( eHit != SDRHIT_NONE && aVEvt.pObj != nullptr )
+ if ( eHit != SdrHitKind::NONE && aVEvt.pObj != nullptr )
{
// URL for IMapObject below Pointer is help text
if ( ScDrawLayer::GetIMapInfo( aVEvt.pObj ) )
diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx
index 46de4c0..58432e8 100644
--- a/sd/source/ui/func/fuconbez.cxx
+++ b/sd/source/ui/func/fuconbez.cxx
@@ -77,7 +77,7 @@ bool FuConstructBezierPolygon::MouseButtonDown(const MouseEvent& rMEvt)
SdrViewEvent aVEvt;
SdrHitKind eHit = mpView->PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt);
- if (eHit == SDRHIT_HANDLE || rMEvt.IsMod1())
+ if (eHit == SdrHitKind::Handle || rMEvt.IsMod1())
{
mpView->SetEditMode(SDREDITMODE_EDIT);
}
@@ -97,7 +97,7 @@ bool FuConstructBezierPolygon::MouseButtonDown(const MouseEvent& rMEvt)
mpView->EnableExtendedMouseEventDispatcher(true);
}
- if (eHit == SDRHIT_MARKEDOBJECT && nEditMode == SID_BEZIER_INSERT)
+ if (eHit == SdrHitKind::MarkedObject && nEditMode == SID_BEZIER_INSERT)
{
// insert glue point
mpView->BegInsObjPoint(aMDPos, rMEvt.IsMod1());
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index d37203a..d5f309d 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -516,7 +516,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
SdrObject* pObj = nullptr;
SdrPageView* pPV = nullptr;
SdrViewEvent aVEvt;
- SdrHitKind eHit = SDRHIT_NONE;
+ SdrHitKind eHit = SdrHitKind::NONE;
SdrDragMode eDragMode = mpView->GetDragMode();
if (pMEvt)
@@ -524,7 +524,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
eHit = mpView->PickAnything(*pMEvt, SdrMouseEventKind::MOVE, aVEvt);
}
- if ((eDragMode == SdrDragMode::Rotate) && (eHit == SDRHIT_MARKEDOBJECT))
+ if ((eDragMode == SdrDragMode::Rotate) && (eHit == SdrHitKind::MarkedObject))
{
// The goal of this request is show always the rotation-arrow for 3D-objects at rotation-modus
// Independent of the settings at Extras->Optionen->Grafik "Objekte immer verschieben"
@@ -539,16 +539,16 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
}
}
- if (eHit == SDRHIT_NONE)
+ if (eHit == SdrHitKind::NONE)
{
// found nothing -> look after at the masterpage
mpView->PickObj(aPnt, mpView->getHitTolLog(), pObj, pPV, SdrSearchOptions::ALSOONMASTER);
}
- else if (eHit == SDRHIT_UNMARKEDOBJECT)
+ else if (eHit == SdrHitKind::UnmarkedObject)
{
pObj = aVEvt.pObj;
}
- else if (eHit == SDRHIT_TEXTEDITOBJ && dynamic_cast< const FuSelection *>( this ) != nullptr)
+ else if (eHit == SdrHitKind::TextEditObj && dynamic_cast< const FuSelection *>( this ) != nullptr)
{
sal_uInt16 nSdrObjKind = aVEvt.pObj->GetObjIdentifier();
@@ -747,7 +747,7 @@ bool FuDraw::RequestHelp(const HelpEvent& rHEvt)
SdrObject* pObj = aVEvt.pObj;
- if (eHit != SDRHIT_NONE && pObj != nullptr)
+ if (eHit != SdrHitKind::NONE && pObj != nullptr)
{
Point aPosPixel = rHEvt.GetMousePosPixel();
diff --git a/sd/source/ui/func/fuediglu.cxx b/sd/source/ui/func/fuediglu.cxx
index 24a85a7..472779d 100644
--- a/sd/source/ui/func/fuediglu.cxx
+++ b/sd/source/ui/func/fuediglu.cxx
@@ -100,7 +100,7 @@ bool FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt)
SdrViewEvent aVEvt;
SdrHitKind eHit = mpView->PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt);
- if (eHit == SDRHIT_HANDLE)
+ if (eHit == SdrHitKind::Handle)
{
// drag handle
SdrHdl* pHdl = aVEvt.pHdl;
@@ -117,12 +117,12 @@ bool FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt)
mpView->BegDragObj(aMDPos, nullptr, aVEvt.pHdl, nDrgLog);
}
}
- else if (eHit == SDRHIT_MARKEDOBJECT && mpView->IsInsGluePointMode())
+ else if (eHit == SdrHitKind::MarkedObject && mpView->IsInsGluePointMode())
{
// insert glue points
mpView->BegInsGluePoint(aMDPos);
}
- else if (eHit == SDRHIT_MARKEDOBJECT && rMEvt.IsMod1())
+ else if (eHit == SdrHitKind::MarkedObject && rMEvt.IsMod1())
{
// select glue points
if (!rMEvt.IsShift())
@@ -130,12 +130,12 @@ bool FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt)
mpView->BegMarkGluePoints(aMDPos);
}
- else if (eHit == SDRHIT_MARKEDOBJECT && !rMEvt.IsShift() && !rMEvt.IsMod2())
+ else if (eHit == SdrHitKind::MarkedObject && !rMEvt.IsShift() && !rMEvt.IsMod2())
{
// move object
mpView->BegDragObj(aMDPos, nullptr, nullptr, nDrgLog);
}
- else if (eHit == SDRHIT_GLUEPOINT)
+ else if (eHit == SdrHitKind::Gluepoint)
{
// select glue points
if (!rMEvt.IsShift())
@@ -152,7 +152,7 @@ bool FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt)
else
{
// select or drag object
- if (!rMEvt.IsShift() && !rMEvt.IsMod2() && eHit == SDRHIT_UNMARKEDOBJECT)
+ if (!rMEvt.IsShift() && !rMEvt.IsMod2() && eHit == SdrHitKind::UnmarkedObject)
{
mpView->UnmarkAllObj();
}
@@ -172,7 +172,7 @@ bool FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt)
}
if (bMarked &&
- (!rMEvt.IsShift() || eHit == SDRHIT_MARKEDOBJECT))
+ (!rMEvt.IsShift() || eHit == SdrHitKind::MarkedObject))
{
// move object
mpView->BegDragObj(aMDPos, nullptr, aVEvt.pHdl, nDrgLog);
@@ -241,7 +241,7 @@ bool FuEditGluePoints::MouseButtonUp(const MouseEvent& rMEvt)
SdrViewEvent aVEvt;
SdrHitKind eHit = mpView->PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt);
- if (eHit == SDRHIT_NONE)
+ if (eHit == SdrHitKind::NONE)
{
// click on position: deselect
mpView->UnmarkAllObj();
diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx b/sd/source/ui/func/fuformatpaintbrush.cxx
index c9e578d..dc70c36 100644
--- a/sd/source/ui/func/fuformatpaintbrush.cxx
+++ b/sd/source/ui/func/fuformatpaintbrush.cxx
@@ -97,7 +97,7 @@ bool FuFormatPaintBrush::MouseButtonDown(const MouseEvent& rMEvt)
SdrViewEvent aVEvt;
SdrHitKind eHit = mpView->PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt);
- if( (eHit == SDRHIT_TEXTEDIT) || (eHit == SDRHIT_TEXTEDITOBJ && ( mpViewShell->GetFrameView()->IsQuickEdit() || dynamic_cast< sdr::table::SdrTableObj* >( aVEvt.pObj ) != nullptr ) ))
+ if( (eHit == SdrHitKind::TextEdit) || (eHit == SdrHitKind::TextEditObj && ( mpViewShell->GetFrameView()->IsQuickEdit() || dynamic_cast< sdr::table::SdrTableObj* >( aVEvt.pObj ) != nullptr ) ))
{
SdrObject* pPickObj=nullptr;
SdrPageView* pPV=nullptr;
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index d0c2df7..9e62290 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -197,7 +197,7 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
SdrViewEvent aVEvt;
SdrHitKind eHit = mpView->PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt);
- if ( eHit == SDRHIT_TEXTEDITOBJ && ( mpViewShell->GetFrameView()->IsQuickEdit() || dynamic_cast< sdr::table::SdrTableObj* >( aVEvt.pObj ) != nullptr ) )
+ if ( eHit == SdrHitKind::TextEditObj && ( mpViewShell->GetFrameView()->IsQuickEdit() || dynamic_cast< sdr::table::SdrTableObj* >( aVEvt.pObj ) != nullptr ) )
{
bTextEdit = true;
}
@@ -438,7 +438,7 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
SdrViewEvent aVEvt;
SdrHitKind eHit = mpView->PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt);
- if (eHit == SDRHIT_HANDLE && aVEvt.pHdl->GetKind() == HDL_BWGT)
+ if (eHit == SdrHitKind::Handle && aVEvt.pHdl->GetKind() == HDL_BWGT)
{
/******************************************************************
* Drag Handle
@@ -446,14 +446,14 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
if ( ! rMEvt.IsRight())
mpView->BegDragObj(aMDPos, nullptr, aVEvt.pHdl, nDrgLog);
}
- else if (eHit == SDRHIT_MARKEDOBJECT && nEditMode == SID_BEZIER_INSERT)
+ else if (eHit == SdrHitKind::MarkedObject && nEditMode == SID_BEZIER_INSERT)
{
/******************************************************************
* Insert glue point
******************************************************************/
mpView->BegInsObjPoint(aMDPos, rMEvt.IsMod1());
}
- else if (eHit == SDRHIT_MARKEDOBJECT && rMEvt.IsMod1())
+ else if (eHit == SdrHitKind::MarkedObject && rMEvt.IsMod1())
{
/******************************************************************
* Select glue point
@@ -464,7 +464,7 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
if ( ! rMEvt.IsRight())
mpView->BegMarkPoints(aMDPos);
}
- else if (eHit == SDRHIT_MARKEDOBJECT && !rMEvt.IsShift() && !rMEvt.IsMod2())
+ else if (eHit == SdrHitKind::MarkedObject && !rMEvt.IsShift() && !rMEvt.IsMod2())
{
/******************************************************************
* Move object
@@ -472,7 +472,7 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
if ( ! rMEvt.IsRight())
mpView->BegDragObj(aMDPos, nullptr, nullptr, nDrgLog);
}
- else if (eHit == SDRHIT_HANDLE)
+ else if (eHit == SdrHitKind::Handle)
{
/******************************************************************
* Select glue point
@@ -520,7 +520,7 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
/******************************************************************
* Select or drag object
******************************************************************/
- if (!rMEvt.IsShift() && !rMEvt.IsMod2() && eHit == SDRHIT_UNMARKEDOBJECT)
+ if (!rMEvt.IsShift() && !rMEvt.IsMod2() && eHit == SdrHitKind::UnmarkedObject)
{
mpView->UnmarkAllObj();
}
@@ -540,7 +540,7 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
}
if (bMarked &&
- (!rMEvt.IsShift() || eHit == SDRHIT_MARKEDOBJECT))
+ (!rMEvt.IsShift() || eHit == SdrHitKind::MarkedObject))
{
// Move object
if ( ! rMEvt.IsRight())
@@ -876,7 +876,7 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
SdrViewEvent aVEvt;
SdrHitKind eHit = mpView->PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt);
- if (eHit == SDRHIT_NONE)
+ if (eHit == SdrHitKind::NONE)
{
// Click on the same place - unselect
mpView->UnmarkAllObj();
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index 775f954..0bd8273 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -257,7 +257,7 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt)
SdrViewEvent aVEvt;
SdrHitKind eHit = mpView->PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt);
- if (eHit == SDRHIT_TEXTEDIT)
+ if (eHit == SdrHitKind::TextEdit)
{
// hit text -> SdrView handles event
if (mpView->MouseButtonDown(rMEvt, mpWindow))
@@ -266,19 +266,19 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt)
if (rMEvt.GetClicks() == 1)
{
- if (mpView->IsTextEdit() && eHit != SDRHIT_MARKEDOBJECT && eHit != SDRHIT_HANDLE)
+ if (mpView->IsTextEdit() && eHit != SdrHitKind::MarkedObject && eHit != SdrHitKind::Handle)
{
// finish text input
if(mpView->SdrEndTextEdit() == SDRENDTEXTEDIT_DELETED)
{
/* Bugfix from MBA: during a double click onto the unused? area
in text mode, we get with the second click eHit =
- SDRHIT_TEXTEDITOBJ since it goes to the TextObject which was
+ SdrHitKind::TextEditObj since it goes to the TextObject which was
created with the first click. But this is removed by
SdrEndTextEdit since it is empty. But it is still in the mark
list. The call MarkObj further below accesses then the dead
object. As a simple fix, we determine eHit after
- SdrEndTextEdit again, this returns then SDRHIT_NONE. */
+ SdrEndTextEdit again, this returns then SdrHitKind::NONE. */
mxTextObj.reset( nullptr );
eHit = mpView->PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt);
}
@@ -292,16 +292,16 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt)
mpWindow->CaptureMouse();
SdrPageView* pPV = mpView->GetSdrPageView();
- if (eHit == SDRHIT_TEXTEDIT)
+ if (eHit == SdrHitKind::TextEdit)
{
SetInEditMode(rMEvt, false);
}
else
{
- if (eHit != SDRHIT_HANDLE)
+ if (eHit != SdrHitKind::Handle)
{
// deselect selection
- if (!rMEvt.IsShift() && eHit == SDRHIT_TEXTEDITOBJ)
+ if (!rMEvt.IsShift() && eHit == SdrHitKind::TextEditObj)
{
mpView->UnmarkAll();
mpView->SetDragMode(SdrDragMode::Move);
@@ -309,14 +309,14 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt)
}
if ( aVEvt.eEvent == SdrEventKind::ExecuteUrl ||
- eHit == SDRHIT_HANDLE ||
- eHit == SDRHIT_MARKEDOBJECT ||
- eHit == SDRHIT_TEXTEDITOBJ ||
- ( eHit == SDRHIT_UNMARKEDOBJECT && bFirstObjCreated &&
+ eHit == SdrHitKind::Handle ||
+ eHit == SdrHitKind::MarkedObject ||
+ eHit == SdrHitKind::TextEditObj ||
+ ( eHit == SdrHitKind::UnmarkedObject && bFirstObjCreated &&
!bPermanent ) )
{
// Handle, hit marked or umarked object
- if (eHit == SDRHIT_TEXTEDITOBJ)
+ if (eHit == SdrHitKind::TextEditObj)
{
/* hit text of unmarked object:
select object and set to EditMode */
@@ -385,7 +385,7 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt)
if (!aVEvt.pHdl)
{
- if( eHit == SDRHIT_UNMARKEDOBJECT )
+ if( eHit == SdrHitKind::UnmarkedObject )
{
if ( !rMEvt.IsShift() )
mpView->UnmarkAll();
@@ -402,7 +402,7 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt)
{
// we need to pick again since SdrEndTextEdit can rebuild the handles list
eHit = mpView->PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt);
- if( (eHit == SDRHIT_HANDLE) || (eHit == SDRHIT_MARKEDOBJECT) )
+ if( (eHit == SdrHitKind::Handle) || (eHit == SdrHitKind::MarkedObject) )
{
sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() );
mpView->BegDragObj(aMDPos, nullptr, aVEvt.pHdl, nDrgLog);
@@ -1074,7 +1074,7 @@ void FuText::SetInEditMode(const MouseEvent& rMEvt, bool bQuickDrag)
SdrViewEvent aVEvt;
SdrHitKind eHit = mpView->PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt);
- if (eHit == SDRHIT_TEXTEDIT)
+ if (eHit == SdrHitKind::TextEdit)
{
// hit text
if (nSdrObjKind == OBJ_TEXT ||
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx
index 135fcf8..4426af0 100644
--- a/svx/source/dialog/graphctl.cxx
+++ b/svx/source/dialog/graphctl.cxx
@@ -622,7 +622,7 @@ void GraphCtrl::MouseButtonDown( const MouseEvent& rMEvt )
SdrViewEvent aVEvt;
SdrHitKind eHit = pView->PickAnything( rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt );
- if ( nPolyEdit == SID_BEZIER_INSERT && eHit == SDRHIT_MARKEDOBJECT )
+ if ( nPolyEdit == SID_BEZIER_INSERT && eHit == SdrHitKind::MarkedObject )
pView->BegInsObjPoint( aLogPt, rMEvt.IsMod1());
else
pView->MouseButtonDown( rMEvt, this );
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index dd67e6e..16a8c76 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -3915,7 +3915,7 @@ void FmXFormShell::handleMouseButtonDown( const SdrViewEvent& _rViewEvent )
// catch simple double clicks
if ( ( _rViewEvent.nMouseClicks == 2 ) && ( _rViewEvent.nMouseCode == MOUSE_LEFT ) )
{
- if ( _rViewEvent.eHit == SDRHIT_MARKEDOBJECT )
+ if ( _rViewEvent.eHit == SdrHitKind::MarkedObject )
{
if ( onlyControlsAreMarked() )
ShowSelectionProperties( true );
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index f5b39d9..c935fb6 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -58,7 +58,7 @@ SdrViewEvent::SdrViewEvent()
pRootObj(nullptr),
pPV(nullptr),
pURLField(nullptr),
- eHit(SDRHIT_NONE),
+ eHit(SdrHitKind::NONE),
eEvent(SdrEventKind::NONE),
eEndCreateCmd(SdrCreateCmd::NextPoint),
nMouseClicks(0),
@@ -329,7 +329,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
bool bShift=(rVEvt.nMouseCode & KEY_SHIFT) !=0;
bool bCtrl=(rVEvt.nMouseCode & KEY_MOD1) !=0;
bool bAlt=(rVEvt.nMouseCode & KEY_MOD2) !=0;
- SdrHitKind eHit=SDRHIT_NONE;
+ SdrHitKind eHit=SdrHitKind::NONE;
SdrHdl* pHdl=pOut!=nullptr && !bTextEditSel ? PickHandle(aLocalLogicPosition) : nullptr;
SdrPageView* pPV=nullptr;
SdrObject* pObj=nullptr;
@@ -339,24 +339,24 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
sal_uInt16 nGlueId=0;
if (bTextEditHit || bTextEditSel)
{
- eHit=SDRHIT_TEXTEDIT;
+ eHit=SdrHitKind::TextEdit;
bTextEditHit=true;
}
else if (pHdl!=nullptr)
{
- eHit=SDRHIT_HANDLE; // handle is hit: highest priority
+ eHit=SdrHitKind::Handle; // handle is hit: highest priority
}
else if (bEditMode && IsHlplVisible() && IsHlplFront() && pOut!=nullptr && PickHelpLine(aLocalLogicPosition,mnHitTolLog,*pOut,nHlplIdx,pPV))
{
- eHit=SDRHIT_HELPLINE; // help line in the foreground hit: can be moved now
+ eHit=SdrHitKind::HelpLine; // help line in the foreground hit: can be moved now
}
else if (bGluePointMode && PickGluePoint(aLocalLogicPosition,pObj,nGlueId,pPV))
{
- eHit=SDRHIT_GLUEPOINT; // deselected glue point hit
+ eHit=SdrHitKind::Gluepoint; // deselected glue point hit
}
else if (PickObj(aLocalLogicPosition,mnHitTolLog,pHitObj,pPV,SdrSearchOptions::DEEP|SdrSearchOptions::MARKED,&pObj,&bHitPassDirect))
{
- eHit=SDRHIT_MARKEDOBJECT;
+ eHit=SdrHitKind::MarkedObject;
sdr::table::SdrTableObj* pTableObj = dynamic_cast< sdr::table::SdrTableObj* >( pObj );
if( pTableObj )
{
@@ -364,10 +364,10 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
switch( pTableObj->CheckTableHit( aLocalLogicPosition, nX, nY ) )
{
case sdr::table::TableHitKind::Cell:
- eHit = SDRHIT_CELL;
+ eHit = SdrHitKind::Cell;
break;
case sdr::table::TableHitKind::CellTextArea:
- eHit = SDRHIT_TEXTEDITOBJ;
+ eHit = SdrHitKind::TextEditObj;
break;
default:
break;
@@ -377,7 +377,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
else if (PickObj(aLocalLogicPosition,mnHitTolLog,pHitObj,pPV,SdrSearchOptions::DEEP|SdrSearchOptions::ALSOONMASTER|SdrSearchOptions::WHOLEPAGE,&pObj,&bHitPassDirect))
{
// MasterPages and WholePage for Macro and URL
- eHit=SDRHIT_UNMARKEDOBJECT;
+ eHit=SdrHitKind::UnmarkedObject;
sdr::table::SdrTableObj* pTableObj = dynamic_cast< sdr::table::SdrTableObj* >( pObj );
if( pTableObj )
{
@@ -385,10 +385,10 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
switch( pTableObj->CheckTableHit( aLocalLogicPosition, nX, nY, mnHitTolLog ) )
{
case sdr::table::TableHitKind::Cell:
- eHit = SDRHIT_CELL;
+ eHit = SdrHitKind::Cell;
break;
case sdr::table::TableHitKind::CellTextArea:
- eHit = SDRHIT_TEXTEDITOBJ;
+ eHit = SdrHitKind::TextEditObj;
break;
default:
break;
@@ -397,9 +397,9 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
}
else if (bEditMode && IsHlplVisible() && !IsHlplFront() && pOut!=nullptr && PickHelpLine(aLocalLogicPosition,mnHitTolLog,*pOut,nHlplIdx,pPV))
{
- eHit=SDRHIT_HELPLINE; // help line in foreground hit: can be moved now
+ eHit=SdrHitKind::HelpLine; // help line in foreground hit: can be moved now
}
- if (eHit==SDRHIT_UNMARKEDOBJECT)
+ if (eHit==SdrHitKind::UnmarkedObject)
{
bool bRoot=pObj->HasMacro();
bool bDeep=pObj!=pHitObj && pHitObj->HasMacro();
@@ -439,12 +439,12 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
rVEvt.pRootObj=pObj;
if (!bRoot) pObj=pMidObj;
if (!bRoot && !bMid) pObj=pHitObj;
- eHit=SDRHIT_MACRO;
+ eHit=SdrHitKind::Macro;
}
}
}
// check for URL field
- if (eHit==SDRHIT_UNMARKEDOBJECT)
+ if (eHit==SdrHitKind::UnmarkedObject)
{
SdrTextObj* pTextObj=dynamic_cast<SdrTextObj*>( pHitObj );
if (pTextObj!=nullptr && pTextObj->HasText())
@@ -485,7 +485,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
const SvxFieldData* pFld=pItem->GetField();
const SvxURLField* pURL=dynamic_cast<const SvxURLField*>( pFld );
if (pURL!=nullptr) {
- eHit=SDRHIT_URLFIELD;
+ eHit=SdrHitKind::UrlField;
rVEvt.pURLField=pURL;
}
}
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list