diff options
author | Armin Le Grand <alg@apache.org> | 2012-05-15 10:16:23 +0000 |
---|---|---|
committer | Armin Le Grand <alg@apache.org> | 2012-05-15 10:16:23 +0000 |
commit | 977a0eff5415a2a4716e02bfab8e69ffb64ad7ce (patch) | |
tree | 4017aa9746a9642c0aa7f73a49d246225910fe3f /sw | |
parent | 328998206948c32dd45875e4c42e39def1a18371 (diff) |
#118780# Moved ObjectInfoPrimitive2D extractor to drawinglayer, changed name to be the filename only, added code to SW to set Title and Desc
Notes
Notes:
merged as: bd55f05b332c1573bd410fd9e21ea7fcf977e1b0
Diffstat (limited to 'sw')
-rw-r--r-- | sw/inc/ndgrf.hxx | 27 | ||||
-rw-r--r-- | sw/source/core/doc/doc.cxx | 14 | ||||
-rw-r--r-- | sw/source/core/doc/notxtfrm.cxx | 21 | ||||
-rw-r--r-- | sw/source/core/docnode/swbaslnk.cxx | 18 | ||||
-rw-r--r-- | sw/source/core/graphic/ndgrf.cxx | 174 | ||||
-rw-r--r-- | sw/source/filter/rtf/rtffly.cxx | 2 |
6 files changed, 176 insertions, 80 deletions
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx index e6a0cd5d544f..7a7958b283bf 100644 --- a/sw/inc/ndgrf.hxx +++ b/sw/inc/ndgrf.hxx @@ -45,7 +45,7 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTxtNode { friend class SwNodes; - GraphicObject aGrfObj; + GraphicObject maGrfObj; GraphicObject* mpReplacementGraphic; ::sfx2::SvBaseLinkRef refLink; // falls Grafik nur als Link, dann Pointer gesetzt Size nGrfSize; @@ -89,7 +89,7 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTxtNode void InsertLink( const String& rGrfName, const String& rFltName ); sal_Bool ImportGraphic( SvStream& rStrm ); - sal_Bool HasStreamName() const { return aGrfObj.HasUserData(); } + 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# @@ -144,20 +144,31 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTxtNode public: virtual ~SwGrfNode(); - const Graphic& GetGrf() const { return aGrfObj.GetGraphic(); } - const GraphicObject& GetGrfObj() const { return aGrfObj; } - GraphicObject& GetGrfObj() { return aGrfObj; } + const Graphic& GetGrf() const { return maGrfObj.GetGraphic(); } + const GraphicObject& GetGrfObj() const { return maGrfObj; } const GraphicObject* GetReplacementGrfObj() const; - virtual SwCntntNode *SplitCntntNode( const SwPosition & ); + /// isolated only way to set GraphicObject to allow more actions when doing so + void SetGraphic(const Graphic& rGraphic, const String& rLink); + + /// wrappers for non-const calls at GraphicObject + void ReleaseGraphicFromCache() { maGrfObj.ReleaseFromCache(); } + void DrawGraphicWithPDFHandling(OutputDevice& rOutDev, const Point& rPt, const Size& rSz, const GraphicAttr* pGrfAttr = NULL, const sal_uLong nFlags = GRFMGR_DRAW_STANDARD) { maGrfObj.DrawWithPDFHandling(rOutDev, rPt, rSz, pGrfAttr, nFlags); } + void StartGraphicAnimation(OutputDevice* pOut, const Point& rPt, const Size& rSz, long nExtraData = 0, const GraphicAttr* pAttr = NULL, sal_uLong nFlags = GRFMGR_DRAW_STANDARD, OutputDevice* pFirstFrameOutDev = NULL) { maGrfObj.StartAnimation(pOut, rPt, rSz, nExtraData, pAttr, nFlags, pFirstFrameOutDev); } + void StopGraphicAnimation(OutputDevice* pOut = NULL, long nExtraData = 0) { maGrfObj.StopAnimation(pOut, nExtraData); } + + /// allow reaction on change of content of GraphicObject, so always call + /// when GraphicObject content changes + void onGraphicChanged(); + virtual Size GetTwipSize() const; #ifndef _FESHVIEW_ONLY_INLINE_NEEDED void SetTwipSize( const Size& rSz ); sal_Bool IsTransparent() const; - inline sal_Bool IsAnimated() const { return aGrfObj.IsAnimated(); } + inline sal_Bool IsAnimated() const { return maGrfObj.IsAnimated(); } inline sal_Bool IsChgTwipSize() const { return bChgTwipSize; } inline sal_Bool IsChgTwipSizeFromPixel() const { return bChgTwipSizeFromPixel; } @@ -187,7 +198,7 @@ public: // Entfernen der Grafik, um Speicher freizugeben short SwapOut(); // Zugriff auf den Storage-Streamnamen - void SetStreamName( const String& r ) { aGrfObj.SetUserData( r ); } + 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; diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx index c061ffbe40ed..35c8891dc736 100644 --- a/sw/source/core/doc/doc.cxx +++ b/sw/source/core/doc/doc.cxx @@ -975,11 +975,14 @@ SwFlyFrmFmt* SwDoc::Insert( const SwPaM &rRg, { if( !pFrmFmt ) pFrmFmt = GetFrmFmtFromPool( RES_POOLFRM_GRAPHIC ); - return _InsNoTxtNode( *rRg.GetPoint(), GetNodes().MakeGrfNode( + SwGrfNode* pSwGrfNode = GetNodes().MakeGrfNode( SwNodeIndex( GetNodes().GetEndOfAutotext() ), rGrfName, rFltName, pGraphic, - pDfltGrfFmtColl ), + pDfltGrfFmtColl ); + SwFlyFrmFmt* pSwFlyFrmFmt = _InsNoTxtNode( *rRg.GetPoint(), pSwGrfNode, pFlyAttrSet, pGrfAttrSet, pFrmFmt ); + pSwGrfNode->onGraphicChanged(); + return pSwFlyFrmFmt; } SwFlyFrmFmt* SwDoc::Insert( const SwPaM &rRg, const GraphicObject& rGrfObj, const SfxItemSet* pFlyAttrSet, @@ -988,10 +991,13 @@ SwFlyFrmFmt* SwDoc::Insert( const SwPaM &rRg, const GraphicObject& rGrfObj, { if( !pFrmFmt ) pFrmFmt = GetFrmFmtFromPool( RES_POOLFRM_GRAPHIC ); - return _InsNoTxtNode( *rRg.GetPoint(), GetNodes().MakeGrfNode( + SwGrfNode* pSwGrfNode = GetNodes().MakeGrfNode( SwNodeIndex( GetNodes().GetEndOfAutotext() ), - rGrfObj, pDfltGrfFmtColl ), + rGrfObj, pDfltGrfFmtColl ); + SwFlyFrmFmt* pSwFlyFrmFmt = _InsNoTxtNode( *rRg.GetPoint(), pSwGrfNode, pFlyAttrSet, pGrfAttrSet, pFrmFmt ); + pSwGrfNode->onGraphicChanged(); + return pSwFlyFrmFmt; } SwFlyFrmFmt* SwDoc::Insert(const SwPaM &rRg, const svt::EmbeddedObjectRef& xObj, diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx index e2cfe770877f..247530c502cc 100644 --- a/sw/source/core/doc/notxtfrm.cxx +++ b/sw/source/core/doc/notxtfrm.cxx @@ -653,7 +653,7 @@ sal_Bool SwNoTxtFrm::GetCrsrOfst(SwPosition* pPos, Point& , } #define CLEARCACHE( pNd ) {\ - (pNd)->GetGrfObj().ReleaseFromCache();\ + (pNd)->ReleaseGraphicFromCache();\ SwFlyFrm* pFly = FindFlyFrm();\ if( pFly && pFly->GetFmt()->GetSurround().IsContour() )\ {\ @@ -948,7 +948,7 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons if( pGrfNd ) { sal_Bool bForceSwap = sal_False, bContinue = sal_True; - GraphicObject& rGrfObj = pGrfNd->GetGrfObj(); + const GraphicObject& rGrfObj = pGrfNd->GetGrfObj(); GraphicAttr aGrfAttr; pGrfNd->GetGraphicAttr( aGrfAttr, this ); @@ -991,9 +991,9 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons else if( rGrfObj.IsCached( pOut, aAlignedGrfArea.Pos(), aAlignedGrfArea.SSize(), &aGrfAttr )) { - rGrfObj.DrawWithPDFHandling( *pOut, - aAlignedGrfArea.Pos(), aAlignedGrfArea.SSize(), - &aGrfAttr ); + pGrfNd->DrawGraphicWithPDFHandling(*pOut, + aAlignedGrfArea.Pos(), aAlignedGrfArea.SSize(), + &aGrfAttr ); bContinue = sal_False; } } @@ -1027,7 +1027,7 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons pShell->GetViewOptions()->IsPDFExport(), "pOut sollte kein virtuelles Device sein" ); - rGrfObj.StartAnimation( pOut, aAlignedGrfArea.Pos(), + pGrfNd->StartGraphicAnimation(pOut, aAlignedGrfArea.Pos(), aAlignedGrfArea.SSize(), long(this), 0, GRFMGR_DRAW_STANDARD, pVout ); } @@ -1060,7 +1060,7 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons if(!bDone) { // fallback paint, uses replacement image - rGrfObj.DrawWithPDFHandling(*pOut, aAlignedGrfArea.Pos(), aAlignedGrfArea.SSize(), &aGrfAttr); + pGrfNd->DrawGraphicWithPDFHandling(*pOut, aAlignedGrfArea.Pos(), aAlignedGrfArea.SSize(), &aGrfAttr); } } } @@ -1221,9 +1221,12 @@ sal_Bool SwNoTxtFrm::IsTransparent() const void SwNoTxtFrm::StopAnimation( OutputDevice* pOut ) const { //animierte Grafiken anhalten - SwGrfNode* pGrfNd = (SwGrfNode*)GetNode()->GetGrfNode(); + const SwGrfNode* pGrfNd = dynamic_cast< const SwGrfNode* >(GetNode()->GetGrfNode()); + if( pGrfNd && pGrfNd->IsAnimated() ) - pGrfNd->GetGrfObj().StopAnimation( pOut, long(this) ); + { + const_cast< SwGrfNode* >(pGrfNd)->StopGraphicAnimation( pOut, long(this) ); + } } diff --git a/sw/source/core/docnode/swbaslnk.cxx b/sw/source/core/docnode/swbaslnk.cxx index 8715ea56f344..20aaa53c0aec 100644 --- a/sw/source/core/docnode/swbaslnk.cxx +++ b/sw/source/core/docnode/swbaslnk.cxx @@ -144,13 +144,15 @@ void SwBaseLink::DataChanged( const String& rMimeType, if( pCntntNode->IsGrfNode() ) { - GraphicObject& rGrfObj = ((SwGrfNode*)pCntntNode)->GetGrfObj(); + SwGrfNode* pSwGrfNode = dynamic_cast< SwGrfNode* >(pCntntNode); + OSL_ENSURE(pSwGrfNode, "Error, pSwGrfNode expected when node answers IsGrfNode() with true (!)"); + const GraphicObject& rGrfObj = pSwGrfNode->GetGrfObj(); - bDontNotify = ((SwGrfNode*)pCntntNode)->IsFrameInPaint(); + bDontNotify = pSwGrfNode->IsFrameInPaint(); bGraphicArrived = GetObj()->IsDataComplete(); bGraphicPieceArrived = GetObj()->IsPending(); - ((SwGrfNode*)pCntntNode)->SetGrafikArrived( bGraphicArrived ); + pSwGrfNode->SetGrafikArrived( bGraphicArrived ); Graphic aGrf; if( sfx2::LinkManager::GetGraphicFromAny( rMimeType, rValue, aGrf ) && @@ -158,7 +160,7 @@ void SwBaseLink::DataChanged( const String& rMimeType, GRAPHIC_DEFAULT != rGrfObj.GetType() ) ) { aGrfSz = ::GetGraphicSizeTwip( aGrf, 0 ); - if( static_cast< const SwGrfNode * >( pCntntNode )->IsChgTwipSizeFromPixel() ) + if( pSwGrfNode->IsChgTwipSizeFromPixel() ) { const MapMode aMapTwip( MAP_TWIP ); aFrmFmtSz = @@ -170,7 +172,7 @@ void SwBaseLink::DataChanged( const String& rMimeType, { aFrmFmtSz = aGrfSz; } - Size aSz( ((SwGrfNode*)pCntntNode)->GetTwipSize() ); + Size aSz( pSwGrfNode->GetTwipSize() ); if( bGraphicPieceArrived && GRAPHIC_DEFAULT != aGrf.GetType() && ( !aSz.Width() || !aSz.Height() ) ) @@ -183,7 +185,7 @@ void SwBaseLink::DataChanged( const String& rMimeType, bGraphicPieceArrived = sal_False; } - rGrfObj.SetGraphic( aGrf, rGrfObj.GetLink() ); + pSwGrfNode->SetGraphic(aGrf, rGrfObj.GetLink()); bUpdate = sal_True; // Bug 33999: damit der Node den Transparent-Status @@ -196,11 +198,11 @@ void SwBaseLink::DataChanged( const String& rMimeType, if( aGrfSz.Height() && aGrfSz.Width() && aSz.Height() && aSz.Width() && aGrfSz != aSz ) - ((SwGrfNode*)pCntntNode)->SetTwipSize( aGrfSz ); + pSwGrfNode->SetTwipSize( aGrfSz ); } } if ( bUpdate && !bGraphicArrived && !bGraphicPieceArrived ) - ((SwGrfNode*)pCntntNode)->SetTwipSize( Size(0,0) ); + pSwGrfNode->SetTwipSize( Size(0,0) ); } else if( pCntntNode->IsOLENode() ) bUpdate = sal_True; diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index cd68a0df3e3e..b96e13f1f8ea 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -57,9 +57,10 @@ #include <tools/link.hxx> #include <vcl/svapp.hxx> #include <com/sun/star/io/XSeekable.hpp> -// --> OD 2007-03-28 #i73788# #include <retrieveinputstreamconsumer.hxx> -// <-- +#include <drawinglayer/processor2d/objectinfoextractor2d.hxx> +#include <drawinglayer/primitive2d/objectinfoprimitive2d.hxx> + using namespace com::sun::star; @@ -73,14 +74,14 @@ SwGrfNode::SwGrfNode( SwGrfFmtColl *pGrfColl, SwAttrSet* pAutoAttr ) : SwNoTxtNode( rWhere, ND_GRFNODE, pGrfColl, pAutoAttr ), - aGrfObj(), + maGrfObj(), mpReplacementGraphic(0), // --> OD 2007-01-23 #i73788# mbLinkedInputStreamReady( false ), mbIsStreamReadOnly( sal_False ) // <-- { - aGrfObj.SetSwapStreamHdl( LINK( this, SwGrfNode, SwapGraphic ) ); + maGrfObj.SetSwapStreamHdl( LINK( this, SwGrfNode, SwapGraphic ) ); bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel = bLoadLowResGrf = bFrameInPaint = bScaleImageMap = sal_False; @@ -92,17 +93,17 @@ SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere, const GraphicObject& rGrfObj, SwGrfFmtColl *pGrfColl, SwAttrSet* pAutoAttr ) : SwNoTxtNode( rWhere, ND_GRFNODE, pGrfColl, pAutoAttr ), - aGrfObj(rGrfObj), + maGrfObj(rGrfObj), mpReplacementGraphic(0), // --> OD 2007-01-23 #i73788# mbLinkedInputStreamReady( false ), mbIsStreamReadOnly( sal_False ) // <-- { - aGrfObj = rGrfObj; - aGrfObj.SetSwapStreamHdl( LINK( this, SwGrfNode, SwapGraphic ) ); + maGrfObj = rGrfObj; + maGrfObj.SetSwapStreamHdl( LINK( this, SwGrfNode, SwapGraphic ) ); if( rGrfObj.HasUserData() && rGrfObj.IsSwappedOut() ) - aGrfObj.SetSwapState(); + maGrfObj.SetSwapState(); bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel= bLoadLowResGrf = bFrameInPaint = bScaleImageMap = sal_False; bGrafikArrived = sal_True; @@ -117,17 +118,17 @@ SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere, SwGrfFmtColl *pGrfColl, SwAttrSet* pAutoAttr ) : SwNoTxtNode( rWhere, ND_GRFNODE, pGrfColl, pAutoAttr ), - aGrfObj(), + maGrfObj(), mpReplacementGraphic(0), // --> OD 2007-01-23 #i73788# mbLinkedInputStreamReady( false ), mbIsStreamReadOnly( sal_False ) // <-- { - aGrfObj.SetSwapStreamHdl( LINK( this, SwGrfNode, SwapGraphic ) ); + maGrfObj.SetSwapStreamHdl( LINK( this, SwGrfNode, SwapGraphic ) ); Graphic aGrf; aGrf.SetDefaultType(); - aGrfObj.SetGraphic( aGrf, rGrfName ); + maGrfObj.SetGraphic( aGrf, rGrfName ); bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel = bLoadLowResGrf = bFrameInPaint = bScaleImageMap = sal_False; @@ -196,15 +197,17 @@ sal_Bool SwGrfNode::ReRead( if( pGraphic ) { - aGrfObj.SetGraphic( *pGraphic, rGrfName ); + maGrfObj.SetGraphic( *pGraphic, rGrfName ); + onGraphicChanged(); bReadGrf = sal_True; } else if( pGrfObj ) { - aGrfObj = *pGrfObj; + maGrfObj = *pGrfObj; if( pGrfObj->HasUserData() && pGrfObj->IsSwappedOut() ) - aGrfObj.SetSwapState(); - aGrfObj.SetLink( rGrfName ); + maGrfObj.SetSwapState(); + maGrfObj.SetLink( rGrfName ); + onGraphicChanged(); bReadGrf = sal_True; } else @@ -213,7 +216,7 @@ sal_Bool SwGrfNode::ReRead( // die korrekte Ersatz-Darstellung erscheint, wenn die // der neue Link nicht geladen werden konnte. Graphic aGrf; aGrf.SetDefaultType(); - aGrfObj.SetGraphic( aGrf, rGrfName ); + maGrfObj.SetGraphic( aGrf, rGrfName ); if( refLink.Is() ) { @@ -232,6 +235,7 @@ sal_Bool SwGrfNode::ReRead( ((SwBaseLink*)&refLink)->SwapIn(); } } + onGraphicChanged(); bSetTwipSize = sal_False; } } @@ -241,7 +245,8 @@ sal_Bool SwGrfNode::ReRead( if( HasStreamName() ) DelStreamName(); - aGrfObj.SetGraphic( *pGraphic ); + maGrfObj.SetGraphic( *pGraphic ); + onGraphicChanged(); bReadGrf = sal_True; } else if( pGrfObj && !rGrfName.Len() ) @@ -250,14 +255,15 @@ sal_Bool SwGrfNode::ReRead( if( HasStreamName() ) DelStreamName(); - aGrfObj = *pGrfObj; + maGrfObj = *pGrfObj; + onGraphicChanged(); if( pGrfObj->HasUserData() && pGrfObj->IsSwappedOut() ) - aGrfObj.SetSwapState(); + maGrfObj.SetSwapState(); bReadGrf = sal_True; } // Import einer Grafik: // Ist die Grafik bereits geladen? - else if( !bNewGrf && GRAPHIC_NONE != aGrfObj.GetType() ) + else if( !bNewGrf && GRAPHIC_NONE != maGrfObj.GetType() ) return sal_True; else @@ -272,15 +278,17 @@ sal_Bool SwGrfNode::ReRead( { if( pGraphic ) { - aGrfObj.SetGraphic( *pGraphic, rGrfName ); + maGrfObj.SetGraphic( *pGraphic, rGrfName ); + onGraphicChanged(); bReadGrf = sal_True; // Verbindung herstellen ohne ein Update; Grafik haben wir! ((SwBaseLink*)&refLink)->Connect(); } else if( pGrfObj ) { - aGrfObj = *pGrfObj; - aGrfObj.SetLink( rGrfName ); + maGrfObj = *pGrfObj; + maGrfObj.SetLink( rGrfName ); + onGraphicChanged(); bReadGrf = sal_True; // Verbindung herstellen ohne ein Update; Grafik haben wir! ((SwBaseLink*)&refLink)->Connect(); @@ -291,7 +299,8 @@ sal_Bool SwGrfNode::ReRead( // die korrekte Ersatz-Darstellung erscheint, wenn die // der neue Kink nicht geladen werden konnte. Graphic aGrf; aGrf.SetDefaultType(); - aGrfObj.SetGraphic( aGrf, rGrfName ); + maGrfObj.SetGraphic( aGrf, rGrfName ); + onGraphicChanged(); // --> OD 2006-11-03 #i59688# // do not load linked graphic, if it isn't a new linked graphic. // //TODO refLink->setInputStream(getInputStream()); @@ -308,7 +317,7 @@ sal_Bool SwGrfNode::ReRead( // Bug 39281: Size nicht sofort loeschen - Events auf ImageMaps // sollten nicht beim Austauschen nicht ins "leere greifen" if( bSetTwipSize ) - SetTwipSize( ::GetGraphicSizeTwip( aGrfObj.GetGraphic(), 0 ) ); + SetTwipSize( ::GetGraphicSizeTwip( maGrfObj.GetGraphic(), 0 ) ); // erzeuge noch einen Update auf die Frames if( bReadGrf && bNewGrf ) @@ -358,6 +367,67 @@ SwGrfNode::~SwGrfNode() DelFrms(); } +/// allow reaction on change of content of GraphicObject +void SwGrfNode::onGraphicChanged() +{ + // try to access SwFlyFrmFmt; since title/desc/name are set there, there is no + // use to continue if it is not yet set. If not yet set, call onGraphicChanged() + // when it is set. + SwFlyFrmFmt* pFlyFmt = dynamic_cast< SwFlyFrmFmt* >(GetFlyFmt()); + + if(pFlyFmt) + { + String aName; + String aTitle; + String aDesc; + const SvgDataPtr& rSvgDataPtr = GetGrf().getSvgData(); + + if(rSvgDataPtr.get()) + { + const drawinglayer::primitive2d::Primitive2DSequence aSequence(rSvgDataPtr->getPrimitive2DSequence()); + + if(aSequence.hasElements()) + { + drawinglayer::geometry::ViewInformation2D aViewInformation2D; + drawinglayer::processor2d::ObjectInfoPrimitiveExtractor2D aProcessor(aViewInformation2D); + + aProcessor.process(aSequence); + + const drawinglayer::primitive2d::ObjectInfoPrimitive2D* pResult = aProcessor.getResult(); + + if(pResult) + { + aName = pResult->getName(); + aTitle = pResult->getTitle(); + aDesc = pResult->getDesc(); + } + } + } + + // do not use this currently; it seems that this name has to be unique in + // the writer model and is already set to some default + //if(aName.Len() && pFlyFmt) + //{ + // pFlyFmt->SetName(aName); + //} + + if(aTitle.Len()) + { + SetTitle(aTitle); + } + + if(aDesc.Len()) + { + SetDescription(aDesc); + } + } +} + +void SwGrfNode::SetGraphic(const Graphic& rGraphic, const String& rLink) +{ + maGrfObj.SetGraphic(rGraphic, rLink); + onGraphicChanged(); +} const GraphicObject* SwGrfNode::GetReplacementGrfObj() const { @@ -420,15 +490,16 @@ Size SwGrfNode::GetTwipSize() const sal_Bool SwGrfNode::ImportGraphic( SvStream& rStrm ) { Graphic aGraphic; - const String aURL(aGrfObj.GetUserData()); + const String aURL(maGrfObj.GetUserData()); if(!GraphicFilter::GetGraphicFilter()->ImportGraphic(aGraphic, aURL, rStrm)) { delete mpReplacementGraphic; mpReplacementGraphic = 0; - aGrfObj.SetGraphic( aGraphic ); - aGrfObj.SetUserData( aURL ); + maGrfObj.SetGraphic( aGraphic ); + maGrfObj.SetUserData( aURL ); + onGraphicChanged(); return sal_True; } @@ -443,7 +514,7 @@ sal_Bool SwGrfNode::ImportGraphic( SvStream& rStrm ) short SwGrfNode::SwapIn( sal_Bool bWaitForData ) { if( bInSwapIn ) // nicht rekuriv!! - return !aGrfObj.IsSwappedOut(); + return !maGrfObj.IsSwappedOut(); short nRet = 0; bInSwapIn = sal_True; @@ -451,25 +522,26 @@ short SwGrfNode::SwapIn( sal_Bool bWaitForData ) if( pLink ) { - if( GRAPHIC_NONE == aGrfObj.GetType() || - GRAPHIC_DEFAULT == aGrfObj.GetType() ) + if( GRAPHIC_NONE == maGrfObj.GetType() || + GRAPHIC_DEFAULT == maGrfObj.GetType() ) { // noch nicht geladener Link //TODO pLink->setInputStream(getInputStream()); if( pLink->SwapIn( bWaitForData ) ) nRet = -1; - else if( GRAPHIC_DEFAULT == aGrfObj.GetType() ) + else if( GRAPHIC_DEFAULT == maGrfObj.GetType() ) { // keine default Bitmap mehr, also neu Painten! delete mpReplacementGraphic; mpReplacementGraphic = 0; - aGrfObj.SetGraphic( Graphic() ); + maGrfObj.SetGraphic( Graphic() ); + onGraphicChanged(); SwMsgPoolItem aMsgHint( RES_GRAPHIC_PIECE_ARRIVED ); ModifyNotification( &aMsgHint, &aMsgHint ); } } - else if( aGrfObj.IsSwappedOut() ) { + else if( maGrfObj.IsSwappedOut() ) { // nachzuladender Link //TODO pLink->setInputStream(getInputStream()); nRet = pLink->SwapIn( bWaitForData ) ? 1 : 0; @@ -477,11 +549,11 @@ short SwGrfNode::SwapIn( sal_Bool bWaitForData ) else nRet = 1; } - else if( aGrfObj.IsSwappedOut() ) + else if( maGrfObj.IsSwappedOut() ) { // Die Grafik ist im Storage oder im TempFile drin if( !HasStreamName() ) - nRet = (short)aGrfObj.SwapIn(); + nRet = (short)maGrfObj.SwapIn(); else { @@ -526,7 +598,7 @@ short SwGrfNode::SwapIn( sal_Bool bWaitForData ) if( nRet ) { if( !nGrfSize.Width() && !nGrfSize.Height() ) - SetTwipSize( ::GetGraphicSizeTwip( aGrfObj.GetGraphic(), 0 ) ); + SetTwipSize( ::GetGraphicSizeTwip( maGrfObj.GetGraphic(), 0 ) ); } bInSwapIn = sal_False; return nRet; @@ -535,9 +607,9 @@ short SwGrfNode::SwapIn( sal_Bool bWaitForData ) short SwGrfNode::SwapOut() { - if( aGrfObj.GetType() != GRAPHIC_DEFAULT && - aGrfObj.GetType() != GRAPHIC_NONE && - !aGrfObj.IsSwappedOut() && !bInSwapIn ) + if( maGrfObj.GetType() != GRAPHIC_DEFAULT && + maGrfObj.GetType() != GRAPHIC_NONE && + !maGrfObj.IsSwappedOut() && !bInSwapIn ) { if( !refLink.Is() ) { @@ -546,11 +618,11 @@ short SwGrfNode::SwapOut() // sie frisch eingefuegt war, d.h. wenn es noch keinen // Streamnamen im Storage gibt. if( !HasStreamName() ) - if( !aGrfObj.SwapOut() ) + if( !maGrfObj.SwapOut() ) return 0; } // Geschriebene Grafiken oder Links werden jetzt weggeschmissen - return (short) aGrfObj.SwapOut( NULL ); + return (short) maGrfObj.SwapOut( NULL ); } return 1; } @@ -661,7 +733,7 @@ void SwGrfNode::InsertLink( const String& rGrfName, const String& rFltName ) (!bSync && rFltName.Len() ? &rFltName : 0) ); } } - aGrfObj.SetLink( rGrfName ); + maGrfObj.SetLink( rGrfName ); } @@ -680,7 +752,7 @@ void SwGrfNode::ReleaseLink() } getIDocumentLinksAdministration()->GetLinkManager().Remove( refLink ); refLink.Clear(); - aGrfObj.SetLink(); + maGrfObj.SetLink(); } } @@ -787,7 +859,7 @@ void SwGrfNode::DelStreamName() } } - aGrfObj.SetUserData(); + maGrfObj.SetUserData(); } } @@ -882,7 +954,7 @@ void SwGrfNode::_GetStreamStorageNames( String& rStrmName, rStorName.Erase(); rStrmName.Erase(); - String aUserData( aGrfObj.GetUserData() ); + String aUserData( maGrfObj.GetUserData() ); if( !aUserData.Len() ) return; @@ -936,7 +1008,7 @@ SwCntntNode* SwGrfNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const SvStream* pStrm = _GetStreamForEmbedGrf( refPics, aStrmName ); if ( pStrm ) { - const String aURL(aGrfObj.GetUserData()); + const String aURL(maGrfObj.GetUserData()); GraphicFilter::GetGraphicFilter()->ImportGraphic(aTmpGrf, aURL, *pStrm); delete pStrm; } @@ -952,9 +1024,9 @@ SwCntntNode* SwGrfNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const } else { - if( aGrfObj.IsSwappedOut() ) + if( maGrfObj.IsSwappedOut() ) const_cast<SwGrfNode*>(this)->SwapIn(); - aTmpGrf = aGrfObj.GetGraphic(); + aTmpGrf = maGrfObj.GetGraphic(); } const sfx2::LinkManager& rMgr = getIDocumentLinksAdministration()->GetLinkManager(); @@ -1069,7 +1141,7 @@ void DelAllGrfCacheEntries( SwDoc* pDoc ) pLnk->ISA( SwBaseLink ) && 0 != ( pGrfNd = ((SwBaseLink*)pLnk)->GetCntntNode()->GetGrfNode()) ) { - pGrfNd->GetGrfObj().ReleaseFromCache(); + pGrfNd->ReleaseGraphicFromCache(); } } } @@ -1133,7 +1205,7 @@ GraphicAttr& SwGrfNode::GetGraphicAttr( GraphicAttr& rGA, sal_Bool SwGrfNode::IsTransparent() const { - sal_Bool bRet = aGrfObj.IsTransparent(); + sal_Bool bRet = maGrfObj.IsTransparent(); if( !bRet ) // ask the attribut bRet = 0 != GetSwAttrSet().GetTransparencyGrf().GetValue(); diff --git a/sw/source/filter/rtf/rtffly.cxx b/sw/source/filter/rtf/rtffly.cxx index a98704bb48be..375f9beb9265 100644 --- a/sw/source/filter/rtf/rtffly.cxx +++ b/sw/source/filter/rtf/rtffly.cxx @@ -1269,6 +1269,8 @@ void SwRTFParser::InsPicture( const String& rGrfNm, const Graphic* pGrf, if( pFlySave->nEndNd == rIdx ) pFlySave->nEndNd = rIdx.GetIndex() - 1; } + + pGrfNd->onGraphicChanged(); } else { |