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 /sc | |
| 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 'sc')
| -rw-r--r-- | sc/source/ui/condformat/colorformat.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/condformat/condformatdlgentry.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/dbgui/scendlg.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/optdlg/opredlin.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/optdlg/tpview.cxx | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/sc/source/ui/condformat/colorformat.cxx b/sc/source/ui/condformat/colorformat.cxx index f6e3cce92ffc..9a455b4bb122 100644 --- a/sc/source/ui/condformat/colorformat.cxx +++ b/sc/source/ui/condformat/colorformat.cxx @@ -180,7 +180,7 @@ void ScDataBarSettingsDlg::Init() for ( long i = 0; i < pColorTable->Count(); ++i ) { - XColorEntry* pEntry = pColorTable->GetColor(i); + const XColorEntry* pEntry = pColorTable->GetColor(i); mpLbPos->InsertEntry( pEntry->GetColor(), pEntry->GetName() ); mpLbNeg->InsertEntry( pEntry->GetColor(), pEntry->GetName() ); mpLbAxisCol->InsertEntry( pEntry->GetColor(), pEntry->GetName() ); diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index 3e3d7f18215f..9cb3e1436f8c 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -810,7 +810,7 @@ void ScColorScale2FrmtEntry::Init() for ( long i = 0; i < pColorTable->Count(); ++i ) { - XColorEntry* pEntry = pColorTable->GetColor(i); + const XColorEntry* pEntry = pColorTable->GetColor(i); maLbColMin->InsertEntry( pEntry->GetColor(), pEntry->GetName() ); maLbColMax->InsertEntry( pEntry->GetColor(), pEntry->GetName() ); @@ -991,7 +991,7 @@ void ScColorScale3FrmtEntry::Init() for ( long i = 0; i < pColorTable->Count(); ++i ) { - XColorEntry* pEntry = pColorTable->GetColor(i); + const XColorEntry* pEntry = pColorTable->GetColor(i); maLbColMin->InsertEntry( pEntry->GetColor(), pEntry->GetName() ); maLbColMiddle->InsertEntry( pEntry->GetColor(), pEntry->GetName() ); maLbColMax->InsertEntry( pEntry->GetColor(), pEntry->GetName() ); diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx index 5cefb49045a1..e775aa9e5ffa 100644 --- a/sc/source/ui/dbgui/scendlg.cxx +++ b/sc/source/ui/dbgui/scendlg.cxx @@ -71,7 +71,7 @@ ScNewScenarioDlg::ScNewScenarioDlg( vcl::Window* pParent, const OUString& rName, long nCount = pColorList->Count(); for ( long n=0; n<nCount; n++ ) { - XColorEntry* pEntry = pColorList->GetColor(n); + const XColorEntry* pEntry = pColorList->GetColor(n); m_pLbColor->InsertEntry( pEntry->GetColor(), pEntry->GetName() ); } m_pLbColor->SetUpdateMode( true ); diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx index 5322adf821b5..f8fb21682a47 100644 --- a/sc/source/ui/optdlg/opredlin.cxx +++ b/sc/source/ui/optdlg/opredlin.cxx @@ -146,7 +146,7 @@ void ScRedlineOptionsTabPage::Reset( const SfxItemSet* /* rSet */ ) XColorListRef xColorLst = XColorList::GetStdColorList(); for( long i = 0; i < xColorLst->Count(); ++i ) { - XColorEntry* pEntry = xColorLst->GetColor( i ); + const XColorEntry* pEntry = xColorLst->GetColor(i); Color aColor = pEntry->GetColor(); OUString sName = pEntry->GetName(); diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx index 99b4fe7e9f85..4b4aa46f6ba1 100644 --- a/sc/source/ui/optdlg/tpview.cxx +++ b/sc/source/ui/optdlg/tpview.cxx @@ -328,7 +328,7 @@ void ScTpContentOptions::InitGridOpt() long nCount = pColorList->Count(); for ( long n=0; n<nCount; n++ ) { - XColorEntry* pEntry = pColorList->GetColor(n); + const XColorEntry* pEntry = pColorList->GetColor(n); pColorLB->InsertEntry( pEntry->GetColor(), pEntry->GetName() ); } |