summaryrefslogtreecommitdiff
path: root/sw/source/uibase/ribbar
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-02-12 10:12:03 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-02-13 11:00:17 +0100
commita2b687a88feedfae0087bfc999b3cf49b9d3d24b (patch)
tree1615bf7094f106a4f92ee4aa460599a2c84282bf /sw/source/uibase/ribbar
parentad6d9bce1126997750d3c3c2606d28164d63d1d8 (diff)
Pointer is pointless
since it is just a wrapper around PointerStyle Change-Id: I51f065e0d4ad8bd91f5c84c5819048c720a19267 Reviewed-on: https://gerrit.libreoffice.org/67711 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/uibase/ribbar')
-rw-r--r--sw/source/uibase/ribbar/conform.cxx5
-rw-r--r--sw/source/uibase/ribbar/drawbase.cxx5
2 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/uibase/ribbar/conform.cxx b/sw/source/uibase/ribbar/conform.cxx
index c7ecb91f0903..88fefd1fefd9 100644
--- a/sw/source/uibase/ribbar/conform.cxx
+++ b/sw/source/uibase/ribbar/conform.cxx
@@ -20,6 +20,7 @@
#include <svx/fmglob.hxx>
#include <svx/svdview.hxx>
#include <svx/fmshell.hxx>
+#include <vcl/ptrstyle.hxx>
#include <swmodule.hxx>
#include <view.hxx>
@@ -64,7 +65,7 @@ bool ConstFormControl::MouseButtonDown(const MouseEvent& rMEvt)
g_bNoInterrupt = true;
m_pWin->CaptureMouse();
- m_pWin->SetPointer(Pointer(PointerStyle::DrawRect));
+ m_pWin->SetPointer(PointerStyle::DrawRect);
m_aStartPos = m_pWin->PixelToLogic(rMEvt.GetPosPixel());
bReturn = m_pSh->BeginCreate( static_cast< sal_uInt16 >(m_pWin->GetSdrDrawMode()), SdrInventor::FmForm, m_aStartPos);
@@ -84,7 +85,7 @@ void ConstFormControl::Activate(const sal_uInt16 nSlotId)
SwDrawBase::Activate(nSlotId);
m_pSh->GetDrawView()->SetCurrentObj(nSlotId);
- m_pWin->SetPointer(Pointer(PointerStyle::DrawRect));
+ m_pWin->SetPointer(PointerStyle::DrawRect);
}
void ConstFormControl::CreateDefaultObject()
diff --git a/sw/source/uibase/ribbar/drawbase.cxx b/sw/source/uibase/ribbar/drawbase.cxx
index 351cccb629f7..fd4f4018be23 100644
--- a/sw/source/uibase/ribbar/drawbase.cxx
+++ b/sw/source/uibase/ribbar/drawbase.cxx
@@ -475,9 +475,8 @@ void SwDrawBase::SetDrawPointer()
SdrView *pSdrView = m_pSh->GetDrawView();
Point aPnt(m_pWin->OutputToScreenPixel(m_pWin->GetPointerPosPixel()));
aPnt = m_pWin->PixelToLogic(m_pWin->ScreenToOutputPixel(aPnt));
- const Pointer aPointTyp = pSdrView->GetPreferredPointer(aPnt, m_pSh->GetOut());
- const Pointer aDrawPt(aPointTyp);
- m_pWin->SetPointer(aDrawPt);
+ PointerStyle aPointTyp = pSdrView->GetPreferredPointer(aPnt, m_pSh->GetOut());
+ m_pWin->SetPointer(aPointTyp);
}
// If necessary switch into selection mode