[Libreoffice-commits] core.git: chart2/source include/svx sc/source sd/source svx/source sw/source

[Noel Grandin (via logerrit)]

 chart2/source/controller/accessibility/AccessibleChartShape.cxx |2 +-
 include/svx/AccessibleShapeTreeInfo.hxx |9 
+++--
 sc/source/ui/Accessibility/AccessibleDocument.cxx   |4 ++--
 sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx|2 +-
 sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx   |2 +-
 svx/source/accessibility/AccessibleControlShape.cxx |4 ++--
 svx/source/accessibility/AccessibleShapeTreeInfo.cxx|2 +-
 svx/source/accessibility/GraphCtlAccessibleContext.cxx  |2 +-
 sw/source/core/access/accmap.cxx|2 +-
 9 files changed, 13 insertions(+), 16 deletions(-)

New commits:
commit fc0002ccf295f8d41ae5d0fee3213af8a0996ebb
Author: Noel Grandin 
AuthorDate: Fri Jan 8 19:12:02 2021 +0200
Commit: Noel Grandin 
CommitDate: Sat Jan 9 07:36:14 2021 +0100

AccessibleShapeTreeInfo needs a vcl::Window

no point in passing an OutputDevice there

Change-Id: I6da9b29a0e6f57ad6a8ebcb6113987ee25419483
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108988
Tested-by: Noel Grandin 
Reviewed-by: Noel Grandin 

diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.cxx 
b/chart2/source/controller/accessibility/AccessibleChartShape.cxx
index d9c2f7071338..2d4fd3010e4b 100644
--- a/chart2/source/controller/accessibility/AccessibleChartShape.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartShape.cxx
@@ -51,7 +51,7 @@ AccessibleChartShape::AccessibleChartShape(
 
 m_aShapeTreeInfo.SetSdrView( rAccInfo.m_pSdrView );
 m_aShapeTreeInfo.SetController( nullptr );
-m_aShapeTreeInfo.SetDevice( VCLUnoHelper::GetWindow( rAccInfo.m_xWindow ) 
);
+m_aShapeTreeInfo.SetWindow( VCLUnoHelper::GetWindow( rAccInfo.m_xWindow ) 
);
 m_aShapeTreeInfo.SetViewForwarder( rAccInfo.m_pViewForwarder );
 
 ::accessibility::ShapeTypeHandler& rShapeHandler = 
::accessibility::ShapeTypeHandler::Instance();
diff --git a/include/svx/AccessibleShapeTreeInfo.hxx 
b/include/svx/AccessibleShapeTreeInfo.hxx
index 220bc2649a2e..f9da042b63d8 100644
--- a/include/svx/AccessibleShapeTreeInfo.hxx
+++ b/include/svx/AccessibleShapeTreeInfo.hxx
@@ -134,7 +134,7 @@ public:
 /** Set the window that is used to construct SvxTextEditSources which in
 turn is used to create accessible edit engines.
 */
-void SetDevice(OutputDevice* pWindow);
+void SetWindow(vcl::Window* pWindow);
 
 /** Return the current Window.
 @return
@@ -142,11 +142,8 @@ public:
 */
 vcl::Window* GetWindow() const
 {
-if (mpWindow && mpWindow->GetOutDevType() == OUTDEV_WINDOW)
-return static_cast(mpWindow.get());
-return nullptr;
+return mpWindow.get();
 }
-OutputDevice* GetDevice() const { return mpWindow;}
 
 /** The view forwarder allows the transformation between internal
 and pixel coordinates and can be asked for the visible area.
@@ -188,7 +185,7 @@ private:
 /** This window is necessary to construct an SvxTextEditSource which in
 turn is used to create an accessible edit engine.
 */
-VclPtr mpWindow;
+VclPtr mpWindow;
 
 /** The view forwarder allows the transformation between internal
 and pixel coordinates and can be asked for the visible area.
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx 
b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index b39230314e2e..f5193c6a80a2 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -331,7 +331,7 @@ ScChildrenShapes::ScChildrenShapes(ScAccessibleDocument* 
pAccessibleDocument, Sc
 maShapeTreeInfo.SetModelBroadcaster( new 
ScDrawModelBroadcaster(rViewData.GetDocument().GetDrawLayer()) );
 maShapeTreeInfo.SetSdrView(rViewData.GetScDrawView());
 maShapeTreeInfo.SetController(nullptr);
-maShapeTreeInfo.SetDevice(pViewShell->GetWindowByPos(meSplitPos));
+maShapeTreeInfo.SetWindow(pViewShell->GetWindowByPos(meSplitPos));
 maShapeTreeInfo.SetViewForwarder(mpAccessibleDocument);
 }
 }
@@ -364,7 +364,7 @@ void ScChildrenShapes::SetDrawBroadcaster()
 maShapeTreeInfo.SetModelBroadcaster( new 
ScDrawModelBroadcaster(rViewData.GetDocument().GetDrawLayer()) );
 maShapeTreeInfo.SetSdrView(rViewData.GetScDrawView());
 maShapeTreeInfo.SetController(nullptr);
-maShapeTreeInfo.SetDevice(mpViewShell->GetWindowByPos(meSplitPos));
+maShapeTreeInfo.SetWindow(mpViewShell->GetWindowByPos(meSplitPos));
 maShapeTreeInfo.SetViewForwarder(mpAccessibleDocument);
 }
 }
diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx 
b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
index 8778e65c7aee..0c974bd5a1c4 100644
--- 

[Libreoffice-commits] core.git: chart2/source include/svx sc/source sd/source svx/source sw/source

[Caolán McNamara (via logerrit)]

 chart2/source/controller/sidebar/ChartAxisPanel.cxx |2 -
 chart2/source/controller/sidebar/ChartElementsPanel.cxx |2 -
 chart2/source/controller/sidebar/ChartElementsPanel.hxx |1 
 chart2/source/controller/sidebar/ChartErrorBarPanel.cxx |2 -
 chart2/source/controller/sidebar/ChartSeriesPanel.cxx   |2 -
 chart2/source/controller/sidebar/ChartTypePanel.cxx |2 -
 chart2/source/controller/sidebar/ChartTypePanel.hxx |1 
 include/svx/sidebar/PanelLayout.hxx |5 +--
 sc/source/ui/formdlg/dwfunctr.cxx   |2 -
 sc/source/ui/navipi/navipi.cxx  |2 -
 sc/source/ui/sidebar/AlignmentPropertyPanel.cxx |2 -
 sc/source/ui/sidebar/AlignmentPropertyPanel.hxx |1 
 sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx|2 -
 sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx  |2 -
 sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx  |3 --
 sd/source/ui/animations/CustomAnimationPane.cxx |2 -
 sd/source/ui/animations/SlideTransitionPane.cxx |2 -
 sd/source/ui/dlg/navigatr.cxx   |2 -
 sd/source/ui/sidebar/LayoutMenu.cxx |2 -
 sd/source/ui/sidebar/MasterPagesSelector.cxx|2 -
 sd/source/ui/sidebar/SlideBackground.cxx|2 -
 sd/source/ui/table/TableDesignPane.hxx  |2 -
 svx/source/gallery2/GalleryControl.cxx  |2 -
 svx/source/sidebar/EmptyPanel.cxx   |2 -
 svx/source/sidebar/PanelLayout.cxx  |   22 
 svx/source/sidebar/area/AreaPropertyPanelBase.cxx   |2 -
 svx/source/sidebar/glow/GlowPropertyPanel.cxx   |2 -
 svx/source/sidebar/graphic/GraphicPropertyPanel.cxx |2 -
 svx/source/sidebar/line/LinePropertyPanel.hxx   |2 -
 svx/source/sidebar/line/LinePropertyPanelBase.cxx   |2 -
 svx/source/sidebar/lists/ListsPropertyPanel.cxx |2 -
 svx/source/sidebar/media/MediaPlaybackPanel.cxx |2 -
 svx/source/sidebar/paragraph/ParaPropertyPanel.cxx  |2 -
 svx/source/sidebar/paragraph/ParaPropertyPanel.hxx  |1 
 svx/source/sidebar/possize/PosSizePropertyPanel.cxx |3 +-
 svx/source/sidebar/possize/PosSizePropertyPanel.hxx |1 
 svx/source/sidebar/shadow/ShadowPropertyPanel.cxx   |2 -
 svx/source/sidebar/shapes/DefaultShapesPanel.cxx|2 -
 svx/source/sidebar/styles/StylesPropertyPanel.cxx   |2 -
 svx/source/sidebar/text/TextPropertyPanel.cxx   |2 -
 sw/source/uibase/misc/redlndlg.cxx  |2 -
 sw/source/uibase/sidebar/PageFooterPanel.cxx|2 -
 sw/source/uibase/sidebar/PageFormatPanel.cxx|2 -
 sw/source/uibase/sidebar/PageHeaderPanel.cxx|2 -
 sw/source/uibase/sidebar/PageStylesPanel.cxx|2 -
 sw/source/uibase/sidebar/StylePresetsPanel.cxx  |2 -
 sw/source/uibase/sidebar/TableEditPanel.cxx |3 --
 sw/source/uibase/sidebar/ThemePanel.cxx |2 -
 sw/source/uibase/sidebar/WrapPropertyPanel.cxx  |2 -
 sw/source/uibase/uiview/view2.cxx   |1 
 sw/source/uibase/utlui/navipi.cxx   |2 -
 51 files changed, 58 insertions(+), 64 deletions(-)

New commits:
commit 5838b62e7ba2312f41a4c8a43d53036476bfce1d
Author: Caolán McNamara 
AuthorDate: Fri Apr 24 13:41:51 2020 +0100
Commit: Caolán McNamara 
CommitDate: Fri Apr 24 20:22:58 2020 +0200

final ctor arg of PanelLayout ctor is always true now

Change-Id: I40cb888c13cb49aa0e20b5be5ceb1c15cf7a346c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92858
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.cxx 
b/chart2/source/controller/sidebar/ChartAxisPanel.cxx
index a4621378cedf..593071ac1ab3 100644
--- a/chart2/source/controller/sidebar/ChartAxisPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartAxisPanel.cxx
@@ -205,7 +205,7 @@ ChartAxisPanel::ChartAxisPanel(
 vcl::Window* pParent,
 const css::uno::Reference& rxFrame,
 ChartController* pController)
-: PanelLayout(pParent, "ChartAxisPanel", 
"modules/schart/ui/sidebaraxis.ui", rxFrame, true)
+: PanelLayout(pParent, "ChartAxisPanel", 
"modules/schart/ui/sidebaraxis.ui", rxFrame)
 , mxCBShowLabel(m_xBuilder->weld_check_button("checkbutton_show_label"))
 , mxCBReverse(m_xBuilder->weld_check_button("checkbutton_reverse"))
 , mxLBLabelPos(m_xBuilder->weld_combo_box("comboboxtext_label_position"))
diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.cxx 
b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
index 594cbf827379..c15572717d50 100644
--- a/chart2/source/controller/sidebar/ChartElementsPanel.cxx
+++ 

[Libreoffice-commits] core.git: chart2/source include/svx sc/source sd/source svx/source sw/source

[Libreoffice Gerrit user]

 chart2/source/controller/main/SelectionHelper.cxx |7 -
 include/svx/svdhdl.hxx|   10 +-
 sc/source/ui/view/gridwin3.cxx|2 
 sd/source/ui/animations/motionpathtag.cxx |   29 +++-
 sd/source/ui/annotations/annotationtag.cxx|4 -
 sd/source/ui/view/viewoverlaymanager.cxx  |4 -
 svx/source/engine3d/obj3d.cxx |5 -
 svx/source/svdraw/svdhdl.cxx  |   69 ---
 svx/source/svdraw/svdmrkv.cxx |   79 ++
 svx/source/svdraw/svdoashp.cxx|4 -
 svx/source/svdraw/svdobj.cxx  |   20 ++---
 svx/source/svdraw/svdocapt.cxx|4 -
 svx/source/svdraw/svdocirc.cxx|5 -
 svx/source/svdraw/svdoedge.cxx|   23 ++
 svx/source/svdraw/svdograf.cxx|   20 ++---
 svx/source/svdraw/svdomeas.cxx|4 -
 svx/source/svdraw/svdopath.cxx|8 +-
 svx/source/svdraw/svdorect.cxx|8 +-
 svx/source/svdraw/svdotxdr.cxx|5 -
 svx/source/table/svdotable.cxx|   35 +
 sw/source/core/draw/dflyobj.cxx   |   16 ++--
 sw/source/core/draw/dview.cxx |2 
 22 files changed, 175 insertions(+), 188 deletions(-)

New commits:
commit b4fc996520b47a6212661a9de3a1c72ccfc379a4
Author: Noel Grandin 
AuthorDate: Fri Sep 21 15:30:02 2018 +0200
Commit: Noel Grandin 
CommitDate: Tue Sep 25 13:57:36 2018 +0200

loplugin:useuniqueptr in SdrHdlList

Change-Id: I83241bd2ed172594704f4b115b584dc39b234086
Reviewed-on: https://gerrit.libreoffice.org/60959
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/chart2/source/controller/main/SelectionHelper.cxx 
b/chart2/source/controller/main/SelectionHelper.cxx
index 30fbfdb648cd..083e7e0f71e7 100644
--- a/chart2/source/controller/main/SelectionHelper.cxx
+++ b/chart2/source/controller/main/SelectionHelper.cxx
@@ -29,6 +29,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace chart
 {
@@ -595,8 +596,7 @@ bool SelectionHelper::getMarkHandles( SdrHdlList& rHdlList )
 for( sal_uInt32 nM = 0; nM < aPolygon.count(); nM++)
 {
 const ::basegfx::B2DPoint aPoint(aPolygon.getB2DPoint(nM));
-SdrHdl* pHdl = new 
SdrHdl(Point(basegfx::fround(aPoint.getX()), basegfx::fround(aPoint.getY())), 
SdrHdlKind::Poly);
-rHdlList.AddHdl(pHdl);
+
rHdlList.AddHdl(o3tl::make_unique(Point(basegfx::fround(aPoint.getX()), 
basegfx::fround(aPoint.getY())), SdrHdlKind::Poly));
 }
 }
 return true;
@@ -641,8 +641,7 @@ bool SelectionHelper::getMarkHandles( SdrHdlList& rHdlList )
 }
 
 Point aPos = pSubObj->GetCurrentBoundRect().Center();
-SdrHdl* pHdl = new SdrHdl(aPos,SdrHdlKind::Poly);
-rHdlList.AddHdl(pHdl);
+rHdlList.AddHdl(o3tl::make_unique(aPos,SdrHdlKind::Poly));
 }
 return true;
 }
diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx
index 5416ec71c68d..075c7fe743e9 100644
--- a/include/svx/svdhdl.hxx
+++ b/include/svx/svdhdl.hxx
@@ -415,7 +415,7 @@ class SVX_DLLPUBLIC SdrHdlList
 protected:
 size_t  mnFocusIndex;
 SdrMarkView*pView;
-std::deque aList;
+std::deque> maList;
 sal_uInt16  nHdlSize;
 
 boolbRotateShear : 1;
@@ -443,8 +443,8 @@ public:
 //  2.Level PageView (Pointer)
 //  3.Level Position (x+y)
 void Sort();
-size_t   GetHdlCount() const { return aList.size(); }
-SdrHdl*  GetHdl(size_t nNum) const { return nNum pHdl);
+std::unique_ptr RemoveHdl(size_t nNum);
 void RemoveAllByKind(SdrHdlKind eKind);
 
 // move the ownership of all the SdrHdl to rOther
diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx
index 337bb7a72beb..c2ea2346cb86 100644
--- a/sc/source/ui/view/gridwin3.cxx
+++ b/sc/source/ui/view/gridwin3.cxx
@@ -303,7 +303,7 @@ void ScGridWindow::CreateAnchorHandle(SdrHdlList& rHdl, 
const ScAddress& rAddres
 bool bNegativePage = pViewData->GetDocument()->IsNegativePage( 
pViewData->GetTabNo() );
 Point aPos = pViewData->GetScrPos( rAddress.Col(), rAddress.Row(), 
eWhich, true );
 aPos = PixelToLogic(aPos);
-rHdl.AddHdl(new SdrHdl(aPos, bNegativePage ? SdrHdlKind::Anchor_TR 
: SdrHdlKind::Anchor));
+rHdl.AddHdl(o3tl::make_unique(aPos, bNegativePage ? 
SdrHdlKind::Anchor_TR : SdrHdlKind::Anchor));
 }
 }
 }
diff --git a/sd/source/ui/animations/motionpathtag.cxx 
b/sd/source/ui/animations/motionpathtag.cxx
index c6e83af4b701..0b8701956796 100644
--- 

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

[Libreoffice Gerrit user]

 chart2/source/controller/main/ChartTransferable.cxx |2 +-
 include/svx/svdxcgv.hxx |2 +-
 include/svx/view3d.hxx  |2 +-
 sc/source/ui/app/seltrans.cxx   |2 +-
 sc/source/ui/navipi/content.cxx |2 +-
 sc/source/ui/view/drawvie4.cxx  |8 
 sd/source/core/drawdoc3.cxx |2 +-
 sd/source/ui/app/sdxfer.cxx |4 ++--
 sd/source/ui/view/sdview2.cxx   |2 +-
 sd/source/ui/view/sdview3.cxx   |2 +-
 svx/source/engine3d/view3d.cxx  |   16 
 svx/source/svdraw/svdpage.cxx   |2 +-
 svx/source/svdraw/svdxcgv.cxx   |4 ++--
 13 files changed, 25 insertions(+), 25 deletions(-)

New commits:
commit b99c69784e8bb7b477759f14058a707e9000e56d
Author: Noel Grandin 
AuthorDate: Wed Aug 29 16:27:18 2018 +0200
Commit: Noel Grandin 
CommitDate: Thu Aug 30 09:46:37 2018 +0200

rename GetMarkedObjModel to CreateMarkedObjModel

and return std::unique_ptr

Not that it helps much, the ownership quickly becomes complex once it
hits the TransferableHelper.

Change-Id: I3c6bd72072e092b71b32e4105fe859fdcea956af
Reviewed-on: https://gerrit.libreoffice.org/59777
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/chart2/source/controller/main/ChartTransferable.cxx 
b/chart2/source/controller/main/ChartTransferable.cxx
index 90660c07e1cb..9ace159756e1 100644
--- a/chart2/source/controller/main/ChartTransferable.cxx
+++ b/chart2/source/controller/main/ChartTransferable.cxx
@@ -63,7 +63,7 @@ ChartTransferable::ChartTransferable(
 m_xMetaFileGraphic.set( aGraphic.GetXGraphic());
 if ( m_bDrawing )
 {
-m_pMarkedObjModel = pExchgView->GetMarkedObjModel();
+m_pMarkedObjModel = pExchgView->CreateMarkedObjModel().release();
 }
 }
 
diff --git a/include/svx/svdxcgv.hxx b/include/svx/svdxcgv.hxx
index 52dc63b1a282..731c9a392f53 100644
--- a/include/svx/svdxcgv.hxx
+++ b/include/svx/svdxcgv.hxx
@@ -70,7 +70,7 @@ public:
 // the page-local layer is merged. If there's no more room left for
 // additional page-local layers, the corresponding objects are assigned
 // the default layer (layer 0, document-global standard layer).
-virtual SdrModel*   GetMarkedObjModel() const;
+virtual std::unique_ptr CreateMarkedObjModel() const;
 
 Graphic GetAllMarkedGraphic() const;
 
diff --git a/include/svx/view3d.hxx b/include/svx/view3d.hxx
index 33a19fa79061..9b92023e5596 100644
--- a/include/svx/view3d.hxx
+++ b/include/svx/view3d.hxx
@@ -83,7 +83,7 @@ public:
 const MouseEvent& GetMouseEvent() { return aMouseEvent; }
 
 // Override getting the model, as we need to supply a Scene together with 
individual 3D Objects.
-virtual SdrModel* GetMarkedObjModel() const override;
+virtual std::unique_ptr CreateMarkedObjModel() const override;
 
 // On Paste: We need to insert the objects of the Scene, but not the Scene 
itself
 using SdrView::Paste;
diff --git a/sc/source/ui/app/seltrans.cxx b/sc/source/ui/app/seltrans.cxx
index c42134bb28cd..5b5aca2a4a7b 100644
--- a/sc/source/ui/app/seltrans.cxx
+++ b/sc/source/ui/app/seltrans.cxx
@@ -327,7 +327,7 @@ void ScSelectionTransferObj::CreateDrawData()
 }
 
 ScDrawLayer::SetGlobalDrawPersist( aDragShellRef.get() );
-std::unique_ptr pModel(pDrawView->GetMarkedObjModel());
+std::unique_ptr 
pModel(pDrawView->CreateMarkedObjModel());
 ScDrawLayer::SetGlobalDrawPersist(nullptr);
 
 ScViewData& rViewData = pView->GetViewData();
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index ecaecee72982..ad7ea280d8c7 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -1253,7 +1253,7 @@ static void lcl_DoDragObject( ScDocShell* pSrcShell, 
const OUString& rName, ScCo
 SdrPageView* pPV = aEditView.GetSdrPageView();
 aEditView.MarkObj(pObject, pPV);
 
-std::unique_ptr 
pDragModel(aEditView.GetMarkedObjModel());
+std::unique_ptr 
pDragModel(aEditView.CreateMarkedObjModel());
 
 TransferableObjectDescriptor aObjDesc;
 pSrcShell->FillTransferableObjectDescriptor( aObjDesc );
diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx
index 4bd6b11719cf..ae640d7f1708 100644
--- a/sc/source/ui/view/drawvie4.cxx
+++ b/sc/source/ui/view/drawvie4.cxx
@@ -80,7 +80,7 @@ void ScDrawView::BeginDrag( vcl::Window* pWindow, const 
Point& rStartPos )
 aDragShellRef->DoInitNew();
 }
 ScDrawLayer::SetGlobalDrawPersist( aDragShellRef.get() );
-std::unique_ptr pModel(GetMarkedObjModel());
+std::unique_ptr 

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

[Libreoffice Gerrit user]

 chart2/source/controller/main/DragMethod_RotateDiagram.cxx |6 
 include/svx/sdr/overlay/overlayobjectlist.hxx  |6 
 include/svx/svddrgmt.hxx   |2 
 sc/source/ui/view/gridwin.cxx  |   40 +++---
 sc/source/ui/view/tabview3.cxx |6 
 sd/source/ui/animations/motionpathtag.cxx  |4 
 sd/source/ui/annotations/annotationtag.cxx |8 -
 sd/source/ui/view/viewoverlaymanager.cxx   |7 -
 svx/source/engine3d/dragmt3d.cxx   |6 
 svx/source/engine3d/view3d.cxx |   10 -
 svx/source/sdr/overlay/overlayobjectlist.cxx   |   16 +-
 svx/source/svdraw/svdcrtv.cxx  |   24 +--
 svx/source/svdraw/svddrgmt.cxx |   14 +-
 svx/source/svdraw/svdedxv.cxx  |6 
 svx/source/svdraw/svdhdl.cxx   |   84 ++---
 svx/source/svdraw/svdmrkv.cxx  |6 
 svx/source/svdraw/svdsnpv.cxx  |   12 -
 svx/source/svdraw/svdview.cxx  |6 
 svx/source/table/tablecontroller.cxx   |4 
 svx/source/table/tablehandles.cxx  |   14 +-
 20 files changed, 139 insertions(+), 142 deletions(-)

New commits:
commit 18e20676024baecaf5719139f80f053f5f1e784a
Author: Noel Grandin 
AuthorDate: Mon Aug 13 16:16:12 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Aug 15 11:27:20 2018 +0200

loplugin:useuniqueptr in OverlayObjectList

Change-Id: I641d93e54504c27bcc49bae8edf6286c0a9a471f
Reviewed-on: https://gerrit.libreoffice.org/59024
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx 
b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
index ccee914fdfbd..a2a46befe667 100644
--- a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
+++ b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
@@ -211,10 +211,10 @@ void 
DragMethod_RotateDiagram::CreateOverlayGeometry(sdr::overlay::OverlayManage
 // transform to 2D view coordinates
 aPolyPolygon.transform(rVCScene.getObjectTransformation());
 
-sdr::overlay::OverlayPolyPolygonStripedAndFilled* pNew = new 
sdr::overlay::OverlayPolyPolygonStripedAndFilled(
-aPolyPolygon);
+std::unique_ptr 
pNew(new sdr::overlay::OverlayPolyPolygonStripedAndFilled(
+aPolyPolygon));
 rOverlayManager.add(*pNew);
-addToOverlayObjectList(pNew);
+addToOverlayObjectList(std::move(pNew));
 }
 }
 } //namespace chart
diff --git a/include/svx/sdr/overlay/overlayobjectlist.hxx 
b/include/svx/sdr/overlay/overlayobjectlist.hxx
index 0774ac16e436..8044ae70147d 100644
--- a/include/svx/sdr/overlay/overlayobjectlist.hxx
+++ b/include/svx/sdr/overlay/overlayobjectlist.hxx
@@ -23,6 +23,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 
 class Point;
@@ -34,7 +36,7 @@ namespace sdr
 class SVX_DLLPUBLIC OverlayObjectList final
 {
 // the vector of OverlayObjects
-OverlayObjectVector maVector;
+::std::vector< std::unique_ptr > maVector;
 
 public:
 OverlayObjectList() {}
@@ -46,7 +48,7 @@ namespace sdr
 void clear();
 
 // append objects (takes ownership)
-void append(OverlayObject* pOverlayObject);
+void append(std::unique_ptr pOverlayObject);
 
 // access to objects
 sal_uInt32 count() const { return maVector.size(); }
diff --git a/include/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx
index b51769d0e740..e4a501429c53 100644
--- a/include/svx/svddrgmt.hxx
+++ b/include/svx/svddrgmt.hxx
@@ -130,7 +130,7 @@ protected:
 virtual void createSdrDragEntryForSdrObject(const SdrObject& rOriginal, 
sdr::contact::ObjectContact& rObjectContact);
 
 // access for derivated classes to maOverlayObjectList (passes ownership)
-void addToOverlayObjectList(sdr::overlay::OverlayObject* pNew) { 
maOverlayObjectList.append(pNew); }
+void addToOverlayObjectList(std::unique_ptr 
pNew) { maOverlayObjectList.append(std::move(pNew)); }
 
 // access for derivated classes to mrSdrDragView
 SdrDragView& getSdrDragView() { return mrSdrDragView; }
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 6106ca423a7f..21ca80104434 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -5840,9 +5840,9 @@ void ScGridWindow::UpdateCopySourceOverlay()
 
 tools::Rectangle aLogic = PixelToLogic(aRect, aDrawMode);
 ::basegfx::B2DRange aRange(aLogic.Left(), aLogic.Top(), 
aLogic.Right(), aLogic.Bottom());
-ScOverlayDashedBorder* pDashedBorder = 

[Libreoffice-commits] core.git: chart2/source include/svx sc/source sd/source svx/source sw/source

[Armin Le Grand]

 chart2/source/controller/drawinglayer/DrawViewWrapper.cxx |5 
 chart2/source/controller/main/ChartController_Window.cxx  |   12 
 chart2/source/controller/main/SelectionHelper.cxx |9 
 chart2/source/view/charttypes/BarChart.cxx|6 
 include/svx/obj3d.hxx |   14 
 include/svx/scene3d.hxx   |   11 
 include/svx/svdobj.hxx|8 
 sc/source/core/tool/detfunc.cxx   |2 
 sc/source/ui/Accessibility/AccessibleDocument.cxx |4 
 sd/source/core/EffectMigration.cxx|2 
 sd/source/core/sdpage.cxx |2 
 sd/source/ui/unoidl/unoobj.cxx|2 
 svx/source/accessibility/AccessibleShape.cxx  |8 
 svx/source/engine3d/dragmt3d.cxx  |  373 +++---
 svx/source/engine3d/e3dsceneupdater.cxx   |4 
 svx/source/engine3d/helperhittest3d.cxx   |6 
 svx/source/engine3d/helperminimaldepth3d.cxx  |6 
 svx/source/engine3d/obj3d.cxx |   62 +-
 svx/source/engine3d/scene3d.cxx   |   45 +
 svx/source/engine3d/view3d.cxx|   51 +
 svx/source/sdr/contact/viewcontactofsdrobj.cxx|2 
 svx/source/sdr/properties/e3dcompoundproperties.cxx   |8 
 svx/source/svdraw/svdedtv.cxx |6 
 svx/source/svdraw/svdedtv2.cxx|   32 -
 svx/source/svdraw/svdedxv.cxx |6 
 svx/source/svdraw/svdmark.cxx |8 
 svx/source/svdraw/svdmrkv.cxx |   28 -
 svx/source/svdraw/svdobj.cxx  |   99 +--
 svx/source/svdraw/svdpage.cxx |4 
 svx/source/svdraw/svdpagv.cxx |   12 
 svx/source/svdraw/svdundo.cxx |8 
 svx/source/svdraw/svdview.cxx |8 
 svx/source/unodraw/unoshap2.cxx   |6 
 svx/source/unodraw/unoshap3.cxx   |4 
 svx/source/unodraw/unoshape.cxx   |4 
 sw/source/core/access/accmap.cxx  |4 
 sw/source/core/doc/docdraw.cxx|6 
 sw/source/core/doc/docfly.cxx |2 
 sw/source/core/draw/dcontact.cxx  |   10 
 sw/source/core/draw/dview.cxx |2 
 sw/source/core/frmedt/fecopy.cxx  |8 
 sw/source/core/frmedt/feshview.cxx|   16 
 sw/source/core/unocore/unodraw.cxx|   14 
 sw/source/filter/ww8/ww8graf.cxx  |6 
 sw/source/filter/ww8/ww8graf2.cxx |4 
 sw/source/filter/xml/swxml.cxx|2 
 46 files changed, 495 insertions(+), 446 deletions(-)

New commits:
commit 099eef24da24d638fdf2c747d28040c9b3a30780
Author: Armin Le Grand 
Date:   Sat Jun 16 13:23:08 2018 +0200

AW080: Continued cleanups/remaps/corrections

Change-Id: I953f29e6a8d398e00884a600d6f4ceba880489a5
Reviewed-on: https://gerrit.libreoffice.org/55913
Tested-by: Jenkins
Reviewed-by: Armin Le Grand 

diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx 
b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
index b86980f47782..6330becfeb64 100644
--- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
+++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
@@ -200,8 +200,9 @@ SdrObject* DrawViewWrapper::getHitObject( const Point& rPnt 
) const
 E3dObject* pE3d = dynamic_cast< E3dObject* >(pRet);
 if( pE3d )
 {
-E3dScene* pScene = pE3d->GetScene();
-if( pScene )
+E3dScene* pScene(pE3d->getRootE3dSceneFromE3dObject());
+
+if(nullptr != pScene)
 {
 // prepare result vector and call helper
 std::vector< const E3dCompoundObject* > aHitList;
diff --git a/chart2/source/controller/main/ChartController_Window.cxx 
b/chart2/source/controller/main/ChartController_Window.cxx
index a1c09e85fc87..66bb107b185e 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -829,9 +829,15 @@ void ChartController::execute_MouseButtonUp( const 
MouseEvent& rMEvt )
 awt::Size aPageSize( ChartModelHelper::getPageSize( 
getModel() ) );
 tools::Rectangle aPageRect( 
0,0,aPageSize.Width,aPageSize.Height );
 
-const E3dObject* pE3dObject = dynamic_cast< const 
E3dObject*>( pObj );
-   

[Libreoffice-commits] core.git: chart2/source include/svx sc/source sd/source svx/source sw/source

[Noel Grandin]

 chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx |3 
 include/svx/svxids.hrc|  101 +-
 sc/source/ui/view/cellsh3.cxx |2 
 sc/source/ui/view/formatsh.cxx|   10 
 sd/source/ui/view/drviewse.cxx|2 
 svx/source/svdraw/svdedtv1.cxx|6 
 svx/source/table/tablecontroller.cxx  |4 
 sw/source/core/unocore/unoobj2.cxx|2 
 sw/source/core/unocore/unostyle.cxx   |2 
 sw/source/ui/chrdlg/tblnumfm.cxx  |2 
 sw/source/uibase/shells/basesh.cxx|4 
 sw/source/uibase/shells/tabsh.cxx |6 
 sw/source/uibase/uiview/pview.cxx |6 
 sw/source/uibase/uiview/viewtab.cxx   |4 
 14 files changed, 81 insertions(+), 73 deletions(-)

New commits:
commit 956dd4a202a0897b7ca1f8abd285af2cad47abb2
Author: Noel Grandin 
Date:   Wed Dec 20 15:53:37 2017 +0200

TypedWhichId in svx part 2

Change-Id: Id927679c9f07f1dd820f4fdca9a45eb7aede037c
Reviewed-on: https://gerrit.libreoffice.org/46850
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx 
b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
index 13c8c2246ab3..aa168a51e6e2 100644
--- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
@@ -926,8 +926,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 
nWhichId, const SfxItemSet
 if( aState == SfxItemState::SET )
 {
 sal_Int32 nFormatKey = static_cast< sal_Int32 >(
-static_cast< const SfxUInt32Item & >(
-rItemSet.Get( SID_ATTR_NUMBERFORMAT_VALUE 
)).GetValue());
+rItemSet.Get( SID_ATTR_NUMBERFORMAT_VALUE 
).GetValue());
 aValue <<= nFormatKey;
 }
 else
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index a98b1b644ba9..07e808c37627 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -26,6 +26,12 @@
 #include 
 #include 
 
+class SfxInt32Item;
+class SfxAllEnumItem;
+class SfxPointItem;
+class SfxBoolItem;
+class SfxUInt32Item;
+class SfxRectangleItem;
 class SvxPageItem;
 class SvxSizeItem;
 class SvxLongULSpaceItem;
@@ -34,6 +40,17 @@ class SvxPostItAuthorItem;
 class SvxPostItDateItem;
 class SvxPostItTextItem;
 class SvxPostItIdItem;
+class SvxColorListItem;
+class SvxColorItem;
+class SvxGradientListItem;
+class SvxRulerItem;
+class SvxNumberInfoItem;
+class SvxHatchListItem;
+class SvxBitmapListItem;
+class SvxPatternListItem;
+class SvxDashListItem;
+class SvxLineEndListItem;
+class SvxLineItem;
 
 // member IDs
 
@@ -245,23 +262,23 @@ class SvxPostItIdItem;
 // CAUTION! Range <64 .. 67> used by EditEngine (!)
 
 #define SID_RULER_CHANGE_STATE  ( SID_SVX_START + 78 )
-#define SID_RULER_NULL_OFFSET   ( SID_SVX_START + 79 )
-#define SID_RULER_BORDERS   ( SID_SVX_START + 80 )
-#define SID_RULER_OBJECT( SID_SVX_START + 81 )
-#define SID_RULER_PAGE_POS  ( SID_SVX_START + 82 )
-#define SID_RULER_ACT_LINE_ONLY ( SID_SVX_START + 83 )
-#define SID_RULER_LR_MIN_MAX( SID_SVX_START + 84 )
-#define SID_ATTR_NUMBERFORMAT_VALUE ( SID_SVX_START + 85 )
-#define SID_ATTR_NUMBERFORMAT_INFO  ( SID_SVX_START + 86 )
-#define SID_ATTR_TRANSFORM  ( SID_SVX_START + 87 )
-#define SID_ATTR_TRANSFORM_POS_X( SID_SVX_START + 88 )
-#define SID_ATTR_TRANSFORM_POS_Y( SID_SVX_START + 89 )
-#define SID_ATTR_TRANSFORM_WIDTH( SID_SVX_START + 90 )
-#define SID_ATTR_TRANSFORM_HEIGHT   ( SID_SVX_START + 91 )
-#define SID_ATTR_TRANSFORM_SIZE_POINT   ( SID_SVX_START + 92 )
-#define SID_ATTR_TRANSFORM_ROT_X( SID_SVX_START + 93 )
-#define SID_ATTR_TRANSFORM_ROT_Y( SID_SVX_START + 94 )
-#define SID_ATTR_TRANSFORM_ANGLE( SID_SVX_START + 95 )
+#define SID_RULER_NULL_OFFSET   
TypedWhichId( SID_SVX_START + 79 )
+#define SID_RULER_BORDERS   
TypedWhichId( SID_SVX_START + 80 )
+#define SID_RULER_OBJECT
TypedWhichId( SID_SVX_START + 81 

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

[Jochen Nitschke]

 chart2/source/controller/main/DragMethod_RotateDiagram.cxx |2 -
 include/svx/sdr/overlay/overlayobjectlist.hxx  |6 ++-
 include/svx/svddrgmt.hxx   |4 +-
 sc/source/ui/view/gridwin.cxx  |   14 +++
 sc/source/ui/view/tabview3.cxx |4 +-
 sd/source/ui/animations/motionpathtag.cxx  |2 -
 sd/source/ui/annotations/annotationtag.cxx |2 -
 sd/source/ui/view/viewoverlaymanager.cxx   |2 -
 svx/source/engine3d/dragmt3d.cxx   |2 -
 svx/source/engine3d/view3d.cxx |4 +-
 svx/source/sdr/overlay/overlayobjectlist.cxx   |8 +++-
 svx/source/svdraw/svdcrtv.cxx  |8 ++--
 svx/source/svdraw/svddrgmt.cxx |6 +--
 svx/source/svdraw/svdhdl.cxx   |   24 ++---
 svx/source/svdraw/svdmrkv.cxx  |2 -
 svx/source/svdraw/svdsnpv.cxx  |4 +-
 svx/source/svdraw/svdview.cxx  |2 -
 svx/source/table/tablecontroller.cxx   |2 -
 svx/source/table/tablehandles.cxx  |6 +--
 19 files changed, 55 insertions(+), 49 deletions(-)

New commits:
commit abc8057ab1a1189ff7f88d42b13b363ceb228d16
Author: Jochen Nitschke 
Date:   Mon Jan 23 09:01:42 2017 +0100

pass ownership by pointer

to show the intend of the code.

assert on invalid objects.
remove useless OSL_ENSURE.
make sure list of owning pointers can't be copied.

Change-Id: I3cccf8ea87585ec9fe62921203a4d12e617ce15c
Reviewed-on: https://gerrit.libreoffice.org/33393
Tested-by: Jenkins 
Reviewed-by: Jochen Nitschke 

diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx 
b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
index 543f32e..5595977 100644
--- a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
+++ b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
@@ -215,7 +215,7 @@ void 
DragMethod_RotateDiagram::CreateOverlayGeometry(sdr::overlay::OverlayManage
 sdr::overlay::OverlayPolyPolygonStripedAndFilled* pNew = new 
sdr::overlay::OverlayPolyPolygonStripedAndFilled(
 aPolyPolygon);
 rOverlayManager.add(*pNew);
-addToOverlayObjectList(*pNew);
+addToOverlayObjectList(pNew);
 }
 }
 } //namespace chart
diff --git a/include/svx/sdr/overlay/overlayobjectlist.hxx 
b/include/svx/sdr/overlay/overlayobjectlist.hxx
index c8e670d..b348b3c 100644
--- a/include/svx/sdr/overlay/overlayobjectlist.hxx
+++ b/include/svx/sdr/overlay/overlayobjectlist.hxx
@@ -39,13 +39,15 @@ namespace sdr
 
 public:
 OverlayObjectList() {}
+OverlayObjectList(const OverlayObjectList&) = delete;
+OverlayObjectList& operator=(const OverlayObjectList&) = delete;
 ~OverlayObjectList();
 
 // clear list, this includes deletion of all contained objects
 void clear();
 
-// append objects
-void append(OverlayObject& rOverlayObject) { 
maVector.push_back(); }
+// append objects (takes ownership)
+void append(OverlayObject* pOverlayObject);
 
 // access to objects
 sal_uInt32 count() const { return maVector.size(); }
diff --git a/include/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx
index df51ea8..e328629 100644
--- a/include/svx/svddrgmt.hxx
+++ b/include/svx/svddrgmt.hxx
@@ -128,8 +128,8 @@ protected:
 virtual void createSdrDragEntries();
 virtual void createSdrDragEntryForSdrObject(const SdrObject& rOriginal, 
sdr::contact::ObjectContact& rObjectContact);
 
-// access for derivated classes to maOverlayObjectList
-void addToOverlayObjectList(sdr::overlay::OverlayObject& rNew) { 
maOverlayObjectList.append(rNew); }
+// access for derivated classes to maOverlayObjectList (passes ownership)
+void addToOverlayObjectList(sdr::overlay::OverlayObject* pNew) { 
maOverlayObjectList.append(pNew); }
 
 // access for derivated classes to mrSdrDragView
 SdrDragView& getSdrDragView() { return mrSdrDragView; }
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 578fd2a..3ac3af0 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -5848,7 +5848,7 @@ void ScGridWindow::UpdateCopySourceOverlay()
 ::basegfx::B2DRange aRange(aLogic.Left(), aLogic.Top(), 
aLogic.Right(), aLogic.Bottom());
 ScOverlayDashedBorder* pDashedBorder = new 
ScOverlayDashedBorder(aRange, aHighlight);
 xOverlayManager->add(*pDashedBorder);
-mpOOSelectionBorder->append(*pDashedBorder);
+

[Libreoffice-commits] core.git: chart2/source include/svx sc/source sd/source svx/source sw/source

[Miklos Vajna]

 chart2/source/controller/drawinglayer/DrawViewWrapper.cxx |2 
 include/svx/svddrgmt.hxx  |2 
 include/svx/svdmrkv.hxx   |   10 -
 sc/source/ui/view/drawvie3.cxx|4 
 sc/source/ui/view/drawview.cxx|2 
 sd/source/ui/view/sdview.cxx  |2 
 svx/source/svdraw/svddrgv.cxx |2 
 svx/source/svdraw/svdedtv.cxx |2 
 svx/source/svdraw/svdedxv.cxx |   12 -
 svx/source/svdraw/svdmrkv.cxx |  100 +++---
 svx/source/svdraw/svdmrkv1.cxx|   24 +--
 svx/source/svdraw/svdview.cxx |4 
 sw/source/core/draw/dview.cxx |6 
 13 files changed, 86 insertions(+), 86 deletions(-)

New commits:
commit 5ea32020e870fde6e1fa05964c343d004ed26f46
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Sat Mar 7 10:50:27 2015 +0100

SdrMarkView: aHdl - maHdlList

aHdl is an SdrHdlList, so reading aHdl.GetHdl() as get the handle of the
handle was confusing.

Change-Id: Ib21fa74cc1daa4b6d2034f07715147a8fb0cf934
Reviewed-on: https://gerrit.libreoffice.org/14779
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Jenkins c...@libreoffice.org

diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx 
b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
index 0870786..9dc9deaeb 100644
--- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
+++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
@@ -166,7 +166,7 @@ SdrPageView* DrawViewWrapper::GetPageView() const
 
 void DrawViewWrapper::SetMarkHandles()
 {
-if( m_pMarkHandleProvider  m_pMarkHandleProvider-getMarkHandles( aHdl ) 
)
+if( m_pMarkHandleProvider  m_pMarkHandleProvider-getMarkHandles( 
maHdlList ) )
 return;
 else
 SdrView::SetMarkHandles();
diff --git a/include/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx
index 6e2fa4a..0e4603d 100644
--- a/include/svx/svddrgmt.hxx
+++ b/include/svx/svddrgmt.hxx
@@ -163,7 +163,7 @@ protected:
 const SdrDragStat DragStat() const{ return 
getSdrDragView().aDragStat; }
 Point Ref1() const{ return 
mrSdrDragView.aRef1; }
 Point Ref2() const{ return 
mrSdrDragView.aRef2; }
-const SdrHdlList  GetHdlList() const  { return 
getSdrDragView().aHdl; }
+const SdrHdlList  GetHdlList() const  { return 
getSdrDragView().GetHdlList(); }
 void   AddUndo(SdrUndoAction* pUndo)   { 
getSdrDragView().AddUndo(pUndo); }
 bool   IsDragLimit()   { return 
getSdrDragView().bDragLimit; }
 const Rectangle   GetDragLimitRect()  { return 
getSdrDragView().aDragLimit; }
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx
index 78d7e84..db6e3ba 100644
--- a/include/svx/svdmrkv.hxx
+++ b/include/svx/svdmrkv.hxx
@@ -101,7 +101,7 @@ protected:
 Point   aRef1;// Persistent - Rotation 
center / axis of reflection
 Point   aRef2;// Persistent
 Point   aLastCrookCenter; // Persistent
-SdrHdlList  aHdl;
+SdrHdlList  maHdlList;
 sdr::ViewSelection* mpSdrViewSelection;
 
 Rectangle   aMarkedObjRect;
@@ -140,7 +140,7 @@ private:
 protected:
 virtual void Notify(SfxBroadcaster rBC, const SfxHint rHint) 
SAL_OVERRIDE;
 virtual void ModelHasChanged() SAL_OVERRIDE; // Is called by the PaintView
-virtual void SetMarkHandles();   
// aHdl - fill (List of handles)
+virtual void SetMarkHandles();   
// maHdlList - fill (List of handles)
 void SetMarkRects(); 
// Rects at the PageViews
 void CheckMarked();  
// Scan MarkList after Del and Lock Layer ...
 void AddDragModeHdl(SdrDragMode eMode);
@@ -347,9 +347,9 @@ public:
 
 // Search for the number of the suitable handle. In case of empty search 
result,
 // SAL_MAX_SIZE is returned.
-size_t GetHdlNum(SdrHdl* pHdl) const { return aHdl.GetHdlNum(pHdl); }
-SdrHdl* GetHdl(size_t nHdlNum)  const { return aHdl.GetHdl(nHdlNum); }
-const SdrHdlList GetHdlList() const { return aHdl; }
+size_t GetHdlNum(SdrHdl* pHdl) const { return maHdlList.GetHdlNum(pHdl); }
+SdrHdl* GetHdl(size_t nHdlNum)  const { return maHdlList.GetHdl(nHdlNum); }
+const SdrHdlList GetHdlList() const { return maHdlList; }
 
 // Draw a selection frame for marking of points.
 // This routine