diff options
| author | Ursache Vladimir <ursache@collabora.co.uk> | 2015-02-14 02:46:47 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2015-02-14 01:51:54 +0100 |
| commit | 50a36041e18dc2a595259b5414ded409687dc47b (patch) | |
| tree | 2f61edb3336449a6649eb5defbd0ca50d5c966b8 /sc/source/ui | |
| parent | 1e475fef47fe6bd9dba6d830aaf0b6c12dc88881 (diff) | |
related tdf#89004 move to std:set instead of std::vector
Conflicts:
sc/source/core/data/document10.cxx
sw/source/core/doc/docfmt.cxx
Change-Id: I1312f476607ea3a78b162a7e59323b0a142f6629
Diffstat (limited to 'sc/source/ui')
| -rw-r--r-- | sc/source/ui/docshell/docsh.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/inc/docsh.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 29b03c3c79bb..e7cb71a76164 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -205,7 +205,7 @@ void ScDocShell::FillClass( SvGlobalName* pClassName, } } -std::vector<Color> ScDocShell::GetDocColors() +std::set<Color> ScDocShell::GetDocColors() { return aDocument.GetDocColors(); } diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index f7c2f2865e28..03e867c2eca4 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -193,7 +193,7 @@ public: sal_Int32 nFileFormat, bool bTemplate = false ) const SAL_OVERRIDE; - virtual std::vector<Color> GetDocColors() SAL_OVERRIDE; + virtual std::set<Color> GetDocColors() SAL_OVERRIDE; virtual bool InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& ) SAL_OVERRIDE; virtual bool Load( SfxMedium& rMedium ) SAL_OVERRIDE; |