diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-10-14 16:57:17 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-10-14 17:01:31 +0200 |
commit | 73b44845c6794aaea198aebaeb2098f96b7ffb9a (patch) | |
tree | f73825dd970abe9e41558b29548a92c9f2f57d14 | |
parent | e5486c46ae5221bce4f4a7bf005044883de45997 (diff) |
Make -1 a valid value of enum MSO_SPT
...as e.g. CppunitTest_sw_filters_test under -fsanitize=undefined complains
> svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx:304:13: runtime error: load of value 4294967295, which is not a valid value for type 'const MSO_SPT'
> EnhancedCustomShapeTypeNames::Get(MSO_SPT) svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx:304:5
> SdrObjCustomShape::MergeDefaultAttributes(rtl::OUString const*) svx/source/svdraw/svdoashp.cxx:873:26
> SvxCustomShape::createCustomShapeDefaults(rtl::OUString const&) svx/source/unodraw/unoshap2.cxx:1933:26
> non-virtual thunk to SvxCustomShape::createCustomShapeDefaults(rtl::OUString const&) svx/source/unodraw/unoshap2.cxx:1934:1
> oox::vml::CustomShape::implConvertAndInsert(com::sun::star::uno::Reference<com::sun::star::drawing::XShapes> const&, com::sun::star::awt::Rectangle const&) const oox/source/vml/vmlshape.cxx:976:9
> oox::vml::ComplexShape::implConvertAndInsert(com::sun::star::uno::Reference<com::sun::star::drawing::XShapes> const&, com::sun::star::awt::Rectangle const&) const oox/source/vml/vmlshape.cxx:1073:12
> oox::vml::ShapeBase::convertAndInsert(com::sun::star::uno::Reference<com::sun::star::drawing::XShapes> const&, oox::vml::ShapeParentAnchor const*) const oox/source/vml/vmlshape.cxx:307:22
> oox::shape::ShapeContextHandler::getShape() oox/source/shape/ShapeContextHandler.cxx:432:27
> non-virtual thunk to oox::shape::ShapeContextHandler::getShape() oox/source/shape/ShapeContextHandler.cxx:545:1
> writerfilter::ooxml::OOXMLFastContextHandlerShape::sendShape(int) writerfilter/source/ooxml/OOXMLFastContextHandler.cxx:1742:48
> writerfilter::ooxml::OOXMLFastContextHandlerShape::lcl_endFastElement(int) writerfilter/source/ooxml/OOXMLFastContextHandler.cxx:1769:9
> writerfilter::ooxml::OOXMLFastContextHandler::endFastElement(int) writerfilter/source/ooxml/OOXMLFastContextHandler.cxx:249:9
> non-virtual thunk to writerfilter::ooxml::OOXMLFastContextHandler::endFastElement(int) writerfilter/source/ooxml/OOXMLFastContextHandler.cxx:250:1
> (anonymous namespace)::Entity::endElement() sax/source/fastparser/fastparser.cxx:484:13
> sax_fastparser::FastSaxParserImpl::callbackEndElement(char const*) sax/source/fastparser/fastparser.cxx:1216:9
> (anonymous namespace)::call_callbackEndElement(void*, char const*) sax/source/fastparser/fastparser.cxx:295:5
> doContent (instdir/program/libexpwraplo.so+0x369381)
> contentProcessor (instdir/program/libexpwraplo.so+0x34d9ee)
> doProlog (instdir/program/libexpwraplo.so+0x330991)
> prologProcessor (instdir/program/libexpwraplo.so+0x32a1f6)
> prologInitProcessor (instdir/program/libexpwraplo.so+0x38d185)
> XML_ParseBuffer (instdir/program/libexpwraplo.so+0x31359b)
> XML_Parse (instdir/program/libexpwraplo.so+0x30f34e)
> sax_fastparser::FastSaxParserImpl::parse() sax/source/fastparser/fastparser.cxx:1058:52
> sax_fastparser::FastSaxParserImpl::parseStream(com::sun::star::xml::sax::InputSource const&) sax/source/fastparser/fastparser.cxx:852:13
> sax_fastparser::FastSaxParser::parseStream(com::sun::star::xml::sax::InputSource const&) sax/source/fastparser/fastparser.cxx:1339:5
> non-virtual thunk to sax_fastparser::FastSaxParser::parseStream(com::sun::star::xml::sax::InputSource const&) sax/source/fastparser/fastparser.cxx:1340:1
> writerfilter::ooxml::OOXMLDocumentImpl::resolve(writerfilter::Stream&) writerfilter/source/ooxml/OOXMLDocumentImpl.cxx:500:13
> WriterFilter::filter(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) writerfilter/source/filter/ImportFilter.cxx:107:9
> non-virtual thunk to WriterFilter::filter(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) writerfilter/source/filter/ImportFilter.cxx:173:1
> SfxObjectShell::ImportFrom(SfxMedium&, com::sun::star::uno::Reference<com::sun::star::text::XTextRange> const&) sfx2/source/doc/objstor.cxx:2271:21
> SfxObjectShell::DoLoad(SfxMedium*) sfx2/source/doc/objstor.cxx:767:23
> SwFiltersTest::filter(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, unsigned int, unsigned int, unsigned int, bool) sw/qa/core/filters-test.cxx:112:20
> SwFiltersTest::load(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, unsigned int, unsigned int, unsigned int) sw/qa/core/filters-test.cxx:71:12
> test::FiltersTest::recursiveScan(test::filterStatus, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, unsigned int, unsigned int, unsigned int, bool) unotest/source/cpp/filters-test.cxx:111:24
> test::FiltersTest::testDir(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, unsigned int, unsigned int, unsigned int, bool) unotest/source/cpp/filters-test.cxx:137:5
> SwFiltersTest::testCVEs() sw/qa/core/filters-test.cxx:162:5
Change-Id: I8249f962585def8c98327cce9939e2b96b648612
-rw-r--r-- | include/svx/msdffdef.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/svx/msdffdef.hxx b/include/svx/msdffdef.hxx index 7cdcf552d274..eeeec5a6936d 100644 --- a/include/svx/msdffdef.hxx +++ b/include/svx/msdffdef.hxx @@ -572,7 +572,7 @@ enum DFF_TextHeader { #define DFF_Prop_metroBlob 937 // XML ZipPackage* // linchpin: the shape type -enum MSO_SPT { +enum MSO_SPT: sal_Int32 { mso_sptMin = 0, mso_sptNotPrimitive = mso_sptMin, mso_sptRectangle = 1, |