You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by or...@apache.org on 2014/05/19 13:37:12 UTC
svn commit: r1595847 - in /openoffice/trunk/main: sw/inc/ndgrf.hxx
sw/source/core/graphic/ndgrf.cxx sw/source/core/unocore/unoframe.cxx
sw/source/filter/xml/xmltexte.cxx xmloff/source/draw/shapeexport2.cxx
Author: orw
Date: Mon May 19 11:37:11 2014
New Revision: 1595847
URL: http://svn.apache.org/r1595847
Log:
114361: provide and accept changed URL of embedded graphic file during save (ODF export)
Modified:
openoffice/trunk/main/sw/inc/ndgrf.hxx
openoffice/trunk/main/sw/source/core/graphic/ndgrf.cxx
openoffice/trunk/main/sw/source/core/unocore/unoframe.cxx
openoffice/trunk/main/sw/source/filter/xml/xmltexte.cxx
openoffice/trunk/main/xmloff/source/draw/shapeexport2.cxx
Modified: openoffice/trunk/main/sw/inc/ndgrf.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/inc/ndgrf.hxx?rev=1595847&r1=1595846&r2=1595847&view=diff
==============================================================================
--- openoffice/trunk/main/sw/inc/ndgrf.hxx (original)
+++ openoffice/trunk/main/sw/inc/ndgrf.hxx Mon May 19 11:37:11 2014
@@ -25,52 +25,38 @@
#include <sfx2/lnkbase.hxx>
#include <svtools/grfmgr.hxx>
#include <ndnotxt.hxx>
-// --> OD, MAV 2005-08-17 #i53025#
#include <com/sun/star/embed/XStorage.hpp>
-// <--
-// --> OD 2007-03-28 #i73788#
#include <boost/shared_ptr.hpp>
#include <boost/weak_ptr.hpp>
class SwAsyncRetrieveInputStreamThreadConsumer;
-// <--
class SwGrfFmtColl;
class SwDoc;
class GraphicAttr;
class SvStorage;
-// --------------------
-// SwGrfNode
-// --------------------
+
+
class SW_DLLPUBLIC SwGrfNode: public SwNoTxtNode
{
- friend class SwNodes;
+ friend class SwNodes;
- GraphicObject maGrfObj;
- GraphicObject* mpReplacementGraphic;
+ GraphicObject maGrfObj;
+ GraphicObject* mpReplacementGraphic;
::sfx2::SvBaseLinkRef refLink; // falls Grafik nur als Link, dann Pointer gesetzt
- Size nGrfSize;
-// String aStrmName; // SW3: Name des Storage-Streams fuer Embedded
- String aNewStrmName; // SW3/XML: new stream name (either SW3 stream
- // name or package url)
- String aLowResGrf; // HTML: LowRes Grafik (Ersatzdarstellung bis
- // die normale (HighRes) geladen ist.
- sal_Bool bTransparentFlagValid :1;
- sal_Bool bInSwapIn :1;
-
- sal_Bool bGrafikArrived :1;
- sal_Bool bChgTwipSize :1;
- sal_Bool bChgTwipSizeFromPixel :1;
- sal_Bool bLoadLowResGrf :1;
- sal_Bool bFrameInPaint :1; //Um Start-/EndActions im Paint (ueber
- //SwapIn zu verhindern.
- sal_Bool bScaleImageMap :1; //Image-Map in SetTwipSize skalieren
+ Size nGrfSize;
+ sal_Bool bInSwapIn :1;
+
+ sal_Bool bGrafikArrived :1;
+ sal_Bool bChgTwipSize :1;
+ sal_Bool bChgTwipSizeFromPixel :1;
+ sal_Bool bLoadLowResGrf :1;
+ sal_Bool bFrameInPaint :1; // Um Start-/EndActions im Paint (ueber SwapIn zu verhindern.
+ sal_Bool bScaleImageMap :1; // Image-Map in SetTwipSize skalieren
- // --> OD 2007-01-19 #i73788#
boost::shared_ptr< SwAsyncRetrieveInputStreamThreadConsumer > mpThreadConsumer;
bool mbLinkedInputStreamReady;
com::sun::star::uno::Reference<com::sun::star::io::XInputStream> mxInputStream;
sal_Bool mbIsStreamReadOnly;
- // <--
SwGrfNode( const SwNodeIndex& rWhere,
const String& rGrfName, const String& rFltName,
@@ -90,13 +76,7 @@ class SW_DLLPUBLIC SwGrfNode: public SwN
void InsertLink( const String& rGrfName, const String& rFltName );
sal_Bool ImportGraphic( SvStream& rStrm );
sal_Bool HasStreamName() const { return maGrfObj.HasUserData(); }
- // --> OD 2005-05-04 #i48434# - adjust return type and rename method to
- // indicate that its an private one.
- // --> OD 2005-08-17 #i53025#
- // embedded graphic stream couldn't be inside a 3.1 - 5.2 storage any more.
- // Thus, return value isn't needed any more.
void _GetStreamStorageNames( String& rStrmName, String& rStgName ) const;
- // <--
void DelStreamName();
DECL_LINK( SwapGraphic, GraphicObject* );
@@ -193,14 +173,18 @@ public:
const GraphicObject* pGrfObj = 0,
sal_Bool bModify = sal_True );
// Laden der Grafik unmittelbar vor der Anzeige
- short SwapIn( sal_Bool bWaitForData = sal_False );
- // Entfernen der Grafik, um Speicher freizugeben
- short SwapOut();
- // Zugriff auf den Storage-Streamnamen
- void SetStreamName( const String& r ) { maGrfObj.SetUserData( r ); }
- void SetNewStreamName( const String& r ) { aNewStrmName = r; }
- // is this node selected by any shell?
- sal_Bool IsSelected() const;
+ short SwapIn( sal_Bool bWaitForData = sal_False );
+ // Entfernen der Grafik, um Speicher freizugeben
+ short SwapOut();
+
+ // applying new stream name for embedded graphic - needed as saving the document might change this stream name
+ void ApplyNewEmbeddedStreamName( const String& r )
+ {
+ maGrfObj.SetUserData( r );
+ }
+
+ // is this node selected by any shell?
+ sal_Bool IsSelected() const;
#endif
// Der Grafik sagen, dass sich der Node im Undobereich befindet
@@ -224,7 +208,6 @@ public:
GraphicAttr& GetGraphicAttr( GraphicAttr&, const SwFrm* pFrm ) const;
#endif
- // --> OD 2007-01-18 #i73788#
boost::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > GetThreadConsumer();
bool IsLinkedInputStreamReady() const;
void TriggerAsyncRetrieveInputStream();
@@ -232,10 +215,7 @@ public:
com::sun::star::uno::Reference<com::sun::star::io::XInputStream> xInputStream,
const sal_Bool bIsStreamReadOnly );
void UpdateLinkWithInputStream();
- // <--
- // --> OD 2008-07-21 #i90395#
bool IsAsyncRetrieveInputStreamPossible() const;
- // <--
};
Modified: openoffice/trunk/main/sw/source/core/graphic/ndgrf.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/graphic/ndgrf.cxx?rev=1595847&r1=1595846&r2=1595847&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/graphic/ndgrf.cxx (original)
+++ openoffice/trunk/main/sw/source/core/graphic/ndgrf.cxx Mon May 19 11:37:11 2014
@@ -68,45 +68,42 @@ using namespace com::sun::star;
// SwGrfNode
// --------------------
SwGrfNode::SwGrfNode(
- const SwNodeIndex & rWhere,
- const String& rGrfName, const String& rFltName,
- const Graphic* pGraphic,
- SwGrfFmtColl *pGrfColl,
- SwAttrSet* pAutoAttr ) :
- SwNoTxtNode( rWhere, ND_GRFNODE, pGrfColl, pAutoAttr ),
- maGrfObj(),
- mpReplacementGraphic(0),
- // --> OD 2007-01-23 #i73788#
- mbLinkedInputStreamReady( false ),
- mbIsStreamReadOnly( sal_False )
- // <--
+ const SwNodeIndex & rWhere,
+ const String& rGrfName,
+ const String& rFltName,
+ const Graphic* pGraphic,
+ SwGrfFmtColl *pGrfColl,
+ SwAttrSet* pAutoAttr )
+ : SwNoTxtNode( rWhere, ND_GRFNODE, pGrfColl, pAutoAttr ),
+ maGrfObj(),
+ mpReplacementGraphic( 0 ),
+ mbLinkedInputStreamReady( false ),
+ mbIsStreamReadOnly( sal_False )
{
- maGrfObj.SetSwapStreamHdl( LINK( this, SwGrfNode, SwapGraphic ) );
- bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel = bLoadLowResGrf =
- bFrameInPaint = bScaleImageMap = sal_False;
+ maGrfObj.SetSwapStreamHdl( LINK( this, SwGrfNode, SwapGraphic ) );
+ bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel = bLoadLowResGrf = bFrameInPaint = bScaleImageMap = sal_False;
bGrafikArrived = sal_True;
- ReRead(rGrfName,rFltName, pGraphic, 0, sal_False);
+ ReRead( rGrfName, rFltName, pGraphic, 0, sal_False );
}
-SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere,
- const GraphicObject& rGrfObj,
- SwGrfFmtColl *pGrfColl, SwAttrSet* pAutoAttr ) :
- SwNoTxtNode( rWhere, ND_GRFNODE, pGrfColl, pAutoAttr ),
- maGrfObj(rGrfObj),
- mpReplacementGraphic(0),
- // --> OD 2007-01-23 #i73788#
- mbLinkedInputStreamReady( false ),
- mbIsStreamReadOnly( sal_False )
- // <--
-{
- maGrfObj = rGrfObj;
- maGrfObj.SetSwapStreamHdl( LINK( this, SwGrfNode, SwapGraphic ) );
- if( rGrfObj.HasUserData() && rGrfObj.IsSwappedOut() )
- maGrfObj.SetSwapState();
- bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel= bLoadLowResGrf =
- bFrameInPaint = bScaleImageMap = sal_False;
- bGrafikArrived = sal_True;
+SwGrfNode::SwGrfNode(
+ const SwNodeIndex & rWhere,
+ const GraphicObject& rGrfObj,
+ SwGrfFmtColl *pGrfColl,
+ SwAttrSet* pAutoAttr )
+ : SwNoTxtNode( rWhere, ND_GRFNODE, pGrfColl, pAutoAttr ),
+ maGrfObj( rGrfObj ),
+ mpReplacementGraphic( 0 ),
+ mbLinkedInputStreamReady( false ),
+ mbIsStreamReadOnly( sal_False )
+{
+ maGrfObj = rGrfObj;
+ maGrfObj.SetSwapStreamHdl( LINK( this, SwGrfNode, SwapGraphic ) );
+ if ( rGrfObj.HasUserData() && rGrfObj.IsSwappedOut() )
+ maGrfObj.SetSwapState();
+ bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel = bLoadLowResGrf = bFrameInPaint = bScaleImageMap = sal_False;
+ bGrafikArrived = sal_True;
}
// Konstruktor fuer den SW/G-Reader. Dieser ctor wird verwendet,
Modified: openoffice/trunk/main/sw/source/core/unocore/unoframe.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/unocore/unoframe.cxx?rev=1595847&r1=1595846&r2=1595847&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/unocore/unoframe.cxx (original)
+++ openoffice/trunk/main/sw/source/core/unocore/unoframe.cxx Mon May 19 11:37:11 2014
@@ -2000,30 +2000,29 @@ uno::Any SwXFrame::getPropertyValue(cons
}
}
else if( FN_UNO_GRAPHIC_U_R_L == pEntry->nWID)
- {
- String sGrfName;
+ {
+ String sGrfName;
const SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx();
- if(pIdx)
- {
- SwNodeIndex aIdx(*pIdx, 1);
-// SwNoTxtNode* pNoTxt = aIdx.GetNode().GetNoTxtNode();
- SwGrfNode* pGrfNode = aIdx.GetNode().GetGrfNode();
- if(!pGrfNode)
- throw uno::RuntimeException();
- if( pGrfNode->IsGrfLink() )
- {
- pFmt->GetDoc()->GetGrfNms( *(SwFlyFrmFmt*)pFmt, &sGrfName, 0 );
- }
- else
- {
- String sPrefix( RTL_CONSTASCII_STRINGPARAM(sGraphicObjectProtocol) );
- String sId( pGrfNode->GetGrfObj().GetUniqueID(),
- RTL_TEXTENCODING_ASCII_US );
- (sGrfName = sPrefix) += sId;
- }
- }
- aAny <<= OUString(sGrfName);
- }
+ if ( pIdx )
+ {
+ SwNodeIndex aIdx( *pIdx, 1 );
+ SwGrfNode* pGrfNode = aIdx.GetNode().GetGrfNode();
+ if ( !pGrfNode )
+ throw uno::RuntimeException();
+ if ( pGrfNode->IsGrfLink() )
+ {
+ pFmt->GetDoc()->GetGrfNms( *(SwFlyFrmFmt*) pFmt, &sGrfName, 0 );
+ }
+ else
+ {
+ String sPrefix( RTL_CONSTASCII_STRINGPARAM( sGraphicObjectProtocol ) );
+ String sId( pGrfNode->GetGrfObj().GetUniqueID(),
+ RTL_TEXTENCODING_ASCII_US );
+ ( sGrfName = sPrefix ) += sId;
+ }
+ }
+ aAny <<= OUString( sGrfName );
+ }
else if( FN_UNO_REPLACEMENT_GRAPHIC_U_R_L == pEntry->nWID)
{
String sGrfName;
Modified: openoffice/trunk/main/sw/source/filter/xml/xmltexte.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/xml/xmltexte.cxx?rev=1595847&r1=1595846&r2=1595847&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/xml/xmltexte.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/xml/xmltexte.cxx Mon May 19 11:37:11 2014
@@ -222,7 +222,7 @@ void SwXMLTextParagraphExport::setTextEm
{
String aNewURL( RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.Package:") );
aNewURL += String(rURL);
- pGrfNd->SetNewStreamName( aNewURL );
+ pGrfNd->ApplyNewEmbeddedStreamName( aNewURL );
// #i15411# save-as will swap all graphics in; we need to swap
// them out again, to prevent excessive memory use
Modified: openoffice/trunk/main/xmloff/source/draw/shapeexport2.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmloff/source/draw/shapeexport2.cxx?rev=1595847&r1=1595846&r2=1595847&view=diff
==============================================================================
--- openoffice/trunk/main/xmloff/source/draw/shapeexport2.cxx (original)
+++ openoffice/trunk/main/xmloff/source/draw/shapeexport2.cxx Mon May 19 11:37:11 2014
@@ -1089,38 +1089,39 @@ void XMLShapeExport::ImpExportPolygonSha
//////////////////////////////////////////////////////////////////////////////
void XMLShapeExport::ImpExportGraphicObjectShape(
- const uno::Reference< drawing::XShape >& xShape,
- XmlShapeType eShapeType, sal_Int32 nFeatures, awt::Point* pRefPoint)
+ const uno::Reference< drawing::XShape >& xShape,
+ XmlShapeType eShapeType,
+ sal_Int32 nFeatures,
+ awt::Point* pRefPoint )
{
- const uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY);
- if(xPropSet.is())
- {
- sal_Bool bIsEmptyPresObj = sal_False;
- uno::Reference< beans::XPropertySetInfo > xPropSetInfo( xPropSet->getPropertySetInfo() );
+ const uno::Reference< beans::XPropertySet > xPropSet( xShape, uno::UNO_QUERY );
+ if ( xPropSet.is() )
+ {
+ sal_Bool bIsEmptyPresObj = sal_False;
+ uno::Reference< beans::XPropertySetInfo > xPropSetInfo( xPropSet->getPropertySetInfo() );
- // Transformation
- ImpExportNewTrans(xPropSet, nFeatures, pRefPoint);
+ // Transformation
+ ImpExportNewTrans( xPropSet, nFeatures, pRefPoint );
- OUString sImageURL;
+ OUString sImageURL;
- if(eShapeType == XmlShapeTypePresGraphicObjectShape)
- bIsEmptyPresObj = ImpExportPresentationAttributes( xPropSet, GetXMLToken(XML_PRESENTATION_GRAPHIC) );
+ if ( eShapeType == XmlShapeTypePresGraphicObjectShape )
+ bIsEmptyPresObj = ImpExportPresentationAttributes( xPropSet, GetXMLToken( XML_PRESENTATION_GRAPHIC ) );
- sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
- SvXMLElementExport aElem( mrExport, XML_NAMESPACE_DRAW,
- XML_FRAME, bCreateNewline, sal_True );
+ sal_Bool bCreateNewline( ( nFeatures & SEF_EXPORT_NO_WS ) == 0 ); // #86116#/#92210#
+ SvXMLElementExport aElem( mrExport, XML_NAMESPACE_DRAW, XML_FRAME, bCreateNewline, sal_True );
- const bool bSaveBackwardsCompatible = ( mrExport.getExportFlags() & EXPORT_SAVEBACKWARDCOMPATIBLE );
+ const bool bSaveBackwardsCompatible = ( mrExport.getExportFlags() & EXPORT_SAVEBACKWARDCOMPATIBLE );
- if( !bIsEmptyPresObj || bSaveBackwardsCompatible )
- {
- if( !bIsEmptyPresObj )
- {
+ if ( !bIsEmptyPresObj || bSaveBackwardsCompatible )
+ {
+ if ( !bIsEmptyPresObj )
+ {
OUString aReplacementUrl;
xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("ReplacementGraphicURL"))) >>= aReplacementUrl;
// If there is no url, then then graphic is empty
- if(aReplacementUrl.getLength())
+ if ( aReplacementUrl.getLength() )
{
const OUString aStr = mrExport.AddEmbeddedGraphicObject(aReplacementUrl);
@@ -1140,81 +1141,83 @@ void XMLShapeExport::ImpExportGraphicObj
}
OUString aStreamURL;
- OUString aStr;
-
- xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("GraphicStreamURL"))) >>= aStreamURL;
- xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("GraphicURL"))) >>= sImageURL;
+ xPropSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "GraphicStreamURL" ) ) ) >>= aStreamURL;
+ xPropSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "GraphicURL" ) ) ) >>= sImageURL;
- OUString aResolveURL( sImageURL );
- const rtl::OUString sPackageURL( RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.Package:") );
+ OUString aResolveURL( sImageURL );
+ const rtl::OUString sPackageURL( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.Package:" ) );
- // sj: trying to preserve the filename
- if ( aStreamURL.match( sPackageURL, 0 ) )
- {
- rtl::OUString sRequestedName( aStreamURL.copy( sPackageURL.getLength(), aStreamURL.getLength() - sPackageURL.getLength() ) );
- sal_Int32 nLastIndex = sRequestedName.lastIndexOf( '/' ) + 1;
- if ( ( nLastIndex > 0 ) && ( nLastIndex < sRequestedName.getLength() ) )
- sRequestedName = sRequestedName.copy( nLastIndex, sRequestedName.getLength() - nLastIndex );
- nLastIndex = sRequestedName.lastIndexOf( '.' );
- if ( nLastIndex >= 0 )
- sRequestedName = sRequestedName.copy( 0, nLastIndex );
- if ( sRequestedName.getLength() )
- {
- aResolveURL = aResolveURL.concat( OUString(RTL_CONSTASCII_USTRINGPARAM("?requestedName=")));
- aResolveURL = aResolveURL.concat( sRequestedName );
- }
- }
+ // sj: trying to preserve the filename
+ if ( aStreamURL.match( sPackageURL, 0 ) )
+ {
+ rtl::OUString sRequestedName( aStreamURL.copy( sPackageURL.getLength(), aStreamURL.getLength() - sPackageURL.getLength() ) );
+ sal_Int32 nLastIndex = sRequestedName.lastIndexOf( '/' ) + 1;
+ if ( ( nLastIndex > 0 ) && ( nLastIndex < sRequestedName.getLength() ) )
+ sRequestedName = sRequestedName.copy( nLastIndex, sRequestedName.getLength() - nLastIndex );
+ nLastIndex = sRequestedName.lastIndexOf( '.' );
+ if ( nLastIndex >= 0 )
+ sRequestedName = sRequestedName.copy( 0, nLastIndex );
+ if ( sRequestedName.getLength() )
+ {
+ aResolveURL = aResolveURL.concat( OUString( RTL_CONSTASCII_USTRINGPARAM( "?requestedName=" ) ) );
+ aResolveURL = aResolveURL.concat( sRequestedName );
+ }
+ }
- aStr = mrExport.AddEmbeddedGraphicObject( aResolveURL );
- mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, aStr );
+ const OUString aStr = mrExport.AddEmbeddedGraphicObject( aResolveURL );
+ mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, aStr );
- if( aStr.getLength() )
- {
- if( aStr[ 0 ] == '#' )
- {
- aStreamURL = sPackageURL;
- aStreamURL = aStreamURL.concat( aStr.copy( 1, aStr.getLength() - 1 ) );
- }
+ if ( !aStr.isEmpty() )
+ {
+ aStreamURL = sPackageURL;
+ if ( aStr[0] == '#' )
+ {
+ aStreamURL = aStreamURL.concat( aStr.copy( 1, aStr.getLength() - 1 ) );
+ }
+ else
+ {
+ aStreamURL = aStreamURL.concat( aStr );
+ }
- // update stream URL for load on demand
- uno::Any aAny;
- aAny <<= aStreamURL;
- xPropSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("GraphicStreamURL")), aAny );
-
- mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE );
- mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED );
- mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD );
- }
- }
- else
- {
- OUString aStr;
- mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, aStr );
- mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE );
- mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED );
- mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD );
- }
+ // update stream URL for load on demand
+ uno::Any aAny;
+ aAny <<= aStreamURL;
+ xPropSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "GraphicStreamURL" ) ), aAny );
+
+ mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE );
+ mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED );
+ mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD );
+ }
+ }
+ else
+ {
+ OUString aStr;
+ mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, aStr );
+ mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE );
+ mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED );
+ mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD );
+ }
- {
- SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_IMAGE, sal_True, sal_True);
+ {
+ SvXMLElementExport aOBJ( mrExport, XML_NAMESPACE_DRAW, XML_IMAGE, sal_True, sal_True );
- if( sImageURL.getLength() )
- {
- // optional office:binary-data
- mrExport.AddEmbeddedGraphicObjectAsBase64( sImageURL );
- }
- if( !bIsEmptyPresObj )
- ImpExportText( xShape );
- }
- }
+ if ( sImageURL.getLength() )
+ {
+ // optional office:binary-data
+ mrExport.AddEmbeddedGraphicObjectAsBase64( sImageURL );
+ }
+ if ( !bIsEmptyPresObj )
+ ImpExportText( xShape );
+ }
+ }
- ImpExportEvents( xShape );
- ImpExportGluePoints( xShape );
+ ImpExportEvents( xShape );
+ ImpExportGluePoints( xShape );
- // image map
- GetExport().GetImageMapExport().Export( xPropSet );
- ImpExportDescription( xShape ); // #i68101#
- }
+ // image map
+ GetExport().GetImageMapExport().Export( xPropSet );
+ ImpExportDescription( xShape ); // #i68101#
+ }
}
//////////////////////////////////////////////////////////////////////////////