[Libreoffice-commits] core.git: include/oox oox/source sw/source
Tamás Zolnai
tamas.zolnai at collabora.com
Thu Aug 17 22:06:22 UTC 2017
include/oox/export/vmlexport.hxx | 5 +----
oox/source/export/vmlexport.cxx | 4 +---
sw/source/filter/ww8/docxattributeoutput.cxx | 24 ++++++++++++------------
sw/source/filter/ww8/docxattributeoutput.hxx | 5 ++---
sw/source/filter/ww8/docxsdrexport.cxx | 10 +++++-----
sw/source/filter/ww8/docxsdrexport.hxx | 4 ++--
6 files changed, 23 insertions(+), 29 deletions(-)
New commits:
commit 79611a44fac472dfa5f0a01c051c314078f798b9
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
Date: Wed Aug 16 22:02:53 2017 +0200
NdTopLeft is unused now.
Change-Id: I39184b8fdf666676c21560d39911f6204b0afd52
Reviewed-on: https://gerrit.libreoffice.org/41257
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>
diff --git a/include/oox/export/vmlexport.hxx b/include/oox/export/vmlexport.hxx
index c259db30cf06..c098ace13cb7 100644
--- a/include/oox/export/vmlexport.hxx
+++ b/include/oox/export/vmlexport.hxx
@@ -84,9 +84,6 @@ class OOX_DLLPUBLIC VMLExport : public EscherEx
sal_Int16 m_eHOri, m_eVOri, m_eHRel, m_eVRel;
bool m_bInline; // css::text::TextContentAnchorType_AS_CHARACTER
- /// Parent position.
- const Point* m_pNdTopLeft;
-
/// The object we're exporting.
const SdrObject* m_pSdrObject;
@@ -128,7 +125,7 @@ public:
/// Call this when you need to export the object as VML.
OString AddSdrObject( const SdrObject& rObj, sal_Int16 eHOri = -1,
sal_Int16 eVOri = -1, sal_Int16 eHRel = -1,
- sal_Int16 eVRel = -1, const Point* pNdTopLeft = nullptr, const bool bOOxmlExport = false );
+ sal_Int16 eVRel = -1, const bool bOOxmlExport = false );
OString AddInlineSdrObject( const SdrObject& rObj, const bool bOOxmlExport = false );
virtual void AddSdrObjectVMLObject( const SdrObject& rObj) override;
static bool IsWaterMarkShape(const OUString& rStr);
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index 3ee2711f8e5f..a401c3c44465 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -60,7 +60,6 @@ VMLExport::VMLExport( ::sax_fastparser::FSHelperPtr const & pSerializer, VMLText
, m_eHRel( 0 )
, m_eVRel( 0 )
, m_bInline( false )
- , m_pNdTopLeft( nullptr )
, m_pSdrObject( nullptr )
, m_pShapeAttrList( nullptr )
, m_nShapeType( ESCHER_ShpInst_Nil )
@@ -1280,14 +1279,13 @@ void VMLExport::EndShape( sal_Int32 nShapeElement )
}
}
-OString VMLExport::AddSdrObject( const SdrObject& rObj, sal_Int16 eHOri, sal_Int16 eVOri, sal_Int16 eHRel, sal_Int16 eVRel, const Point* pNdTopLeft, const bool bOOxmlExport )
+OString VMLExport::AddSdrObject( const SdrObject& rObj, sal_Int16 eHOri, sal_Int16 eVOri, sal_Int16 eHRel, sal_Int16 eVRel, const bool bOOxmlExport )
{
m_pSdrObject = &rObj;
m_eHOri = eHOri;
m_eVOri = eVOri;
m_eHRel = eHRel;
m_eVRel = eVRel;
- m_pNdTopLeft = pNdTopLeft;
EscherEx::AddSdrObject(rObj, bOOxmlExport);
return m_sShapeId;
}
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 3c8bddef0cbf..87fefdc7783b 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4790,13 +4790,13 @@ void DocxAttributeOutput::WritePostponedActiveXControl()
for( std::vector<PostponedDrawing>::const_iterator it = m_aPostponedActiveXControls.begin();
it != m_aPostponedActiveXControls.end(); ++it )
{
- WriteActiveXControl(it->object, *(it->frame), *(it->point));
+ WriteActiveXControl(it->object, *(it->frame));
}
m_aPostponedActiveXControls.clear();
}
-void DocxAttributeOutput::WriteActiveXControl(const SdrObject* pObject, const SwFrameFormat& rFrameFormat,const Point& rNdTopLeft)
+void DocxAttributeOutput::WriteActiveXControl(const SdrObject* pObject, const SwFrameFormat& rFrameFormat)
{
SdrUnoObj *pFormObj = const_cast<SdrUnoObj*>(dynamic_cast< const SdrUnoObj*>(pObject));
if (!pFormObj)
@@ -4833,7 +4833,7 @@ void DocxAttributeOutput::WriteActiveXControl(const SdrObject* pObject, const Sw
sShapeId = m_rExport.VMLExporter().AddSdrObject(*pObject,
rHoriOri.GetHoriOrient(), rVertOri.GetVertOrient(),
rHoriOri.GetRelationOrient(),
- rVertOri.GetRelationOrient(), &rNdTopLeft, true);
+ rVertOri.GetRelationOrient(), true);
}
// control
@@ -5013,7 +5013,7 @@ void DocxAttributeOutput::WritePostponedCustomShape()
if ( IsAlternateContentChoiceOpen() )
m_rExport.SdrExporter().writeDMLDrawing(it->object, (it->frame), m_anchorId++);
else
- m_rExport.SdrExporter().writeDMLAndVMLDrawing(it->object, *(it->frame), *(it->point), m_anchorId++);
+ m_rExport.SdrExporter().writeDMLAndVMLDrawing(it->object, *(it->frame), m_anchorId++);
}
m_bStartedParaSdt = bStartedParaSdt;
m_pPostponedCustomShape.reset(nullptr);
@@ -5037,14 +5037,14 @@ void DocxAttributeOutput::WritePostponedDMLDrawing()
if ( IsAlternateContentChoiceOpen() && !( m_rExport.SdrExporter().IsDrawingOpen()) )
m_rExport.SdrExporter().writeDMLDrawing(it->object, (it->frame), m_anchorId++);
else
- m_rExport.SdrExporter().writeDMLAndVMLDrawing(it->object, *(it->frame), *(it->point), m_anchorId++);
+ m_rExport.SdrExporter().writeDMLAndVMLDrawing(it->object, *(it->frame), m_anchorId++);
}
m_bStartedParaSdt = bStartedParaSdt;
m_pPostponedOLEs = std::move(pPostponedOLEs);
}
-void DocxAttributeOutput::OutputFlyFrame_Impl( const ww8::Frame &rFrame, const Point& rNdTopLeft )
+void DocxAttributeOutput::OutputFlyFrame_Impl( const ww8::Frame &rFrame, const Point& /*rNdTopLeft*/ )
{
m_pSerializer->mark(Tag_OutputFlyFrame);
@@ -5097,12 +5097,12 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const ww8::Frame &rFrame, const P
{
// Do not write w:drawing inside w:drawing. Instead Postpone the Inner Drawing.
if( m_rExport.SdrExporter().IsDrawingOpen() )
- m_pPostponedCustomShape->push_back(PostponedDrawing(pSdrObj, &(rFrame.GetFrameFormat()), &rNdTopLeft));
+ m_pPostponedCustomShape->push_back(PostponedDrawing(pSdrObj, &(rFrame.GetFrameFormat())));
else
m_rExport.SdrExporter().writeDMLDrawing( pSdrObj, &rFrame.GetFrameFormat(), m_anchorId++);
}
else
- m_rExport.SdrExporter().writeDMLAndVMLDrawing( pSdrObj, rFrame.GetFrameFormat(), rNdTopLeft, m_anchorId++);
+ m_rExport.SdrExporter().writeDMLAndVMLDrawing( pSdrObj, rFrame.GetFrameFormat(), m_anchorId++);
m_bStartedParaSdt = bStartedParaSdt;
m_bPostponedProcessingFly = false ;
@@ -5110,12 +5110,12 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const ww8::Frame &rFrame, const P
// IsAlternateContentChoiceOpen(): check is to ensure that only one object is getting added. Without this check, plus one object gets added
// m_bParagraphFrameOpen: check if the frame is open.
else if (IsAlternateContentChoiceOpen() && m_bParagraphFrameOpen)
- m_pPostponedCustomShape->push_back(PostponedDrawing(pSdrObj, &(rFrame.GetFrameFormat()), &rNdTopLeft));
+ m_pPostponedCustomShape->push_back(PostponedDrawing(pSdrObj, &(rFrame.GetFrameFormat())));
else
{
// we are writing out attributes, but w:drawing should not be inside w:rPr, so write it out later
m_bPostponedProcessingFly = true ;
- m_pPostponedDMLDrawings->push_back(PostponedDrawing(pSdrObj, &(rFrame.GetFrameFormat()), &rNdTopLeft));
+ m_pPostponedDMLDrawings->push_back(PostponedDrawing(pSdrObj, &(rFrame.GetFrameFormat())));
}
}
}
@@ -5166,14 +5166,14 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const ww8::Frame &rFrame, const P
{
const SdrObject* pObject = rFrame.GetFrameFormat().FindRealSdrObject();
if(ExportAsActiveXControl(pObject))
- m_aPostponedActiveXControls.push_back(PostponedDrawing(pObject, &(rFrame.GetFrameFormat()), &rNdTopLeft));
+ m_aPostponedActiveXControls.push_back(PostponedDrawing(pObject, &(rFrame.GetFrameFormat())));
else
m_aPostponedFormControls.push_back(pObject);
m_bPostponedProcessingFly = true ;
}
break;
default:
- SAL_INFO("sw.ww8", "TODO DocxAttributeOutput::OutputFlyFrame_Impl( const ww8::Frame& rFrame, const Point& rNdTopLeft ) - frame type " <<
+ SAL_INFO("sw.ww8", "TODO DocxAttributeOutput::OutputFlyFrame_Impl( const ww8::Frame& rFrame ) - frame type " <<
( rFrame.GetWriterType() == ww8::Frame::eTextBox ? "eTextBox":
( rFrame.GetWriterType() == ww8::Frame::eOle ? "eOle": "???" ) ) );
break;
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx
index 54d67559b35e..0d716e7129fd 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -417,7 +417,7 @@ private:
bool PostponeOLE( SwOLENode& rNode, const Size& rSize, const SwFlyFrameFormat* pFlyFrameFormat );
void WriteOLE( SwOLENode& rNode, const Size& rSize, const SwFlyFrameFormat* rFlyFrameFormat );
- void WriteActiveXControl(const SdrObject* pObject, const SwFrameFormat& rFrameFormat, const Point& rNdTopLeft);
+ void WriteActiveXControl(const SdrObject* pObject, const SwFrameFormat& rFrameFormat);
bool ExportAsActiveXControl(const SdrObject* pObject) const;
/// checks whether the current component is a diagram
@@ -854,10 +854,9 @@ private:
struct PostponedDrawing
{
- PostponedDrawing( const SdrObject* sdrObj, const SwFrameFormat* frm, const Point* pt ) : object( sdrObj ), frame( frm ), point( pt ) {};
+ PostponedDrawing( const SdrObject* sdrObj, const SwFrameFormat* frm) : object( sdrObj ), frame( frm ) {};
const SdrObject* object;
const SwFrameFormat* frame;
- const Point* point;
};
std::unique_ptr< std::list<PostponedDrawing> > m_pPostponedDMLDrawings;
std::unique_ptr< std::list<PostponedDrawing> > m_pPostponedCustomShape;
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx
index ee5e4af200b5..ee2c646d536d 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -754,7 +754,7 @@ void DocxSdrExport::endDMLAnchorInline(const SwFrameFormat* pFrameFormat)
m_pImpl->m_bDrawingOpen = false;
}
-void DocxSdrExport::writeVMLDrawing(const SdrObject* sdrObj, const SwFrameFormat& rFrameFormat,const Point& rNdTopLeft)
+void DocxSdrExport::writeVMLDrawing(const SdrObject* sdrObj, const SwFrameFormat& rFrameFormat)
{
bool bSwapInPage = false;
if (!sdrObj->GetPage())
@@ -778,7 +778,7 @@ void DocxSdrExport::writeVMLDrawing(const SdrObject* sdrObj, const SwFrameFormat
m_pImpl->m_rExport.VMLExporter().AddSdrObject(*sdrObj,
rHoriOri.GetHoriOrient(), rVertOri.GetVertOrient(),
rHoriOri.GetRelationOrient(),
- rVertOri.GetRelationOrient(), (&rNdTopLeft), true);
+ rVertOri.GetRelationOrient(), true);
m_pImpl->m_pSerializer->endElementNS(XML_w, XML_pict);
if (bSwapInPage)
@@ -928,7 +928,7 @@ bool DocxSdrExport::Impl::isSupportedDMLShape(const uno::Reference<drawing::XSha
return supported;
}
-void DocxSdrExport::writeDMLAndVMLDrawing(const SdrObject* sdrObj, const SwFrameFormat& rFrameFormat,const Point& rNdTopLeft, int nAnchorId)
+void DocxSdrExport::writeDMLAndVMLDrawing(const SdrObject* sdrObj, const SwFrameFormat& rFrameFormat, int nAnchorId)
{
bool bDMLAndVMLDrawingOpen = m_pImpl->m_bDMLAndVMLDrawingOpen;
m_pImpl->m_bDMLAndVMLDrawingOpen = true;
@@ -958,13 +958,13 @@ void DocxSdrExport::writeDMLAndVMLDrawing(const SdrObject* sdrObj, const SwFrame
m_pImpl->m_pSerializer->endElementNS(XML_mc, XML_Choice);
m_pImpl->m_pSerializer->startElementNS(XML_mc, XML_Fallback, FSEND);
- writeVMLDrawing(sdrObj, rFrameFormat, rNdTopLeft);
+ writeVMLDrawing(sdrObj, rFrameFormat);
m_pImpl->m_pSerializer->endElementNS(XML_mc, XML_Fallback);
m_pImpl->m_pSerializer->endElementNS(XML_mc, XML_AlternateContent);
}
else
- writeVMLDrawing(sdrObj, rFrameFormat, rNdTopLeft);
+ writeVMLDrawing(sdrObj, rFrameFormat);
m_pImpl->m_bDMLAndVMLDrawingOpen = false;
}
diff --git a/sw/source/filter/ww8/docxsdrexport.hxx b/sw/source/filter/ww8/docxsdrexport.hxx
index 9183091f71f8..59871e7511f0 100644
--- a/sw/source/filter/ww8/docxsdrexport.hxx
+++ b/sw/source/filter/ww8/docxsdrexport.hxx
@@ -88,11 +88,11 @@ public:
void startDMLAnchorInline(const SwFrameFormat* pFrameFormat, const Size& rSize);
void endDMLAnchorInline(const SwFrameFormat* pFrameFormat);
/// Writes a drawing as VML data.
- void writeVMLDrawing(const SdrObject* sdrObj, const SwFrameFormat& rFrameFormat,const Point& rNdTopLeft);
+ void writeVMLDrawing(const SdrObject* sdrObj, const SwFrameFormat& rFrameFormat);
/// Writes a drawing as DML.
void writeDMLDrawing(const SdrObject* pSdrObject, const SwFrameFormat* pFrameFormat, int nAnchorId);
/// Writes shape in both DML and VML format.
- void writeDMLAndVMLDrawing(const SdrObject* sdrObj, const SwFrameFormat& rFrameFormat,const Point& rNdTopLeft, int nAnchorId);
+ void writeDMLAndVMLDrawing(const SdrObject* sdrObj, const SwFrameFormat& rFrameFormat, int nAnchorId);
/// Write <a:effectLst>, the effect list.
void writeDMLEffectLst(const SwFrameFormat& rFrameFormat);
/// Writes a diagram (smartart).
More information about the Libreoffice-commits
mailing list