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 /sw/inc | |
| 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 'sw/inc')
| -rw-r--r-- | sw/inc/doc.hxx | 2 | ||||
| -rw-r--r-- | sw/inc/docsh.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 1fe0fd95dd2c..e030ff9ad36e 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -1668,7 +1668,7 @@ public: */ void dumpAsXml( xmlTextWriterPtr writer = NULL ) const; - std::vector<Color> GetDocColors(); + std::set<Color> GetDocColors(); private: // Copies master header to left / first one, if necessary - used by ChgPageDesc(). diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index 780883b3b6ad..9b917728bc53 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -249,7 +249,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 void LoadStyles( SfxObjectShell& rSource ) SAL_OVERRIDE; |