summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-03-01 15:13:33 +0200
committerNoel Grandin <noel@peralex.com>2016-03-02 07:57:37 +0200
commite65506968f98340522df9af1a2bfa7ab736bdc45 (patch)
treed3a21b4263d3bdd1960250c23f447fc8b176a08e
parenta8aafaee134eb82e033175a820096d72205ce5e5 (diff)
loplugin:unuseddefaultparam in sd
Change-Id: Ic1bb6903a7e4d4aae44b0a2a21a46590d5b4027f
-rw-r--r--sd/inc/CustomAnimationEffect.hxx2
-rw-r--r--sd/source/core/CustomAnimationEffect.cxx4
-rw-r--r--sd/source/filter/html/htmlex.cxx8
-rw-r--r--sd/source/filter/html/htmlex.hxx2
-rw-r--r--sd/source/ui/animations/CategoryListBox.cxx4
-rw-r--r--sd/source/ui/animations/CategoryListBox.hxx2
-rw-r--r--sd/source/ui/animations/CustomAnimationList.cxx6
-rw-r--r--sd/source/ui/animations/CustomAnimationList.hxx2
-rw-r--r--sd/source/ui/animations/STLPropertySet.cxx2
-rw-r--r--sd/source/ui/animations/STLPropertySet.hxx2
-rw-r--r--sd/source/ui/annotations/annotationwindow.cxx5
-rw-r--r--sd/source/ui/annotations/annotationwindow.hxx2
-rw-r--r--sd/source/ui/inc/TemplateScanner.hxx4
-rw-r--r--sd/source/ui/inc/WindowUpdater.hxx6
-rw-r--r--sd/source/ui/inc/slideshow.hxx3
-rw-r--r--sd/source/ui/inc/tools/AsynchronousCall.hxx10
-rw-r--r--sd/source/ui/inc/unomodel.hxx2
-rw-r--r--sd/source/ui/sidebar/MasterPageContainer.cxx44
-rw-r--r--sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx6
-rw-r--r--sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx9
-rw-r--r--sd/source/ui/slideshow/slideshow.cxx5
-rw-r--r--sd/source/ui/slidesorter/cache/SlsPageCache.cxx4
-rw-r--r--sd/source/ui/slidesorter/controller/SlsAnimator.cxx3
-rw-r--r--sd/source/ui/slidesorter/controller/SlsClipboard.cxx10
-rw-r--r--sd/source/ui/slidesorter/controller/SlsPageSelector.cxx6
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx5
-rw-r--r--sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx6
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx2
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx4
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx9
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx2
-rw-r--r--sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx10
-rw-r--r--sd/source/ui/tools/AsynchronousCall.cxx6
-rw-r--r--sd/source/ui/unoidl/unolayer.cxx5
-rw-r--r--sd/source/ui/unoidl/unolayer.hxx2
-rw-r--r--sd/source/ui/unoidl/unomodel.cxx4
-rw-r--r--sd/source/ui/view/WindowUpdater.cxx5
37 files changed, 71 insertions, 142 deletions
diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx
index f6dbd1815821..a8dcbe5c1a42 100644
--- a/sd/inc/CustomAnimationEffect.hxx
+++ b/sd/inc/CustomAnimationEffect.hxx
@@ -151,7 +151,7 @@ public:
SAL_DLLPRIVATE void setAudio( const css::uno::Reference< css::animations::XAudio >& xAudio );
SAL_DLLPRIVATE bool getStopAudio() const;
void setStopAudio();
- void createAudio( const css::uno::Any& rSource, double fVolume = 1.0 );
+ void createAudio( const css::uno::Any& rSource );
SAL_DLLPRIVATE void removeAudio();
SAL_DLLPRIVATE const css::uno::Reference< css::animations::XAudio >& getAudio() const { return mxAudio; }
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx
index a3efd9fb8dd7..674f3117bd94 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -1477,7 +1477,7 @@ bool CustomAnimationEffect::setTransformationProperty( sal_Int32 nTransformType,
return bChanged;
}
-void CustomAnimationEffect::createAudio( const css::uno::Any& rSource, double fVolume /* = 1.0 */ )
+void CustomAnimationEffect::createAudio( const css::uno::Any& rSource )
{
DBG_ASSERT( !mxAudio.is(), "sd::CustomAnimationEffect::createAudio(), node already has an audio!" );
@@ -1486,7 +1486,7 @@ void CustomAnimationEffect::createAudio( const css::uno::Any& rSource, double fV
Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
Reference< XAudio > xAudio( Audio::create( xContext ) );
xAudio->setSource( rSource );
- xAudio->setVolume( fVolume );
+ xAudio->setVolume( 1.0 );
setAudio( xAudio );
}
catch( Exception& )
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 9bbe92cc5071..06b2375ba827 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -2729,8 +2729,7 @@ OUString HtmlExport::CreateLink( const OUString& aLink,
// creates a image tag
OUString HtmlExport::CreateImage( const OUString& aImage, const OUString& aAltText,
- sal_Int16 nWidth,
- sal_Int16 nHeight )
+ sal_Int16 nWidth )
{
OUStringBuffer aStr( "<img src=\"");
aStr.append(aImage);
@@ -2753,11 +2752,6 @@ OUString HtmlExport::CreateImage( const OUString& aImage, const OUString& aAltTe
aStr.append(" width=" + OUString::number(nWidth));
}
- if(nHeight > -1)
- {
- aStr.append(" height=" + OUString::number(nHeight));
- }
-
aStr.append('>');
return aStr.makeStringAndClear();
diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx
index 0c51afb1a7c2..ae681a249246 100644
--- a/sd/source/filter/html/htmlex.hxx
+++ b/sd/source/filter/html/htmlex.hxx
@@ -172,7 +172,7 @@ class HtmlExport
static OUString CreateLink( const OUString& aLink, const OUString& aText,
const OUString& aTarget = OUString());
- static OUString CreateImage( const OUString& aImage, const OUString& aAltText, sal_Int16 nWidth = -1, sal_Int16 nHeight = -1 );
+ static OUString CreateImage( const OUString& aImage, const OUString& aAltText, sal_Int16 nWidth = -1 );
OUString CreateNavBar( sal_uInt16 nSdPage, bool bIsText ) const;
OUString CreateBodyTag() const;
diff --git a/sd/source/ui/animations/CategoryListBox.cxx b/sd/source/ui/animations/CategoryListBox.cxx
index 93364d48b52d..1fba84529482 100644
--- a/sd/source/ui/animations/CategoryListBox.cxx
+++ b/sd/source/ui/animations/CategoryListBox.cxx
@@ -15,9 +15,9 @@ CategoryListBox::~CategoryListBox()
{
}
-sal_Int32 CategoryListBox::InsertCategory( const OUString& rStr, sal_Int32 nPos /* = LISTBOX_APPEND */ )
+sal_Int32 CategoryListBox::InsertCategory( const OUString& rStr )
{
- sal_Int32 n = ListBox::InsertEntry( rStr, nPos );
+ sal_Int32 n = ListBox::InsertEntry( rStr );
if( n != LISTBOX_ENTRY_NOTFOUND )
ListBox::SetEntryFlags( n, ListBox::GetEntryFlags(n) | ListBoxEntryFlags::DisableSelection );
diff --git a/sd/source/ui/animations/CategoryListBox.hxx b/sd/source/ui/animations/CategoryListBox.hxx
index fa29b4abea5b..aace8a448af0 100644
--- a/sd/source/ui/animations/CategoryListBox.hxx
+++ b/sd/source/ui/animations/CategoryListBox.hxx
@@ -14,7 +14,7 @@ public:
virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
- sal_Int32 InsertCategory( const OUString& rStr, sal_Int32 nPos = LISTBOX_APPEND );
+ sal_Int32 InsertCategory( const OUString& rStr );
DECL_LINK_TYPED(implDoubleClickHdl, ListBox&, void);
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index 16c05d4f5699..a8cc25ec919a 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -487,21 +487,21 @@ void CustomAnimationList::KeyInput( const KeyEvent& rKEvt )
/** selects or deselects the given effect.
Selections of other effects are not changed */
-void CustomAnimationList::select( CustomAnimationEffectPtr pEffect, bool bSelect /* = true */ )
+void CustomAnimationList::select( CustomAnimationEffectPtr pEffect )
{
CustomAnimationListEntry* pEntry = static_cast< CustomAnimationListEntry* >(First());
while( pEntry )
{
if( pEntry->getEffect() == pEffect )
{
- Select( pEntry, bSelect );
+ Select( pEntry );
MakeVisible( pEntry );
break;
}
pEntry = static_cast< CustomAnimationListEntry* >(Next( pEntry ));
}
- if( !pEntry && bSelect )
+ if( !pEntry )
{
append( pEffect );
select( pEffect );
diff --git a/sd/source/ui/animations/CustomAnimationList.hxx b/sd/source/ui/animations/CustomAnimationList.hxx
index 58f6153f2e7b..376934509790 100644
--- a/sd/source/ui/animations/CustomAnimationList.hxx
+++ b/sd/source/ui/animations/CustomAnimationList.hxx
@@ -58,7 +58,7 @@ public:
/** selects or deselects the given effect.
Selections of other effects are not changed */
- void select( CustomAnimationEffectPtr pEffect, bool bSelect = true );
+ void select( CustomAnimationEffectPtr pEffect );
/** populates the list with all effects from the given MainSequence */
void update( MainSequencePtr pMainSequence );
diff --git a/sd/source/ui/animations/STLPropertySet.cxx b/sd/source/ui/animations/STLPropertySet.cxx
index 9044c0204226..ea339af5eb33 100644
--- a/sd/source/ui/animations/STLPropertySet.cxx
+++ b/sd/source/ui/animations/STLPropertySet.cxx
@@ -42,7 +42,7 @@ void STLPropertySet::setPropertyDefaultValue( sal_Int32 nHandle, const Any& rVal
maPropertyMap[ nHandle ] = aEntry;
}
-void STLPropertySet::setPropertyValue( sal_Int32 nHandle, const Any& rValue, sal_Int32 /* nState = STLPropertyState_DIRECT */ )
+void STLPropertySet::setPropertyValue( sal_Int32 nHandle, const Any& rValue )
{
PropertyMapIter aIter;
if( findProperty( nHandle, aIter ) )
diff --git a/sd/source/ui/animations/STLPropertySet.hxx b/sd/source/ui/animations/STLPropertySet.hxx
index 10606534f720..54665cc781d8 100644
--- a/sd/source/ui/animations/STLPropertySet.hxx
+++ b/sd/source/ui/animations/STLPropertySet.hxx
@@ -55,7 +55,7 @@ public:
~STLPropertySet();
void setPropertyDefaultValue( sal_Int32 nHandle, const css::uno::Any& rValue );
- void setPropertyValue( sal_Int32 nHandle, const css::uno::Any& rValue, sal_Int32 nState = STLPropertyState_DIRECT );
+ void setPropertyValue( sal_Int32 nHandle, const css::uno::Any& rValue );
css::uno::Any getPropertyValue( sal_Int32 nHandle ) const;
sal_Int32 getPropertyState( sal_Int32 nHandle ) const;
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx
index fe92614a6f65..a33e04309efe 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -523,7 +523,7 @@ TextApiObject* getTextApiObject( const Reference< XAnnotation >& xAnnotation )
return nullptr;
}
-void AnnotationWindow::setAnnotation( const Reference< XAnnotation >& xAnnotation, bool bGrabFocus )
+void AnnotationWindow::setAnnotation( const Reference< XAnnotation >& xAnnotation )
{
if( (xAnnotation != mxAnnotation) && xAnnotation.is() )
{
@@ -559,9 +559,6 @@ void AnnotationWindow::setAnnotation( const Reference< XAnnotation >& xAnnotatio
sMeta += sDateTime;
}
mpMeta->SetText(sMeta);
-
- if( bGrabFocus )
- GrabFocus();
}
}
diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx
index 20f6e169204b..0ce319766afa 100644
--- a/sd/source/ui/annotations/annotationwindow.hxx
+++ b/sd/source/ui/annotations/annotationwindow.hxx
@@ -107,7 +107,7 @@ class AnnotationWindow : public FloatingWindow
SvxLanguageItem GetLanguage();
- void setAnnotation( const css::uno::Reference< css::office::XAnnotation >& xAnnotation, bool bGrabFocus = false );
+ void setAnnotation( const css::uno::Reference< css::office::XAnnotation >& xAnnotation );
void ExecuteSlot( sal_uInt16 nSID );
diff --git a/sd/source/ui/inc/TemplateScanner.hxx b/sd/source/ui/inc/TemplateScanner.hxx
index 6497848312bc..eed8d9445bec 100644
--- a/sd/source/ui/inc/TemplateScanner.hxx
+++ b/sd/source/ui/inc/TemplateScanner.hxx
@@ -142,8 +142,8 @@ public:
/** Set whether to sort the template entries inside the regions.
*/
- void EnableEntrySorting (bool isEntrySortingEnabled = true)
- {mbEntrySortingEnabled = isEntrySortingEnabled;}
+ void EnableEntrySorting ()
+ {mbEntrySortingEnabled = true;}
private:
/** The current state determines which step will be executed next by
diff --git a/sd/source/ui/inc/WindowUpdater.hxx b/sd/source/ui/inc/WindowUpdater.hxx
index e444353850ee..30c92d65578c 100644
--- a/sd/source/ui/inc/WindowUpdater.hxx
+++ b/sd/source/ui/inc/WindowUpdater.hxx
@@ -92,12 +92,8 @@ public:
@param pWindow
The device to update. When the given pointer is NULL then
nothing is done.
- @param pDocument
- When given a pointer to a document then tell it to reformat all
- text objects. This refomatting is necessary for the new values
- to take effect.
*/
- void Update (OutputDevice* pDevice, SdDrawDocument* pDocument=nullptr) const;
+ void Update (OutputDevice* pDevice) const;
/** Callback that waits for notifications of a
<type>SvtCTLOptions</type> object.
diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx
index 741af84d7966..93f3ede65166 100644
--- a/sd/source/ui/inc/slideshow.hxx
+++ b/sd/source/ui/inc/slideshow.hxx
@@ -95,8 +95,7 @@ public:
static bool StartPreview( ViewShellBase& rBase,
const css::uno::Reference< css::drawing::XDrawPage >& xDrawPage,
- const css::uno::Reference< css::animations::XAnimationNode >& xAnimationNode,
- vcl::Window* pParent = nullptr );
+ const css::uno::Reference< css::animations::XAnimationNode >& xAnimationNode );
static void Stop( ViewShellBase& rBase );
diff --git a/sd/source/ui/inc/tools/AsynchronousCall.hxx b/sd/source/ui/inc/tools/AsynchronousCall.hxx
index d20a76f3ee09..2733f2242e09 100644
--- a/sd/source/ui/inc/tools/AsynchronousCall.hxx
+++ b/sd/source/ui/inc/tools/AsynchronousCall.hxx
@@ -54,20 +54,16 @@ public:
~AsynchronousCall();
/** Post a function object that is to be executed asynchronously. When
- this method is called while the current function object has not bee
- executed then the later is destroyed and only the given function
+ this method is called while the current function object has not been
+ executed then the latter is destroyed and only the given function
object will be executed.
@param rFunction
The function object that may be called asynchronously in the
near future.
- @param nTimeoutInMilliseconds
- The timeout in milliseconds until the function object is
- executed.
*/
typedef ::std::function<void ()> AsynchronousFunction;
void Post (
- const AsynchronousFunction& rFunction,
- sal_uInt32 nTimeoutInMilliseconds=10);
+ const AsynchronousFunction& rFunction);
private:
Timer maTimer;
diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx
index fe09a745845f..7b2c9d31e51d 100644
--- a/sd/source/ui/inc/unomodel.hxx
+++ b/sd/source/ui/inc/unomodel.hxx
@@ -145,7 +145,7 @@ public:
SdDrawDocument* GetDoc() const { return mpDoc; }
bool IsImpressDocument() const { return mbImpressDoc; }
- void SetModified( bool bModified = true ) throw();
+ void SetModified() throw();
css::uno::Reference< css::i18n::XForbiddenCharacters > getForbiddenCharsTable();
diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx b/sd/source/ui/sidebar/MasterPageContainer.cxx
index a75743aa2da9..728bf786f85c 100644
--- a/sd/source/ui/sidebar/MasterPageContainer.cxx
+++ b/sd/source/ui/sidebar/MasterPageContainer.cxx
@@ -104,8 +104,7 @@ public:
void FireContainerChange (
MasterPageContainerChangeEvent::EventType eType,
- Token aToken,
- bool bNotifyAsynchronously = false);
+ Token aToken);
virtual bool UpdateDescriptor (
const SharedMasterPageDescriptor& rpDescriptor,
@@ -170,7 +169,6 @@ private:
bool mbContainerCleaningPending;
typedef ::std::pair<MasterPageContainerChangeEvent::EventType,Token> EventData;
- DECL_LINK_TYPED(AsynchronousNotifyCallback, void*, void);
Image GetPreviewSubstitution (sal_uInt16 nId, PreviewSize ePreviewSize);
@@ -617,18 +615,6 @@ Size MasterPageContainer::Implementation::GetPreviewSizePixel (PreviewSize eSize
return maLargePreviewSizePixel;
}
-IMPL_LINK_TYPED(MasterPageContainer::Implementation,AsynchronousNotifyCallback, void*, p, void)
-{
- EventData* pData = static_cast<EventData*>(p);
- const ::osl::MutexGuard aGuard (maMutex);
-
- if (pData != nullptr)
- {
- FireContainerChange(pData->first, pData->second);
- delete pData;
- }
-}
-
MasterPageContainer::Token MasterPageContainer::Implementation::PutMasterPage (
const SharedMasterPageDescriptor& rpDescriptor)
{
@@ -945,25 +931,15 @@ void MasterPageContainer::Implementation::CleanContainer()
void MasterPageContainer::Implementation::FireContainerChange (
MasterPageContainerChangeEvent::EventType eType,
- Token aToken,
- bool bNotifyAsynchronously)
-{
- if (bNotifyAsynchronously)
- {
- Application::PostUserEvent(
- LINK(this,Implementation,AsynchronousNotifyCallback),
- new EventData(eType,aToken));
- }
- else
- {
- ::std::vector<Link<MasterPageContainerChangeEvent&,void>> aCopy(maChangeListeners.begin(),maChangeListeners.end());
- ::std::vector<Link<MasterPageContainerChangeEvent&,void>>::iterator iListener;
- MasterPageContainerChangeEvent aEvent;
- aEvent.meEventType = eType;
- aEvent.maChildToken = aToken;
- for (iListener=aCopy.begin(); iListener!=aCopy.end(); ++iListener)
- iListener->Call(aEvent);
- }
+ Token aToken)
+{
+ ::std::vector<Link<MasterPageContainerChangeEvent&,void>> aCopy(maChangeListeners.begin(),maChangeListeners.end());
+ ::std::vector<Link<MasterPageContainerChangeEvent&,void>>::iterator iListener;
+ MasterPageContainerChangeEvent aEvent;
+ aEvent.meEventType = eType;
+ aEvent.maChildToken = aToken;
+ for (iListener=aCopy.begin(); iListener!=aCopy.end(); ++iListener)
+ iListener->Call(aEvent);
}
bool MasterPageContainer::Implementation::UpdateDescriptor (
diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
index 7d52c78540bb..0a0283bee857 100644
--- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
+++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
@@ -317,8 +317,7 @@ IMPL_LINK_TYPED(RecentlyUsedMasterPages, MasterPageContainerChangeListener,
}
void RecentlyUsedMasterPages::AddMasterPage (
- MasterPageContainer::Token aToken,
- bool bMakePersistent)
+ MasterPageContainer::Token aToken)
{
// For the page to be inserted the token has to be valid and the page
// has to have a valid URL. This excludes master pages that do not come
@@ -349,8 +348,7 @@ void RecentlyUsedMasterPages::AddMasterPage (
mvMasterPages.pop_back ();
}
- if (bMakePersistent)
- SavePersistentValues ();
+ SavePersistentValues ();
SendEvent();
}
}
diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
index 7c01cc775bc2..f8ad97abfcbd 100644
--- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
+++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
@@ -110,15 +110,8 @@ private:
list of most recently used master pages. When the page is already a
member of that list the associated descriptor is moved to the end of
the list to make it the most recently used entry.
- @param bMakePersistent
- When <TRUE/> is given then the new list of recently used master
- pages is written back into the configuration to make it
- persistent. Giving <FALSE/> to omit this is used while loading
- the persistent list from the configuration.
*/
- void AddMasterPage (
- MasterPageContainer::Token aToken,
- bool bMakePersistent = true);
+ void AddMasterPage(MasterPageContainer::Token aToken);
/** Load the list of recently used master pages from the registry where
it was saved to make it persistent.
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index 6d30a083a6a2..db0f47693f2a 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -184,12 +184,11 @@ css::uno::Reference< css::presentation::XSlideShowController > SlideShow::GetSli
bool SlideShow::StartPreview( ViewShellBase& rBase,
const css::uno::Reference< css::drawing::XDrawPage >& xDrawPage,
- const css::uno::Reference< css::animations::XAnimationNode >& xAnimationNode,
- vcl::Window* pParent /* = 0 */ )
+ const css::uno::Reference< css::animations::XAnimationNode >& xAnimationNode )
{
rtl::Reference< SlideShow > xSlideShow( GetSlideShow( rBase ) );
if( xSlideShow.is() )
- return xSlideShow->startPreview( xDrawPage, xAnimationNode, pParent );
+ return xSlideShow->startPreview( xDrawPage, xAnimationNode );
return false;
}
diff --git a/sd/source/ui/slidesorter/cache/SlsPageCache.cxx b/sd/source/ui/slidesorter/cache/SlsPageCache.cxx
index c369500f9fdf..fa7ff455bb0d 100644
--- a/sd/source/ui/slidesorter/cache/SlsPageCache.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsPageCache.cxx
@@ -86,9 +86,9 @@ void PageCache::InvalidatePreviewBitmap (
RequestPreviewBitmap(aKey);
}
-void PageCache::InvalidateCache (const bool bUpdateCache)
+void PageCache::InvalidateCache()
{
- mpImplementation->InvalidateCache(bUpdateCache);
+ mpImplementation->InvalidateCache(true);
}
void PageCache::SetPreciousFlag (
diff --git a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
index 2dd7db85bf08..7268cd7227c7 100644
--- a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
@@ -201,9 +201,8 @@ void Animator::CleanUpAnimationList()
maAnimations.swap(aActiveAnimations);
}
-void Animator::RequestNextFrame (const double nFrameStart)
+void Animator::RequestNextFrame ()
{
- (void)nFrameStart;
if ( ! maIdle.IsActive())
{
// Prevent redraws except for the ones in TimeoutHandler. While the
diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
index 99c5faf5ffd2..3d0cf86eda48 100644
--- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
@@ -216,12 +216,12 @@ void Clipboard::HandleSlotCall (SfxRequest& rRequest)
}
}
-void Clipboard::DoCut (vcl::Window* pWindow)
+void Clipboard::DoCut ()
{
if (mrSlideSorter.GetModel().GetPageCount() > 1)
{
- DoCopy(pWindow);
- DoDelete(pWindow);
+ DoCopy();
+ DoDelete();
}
}
@@ -238,13 +238,13 @@ void Clipboard::DoCopy (vcl::Window* pWindow )
CreateSlideTransferable( pWindow, false );
}
-void Clipboard::DoPaste (vcl::Window* pWindow)
+void Clipboard::DoPaste ()
{
SdTransferable* pClipTransferable = SD_MOD()->pTransferClip;
if (pClipTransferable!=nullptr && pClipTransferable->IsPageTransferable())
{
- sal_Int32 nInsertPosition = GetInsertionPosition(pWindow);
+ sal_Int32 nInsertPosition = GetInsertionPosition(nullptr);
if (nInsertPosition >= 0)
{
diff --git a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
index fc834e295e9c..d7766d2da5ba 100644
--- a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
@@ -166,13 +166,11 @@ void PageSelector::SelectPage (const SharedPageDescriptor& rpDescriptor)
}
}
-void PageSelector::DeselectPage (
- int nPageIndex,
- const bool bUpdateCurrentPage)
+void PageSelector::DeselectPage (int nPageIndex)
{
model::SharedPageDescriptor pDescriptor (mrModel.GetPageDescriptor(nPageIndex));
if (pDescriptor.get() != nullptr)
- DeselectPage(pDescriptor, bUpdateCurrentPage);
+ DeselectPage(pDescriptor);
}
void PageSelector::DeselectPage (
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx
index e2d8292eec94..a954aed91d6c 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx
@@ -201,10 +201,9 @@ void SelectionManager::DeleteSelectedMasterPages (const ::std::vector<SdPage*>&
}
}
-void SelectionManager::SelectionHasChanged (const bool bMakeSelectionVisible)
+void SelectionManager::SelectionHasChanged ()
{
- if (bMakeSelectionVisible)
- mbIsMakeSelectionVisiblePending = true;
+ mbIsMakeSelectionVisiblePending = true;
ViewShell* pViewShell = mrSlideSorter.GetViewShell();
if (pViewShell != nullptr)
diff --git a/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx b/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx
index 022c88b82735..90f0d3090c0e 100644
--- a/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx
+++ b/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx
@@ -134,12 +134,8 @@ public:
/** Call this method when all preview bitmaps have to be generated anew.
This is the case when the size of the page objects on the screen has
changed or when the model has changed.
- @param bUpdateCache
- When this flags is <TRUE/> then requests for updated previews
- are created. When it is <FALSE/> the existing previews are only
- marked as not being up-to-date anymore.
*/
- void InvalidateCache (const bool bUpdateCache = true);
+ void InvalidateCache ();
/** With the precious flag you can control whether a bitmap can be
removed or reduced in size to make room for other bitmaps or is so
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
index f9c8db38773d..0128b41917a1 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
@@ -120,7 +120,7 @@ private:
*/
void CleanUpAnimationList();
- void RequestNextFrame (const double nFrameStart = 0);
+ void RequestNextFrame();
};
} } } // end of namespace ::sd::slidesorter::controller
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx
index 8b37209808cd..8e3cb0456cf6 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx
@@ -72,11 +72,11 @@ public:
void HandleSlotCall (SfxRequest& rRequest);
- void DoCut (vcl::Window* pWindow = nullptr);
+ void DoCut ();
// Exported for unit test
SD_DLLPUBLIC void DoCopy(vcl::Window* pWindow = nullptr);
// Exported for unit test
- SD_DLLPUBLIC void DoPaste(vcl::Window* pWindow = nullptr);
+ SD_DLLPUBLIC void DoPaste();
void DoDelete (vcl::Window* pWindow = nullptr);
void StartDrag (
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
index 5811df235a6a..596fda670207 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
@@ -93,13 +93,10 @@ public:
bool IsPageSelected (int nPageIndex);
/** Deselect the descriptor that is associated with the given page.
- @param bUpdateCurrentPage
- When <TRUE/> then the current page is updated to the first slide
- of the remaining selection.
+ The current page is updated to the first slide
+ of the remaining selection.
*/
- void DeselectPage (
- int nPageIndex,
- const bool bUpdateCurrentPage = true);
+ void DeselectPage (int nPageIndex);
void DeselectPage (
const model::SharedPageDescriptor& rpDescriptor,
const bool bUpdateCurrentPage = true);
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx
index 47b892936a00..9f90324f3ac9 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx
@@ -69,7 +69,7 @@ public:
calls to the PageSelector) to invalidate the relevant slots and send
appropriate events.
*/
- void SelectionHasChanged (const bool bMakeSelectionVisible = true);
+ void SelectionHasChanged ();
/** Add a listener that is called when the selection of the slide sorter
changes.
diff --git a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
index 365b73b62d66..f12f9999e07e 100644
--- a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
+++ b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
@@ -140,8 +140,7 @@ private:
SharedPageObjectRun GetRun (
view::Layouter& rLayouter,
- const InsertPosition& rInsertPosition,
- const bool bCreate = true);
+ const InsertPosition& rInsertPosition);
RunContainer::const_iterator FindRun (const sal_Int32 nRunIndex) const;
};
@@ -206,8 +205,7 @@ void InsertAnimator::Implementation::SetInsertPosition (
SharedPageObjectRun InsertAnimator::Implementation::GetRun (
view::Layouter& rLayouter,
- const InsertPosition& rInsertPosition,
- const bool bCreate)
+ const InsertPosition& rInsertPosition)
{
const sal_Int32 nRow (rInsertPosition.GetRow());
if (nRow < 0)
@@ -217,7 +215,7 @@ SharedPageObjectRun InsertAnimator::Implementation::GetRun (
if (rLayouter.GetColumnCount() == 1)
{
// There is only one run that contains all slides.
- if (maRuns.empty() && bCreate)
+ if (maRuns.empty())
maRuns.insert(SharedPageObjectRun(new PageObjectRun(
*this,
0,
@@ -228,7 +226,7 @@ SharedPageObjectRun InsertAnimator::Implementation::GetRun (
else
{
iRun = FindRun(nRow);
- if (iRun == maRuns.end() && bCreate)
+ if (iRun == maRuns.end())
{
// Create a new run.
const sal_Int32 nStartIndex (rLayouter.GetIndex(nRow, 0));
diff --git a/sd/source/ui/tools/AsynchronousCall.cxx b/sd/source/ui/tools/AsynchronousCall.cxx
index e3d6b0630156..47ba8bb5aed8 100644
--- a/sd/source/ui/tools/AsynchronousCall.cxx
+++ b/sd/source/ui/tools/AsynchronousCall.cxx
@@ -37,12 +37,10 @@ AsynchronousCall::~AsynchronousCall()
maTimer.Stop();
}
-void AsynchronousCall::Post (
- const AsynchronousFunction& rFunction,
- sal_uInt32 nTimeoutInMilliseconds)
+void AsynchronousCall::Post (const AsynchronousFunction& rFunction)
{
mpFunction.reset(new AsynchronousFunction(rFunction));
- maTimer.SetTimeout(nTimeoutInMilliseconds);
+ maTimer.SetTimeout(10);
maTimer.Start();
}
diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx
index 66658f9bd50e..d088e4629cc3 100644
--- a/sd/source/ui/unoidl/unolayer.cxx
+++ b/sd/source/ui/unoidl/unolayer.cxx
@@ -693,7 +693,7 @@ sal_Bool SAL_CALL SdLayerManager::hasElements() throw(uno::RuntimeException, std
* If something was changed at the layers, this methods takes care that the
* changes are made visible in sdbcx::View.
*/
-void SdLayerManager::UpdateLayerView( bool modify ) const throw()
+void SdLayerManager::UpdateLayerView() const throw()
{
if(mpModel->mpDocShell)
{
@@ -706,8 +706,7 @@ void SdLayerManager::UpdateLayerView( bool modify ) const throw()
pDrViewSh->ChangeEditMode(pDrViewSh->GetEditMode(), bLayerMode);
}
- if(modify)
- mpModel->mpDoc->SetChanged();
+ mpModel->mpDoc->SetChanged();
}
}
diff --git a/sd/source/ui/unoidl/unolayer.hxx b/sd/source/ui/unoidl/unolayer.hxx
index d8452aa2169f..9a395e1445c0 100644
--- a/sd/source/ui/unoidl/unolayer.hxx
+++ b/sd/source/ui/unoidl/unolayer.hxx
@@ -170,7 +170,7 @@ private:
::sd::View* GetView() const throw();
::sd::DrawDocShell* GetDocShell() const throw() { return mpModel->mpDocShell; }
- void UpdateLayerView( bool modify = true ) const throw();
+ void UpdateLayerView() const throw();
};
#endif
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index bca78851a354..546f360bba12 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -563,10 +563,10 @@ SdPage* SdXImpressDocument::InsertSdPage( sal_uInt16 nPage, bool bDuplicate )
return pStandardPage;
}
-void SdXImpressDocument::SetModified( bool bModified /* = sal_True */ ) throw()
+void SdXImpressDocument::SetModified() throw()
{
if( mpDoc )
- mpDoc->SetChanged( bModified );
+ mpDoc->SetChanged();
}
// XModel
diff --git a/sd/source/ui/view/WindowUpdater.cxx b/sd/source/ui/view/WindowUpdater.cxx
index 3dac87aabae2..1eb5e524d501 100644
--- a/sd/source/ui/view/WindowUpdater.cxx
+++ b/sd/source/ui/view/WindowUpdater.cxx
@@ -82,14 +82,11 @@ void WindowUpdater::SetDocument (SdDrawDocument* pDocument)
}
void WindowUpdater::Update (
- OutputDevice* pDevice,
- SdDrawDocument* pDocument) const
+ OutputDevice* pDevice) const
{
if (pDevice != nullptr)
{
UpdateWindow (pDevice);
- if (pDocument != nullptr)
- pDocument->ReformatAllTextObjects();
}
}