[Libreoffice-commits] core.git: 3 commits - configure.ac include/svx
Stephan Bergmann
sbergman at redhat.com
Tue Oct 14 08:01:59 PDT 2014
configure.ac | 5 ++++-
include/svx/msdffdef.hxx | 33 ++++++++++++++++-----------------
2 files changed, 20 insertions(+), 18 deletions(-)
New commits:
commit f57a697fac4e2c885bfaf5add1dfe05ede552cd5
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Oct 14 17:00:27 2014 +0200
Add clarification of --enable-chart-tests
...provided by moggi via private mail.
Change-Id: If163e1ce40053c3fe9a5f76ea0356bf5c073e55b
diff --git a/configure.ac b/configure.ac
index 2572e96..1a56cb8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1239,7 +1239,10 @@ AC_ARG_ENABLE(cve-tests,
AC_ARG_ENABLE(chart-tests,
AS_HELP_STRING([--enable-chart-tests],
- [Executes chart XShape tests]),
+ [Executes chart XShape tests. In a perfect world these tests would be
+ stable and everyone could run them, in reality it is best to run them
+ only on a few machines that are known to work and maintained by people
+ who can judge if a test failure is a regression or not.]),
,)
AC_ARG_ENABLE(build-unowinreg,
commit 73b44845c6794aaea198aebaeb2098f96b7ffb9a
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Oct 14 16:57:17 2014 +0200
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
diff --git a/include/svx/msdffdef.hxx b/include/svx/msdffdef.hxx
index 7cdcf55..eeeec5a 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,
commit e5486c46ae5221bce4f4a7bf005044883de45997
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Oct 14 15:39:01 2014 +0200
Resolve some unnecessary typedefs
Change-Id: If57e32d41fe03db402aad74d2bd3e4d03c5e0643
diff --git a/include/svx/msdffdef.hxx b/include/svx/msdffdef.hxx
index 420b247..7cdcf55 100644
--- a/include/svx/msdffdef.hxx
+++ b/include/svx/msdffdef.hxx
@@ -572,8 +572,7 @@ enum DFF_TextHeader {
#define DFF_Prop_metroBlob 937 // XML ZipPackage*
// linchpin: the shape type
-typedef enum
- {
+enum MSO_SPT {
mso_sptMin = 0,
mso_sptNotPrimitive = mso_sptMin,
mso_sptRectangle = 1,
@@ -782,7 +781,7 @@ typedef enum
mso_sptTearDrop = 203,
mso_sptMax = 0x0FFF,
mso_sptNil = mso_sptMax
- } MSO_SPT;
+};
// different enums from the OfficeDraw documentation, Appendix D - beginning
@@ -1070,7 +1069,7 @@ enum MSO_LineCap {
// BStore-Container
// FBSE - File Blip Store Entry
-typedef struct _MSOF_BSE {
+struct MSOF_BSE {
sal_uInt8 btWin32; // Required type on Win32
sal_uInt8 btMacOS; // Required type on Mac
sal_uInt8 rgbUid[16]; // Identifier of blip
@@ -1082,15 +1081,15 @@ typedef struct _MSOF_BSE {
sal_uInt8 cbName; // length of the blip name
sal_uInt8 unused2; // for the future
sal_uInt8 unused3; // for the future
-} MSO_FBSE;
+};
-typedef enum {
+enum MSO_BLIPUSAGE {
mso_blipUsageDefault, // All non-texture fill blips get this.
mso_blipUsageTexture,
mso_blipUsageMax = 255 // Since this is stored in a byte
-} MSO_BLIPUSAGE;
+};
-typedef enum { // GEL provided types...
+enum MSO_BLIPTYPE { // GEL provided types...
mso_blipERROR = 0, // An error occurred during loading
mso_blipUNKNOWN, // An unknown blip type
mso_blipEMF, // Windows Enhanced Metafile
@@ -1101,9 +1100,9 @@ typedef enum { // GEL provided types...
mso_blipDIB, // Windows DIB
mso_blipFirstClient = 32, // First client defined blip type
mso_blipLastClient = 255 // Last client defined blip type
-} MSO_BLIPTYPE;
+};
-typedef enum {
+enum MSO_BI {
mso_biUNKNOWN = 0,
mso_biWMF = 0x216, // Metafile header then compressed WMF
mso_biEMF = 0x3D4, // Metafile header then compressed EMF
@@ -1113,21 +1112,21 @@ typedef enum {
mso_biJPEG = mso_biJFIF,
mso_biDIB = 0x7A8, // One byte tag then DIB data
mso_biClient=0x800 // Clients should set this bit
-} MSO_BI; // Blip signature as encoded in the MSO_FBH.inst
+}; // Blip signature as encoded in the MSO_FBH.inst
-typedef enum {
+enum MSO_BLIPCOMPRESSION {
mso_compressionDeflate = 0,
mso_compressionNone = 254, // Used only if compression fails
mso_compressionTest = 255 // For testing only
-} MSO_BLIPCOMPRESSION;
+};
-typedef enum {
+enum MSO_BLIPFILTER {
mso_filterAdaptive = 0, // PNG type - not used/supported for metafile
mso_filterNone = 254,
mso_filterTest = 255 // For testing only
-} MSO_BLIPFILTER;
+};
-typedef enum {
+enum MSO_SYSCOLORINDEX {
mso_syscolorButtonFace, // COLOR_BTNFACE
mso_syscolorWindowText, // COLOR_WINDOWTEXT
mso_syscolorMenu, // COLOR_MENU
@@ -1177,7 +1176,7 @@ typedef enum {
mso_colorGray =0x8000, // Make the color gray (before the above!)
mso_colorBParamMask =0xFF0000,// Parameter used as above
mso_colorBParamShift = 16 // To extract the parameter value
-} MSO_SYSCOLORINDEX;
+};
//ALT_TXT_MSINTEROP
#define MSPROP_DESCRIPTION_MAX_LEN 4096
More information about the Libreoffice-commits
mailing list