diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2018-03-11 01:53:13 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2018-03-11 01:51:38 +0100 |
| commit | 91ab5a07708892c3df6940aeb643d50bfd43e285 (patch) | |
| tree | d4173fc6d98267231e2463a865b14910ccff7baf /sw/source | |
| parent | cfb90793b42ff57281d1cdd8b0c609652664ffe9 (diff) | |
use XML_EMBEDDEDOBJECTGRAPHIC_URL_BASE define
Change-Id: I6d37cc1e745b797a1c727a988177916291b650be
Reviewed-on: https://gerrit.libreoffice.org/51049
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/filter/xml/xmltexte.cxx | 4 | ||||
| -rw-r--r-- | sw/source/filter/xml/xmltexte.hxx | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx index 2324d667cb39..27205f248222 100644 --- a/sw/source/filter/xml/xmltexte.cxx +++ b/sw/source/filter/xml/xmltexte.cxx @@ -79,7 +79,6 @@ SwXMLTextParagraphExport::SwXMLTextParagraphExport( SvXMLAutoStylePoolP& _rAutoStylePool ) : XMLTextParagraphExport( rExp, _rAutoStylePool ), sEmbeddedObjectProtocol( "vnd.sun.star.EmbeddedObject:" ), - sGraphicObjectProtocol( "vnd.sun.star.GraphicObject:" ), aAppletClassId( SO3_APPLET_CLASSID ), aPluginClassId( SO3_PLUGIN_CLASSID ), aIFrameClassId( SO3_IFRAME_CLASSID ) @@ -562,7 +561,8 @@ void SwXMLTextParagraphExport::_exportTextEmbedded( } if( SV_EMBEDDED_OUTPLACE==nType || SV_EMBEDDED_OWN==nType ) { - OUString sURL( sGraphicObjectProtocol + rOLEObj.GetCurrentPersistName() ); + OUString sURL(XML_EMBEDDEDOBJECTGRAPHIC_URL_BASE); + sURL += rOLEObj.GetCurrentPersistName(); if( !(rXMLExport.getExportFlags() & SvXMLExportFlags::EMBEDDED) ) { sURL = GetExport().AddEmbeddedObject( sURL ); diff --git a/sw/source/filter/xml/xmltexte.hxx b/sw/source/filter/xml/xmltexte.hxx index 9ff9581d5070..38d0d2bdd02e 100644 --- a/sw/source/filter/xml/xmltexte.hxx +++ b/sw/source/filter/xml/xmltexte.hxx @@ -23,6 +23,8 @@ #include <xmloff/txtparae.hxx> #include <tools/globname.hxx> +#define XML_EMBEDDEDOBJECTGRAPHIC_URL_BASE "vnd.sun.star.GraphicObject:" + class SwXMLExport; class SvXMLAutoStylePoolP; class SwNoTextNode; @@ -33,7 +35,6 @@ namespace com { namespace sun { namespace star { namespace style { class SwXMLTextParagraphExport : public XMLTextParagraphExport { const OUString sEmbeddedObjectProtocol; - const OUString sGraphicObjectProtocol; const SvGlobalName aAppletClassId; const SvGlobalName aPluginClassId; |