diff options
author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2016-08-15 09:19:35 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-08-15 07:49:37 +0000 |
commit | 2b68e03348b3b4009e8bb2af7979de36bd3450c5 (patch) | |
tree | ea337632ae63bc8c19cdb1b72feedbce8302433a /sw | |
parent | 3093732c17d14b0e6eb67868c514448f13bc66d0 (diff) |
tdf#100782 have XPropertyList hold unique_ptr
Change-Id: I928f297e1be76b965898d83cb3dd2e79b23b7974
Reviewed-on: https://gerrit.libreoffice.org/28095
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/ui/config/optpage.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/frmdlg/column.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/misc/pgfnote.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/misc/pggrid.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 8eca7911e254..38b45687ccc6 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -1973,7 +1973,7 @@ void SwRedlineOptionsTabPage::Reset( const SfxItemSet* ) XColorListRef pColorLst = XColorList::GetStdColorList(); for( long i = 0; i < pColorLst->Count(); ++i ) { - XColorEntry* pEntry = pColorLst->GetColor( i ); + const XColorEntry* pEntry = pColorLst->GetColor(i); Color aColor = pEntry->GetColor(); const OUString sName = pEntry->GetName(); diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 534e1c1d4783..7ec636d63c1a 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -542,7 +542,7 @@ SwColumnPage::SwColumnPage(vcl::Window *pParent, const SfxItemSet &rSet) for (long i = 0; i < pColorList->Count(); ++i ) { - XColorEntry* pEntry = pColorList->GetColor(i); + const XColorEntry* pEntry = pColorList->GetColor(i); m_pLineColorDLB->InsertEntry( pEntry->GetColor(), pEntry->GetName() ); } m_pLineColorDLB->SetUpdateMode( true ); diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index 88cd797ffd7f..efa2aaf63b60 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -231,7 +231,7 @@ void SwFootNotePage::Reset(const SfxItemSet *rSet) for ( long i = 0; i < pColorList->Count(); ++i ) { - XColorEntry* pEntry = pColorList->GetColor(i); + const XColorEntry* pEntry = pColorList->GetColor(i); m_pLineColorBox->InsertEntry( pEntry->GetColor(), pEntry->GetName() ); } m_pLineColorBox->SetUpdateMode( true ); diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index 3614c8899bad..3854fa0400f0 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -113,7 +113,7 @@ SwTextGridPage::SwTextGridPage(vcl::Window *pParent, const SfxItemSet &rSet) : const long nCount = pColorLst->Count(); for( long i = 0; i < nCount; ++i ) { - XColorEntry* pEntry = pColorLst->GetColor( i ); + const XColorEntry* pEntry = pColorLst->GetColor(i); Color aColor = pEntry->GetColor(); OUString sName = pEntry->GetName(); m_pColorLB->InsertEntry( aColor, sName ); |