diff options
-rw-r--r-- | sdext/source/pdfimport/tree/pdfiprocessor.cxx | 5 | ||||
-rw-r--r-- | sdext/source/pdfimport/tree/pdfiprocessor.hxx | 3 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterCanvasHelper.cxx | 5 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterCanvasHelper.hxx | 3 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterPaintManager.cxx | 10 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterPaintManager.hxx | 6 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterScrollBar.cxx | 10 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterScrollBar.hxx | 3 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterSlideSorter.cxx | 9 |
9 files changed, 18 insertions, 36 deletions
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx index c91bef382ac9..3f8fcc73dfdb 100644 --- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx +++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx @@ -601,10 +601,9 @@ void PDFIProcessor::emit( XmlEmitter& rEmitter, endIndicator(); } -void PDFIProcessor::startIndicator( const OUString& rText, sal_Int32 nElements ) +void PDFIProcessor::startIndicator( const OUString& rText ) { - if( nElements == -1 ) - nElements = m_nPages; + sal_Int32 nElements = m_nPages; if( m_xStatusIndicator.is() ) { sal_Int32 nUnicodes = rText.getLength(); diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.hxx b/sdext/source/pdfimport/tree/pdfiprocessor.hxx index 126143b09671..21197bfa8233 100644 --- a/sdext/source/pdfimport/tree/pdfiprocessor.hxx +++ b/sdext/source/pdfimport/tree/pdfiprocessor.hxx @@ -162,8 +162,7 @@ namespace pdfi const css::uno::Sequence< css::beans::PropertyValue>& xMask) override; - /// nElements == -1 means fill in number of pages - void startIndicator( const OUString& rText, sal_Int32 nElements = -1 ); + void startIndicator( const OUString& rText ); void endIndicator(); void setupImage(ImageId nImage); diff --git a/sdext/source/presenter/PresenterCanvasHelper.cxx b/sdext/source/presenter/PresenterCanvasHelper.cxx index da90b239b2e3..4903a87e1afe 100644 --- a/sdext/source/presenter/PresenterCanvasHelper.cxx +++ b/sdext/source/presenter/PresenterCanvasHelper.cxx @@ -279,10 +279,9 @@ css::geometry::RealRectangle2D PresenterCanvasHelper::GetTextBoundingBox ( css::geometry::RealSize2D PresenterCanvasHelper::GetTextSize ( const css::uno::Reference<css::rendering::XCanvasFont>& rxFont, - const OUString& rsText, - const sal_Int8 nTextDirection) + const OUString& rsText) { - const geometry::RealRectangle2D aTextBBox (GetTextBoundingBox(rxFont, rsText, nTextDirection)); + const geometry::RealRectangle2D aTextBBox (GetTextBoundingBox(rxFont, rsText)); return css::geometry::RealSize2D(aTextBBox.X2 - aTextBBox.X1, aTextBBox.Y2 - aTextBBox.Y1); } diff --git a/sdext/source/presenter/PresenterCanvasHelper.hxx b/sdext/source/presenter/PresenterCanvasHelper.hxx index 5b66623f8f4c..e26e845c2db5 100644 --- a/sdext/source/presenter/PresenterCanvasHelper.hxx +++ b/sdext/source/presenter/PresenterCanvasHelper.hxx @@ -68,8 +68,7 @@ public: static css::geometry::RealSize2D GetTextSize ( const css::uno::Reference<css::rendering::XCanvasFont>& rxFont, - const OUString& rsText, - const sal_Int8 = css::rendering::TextDirection::WEAK_LEFT_TO_RIGHT); + const OUString& rsText ); private: const css::rendering::ViewState maDefaultViewState; diff --git a/sdext/source/presenter/PresenterPaintManager.cxx b/sdext/source/presenter/PresenterPaintManager.cxx index bd39112e7956..5fef2118f60e 100644 --- a/sdext/source/presenter/PresenterPaintManager.cxx +++ b/sdext/source/presenter/PresenterPaintManager.cxx @@ -42,8 +42,7 @@ PresenterPaintManager::PresenterPaintManager ( ::std::function<void (const css::awt::Rectangle& rRepaintBox)> PresenterPaintManager::GetInvalidator ( - const css::uno::Reference<css::awt::XWindow>& rxWindow, - const bool bSynchronous) + const css::uno::Reference<css::awt::XWindow>& rxWindow) { return ::boost::bind( static_cast<void (PresenterPaintManager::*)( @@ -53,16 +52,13 @@ PresenterPaintManager::PresenterPaintManager ( this, rxWindow, _1, - bSynchronous); + false/*bSynchronous*/); } void PresenterPaintManager::Invalidate ( - const css::uno::Reference<css::awt::XWindow>& rxWindow, - const bool bSynchronous) + const css::uno::Reference<css::awt::XWindow>& rxWindow) { sal_Int16 nInvalidateMode (awt::InvalidateStyle::CHILDREN); - if (bSynchronous) - nInvalidateMode |= awt::InvalidateStyle::UPDATE; PresenterPaneContainer::SharedPaneDescriptor pDescriptor( mpPaneContainer->FindContentWindow(rxWindow)); diff --git a/sdext/source/presenter/PresenterPaintManager.hxx b/sdext/source/presenter/PresenterPaintManager.hxx index 3ad014146eee..d1734a122b8c 100644 --- a/sdext/source/presenter/PresenterPaintManager.hxx +++ b/sdext/source/presenter/PresenterPaintManager.hxx @@ -48,16 +48,14 @@ public: ::std::function<void (const css::awt::Rectangle& rRepaintBox)> GetInvalidator ( - const css::uno::Reference<css::awt::XWindow>& rxWindow, - const bool bSynchronous = false); + const css::uno::Reference<css::awt::XWindow>& rxWindow); /** Request a repaint of the whole window. @param rxWindow May be the parent window or one of its descendents. */ void Invalidate ( - const css::uno::Reference<css::awt::XWindow>& rxWindow, - const bool bSynchronous = false); + const css::uno::Reference<css::awt::XWindow>& rxWindow); void Invalidate ( const css::uno::Reference<css::awt::XWindow>& rxWindow, const sal_Int16 nInvalidateFlags); diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx index d848b1a4b2b8..bafad658e7bc 100644 --- a/sdext/source/presenter/PresenterScrollBar.cxx +++ b/sdext/source/presenter/PresenterScrollBar.cxx @@ -294,8 +294,7 @@ double PresenterScrollBar::ValidateThumbPosition (double nPosition) } void PresenterScrollBar::Paint ( - const awt::Rectangle& rUpdateBox, - const bool bNoClip) + const awt::Rectangle& rUpdateBox) { if ( ! mxCanvas.is() || ! mxWindow.is()) { @@ -304,11 +303,8 @@ void PresenterScrollBar::Paint ( return; } - if ( ! bNoClip) - { - if (PresenterGeometryHelper::AreRectanglesDisjoint (rUpdateBox, mxWindow->getPosSize())) - return; - } + if (PresenterGeometryHelper::AreRectanglesDisjoint (rUpdateBox, mxWindow->getPosSize())) + return; PaintBackground(rUpdateBox); PaintComposite(rUpdateBox, PagerUp, diff --git a/sdext/source/presenter/PresenterScrollBar.hxx b/sdext/source/presenter/PresenterScrollBar.hxx index b2c37ca1b00c..05c2ae5e79ce 100644 --- a/sdext/source/presenter/PresenterScrollBar.hxx +++ b/sdext/source/presenter/PresenterScrollBar.hxx @@ -107,8 +107,7 @@ public: scrollbar from the outside. */ void Paint ( - const css::awt::Rectangle& rUpdateBox, - bool bNoClip = false); + const css::awt::Rectangle& rUpdateBox); virtual sal_Int32 GetSize() const = 0; diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx index 6e8716f2062c..d7ece041198b 100644 --- a/sdext/source/presenter/PresenterSlideSorter.cxx +++ b/sdext/source/presenter/PresenterSlideSorter.cxx @@ -92,8 +92,7 @@ public: bool IsScrollBarNeeded (const sal_Int32 nSlideCount); geometry::RealPoint2D GetLocalPosition (const geometry::RealPoint2D& rWindowPoint) const; geometry::RealPoint2D GetWindowPosition(const geometry::RealPoint2D& rLocalPoint) const; - sal_Int32 GetColumn (const geometry::RealPoint2D& rLocalPoint, - const bool bReturnInvalidValue = false) const; + sal_Int32 GetColumn (const geometry::RealPoint2D& rLocalPoint) const; sal_Int32 GetRow (const geometry::RealPoint2D& rLocalPoint, const bool bReturnInvalidValue = false) const; sal_Int32 GetSlideIndexForPosition (const css::geometry::RealPoint2D& rPoint) const; @@ -1296,13 +1295,11 @@ geometry::RealPoint2D PresenterSlideSorter::Layout::GetWindowPosition( } sal_Int32 PresenterSlideSorter::Layout::GetColumn ( - const css::geometry::RealPoint2D& rLocalPoint, - const bool bReturnInvalidValue) const + const css::geometry::RealPoint2D& rLocalPoint) const { const sal_Int32 nColumn(floor( (rLocalPoint.X + mnHorizontalGap/2.0) / (maPreviewSize.Width+mnHorizontalGap))); - if (bReturnInvalidValue - || (nColumn>=mnFirstVisibleColumn && nColumn<=mnLastVisibleColumn)) + if (nColumn>=mnFirstVisibleColumn && nColumn<=mnLastVisibleColumn) { return nColumn; } |