sw/inc/docary.hxx | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit afa375d7f7b1094c96597bbc3793fbc9adb87d60
Author: Michael Stahl <mst...@redhat.com>
Date: Thu Mar 14 19:36:04 2013 +0100
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
(cherry picked from commit abccbae3d8376d7f8b79d517a758daeac08af003)
Reviewed-on: https://gerrit.libreoffice.org/3177
Reviewed-by: Fridrich Strba <fridr...@documentfoundation.org>
Tested-by: Fridrich Strba <fridr...@documentfoundation.org>
diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index 7212c06..3cf5d08 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -65,8 +65,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(); }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
