include/oox/drawingml/shape.hxx | 2 +-
oox/source/drawingml/diagram/diagram.cxx | 4 ++--
oox/source/drawingml/shape.cxx | 4 ++--
oox/source/export/vmlexport.cxx | 2 +-
oox/source/shape/ShapeContextHandler.cxx | 4 ++--
sc/qa/unit/subsequent_filters-test.cxx | 7 -------
sc/source/filter/oox/sheetdatabuffer.cxx | 2 +-
sc/source/filter/xcl97/xcl97rec.cxx | 1 +
8 files changed, 10 insertions(+), 16 deletions(-)
New commits:
commit 291c3ae79c45bc470f8a903a2541b10e9784fac5
Author: Markus Mohrhard <markus.mohrh...@collabora.co.uk>
Date: Thu Mar 6 11:22:47 2014 +0100
fix OOXML strict import
fix the problem introduced by 6536826f2f4c747582d60ed40b0418c6a67a9829
Change-Id: I6c499f8490d92badda0f086d48c2347fa112bb4e
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index 7f3ba65..911298f 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -178,7 +178,7 @@ public:
const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> &
getDiagramDoms() { return maDiagramDoms; }
void setDiagramDoms(const
com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>&
rDiagramDoms) { maDiagramDoms = rDiagramDoms; }
- com::sun::star::uno::Sequence< com::sun::star::uno::Sequence<
com::sun::star::uno::Any > >resolveRelationshipsOfType(
+ com::sun::star::uno::Sequence< com::sun::star::uno::Sequence<
com::sun::star::uno::Any > >resolveRelationshipsOfTypeFromOfficeDoc(
core::XmlFilterBase& rFilter, OUString sFragment, OUString sType );
protected:
diff --git a/oox/source/drawingml/diagram/diagram.cxx
b/oox/source/drawingml/diagram/diagram.cxx
index 4672a28..70d938a 100644
--- a/oox/source/drawingml/diagram/diagram.cxx
+++ b/oox/source/drawingml/diagram/diagram.cxx
@@ -421,8 +421,8 @@ void loadDiagram( ShapePtr& pShape,
pDiagram,
xRefDataModel);
- pDiagram->getDataRelsMap() = pShape->resolveRelationshipsOfType(
rFilter, xRefDataModel->getFragmentPath(),
-
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"; );
+ pDiagram->getDataRelsMap() =
pShape->resolveRelationshipsOfTypeFromOfficeDoc( rFilter,
+ xRefDataModel->getFragmentPath(), "image" );
// Pass the info to pShape
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 3a2ebae..883d76f 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -1200,7 +1200,7 @@ void Shape::putPropertiesToGrabBag( const Sequence<
PropertyValue >& aProperties
}
}
-uno::Sequence< uno::Sequence< uno::Any > >
Shape::resolveRelationshipsOfType(core::XmlFilterBase& rFilter, OUString
sFragment, OUString sType )
+uno::Sequence< uno::Sequence< uno::Any > >
Shape::resolveRelationshipsOfTypeFromOfficeDoc(core::XmlFilterBase& rFilter,
OUString sFragment, OUString sType )
{
uno::Sequence< uno::Sequence< uno::Any > > xRelListTemp;
sal_Int32 counter = 0;
@@ -1208,7 +1208,7 @@ uno::Sequence< uno::Sequence< uno::Any > >
Shape::resolveRelationshipsOfType(co
core::RelationsRef xRels = rFilter.importRelations( sFragment );
if ( xRels )
{
- core::RelationsRef xImageRels = xRels->getRelationsFromType( sType );
+ core::RelationsRef xImageRels =
xRels->getRelationsFromTypeFromOfficeDoc( sType );
if ( xImageRels )
{
xRelListTemp.realloc( xImageRels->size() );
diff --git a/oox/source/shape/ShapeContextHandler.cxx
b/oox/source/shape/ShapeContextHandler.cxx
index dc20747..7e6a217 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -433,8 +433,8 @@ ShapeContextHandler::getShape() throw
(uno::RuntimeException, std::exception)
aValue.realloc(length+1);
diagramDrawing[0] = uno::makeAny(
mxFilterBase->importFragment( aFragmentPath ) );
- diagramDrawing[1] = uno::makeAny(
pShapePtr->resolveRelationshipsOfType( *mxFilterBase, aFragmentPath,
-
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"; )
);
+ diagramDrawing[1] = uno::makeAny(
pShapePtr->resolveRelationshipsOfTypeFromOfficeDoc(
+ *mxFilterBase, aFragmentPath, "image" ) );
beans::PropertyValue* pValue = aValue.getArray();
pValue[length].Name = "OOXDrawing";
commit b09957e616f569ebf56e2b09b04e64fee9e0e298
Author: Markus Mohrhard <markus.mohrh...@collabora.co.uk>
Date: Thu Mar 6 10:50:37 2014 +0100
coverity#1190367: uninitialized scalar variable
Change-Id: Iee8658ce33d7ba1f9a52778898fc42f15da853ad
diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx
b/sc/source/filter/oox/sheetdatabuffer.cxx
index b7db26d..7422e1a 100644
--- a/sc/source/filter/oox/sheetdatabuffer.cxx
+++ b/sc/source/filter/oox/sheetdatabuffer.cxx
@@ -229,7 +229,7 @@ void SheetDataBuffer::setDateCell( const CellModel& rModel,
const OUString& rDat
SvNumberFormatter* pFormatter = rDoc.GetFormatTable();
double fValue = 0.0;
- sal_uInt32 nFormatIndex;
+ sal_uInt32 nFormatIndex = 0;
bool bValid = pFormatter->IsNumberFormat( rDateString, nFormatIndex,
fValue );
if(bValid)
commit 804397dfb6cc1415bd4e94c3c7b1a5af469613d9
Author: Markus Mohrhard <markus.mohrh...@collabora.co.uk>
Date: Thu Mar 6 10:49:14 2014 +0100
fix OOXML validation error, related fdo#31064
Use the correct namespace for wrap.
Change-Id: I5620d3386fcaf54090fd58963404dde3f03c5bf8
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index f348439..de62d73 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -365,7 +365,7 @@ void VMLExport::Commit( EscherPropertyContainer& rProps,
const Rectangle& rRect
case ESCHER_WrapThrough: pWrapType = "through";
break;
}
if ( pWrapType )
- m_pSerializer->singleElementNS( XML_v, XML_wrap,
+ m_pSerializer->singleElementNS( XML_w10, XML_wrap,
FSNS( XML_v, XML_type ), pWrapType,
FSEND );
}
diff --git a/sc/source/filter/xcl97/xcl97rec.cxx
b/sc/source/filter/xcl97/xcl97rec.cxx
index d3a9b5b..19dd891 100644
--- a/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/sc/source/filter/xcl97/xcl97rec.cxx
@@ -256,6 +256,7 @@ static void SaveVmlObjects( XclExpObjList& rList,
XclExpXmlStream& rStrm, sal_In
FSNS( XML_xmlns, XML_v ), "urn:schemas-microsoft-com:vml",
FSNS( XML_xmlns, XML_o ),
"urn:schemas-microsoft-com:office:office",
FSNS( XML_xmlns, XML_x ),
"urn:schemas-microsoft-com:office:excel",
+ FSNS( XML_xmlns, XML_w10 ),
"urn:schemas-microsoft-com:office:word",
FSEND );
std::vector<XclObj*>::iterator pIter;
commit db2bb66d29ba841634acea57ddf5e476884e7744
Author: Markus Mohrhard <markus.mohrh...@collabora.co.uk>
Date: Wed Mar 5 19:26:55 2014 +0100
remove more places that reference the old crash testing
Change-Id: I49244bf4a84d0fbe1fa12aa5b70d9357f8ee05fb
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index 4a005df2..21ad019 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -62,8 +62,6 @@
#include <com/sun/star/chart2/XChartDocument.hpp>
#include <com/sun/star/chart2/data/XDataReceiver.hpp>
-#define TEST_BUG_FILES 0
-
#include "helper/qahelper.hxx"
#include "helper/shared_test_impl.hxx"
@@ -226,11 +224,6 @@ public:
CPPUNIT_TEST(testPasswordNew);
#endif
-#if TEST_BUG_FILES
- CPPUNIT_TEST(testBugFiles);
- CPPUNIT_TEST(testBugFilesXLS);
- CPPUNIT_TEST(testBugFilesXLSX);
-#endif
CPPUNIT_TEST(testMiscRowHeights);
CPPUNIT_TEST(testOptimalHeightReset);
CPPUNIT_TEST(testPrintRangeODS);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
