summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-05-04 17:07:59 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-05-08 09:06:42 +0200
commit137ec9e3185bc19884e8fc1a56151c8892b0c52e (patch)
treec0027e2b41f594a32b2d1fa95d39de957ad3eef2 /include
parent18e2ee154ac3af88cb800a548dc24b87947ff937 (diff)
loplugin:useuniqueptr in FmGridListener
Change-Id: I774aaf10dd9701f40a098280b68557d8b8045b34 Reviewed-on: https://gerrit.libreoffice.org/53884 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
-rw-r--r--include/svx/gridctrl.hxx8
1 files changed, 3 insertions, 5 deletions
diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx
index 432a3a463134..f4782b91baa2 100644
--- a/include/svx/gridctrl.hxx
+++ b/include/svx/gridctrl.hxx
@@ -98,8 +98,6 @@ typedef tools::SvRef<DbGridRow> DbGridRowRef;
// DbGridControl
class DbGridColumn;
-typedef ::std::vector< DbGridColumn* > DbGridColumns;
-
class FmGridListener
{
@@ -233,7 +231,7 @@ private:
css::uno::Reference< css::util::XNumberFormatter > m_xFormatter;
css::uno::Reference< css::uno::XComponentContext > m_xContext;
- DbGridColumns m_aColumns; // Column description
+ std::vector< std::unique_ptr<DbGridColumn> > m_aColumns; // Column description
VclPtr<NavigationBar> m_aBar;
DbGridRowRef m_xDataRow; // Row which can be modified
// comes from the data cursor
@@ -328,7 +326,7 @@ protected:
virtual sal_uInt16 AppendColumn(const OUString& rName, sal_uInt16 nWidth, sal_uInt16 nPos = HEADERBAR_APPEND, sal_uInt16 nId = sal_uInt16(-1)) override;
void RemoveColumn(sal_uInt16 nId);
- DbGridColumn* CreateColumn(sal_uInt16 nId) const;
+ std::unique_ptr<DbGridColumn> CreateColumn(sal_uInt16 nId) const;
virtual void ColumnMoved(sal_uInt16 nId) override;
virtual bool SaveRow() override;
virtual bool IsTabAllowed(bool bForward) const override;
@@ -403,7 +401,7 @@ public:
virtual void Dispatch(sal_uInt16 nId) override;
CursorWrapper* getDataSource() const {return m_pDataCursor.get();}
- const DbGridColumns& GetColumns() const {return m_aColumns;}
+ const std::vector< std::unique_ptr<DbGridColumn> >& GetColumns() const {return m_aColumns;}
void EnableHandle(bool bEnable);
bool HasHandle() const {return m_bHandle;}