svn commit: r1600883 - /openoffice/trunk/main/sw/source/core/graphic/ndgrf.cxx

[orw]

Author: orw
Date: Fri Jun  6 13:31:32 2014
New Revision: 1600883

URL: http://svn.apache.org/r1600883
Log:
124999: As Writer graphics are no longer painted via the graphic manager - see 
<SwNoTxtFrm::PaintPicture(..)> - it is needed to swap out the Writer graphics 
automatically after a certain amount of time. --> 5000ms


Modified:
    openoffice/trunk/main/sw/source/core/graphic/ndgrf.cxx

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=1600883&r1=1600882&r2=1600883&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/graphic/ndgrf.cxx (original)
+++ openoffice/trunk/main/sw/source/core/graphic/ndgrf.cxx Fri Jun  6 13:31:32 
2014
@@ -62,6 +62,11 @@
 using namespace com::sun::star;
 
 
+// As Writer graphics are no longer painted via the graphic manager - see 
<SwNoTxtFrm::PaintPicture(..)> -
+// it is needed to swap out the Writer graphics automatically after a certain 
amount of time.
+// --> 5000ms
+#define TIMETOSWAPOUTGRAPHICAUTOMATICALLY 5000
+
 // --------------------
 // SwGrfNode
 // --------------------
@@ -78,7 +83,7 @@ SwGrfNode::SwGrfNode(
           mbLinkedInputStreamReady( false ),
           mbIsStreamReadOnly( sal_False )
 {
-    maGrfObj.SetSwapStreamHdl( LINK( this, SwGrfNode, SwapGraphic ) );
+    maGrfObj.SetSwapStreamHdl( LINK( this, SwGrfNode, SwapGraphic ), 
TIMETOSWAPOUTGRAPHICAUTOMATICALLY );
     bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel = bLoadLowResGrf = 
bFrameInPaint = bScaleImageMap = sal_False;
 
     bGrafikArrived = sal_True;
@@ -97,7 +102,7 @@ SwGrfNode::SwGrfNode(
           mbIsStreamReadOnly( sal_False )
 {
     maGrfObj = rGrfObj;
-    maGrfObj.SetSwapStreamHdl( LINK( this, SwGrfNode, SwapGraphic ) );
+    maGrfObj.SetSwapStreamHdl( LINK( this, SwGrfNode, SwapGraphic ), 
TIMETOSWAPOUTGRAPHICAUTOMATICALLY );
     if ( rGrfObj.HasUserData() && rGrfObj.IsSwappedOut() )
         maGrfObj.SetSwapState();
     bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel = bLoadLowResGrf = 
bFrameInPaint = bScaleImageMap = sal_False;
@@ -120,7 +125,7 @@ SwGrfNode::SwGrfNode(
           mbLinkedInputStreamReady( false ),
           mbIsStreamReadOnly( sal_False )
 {
-    maGrfObj.SetSwapStreamHdl( LINK( this, SwGrfNode, SwapGraphic ) );
+    maGrfObj.SetSwapStreamHdl( LINK( this, SwGrfNode, SwapGraphic ), 
TIMETOSWAPOUTGRAPHICAUTOMATICALLY );
 
     Graphic aGrf;
     aGrf.SetDefaultType();