svl/inc/svl/style.hxx | 1 + svl/source/items/style.cxx | 4 ++++ 2 files changed, 5 insertions(+)
New commits: commit 2a3e2bb484d79f101f2c8a986142ac390aea85cc Author: Stephan Bergmann <sberg...@redhat.com> Date: Tue Feb 7 21:29:49 2012 +0100 Reintroduce MSVC workaround ...originally introduced with 02abccf953185f266979aafd946f5b96c5d59875 but erroneously purged with 9c2f7056a82c4d7719715ca1c77f8dd4c17aa24c. diff --git a/svl/inc/svl/style.hxx b/svl/inc/svl/style.hxx index ceb8050..e347d54 100644 --- a/svl/inc/svl/style.hxx +++ b/svl/inc/svl/style.hxx @@ -285,6 +285,7 @@ public: virtual sal_Bool SetParent( const UniString& ); protected: + SfxStyleSheet(); // do not use! needed by MSVC virtual ~SfxStyleSheet(); }; diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx index c3e11e1..c49d9ad 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.cxx @@ -884,6 +884,10 @@ SfxStyleSheet::SfxStyleSheet(const SfxStyleSheet& rStyle) : SfxBroadcaster( rStyle ) {} +SfxStyleSheet::SfxStyleSheet() +{ +} + SfxStyleSheet::~SfxStyleSheet() { Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_INDESTRUCTION, *this ) ); _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits