[Libreoffice-commits] core.git: sw/source
Miklos Vajna
vmiklos at collabora.co.uk
Fri Apr 29 07:43:18 UTC 2016
sw/source/filter/ww8/docxsdrexport.cxx | 14 +++++++-------
sw/source/filter/ww8/docxsdrexport.hxx | 6 +++---
2 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 86b49add3a7ec24923cb7f95461465a8863ab5ad
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri Apr 29 08:55:46 2016 +0200
sw: no need to copy these in docxsdrexport
Change-Id: I2d5d0ce4555250b1c2480167743258300b76c9fa
Reviewed-on: https://gerrit.libreoffice.org/24486
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
Tested-by: Jenkins <ci at libreoffice.org>
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx
index 5d60ca6..f6d3776 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -38,7 +38,7 @@ using namespace oox;
namespace
{
-uno::Sequence<beans::PropertyValue> lclGetProperty(uno::Reference<drawing::XShape> rShape, const OUString& rPropName)
+uno::Sequence<beans::PropertyValue> lclGetProperty(const uno::Reference<drawing::XShape>& rShape, const OUString& rPropName)
{
uno::Sequence<beans::PropertyValue> aResult;
uno::Reference<beans::XPropertySet> xPropertySet(rShape, uno::UNO_QUERY);
@@ -177,7 +177,7 @@ struct DocxSdrExport::Impl
/// Writes wp wrapper code around an SdrObject, which itself is written using drawingML syntax.
void textFrameShadow(const SwFrameFormat& rFrameFormat);
- static bool isSupportedDMLShape(uno::Reference<drawing::XShape> xShape);
+ static bool isSupportedDMLShape(const uno::Reference<drawing::XShape>& xShape);
/// Undo the text direction mangling done by the frame btLr handler in writerfilter::dmapper::DomainMapper::lcl_startCharacterGroup()
bool checkFrameBtlr(SwNode* pStartNode, bool bDML);
};
@@ -191,7 +191,7 @@ DocxSdrExport::~DocxSdrExport()
{
}
-void DocxSdrExport::setSerializer(sax_fastparser::FSHelperPtr pSerializer)
+void DocxSdrExport::setSerializer(const sax_fastparser::FSHelperPtr& pSerializer)
{
m_pImpl->m_pSerializer = pSerializer;
}
@@ -783,7 +783,7 @@ void DocxSdrExport::writeVMLDrawing(const SdrObject* sdrObj, const SwFrameFormat
const_cast< SdrObject* >(sdrObj)->SetPage(nullptr);
}
-bool lcl_isLockedCanvas(uno::Reference<drawing::XShape> xShape)
+bool lcl_isLockedCanvas(const uno::Reference<drawing::XShape>& xShape)
{
bool bRet = false;
uno::Sequence< beans::PropertyValue > propList =
@@ -915,7 +915,7 @@ void DocxSdrExport::Impl::textFrameShadow(const SwFrameFormat& rFrameFormat)
FSEND);
}
-bool DocxSdrExport::Impl::isSupportedDMLShape(uno::Reference<drawing::XShape> xShape)
+bool DocxSdrExport::Impl::isSupportedDMLShape(const uno::Reference<drawing::XShape>& xShape)
{
bool supported = true;
@@ -1031,9 +1031,9 @@ void DocxSdrExport::writeDMLEffectLst(const SwFrameFormat& rFrameFormat)
}
-void DocxSdrExport::writeDiagramRels(uno::Reference<xml::dom::XDocument> xDom,
+void DocxSdrExport::writeDiagramRels(const uno::Reference<xml::dom::XDocument>& xDom,
const uno::Sequence< uno::Sequence< uno::Any > >& xRelSeq,
- uno::Reference< io::XOutputStream > xOutStream, const OUString& sGrabBagProperyName,
+ const uno::Reference<io::XOutputStream>& xOutStream, const OUString& sGrabBagProperyName,
int nAnchorId)
{
// add image relationships of OOXData, OOXDiagram
diff --git a/sw/source/filter/ww8/docxsdrexport.hxx b/sw/source/filter/ww8/docxsdrexport.hxx
index 4e935b1..c3538aa 100644
--- a/sw/source/filter/ww8/docxsdrexport.hxx
+++ b/sw/source/filter/ww8/docxsdrexport.hxx
@@ -58,7 +58,7 @@ public:
DocxSdrExport(DocxExport& rExport, sax_fastparser::FSHelperPtr pSerializer, oox::drawingml::DrawingML* pDrawingML);
~DocxSdrExport();
- void setSerializer(sax_fastparser::FSHelperPtr pSerializer);
+ void setSerializer(const sax_fastparser::FSHelperPtr& pSerializer);
/// When exporting fly frames, this holds the real size of the frame.
const Size* getFlyFrameSize();
bool getTextFrameSyntax();
@@ -96,9 +96,9 @@ public:
void writeDMLEffectLst(const SwFrameFormat& rFrameFormat);
/// Writes a diagram (smartart).
void writeDiagram(const SdrObject* sdrObject, const SwFrameFormat& rFrameFormat, int nAnchorId);
- void writeDiagramRels(css::uno::Reference<css::xml::dom::XDocument> xDom,
+ void writeDiagramRels(const css::uno::Reference<css::xml::dom::XDocument>& xDom,
const css::uno::Sequence< css::uno::Sequence<css::uno::Any> >& xRelSeq,
- css::uno::Reference<css::io::XOutputStream> xOutStream, const OUString& sGrabBagProperyName,
+ const css::uno::Reference<css::io::XOutputStream>& xOutStream, const OUString& sGrabBagProperyName,
int nAnchorId);
/// Writes text frame in DML format.
void writeDMLTextFrame(ww8::Frame* pParentFrame, int nAnchorId, bool bTextBoxOnly = false);
More information about the Libreoffice-commits
mailing list