Kaydet (Commit) a8aafaee authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:unuseddefaultparam in sdext

Change-Id: I6919b8ca82e81153f4f8b663f00c9ede5ffe6305
üst bd5ceabb
...@@ -601,10 +601,9 @@ void PDFIProcessor::emit( XmlEmitter& rEmitter, ...@@ -601,10 +601,9 @@ void PDFIProcessor::emit( XmlEmitter& rEmitter,
endIndicator(); endIndicator();
} }
void PDFIProcessor::startIndicator( const OUString& rText, sal_Int32 nElements ) void PDFIProcessor::startIndicator( const OUString& rText )
{ {
if( nElements == -1 ) sal_Int32 nElements = m_nPages;
nElements = m_nPages;
if( m_xStatusIndicator.is() ) if( m_xStatusIndicator.is() )
{ {
sal_Int32 nUnicodes = rText.getLength(); sal_Int32 nUnicodes = rText.getLength();
......
...@@ -162,8 +162,7 @@ namespace pdfi ...@@ -162,8 +162,7 @@ namespace pdfi
const css::uno::Sequence< const css::uno::Sequence<
css::beans::PropertyValue>& xMask) override; css::beans::PropertyValue>& xMask) override;
/// nElements == -1 means fill in number of pages void startIndicator( const OUString& rText );
void startIndicator( const OUString& rText, sal_Int32 nElements = -1 );
void endIndicator(); void endIndicator();
void setupImage(ImageId nImage); void setupImage(ImageId nImage);
......
...@@ -279,10 +279,9 @@ css::geometry::RealRectangle2D PresenterCanvasHelper::GetTextBoundingBox ( ...@@ -279,10 +279,9 @@ css::geometry::RealRectangle2D PresenterCanvasHelper::GetTextBoundingBox (
css::geometry::RealSize2D PresenterCanvasHelper::GetTextSize ( css::geometry::RealSize2D PresenterCanvasHelper::GetTextSize (
const css::uno::Reference<css::rendering::XCanvasFont>& rxFont, const css::uno::Reference<css::rendering::XCanvasFont>& rxFont,
const OUString& rsText, const OUString& rsText)
const sal_Int8 nTextDirection)
{ {
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); return css::geometry::RealSize2D(aTextBBox.X2 - aTextBBox.X1, aTextBBox.Y2 - aTextBBox.Y1);
} }
......
...@@ -68,8 +68,7 @@ public: ...@@ -68,8 +68,7 @@ public:
static css::geometry::RealSize2D GetTextSize ( static css::geometry::RealSize2D GetTextSize (
const css::uno::Reference<css::rendering::XCanvasFont>& rxFont, const css::uno::Reference<css::rendering::XCanvasFont>& rxFont,
const OUString& rsText, const OUString& rsText );
const sal_Int8 = css::rendering::TextDirection::WEAK_LEFT_TO_RIGHT);
private: private:
const css::rendering::ViewState maDefaultViewState; const css::rendering::ViewState maDefaultViewState;
......
...@@ -42,8 +42,7 @@ PresenterPaintManager::PresenterPaintManager ( ...@@ -42,8 +42,7 @@ PresenterPaintManager::PresenterPaintManager (
::std::function<void (const css::awt::Rectangle& rRepaintBox)> ::std::function<void (const css::awt::Rectangle& rRepaintBox)>
PresenterPaintManager::GetInvalidator ( PresenterPaintManager::GetInvalidator (
const css::uno::Reference<css::awt::XWindow>& rxWindow, const css::uno::Reference<css::awt::XWindow>& rxWindow)
const bool bSynchronous)
{ {
return ::boost::bind( return ::boost::bind(
static_cast<void (PresenterPaintManager::*)( static_cast<void (PresenterPaintManager::*)(
...@@ -53,16 +52,13 @@ PresenterPaintManager::PresenterPaintManager ( ...@@ -53,16 +52,13 @@ PresenterPaintManager::PresenterPaintManager (
this, this,
rxWindow, rxWindow,
_1, _1,
bSynchronous); false/*bSynchronous*/);
} }
void PresenterPaintManager::Invalidate ( void PresenterPaintManager::Invalidate (
const css::uno::Reference<css::awt::XWindow>& rxWindow, const css::uno::Reference<css::awt::XWindow>& rxWindow)
const bool bSynchronous)
{ {
sal_Int16 nInvalidateMode (awt::InvalidateStyle::CHILDREN); sal_Int16 nInvalidateMode (awt::InvalidateStyle::CHILDREN);
if (bSynchronous)
nInvalidateMode |= awt::InvalidateStyle::UPDATE;
PresenterPaneContainer::SharedPaneDescriptor pDescriptor( PresenterPaneContainer::SharedPaneDescriptor pDescriptor(
mpPaneContainer->FindContentWindow(rxWindow)); mpPaneContainer->FindContentWindow(rxWindow));
......
...@@ -48,16 +48,14 @@ public: ...@@ -48,16 +48,14 @@ public:
::std::function<void (const css::awt::Rectangle& rRepaintBox)> ::std::function<void (const css::awt::Rectangle& rRepaintBox)>
GetInvalidator ( GetInvalidator (
const css::uno::Reference<css::awt::XWindow>& rxWindow, const css::uno::Reference<css::awt::XWindow>& rxWindow);
const bool bSynchronous = false);
/** Request a repaint of the whole window. /** Request a repaint of the whole window.
@param rxWindow @param rxWindow
May be the parent window or one of its descendents. May be the parent window or one of its descendents.
*/ */
void Invalidate ( void Invalidate (
const css::uno::Reference<css::awt::XWindow>& rxWindow, const css::uno::Reference<css::awt::XWindow>& rxWindow);
const bool bSynchronous = false);
void Invalidate ( void Invalidate (
const css::uno::Reference<css::awt::XWindow>& rxWindow, const css::uno::Reference<css::awt::XWindow>& rxWindow,
const sal_Int16 nInvalidateFlags); const sal_Int16 nInvalidateFlags);
......
...@@ -294,8 +294,7 @@ double PresenterScrollBar::ValidateThumbPosition (double nPosition) ...@@ -294,8 +294,7 @@ double PresenterScrollBar::ValidateThumbPosition (double nPosition)
} }
void PresenterScrollBar::Paint ( void PresenterScrollBar::Paint (
const awt::Rectangle& rUpdateBox, const awt::Rectangle& rUpdateBox)
const bool bNoClip)
{ {
if ( ! mxCanvas.is() || ! mxWindow.is()) if ( ! mxCanvas.is() || ! mxWindow.is())
{ {
...@@ -304,11 +303,8 @@ void PresenterScrollBar::Paint ( ...@@ -304,11 +303,8 @@ void PresenterScrollBar::Paint (
return; return;
} }
if ( ! bNoClip) if (PresenterGeometryHelper::AreRectanglesDisjoint (rUpdateBox, mxWindow->getPosSize()))
{ return;
if (PresenterGeometryHelper::AreRectanglesDisjoint (rUpdateBox, mxWindow->getPosSize()))
return;
}
PaintBackground(rUpdateBox); PaintBackground(rUpdateBox);
PaintComposite(rUpdateBox, PagerUp, PaintComposite(rUpdateBox, PagerUp,
......
...@@ -107,8 +107,7 @@ public: ...@@ -107,8 +107,7 @@ public:
scrollbar from the outside. scrollbar from the outside.
*/ */
void Paint ( void Paint (
const css::awt::Rectangle& rUpdateBox, const css::awt::Rectangle& rUpdateBox);
bool bNoClip = false);
virtual sal_Int32 GetSize() const = 0; virtual sal_Int32 GetSize() const = 0;
......
...@@ -92,8 +92,7 @@ public: ...@@ -92,8 +92,7 @@ public:
bool IsScrollBarNeeded (const sal_Int32 nSlideCount); bool IsScrollBarNeeded (const sal_Int32 nSlideCount);
geometry::RealPoint2D GetLocalPosition (const geometry::RealPoint2D& rWindowPoint) const; geometry::RealPoint2D GetLocalPosition (const geometry::RealPoint2D& rWindowPoint) const;
geometry::RealPoint2D GetWindowPosition(const geometry::RealPoint2D& rLocalPoint) const; geometry::RealPoint2D GetWindowPosition(const geometry::RealPoint2D& rLocalPoint) const;
sal_Int32 GetColumn (const geometry::RealPoint2D& rLocalPoint, sal_Int32 GetColumn (const geometry::RealPoint2D& rLocalPoint) const;
const bool bReturnInvalidValue = false) const;
sal_Int32 GetRow (const geometry::RealPoint2D& rLocalPoint, sal_Int32 GetRow (const geometry::RealPoint2D& rLocalPoint,
const bool bReturnInvalidValue = false) const; const bool bReturnInvalidValue = false) const;
sal_Int32 GetSlideIndexForPosition (const css::geometry::RealPoint2D& rPoint) const; sal_Int32 GetSlideIndexForPosition (const css::geometry::RealPoint2D& rPoint) const;
...@@ -1296,13 +1295,11 @@ geometry::RealPoint2D PresenterSlideSorter::Layout::GetWindowPosition( ...@@ -1296,13 +1295,11 @@ geometry::RealPoint2D PresenterSlideSorter::Layout::GetWindowPosition(
} }
sal_Int32 PresenterSlideSorter::Layout::GetColumn ( sal_Int32 PresenterSlideSorter::Layout::GetColumn (
const css::geometry::RealPoint2D& rLocalPoint, const css::geometry::RealPoint2D& rLocalPoint) const
const bool bReturnInvalidValue) const
{ {
const sal_Int32 nColumn(floor( const sal_Int32 nColumn(floor(
(rLocalPoint.X + mnHorizontalGap/2.0) / (maPreviewSize.Width+mnHorizontalGap))); (rLocalPoint.X + mnHorizontalGap/2.0) / (maPreviewSize.Width+mnHorizontalGap)));
if (bReturnInvalidValue if (nColumn>=mnFirstVisibleColumn && nColumn<=mnLastVisibleColumn)
|| (nColumn>=mnFirstVisibleColumn && nColumn<=mnLastVisibleColumn))
{ {
return nColumn; return nColumn;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment