[Libreoffice-commits] core.git: sd/inc sd/source
Noel Grandin
noel at peralex.com
Fri Mar 18 09:33:23 UTC 2016
sd/inc/drawdoc.hxx | 2
sd/inc/sdcgmfilter.hxx | 3 -
sd/inc/sdhtmlfilter.hxx | 3 -
sd/inc/sdpptwrp.hxx | 3 -
sd/inc/sdxmlwrp.hxx | 1
sd/source/core/drawdoc3.cxx | 3 -
sd/source/filter/cgm/sdcgmfilter.cxx | 4 -
sd/source/filter/html/sdhtmlfilter.cxx | 4 -
sd/source/filter/sdpptwrp.cxx | 4 -
sd/source/filter/xml/sdxmlwrp.cxx | 4 -
sd/source/ui/dlg/filedlg.cxx | 13 +----
sd/source/ui/docshell/docshel4.cxx | 26 +++++-----
sd/source/ui/inc/ViewShell.hxx | 5 -
sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx | 13 +----
sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx | 10 +--
sd/source/ui/slidesorter/cache/SlsPageCache.cxx | 10 +--
sd/source/ui/slidesorter/controller/SlideSorterController.cxx | 6 --
sd/source/ui/slidesorter/controller/SlsAnimator.cxx | 3 -
sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx | 5 -
sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx | 5 -
sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx | 3 -
sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx | 1
sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx | 12 +---
sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx | 3 -
sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx | 7 --
sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx | 13 -----
sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx | 17 ------
sd/source/ui/slidesorter/view/SlsFramePainter.cxx | 6 --
sd/source/ui/slidesorter/view/SlsFramePainter.hxx | 5 -
sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx | 1
sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx | 4 -
sd/source/ui/unoidl/SdUnoDrawView.cxx | 2
sd/source/ui/unoidl/SdUnoSlideView.cxx | 3 -
sd/source/ui/view/sdview2.cxx | 2
sd/source/ui/view/viewshe2.cxx | 9 +--
sd/source/ui/view/viewshel.cxx | 6 +-
36 files changed, 75 insertions(+), 146 deletions(-)
New commits:
commit f4c59e5364e449bd8ce5420ff57331677ff859b9
Author: Noel Grandin <noel at peralex.com>
Date: Fri Mar 18 08:09:25 2016 +0200
loplugin:constantparam in sd
Change-Id: Idad86a005a7df1af38722fa0e909ed9b6e0858fa
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index af57988..a2434fa 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -264,7 +264,7 @@ public:
SAL_DLLPRIVATE void InsertBookmark(const std::vector<OUString> &rBookmarkList,
std::vector<OUString> &rExchangeList, bool bLink,
bool bReplace, sal_uInt16 nPgPos, bool bNoDialogs,
- ::sd::DrawDocShell* pBookmarkDocSh, bool bCopy,
+ ::sd::DrawDocShell* pBookmarkDocSh,
Point* pObjPos);
SAL_DLLPRIVATE bool IsStartWithPresentation() const { return mbStartWithPresentation;}
diff --git a/sd/inc/sdcgmfilter.hxx b/sd/inc/sdcgmfilter.hxx
index 7f11bbf5..550819b 100644
--- a/sd/inc/sdcgmfilter.hxx
+++ b/sd/inc/sdcgmfilter.hxx
@@ -28,8 +28,7 @@ class SdCGMFilter : public SdFilter
public:
SdCGMFilter (
SfxMedium& rMedium,
- ::sd::DrawDocShell& rDocShell,
- bool bShowProgress );
+ ::sd::DrawDocShell& rDocShell );
virtual ~SdCGMFilter();
bool Import();
diff --git a/sd/inc/sdhtmlfilter.hxx b/sd/inc/sdhtmlfilter.hxx
index e548284..e696c8a 100644
--- a/sd/inc/sdhtmlfilter.hxx
+++ b/sd/inc/sdhtmlfilter.hxx
@@ -29,8 +29,7 @@ class SdHTMLFilter
public:
SdHTMLFilter (
SfxMedium& rMedium,
- ::sd::DrawDocShell& rDocShell,
- bool bShowProgress);
+ ::sd::DrawDocShell& rDocShell);
virtual ~SdHTMLFilter();
virtual bool Export() override;
diff --git a/sd/inc/sdpptwrp.hxx b/sd/inc/sdpptwrp.hxx
index f333ced..3f74e7c 100644
--- a/sd/inc/sdpptwrp.hxx
+++ b/sd/inc/sdpptwrp.hxx
@@ -28,8 +28,7 @@ class SdPPTFilter : public SdFilter
public:
SdPPTFilter (
SfxMedium& rMedium,
- ::sd::DrawDocShell& rDocShell,
- bool bShowProgress);
+ ::sd::DrawDocShell& rDocShell);
virtual ~SdPPTFilter();
/// these methods are necessary for the export to PowerPoint
diff --git a/sd/inc/sdxmlwrp.hxx b/sd/inc/sdxmlwrp.hxx
index 5aafa00..f3488f7 100644
--- a/sd/inc/sdxmlwrp.hxx
+++ b/sd/inc/sdxmlwrp.hxx
@@ -36,7 +36,6 @@ public:
SdXMLFilter(
SfxMedium& rMedium,
::sd::DrawDocShell& rDocShell,
- bool bShowProgress,
SdXMLFilterMode eFilterMode = SDXMLMODE_Normal,
sal_uLong nStoreVer = SOFFICE_FILEFORMAT_8 );
virtual ~SdXMLFilter();
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index f1559fa..58d80cd 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -285,7 +285,6 @@ void SdDrawDocument::InsertBookmark(
sal_uInt16 nInsertPos, // Insertion position of pages
bool bNoDialogs, // Don't show dialogs
::sd::DrawDocShell* pBookmarkDocSh, // If set, this is the source document
- bool bCopy, // Copy the pages?
Point* pObjPos) // Insertion position of objects
{
bool bOK = true;
@@ -330,7 +329,7 @@ void SdDrawDocument::InsertBookmark(
{
// Insert all page bookmarks
bOK = InsertBookmarkAsPage(rBookmarkList, &rExchangeList, bLink, bReplace,
- nInsertPos, bNoDialogs, pBookmarkDocSh, bCopy, true, false);
+ nInsertPos, bNoDialogs, pBookmarkDocSh, true/*bCopy*/, true, false);
}
if ( bOK && !rBookmarkList.empty() )
diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx b/sd/source/filter/cgm/sdcgmfilter.cxx
index 776d4db..f6b5e1f 100644
--- a/sd/source/filter/cgm/sdcgmfilter.cxx
+++ b/sd/source/filter/cgm/sdcgmfilter.cxx
@@ -48,8 +48,8 @@ extern "C" sal_uInt32 ImportCGM( OUString const &, Reference< XModel > const &,
#endif
-SdCGMFilter::SdCGMFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, bool bShowProgress ) :
- SdFilter( rMedium, rDocShell, bShowProgress )
+SdCGMFilter::SdCGMFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell ) :
+ SdFilter( rMedium, rDocShell, true/*bShowProgress*/ )
{
}
diff --git a/sd/source/filter/html/sdhtmlfilter.cxx b/sd/source/filter/html/sdhtmlfilter.cxx
index c4bc085..56c7433 100644
--- a/sd/source/filter/html/sdhtmlfilter.cxx
+++ b/sd/source/filter/html/sdhtmlfilter.cxx
@@ -39,8 +39,8 @@
#include "sdhtmlfilter.hxx"
-SdHTMLFilter::SdHTMLFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, bool bShowProgress ) :
- SdFilter( rMedium, rDocShell, bShowProgress )
+SdHTMLFilter::SdHTMLFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell ) :
+ SdFilter( rMedium, rDocShell, true/*bShowProgress*/ )
{
}
diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx
index 98a7453..6f6b225 100644
--- a/sd/source/filter/sdpptwrp.cxx
+++ b/sd/source/filter/sdpptwrp.cxx
@@ -61,8 +61,8 @@ extern "C" sal_Bool SaveVBA( SfxObjectShell&, SvMemoryStream*& );
#endif
-SdPPTFilter::SdPPTFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, bool bShowProgress ) :
- SdFilter( rMedium, rDocShell, bShowProgress ),
+SdPPTFilter::SdPPTFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell ) :
+ SdFilter( rMedium, rDocShell, true/*bShowProgress*/ ),
pBas ( nullptr )
{
}
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index 91ba7a6..8416ca5 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -157,8 +157,8 @@ XML_SERVICES* getServices( bool bImport, bool bDraw, sal_uLong nStoreVer )
}
-SdXMLFilter::SdXMLFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, bool bShowProgress, SdXMLFilterMode eFilterMode, sal_uLong nStoreVer ) :
- SdFilter( rMedium, rDocShell, bShowProgress ), meFilterMode( eFilterMode ), mnStoreVer( nStoreVer )
+SdXMLFilter::SdXMLFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, SdXMLFilterMode eFilterMode, sal_uLong nStoreVer ) :
+ SdFilter( rMedium, rDocShell, true/*bShowProgress*/ ), meFilterMode( eFilterMode ), mnStoreVer( nStoreVer )
{
}
diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx
index ae6aa58..3b05fa2 100644
--- a/sd/source/ui/dlg/filedlg.cxx
+++ b/sd/source/ui/dlg/filedlg.cxx
@@ -64,8 +64,8 @@ private:
DECL_LINK_TYPED( IsMusicStoppedHdl, Idle *, void );
public:
- SdFileDialog_Imp( const short nDialogType, bool bUsableSelection );
- virtual ~SdFileDialog_Imp();
+ SdFileDialog_Imp( const short nDialogType );
+ virtual ~SdFileDialog_Imp();
ErrCode Execute();
@@ -213,11 +213,10 @@ void SdFileDialog_Imp::CheckSelectionState()
}
}
-SdFileDialog_Imp::SdFileDialog_Imp( const short nDialogType,
- bool bUsableSelection ) :
+SdFileDialog_Imp::SdFileDialog_Imp( const short nDialogType ) :
FileDialogHelper( nDialogType, 0 ),
mnPlaySoundEvent( nullptr ),
- mbUsableSelection( bUsableSelection ),
+ mbUsableSelection( false ),
mbLabelPlaying(false)
{
maUpdateIdle.SetIdleHdl(LINK(this, SdFileDialog_Imp, IsMusicStoppedHdl));
@@ -278,9 +277,7 @@ ErrCode SdFileDialog_Imp::Execute()
// these are simple forwarders
SdOpenSoundFileDialog::SdOpenSoundFileDialog() :
- mpImpl(
- new SdFileDialog_Imp(
- css::ui::dialogs::TemplateDescription::FILEOPEN_PLAY, false ) )
+ mpImpl( new SdFileDialog_Imp( css::ui::dialogs::TemplateDescription::FILEOPEN_PLAY ) )
{
OUString aDescr;
aDescr = SD_RESSTR(STR_ALL_FILES);
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index 71ac8e4..a2552e2 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -287,7 +287,7 @@ bool DrawDocShell::Load( SfxMedium& rMedium )
bRet = SfxObjectShell::Load( rMedium );
if( bRet )
{
- bRet = SdXMLFilter( rMedium, *this, true, SDXMLMODE_Normal, SotStorage::GetVersion( rMedium.GetStorage() ) ).Import( nError );
+ bRet = SdXMLFilter( rMedium, *this, SDXMLMODE_Normal, SotStorage::GetVersion( rMedium.GetStorage() ) ).Import( nError );
}
if( bRet )
@@ -351,7 +351,7 @@ bool DrawDocShell::LoadFrom( SfxMedium& rMedium )
// TODO/LATER: nobody is interested in the error code?!
ErrCode nError = ERRCODE_NONE;
- bool bRet = SdXMLFilter( rMedium, *this, true, SDXMLMODE_Organizer, SotStorage::GetVersion( rMedium.GetStorage() ) ).Import( nError );
+ bool bRet = SdXMLFilter( rMedium, *this, SDXMLMODE_Organizer, SotStorage::GetVersion( rMedium.GetStorage() ) ).Import( nError );
// tell SFX to change viewshell when in preview mode
if( IsPreview() )
@@ -450,7 +450,7 @@ bool DrawDocShell::ConvertFrom( SfxMedium& rMedium )
|| aFilterName == pFilterPowerPoint97AutoPlay)
{
mpDoc->StopWorkStartupDelay();
- bRet = SdPPTFilter( rMedium, *this, true ).Import();
+ bRet = SdPPTFilter( rMedium, *this ).Import();
}
else if (aFilterName.indexOf("impress8") >= 0 ||
aFilterName.indexOf("draw8") >= 0)
@@ -459,7 +459,7 @@ bool DrawDocShell::ConvertFrom( SfxMedium& rMedium )
mpDoc->CreateFirstPages();
mpDoc->StopWorkStartupDelay();
ErrCode nError = ERRCODE_NONE;
- bRet = SdXMLFilter( rMedium, *this, true ).Import( nError );
+ bRet = SdXMLFilter( rMedium, *this ).Import( nError );
}
else if (aFilterName.indexOf("StarOffice XML (Draw)") >= 0 ||
@@ -469,13 +469,13 @@ bool DrawDocShell::ConvertFrom( SfxMedium& rMedium )
mpDoc->CreateFirstPages();
mpDoc->StopWorkStartupDelay();
ErrCode nError = ERRCODE_NONE;
- bRet = SdXMLFilter( rMedium, *this, true, SDXMLMODE_Normal, SOFFICE_FILEFORMAT_60 ).Import( nError );
+ bRet = SdXMLFilter( rMedium, *this, SDXMLMODE_Normal, SOFFICE_FILEFORMAT_60 ).Import( nError );
}
else if( aFilterName == "CGM - Computer Graphics Metafile" )
{
mpDoc->CreateFirstPages();
mpDoc->StopWorkStartupDelay();
- bRet = SdCGMFilter( rMedium, *this, true ).Import();
+ bRet = SdCGMFilter( rMedium, *this ).Import();
}
else
{
@@ -521,7 +521,7 @@ bool DrawDocShell::Save()
bool bRet = SfxObjectShell::Save();
if( bRet )
- bRet = SdXMLFilter( *GetMedium(), *this, true, SDXMLMODE_Normal, SotStorage::GetVersion( GetMedium()->GetStorage() ) ).Export();
+ bRet = SdXMLFilter( *GetMedium(), *this, SDXMLMODE_Normal, SotStorage::GetVersion( GetMedium()->GetStorage() ) ).Export();
return bRet;
}
@@ -555,7 +555,7 @@ bool DrawDocShell::SaveAs( SfxMedium& rMedium )
bool bRet = SfxObjectShell::SaveAs( rMedium );
if( bRet )
- bRet = SdXMLFilter( rMedium, *this, true, SDXMLMODE_Normal, SotStorage::GetVersion( rMedium.GetStorage() ) ).Export();
+ bRet = SdXMLFilter( rMedium, *this, SDXMLMODE_Normal, SotStorage::GetVersion( rMedium.GetStorage() ) ).Export();
if( GetError() == ERRCODE_NONE )
SetError( nVBWarning, OSL_LOG_PREFIX );
@@ -578,26 +578,26 @@ bool DrawDocShell::ConvertTo( SfxMedium& rMedium )
if( aTypeName.indexOf( "graphic_HTML" ) >= 0 )
{
- pFilter = new SdHTMLFilter( rMedium, *this, true );
+ pFilter = new SdHTMLFilter( rMedium, *this );
}
else if( aTypeName.indexOf( "MS_PowerPoint_97" ) >= 0 )
{
- pFilter = new SdPPTFilter( rMedium, *this, true );
+ pFilter = new SdPPTFilter( rMedium, *this );
static_cast<SdPPTFilter*>(pFilter)->PreSaveBasic();
}
else if ( aTypeName.indexOf( "CGM_Computer_Graphics_Metafile" ) >= 0 )
{
- pFilter = new SdCGMFilter( rMedium, *this, true );
+ pFilter = new SdCGMFilter( rMedium, *this );
}
else if( aTypeName.indexOf( "draw8" ) >= 0 ||
aTypeName.indexOf( "impress8" ) >= 0 )
{
- pFilter = new SdXMLFilter( rMedium, *this, true );
+ pFilter = new SdXMLFilter( rMedium, *this );
}
else if( aTypeName.indexOf( "StarOffice_XML_Impress" ) >= 0 ||
aTypeName.indexOf( "StarOffice_XML_Draw" ) >= 0 )
{
- pFilter = new SdXMLFilter( rMedium, *this, true, SDXMLMODE_Normal, SOFFICE_FILEFORMAT_60 );
+ pFilter = new SdXMLFilter( rMedium, *this, SDXMLMODE_Normal, SOFFICE_FILEFORMAT_60 );
}
else
{
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index 21ccfde..e4e2ad4 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -112,8 +112,7 @@ public:
ViewShell (
SfxViewFrame *pFrame,
vcl::Window* pParentWindow,
- ViewShellBase& rViewShellBase,
- bool bAllowCenter = true);
+ ViewShellBase& rViewShellBase);
virtual ~ViewShell();
/** The Init method has to be called from the outside directly
@@ -298,7 +297,7 @@ public:
// Move these two methods from DrawViewShell to enable slide show view
void NotifyAccUpdate();
void fireSwitchCurrentPage(sal_Int32 pageIndex);
- void SetWinViewPos(const Point& rWinPos, bool bUpdate);
+ void SetWinViewPos(const Point& rWinPos);
Point GetWinViewPos() const;
Point GetViewOrigin() const;
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
index 93e527d..9ca737d 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
@@ -115,7 +115,7 @@ typedef ::std::vector<
//===== BitmapCache =========================================================
-BitmapCache::BitmapCache (const sal_Int32 nMaximalNormalCacheSize)
+BitmapCache::BitmapCache ()
: maMutex(),
mpBitmapContainer(new CacheBitmapContainer()),
mnNormalCacheSize(0),
@@ -125,14 +125,9 @@ BitmapCache::BitmapCache (const sal_Int32 nMaximalNormalCacheSize)
mpCacheCompactor(),
mbIsFull(false)
{
- if (nMaximalNormalCacheSize > 0)
- mnMaximalNormalCacheSize = nMaximalNormalCacheSize;
- else
- {
- Any aCacheSize (CacheConfiguration::Instance()->GetValue("CacheSize"));
- if (aCacheSize.has<sal_Int32>())
- aCacheSize >>= mnMaximalNormalCacheSize;
- }
+ Any aCacheSize (CacheConfiguration::Instance()->GetValue("CacheSize"));
+ if (aCacheSize.has<sal_Int32>())
+ aCacheSize >>= mnMaximalNormalCacheSize;
mpCacheCompactor = CacheCompactor::Create(*this,mnMaximalNormalCacheSize);
}
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx
index ff875ae..7b399ad 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx
@@ -57,13 +57,11 @@ public:
typedef ::std::vector<CacheKey> CacheIndex;
/** Create a new cache for bitmap objects.
- @param nMaximalNormalCacheSize
- When a size larger then zero is given then that size is used.
- Otherwise the default value from the configuration is used.
- When that does not exist either then a internal default value is
- used.
+ The default value from the configuration is used.
+ When that does not exist then a internal default value is
+ used.
*/
- explicit BitmapCache (const sal_Int32 nMaximalNormalCacheSize = 0);
+ explicit BitmapCache ();
/** The destructor clears the cache and releases all bitmaps still in it.
*/
diff --git a/sd/source/ui/slidesorter/cache/SlsPageCache.cxx b/sd/source/ui/slidesorter/cache/SlsPageCache.cxx
index 07f4f62..b10dbd6 100644
--- a/sd/source/ui/slidesorter/cache/SlsPageCache.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsPageCache.cxx
@@ -60,10 +60,9 @@ Bitmap PageCache::GetPreviewBitmap (
}
Bitmap PageCache::GetMarkedPreviewBitmap (
- const CacheKey aKey,
- const bool bResize)
+ const CacheKey aKey)
{
- return mpImplementation->GetMarkedPreviewBitmap(aKey, bResize);
+ return mpImplementation->GetMarkedPreviewBitmap(aKey, false/*bResize*/);
}
void PageCache::SetMarkedPreviewBitmap (
@@ -79,10 +78,9 @@ void PageCache::RequestPreviewBitmap (const CacheKey aKey)
}
void PageCache::InvalidatePreviewBitmap (
- const CacheKey aKey,
- const bool bRequestPreview)
+ const CacheKey aKey)
{
- if (mpImplementation->InvalidatePreviewBitmap(aKey) && bRequestPreview)
+ if (mpImplementation->InvalidatePreviewBitmap(aKey))
RequestPreviewBitmap(aKey);
}
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index 2069d24..703d0c5 100644
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@ -900,8 +900,7 @@ void SlideSorterController::CheckForMasterPageAssignment()
if (pDescriptor->UpdateMasterPage())
{
mrView.GetPreviewCache()->InvalidatePreviewBitmap (
- pDescriptor->GetPage(),
- true);
+ pDescriptor->GetPage());
}
}
}
@@ -917,8 +916,7 @@ void SlideSorterController::CheckForSlideTransitionAssignment()
if (pDescriptor->UpdateTransitionFlag())
{
mrView.GetPreviewCache()->InvalidatePreviewBitmap (
- pDescriptor->GetPage(),
- true);
+ pDescriptor->GetPage());
}
}
}
diff --git a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
index 7268cd7..6d13918 100644
--- a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
@@ -99,7 +99,6 @@ void Animator::Dispose()
Animator::AnimationId Animator::AddAnimation (
const AnimationFunctor& rAnimation,
- const sal_Int32 nStartOffset,
const sal_Int32 nDuration,
const FinishFunctor& rFinishFunctor)
{
@@ -112,7 +111,7 @@ Animator::AnimationId Animator::AddAnimation (
std::shared_ptr<Animation> pAnimation (
new Animation(
rAnimation,
- nStartOffset / 1000.0,
+ 0,
nDuration / 1000.0,
maElapsedTime.getElapsedTime(),
++mnNextAnimationId,
diff --git a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx
index a8e6a49..da5e6e0 100644
--- a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx
@@ -115,10 +115,9 @@ void CurrentSlideManager::AcquireCurrentSlide (const sal_Int32 nSlideIndex)
}
void CurrentSlideManager::SwitchCurrentSlide (
- const sal_Int32 nSlideIndex,
- const bool bUpdateSelection)
+ const sal_Int32 nSlideIndex)
{
- SwitchCurrentSlide(mrSlideSorter.GetModel().GetPageDescriptor(nSlideIndex), bUpdateSelection);
+ SwitchCurrentSlide(mrSlideSorter.GetModel().GetPageDescriptor(nSlideIndex), true/*bUpdateSelection*/);
}
void CurrentSlideManager::SwitchCurrentSlide (
diff --git a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
index 05090c8..b27701d 100644
--- a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
@@ -111,8 +111,7 @@ void DragAndDropContext::UpdatePosition (
void DragAndDropContext::SetTargetSlideSorter (
const Point& rMousePosition,
- const InsertionIndicatorHandler::Mode eMode,
- const bool bIsOverSourceView)
+ const InsertionIndicatorHandler::Mode eMode)
{
if (mpTargetSlideSorter != nullptr)
{
@@ -126,7 +125,7 @@ void DragAndDropContext::SetTargetSlideSorter (
if (mpTargetSlideSorter != nullptr)
{
mpTargetSlideSorter->GetController().GetInsertionIndicatorHandler()->Start(
- bIsOverSourceView);
+ false/*bIsOverSourceView*/);
mpTargetSlideSorter->GetController().GetInsertionIndicatorHandler()->UpdatePosition(
rMousePosition,
eMode);
diff --git a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx
index 1e14c70..3fa783e 100644
--- a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx
+++ b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx
@@ -62,8 +62,7 @@ public:
void SetTargetSlideSorter (
const Point& rMousePosition = Point(0,0),
- const InsertionIndicatorHandler::Mode eMode = InsertionIndicatorHandler::UnknownMode,
- const bool bIsOverSourceView = false);
+ const InsertionIndicatorHandler::Mode eMode = InsertionIndicatorHandler::UnknownMode);
private:
SlideSorter* mpTargetSlideSorter;
diff --git a/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx b/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx
index 3de85b3..644a437 100644
--- a/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx
@@ -135,7 +135,6 @@ void VisibleAreaManager::MakeVisible()
{
mnScrollAnimationId = mrSlideSorter.GetController().GetAnimator()->AddAnimation(
aAnimation,
- 0,
300);
}
else
diff --git a/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx b/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx
index 90f0d30..47caa1d 100644
--- a/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx
+++ b/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx
@@ -108,8 +108,7 @@ public:
const bool bResize);
Bitmap GetMarkedPreviewBitmap (
- const CacheKey aKey,
- const bool bResize);
+ const CacheKey aKey);
void SetMarkedPreviewBitmap (
const CacheKey aKey,
const Bitmap& rBitmap);
@@ -123,13 +122,10 @@ public:
/** Tell the cache that the bitmap associated with the given request
data is not up-to-date anymore. This will invalidate all previews
in other caches that represent the same page as well.
- @param bRequestPreview
- When <TRUE/> then a new preview is requested and will lead
- eventually to a repaint of the associated page object.
+ A new preview is requested and will lead
+ eventually to a repaint of the associated page object.
*/
- void InvalidatePreviewBitmap (
- const CacheKey aKey,
- const bool bRequestPreview);
+ void InvalidatePreviewBitmap (const CacheKey aKey);
/** 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
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
index 0128b41..9b90f36 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
@@ -68,14 +68,11 @@ public:
the specified duration.
@param rAnimation
The animation operation.
- @param nStartOffset
- Time in milli seconds before the animation is started.
@param nDuration
The duration in milli seconds.
*/
AnimationId AddAnimation (
const AnimationFunctor& rAnimation,
- const sal_Int32 nStartOffset,
const sal_Int32 nDuration,
const FinishFunctor& rFinishFunctor = FinishFunctor());
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx
index cb3f2b4..c27da2d 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx
@@ -62,13 +62,10 @@ public:
slide change has been initiated by someone else.
@param nSlideIndex
Zero based index in the range [0,number-of-slides).
- @param bUpdateSelection
- When <TRUE/> then the page selection is cleared and only the new
+ The page selection is cleared and only the new
current slide is selected.
*/
- void SwitchCurrentSlide (
- const sal_Int32 nSlideIndex,
- const bool bUpdateSelection = false);
+ void SwitchCurrentSlide (const sal_Int32 nSlideIndex);
void SwitchCurrentSlide (
const model::SharedPageDescriptor& rpSlide,
const bool bUpdateSelection = false);
diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx
index 226bb5b..3afaadc 100644
--- a/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx
+++ b/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx
@@ -65,19 +65,6 @@ public:
virtual ~PageEnumeration();
- /** Create a new enumeration object. The ownership of the
- implementation object goes to the new object. Use this copy
- constructor only when you know what you are doing. When in doubt,
- use the one argument version.
- @param bCloneImpl
- When <TRUE/> is given this constructor behaves exactly like its
- one argument version. When <FALSE/> is given then the
- implementation object is not copied but moved from the given
- enumeration to the newly created one. The given enumeration
- thus becomes empty.
- */
- PageEnumeration (PageEnumeration& rEnumeration, bool bCloneImpl);
-
/** Create and return an exact copy of the called object.
*/
virtual ::std::unique_ptr<Enumeration<SharedPageDescriptor> > Clone() override;
diff --git a/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx b/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx
index 2a01da3..ff6a398 100644
--- a/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx
+++ b/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx
@@ -85,21 +85,6 @@ PageEnumeration::PageEnumeration (
{
}
-PageEnumeration::PageEnumeration (
- PageEnumeration& rEnumeration,
- bool bCloneImpl)
-{
-
- if( bCloneImpl )
- {
- mpImpl = rEnumeration.mpImpl->Clone();
- }
- else
- {
- mpImpl = std::move(rEnumeration.mpImpl);
- }
-}
-
PageEnumeration::PageEnumeration (const PageEnumeration& rEnumeration )
: sd::slidesorter::model::Enumeration<sd::slidesorter::model::SharedPageDescriptor>()
{
@@ -120,7 +105,7 @@ PageEnumeration& PageEnumeration::operator= (
::std::unique_ptr<Enumeration<SharedPageDescriptor> > PageEnumeration::Clone()
{
return ::std::unique_ptr<Enumeration<SharedPageDescriptor> >(
- new PageEnumeration (*this, true));
+ new PageEnumeration (*this));
}
bool PageEnumeration::HasMoreElements() const
diff --git a/sd/source/ui/slidesorter/view/SlsFramePainter.cxx b/sd/source/ui/slidesorter/view/SlsFramePainter.cxx
index f1c0140..bb297c9 100644
--- a/sd/source/ui/slidesorter/view/SlsFramePainter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsFramePainter.cxx
@@ -73,8 +73,7 @@ void FramePainter::PaintFrame (
}
void FramePainter::AdaptColor (
- const Color aNewColor,
- const bool bEraseCenter)
+ const Color aNewColor)
{
// Get the source color.
if (maCenter.maBitmap.IsEmpty())
@@ -86,8 +85,7 @@ void FramePainter::AdaptColor (
Bitmap::ReleaseAccess(pReadAccess);
// Erase the center bitmap.
- if (bEraseCenter)
- maCenter.maBitmap.SetEmpty();
+ maCenter.maBitmap.SetEmpty();
// Replace the color in all bitmaps.
maTopLeft.maBitmap.Replace(aSourceColor, aNewColor);
diff --git a/sd/source/ui/slidesorter/view/SlsFramePainter.hxx b/sd/source/ui/slidesorter/view/SlsFramePainter.hxx
index 614ec0a..5ce2ee6 100644
--- a/sd/source/ui/slidesorter/view/SlsFramePainter.hxx
+++ b/sd/source/ui/slidesorter/view/SlsFramePainter.hxx
@@ -38,10 +38,9 @@ public:
/** Special functionality that takes the color from the center
bitmap and replaces that color in all bitmaps by the given new
color. Alpha values are not modified.
- @param bClearCenterBitmap
- When <TRUE/> then the center bitmap is erased.
+ The center bitmap is erased.
*/
- void AdaptColor (const Color aNewColor, const bool bClearCenterBitmap);
+ void AdaptColor (const Color aNewColor);
private:
/** Bitmap with offset that is used when the bitmap is painted. The bitmap
diff --git a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
index f12f999..41e878e 100644
--- a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
+++ b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
@@ -393,7 +393,6 @@ void PageObjectRun::RestartAnimation()
auto sharedThis(shared_from_this());
mnAnimationId = mrAnimatorAccess.GetAnimator()->AddAnimation(
[this] (double const val) { (*this)(val); },
- 0,
300,
[sharedThis] () { sharedThis->mrAnimatorAccess.RemoveRun(sharedThis); }
);
diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
index 515aaa8..e9d3f6e 100644
--- a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
@@ -57,7 +57,7 @@ PageObjectPainter::PageObjectPainter (
sal_uInt16 nHue, nSat, nBri;
aColor.RGBtoHSB(nHue, nSat, nBri);
aColor = Color::HSBtoRGB(nHue, 28, 65);
- mpFocusBorderPainter->AdaptColor(aColor, true);
+ mpFocusBorderPainter->AdaptColor(aColor);
}
PageObjectPainter::~PageObjectPainter()
@@ -191,7 +191,7 @@ Bitmap PageObjectPainter::GetPreviewBitmap (
{
PageObjectLayouter *pPageObjectLayouter = mrLayouter.GetPageObjectLayouter().get();
- Bitmap aMarkedPreview (mpCache->GetMarkedPreviewBitmap(pPage,false));
+ Bitmap aMarkedPreview (mpCache->GetMarkedPreviewBitmap(pPage));
const Rectangle aPreviewBox (pPageObjectLayouter->GetBoundingBox(
rpDescriptor,
PageObjectLayouter::Preview,
diff --git a/sd/source/ui/unoidl/SdUnoDrawView.cxx b/sd/source/ui/unoidl/SdUnoDrawView.cxx
index d2e6ea1..e7cfe2b 100644
--- a/sd/source/ui/unoidl/SdUnoDrawView.cxx
+++ b/sd/source/ui/unoidl/SdUnoDrawView.cxx
@@ -487,7 +487,7 @@ void SdUnoDrawView::SetViewOffset(const awt::Point& rWinPos )
{
Point aWinPos( rWinPos.X, rWinPos.Y );
aWinPos += mrDrawViewShell.GetViewOrigin();
- mrDrawViewShell.SetWinViewPos( aWinPos, true );
+ mrDrawViewShell.SetWinViewPos( aWinPos );
}
awt::Point SdUnoDrawView::GetViewOffset() const
diff --git a/sd/source/ui/unoidl/SdUnoSlideView.cxx b/sd/source/ui/unoidl/SdUnoSlideView.cxx
index cd3a8b2..c220a74 100644
--- a/sd/source/ui/unoidl/SdUnoSlideView.cxx
+++ b/sd/source/ui/unoidl/SdUnoSlideView.cxx
@@ -134,8 +134,7 @@ void SAL_CALL SdUnoSlideView::setCurrentPage (
if (xProperties->getPropertyValue("Number") >>= nPageNumber)
{
mrSlideSorter.GetController().GetCurrentSlideManager()->SwitchCurrentSlide(
- nPageNumber-1,
- true);
+ nPageNumber-1);
}
}
}
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index 486535f..4cc7c56 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -845,7 +845,7 @@ IMPL_LINK_TYPED( View, ExecuteNavigatorDrop, void*, p, void )
mrDoc.InsertBookmark( aBookmarkList, aExchangeList,
bLink, bReplace, nPgPos, false,
&pPageObjsTransferable->GetDocShell(),
- true, &aPos );
+ &aPos );
}
}
diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx
index 692262c..8e8aeab 100644
--- a/sd/source/ui/view/viewshe2.cxx
+++ b/sd/source/ui/view/viewshe2.cxx
@@ -982,17 +982,14 @@ void ViewShell::VisAreaChanged(const Rectangle& rRect)
GetViewShell()->VisAreaChanged(rRect);
}
-void ViewShell::SetWinViewPos(const Point& rWinPos, bool bUpdate)
+void ViewShell::SetWinViewPos(const Point& rWinPos)
{
if (mpContentWindow.get() != nullptr)
{
mpContentWindow->SetWinViewPos(rWinPos);
- if ( bUpdate )
- {
- mpContentWindow->UpdateMapOrigin();
- mpContentWindow->Invalidate();
- }
+ mpContentWindow->UpdateMapOrigin();
+ mpContentWindow->Invalidate();
}
if (mbHasRulers)
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index 67a38fe..9e2889c 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -135,9 +135,9 @@ SfxViewFrame* ViewShell::GetViewFrame() const
/// declare SFX-Slotmap and standard interface
-ViewShell::ViewShell( SfxViewFrame*, vcl::Window* pParentWindow, ViewShellBase& rViewShellBase, bool bAllowCenter)
+ViewShell::ViewShell( SfxViewFrame*, vcl::Window* pParentWindow, ViewShellBase& rViewShellBase)
: SfxShell(&rViewShellBase)
-, mbCenterAllowed(bAllowCenter)
+, mbCenterAllowed(true)
, mpParentWindow(pParentWindow)
{
construct();
@@ -796,7 +796,7 @@ bool ViewShell::HandleScrollCommand(const CommandEvent& rCEvt, ::sd::Window* pWi
SetZoom( nNewZoom );
// Keep mouse at same doc point before zoom
Point aNewMousePos = GetActiveWindow()->PixelToLogic(rCEvt.GetMousePosPixel());
- SetWinViewPos(GetWinViewPos() - (aNewMousePos - aOldMousePos), true);
+ SetWinViewPos(GetWinViewPos() - (aNewMousePos - aOldMousePos));
Invalidate( SID_ATTR_ZOOM );
Invalidate( SID_ATTR_ZOOMSLIDER );
More information about the Libreoffice-commits
mailing list