summaryrefslogtreecommitdiffstats
path: root/include/xmloff/prstylei.hxx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-08-23 13:55:35 +0200
committerNoel Grandin <noel@peralex.com>2016-08-23 13:56:19 +0200
commit49bbea41a2371bb9fb5a585a2efec61bd82a92c5 (patch)
treed6df252dbd2629780cd90415fdde26ad0f93f3e6 /include/xmloff/prstylei.hxx
parentadd CHOOSE test case (diff)
downloadcore-49bbea41a2371bb9fb5a585a2efec61bd82a92c5.tar.gz
core-49bbea41a2371bb9fb5a585a2efec61bd82a92c5.zip
use rtl::Static for static std::ordered_set in XMLPropStyleContext
we suspect the current situation of causing a crash on shutdown after the tokenmap unit test: (gdb) bt 20 __gnu_cxx::new_allocator<std::__detail::_Hash_node_base*>::deallocate (this=0x7fffffff52c7, __p=0x78a700) at /opt/rh/devtoolset-2/root/usr/include/c++/4.8.2/ext/new_allocator.h:110 std::allocator<rtl::OUString>, std::__detail::_Identity, std::equal_to<rtl::OUString>, rtl::OUStringHash, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits<true, true, true> >::_M_deallocate_buckets ( this=0x2aaab3166640 <XMLPropStyleContext::maParaSet>, __p=0x78a700, __n=11) at /opt/rh/devtoolset-2/root/usr/include/c++/4.8.2/bits/hashtable.h:794 std::allocator<rtl::OUString>, std::__detail::_Identity, std::equal_to<rtl::OUString>, rtl::OUStringHash, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits<true, true, true> >::~_Hashtable ( this=0x2aaab3166640 <XMLPropStyleContext::maParaSet>, __in_chrg=<optimized out>) at /opt/rh/devtoolset-2/root/usr/include/c++/4.8.2/bits/hashtable.h:959 rtl::OUStringHash, std::equal_to<rtl::OUString>, std::allocator<rtl::OUString> >::~unordered_set ( this=0x2aaab3166640 <XMLPropStyleContext::maParaSet>, __in_chrg=<optimized out>) at /opt/rh/devtoolset-2/root/usr/include/c++/4.8.2/bits/unordered_set.h:93 rtl::OUStringHash, std::equal_to<rtl::OUString>, std::allocator<rtl::OUString> >::~unordered_set ( this=0x2aaab3166640 <XMLPropStyleContext::maParaSet>, __in_chrg=<optimized out>) at /opt/rh/devtoolset-2/root/usr/include/c++/4.8.2/debug/unordered_set:113 Change-Id: Iff36d4f217b8bb07083d2e599afade1f86206165
Diffstat (limited to 'include/xmloff/prstylei.hxx')
-rw-r--r--include/xmloff/prstylei.hxx6
1 files changed, 0 insertions, 6 deletions
diff --git a/include/xmloff/prstylei.hxx b/include/xmloff/prstylei.hxx
index da5278ce3102..081ba36bc87d 100644
--- a/include/xmloff/prstylei.hxx
+++ b/include/xmloff/prstylei.hxx
@@ -48,12 +48,6 @@ private:
css::uno::Reference < css::style::XStyle > mxStyle;
SvXMLImportContextRef mxStyles;
- //UUUU
- static OldFillStyleDefinitionSet maStandardSet;
- static OldFillStyleDefinitionSet maHeaderSet;
- static OldFillStyleDefinitionSet maFooterSet;
- static OldFillStyleDefinitionSet maParaSet;
-
XMLPropStyleContext(XMLPropStyleContext &) = delete;
void operator =(XMLPropStyleContext &) = delete;