Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3177

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/77/3177/1

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)
---
M sw/inc/docary.hxx
1 file changed, 4 insertions(+), 1 deletion(-)



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 @@
     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(); }

-- 
To view, visit https://gerrit.libreoffice.org/3177
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibf2aa521c7561d3973c8293aacdf71353e6d65aa
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Fridrich Strba <fridrich@documentfoundation.org>
Gerrit-Reviewer: Michael Stahl <mstahl@redhat.com>


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.