diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2016-10-05 10:52:23 +0900 |
|---|---|---|
| committer | Takeshi Abe <tabe@fixedpoint.jp> | 2016-10-06 05:51:23 +0000 |
| commit | f32b300c9e071c2bdee2a7b925200feb93add702 (patch) | |
| tree | 1e9098a9aa4b8d2aef8fd0ed4b744723fb666a67 | |
| parent | f933da55797566cf725e35ab0df17e91c7d5598f (diff) | |
tdf#75757 Remove inheritance from std::vector
Change-Id: I87572c545559ef22d4f74fb63218910681c1a7d7
Reviewed-on: https://gerrit.libreoffice.org/29533
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Takeshi Abe <tabe@fixedpoint.jp>
| -rw-r--r-- | sw/inc/doc.hxx | 3 | ||||
| -rw-r--r-- | sw/inc/fmtcol.hxx | 2 | ||||
| -rw-r--r-- | sw/inc/rubylist.hxx | 5 |
3 files changed, 3 insertions, 7 deletions
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index bc53c5e05c14..4d881ad1547b 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -110,7 +110,6 @@ class SwNumRule; class SwNumRuleTable; class SwPagePreviewPrtData; class SwRootFrame; -class SwRubyList; class SwRubyListEntry; class SwSectionFormat; class SwSectionFormats; @@ -228,6 +227,8 @@ void SetAllScriptItem( SfxItemSet& rSet, const SfxPoolItem& rItem ); // global function to start grammar checking in the document void StartGrammarChecking( SwDoc &rDoc ); +using SwRubyList = std::vector<std::unique_ptr<SwRubyListEntry>>; + // Represents the model of a Writer document. class SW_DLLPUBLIC SwDoc : public IInterface diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx index 5c2045bad2c3..78688f02e528 100644 --- a/sw/inc/fmtcol.hxx +++ b/sw/inc/fmtcol.hxx @@ -207,7 +207,7 @@ public: void RegisterToFormat( SwFormat& ); }; -class SwFormatCollConditions : public std::vector<std::unique_ptr<SwCollCondition>> {}; +using SwFormatCollConditions = std::vector<std::unique_ptr<SwCollCondition>>; class SW_DLLPUBLIC SwConditionTextFormatColl : public SwTextFormatColl { diff --git a/sw/inc/rubylist.hxx b/sw/inc/rubylist.hxx index 680379f3d2e3..bcb7447276a3 100644 --- a/sw/inc/rubylist.hxx +++ b/sw/inc/rubylist.hxx @@ -22,9 +22,6 @@ #include <swtypes.hxx> #include <fmtruby.hxx> -#include <memory> -#include <vector> - class SwRubyListEntry { OUString m_sText; @@ -41,8 +38,6 @@ public: void SetRubyAttr( const SwFormatRuby& rAttr ) { m_aRubyAttr = rAttr; } }; -class SwRubyList : public std::vector<std::unique_ptr<SwRubyListEntry>> {}; - #endif //_ INCLUDED_SW_INC_RUBYLIST_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |