[Libreoffice-commits] core.git: 8 commits - basic/source editeng/source filter/source include/basic include/oox oox/source sc/source starmath/inc starmath/source sw/source vcl/source
Michael Stahl
mstahl at redhat.com
Fri Jan 15 04:07:17 PST 2016
basic/source/basmgr/basmgr.cxx | 15 ++++++++++-----
editeng/source/misc/svxacorr.cxx | 1 +
filter/source/svg/gfxtypes.hxx | 1 +
filter/source/svg/svgreader.cxx | 2 +-
include/basic/basmgr.hxx | 2 +-
include/oox/export/drawingml.hxx | 7 ++++---
include/oox/export/utils.hxx | 4 ++++
include/oox/mathml/export.hxx | 5 ++++-
oox/source/drawingml/shape.cxx | 2 +-
oox/source/export/shapes.cxx | 4 ++--
sc/source/filter/excel/xeescher.cxx | 4 ++--
sc/source/filter/xcl97/xcl97rec.cxx | 2 +-
starmath/inc/document.hxx | 5 ++++-
starmath/inc/unomodel.hxx | 4 +++-
starmath/source/document.cxx | 7 +++++--
starmath/source/ooxmlexport.cxx | 6 ++++--
starmath/source/ooxmlexport.hxx | 6 +++++-
starmath/source/unomodel.cxx | 7 +++++--
sw/source/filter/ww8/docxattributeoutput.cxx | 3 ++-
sw/source/filter/ww8/docxexport.cxx | 6 +++---
vcl/source/window/winproc.cxx | 9 +--------
21 files changed, 64 insertions(+), 38 deletions(-)
New commits:
commit 228bccb7bc7d7500fb630885d7fc7cb22ae43507
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Jan 15 12:31:03 2016 +0100
editeng: coverity#1348472 unused value AddNonBrkSpace
Let's hope that shuts up coverity?
Change-Id: I81f56ce9120c1d9328d5f04b1d1869c01402eca1
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 8461634..cbebcf4 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1417,6 +1417,7 @@ void SvxAutoCorrect::DoAutoCorrect( SvxAutoCorrDoc& rDoc, const OUString& rTxt,
}
} while( false );
+ SAL_INFO_IF(nRet != 0, "editeng", "DoAutoCorrect: did " << nRet);
}
SvxAutoCorrectLanguageLists& SvxAutoCorrect::_GetLanguageList(
commit c1c0c0c360a77010809d0f7a5e677d3d2150ce1a
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Jan 15 12:22:59 2016 +0100
filter: coverity#1348471 uninitialized member
Change-Id: I2ea96fa368d7b5d326706c2575168e67e71903ce
diff --git a/filter/source/svg/gfxtypes.hxx b/filter/source/svg/gfxtypes.hxx
index e8041f5..6de5e9e 100644
--- a/filter/source/svg/gfxtypes.hxx
+++ b/filter/source/svg/gfxtypes.hxx
@@ -155,6 +155,7 @@ struct State
mbIsText(false),
maFontFamily(), // app-default
mnFontSize(12),
+ mnParentFontSize(12),
maFontStyle("normal"),
maFontVariant("normal"),
mnFontWeight(400.0),
commit 1cced813374252f40f49695f07e719fd6b74bb15
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Jan 15 12:01:38 2016 +0100
vcl: coverity#1348469 identical branches
Change-Id: I49fb0826e5118d139fb2b86c60b74ef15a4b2cda
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index e61ea10..f8f1831 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -1972,14 +1972,7 @@ static void ImplHandleUserEvent( ImplSVEvent* pSVEvent )
{
if ( pSVEvent->mbCall && !pSVEvent->maDelData.IsDead() )
{
- if ( pSVEvent->mpWindow )
- {
- pSVEvent->maLink.Call( pSVEvent->mpData );
- }
- else
- {
- pSVEvent->maLink.Call( pSVEvent->mpData );
- }
+ pSVEvent->maLink.Call( pSVEvent->mpData );
}
delete pSVEvent;
commit 99ab23d26010120e7e6344cb2b26e192890ec5c3
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Jan 15 12:08:06 2016 +0100
oox: coverity#1348468 copy-paste error
Change-Id: Ibea6944c4e61e9848aac936e399ed08192ec5812
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 2dc84e9..b744bb1 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -518,7 +518,7 @@ Reference< XShape > Shape::createAndInsert(
const basegfx::B2DPoint& rPreviousPoint = aPoly.getB2DPoint(i - 1);
if (aPoint.getX() - rPreviousPoint.getX() == 0)
aPoint.setX(aPoint.getX() + 1);
- if (aPoint.getY() - rPreviousPoint.getX() == 0)
+ if (aPoint.getY() - rPreviousPoint.getY() == 0)
aPoint.setY(aPoint.getY() + 1);
}
commit 1b95e6155b9ad1702b041fef35da9439b3c85700
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Jan 15 12:11:46 2016 +0100
filter: coverity#1348467 constant expression result
Change-Id: I51bd2919688e6ffc9c82aede1c67bcce0255f1cf
diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
index 16c9cf8..f5a455b 100644
--- a/filter/source/svg/svgreader.cxx
+++ b/filter/source/svg/svgreader.cxx
@@ -408,7 +408,7 @@ struct AnnotatingVisitor
maElementIdMap.insert(std::make_pair(sAttributeValue,
maElementVector.size() - 1));
}
- else if ( nTokenId != XML_COLOR || nTokenId != XML_STYLE )
+ else if (nTokenId != XML_COLOR && nTokenId != XML_STYLE)
parseAttribute(nTokenId,
sAttributeValue);
}
commit 9694a0edfeb3cfe20d7c1286db097ba9b7c51e37
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Jan 15 12:18:11 2016 +0100
basic: coverity#1348466 checked return
Kind of unnecessary but let's hope it shuts up coverity.
Change-Id: I4903c9df788ce5fb9648c5fd68627ff21362828f
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index ac45383..c5f2f3e 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -1343,8 +1343,9 @@ OUString BasicManager::GetLibName( sal_uInt16 nLib )
return OUString();
}
-void BasicManager::LoadLib( sal_uInt16 nLib )
+bool BasicManager::LoadLib( sal_uInt16 nLib )
{
+ bool bDone = false;
DBG_ASSERT( nLib < mpImpl->aLibs.size() , "Lib?!" );
if ( nLib < mpImpl->aLibs.size() )
{
@@ -1354,11 +1355,11 @@ void BasicManager::LoadLib( sal_uInt16 nLib )
{
OUString aLibName = rLibInfo.GetLibName();
xLibContainer->loadLibrary( aLibName );
- xLibContainer->isLibraryLoaded( aLibName );
+ bDone = xLibContainer->isLibraryLoaded( aLibName );
}
else
{
- ImpLoadLibrary( &rLibInfo, nullptr );
+ bDone = ImpLoadLibrary( &rLibInfo, nullptr );
StarBASIC* pLib = GetLib( nLib );
if ( pLib )
{
@@ -1372,6 +1373,7 @@ void BasicManager::LoadLib( sal_uInt16 nLib )
StringErrorInfo* pErrInf = new StringErrorInfo( ERRCODE_BASMGR_LIBLOAD, OUString(), ERRCODE_BUTTON_OK );
aErrors.push_back(BasicError(*pErrInf, BasicErrorReason::LIBNOTFOUND, OUString::number(nLib)));
}
+ return bDone;
}
StarBASIC* BasicManager::CreateLib( const OUString& rLibName )
@@ -1584,8 +1586,11 @@ namespace
StarBASIC* pLib = i_manager->GetLib( nLib );
if( !pLib )
{
- i_manager->LoadLib( nLib );
- pLib = i_manager->GetLib( nLib );
+ bool const bLoaded = i_manager->LoadLib( nLib );
+ if (bLoaded)
+ {
+ pLib = i_manager->GetLib( nLib );
+ }
}
if( pLib )
diff --git a/include/basic/basmgr.hxx b/include/basic/basmgr.hxx
index dac109f..d64259a 100644
--- a/include/basic/basmgr.hxx
+++ b/include/basic/basmgr.hxx
@@ -171,7 +171,7 @@ public:
const css::uno::Reference< css::script::XPersistentLibraryContainer >&
GetScriptLibraryContainer() const;
- void LoadLib( sal_uInt16 nLib );
+ bool LoadLib( sal_uInt16 nLib );
bool RemoveLib( sal_uInt16 nLib, bool bDelBasicFromStorage );
// Modify-Flag will be reset only during save.
commit 80b55dcfc9754553e42625d0d6e9ebbb728200eb
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Jan 14 22:40:52 2016 +0100
starmath: only use WordProcessingML elements in DOCX files
Change-Id: I1b0f6d67bd0db0796756fd920ab92303a7ee7d79
diff --git a/include/oox/mathml/export.hxx b/include/oox/mathml/export.hxx
index 49a2afe..20b6b21 100644
--- a/include/oox/mathml/export.hxx
+++ b/include/oox/mathml/export.hxx
@@ -12,6 +12,7 @@
#include <sax/fshelper.hxx>
#include <rtl/strbuf.hxx>
#include <oox/core/filterbase.hxx>
+#include <oox/export/utils.hxx>
#include <oox/dllapi.h>
namespace oox
@@ -24,7 +25,9 @@ namespace oox
class OOX_DLLPUBLIC FormulaExportBase
{
public:
- virtual void writeFormulaOoxml( ::sax_fastparser::FSHelperPtr m_pSerializer, oox::core::OoxmlVersion version ) = 0;
+ virtual void writeFormulaOoxml(::sax_fastparser::FSHelperPtr pSerializer,
+ oox::core::OoxmlVersion version,
+ oox::drawingml::DocumentType documentType) = 0;
virtual void writeFormulaRtf( OStringBuffer& rBuffer, rtl_TextEncoding nEncoding ) = 0;
protected:
diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index dde99d5..7a9c359 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -31,6 +31,7 @@
#include <sax/fshelper.hxx>
#include <oox/core/filterbase.hxx>
#include <oox/mathml/import.hxx>
+#include <oox/export/utils.hxx>
#include <memory>
#include <set>
@@ -146,7 +147,9 @@ class SM_DLLPUBLIC SmDocShell : public SfxObjectShell, public SfxListener
*/
void InvalidateCursor();
- bool writeFormulaOoxml( ::sax_fastparser::FSHelperPtr pSerializer, oox::core::OoxmlVersion version );
+ bool writeFormulaOoxml(::sax_fastparser::FSHelperPtr pSerializer,
+ oox::core::OoxmlVersion version,
+ oox::drawingml::DocumentType documentType);
void writeFormulaRtf(OStringBuffer& rBuffer, rtl_TextEncoding nEncoding);
void readFormulaOoxml( oox::formulaimport::XmlStream& stream );
diff --git a/starmath/inc/unomodel.hxx b/starmath/inc/unomodel.hxx
index 6b6ac07..c853806 100644
--- a/starmath/inc/unomodel.hxx
+++ b/starmath/inc/unomodel.hxx
@@ -91,7 +91,9 @@ public:
virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& xParent ) throw( css::lang::NoSupportException, css::uno::RuntimeException, std::exception ) override;
// oox::FormulaExportBase
- virtual void writeFormulaOoxml( ::sax_fastparser::FSHelperPtr m_pSerializer, oox::core::OoxmlVersion version ) override;
+ virtual void writeFormulaOoxml(::sax_fastparser::FSHelperPtr pSerializer,
+ oox::core::OoxmlVersion version,
+ oox::drawingml::DocumentType documentType) override;
virtual void writeFormulaRtf(OStringBuffer& rBuffer, rtl_TextEncoding nEncoding) override;
// oox::FormulaImportBase
virtual void readFormulaOoxml( oox::formulaimport::XmlStream& stream ) override;
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index 758fb8a..41c6d6c 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -895,13 +895,16 @@ bool SmDocShell::ConvertTo( SfxMedium &rMedium )
return bRet;
}
-bool SmDocShell::writeFormulaOoxml( ::sax_fastparser::FSHelperPtr pSerializer, oox::core::OoxmlVersion version )
+bool SmDocShell::writeFormulaOoxml(
+ ::sax_fastparser::FSHelperPtr const pSerializer,
+ oox::core::OoxmlVersion const version,
+ oox::drawingml::DocumentType const documentType)
{
if( !pTree )
Parse();
if( pTree && !IsFormulaArranged() )
ArrangeFormula();
- SmOoxmlExport aEquation( pTree, version );
+ SmOoxmlExport aEquation(pTree, version, documentType);
return aEquation.ConvertFromStarMath( pSerializer );
}
diff --git a/starmath/source/ooxmlexport.cxx b/starmath/source/ooxmlexport.cxx
index 5a72ee1..277fb25 100644
--- a/starmath/source/ooxmlexport.cxx
+++ b/starmath/source/ooxmlexport.cxx
@@ -16,9 +16,11 @@
using namespace oox;
using namespace oox::core;
-SmOoxmlExport::SmOoxmlExport( const SmNode* pIn, OoxmlVersion v )
+SmOoxmlExport::SmOoxmlExport(const SmNode *const pIn, OoxmlVersion const v,
+ drawingml::DocumentType const documentType)
: SmWordExportBase( pIn )
, version( v )
+, m_DocumentType(documentType)
{
}
@@ -63,7 +65,7 @@ void SmOoxmlExport::HandleText( const SmNode* pNode, int /*nLevel*/)
m_pSerializer->singleElementNS( XML_m, XML_nor, FSEND );
m_pSerializer->endElementNS( XML_m, XML_rPr );
}
- if( version == ECMA_DIALECT )
+ if (drawingml::DOCUMENT_DOCX == m_DocumentType && ECMA_DIALECT == version)
{ // HACK: MSOffice2007 does not import characters properly unless this font is explicitly given
m_pSerializer->startElementNS( XML_w, XML_rPr, FSEND );
m_pSerializer->singleElementNS( XML_w, XML_rFonts, FSNS( XML_w, XML_ascii ), "Cambria Math",
diff --git a/starmath/source/ooxmlexport.hxx b/starmath/source/ooxmlexport.hxx
index a474098..5bd69bf 100644
--- a/starmath/source/ooxmlexport.hxx
+++ b/starmath/source/ooxmlexport.hxx
@@ -14,6 +14,7 @@
#include <sax/fshelper.hxx>
#include <oox/core/filterbase.hxx>
+#include <oox/export/utils.hxx>
/**
Class implementing writing of formulas to OOXML.
@@ -21,7 +22,8 @@
class SmOoxmlExport : public SmWordExportBase
{
public:
- SmOoxmlExport( const SmNode* pIn, oox::core::OoxmlVersion version );
+ SmOoxmlExport(const SmNode* pIn, oox::core::OoxmlVersion version,
+ oox::drawingml::DocumentType documentType);
bool ConvertFromStarMath( ::sax_fastparser::FSHelperPtr m_pSerializer );
private:
virtual void HandleVerticalStack( const SmNode* pNode, int nLevel ) override;
@@ -37,6 +39,8 @@ private:
virtual void HandleBlank() override;
::sax_fastparser::FSHelperPtr m_pSerializer;
oox::core::OoxmlVersion version;
+ /// needed to determine markup for nested run properties
+ oox::drawingml::DocumentType const m_DocumentType;
};
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index 51c588c..2c19f8a 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -1110,9 +1110,12 @@ void SAL_CALL SmModel::setParent( const uno::Reference< uno::XInterface >& xPare
}
}
-void SmModel::writeFormulaOoxml( ::sax_fastparser::FSHelperPtr m_pSerializer, oox::core::OoxmlVersion version )
+void SmModel::writeFormulaOoxml(
+ ::sax_fastparser::FSHelperPtr const pSerializer,
+ oox::core::OoxmlVersion const version,
+ oox::drawingml::DocumentType const documentType)
{
- static_cast< SmDocShell* >( GetObjectShell())->writeFormulaOoxml( m_pSerializer, version );
+ static_cast<SmDocShell*>(GetObjectShell())->writeFormulaOoxml(pSerializer, version, documentType);
}
void SmModel::writeFormulaRtf(OStringBuffer& rBuffer, rtl_TextEncoding nEncoding)
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index e8b5055..138b806 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4544,7 +4544,8 @@ void DocxAttributeOutput::WritePostponedMath(const SwOLENode* pPostponedMath)
oox::FormulaExportBase* formulaexport = dynamic_cast<oox::FormulaExportBase*>(dynamic_cast<SfxBaseModel*>(xInterface.get()));
assert( formulaexport != nullptr );
if (formulaexport)
- formulaexport->writeFormulaOoxml( m_pSerializer, GetExport().GetFilter().getVersion());
+ formulaexport->writeFormulaOoxml( m_pSerializer, GetExport().GetFilter().getVersion(),
+ oox::drawingml::DOCUMENT_DOCX);
}
void DocxAttributeOutput::WritePostponedFormControl(const SdrObject* pObject)
commit 3e0bc5c7fe715ebd38bfa64a49b23df58d6d29a9
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Jan 14 22:30:35 2016 +0100
oox: move enum DocumentType out of drawingml.hxx
... which has nasty dependencies.
Change-Id: I84ba0302142ade6e15291b782453dbe3bac753dd
diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index 988d34e..9305c01 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -29,6 +29,8 @@
#include <filter/msfilter/escherex.hxx>
#include "oox/drawingml/drawingmltypes.hxx"
#include <oox/token/tokens.hxx>
+#include <oox/export/utils.hxx>
+
#ifndef OOX_DRAWINGML_EXPORT_ROTATE_CLOCKWISIFY
// Our rotation is counter-clockwise and is in 100ths of a degree.
// drawingML rotation is clockwise and is in 60000ths of a degree.
@@ -86,9 +88,8 @@ protected:
virtual ~DMLTextExport() {}
};
-class OOX_DLLPUBLIC DrawingML {
-public:
- enum DocumentType { DOCUMENT_DOCX, DOCUMENT_PPTX, DOCUMENT_XLSX };
+class OOX_DLLPUBLIC DrawingML
+{
private:
static int mnImageCounter;
diff --git a/include/oox/export/utils.hxx b/include/oox/export/utils.hxx
index 53cdfcd..32a9fbe 100644
--- a/include/oox/export/utils.hxx
+++ b/include/oox/export/utils.hxx
@@ -44,6 +44,10 @@ OString write1000thOfAPercent(T number)
return OString::number( number * 1000 );
}
+namespace oox { namespace drawingml {
+ enum DocumentType { DOCUMENT_DOCX, DOCUMENT_PPTX, DOCUMENT_XLSX };
+} }
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 654b11f..8320aad 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -1144,7 +1144,7 @@ ShapeExport& ShapeExport::WriteRectangleShape( Reference< XShape > xShape )
typedef ShapeExport& (ShapeExport::*ShapeConverter)( Reference< XShape > );
typedef std::unordered_map< const char*, ShapeConverter, rtl::CStringHash, rtl::CStringEqual> NameToConvertMapType;
-static const NameToConvertMapType& lcl_GetConverters(DrawingML::DocumentType eDocumentType)
+static const NameToConvertMapType& lcl_GetConverters(DocumentType eDocumentType)
{
static bool shape_map_inited = false;
static NameToConvertMapType shape_converters;
@@ -1177,7 +1177,7 @@ static const NameToConvertMapType& lcl_GetConverters(DrawingML::DocumentType eDo
shape_converters[ "com.sun.star.presentation.OutlinerShape" ] = &ShapeExport::WriteTextShape;
shape_converters[ "com.sun.star.presentation.SlideNumberShape" ] = &ShapeExport::WriteTextShape;
shape_converters[ "com.sun.star.presentation.TitleTextShape" ] = &ShapeExport::WriteTextShape;
- if (eDocumentType == DrawingML::DOCUMENT_DOCX)
+ if (eDocumentType == DOCUMENT_DOCX)
shape_converters[ "com.sun.star.drawing.GroupShape" ] = &ShapeExport::WriteGroupShape;
shape_map_inited = true;
diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx
index 6e04a38..7c7d4d8 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -445,7 +445,7 @@ void XclExpImgData::SaveXml( XclExpXmlStream& rStrm )
{
sax_fastparser::FSHelperPtr pWorksheet = rStrm.GetCurrentStream();
- DrawingML aDML( pWorksheet, &rStrm, DrawingML::DOCUMENT_XLSX );
+ DrawingML aDML(pWorksheet, &rStrm, drawingml::DOCUMENT_XLSX);
OUString rId = aDML.WriteImage( maGraphic );
pWorksheet->singleElement( XML_picture,
FSNS( XML_r, XML_id ), XclXmlUtils::ToOString( rId ).getStr(),
@@ -1137,7 +1137,7 @@ void XclExpChartObj::SaveXml( XclExpXmlStream& rStrm )
{
XclObjAny::WriteFromTo( rStrm, mxShape, GetTab() );
Reference< XModel > xModel( mxChartDoc, UNO_QUERY );
- ChartExport aChartExport( XML_xdr, pDrawing, xModel, &rStrm, DrawingML::DOCUMENT_XLSX );
+ ChartExport aChartExport(XML_xdr, pDrawing, xModel, &rStrm, drawingml::DOCUMENT_XLSX);
static sal_Int32 nChartCount = 0;
nChartCount++;
aChartExport.WriteChartObj( mxShape, nChartCount );
diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx
index 5a76ae8..8f5ac14 100644
--- a/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/sc/source/filter/xcl97/xcl97rec.cxx
@@ -1164,7 +1164,7 @@ void XclObjAny::SaveXml( XclExpXmlStream& rStrm )
sax_fastparser::FSHelperPtr pDrawing = rStrm.GetCurrentStream();
- ShapeExport aDML( XML_xdr, pDrawing, nullptr, &rStrm, DrawingML::DOCUMENT_XLSX );
+ ShapeExport aDML(XML_xdr, pDrawing, nullptr, &rStrm, drawingml::DOCUMENT_XLSX);
std::shared_ptr<oox::drawingml::URLTransformer> pURLTransformer(new ScURLTransformer(*mpDoc));
aDML.SetURLTranslator(pURLTransformer);
diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx
index 6382af4..28f027b 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -361,7 +361,7 @@ OString DocxExport::OutputChart( uno::Reference< frame::XModel >& xModel, sal_In
m_pFilter->openFragmentStreamWithSerializer( aFileName,
"application/vnd.openxmlformats-officedocument.drawingml.chart+xml" );
- oox::drawingml::ChartExport aChartExport( XML_w, pChartFS, xModel, m_pFilter, oox::drawingml::DrawingML::DOCUMENT_DOCX );
+ oox::drawingml::ChartExport aChartExport(XML_w, pChartFS, xModel, m_pFilter, oox::drawingml::DOCUMENT_DOCX);
aChartExport.ExportContent();
return OUStringToOString( sId, RTL_TEXTENCODING_UTF8 );
}
@@ -422,7 +422,7 @@ void DocxExport::OutputDML(uno::Reference<drawing::XShape>& xShape)
nNamespace = XML_wpg;
else if (xServiceInfo->supportsService("com.sun.star.drawing.GraphicObjectShape"))
nNamespace = XML_pic;
- oox::drawingml::ShapeExport aExport(nNamespace, m_pAttrOutput->GetSerializer(), nullptr, m_pFilter, oox::drawingml::DrawingML::DOCUMENT_DOCX, m_pAttrOutput);
+ oox::drawingml::ShapeExport aExport(nNamespace, m_pAttrOutput->GetSerializer(), nullptr, m_pFilter, oox::drawingml::DOCUMENT_DOCX, m_pAttrOutput);
aExport.WriteShape(xShape);
}
@@ -1450,7 +1450,7 @@ DocxExport::DocxExport( DocxExportFilter *pFilter, SwDoc *pDocument, SwPaM *pCur
SetFS(m_pDocumentFS);
// the DrawingML access
- m_pDrawingML = new oox::drawingml::DrawingML( m_pDocumentFS, m_pFilter, oox::drawingml::DrawingML::DOCUMENT_DOCX );
+ m_pDrawingML = new oox::drawingml::DrawingML(m_pDocumentFS, m_pFilter, oox::drawingml::DOCUMENT_DOCX);
// the attribute output for the document
m_pAttrOutput = new DocxAttributeOutput( *this, m_pDocumentFS, m_pDrawingML );
More information about the Libreoffice-commits
mailing list