ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Remove now useless setTextEmbeddedGraphicURL()

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

Change-Id: I25c829e9bc0c666838baf19cd60f19938ebb430c
This commit is contained in:
Zolnai Tamás
2014-11-16 20:48:19 +01:00
parent db686e8ae1
commit aea2dbc319
5 changed files with 1 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/xmloff/txtparae.hxx
-4
View File
@@ -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(
sw/inc/ndgrf.hxx
+1 -5
View File
@@ -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;
sw/source/filter/xml/xmltexte.cxx
-22
View File
@@ -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 )
{
sw/source/filter/xml/xmltexte.hxx
-5
View File
@@ -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
xmloff/source/text/txtparae.cxx
-7
View File
@@ -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,