summaryrefslogtreecommitdiff
path: root/include/svtools/brwbox.hxx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-04-24 12:10:32 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-04-30 08:38:43 +0200
commit6b2e5bce6e658a6e6c202ed801052da14b5f87be (patch)
treee7fcca57571e14ffb8a076e6586c62ca568164ae /include/svtools/brwbox.hxx
parentf15ea6fa71e66bfea373a01580e76c7d8b69d3cb (diff)
loplugin:useuniqueptr in BrowseBox
Change-Id: I079009f5e9f5e8c8d2666f79e2bfcefe662acf6a Reviewed-on: https://gerrit.libreoffice.org/53591 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/svtools/brwbox.hxx')
-rw-r--r--include/svtools/brwbox.hxx7
1 files changed, 3 insertions, 4 deletions
diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index 4bfad8d4633a..a4aa7a8ac5e0 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -39,7 +39,6 @@ class BrowserColumn;
class BrowserDataWin;
class MultiSelection;
class BrowserHeader;
-typedef ::std::vector< BrowserColumn* > BrowserColumns;
namespace svt {
class BrowseBoxImpl;
@@ -239,13 +238,13 @@ private:
TriState bHideCursor; // hide cursor (frame)
Range aSelRange; // for selection expansion
- BrowserColumns pCols; // array of column-descriptions
+ ::std::vector< std::unique_ptr<BrowserColumn> > mvCols; // array of column-descriptions
union
{
MultiSelection* pSel; // selected rows for multi-selection
long nSel; // selected row for single-selection
} uRow;
- MultiSelection* pColSel; // selected column-ids
+ std::unique_ptr<MultiSelection> pColSel; // selected column-ids
// fdo#83943, detect if making the cursor position visible is impossible to achieve
struct CursorMoveAttempt
@@ -487,7 +486,7 @@ public:
long FirstSelectedRow();
long LastSelectedRow();
long NextSelectedRow();
- const MultiSelection* GetColumnSelection() const { return pColSel; }
+ const MultiSelection* GetColumnSelection() const { return pColSel.get(); }
const MultiSelection* GetSelection() const
{ return bMultiSelection ? uRow.pSel : nullptr; }