?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
update ooo310-m15
[ooovba.git] / applied_patches / 0575-transogl-fix-first-slide.diff
blobedfc1a80e7bbefe5777b4ad6c97b0b846b1684f7
1 diff -rup ../ooo300-m4-orig/offapi/com/sun/star/presentation/XTransitionFactory.idl offapi/com/sun/star/presentation/XTransitionFactory.idl
2 --- ../ooo300-m4-orig/offapi/com/sun/star/presentation/XTransitionFactory.idl 2008-04-11 12:33:10.000000000 +0200
3 +++ offapi/com/sun/star/presentation/XTransitionFactory.idl 2008-09-18 11:49:53.000000000 +0200
4 @@ -85,8 +85,7 @@ interface XTransitionFactory : ::com::su
5 [in] short transitionSubType,
6 [in] XSlideShowView view,
7 [in] com::sun::star::rendering::XBitmap leavingBitmap,
8 - [in] com::sun::star::rendering::XBitmap enteringBitmap,
9 - [in] com::sun::star::geometry::RealPoint2D slideOffset );
10 + [in] com::sun::star::rendering::XBitmap enteringBitmap );
11 };
12
13 service TransitionFactory : XTransitionFactory;
14 diff -rup ../ooo300-m4-orig/offapi/com/sun/star/presentation/XTransition.idl offapi/com/sun/star/presentation/XTransition.idl
15 --- ../ooo300-m4-orig/offapi/com/sun/star/presentation/XTransition.idl 2008-04-11 12:32:51.000000000 +0200
16 +++ offapi/com/sun/star/presentation/XTransition.idl 2008-09-17 14:55:45.000000000 +0200
17 @@ -35,7 +35,14 @@
18 #include <com/sun/star/uno/XInterface.idl>
19 #endif
20
21 -module com { module sun { module star { module presentation {
22 +module com { module sun { module star {
23 +
24 +module rendering { interface XBitmap; };
25 +
26 +module presentation {
27 +
28 +interface XSlideShowView;
29 +
30 /** Transition interface to render custom transitions over time.<p>
31
32 @since OOo 2.4
33 @@ -49,6 +56,10 @@ interface XTransition : ::com::sun::star
34 [0,1] range.
35 */
36 void update( [in] double t );
37 +
38 + void viewChanged( [in] XSlideShowView view,
39 + [in] com::sun::star::rendering::XBitmap leavingBitmap,
40 + [in] com::sun::star::rendering::XBitmap enteringBitmap );
41 };
42
43 }; }; }; };
44 diff -rup ../ooo300-m4-orig/slideshow//source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx slideshow//source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx
45 --- ../ooo300-m4-orig/slideshow//source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx 2008-09-17 12:12:55.000000000 +0200
46 +++ slideshow//source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx 2008-09-18 11:50:32.000000000 +0200
47 @@ -162,14 +162,22 @@ class OGLTransitionerImpl : private cppu
48 {
49 public:
50 explicit OGLTransitionerImpl(OGLTransitionImpl* pOGLTransition);
51 - bool initWindowFromSlideShowView( const uno::Reference< presentation::XSlideShowView >& xView, double, double);
52 - void setSlides( const uno::Reference< rendering::XBitmap >& xLeavingSlide , const uno::Reference< rendering::XBitmap >& xEnteringSlide );
53 - static bool initialize( const uno::Reference< presentation::XSlideShowView >& xView );
54 + bool initWindowFromSlideShowView( const uno::Reference< presentation::XSlideShowView >& xView );
55 + void setSlides( const Reference< rendering::XBitmap >& xLeavingSlide , const uno::Reference< rendering::XBitmap >& xEnteringSlide );
56 + static bool initialize( const Reference< presentation::XSlideShowView >& xView );
57
58 // XTransition
59 - virtual void SAL_CALL update( double nTime ) throw (uno::RuntimeException);
60 + virtual void SAL_CALL update( double nTime )
61 + throw (uno::RuntimeException);
62 + virtual void SAL_CALL viewChanged( const Reference< presentation::XSlideShowView >& rView,
63 + const Reference< rendering::XBitmap >& rLeavingBitmap,
64 + const Reference< rendering::XBitmap >& rEnteringBitmap )
65 + throw (uno::RuntimeException);
66
67 protected:
68 + void disposeContextAndWindow();
69 + void disposeTextures();
70 +
71 // WeakComponentImplHelperBase
72 virtual void SAL_CALL disposing();
73
74 @@ -236,6 +244,7 @@ private:
75 */
76 class SystemChildWindow* pWindow;
77
78 + Reference< presentation::XSlideShowView > mxView;
79 Reference< rendering::XIntegerBitmap > mxLeavingBitmap;
80 Reference< rendering::XIntegerBitmap > mxEnteringBitmap;
81
82 @@ -321,7 +330,7 @@ float OGLTransitionerImpl::cnGLVersion;
83 bool OGLTransitionerImpl::cbMesa;
84 bool OGLTransitionerImpl::cbGLXPresent;
85
86 -bool OGLTransitionerImpl::initialize( const uno::Reference< presentation::XSlideShowView >& xView )
87 +bool OGLTransitionerImpl::initialize( const Reference< presentation::XSlideShowView >& xView )
88 {
89 // not thread safe
90 static bool initialized = false;
91 @@ -330,7 +339,7 @@ bool OGLTransitionerImpl::initialize( co
92 OGLTransitionerImpl *instance;
93
94 instance = new OGLTransitionerImpl( NULL );
95 - if( instance->initWindowFromSlideShowView( xView, 0, 0 ) ) {
96 + if( instance->initWindowFromSlideShowView( xView ) ) {
97
98 const GLubyte* version = glGetString( GL_VERSION );
99 if( version && version[0] ) {
100 @@ -373,6 +382,8 @@ bool OGLTransitionerImpl::createWindow(
101
102 GLWin.win = sysData->aWindow;
103
104 + OSL_TRACE("parent window: %d", GLWin.win);
105 +
106 unx::XWindowAttributes xattr;
107 unx::XGetWindowAttributes( GLWin.dpy, GLWin.win, &xattr );
108
109 @@ -555,15 +566,19 @@ bool OGLTransitionerImpl::createWindow(
110 return false;
111 }
112
113 -bool OGLTransitionerImpl::initWindowFromSlideShowView( const uno::Reference< presentation::XSlideShowView >& xView, double, double)
114 +bool OGLTransitionerImpl::initWindowFromSlideShowView( const Reference< presentation::XSlideShowView >& xView )
115 {
116 osl::MutexGuard const guard( m_aMutex );
117
118 if (isDisposed())
119 return false;
120
121 + mxView.set( xView, UNO_QUERY );
122 + if( !mxView.is() )
123 + return false;
124 +
125 /// take the XSlideShowView and extract the parent window from it. see viewmediashape.cxx
126 - uno::Reference< rendering::XCanvas > xCanvas(xView->getCanvas(), uno::UNO_QUERY_THROW);
127 + uno::Reference< rendering::XCanvas > xCanvas(mxView->getCanvas(), uno::UNO_QUERY_THROW);
128 uno::Sequence< uno::Any > aDeviceParams;
129 ::canvas::tools::getDeviceInfo( xCanvas, aDeviceParams );
130
131 @@ -575,7 +590,7 @@ bool OGLTransitionerImpl::initWindowFrom
132 if( !createWindow( reinterpret_cast< Window* >( aVal ) ) )
133 return false;
134
135 - awt::Rectangle aCanvasArea = xView->getCanvasArea();
136 + awt::Rectangle aCanvasArea = mxView->getCanvasArea();
137 pWindow->SetPosSizePixel(aCanvasArea.X, aCanvasArea.Y, aCanvasArea.Width, aCanvasArea.Height);
138 GLWin.Width = aCanvasArea.Width;
139 GLWin.Height = aCanvasArea.Height;
140 @@ -714,6 +729,10 @@ void OGLTransitionerImpl::setSlides( con
141 SlideRect.Y1 = 0;
142 SlideRect.Y2 = SlideSize.Height;
143
144 + OSL_TRACE("leaving bitmap area: %dx%d", SlideSize.Width, SlideSize.Height);
145 + SlideSize = mxEnteringBitmap->getSize();
146 + OSL_TRACE("entering bitmap area: %dx%d", SlideSize.Width, SlideSize.Height);
147 +
148 #ifdef UNX
149 unx::glXWaitGL();
150 XSync(GLWin.dpy, false);
151 @@ -1145,6 +1164,94 @@ void SAL_CALL OGLTransitionerImpl::updat
152 #endif
153 }
154
155 +void SAL_CALL OGLTransitionerImpl::viewChanged( const Reference< presentation::XSlideShowView >& rView,
156 + const Reference< rendering::XBitmap >& rLeavingBitmap,
157 + const Reference< rendering::XBitmap >& rEnteringBitmap )
158 + throw (uno::RuntimeException)
159 +{
160 + OSL_TRACE("transitioner: view changed");
161 +
162 + disposeTextures();
163 + disposeContextAndWindow();
164 +
165 + initWindowFromSlideShowView( rView );
166 + setSlides( rLeavingBitmap, rEnteringBitmap );
167 +}
168 +
169 +void OGLTransitionerImpl::disposeContextAndWindow()
170 +{
171 +#if defined( WNT )
172 + if (GLWin.hRC)
173 + {
174 + wglMakeCurrent( GLWin.hDC, 0 ); // kill Device Context
175 + wglDeleteContext( GLWin.hRC ); // Kill Render Context
176 + ReleaseDC( GLWin.hWnd, GLWin.hDC ); // Release Window
177 + }
178 +#elif defined( UNX )
179 + if(GLWin.ctx)
180 + {
181 + glXMakeCurrent(GLWin.dpy, None, NULL);
182 + if( glGetError() != GL_NO_ERROR ) {
183 + OSL_TRACE("glError: %s", (char *)gluErrorString(glGetError()));
184 + }
185 + glXDestroyContext(GLWin.dpy, GLWin.ctx);
186 + GLWin.ctx = NULL;
187 + }
188 +#endif
189 + if( pWindow ) {
190 + delete pWindow;
191 + pWindow = NULL;
192 + GLWin.win = 0;
193 + }
194 +}
195 +
196 +void OGLTransitionerImpl::disposeTextures()
197 +{
198 +#ifdef WNT
199 + wglMakeCurrent(GLWin.hDC,GLWin.hRC);
200 +#endif
201 +#ifdef UNX
202 + glXMakeCurrent( GLWin.dpy, GLWin.win, GLWin.ctx );
203 +#endif
204 +
205 +#if defined( GLX_VERSION_1_3 ) && defined( GLX_EXT_texture_from_pixmap )
206 + unx::PFNGLXRELEASETEXIMAGEEXTPROC myglXReleaseTexImageEXT = (unx::PFNGLXRELEASETEXIMAGEEXTPROC) unx::glXGetProcAddress( (const GLubyte*) "glXReleaseTexImageEXT" );
207 + if( mbUseLeavingPixmap ) {
208 +
209 + myglXReleaseTexImageEXT( GLWin.dpy, LeavingPixmap, GLX_FRONT_LEFT_EXT );
210 + glXDestroyGLXPixmap( GLWin.dpy, LeavingPixmap );
211 + LeavingPixmap = 0;
212 + if( mbFreeLeavingPixmap ) {
213 + unx::XFreePixmap( GLWin.dpy, maLeavingPixmap );
214 + mbFreeLeavingPixmap = false;
215 + maLeavingPixmap = 0;
216 + }
217 + }
218 + if( mbUseEnteringPixmap ) {
219 + myglXReleaseTexImageEXT( GLWin.dpy, EnteringPixmap, GLX_FRONT_LEFT_EXT );
220 + glXDestroyGLXPixmap( GLWin.dpy, EnteringPixmap );
221 + EnteringPixmap = 0;
222 + if( mbFreeEnteringPixmap ) {
223 + unx::XFreePixmap( GLWin.dpy, maEnteringPixmap );
224 + mbFreeEnteringPixmap = false;
225 + maEnteringPixmap = 0;
226 + }
227 + }
228 +#endif
229 +
230 + if( !mbUseLeavingPixmap ) {
231 + glDeleteTextures(1,&GLleavingSlide);
232 + GLleavingSlide = 0;
233 + }
234 + if( !mbUseEnteringPixmap ) {
235 + glDeleteTextures(1,&GLenteringSlide);
236 + GLleavingSlide = 0;
237 + }
238 +
239 + mbUseLeavingPixmap = false;
240 + mbUseEnteringPixmap = false;
241 +}
242 +
243 // we are about to be disposed (someone call dispose() on us)
244 void OGLTransitionerImpl::disposing()
245 {
246 @@ -1165,38 +1272,8 @@ void OGLTransitionerImpl::disposing()
247 #endif
248
249 if( pWindow ) {
250 -#ifdef WNT
251 - wglMakeCurrent(GLWin.hDC,GLWin.hRC);
252 -#endif
253 -#ifdef UNX
254 - glXMakeCurrent( GLWin.dpy, GLWin.win, GLWin.ctx );
255 -#endif
256
257 -#if defined( GLX_VERSION_1_3 ) && defined( GLX_EXT_texture_from_pixmap )
258 - unx::PFNGLXRELEASETEXIMAGEEXTPROC myglXReleaseTexImageEXT = (unx::PFNGLXRELEASETEXIMAGEEXTPROC) unx::glXGetProcAddress( (const GLubyte*) "glXReleaseTexImageEXT" );
259 - if( mbUseLeavingPixmap ) {
260 -
261 - myglXReleaseTexImageEXT( GLWin.dpy, LeavingPixmap, GLX_FRONT_LEFT_EXT );
262 - glXDestroyGLXPixmap( GLWin.dpy, LeavingPixmap );
263 - if( mbFreeLeavingPixmap ) {
264 - unx::XFreePixmap( GLWin.dpy, maLeavingPixmap );
265 - mbFreeLeavingPixmap = false;
266 - }
267 - }
268 - if( mbUseEnteringPixmap ) {
269 - myglXReleaseTexImageEXT( GLWin.dpy, EnteringPixmap, GLX_FRONT_LEFT_EXT );
270 - glXDestroyGLXPixmap( GLWin.dpy, EnteringPixmap );
271 - if( mbFreeLeavingPixmap ) {
272 - unx::XFreePixmap( GLWin.dpy, maLeavingPixmap );
273 - mbFreeLeavingPixmap = false;
274 - }
275 - }
276 -#endif
277 -
278 - if( !mbUseLeavingPixmap )
279 - glDeleteTextures(1,&GLleavingSlide);
280 - if( !mbUseEnteringPixmap )
281 - glDeleteTextures(1,&GLenteringSlide);
282 + disposeTextures();
283
284 if (pTransition)
285 pTransition->finish();
286 @@ -1209,25 +1286,7 @@ void OGLTransitionerImpl::disposing()
287 }
288 #endif
289
290 -#if defined( WNT )
291 - if (GLWin.hRC)
292 - {
293 - wglMakeCurrent( GLWin.hDC, 0 ); // kill Device Context
294 - wglDeleteContext( GLWin.hRC ); // Kill Render Context
295 - ReleaseDC( GLWin.hWnd, GLWin.hDC ); // Release Window
296 - }
297 -#elif defined( UNX )
298 - if(GLWin.ctx)
299 - {
300 - glXMakeCurrent(GLWin.dpy, None, NULL);
301 - if( glGetError() != GL_NO_ERROR ) {
302 - OSL_TRACE("glError: %s", (char *)gluErrorString(glGetError()));
303 - }
304 - glXDestroyContext(GLWin.dpy, GLWin.ctx);
305 - GLWin.ctx = NULL;
306 - }
307 -#endif
308 - delete pWindow;
309 + disposeContextAndWindow();
310 }
311
312 if (pTransition)
313 @@ -1235,6 +1294,7 @@ void OGLTransitionerImpl::disposing()
314
315 mxLeavingBitmap.clear();
316 mxEnteringBitmap.clear();
317 + mxView.clear();
318 }
319
320 OGLTransitionerImpl::OGLTransitionerImpl(OGLTransitionImpl* pOGLTransition) :
321 @@ -1243,6 +1303,7 @@ OGLTransitionerImpl::OGLTransitionerImpl
322 GLleavingSlide( 0 ),
323 GLenteringSlide( 0 ),
324 pWindow( NULL ),
325 + mxView(),
326 EnteringBytes(),
327 LeavingBytes(),
328 mbRestoreSync( false ),
329 @@ -1312,8 +1373,8 @@ public:
330 ::sal_Int16 transitionSubType,
331 const uno::Reference< presentation::XSlideShowView >& view,
332 const uno::Reference< rendering::XBitmap >& leavingBitmap,
333 - const uno::Reference< rendering::XBitmap >& enteringBitmap,
334 - const geometry::RealPoint2D& slideOffset ) throw (uno::RuntimeException)
335 + const uno::Reference< rendering::XBitmap >& enteringBitmap )
336 + throw (uno::RuntimeException)
337 {
338 if( !hasTransition( transitionType, transitionSubType ) )
339 return uno::Reference< presentation::XTransition >();
340 @@ -1393,7 +1454,7 @@ public:
341 rtl::Reference<OGLTransitionerImpl> xRes(
342 new OGLTransitionerImpl(pTransition) );
343 if( bGLXPresent ) {
344 - if( !xRes->initWindowFromSlideShowView(view,slideOffset.X,slideOffset.Y))
345 + if( !xRes->initWindowFromSlideShowView(view))
346 return uno::Reference< presentation::XTransition >();
347 xRes->setSlides(leavingBitmap,enteringBitmap);
348 }
349 diff -rup ../ooo300-m4-orig/slideshow//source/engine/transitions/slidetransitionfactory.cxx slideshow//source/engine/transitions/slidetransitionfactory.cxx
350 --- ../ooo300-m4-orig/slideshow//source/engine/transitions/slidetransitionfactory.cxx 2008-09-17 12:12:55.000000000 +0200
351 +++ slideshow//source/engine/transitions/slidetransitionfactory.cxx 2008-09-18 11:52:08.000000000 +0200
352 @@ -106,6 +106,28 @@ void fillPage( const ::cppcanvas::Canvas
353
354 class PluginSlideChange: public SlideChangeBase
355 {
356 + struct TransitionViewPair {
357 + uno::Reference<presentation::XTransition> mxTransition;
358 + UnoViewSharedPtr mpView;
359 +
360 + TransitionViewPair( uno::Reference<presentation::XTransition> xTransition, const UnoViewSharedPtr pView )
361 + {
362 + mxTransition = xTransition;
363 + mpView = pView;
364 + }
365 +
366 + ~TransitionViewPair()
367 + {
368 + mxTransition.clear();
369 + mpView.reset();;
370 + }
371 +
372 + void update( double t )
373 + {
374 + mxTransition->update( t );
375 + }
376 + };
377 +
378 public:
379 /** Create a new SlideChanger, for the given leaving and
380 entering slide bitmaps, which uses super secret OpenGL
381 @@ -128,43 +150,61 @@ public:
382 rScreenUpdater,
383 rEventMultiplexer ),
384 maTransitions(),
385 - mbSuccess( false )
386 + mbSuccess( false ),
387 + mnTransitionType( nTransitionType ),
388 + mnTransitionSubType( nTransitionSubType ),
389 + mxFactory( xFactory )
390 {
391 // create one transition per view
392 UnoViewVector::const_iterator aCurrView (rViewContainer.begin());
393 const UnoViewVector::const_iterator aEnd(rViewContainer.end());
394 while( aCurrView != aEnd )
395 {
396 - const ::basegfx::B2DHomMatrix aViewTransform(
397 - (*aCurrView)->getCanvas()->getTransformation() );
398 - const ::basegfx::B2DPoint aOffsetPixel(
399 - aViewTransform * ::basegfx::B2DPoint() );
400 -
401 - uno::Reference<presentation::XTransition> rTransition = xFactory->createTransition(
402 - nTransitionType,
403 - nTransitionSubType,
404 - (*aCurrView)->getUnoView(),
405 - getLeavingBitmap(ViewEntry(*aCurrView))->getXBitmap(),
406 - getEnteringBitmap(ViewEntry(*aCurrView))->getXBitmap(),
407 - basegfx::unotools::point2DFromB2DPoint(aOffsetPixel) );
408 -
409 - if( rTransition.is() )
410 - maTransitions.push_back( rTransition );
411 - else
412 - return;
413 + addTransition( *aCurrView );
414
415 - ENSURE_OR_THROW(maTransitions.back().is(),
416 + ENSURE_OR_THROW(maTransitions.back()->mxTransition.is(),
417 "Failed to create plugin transition");
418 ++aCurrView;
419 }
420 mbSuccess = true;
421 }
422 +
423 + ~PluginSlideChange()
424 + {
425 + mxFactory.clear();
426 +
427 + ::std::vector< TransitionViewPair* >::const_iterator aCurrView (maTransitions.begin());
428 + ::std::vector< TransitionViewPair* >::const_iterator aEnd(maTransitions.end());
429 + while( aCurrView != aEnd )
430 + {
431 + delete (*aCurrView);
432 + ++aCurrView;
433 + }
434 + maTransitions.clear();
435 + }
436 +
437 + bool addTransition( const UnoViewSharedPtr& rView )
438 + {
439 + uno::Reference<presentation::XTransition> rTransition = mxFactory->createTransition(
440 + mnTransitionType,
441 + mnTransitionSubType,
442 + rView->getUnoView(),
443 + getLeavingBitmap(ViewEntry(rView))->getXBitmap(),
444 + getEnteringBitmap(ViewEntry(rView))->getXBitmap() );
445 +
446 + if( rTransition.is() )
447 + maTransitions.push_back( new TransitionViewPair( rTransition, rView ) );
448 + else
449 + return false;
450 +
451 + return true;
452 + }
453
454 virtual bool operator()( double t )
455 {
456 std::for_each(maTransitions.begin(),
457 maTransitions.end(),
458 - boost::bind( &presentation::XTransition::update,
459 + boost::bind( &TransitionViewPair::update,
460 _1, t) );
461 return true;
462 }
463 @@ -174,14 +214,100 @@ public:
464 return mbSuccess;
465 }
466
467 -private:
468 + // ViewEventHandler
469 + virtual void viewAdded( const UnoViewSharedPtr& rView )
470 + {
471 + OSL_TRACE("PluginSlideChange viewAdded");
472 + SlideChangeBase::viewAdded( rView );
473 +
474 + ::std::vector< TransitionViewPair* >::const_iterator aCurrView (maTransitions.begin());
475 + ::std::vector< TransitionViewPair* >::const_iterator aEnd(maTransitions.end());
476 + bool bKnown = false;
477 + while( aCurrView != aEnd )
478 + {
479 + if( (*aCurrView)->mpView == rView ) {
480 + bKnown = true;
481 + break;
482 + }
483 + ++aCurrView;
484 + }
485 +
486 + if( !bKnown ) {
487 + OSL_TRACE("need to be added");
488 +
489 + addTransition( rView );
490 + }
491 + }
492 +
493 + virtual void viewRemoved( const UnoViewSharedPtr& rView )
494 + {
495 + OSL_TRACE("PluginSlideChange viewRemoved");
496 + SlideChangeBase::viewRemoved( rView );
497 +
498 + ::std::vector< TransitionViewPair* >::iterator aCurrView (maTransitions.begin());
499 + ::std::vector< TransitionViewPair* >::const_iterator aEnd(maTransitions.end());
500 + while( aCurrView != aEnd )
501 + {
502 + if( (*aCurrView)->mpView == rView ) {
503 + OSL_TRACE( "view removed" );
504 + delete (*aCurrView);
505 + maTransitions.erase( aCurrView );
506 + break;
507 + }
508 + ++aCurrView;
509 + }
510 + }
511 +
512 + virtual void viewChanged( const UnoViewSharedPtr& rView )
513 + {
514 + OSL_TRACE("PluginSlideChange viewChanged");
515 + SlideChangeBase::viewChanged( rView );
516 +
517 + ::std::vector< TransitionViewPair* >::const_iterator aCurrView (maTransitions.begin());
518 + ::std::vector< TransitionViewPair* >::const_iterator aEnd(maTransitions.end());
519 + while( aCurrView != aEnd )
520 + {
521 + if( (*aCurrView)->mpView == rView ) {
522 + OSL_TRACE( "view changed" );
523 + (*aCurrView)->mxTransition->viewChanged( rView->getUnoView(),
524 + getLeavingBitmap(ViewEntry(rView))->getXBitmap(),
525 + getEnteringBitmap(ViewEntry(rView))->getXBitmap() );
526 + } else
527 + OSL_TRACE( "view did not changed" );
528 +
529 + ++aCurrView;
530 + }
531 + }
532 +
533 + virtual void viewsChanged()
534 + {
535 + OSL_TRACE("PluginSlideChange viewsChanged");
536 + SlideChangeBase::viewsChanged();
537 +
538 + ::std::vector< TransitionViewPair* >::const_iterator aCurrView (maTransitions.begin());
539 + ::std::vector< TransitionViewPair* >::const_iterator aEnd(maTransitions.end());
540 + while( aCurrView != aEnd )
541 + {
542 + OSL_TRACE( "view changed" );
543 + (*aCurrView)->mxTransition->viewChanged( (*aCurrView)->mpView->getUnoView(),
544 + getLeavingBitmap(ViewEntry((*aCurrView)->mpView))->getXBitmap(),
545 + getEnteringBitmap(ViewEntry((*aCurrView)->mpView))->getXBitmap() );
546 + ++aCurrView;
547 + }
548 + }
549 +
550 +private:
551 // One transition object per view
552 - std::vector< uno::Reference<presentation::XTransition> > maTransitions;
553 + std::vector< TransitionViewPair* > maTransitions;
554
555 // bool
556 bool mbSuccess;
557 -};
558
559 + sal_Int16 mnTransitionType;
560 + sal_Int16 mnTransitionSubType;
561 +
562 + uno::Reference<presentation::XTransitionFactory> mxFactory;
563 +};
564
565 class ClippedSlideChange : public SlideChangeBase
566 {
vba interoperability for OOo