diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2019-12-03 17:35:34 +0000 |
|---|---|---|
| committer | Dennis Francis <dennisfrancis.in@gmail.com> | 2020-05-26 23:17:26 +0530 |
| commit | 1c78eb2e33e6218b22470096eff9fee3a3159162 (patch) | |
| tree | d71a767ab6f0cdc0fefd3e5684aba79c3b5d4181 /sc/source/ui/inc | |
| parent | 970e1d0beb129c493644c34aee30cb82aa50e80b (diff) | |
lok: calc - send other views our selection in their co-ordinates.
Change-Id: If48b5adb9b8b03310d2d2c4e4fefab84ad8bb149
Reviewed-on: https://gerrit.libreoffice.org/84370
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
(cherry picked from commit ab07df7ee12aef8bb3770e69d22ecb272d379ece)
Diffstat (limited to 'sc/source/ui/inc')
| -rw-r--r-- | sc/source/ui/inc/gridwin.hxx | 7 | ||||
| -rw-r--r-- | sc/source/ui/inc/tabview.hxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/inc/viewdata.hxx | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index c56eca68895c..7a361fc9dc41 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -286,8 +286,11 @@ class SAL_DLLPUBLIC_RTTI ScGridWindow : public vcl::Window, public DropTargetHel void SelectForContextMenu( const Point& rPosPixel, SCCOL nCellX, SCROW nCellY ); - void GetSelectionRects( ::std::vector< tools::Rectangle >& rPixelRects ); - + void GetSelectionRects( ::std::vector< tools::Rectangle >& rPixelRects ) const; + void GetPixelRectsFor( const ScMarkData &rMarkData, + ::std::vector< tools::Rectangle >& rPixelRects ) const; + void UpdateKitSelection(const std::vector<tools::Rectangle>& rRectangles, + std::vector<tools::Rectangle>* pLogicRects = nullptr); protected: virtual void PrePaint(vcl::RenderContext& rRenderContext) override; diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx index b4af1dd213b1..0ee1cfd48819 100644 --- a/sc/source/ui/inc/tabview.hxx +++ b/sc/source/ui/inc/tabview.hxx @@ -376,7 +376,7 @@ public: void FakeButtonUp( ScSplitPos eWhich ); ScGridWindow* GetActiveWin(); - vcl::Window* GetWindowByPos( ScSplitPos ePos ) { return pGridWin[ePos]; } + vcl::Window* GetWindowByPos( ScSplitPos ePos ) const { return pGridWin[ePos]; } ScSplitPos FindWindow( const vcl::Window* pWindow ) const; diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx index 1dc31b11fe71..e5833dec5d32 100644 --- a/sc/source/ui/inc/viewdata.hxx +++ b/sc/source/ui/inc/viewdata.hxx @@ -606,7 +606,7 @@ public: /// return json for our cursor position. OString describeCellCursor() const { return describeCellCursorAt(GetCurX(), GetCurY()); } - OString describeCellCursorAt(SCCOL nCol, SCROW nRow) const; + OString describeCellCursorAt( SCCOL nCol, SCROW nRow ) const; SCCOL CellsAtX( SCCOL nPosX, SCCOL nDir, ScHSplitPos eWhichX, sal_uInt16 nScrSizeY = SC_SIZE_NONE ) const; SCROW CellsAtY( SCROW nPosY, SCROW nDir, ScVSplitPos eWhichY, sal_uInt16 nScrSizeX = SC_SIZE_NONE ) const; |