diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-03-14 19:36:04 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-03-14 19:37:23 +0100 |
| commit | abccbae3d8376d7f8b79d517a758daeac08af003 (patch) | |
| tree | 4fea5dfeabb26c6ec1e23cd824520cdaa1e9e1fc | |
| parent | 07e24bdca5ab941368e3e9facb94ac1b80690ace (diff) | |
SwFrmFmts: MSVC does stupid things with dllexporting templates
... so work around that. Was triggered by new use of
std::vector<SwFrmFmt*> in 1c22545edf9085b9f2656ca92781158b6b123db3
Change-Id: Ibf2aa521c7561d3973c8293aacdf71353e6d65aa
| -rw-r--r-- | sw/inc/docary.hxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx index 3ce50c0b4275..6b9636ee27fd 100644 --- a/sw/inc/docary.hxx +++ b/sw/inc/docary.hxx @@ -66,8 +66,11 @@ public: virtual ~SwGrfFmtColls() {} }; +/// stupid base class to work around MSVC dllexport mess +class SAL_DLLPUBLIC_TEMPLATE SwFrmFmts_Base : public std::vector<SwFrmFmt*> {}; + /// Specific frame formats (frames, DrawObjects). -class SW_DLLPUBLIC SwFrmFmts : public std::vector<SwFrmFmt*>, public SwFmtsBase +class SW_DLLPUBLIC SwFrmFmts : public SwFrmFmts_Base, public SwFmtsBase { public: virtual size_t GetFmtCount() const { return size(); } |