diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-02-04 10:50:44 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-02-04 12:55:21 +0100 |
| commit | 4d307299bc7aada87d13810f12b9868045d15743 (patch) | |
| tree | a9c5acf9ceaff1813f07d6cbf51134323157e1c8 /sw/source/filter | |
| parent | 02c5a61944a212ecc4573001a2fb853339448b03 (diff) | |
std::set<T*> -> o3tl::sorted_vector in sw/
Change-Id: I7b8e221b9e76f98efdbed9ee1c83e32379fde73f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87951
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/filter')
| -rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.hxx | 3 | ||||
| -rw-r--r-- | sw/source/filter/ww8/writerwordglue.cxx | 3 | ||||
| -rw-r--r-- | sw/source/filter/ww8/wrtww8.hxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par.hxx | 5 |
4 files changed, 8 insertions, 5 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx index 05761c426abe..894b24ba1a36 100644 --- a/sw/source/filter/ww8/docxattributeoutput.hxx +++ b/sw/source/filter/ww8/docxattributeoutput.hxx @@ -38,6 +38,7 @@ #include <vector> #include <o3tl/optional.hxx> +#include <o3tl/sorted_vector.hxx> #include <oox/export/vmlexport.hxx> #include <oox/export/drawingml.hxx> #include "docxtablestyleexport.hxx" @@ -847,7 +848,7 @@ private: bool m_bPageBreakAfter = false; std::vector<ww8::Frame> m_aFramesOfParagraph; - std::set<const SwFrameFormat*> m_aFloatingTablesOfParagraph; + o3tl::sorted_vector<const SwFrameFormat*> m_aFloatingTablesOfParagraph; sal_Int32 m_nTextFrameLevel; // close of hyperlink needed diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx index b1ff51aab134..05c146726603 100644 --- a/sw/source/filter/ww8/writerwordglue.cxx +++ b/sw/source/filter/ww8/writerwordglue.cxx @@ -37,6 +37,7 @@ #include <editeng/ulspitem.hxx> #include <editeng/boxitem.hxx> #include <editeng/fontitem.hxx> +#include <o3tl/sorted_vector.hxx> #include <frmfmt.hxx> #include <fmtclds.hxx> #include <hfspacingitem.hxx> @@ -239,7 +240,7 @@ namespace myImplHelpers { private: MapperImpl<C> maHelper; - std::set<const C*> maUsedStyles; + o3tl::sorted_vector<const C*> maUsedStyles; C* MakeNonCollidingStyle(const OUString& rName); public: typedef std::pair<C*, bool> StyleResult; diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index 248f3c238148..5dfd181f2135 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -1265,7 +1265,7 @@ class WW8_WrPlcAnnotations : public WW8_WrPlcSubDoc // double Plc for Postits private: WW8_WrPlcAnnotations(const WW8_WrPlcAnnotations&) = delete; WW8_WrPlcAnnotations& operator=(WW8_WrPlcAnnotations const &) = delete; - std::set<const SwRedlineData*> maProcessedRedlines; + o3tl::sorted_vector<const SwRedlineData*> maProcessedRedlines; std::map<const OUString, std::pair<WW8_CP, bool>> m_aRangeStartPositions; public: diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 4a0b06c553a6..e7d8384f8091 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -52,6 +52,7 @@ #include <ndtxt.hxx> #include <editeng/lrspitem.hxx> #include <o3tl/deleter.hxx> +#include <o3tl/sorted_vector.hxx> #include <oox/ole/olehelper.hxx> #define SW_UD_IMAPDATA 2 @@ -1223,8 +1224,8 @@ private: std::shared_ptr<WW8PLCFMan> m_xPlcxMan; std::map<short, OUString> m_aLinkStringMap; - std::set<const SwNode*> m_aTextNodesHavingFirstLineOfstSet; // #i103711# - std::set<const SwNode*> m_aTextNodesHavingLeftIndentSet; // #i105414# + o3tl::sorted_vector<const SwNode*> m_aTextNodesHavingFirstLineOfstSet; // #i103711# + o3tl::sorted_vector<const SwNode*> m_aTextNodesHavingLeftIndentSet; // #i105414# std::unique_ptr<WW8RStyle> m_xStyles; // pointer to the style reading class SwFormat* m_pCurrentColl; // collection to be created now |