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 /sfx2/source/doc | |
| 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 'sfx2/source/doc')
| -rw-r--r-- | sfx2/source/doc/objcont.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index cd5c294546ea..937a5e04ba46 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -296,9 +296,9 @@ SfxDocumentInfoDialog* SfxObjectShell::CreateDocumentInfoDialog -std::vector<Color> SfxObjectShell::GetDocColors() +std::set<Color> SfxObjectShell::GetDocColors() { - std::vector<Color> empty; + std::set<Color> empty; return empty; } |