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 /dbaccess | |
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 'dbaccess')
-rw-r--r-- | dbaccess/inc/pch/precompiled_dbaxml.hxx | 1 | ||||
-rw-r--r-- | dbaccess/inc/pch/precompiled_dbmm.hxx | 1 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/JoinTableView.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/querydesign/JoinTableView.cxx | 11 | ||||
-rw-r--r-- | dbaccess/source/ui/querydesign/TableWindow.cxx | 11 |
5 files changed, 13 insertions, 13 deletions
diff --git a/dbaccess/inc/pch/precompiled_dbaxml.hxx b/dbaccess/inc/pch/precompiled_dbaxml.hxx index f0442e7397d8..d72ac77b52dc 100644 --- a/dbaccess/inc/pch/precompiled_dbaxml.hxx +++ b/dbaccess/inc/pch/precompiled_dbaxml.hxx @@ -48,7 +48,6 @@ #include <vcl/inputtypes.hxx> #include <vcl/keycodes.hxx> #include <vcl/outdev.hxx> -#include <vcl/pointr.hxx> #include <vcl/region.hxx> #include <vcl/salnativewidgets.hxx> #include <vcl/svapp.hxx> diff --git a/dbaccess/inc/pch/precompiled_dbmm.hxx b/dbaccess/inc/pch/precompiled_dbmm.hxx index d8331303f9cb..dc580df57f57 100644 --- a/dbaccess/inc/pch/precompiled_dbmm.hxx +++ b/dbaccess/inc/pch/precompiled_dbmm.hxx @@ -120,7 +120,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/salnativewidgets.hxx> diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx index ecd2dcd69d18..caad1eaebf93 100644 --- a/dbaccess/source/ui/inc/JoinTableView.hxx +++ b/dbaccess/source/ui/inc/JoinTableView.hxx @@ -130,7 +130,7 @@ namespace dbaui void InvalidateConnections(); void BeginChildMove( OTableWindow* pTabWin, const Point& rMousePos ); - void BeginChildSizing( OTableWindow* pTabWin, const Pointer& rPointer ); + void BeginChildSizing( OTableWindow* pTabWin, PointerStyle nPointer ); void NotifyTitleClicked( OTableWindow* pTabWin, const Point& rMousePos ); diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index 942ddafa40bf..54f595e79d47 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -36,6 +36,7 @@ #include <vcl/settings.hxx> #include <vcl/commandevent.hxx> #include <vcl/event.hxx> +#include <vcl/ptrstyle.hxx> #include <TableWindowData.hxx> #include <JAccess.hxx> #include <com/sun/star/accessibility/XAccessible.hpp> @@ -612,7 +613,7 @@ void OJoinTableView::BeginChildMove( OTableWindow* pTabWin, const Point& rMouseP return; m_pDragWin = pTabWin; - SetPointer(Pointer(PointerStyle::Move)); + SetPointer(PointerStyle::Move); Point aMousePos = ScreenToOutputPixel( rMousePos ); m_aDragOffset = aMousePos - pTabWin->GetPosPixel(); m_pDragWin->SetZOrder(nullptr, ZOrderFlags::First); @@ -625,13 +626,13 @@ void OJoinTableView::NotifyTitleClicked( OTableWindow* pTabWin, const Point& rMo BeginChildMove(pTabWin, rMousePos); } -void OJoinTableView::BeginChildSizing( OTableWindow* pTabWin, const Pointer& rPointer ) +void OJoinTableView::BeginChildSizing( OTableWindow* pTabWin, PointerStyle nPointer ) { if (m_pView->getController().isReadOnly()) return; - SetPointer( rPointer ); + SetPointer( nPointer ); m_pSizingWin = pTabWin; StartTracking(); } @@ -757,12 +758,12 @@ void OJoinTableView::Tracking( const TrackingEvent& rTEvt ) m_pDragWin->GrabFocus(); } m_pDragWin = nullptr; - SetPointer(Pointer(PointerStyle::Arrow)); + SetPointer(PointerStyle::Arrow); } // else we handle the resizing else if( m_pSizingWin ) { - SetPointer( Pointer() ); + SetPointer( PointerStyle::Arrow ); EndTracking(); // old physical coordinates diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx index b43244dfa5d5..f4e132493b0c 100644 --- a/dbaccess/source/ui/querydesign/TableWindow.cxx +++ b/dbaccess/source/ui/querydesign/TableWindow.cxx @@ -30,6 +30,7 @@ #include <vcl/settings.hxx> #include <vcl/commandevent.hxx> #include <vcl/event.hxx> +#include <vcl/ptrstyle.hxx> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/container/XNameAccess.hpp> @@ -397,21 +398,21 @@ void OTableWindow::MouseMove( const MouseEvent& rEvt ) Point aPos = rEvt.GetPosPixel(); setSizingFlag(aPos); - Pointer aPointer; + PointerStyle aPointer = PointerStyle::Arrow; // Set the mouse cursor when it is in the sizing area if ( m_nSizingFlags == SizingFlags::Top || m_nSizingFlags == SizingFlags::Bottom ) - aPointer = Pointer( PointerStyle::SSize ); + aPointer = PointerStyle::SSize; else if ( m_nSizingFlags == SizingFlags::Left || m_nSizingFlags ==SizingFlags::Right ) - aPointer = Pointer( PointerStyle::ESize ); + aPointer = PointerStyle::ESize; else if ( m_nSizingFlags == (SizingFlags::Left | SizingFlags::Top) || m_nSizingFlags == (SizingFlags::Right | SizingFlags::Bottom) ) - aPointer = Pointer( PointerStyle::SESize ); + aPointer = PointerStyle::SESize; else if ( m_nSizingFlags == (SizingFlags::Right | SizingFlags::Top) || m_nSizingFlags == (SizingFlags::Left | SizingFlags::Bottom) ) - aPointer = Pointer( PointerStyle::NESize ); + aPointer = PointerStyle::NESize; SetPointer( aPointer ); } |