diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-02-12 10:12:03 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-02-13 11:00:17 +0100 |
commit | a2b687a88feedfae0087bfc999b3cf49b9d3d24b (patch) | |
tree | 1615bf7094f106a4f92ee4aa460599a2c84282bf /sw | |
parent | ad6d9bce1126997750d3c3c2606d28164d63d1d8 (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')
-rw-r--r-- | sw/inc/pch/precompiled_msword.hxx | 1 | ||||
-rw-r--r-- | sw/inc/pch/precompiled_swui.hxx | 1 | ||||
-rw-r--r-- | sw/inc/pch/precompiled_vbaswobj.hxx | 1 | ||||
-rw-r--r-- | sw/inc/unotxdoc.hxx | 2 | ||||
-rw-r--r-- | sw/source/core/draw/dflyobj.cxx | 5 | ||||
-rw-r--r-- | sw/source/core/inc/dflyobj.hxx | 2 | ||||
-rw-r--r-- | sw/source/ui/vba/vbasystem.cxx | 12 | ||||
-rw-r--r-- | sw/source/uibase/docvw/AnnotationWin2.cxx | 3 | ||||
-rw-r--r-- | sw/source/uibase/docvw/edtwin.cxx | 3 | ||||
-rw-r--r-- | sw/source/uibase/docvw/srcedtw.cxx | 3 | ||||
-rw-r--r-- | sw/source/uibase/ribbar/conform.cxx | 5 | ||||
-rw-r--r-- | sw/source/uibase/ribbar/drawbase.cxx | 5 | ||||
-rw-r--r-- | sw/source/uibase/uiview/viewdraw.cxx | 3 | ||||
-rw-r--r-- | sw/source/uibase/uno/unotxdoc.cxx | 4 |
14 files changed, 24 insertions, 26 deletions
diff --git a/sw/inc/pch/precompiled_msword.hxx b/sw/inc/pch/precompiled_msword.hxx index 8e68fe7adce1..8635a2062a7d 100644 --- a/sw/inc/pch/precompiled_msword.hxx +++ b/sw/inc/pch/precompiled_msword.hxx @@ -155,7 +155,6 @@ #include <vcl/outdev.hxx> #include <vcl/outdevmap.hxx> #include <vcl/outdevstate.hxx> -#include <vcl/pointr.hxx> #include <vcl/ptrstyle.hxx> #include <vcl/region.hxx> #include <vcl/salgtype.hxx> diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx index b303c9435318..f78a904d287d 100644 --- a/sw/inc/pch/precompiled_swui.hxx +++ b/sw/inc/pch/precompiled_swui.hxx @@ -171,7 +171,6 @@ #include <vcl/outdev.hxx> #include <vcl/outdevmap.hxx> #include <vcl/outdevstate.hxx> -#include <vcl/pointr.hxx> #include <vcl/print.hxx> #include <vcl/prntypes.hxx> #include <vcl/ptrstyle.hxx> diff --git a/sw/inc/pch/precompiled_vbaswobj.hxx b/sw/inc/pch/precompiled_vbaswobj.hxx index 0ad59d9dee78..14c103107a75 100644 --- a/sw/inc/pch/precompiled_vbaswobj.hxx +++ b/sw/inc/pch/precompiled_vbaswobj.hxx @@ -163,7 +163,6 @@ #include <vcl/outdev.hxx> #include <vcl/outdevmap.hxx> #include <vcl/outdevstate.hxx> -#include <vcl/pointr.hxx> #include <vcl/print.hxx> #include <vcl/prntypes.hxx> #include <vcl/ptrstyle.hxx> diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx index ae3fb79aa936..0ceb70b3f888 100644 --- a/sw/inc/unotxdoc.hxx +++ b/sw/inc/unotxdoc.hxx @@ -434,7 +434,7 @@ public: /// @see vcl::ITiledRenderable::setClientZoom. virtual void setClientZoom(int nTilePixelWidth_, int nTilePixelHeight_, int nTileTwipWidth_, int nTileTwipHeight_) override; /// @see vcl::ITiledRenderable::getPointer(). - virtual Pointer getPointer() override; + virtual PointerStyle getPointer() override; /// @see vcl::ITiledRenderable::getTrackedChanges(). OUString getTrackedChanges() override; /// @see vcl::ITiledRenderable::getTrackedChangeAuthors(). diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx index a78d78e51433..b7f5a30de5af 100644 --- a/sw/source/core/draw/dflyobj.cxx +++ b/sw/source/core/draw/dflyobj.cxx @@ -25,6 +25,7 @@ #include <editeng/opaqitem.hxx> #include <svx/svdpage.hxx> #include <vcl/svapp.hxx> +#include <vcl/ptrstyle.hxx> #include <fmtclds.hxx> #include <fmtornt.hxx> @@ -1229,10 +1230,10 @@ void SwVirtFlyDrawObj::addCropHandles(SdrHdlList& rTarget) const // Macro -Pointer SwVirtFlyDrawObj::GetMacroPointer( +PointerStyle SwVirtFlyDrawObj::GetMacroPointer( const SdrObjMacroHitRec& ) const { - return Pointer( PointerStyle::RefHand ); + return PointerStyle::RefHand; } bool SwVirtFlyDrawObj::HasMacro() const diff --git a/sw/source/core/inc/dflyobj.hxx b/sw/source/core/inc/dflyobj.hxx index f7f744a5fc02..30e27cf5f97c 100644 --- a/sw/source/core/inc/dflyobj.hxx +++ b/sw/source/core/inc/dflyobj.hxx @@ -130,7 +130,7 @@ public: // if an URL is attached to a graphic than this is a macro object virtual bool HasMacro() const override; virtual SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec) const override; - virtual Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec) const override; + virtual PointerStyle GetMacroPointer (const SdrObjMacroHitRec& rRec) const override; // RotGrfFlyFrame: If true, this SdrObject supports only limited rotation. virtual bool HasLimitedRotation() const override; diff --git a/sw/source/ui/vba/vbasystem.cxx b/sw/source/ui/vba/vbasystem.cxx index 2ee7a68d8a1d..3be9571f239c 100644 --- a/sw/source/ui/vba/vbasystem.cxx +++ b/sw/source/ui/vba/vbasystem.cxx @@ -200,28 +200,24 @@ SwVbaSystem::setCursor( sal_Int32 _cursor ) { case word::WdCursorType::wdCursorNorthwestArrow: { - const Pointer& rPointer( PointerStyle::Arrow ); - setCursorHelper( getCurrentWordDoc(mxContext), rPointer, false ); + setCursorHelper( getCurrentWordDoc(mxContext), PointerStyle::Arrow, false ); break; } case word::WdCursorType::wdCursorWait: { - const Pointer& rPointer( PointerStyle::Wait ); //It will set the edit window, toobar and statusbar's mouse pointer. - setCursorHelper( getCurrentWordDoc(mxContext), rPointer, true ); + setCursorHelper( getCurrentWordDoc(mxContext), PointerStyle::Wait, true ); break; } case word::WdCursorType::wdCursorIBeam: { - const Pointer& rPointer( PointerStyle::Text ); //It will set the edit window, toobar and statusbar's mouse pointer. - setCursorHelper( getCurrentWordDoc( mxContext ), rPointer, true ); + setCursorHelper( getCurrentWordDoc( mxContext ), PointerStyle::Text, true ); break; } case word::WdCursorType::wdCursorNormal: { - const Pointer& rPointer( PointerStyle::Null ); - setCursorHelper( getCurrentWordDoc( mxContext ), rPointer, false ); + setCursorHelper( getCurrentWordDoc( mxContext ), PointerStyle::Null, false ); break; } default: diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx b/sw/source/uibase/docvw/AnnotationWin2.cxx index 380831b966c8..978482343e81 100644 --- a/sw/source/uibase/docvw/AnnotationWin2.cxx +++ b/sw/source/uibase/docvw/AnnotationWin2.cxx @@ -60,6 +60,7 @@ #include <vcl/svapp.hxx> #include <vcl/menubtn.hxx> #include <vcl/settings.hxx> +#include <vcl/ptrstyle.hxx> #include <edtwin.hxx> #include <view.hxx> @@ -444,7 +445,7 @@ void SwAnnotationWin::InitControls() mpSidebarTextControl = VclPtr<SidebarTextControl>::Create( *this, WB_NODIALOGCONTROL, mrView, mrMgr ); - mpSidebarTextControl->SetPointer(Pointer(PointerStyle::Text)); + mpSidebarTextControl->SetPointer(PointerStyle::Text); // window controls for author and date mpMetadataAuthor = VclPtr<Edit>::Create( this, 0 ); diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index 494d0ad575cb..9d947f235f38 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -35,6 +35,7 @@ #include <vcl/help.hxx> #include <vcl/graph.hxx> #include <vcl/weld.hxx> +#include <vcl/ptrstyle.hxx> #include <sot/storage.hxx> #include <svl/macitem.hxx> #include <unotools/securityoptions.hxx> @@ -3536,7 +3537,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt) // don't start a selection when an // URL field or a graphic is clicked bool bSttSelect = rSh.HasSelection() || - Pointer(PointerStyle::RefHand) != GetPointer(); + PointerStyle::RefHand != GetPointer(); if( !bSttSelect ) { diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx index 1564e969b1a2..d15b9314cba8 100644 --- a/sw/source/uibase/docvw/srcedtw.cxx +++ b/sw/source/uibase/docvw/srcedtw.cxx @@ -31,6 +31,7 @@ #include <vcl/textview.hxx> #include <svx/svxids.hrc> #include <vcl/scrbar.hxx> +#include <vcl/ptrstyle.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/app.hxx> #include <svtools/htmltokn.h> @@ -493,7 +494,7 @@ void SwSrcEditWindow::CreateTextEngine() const Color &rCol = GetSettings().GetStyleSettings().GetWindowColor(); m_pOutWin = VclPtr<TextViewOutWin>::Create(this, 0); m_pOutWin->SetBackground(Wallpaper(rCol)); - m_pOutWin->SetPointer(Pointer(PointerStyle::Text)); + m_pOutWin->SetPointer(PointerStyle::Text); m_pOutWin->Show(); // create Scrollbars 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 diff --git a/sw/source/uibase/uiview/viewdraw.cxx b/sw/source/uibase/uiview/viewdraw.cxx index ca7884c5cf2b..00b722710caa 100644 --- a/sw/source/uibase/uiview/viewdraw.cxx +++ b/sw/source/uibase/uiview/viewdraw.cxx @@ -47,6 +47,7 @@ #include <svx/fmglob.hxx> #include <sfx2/dispatch.hxx> #include <svx/svdoutl.hxx> +#include <vcl/ptrstyle.hxx> #include <view.hxx> #include <wrtsh.hxx> @@ -423,7 +424,7 @@ void SwView::ExitDraw() GetViewFrame()->GetBindings().Invalidate(SID_INSERT_DRAW); } - GetEditWin().SetPointer(Pointer(PointerStyle::Text)); + GetEditWin().SetPointer(PointerStyle::Text); } } } diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 934072fd0cf9..18da3684b4e1 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -3295,13 +3295,13 @@ void SwXTextDocument::setClientZoom(int nTilePixelWidth_, int /*nTilePixelHeight } } -Pointer SwXTextDocument::getPointer() +PointerStyle SwXTextDocument::getPointer() { SolarMutexGuard aGuard; SwWrtShell* pWrtShell = pDocShell->GetWrtShell(); if (!pWrtShell) - return Pointer(); + return PointerStyle::Arrow; return pWrtShell->GetView().GetEditWin().GetPointer(); } |