summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sw/source/filter/xml/xmltexte.cxx4
-rw-r--r--sw/source/filter/xml/xmltexte.hxx3
-rw-r--r--xmloff/source/draw/shapeexport.cxx4
3 files changed, 7 insertions, 4 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;
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index e028f56e846e..6a6613e486d4 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -128,6 +128,8 @@ using namespace ::com::sun::star;
using namespace ::xmloff::EnhancedCustomShapeToken;
using namespace ::xmloff::token;
+#define XML_EMBEDDEDOBJECTGRAPHIC_URL_BASE "vnd.sun.star.GraphicObject:"
+
namespace {
bool supportsText(XmlShapeType eShapeType)
@@ -2954,7 +2956,7 @@ void XMLShapeExport::ImpExportOLE2Shape(
}
if( !bIsEmptyPresObj )
{
- OUString sURL( "vnd.sun.star.GraphicObject:" );
+ OUString sURL(XML_EMBEDDEDOBJECTGRAPHIC_URL_BASE);
sURL += sPersistName;
if( !bExportEmbedded )
{