Kaydet (Commit) aea2dbc3 authored tarafından Zolnai Tamás's avatar Zolnai Tamás

Remove now useless setTextEmbeddedGraphicURL()

Since this commit:
286e2f5c
it's not necessary to update the package URL.

Change-Id: I25c829e9bc0c666838baf19cd60f19938ebb430c
üst db686e8a
...@@ -380,10 +380,6 @@ protected: ...@@ -380,10 +380,6 @@ protected:
bool bAutoStyles, bool bAutoStyles,
const ::com::sun::star::uno::Reference < const ::com::sun::star::uno::Reference <
::com::sun::star::beans::XPropertySet > *pRangePropSet = 0 ); ::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 /// export a footnote and styles
void exportTextFootnote( void exportTextFootnote(
......
...@@ -177,11 +177,7 @@ private: ...@@ -177,11 +177,7 @@ private:
public: public:
bool HasEmbeddedStreamName() const { return maGrfObj.HasUserData(); } 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? /// Is this node selected by any shell?
bool IsSelected() const; bool IsSelected() const;
......
...@@ -188,28 +188,6 @@ SwXMLTextParagraphExport::~SwXMLTextParagraphExport() ...@@ -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, static void lcl_addURL ( SvXMLExport &rExport, const OUString &rURL,
bool bToRel = true ) bool bToRel = true )
{ {
......
...@@ -69,11 +69,6 @@ public: ...@@ -69,11 +69,6 @@ public:
SwXMLExport& rExp, SwXMLExport& rExp,
SvXMLAutoStylePoolP& rAutoStylePool ); SvXMLAutoStylePoolP& rAutoStylePool );
virtual ~SwXMLTextParagraphExport(); 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 #endif // INCLUDED_SW_SOURCE_FILTER_XML_XMLTEXTE_HXX
......
...@@ -3084,7 +3084,6 @@ void XMLTextParagraphExport::_exportTextGraphic( ...@@ -3084,7 +3084,6 @@ void XMLTextParagraphExport::_exportTextGraphic(
OUString sOrigURL; OUString sOrigURL;
rPropSet->getPropertyValue( sGraphicURL ) >>= sOrigURL; rPropSet->getPropertyValue( sGraphicURL ) >>= sOrigURL;
OUString sURL(GetExport().AddEmbeddedGraphicObject( sOrigURL )); OUString sURL(GetExport().AddEmbeddedGraphicObject( sOrigURL ));
setTextEmbeddedGraphicURL( rPropSet, sURL );
// If there still is no url, then then graphic is empty // If there still is no url, then then graphic is empty
if( !sURL.isEmpty() ) if( !sURL.isEmpty() )
...@@ -3205,12 +3204,6 @@ void XMLTextParagraphExport::exportTitleAndDescription( ...@@ -3205,12 +3204,6 @@ void XMLTextParagraphExport::exportTitleAndDescription(
} }
} }
void XMLTextParagraphExport::setTextEmbeddedGraphicURL(
const Reference < XPropertySet >&,
OUString& /*rStreamName*/ ) const
{
}
bool XMLTextParagraphExport::addHyperlinkAttributes( bool XMLTextParagraphExport::addHyperlinkAttributes(
const Reference< XPropertySet > & rPropSet, const Reference< XPropertySet > & rPropSet,
const Reference< XPropertyState > & rPropState, const Reference< XPropertyState > & rPropState,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment