summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZolnai Tamás <tamas.zolnai@collabora.com>2014-11-16 20:48:19 +0100
committerZolnai Tamás <tamas.zolnai@collabora.com>2014-11-16 20:48:19 +0100
commitaea2dbc319e1e1069d3af4bbc828eb0001cd6ece (patch)
tree8ee3f4d636082c7d4df8630b8a9169da427d20b5
parentdb686e8ae12e4c554e24d0c262915fb1bf45525b (diff)
Remove now useless setTextEmbeddedGraphicURL()
Since this commit: 286e2f5c6ec829bc0987b1be7016699f7ef03e5e it's not necessary to update the package URL. Change-Id: I25c829e9bc0c666838baf19cd60f19938ebb430c
-rw-r--r--include/xmloff/txtparae.hxx4
-rw-r--r--sw/inc/ndgrf.hxx6
-rw-r--r--sw/source/filter/xml/xmltexte.cxx22
-rw-r--r--sw/source/filter/xml/xmltexte.hxx5
-rw-r--r--xmloff/source/text/txtparae.cxx7
5 files changed, 1 insertions, 43 deletions
diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx
index 37ec27b42508..a7369eafae24 100644
--- a/include/xmloff/txtparae.hxx
+++ b/include/xmloff/txtparae.hxx
@@ -380,10 +380,6 @@ protected:
bool bAutoStyles,
const ::com::sun::star::uno::Reference <
::com::sun::star::beans::XPropertySet > *pRangePropSet = 0 );
- virtual void setTextEmbeddedGraphicURL(
- const ::com::sun::star::uno::Reference <
- ::com::sun::star::beans::XPropertySet >& rPropSet,
- OUString& rStreamName ) const;
/// export a footnote and styles
void exportTextFootnote(
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index 3eaa75a4a3af..b40da0c55d91 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -177,11 +177,7 @@ private:
public:
bool HasEmbeddedStreamName() const { return maGrfObj.HasUserData(); }
- /// applying new stream name for embedded graphic - needed as saving the document might change this stream name
- void ApplyNewEmbeddedStreamName(const OUString& r)
- {
- maGrfObj.SetUserData(r);
- }
+
/// Is this node selected by any shell?
bool IsSelected() const;
diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx
index c830e1df5088..79ea895a69d3 100644
--- a/sw/source/filter/xml/xmltexte.cxx
+++ b/sw/source/filter/xml/xmltexte.cxx
@@ -188,28 +188,6 @@ SwXMLTextParagraphExport::~SwXMLTextParagraphExport()
{
}
-void SwXMLTextParagraphExport::setTextEmbeddedGraphicURL(
- const Reference < XPropertySet >& rPropSet,
- OUString& rURL) const
-{
- if( rURL.isEmpty() )
- return;
-
- SwGrfNode *pGrfNd = GetNoTxtNode( rPropSet )->GetGrfNode();
- if (pGrfNd && !pGrfNd->IsGrfLink())
- {
- // Apply new embedded stream name, only if graphic node already has one.
- // - The saving of recovery information triggers this method, but for a newly created
- // document the new embedded stream name shall not be applied.
- // - The saving of a newly created document to own format (ODF) triggers this method,
- // but the embedded stream name is not needed as its original inserted data is still in use.
- if (pGrfNd->HasEmbeddedStreamName())
- {
- pGrfNd->ApplyNewEmbeddedStreamName("vnd.sun.star.Package:" + rURL);
- }
- }
-}
-
static void lcl_addURL ( SvXMLExport &rExport, const OUString &rURL,
bool bToRel = true )
{
diff --git a/sw/source/filter/xml/xmltexte.hxx b/sw/source/filter/xml/xmltexte.hxx
index cb007465a77d..17f45d966113 100644
--- a/sw/source/filter/xml/xmltexte.hxx
+++ b/sw/source/filter/xml/xmltexte.hxx
@@ -69,11 +69,6 @@ public:
SwXMLExport& rExp,
SvXMLAutoStylePoolP& rAutoStylePool );
virtual ~SwXMLTextParagraphExport();
-
- virtual void setTextEmbeddedGraphicURL(
- const ::com::sun::star::uno::Reference <
- ::com::sun::star::beans::XPropertySet >& rPropSet,
- OUString& rStreamName ) const SAL_OVERRIDE;
};
#endif // INCLUDED_SW_SOURCE_FILTER_XML_XMLTEXTE_HXX
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 07b2ab4bc7eb..4d43b3ca604b 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -3084,7 +3084,6 @@ void XMLTextParagraphExport::_exportTextGraphic(
OUString sOrigURL;
rPropSet->getPropertyValue( sGraphicURL ) >>= sOrigURL;
OUString sURL(GetExport().AddEmbeddedGraphicObject( sOrigURL ));
- setTextEmbeddedGraphicURL( rPropSet, sURL );
// If there still is no url, then then graphic is empty
if( !sURL.isEmpty() )
@@ -3205,12 +3204,6 @@ void XMLTextParagraphExport::exportTitleAndDescription(
}
}
-void XMLTextParagraphExport::setTextEmbeddedGraphicURL(
- const Reference < XPropertySet >&,
- OUString& /*rStreamName*/ ) const
-{
-}
-
bool XMLTextParagraphExport::addHyperlinkAttributes(
const Reference< XPropertySet > & rPropSet,
const Reference< XPropertyState > & rPropState,