sfx2/source/bastyp/fltfnc.cxx | 4 ++++ sfx2/source/inc/sfxtypes.hxx | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-)
New commits: commit 0a2b5bafcd81a7c1fa7ab286438b5e93288c1925 Author: Michael Stahl <[email protected]> Date: Thu Feb 28 19:42:43 2013 +0100 sfx2: restore weird SfxStack::nLevel that was... ... accidentally removed in 7cbeac07d21413443889e6ee777a428782e746ae. Not that i know what it's good for. Change-Id: I8f2963050434741503b39539fd9a1a339b56d60f diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index bc10231..acff8c2 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -110,6 +110,10 @@ using namespace ::com::sun::star::beans; #include <boost/ptr_container/ptr_vector.hpp> #include <functional> +#if defined(DBG_UTIL) && defined(WNT) +unsigned SfxStack::nLevel = 0; +#endif + namespace { class theSfxFilterListener : public rtl::Static<SfxFilterListener, theSfxFilterListener> {}; commit 2ad72a560af533ebf4d93e751b6bbe23812d0686 Author: Michael Stahl <[email protected]> Date: Thu Feb 28 19:34:52 2013 +0100 sfx2: remove GPF() macro, we manage to crash just fine without that Change-Id: Ia80c5affa0c12acee0a79b9e4665a2b13511e981 diff --git a/sfx2/source/inc/sfxtypes.hxx b/sfx2/source/inc/sfxtypes.hxx index 73429c8..aa573a0 100644 --- a/sfx2/source/inc/sfxtypes.hxx +++ b/sfx2/source/inc/sfxtypes.hxx @@ -125,8 +125,6 @@ struct StringList_Impl : private Resource }; -#define GPF() *(int*)0 = 0 - #endif // #ifndef _SFX_SFXTYPES_HXX _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
