diff options
Diffstat (limited to 'sd/source/ui/presenter')
-rw-r--r-- | sd/source/ui/presenter/CanvasUpdateRequester.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/presenter/CanvasUpdateRequester.hxx | 10 | ||||
-rw-r--r-- | sd/source/ui/presenter/PresenterCanvas.cxx | 34 | ||||
-rw-r--r-- | sd/source/ui/presenter/PresenterCanvas.hxx | 64 | ||||
-rw-r--r-- | sd/source/ui/presenter/PresenterCanvasFactory.cxx | 8 | ||||
-rw-r--r-- | sd/source/ui/presenter/PresenterHelper.cxx | 12 | ||||
-rw-r--r-- | sd/source/ui/presenter/PresenterHelper.hxx | 8 | ||||
-rw-r--r-- | sd/source/ui/presenter/PresenterPreviewCache.cxx | 12 | ||||
-rw-r--r-- | sd/source/ui/presenter/PresenterPreviewCache.hxx | 8 | ||||
-rw-r--r-- | sd/source/ui/presenter/PresenterTextView.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/presenter/PresenterTextView.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/presenter/SlideRenderer.cxx | 8 | ||||
-rw-r--r-- | sd/source/ui/presenter/SlideRenderer.hxx | 10 |
13 files changed, 91 insertions, 91 deletions
diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.cxx b/sd/source/ui/presenter/CanvasUpdateRequester.cxx index ae37ff945061..fbc79e6875d7 100644 --- a/sd/source/ui/presenter/CanvasUpdateRequester.cxx +++ b/sd/source/ui/presenter/CanvasUpdateRequester.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.hxx b/sd/source/ui/presenter/CanvasUpdateRequester.hxx index e8c8f5d93fbe..3350ace49ebc 100644 --- a/sd/source/ui/presenter/CanvasUpdateRequester.hxx +++ b/sd/source/ui/presenter/CanvasUpdateRequester.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,18 +58,18 @@ public: const css::uno::Reference<css::rendering::XSpriteCanvas>& rxCanvas); void RequestUpdate (const sal_Bool bUpdateAll); - + private: CanvasUpdateRequester (const css::uno::Reference<css::rendering::XSpriteCanvas>& rxCanvas); ~CanvasUpdateRequester (void); class Deleter; friend class Deleter; - + typedef ::std::vector< ::std::pair< - css::uno::Reference<css::rendering::XSpriteCanvas>, + css::uno::Reference<css::rendering::XSpriteCanvas>, ::boost::shared_ptr<CanvasUpdateRequester> > > RequesterMap; static RequesterMap maRequesterMap; - + css::uno::Reference<css::rendering::XSpriteCanvas> mxCanvas; ULONG mnUserEventId; sal_Bool mbUpdateFlag; diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/ui/presenter/PresenterCanvas.cxx index b4f57b365ac3..7c117669e7a1 100644 --- a/sd/source/ui/presenter/PresenterCanvas.cxx +++ b/sd/source/ui/presenter/PresenterCanvas.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -109,15 +109,15 @@ public: virtual void SAL_CALL setAlpha (double nAlpha) throw (lang::IllegalArgumentException,RuntimeException); - + virtual void SAL_CALL move (const geometry::RealPoint2D& rNewPos, const rendering::ViewState& rViewState, const rendering::RenderState& rRenderState) throw (lang::IllegalArgumentException,RuntimeException); - + virtual void SAL_CALL transform (const geometry::AffineMatrix2D& rTransformation) throw (lang::IllegalArgumentException,RuntimeException); - + virtual void SAL_CALL clip (const Reference<rendering::XPolyPolygon2D>& rClip) throw (RuntimeException); @@ -126,13 +126,13 @@ public: virtual void SAL_CALL show (void) throw (RuntimeException); - + virtual void SAL_CALL hide (void) throw (RuntimeException); - + // XCustomSprite - + virtual Reference<rendering::XCanvas> SAL_CALL getContentCanvas (void) throw (RuntimeException); @@ -142,7 +142,7 @@ private: Reference<awt::XWindow> mxBaseWindow; geometry::RealPoint2D maPosition; geometry::RealSize2D maSpriteSize; - + void ThrowIfDisposed (void) throw (css::lang::DisposedException); }; @@ -188,7 +188,7 @@ PresenterCanvas::PresenterCanvas ( { if (mxWindow.is()) mxWindow->addWindowListener(this); - + if (mxUpdateCanvas.is()) mpUpdateRequester = CanvasUpdateRequester::Instance(mxUpdateCanvas); } @@ -214,7 +214,7 @@ void SAL_CALL PresenterCanvas::disposing (void) //----- XInitialization ------------------------------------------------------- - + void SAL_CALL PresenterCanvas::initialize ( const Sequence<Any>& rArguments) throw(Exception, RuntimeException) @@ -626,7 +626,7 @@ Reference<rendering::XAnimatedSprite> SAL_CALL else return NULL; } - + @@ -647,7 +647,7 @@ Reference<rendering::XAnimatedSprite> SAL_CALL else return NULL; } - + @@ -868,11 +868,11 @@ css::rendering::ViewState PresenterCanvas::MergeViewState ( // Prepare the local clip rectangle. ::basegfx::B2DRectangle aWindowRange (GetClipRectangle(aViewState.AffineTransform, rOffset)); - + // Adapt the offset of the view state. aViewState.AffineTransform.m02 += rOffset.X; aViewState.AffineTransform.m12 += rOffset.Y; - + // Adapt the clip polygon. if ( ! aViewState.Clip.is()) { @@ -964,7 +964,7 @@ awt::Point PresenterCanvas::GetOffset (const Reference<awt::XWindow>& rxBaseWind maClipRectangle.X + maClipRectangle.Width + rOffset.X, maClipRectangle.Y + maClipRectangle.Height + rOffset.Y); } - + // The local clip rectangle is used to clip the view state clipping // polygon. ::basegfx::B2DRectangle aWindowRectangle ( @@ -1119,7 +1119,7 @@ void SAL_CALL PresenterCustomSprite::setAlpha (const double nAlpha) ThrowIfDisposed(); mxSprite->setAlpha(nAlpha); } - + @@ -1198,7 +1198,7 @@ void SAL_CALL PresenterCustomSprite::hide (void) //----- XCustomSprite --------------------------------------------------------- - + Reference<rendering::XCanvas> PresenterCustomSprite::getContentCanvas (void) throw (RuntimeException) { diff --git a/sd/source/ui/presenter/PresenterCanvas.hxx b/sd/source/ui/presenter/PresenterCanvas.hxx index 3d119fb01758..84267ed670d9 100644 --- a/sd/source/ui/presenter/PresenterCanvas.hxx +++ b/sd/source/ui/presenter/PresenterCanvas.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -151,52 +151,52 @@ public: const css::geometry::RealPoint2D& rLocation, const css::geometry::RealSize2D& rSize); - + // XInitialization - + virtual void SAL_CALL initialize ( const css::uno::Sequence<css::uno::Any>& rArguments) throw(css::uno::Exception, css::uno::RuntimeException); - + // XCanvas virtual void SAL_CALL clear (void) throw (css::uno::RuntimeException); - + virtual void SAL_CALL drawPoint ( const css::geometry::RealPoint2D& aPoint, const css::rendering::ViewState& aViewState, const css::rendering::RenderState& aRenderState) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - + virtual void SAL_CALL drawLine ( const css::geometry::RealPoint2D& aStartPoint, const css::geometry::RealPoint2D& aEndPoint, const css::rendering::ViewState& aViewState, const css::rendering::RenderState& aRenderState) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - + virtual void SAL_CALL drawBezier ( const css::geometry::RealBezierSegment2D& aBezierSegment, const css::geometry::RealPoint2D& aEndPoint, const css::rendering::ViewState& aViewState, const css::rendering::RenderState& aRenderState) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - + virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL drawPolyPolygon ( const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon, const css::rendering::ViewState& aViewState, const css::rendering::RenderState& aRenderState) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - + virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL strokePolyPolygon ( const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon, const css::rendering::ViewState& aViewState, const css::rendering::RenderState& aRenderState, const css::rendering::StrokeAttributes& aStrokeAttributes) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - + virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL strokeTexturedPolyPolygon ( const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon, @@ -207,7 +207,7 @@ public: throw (css::lang::IllegalArgumentException, css::rendering::VolatileContentDestroyedException, css::uno::RuntimeException); - + virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL strokeTextureMappedPolyPolygon( const css::uno::Reference<css::rendering::XPolyPolygon2D >& xPolyPolygon, @@ -219,7 +219,7 @@ public: throw (css::lang::IllegalArgumentException, css::rendering::VolatileContentDestroyedException, css::uno::RuntimeException); - + virtual css::uno::Reference<css::rendering::XPolyPolygon2D> SAL_CALL queryStrokeShapes( const css::uno::Reference<css::rendering::XPolyPolygon2D>& xPolyPolygon, @@ -227,7 +227,7 @@ public: const css::rendering::RenderState& aRenderState, const css::rendering::StrokeAttributes& aStrokeAttributes) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - + virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL fillPolyPolygon( const css::uno::Reference<css::rendering::XPolyPolygon2D>& xPolyPolygon, @@ -235,7 +235,7 @@ public: const css::rendering::RenderState& aRenderState) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - + virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL fillTexturedPolyPolygon( const css::uno::Reference<css::rendering::XPolyPolygon2D>& xPolyPolygon, @@ -245,7 +245,7 @@ public: throw (css::lang::IllegalArgumentException, css::rendering::VolatileContentDestroyedException, css::uno::RuntimeException); - + virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL fillTextureMappedPolyPolygon( const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon, @@ -256,7 +256,7 @@ public: throw (css::lang::IllegalArgumentException, css::rendering::VolatileContentDestroyedException, css::uno::RuntimeException); - + virtual css::uno::Reference<css::rendering::XCanvasFont> SAL_CALL createFont( const css::rendering::FontRequest& aFontRequest, @@ -264,13 +264,13 @@ public: const css::geometry::Matrix2D& aFontMatrix) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - + virtual css::uno::Sequence<css::rendering::FontInfo> SAL_CALL queryAvailableFonts( const css::rendering::FontInfo& aFilter, const css::uno::Sequence< css::beans::PropertyValue >& aFontProperties) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - + virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL drawText( const css::rendering::StringContext& aText, @@ -279,14 +279,14 @@ public: const css::rendering::RenderState& aRenderState, ::sal_Int8 nTextDirection) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - + virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL drawTextLayout( const css::uno::Reference< css::rendering::XTextLayout >& xLayoutetText, const css::rendering::ViewState& aViewState, const css::rendering::RenderState& aRenderState) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - + virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL drawBitmap( const css::uno::Reference< css::rendering::XBitmap >& xBitmap, @@ -295,7 +295,7 @@ public: throw (css::lang::IllegalArgumentException, css::rendering::VolatileContentDestroyedException, css::uno::RuntimeException); - + virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL drawBitmapModulated( const css::uno::Reference< css::rendering::XBitmap>& xBitmap, @@ -304,7 +304,7 @@ public: throw (css::lang::IllegalArgumentException, css::rendering::VolatileContentDestroyedException, css::uno::RuntimeException); - + virtual css::uno::Reference<css::rendering::XGraphicDevice> SAL_CALL getDevice (void) throw (css::uno::RuntimeException); @@ -324,14 +324,14 @@ public: css::rendering::VolatileContentDestroyedException, css::uno::RuntimeException); - + // XSpriteCanvas css::uno::Reference< css::rendering::XAnimatedSprite > SAL_CALL createSpriteFromAnimation ( const css::uno::Reference< css::rendering::XAnimation >& animation) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - + css::uno::Reference< css::rendering::XAnimatedSprite > SAL_CALL createSpriteFromBitmaps ( const css::uno::Sequence< @@ -340,17 +340,17 @@ public: throw (css::lang::IllegalArgumentException, css::rendering::VolatileContentDestroyedException, css::uno::RuntimeException); - + css::uno::Reference< css::rendering::XCustomSprite > SAL_CALL createCustomSprite ( const css::geometry::RealSize2D& spriteSize) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - + css::uno::Reference< css::rendering::XSprite > SAL_CALL createClonedSprite ( const css::uno::Reference< css::rendering::XSprite >& original) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - + ::sal_Bool SAL_CALL updateScreen (::sal_Bool bUpdateAll) throw (css::uno::RuntimeException); @@ -365,13 +365,13 @@ public: virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) throw (css::uno::RuntimeException); - + virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) throw (css::uno::RuntimeException); - + virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) throw (css::uno::RuntimeException); - + virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) throw (css::uno::RuntimeException); @@ -383,10 +383,10 @@ public: virtual sal_Bool SAL_CALL hasAlpha (void) throw (css::uno::RuntimeException); - + virtual css::uno::Reference<css::rendering::XBitmapCanvas> SAL_CALL queryBitmapCanvas (void) throw (css::uno::RuntimeException); - + virtual css::uno::Reference<css::rendering::XBitmap> SAL_CALL getScaledBitmap( const css::geometry::RealSize2D& rNewSize, sal_Bool bFast) diff --git a/sd/source/ui/presenter/PresenterCanvasFactory.cxx b/sd/source/ui/presenter/PresenterCanvasFactory.cxx index 81b990f57f09..9d0fca423ff4 100644 --- a/sd/source/ui/presenter/PresenterCanvasFactory.cxx +++ b/sd/source/ui/presenter/PresenterCanvasFactory.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -206,7 +206,7 @@ Reference<rendering::XCanvas> PresenterCanvasFactory::CreateCanvasForSprite ( { OSL_ASSERT(rxSharedWindow.is()); (void)rxWindow.is(); - + SharedWindowContainer::iterator iDescriptor ( mpSharedWindows->FindDescriptor(rxSharedWindow)); if (iDescriptor != mpSharedWindows->end()) @@ -239,14 +239,14 @@ Reference<rendering::XCanvas> PresenterCanvasFactory::CreateCanvas ( if (pWindow != NULL) { Sequence<Any> aArg (5); - + // common: first any is VCL pointer to window (for VCL canvas) aArg[0] = makeAny(reinterpret_cast<sal_Int64>(pWindow)); aArg[1] = Any(); aArg[2] = makeAny(::com::sun::star::awt::Rectangle()); aArg[3] = makeAny(sal_False); aArg[4] = makeAny(rxWindow); - + Reference<lang::XMultiServiceFactory> xFactory (::comphelper::getProcessServiceFactory()); return Reference<rendering::XCanvas>( xFactory->createInstanceWithArguments( diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx index 5814b2d16e13..c3a6be7b9e58 100644 --- a/sd/source/ui/presenter/PresenterHelper.cxx +++ b/sd/source/ui/presenter/PresenterHelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -103,7 +103,7 @@ void SAL_CALL PresenterHelper::initialize (const Sequence<Any>& rArguments) { (void)rArguments; } - + @@ -180,7 +180,7 @@ Reference<rendering::XCanvas> SAL_CALL PresenterHelper::createSharedCanvas ( OUString::createFromAscii("illegal argument"), Reference<XInterface>(static_cast<XWeak*>(this))); } - + if (rxWindow == rxSharedWindow) return rxSharedCanvas; else @@ -209,14 +209,14 @@ Reference<rendering::XCanvas> SAL_CALL PresenterHelper::createCanvas ( if (pWindow != NULL) { Sequence<Any> aArg (5); - + // common: first any is VCL pointer to window (for VCL canvas) aArg[0] = makeAny(reinterpret_cast<sal_Int64>(pWindow)); aArg[1] = Any(); aArg[2] = makeAny(::com::sun::star::awt::Rectangle()); aArg[3] = makeAny(sal_False); aArg[4] = makeAny(rxWindow); - + Reference<lang::XMultiServiceFactory> xFactory ( mxComponentContext->getServiceManager(), UNO_QUERY_THROW); return Reference<rendering::XCanvas>( @@ -256,7 +256,7 @@ Reference<rendering::XBitmap> SAL_CALL PresenterHelper::loadBitmap ( { if ( ! rxCanvas.is()) return NULL; - + ::osl::MutexGuard aGuard (::osl::Mutex::getGlobalMutex()); if (mpGraphicFilter.get() == NULL) diff --git a/sd/source/ui/presenter/PresenterHelper.hxx b/sd/source/ui/presenter/PresenterHelper.hxx index b3c7a336824a..f9d814c0c858 100644 --- a/sd/source/ui/presenter/PresenterHelper.hxx +++ b/sd/source/ui/presenter/PresenterHelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,7 +65,7 @@ public: virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) throw(css::uno::Exception,css::uno::RuntimeException); - + // XPresenterHelper @@ -76,7 +76,7 @@ public: sal_Bool bEnableChildTransparentMode, sal_Bool bEnableParentClip) throw (css::uno::RuntimeException); - + virtual css::uno::Reference<css::rendering::XCanvas> SAL_CALL createSharedCanvas ( const css::uno::Reference<css::rendering::XSpriteCanvas>& rxUpdateCanvas, const css::uno::Reference<css::awt::XWindow>& rxUpdateWindow, @@ -110,7 +110,7 @@ public: const css::uno::Reference<css::awt::XWindow>& rxChildWindow, const css::uno::Reference<css::awt::XWindow>& rxParentWindow) throw (css::uno::RuntimeException); - + private: css::uno::Reference<css::uno::XComponentContext> mxComponentContext; ::boost::scoped_ptr<GraphicFilter> mpGraphicFilter; diff --git a/sd/source/ui/presenter/PresenterPreviewCache.cxx b/sd/source/ui/presenter/PresenterPreviewCache.cxx index 12f54ff91a2d..10fb3036de3e 100644 --- a/sd/source/ui/presenter/PresenterPreviewCache.cxx +++ b/sd/source/ui/presenter/PresenterPreviewCache.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -372,7 +372,7 @@ void PresenterPreviewCache::PresenterCacheContext::NotifyPreviewCreation ( const ::boost::shared_ptr<BitmapEx>& rPreview) { (void)rPreview; - + if ( ! mxSlides.is()) return; const sal_Int32 nCount(mxSlides->getCount()); @@ -427,10 +427,10 @@ const SdrPage* PresenterPreviewCache::PresenterCacheContext::GetPage (CacheKey a PresenterPreviewCache::PresenterCacheContext::GetEntryList (bool bVisible) { ::boost::shared_ptr<std::vector<CacheKey> > pKeys (new std::vector<CacheKey>()); - + if ( ! mxSlides.is()) return pKeys; - + const sal_Int32 nFirstIndex (bVisible ? mnFirstVisibleSlideIndex : 0); const sal_Int32 nLastIndex (bVisible ? mnLastVisibleSlideIndex : mxSlides->getCount()-1); @@ -454,11 +454,11 @@ sal_Int32 PresenterPreviewCache::PresenterCacheContext::GetPriority (CacheKey aK return 0; const sal_Int32 nCount (mxSlides->getCount()); - + for (sal_Int32 nIndex=mnFirstVisibleSlideIndex; nIndex<=mnLastVisibleSlideIndex; ++nIndex) if (aKey == GetPage(nIndex)) return -nCount-1+nIndex; - + for (sal_Int32 nIndex=0; nIndex<=nCount; ++nIndex) if (aKey == GetPage(nIndex)) return nIndex; diff --git a/sd/source/ui/presenter/PresenterPreviewCache.hxx b/sd/source/ui/presenter/PresenterPreviewCache.hxx index 1601c8439316..b3de5a34103d 100644 --- a/sd/source/ui/presenter/PresenterPreviewCache.hxx +++ b/sd/source/ui/presenter/PresenterPreviewCache.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,15 +67,15 @@ public: */ virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) throw(css::uno::Exception,css::uno::RuntimeException); - + // XSlidePreviewCache - + virtual void SAL_CALL setDocumentSlides ( const css::uno::Reference<css::container::XIndexAccess>& rxSlides, const css::uno::Reference<css::uno::XInterface>& rxDocument) throw (css::uno::RuntimeException); - + virtual void SAL_CALL setVisibleRange ( sal_Int32 nFirstVisibleSlideIndex, sal_Int32 nLastVisibleSlideIndex) diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx index cf9550baf1c2..b67e0c784000 100644 --- a/sd/source/ui/presenter/PresenterTextView.cxx +++ b/sd/source/ui/presenter/PresenterTextView.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/ui/presenter/PresenterTextView.hxx b/sd/source/ui/presenter/PresenterTextView.hxx index e02115ac7c71..561a748e527e 100644 --- a/sd/source/ui/presenter/PresenterTextView.hxx +++ b/sd/source/ui/presenter/PresenterTextView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,7 +61,7 @@ public: virtual ~PresenterTextView (void); // XInitialization - + virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) throw (css::uno::Exception, css::uno::RuntimeException); diff --git a/sd/source/ui/presenter/SlideRenderer.cxx b/sd/source/ui/presenter/SlideRenderer.cxx index dbd43cbbab5b..c852ff5f79e7 100644 --- a/sd/source/ui/presenter/SlideRenderer.cxx +++ b/sd/source/ui/presenter/SlideRenderer.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -206,7 +206,7 @@ BitmapEx SlideRenderer::CreatePreview ( OUString::createFromAscii("SlideRenderer::createPreview() called with invalid slide"), static_cast<XWeak*>(this), 0); - + // Determine the size of the current slide and its aspect ratio. Size aPageSize = pPage->GetSize(); if (aPageSize.Height() <= 0) @@ -231,14 +231,14 @@ BitmapEx SlideRenderer::CreatePreview ( nFactor = 1; else if (nFactor > 10) nFactor = 10; - + // Create the preview. When the super sample factor n is greater than 1 // then a preview is created in size (n*width, n*height) and then scaled // down to (width, height). This is a poor mans antialiasing for the // time being. When we have true antialiasing support this workaround // can be removed. const Image aPreview = maPreviewRenderer.RenderPage ( - pPage, + pPage, Size(aPreviewSize.Width*nFactor, aPreviewSize.Height*nFactor), ::rtl::OUString()); if (nFactor == 1) diff --git a/sd/source/ui/presenter/SlideRenderer.hxx b/sd/source/ui/presenter/SlideRenderer.hxx index ddeb211608f6..e5a715ea1e34 100644 --- a/sd/source/ui/presenter/SlideRenderer.hxx +++ b/sd/source/ui/presenter/SlideRenderer.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,13 +64,13 @@ public: // XInitialization - + virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) throw (css::uno::Exception, css::uno::RuntimeException); - + // XSlideRenderer - + virtual css::uno::Reference<css::awt::XBitmap> SAL_CALL createPreview ( const ::css::uno::Reference<css::drawing::XDrawPage>& rxSlide, const css::awt::Size& rMaximumPreviewPixelSize, @@ -88,7 +88,7 @@ public: double nSlideAspectRatio, const css::awt::Size& rMaximumPreviewPixelSize) throw (css::uno::RuntimeException); - + private: PreviewRenderer maPreviewRenderer; |