diff options
| author | Noel Grandin <noel@peralex.com> | 2016-08-01 09:51:02 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-08-02 05:34:49 +0000 |
| commit | 6c87b028406070332ab1c37dde323b1678cdf8e6 (patch) | |
| tree | 51cd2bffdc152c02f7d72f3e98b450f84eb1c6c0 /sd | |
| parent | 389b08190092f9a9103b3ac098994ec83b2d0bfa (diff) | |
loplugin:countusersofdefaultparams in sd
Change-Id: I848d9b555a26e9d343efdfaaaec44a2c7d8be5b5
Reviewed-on: https://gerrit.libreoffice.org/27765
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sd')
83 files changed, 172 insertions, 172 deletions
diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx index a1b6b2a1bde4..3b8ffa1fe809 100644 --- a/sd/inc/CustomAnimationEffect.hxx +++ b/sd/inc/CustomAnimationEffect.hxx @@ -272,11 +272,11 @@ public: SAL_DLLPRIVATE virtual css::uno::Reference< css::animations::XAnimationNode > getRootNode(); - SAL_DLLPRIVATE CustomAnimationEffectPtr append( const CustomAnimationPresetPtr& pDescriptor, const css::uno::Any& rTarget, double fDuration = -1.0 ); - SAL_DLLPRIVATE CustomAnimationEffectPtr append( const SdrPathObj& rPathObj, const css::uno::Any& rTarget, double fDuration = -1.0 ); + SAL_DLLPRIVATE CustomAnimationEffectPtr append( const CustomAnimationPresetPtr& pDescriptor, const css::uno::Any& rTarget, double fDuration ); + SAL_DLLPRIVATE CustomAnimationEffectPtr append( const SdrPathObj& rPathObj, const css::uno::Any& rTarget, double fDuration ); void append( const CustomAnimationEffectPtr& pEffect ); - SAL_DLLPRIVATE void replace( const CustomAnimationEffectPtr& pEffect, const CustomAnimationPresetPtr& pDescriptor, double fDuration = -1.0 ); - SAL_DLLPRIVATE void replace( const CustomAnimationEffectPtr& pEffect, const CustomAnimationPresetPtr& pDescriptor, const OUString& rPresetSubType, double fDuration = -1.0 ); + SAL_DLLPRIVATE void replace( const CustomAnimationEffectPtr& pEffect, const CustomAnimationPresetPtr& pDescriptor, double fDuration ); + SAL_DLLPRIVATE void replace( const CustomAnimationEffectPtr& pEffect, const CustomAnimationPresetPtr& pDescriptor, const OUString& rPresetSubType, double fDuration ); SAL_DLLPRIVATE void remove( const CustomAnimationEffectPtr& pEffect ); SAL_DLLPRIVATE void create( const css::uno::Reference< css::animations::XAnimationNode >& xNode ); diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx index b0a2192bd9ac..b6cfd7cb5d76 100644 --- a/sd/inc/Outliner.hxx +++ b/sd/inc/Outliner.hxx @@ -464,7 +464,7 @@ private: /** Switch on edit mode for the currently selected text object. */ - void EnterEditMode (bool bGrabFocus=true); + void EnterEditMode (bool bGrabFocus); /** Return the position at which a new search is started with respect to the search direction as specified by the argument. diff --git a/sd/inc/OutlinerIterator.hxx b/sd/inc/OutlinerIterator.hxx index dc63adda0699..4cfc111213a3 100644 --- a/sd/inc/OutlinerIterator.hxx +++ b/sd/inc/OutlinerIterator.hxx @@ -234,7 +234,7 @@ private: const ::std::vector<SdrObjectWeakRef>& rObjectList, SdDrawDocument* pDocument, const std::shared_ptr<ViewShell>& rpViewShell, - bool bDirectionIsForward=true, + bool bDirectionIsForward, IteratorLocation aLocation=BEGIN); /** Create an iterator that iterates over all <type>SdrObjects</type> @@ -251,7 +251,7 @@ private: static Iterator CreateDocumentIterator ( SdDrawDocument* pDocument, const std::shared_ptr<ViewShell>& rpViewShell, - bool bDirectionIsForward=true, + bool bDirectionIsForward, IteratorLocation aLocation=BEGIN); /** Return the index of a page that contains an object that a new diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index a7bdff182cc3..8a67ab894ec7 100644 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx @@ -335,7 +335,7 @@ public: SAL_DLLPRIVATE bool InsertBookmarkAsObject(const std::vector<OUString> &rBookmarkList, const std::vector<OUString> &rExchangeList, bool bLink, ::sd::DrawDocShell* pBookmarkDocSh, - Point* pObjPos, bool bCalcObjCount = false); + Point* pObjPos, bool bCalcObjCount); void CloseBookmarkDoc(); @@ -414,7 +414,7 @@ public: SAL_DLLPRIVATE std::vector<sd::FrameView*>& GetFrameViewList() { return maFrameViewList; } SdCustomShowList* GetCustomShowList(bool bCreate = false); - SAL_DLLPRIVATE void NbcSetChanged(bool bFlag = true); + SAL_DLLPRIVATE void NbcSetChanged(bool bFlag); SAL_DLLPRIVATE void SetTextDefaults() const; @@ -513,7 +513,7 @@ public: AutoLayout eNotesLayout, bool bIsPageBack, bool bIsPageObj, - const sal_Int32 nInsertPosition = -1); + const sal_Int32 nInsertPosition); /** This method acts as a simplified front end for the more complex <member>DuplicatePage()</member> method. @@ -561,7 +561,7 @@ public: const OUString& sNotesPageName, bool bIsPageBack, bool bIsPageObj, - const sal_Int32 nInsertPosition = -1); + const sal_Int32 nInsertPosition); /** return the document fonts for latin, cjk and ctl according to the current languages set at this document */ @@ -631,7 +631,7 @@ private: bool bIsPageObj, SdPage* pStandardPage, SdPage* pNotesPage, - sal_Int32 nInsertPosition = -1); + sal_Int32 nInsertPosition); /** Set up a newly created page and insert it into the list of pages. @param pPreviousPage diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx index 8a9ed331c47a..2c4f5b6bfe78 100644 --- a/sd/inc/sdabstdlg.hxx +++ b/sd/inc/sdabstdlg.hxx @@ -156,13 +156,13 @@ public: virtual AbstractCopyDlg* CreateCopyDlg(vcl::Window* pWindow, const SfxItemSet& rInAttrs, const rtl::Reference<XColorList> &pColTab, ::sd::View* pView ) = 0; virtual AbstractSdCustomShowDlg* CreateSdCustomShowDlg(vcl::Window* pWindow, SdDrawDocument& rDrawDoc) = 0; virtual SfxAbstractTabDialog* CreateSdTabCharDialog(vcl::Window* pWindow, const SfxItemSet* pAttr, SfxObjectShell* pDocShell) = 0; - virtual SfxAbstractTabDialog* CreateSdTabPageDialog(vcl::Window* pWindow, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, bool bAreaPage = true) = 0; + virtual SfxAbstractTabDialog* CreateSdTabPageDialog(vcl::Window* pWindow, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, bool bAreaPage) = 0; virtual AbstractSdModifyFieldDlg* CreateSdModifyFieldDlg(vcl::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet) = 0; virtual AbstractSdSnapLineDlg* CreateSdSnapLineDlg(vcl::Window* pParent, const SfxItemSet& rInAttrs, ::sd::View* pView) = 0; virtual AbstractSdInsertLayerDlg* CreateSdInsertLayerDlg(vcl::Window* pParent, const SfxItemSet& rInAttrs, bool bDeletable, const OUString& aStr) = 0; virtual AbstractSdInsertPagesObjsDlg* CreateSdInsertPagesObjsDlg(vcl::Window* pParent, const SdDrawDocument* pDoc, SfxMedium* pSfxMedium, const OUString& rFileName) = 0; virtual AbstractMorphDlg* CreateMorphDlg(vcl::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2) = 0; - virtual SfxAbstractTabDialog* CreateSdOutlineBulletTabDlg(vcl::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView = nullptr) = 0; + virtual SfxAbstractTabDialog* CreateSdOutlineBulletTabDlg(vcl::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView) = 0; virtual SfxAbstractTabDialog* CreateSdParagraphTabDlg(vcl::Window* pWindow, const SfxItemSet* pAttr) = 0; virtual AbstractSdStartPresDlg* CreateSdStartPresentationDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, const std::vector<OUString> &rPageNames, SdCustomShowList* pCSList ) = 0; diff --git a/sd/inc/sdgrffilter.hxx b/sd/inc/sdgrffilter.hxx index e637a0032e60..c6287869e1f2 100644 --- a/sd/inc/sdgrffilter.hxx +++ b/sd/inc/sdgrffilter.hxx @@ -36,7 +36,7 @@ public: bool Import(); bool Export() override; - static void HandleGraphicFilterError( sal_uInt16 nFilterError, sal_uLong nStreamError = ERRCODE_NONE ); + static void HandleGraphicFilterError( sal_uInt16 nFilterError, sal_uLong nStreamError ); }; #endif // INCLUDED_SD_INC_SDGRFFILTER_HXX diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx index ecc4b787421e..3aa10ed2a194 100644 --- a/sd/inc/sdpage.hxx +++ b/sd/inc/sdpage.hxx @@ -369,7 +369,7 @@ public: bool IsPrecious() const { return mbIsPrecious; } void createAnnotation( css::uno::Reference< css::office::XAnnotation >& xAnnotation ); - void addAnnotation( const css::uno::Reference< css::office::XAnnotation >& xAnnotation, int nIndex = -1 ); + void addAnnotation( const css::uno::Reference< css::office::XAnnotation >& xAnnotation, int nIndex ); void removeAnnotation( const css::uno::Reference< css::office::XAnnotation >& xAnnotation ); const sd::AnnotationVector& getAnnotations() const { return maAnnotations; } OString stringify() const; diff --git a/sd/source/core/CustomAnimationCloner.cxx b/sd/source/core/CustomAnimationCloner.cxx index 48d74bcdb17e..b43172ad5804 100644 --- a/sd/source/core/CustomAnimationCloner.cxx +++ b/sd/source/core/CustomAnimationCloner.cxx @@ -61,7 +61,7 @@ namespace sd { public: CustomAnimationClonerImpl(); - Reference< XAnimationNode > Clone( const Reference< XAnimationNode >& xSourceNode, const SdPage* pSource = nullptr, const SdPage* pTarget = nullptr ); + Reference< XAnimationNode > Clone( const Reference< XAnimationNode >& xSourceNode, const SdPage* pSource, const SdPage* pTarget ); private: void transformNode( const Reference< XAnimationNode >& xNode ); diff --git a/sd/source/core/EffectMigration.cxx b/sd/source/core/EffectMigration.cxx index ab2a4615bdb1..140c2405ed71 100644 --- a/sd/source/core/EffectMigration.cxx +++ b/sd/source/core/EffectMigration.cxx @@ -525,7 +525,7 @@ void EffectMigration::SetAnimationEffect( SvxShape* pShape, AnimationEffect eEff if( (pEffect->getPresetId() != aPresetId) || (pEffect->getPresetSubType() != aPresetSubType) ) { - pMainSequence->replace( pEffect, pPreset, aPresetSubType ); + pMainSequence->replace( pEffect, pPreset, aPresetSubType, -1.0 ); } } } diff --git a/sd/source/core/PageListWatcher.hxx b/sd/source/core/PageListWatcher.hxx index 1459af7fc954..979ad9e97a12 100644 --- a/sd/source/core/PageListWatcher.hxx +++ b/sd/source/core/PageListWatcher.hxx @@ -58,7 +58,7 @@ public: virtual ~ImpPageListWatcher(); void Invalidate() { mbPageListValid = false; } - SdPage* GetSdPage(PageKind ePgKind, sal_uInt32 nPgNum = 0L); + SdPage* GetSdPage(PageKind ePgKind, sal_uInt32 nPgNum); sal_uInt32 GetSdPageCount(PageKind ePgKind); sal_uInt32 GetVisibleSdPageCount(); }; diff --git a/sd/source/core/annotations/Annotation.cxx b/sd/source/core/annotations/Annotation.cxx index 3a2b0616e913..52e999579e19 100644 --- a/sd/source/core/annotations/Annotation.cxx +++ b/sd/source/core/annotations/Annotation.cxx @@ -168,7 +168,7 @@ void createAnnotation( Reference< XAnnotation >& xAnnotation, SdPage* pPage ) { xAnnotation.set( new Annotation(comphelper::getProcessComponentContext(), pPage)); - pPage->addAnnotation(xAnnotation); + pPage->addAnnotation(xAnnotation, -1); } Annotation::Annotation( const Reference< XComponentContext >& context, SdPage* pPage ) diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index c936af755cc6..d65ddc76ae92 100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -1323,7 +1323,7 @@ sal_uInt16 SdDrawDocument::DuplicatePage (sal_uInt16 nPageNum) // No names for the new slides OUString(), OUString(), aVisibleLayers.IsSet(aBckgrnd), - aVisibleLayers.IsSet(aBckgrndObj)); + aVisibleLayers.IsSet(aBckgrndObj), -1); } sal_uInt16 SdDrawDocument::DuplicatePage ( diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index c423141560a9..5321eb928da5 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -132,7 +132,7 @@ void InsertBookmarkAsPage_FindDuplicateLayouts::operator()( SdDrawDocument& rDoc // Inserts a bookmark as a page static void lcl_IterateBookmarkPages( SdDrawDocument &rDoc, SdDrawDocument* pBookmarkDoc, const std::vector<OUString> &rBookmarkList, sal_uInt16 nBMSdPageCount, - InsertBookmarkAsPage_FindDuplicateLayouts& rPageIterator, bool bRenameDuplicates = false ) + InsertBookmarkAsPage_FindDuplicateLayouts& rPageIterator, bool bRenameDuplicates ) { // Refactored copy'n'pasted layout name collection from InsertBookmarkAsPage diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx index 8c867359f9e4..38e26109c0f8 100644 --- a/sd/source/filter/eppt/eppt.hxx +++ b/sd/source/filter/eppt/eppt.hxx @@ -197,14 +197,14 @@ class PPTWriter : public PPTWriterBase, public PPTExBulletProvider void ImplWriteExtParaHeader( SvMemoryStream& rSt, sal_uInt32 nRef, sal_uInt32 nInstance, sal_uInt32 nSlideId ); - sal_uInt32 ImplProgBinaryTag( SvStream* pOutStrm = nullptr ); - sal_uInt32 ImplProgBinaryTagContainer( SvStream* pOutStrm = nullptr, SvMemoryStream* pBinTag = nullptr ); - sal_uInt32 ImplProgTagContainer( SvStream* pOutStrm = nullptr, SvMemoryStream* pBinTag = nullptr ); - static sal_uInt32 ImplOutlineViewInfoContainer( SvStream* pOutStrm = nullptr ); - static sal_uInt32 ImplSlideViewInfoContainer( sal_uInt32 nInstance, SvStream* pOutStrm = nullptr ); - sal_uInt32 ImplVBAInfoContainer( SvStream* pOutStrm = nullptr ); - sal_uInt32 ImplDocumentListContainer( SvStream* pOutStrm = nullptr ); - sal_uInt32 ImplMasterSlideListContainer( SvStream* pOutStrm = nullptr ); + sal_uInt32 ImplProgBinaryTag( SvStream* pOutStrm ); + sal_uInt32 ImplProgBinaryTagContainer( SvStream* pOutStrm, SvMemoryStream* pBinTag = nullptr ); + sal_uInt32 ImplProgTagContainer( SvStream* pOutStrm, SvMemoryStream* pBinTag = nullptr ); + static sal_uInt32 ImplOutlineViewInfoContainer( SvStream* pOutStrm ); + static sal_uInt32 ImplSlideViewInfoContainer( sal_uInt32 nInstance, SvStream* pOutStrm ); + sal_uInt32 ImplVBAInfoContainer( SvStream* pOutStrm ); + sal_uInt32 ImplDocumentListContainer( SvStream* pOutStrm ); + sal_uInt32 ImplMasterSlideListContainer( SvStream* pOutStrm ); public: static void WriteCString( SvStream&, const OUString&, sal_uInt32 nInstance = 0 ); diff --git a/sd/source/filter/eppt/epptbase.hxx b/sd/source/filter/eppt/epptbase.hxx index 38f762cc76b0..6e576e8ec07d 100644 --- a/sd/source/filter/eppt/epptbase.hxx +++ b/sd/source/filter/eppt/epptbase.hxx @@ -366,7 +366,7 @@ protected: virtual bool ImplCreateMainNotes()=0; bool GetStyleSheets(); - bool GetShapeByIndex( sal_uInt32 nIndex, bool bGroup = false ); + bool GetShapeByIndex( sal_uInt32 nIndex, bool bGroup ); bool CreateMainNotes(); diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 315a24016f89..206f062602dd 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -435,8 +435,8 @@ bool PPTWriter::ImplCloseDocument() nBytesToInsert += maSoundCollection.GetSize(); nBytesToInsert += mpPptEscherEx->DrawingGroupContainerSize(); - nBytesToInsert += ImplMasterSlideListContainer(); - nBytesToInsert += ImplDocumentListContainer(); + nBytesToInsert += ImplMasterSlideListContainer(nullptr); + nBytesToInsert += ImplDocumentListContainer(nullptr); // insert nBytes into stream and adjust depending container mpPptEscherEx->InsertAtCurrentPos( nBytesToInsert ); diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx index d228d60c9cf3..48ad287083c3 100644 --- a/sd/source/filter/eppt/pptx-epptbase.cxx +++ b/sd/source/filter/eppt/pptx-epptbase.cxx @@ -1005,7 +1005,7 @@ bool PPTWriterBase::ContainsOtherShapeThanPlaceholders() if ( nShapes ) for ( sal_uInt32 nIndex = 0; ( nIndex < nShapes ) && !bOtherThanPlaceHolders; nIndex++ ) { - if ( GetShapeByIndex( nIndex ) && mType != "drawing.Page" ) + if ( GetShapeByIndex( nIndex, false ) && mType != "drawing.Page" ) { if( mType == "presentation.Page" || mType == "presentation.Notes" ) { diff --git a/sd/source/filter/eppt/pptx-stylesheet.cxx b/sd/source/filter/eppt/pptx-stylesheet.cxx index 89c72956ebd3..eb0327aa3031 100644 --- a/sd/source/filter/eppt/pptx-stylesheet.cxx +++ b/sd/source/filter/eppt/pptx-stylesheet.cxx @@ -292,7 +292,7 @@ void PPTExParaSheet::SetStyleSheet( const css::uno::Reference< css::beans::XProp { PPTExParaLevel& rLevel = maParaLevel[ i ]; if ( i ) - aParagraphObj.ImplGetNumberingLevel( pBuProv, i, false ); + aParagraphObj.ImplGetNumberingLevel( pBuProv, i, false, false ); rLevel.mnTextOfs = aParagraphObj.nTextOfs; rLevel.mnBulletOfs = (sal_uInt16)aParagraphObj.nBulletOfs; rLevel.mnBulletChar = aParagraphObj.cBulletId; diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx index 3ec1dc4884aa..91af50246422 100644 --- a/sd/source/filter/eppt/pptx-text.cxx +++ b/sd/source/filter/eppt/pptx-text.cxx @@ -72,7 +72,7 @@ PortionObj::PortionObj(const css::uno::Reference< css::beans::XPropertySet > & r { mXPropSet = rXPropSet; - ImplGetPortionValues( rFontCollection ); + ImplGetPortionValues( rFontCollection, false ); } PortionObj::PortionObj(css::uno::Reference< css::text::XTextRange > & rXTextRange, @@ -673,7 +673,7 @@ ParagraphObj::ParagraphObj(const css::uno::Reference< css::beans::XPropertySet > nBulletFlags = 0; nParaFlags = 0; - ImplGetParagraphValues( pProv ); + ImplGetParagraphValues( pProv, false ); } ParagraphObj::ParagraphObj(css::uno::Reference< css::text::XTextContent > & rXTextContent, diff --git a/sd/source/filter/eppt/text.hxx b/sd/source/filter/eppt/text.hxx index 28ac497d6b63..35c6f4475ad2 100644 --- a/sd/source/filter/eppt/text.hxx +++ b/sd/source/filter/eppt/text.hxx @@ -95,7 +95,7 @@ protected: css::beans::PropertyState ePropState; css::uno::Reference < css::beans::XPropertyState > mXPropState; - bool ImplGetPropertyValue( const OUString& rString, bool bGetPropertyState = true ); + bool ImplGetPropertyValue( const OUString& rString, bool bGetPropertyState ); }; struct FieldEntry @@ -126,7 +126,7 @@ class PortionObj : public PropStateValue static sal_uInt32 ImplGetTextField( css::uno::Reference< css::text::XTextRange > & rXTextRangeRef, const css::uno::Reference< css::beans::XPropertySet > & rXPropSetRef, OUString& rURL ); sal_uInt32 ImplCalculateTextPositions( sal_uInt32 nCurrentTextPosition ); - void ImplGetPortionValues( FontCollection& rFontCollection, bool bGetPropStateValue = false ); + void ImplGetPortionValues( FontCollection& rFontCollection, bool bGetPropStateValue ); public: @@ -184,8 +184,8 @@ class ParagraphObj : public PropStateValue, public SOParagraph void ImplConstruct( const ParagraphObj& rParagraphObj ); void ImplClear(); sal_uInt32 ImplCalculateTextPositions( sal_uInt32 nCurrentTextPosition ); - void ImplGetParagraphValues( PPTExBulletProvider* pBuProv, bool bGetPropStateValue = false ); - void ImplGetNumberingLevel( PPTExBulletProvider* pBuProv, sal_Int16 nDepth, bool bIsBullet, bool bGetPropStateValue = false ); + void ImplGetParagraphValues( PPTExBulletProvider* pBuProv, bool bGetPropStateValue ); + void ImplGetNumberingLevel( PPTExBulletProvider* pBuProv, sal_Int16 nDepth, bool bIsBullet, bool bGetPropStateValue ); public: diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index 3d300d46d560..a02af081e527 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -1792,7 +1792,7 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(vcl::Window* pPar continue; } - OUString aDescription( getShapeDescription( xShape ) ); + OUString aDescription( getShapeDescription( xShape, true ) ); sal_Int32 nPos = mpLBTrigger->InsertEntry( aDescription ); mpLBTrigger->SetEntryData( nPos, reinterpret_cast<void*>((sal_IntPtr)nShape) ); diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index 300da5f96d59..ca08e350fc9a 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -157,7 +157,7 @@ OUString getShapeDescription( const Reference< XShape >& xShape, bool bWithText return aDescription; } -static OUString getDescription( const Any& rTarget, bool bWithText = true ) +static OUString getDescription( const Any& rTarget, bool bWithText ) { OUString aDescription; diff --git a/sd/source/ui/animations/CustomAnimationList.hxx b/sd/source/ui/animations/CustomAnimationList.hxx index a45a303e4e93..f2bce08e8439 100644 --- a/sd/source/ui/animations/CustomAnimationList.hxx +++ b/sd/source/ui/animations/CustomAnimationList.hxx @@ -115,7 +115,7 @@ private: OUString getPropertyName( sal_Int32 nPropertyType ); -OUString getShapeDescription( const css::uno::Reference< css::drawing::XShape >& xShape, bool bWithText = true ); +OUString getShapeDescription( const css::uno::Reference< css::drawing::XShape >& xShape, bool bWithText ); } diff --git a/sd/source/ui/animations/motionpathtag.hxx b/sd/source/ui/animations/motionpathtag.hxx index 2c9deecbdb39..0803417434ac 100644 --- a/sd/source/ui/animations/motionpathtag.hxx +++ b/sd/source/ui/animations/motionpathtag.hxx @@ -52,7 +52,7 @@ public: // callbacks from sdr view virtual sal_uLong GetMarkablePointCount() const override; virtual sal_uLong GetMarkedPointCount() const override; - virtual bool MarkPoint(SdrHdl& rHdl, bool bUnmark=false) override; + virtual bool MarkPoint(SdrHdl& rHdl, bool bUnmark) override; virtual void CheckPossibilities() override; virtual bool MarkPoints(const Rectangle* pRect, bool bUnmark) override; diff --git a/sd/source/ui/annotations/annotationtag.hxx b/sd/source/ui/annotations/annotationtag.hxx index 622b4f1a40ff..54a8e6b909a2 100644 --- a/sd/source/ui/annotations/annotationtag.hxx +++ b/sd/source/ui/annotations/annotationtag.hxx @@ -52,7 +52,7 @@ public: // callbacks from sdr view virtual sal_uLong GetMarkablePointCount() const override; virtual sal_uLong GetMarkedPointCount() const override; - virtual bool MarkPoint(SdrHdl& rHdl, bool bUnmark=false) override; + virtual bool MarkPoint(SdrHdl& rHdl, bool bUnmark) override; virtual void CheckPossibilities() override; virtual bool MarkPoints(const Rectangle* pRect, bool bUnmark) override; diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index 548015494ec6..764645493c2f 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -308,7 +308,7 @@ IMPL_LINK_TYPED( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox, void ) nID < NAVIGATOR_DRAGTYPE_COUNT; nID++ ) { - sal_uInt16 nRId = GetDragTypeSdResId( (NavigatorDragType)nID ); + sal_uInt16 nRId = GetDragTypeSdResId( (NavigatorDragType)nID, false ); if( nRId > 0 ) { DBG_ASSERT(aHIDs[nID-NAVIGATOR_DRAGTYPE_URL],"HelpId not added!"); @@ -674,7 +674,7 @@ void SdNavigatorWin::RefreshDocumentLB( const OUString* pDocName ) SfxMedium *pMedium = pDocShell->GetMedium(); aStr = pMedium ? pMedium->GetName() : OUString(); if( !aStr.isEmpty() ) - aInfo.SetName(); + aInfo.SetName( true ); else aInfo.SetName( false ); // at the moment, we use the name of the shell again (i.e. @@ -685,7 +685,7 @@ void SdNavigatorWin::RefreshDocumentLB( const OUString* pDocName ) maLbDocs->InsertEntry( aStr ); if( pDocShell == pCurrentDocShell ) - aInfo.SetActive(); + aInfo.SetActive( true ); else aInfo.SetActive( false ); diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx index 9f203a1f092d..c5ec43014349 100644 --- a/sd/source/ui/dlg/sddlgfact.hxx +++ b/sd/source/ui/dlg/sddlgfact.hxx @@ -210,13 +210,13 @@ public: virtual AbstractCopyDlg* CreateCopyDlg(vcl::Window* pParent, const SfxItemSet& rInAttrs, const rtl::Reference<XColorList> &pColTab, ::sd::View* pView) override; virtual AbstractSdCustomShowDlg* CreateSdCustomShowDlg(vcl::Window* pParent, SdDrawDocument& rDrawDoc) override; virtual SfxAbstractTabDialog* CreateSdTabCharDialog(vcl::Window* pWindow, const SfxItemSet* pAttr, SfxObjectShell* pDocShell) override; - virtual SfxAbstractTabDialog* CreateSdTabPageDialog(vcl::Window* pWindow, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, bool bAreaPage = true) override; + virtual SfxAbstractTabDialog* CreateSdTabPageDialog(vcl::Window* pWindow, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, bool bAreaPage) override; virtual AbstractSdModifyFieldDlg* CreateSdModifyFieldDlg( vcl::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ) override; virtual AbstractSdSnapLineDlg* CreateSdSnapLineDlg(vcl::Window* pParent, const SfxItemSet& rInAttrs, ::sd::View* pView) override; virtual AbstractSdInsertLayerDlg* CreateSdInsertLayerDlg(vcl::Window* pParent, const SfxItemSet& rInAttrs, bool bDeletable, const OUString& aStr) override; virtual AbstractSdInsertPagesObjsDlg* CreateSdInsertPagesObjsDlg(vcl::Window* pParent, const SdDrawDocument* pDoc, SfxMedium* pSfxMedium, const OUString& rFileName ) override; virtual AbstractMorphDlg* CreateMorphDlg(vcl::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2) override; - virtual SfxAbstractTabDialog* CreateSdOutlineBulletTabDlg(vcl::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView = nullptr) override; + virtual SfxAbstractTabDialog* CreateSdOutlineBulletTabDlg(vcl::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView) override; virtual SfxAbstractTabDialog* CreateSdParagraphTabDlg(vcl::Window* pParent, const SfxItemSet* pAttr) override; virtual AbstractSdStartPresDlg* CreateSdStartPresentationDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, const std::vector<OUString> &rPageNames, SdCustomShowList* pCSList ) override; diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index eb9b3636a099..acf5f690a45e 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -1107,7 +1107,7 @@ void SdPageObjsTLB::KeyInput( const KeyEvent& rKEvt ) if (pSdDrawDocShell) { pSdDrawDocShell->GetObjectIsmarked(aStr, true); - bMarked = pSdDrawDocShell->GetObjectIsmarked(aStr); + bMarked = pSdDrawDocShell->GetObjectIsmarked(aStr, false); } pNewEntry->SetMarked(bMarked); Invalidate(); diff --git a/sd/source/ui/docshell/docshel3.cxx b/sd/source/ui/docshell/docshel3.cxx index 826acad997e0..142e38184426 100644 --- a/sd/source/ui/docshell/docshel3.cxx +++ b/sd/source/ui/docshell/docshel3.cxx @@ -65,7 +65,7 @@ using namespace ::com::sun::star::uno; namespace sd { -static void lcl_setLanguageForObj( SdrObject *pObj, LanguageType nLang, bool bLanguageNone = false ) +static void lcl_setLanguageForObj( SdrObject *pObj, LanguageType nLang, bool bLanguageNone ) { const sal_uInt16 aLangWhichId_EE[3] = { diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx index 2a341eeafa03..ceb65bcaef45 100644 --- a/sd/source/ui/framework/factories/BasicViewFactory.cxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx @@ -227,7 +227,7 @@ void SAL_CALL BasicViewFactory::releaseResource (const Reference<XResource>& rxV pSfxViewShell->DisconnectAllClients(); } - ReleaseView(*iViewShell); + ReleaseView(*iViewShell, false); mpViewShellContainer->erase(iViewShell); } diff --git a/sd/source/ui/framework/factories/BasicViewFactory.hxx b/sd/source/ui/framework/factories/BasicViewFactory.hxx index 1d6eecc6343a..6904d8451fb2 100644 --- a/sd/source/ui/framework/factories/BasicViewFactory.hxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.hxx @@ -129,7 +129,7 @@ private: void ReleaseView ( const std::shared_ptr<ViewDescriptor>& rpDescriptor, - bool bDoNotCache = false); + bool bDoNotCache); bool IsCacheable ( const std::shared_ptr<ViewDescriptor>& rpDescriptor); diff --git a/sd/source/ui/func/fucushow.cxx b/sd/source/ui/func/fucushow.cxx index 35a3f61dce28..f3cce7bb272c 100644 --- a/sd/source/ui/func/fucushow.cxx +++ b/sd/source/ui/func/fucushow.cxx @@ -71,7 +71,7 @@ void FuCustomShowDlg::DoExecute( SfxRequest& ) if( nRet == RET_YES ) { - mpViewShell->SetStartShowWithDialog(); + mpViewShell->SetStartShowWithDialog(true); mpViewShell->GetViewFrame()->GetDispatcher()->Execute( SID_PRESENTATION, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD ); diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx index 54f06c2d2e4e..4deb00e9ac14 100644 --- a/sd/source/ui/func/fuinsfil.cxx +++ b/sd/source/ui/func/fuinsfil.cxx @@ -402,7 +402,7 @@ bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium) if( bNameOK ) bOK = mpDoc->InsertBookmarkAsObject( aObjectBookmarkList, aExchangeList, - bLink, nullptr, nullptr); + bLink, nullptr, nullptr, false ); if( pDlg->IsRemoveUnnessesaryMasterPages() ) mpDoc->RemoveUnnecessaryMasterPages(); diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index d377abf378c9..cfadfc3113ce 100644 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -133,7 +133,7 @@ public: bool IsMarked( SdrObject* pObject ); // Optionally realize multi-selection of objects - bool GetObjectIsmarked(const OUString& rBookmark, bool bRealizeMultiSelectionOfObjects = false); + bool GetObjectIsmarked(const OUString& rBookmark, bool bRealizeMultiSelectionOfObjects); Bitmap GetPagePreviewBitmap(SdPage* pPage, sal_uInt16 nMaxEdgePixel); /** checks, if the given name is a valid new name for a slide diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index 0195f3b7459e..825764009fc1 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -137,8 +137,8 @@ public: virtual void Deactivate(bool IsMDIActivate) override; virtual void UIActivating( SfxInPlaceClient* ) override; virtual void UIDeactivated( SfxInPlaceClient* ) override; - OUString GetSelectionText( bool bCompleteWords = false ); - bool HasSelection( bool bText = true ) const; + OUString GetSelectionText( bool bCompleteWords ); + bool HasSelection( bool bText ) const; //If we are editing an PRESOBJ_OUTLINE return the Outliner and fill rSel //with the current selection @@ -259,7 +259,7 @@ public: virtual ErrCode DoVerb(long nVerb) override; virtual bool ActivateObject(SdrOle2Obj* pObj, long nVerb) override; - void SetZoomOnPage( bool bZoom = true ) { mbZoomOnPage = bZoom; } + void SetZoomOnPage( bool bZoom ) { mbZoomOnPage = bZoom; } bool IsZoomOnPage() { return mbZoomOnPage; } static void CheckLineTo (SfxRequest& rReq); void SetChildWindowState( SfxItemSet& rSet ); @@ -276,7 +276,7 @@ public: Do not call this method directly. Call the method at ViewShellBase instead. */ - virtual void ShowUIControls (bool bVisible = true) override; + virtual void ShowUIControls (bool bVisible) override; void ScannerEvent( const css::lang::EventObject& rEventObject ); @@ -287,8 +287,8 @@ public: virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow, sal_uInt16 nPage, sal_uInt16 nLayer ) override; - virtual void WriteUserDataSequence ( css::uno::Sequence < css::beans::PropertyValue >&, bool bBrowse = false ) override; - virtual void ReadUserDataSequence ( const css::uno::Sequence < css::beans::PropertyValue >&, bool bBrowse = false ) override; + virtual void WriteUserDataSequence ( css::uno::Sequence < css::beans::PropertyValue >&, bool bBrowse ) override; + virtual void ReadUserDataSequence ( const css::uno::Sequence < css::beans::PropertyValue >&, bool bBrowse ) override; virtual void VisAreaChanged(const Rectangle& rRect) override; diff --git a/sd/source/ui/inc/EventMultiplexer.hxx b/sd/source/ui/inc/EventMultiplexer.hxx index f6f38ce0bffd..f5b4ade90592 100644 --- a/sd/source/ui/inc/EventMultiplexer.hxx +++ b/sd/source/ui/inc/EventMultiplexer.hxx @@ -201,7 +201,7 @@ public: */ void MultiplexEvent( EventMultiplexerEvent::EventId eEventId, - void* pUserData = nullptr); + void* pUserData); private: class Implementation; diff --git a/sd/source/ui/inc/FrameView.hxx b/sd/source/ui/inc/FrameView.hxx index 11741ccd7280..5e6267693764 100644 --- a/sd/source/ui/inc/FrameView.hxx +++ b/sd/source/ui/inc/FrameView.hxx @@ -124,10 +124,10 @@ public: { mbQuickEdit = bQEdit; } bool IsQuickEdit() const { return mbQuickEdit; } - void SetDoubleClickTextEdit( bool bOn = true ) { mbDoubleClickTextEdit = bOn; } + void SetDoubleClickTextEdit( bool bOn ) { mbDoubleClickTextEdit = bOn; } bool IsDoubleClickTextEdit() const { return mbDoubleClickTextEdit; } - void SetClickChangeRotation( bool bOn = true ) { mbClickChangeRotation = bOn; } + void SetClickChangeRotation( bool bOn ) { mbClickChangeRotation = bOn; } bool IsClickChangeRotation() const { return mbClickChangeRotation; } /** Remember the type of the view shell that was (or soon will be) @@ -165,8 +165,8 @@ public: void SetIsNavigatorShowingAllShapes (const bool bIsNavigatorShowingAllShapes); bool IsNavigatorShowingAllShapes() const { return mbIsNavigatorShowingAllShapes;} - void WriteUserDataSequence ( css::uno::Sequence < css::beans::PropertyValue >&, bool bBrowse = false ); - void ReadUserDataSequence ( const css::uno::Sequence < css::beans::PropertyValue >&, bool bBrowse = false ); + void WriteUserDataSequence ( css::uno::Sequence < css::beans::PropertyValue >&, bool bBrowse ); + void ReadUserDataSequence ( const css::uno::Sequence < css::beans::PropertyValue >&, bool bBrowse ); private: sal_uInt16 mnRefCount; diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx index f309db41246e..67a6bb57ea06 100644 --- a/sd/source/ui/inc/OutlineView.hxx +++ b/sd/source/ui/inc/OutlineView.hxx @@ -125,12 +125,12 @@ public: virtual sal_Int8 AcceptDrop ( const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow = nullptr, + ::sd::Window* pTargetWindow, sal_uInt16 nPage = SDRPAGE_NOTFOUND, sal_uInt16 nLayer = SDRPAGE_NOTFOUND) override; virtual sal_Int8 ExecuteDrop ( const ExecuteDropEvent& rEvt, - ::sd::Window* pTargetWindow = nullptr, + ::sd::Window* pTargetWindow, sal_uInt16 nPage = SDRPAGE_NOTFOUND, sal_uInt16 nLayer = SDRPAGE_NOTFOUND) override; @@ -193,7 +193,7 @@ private: /** updates the high contrast settings and document color if they changed. @param bForceUpdate forces the method to set all style settings */ - void onUpdateStyleSettings( bool bForceUpdate = false ); + void onUpdateStyleSettings( bool bForceUpdate ); /** this link is called from the vcl application when the stylesettings change. Its only purpose is to call onUpdateStyleSettings() then. diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx index 79b03f9b0d36..6533a83e62e6 100644 --- a/sd/source/ui/inc/OutlineViewShell.hxx +++ b/sd/source/ui/inc/OutlineViewShell.hxx @@ -113,8 +113,8 @@ public: sal_uLong Read(SvStream& rInput, const OUString& rBaseURL, sal_uInt16 eFormat); - virtual void WriteUserDataSequence ( css::uno::Sequence < css::beans::PropertyValue >&, bool bBrowse = false ) override; - virtual void ReadUserDataSequence ( const css::uno::Sequence < css::beans::PropertyValue >&, bool bBrowse = false ) override; + virtual void WriteUserDataSequence ( css::uno::Sequence < css::beans::PropertyValue >&, bool bBrowse ) override; + virtual void ReadUserDataSequence ( const css::uno::Sequence < css::beans::PropertyValue >&, bool bBrowse ) override; /** this method is called when the visible area of the view from this viewshell is changed */ virtual void VisAreaChanged(const Rectangle& rRect) override; diff --git a/sd/source/ui/inc/PreviewRenderer.hxx b/sd/source/ui/inc/PreviewRenderer.hxx index af23ec430c71..1a62df6be844 100644 --- a/sd/source/ui/inc/PreviewRenderer.hxx +++ b/sd/source/ui/inc/PreviewRenderer.hxx @@ -95,7 +95,7 @@ public: const SdPage* pPage, const Size aPreviewPixelSize, const OUString& sSubstitutionText, - const bool bObeyHighContrastMode = true, + const bool bObeyHighContrastMode, const bool bDisplayPresentationObjects = true); /** Render an image that contains the given substitution text instead of a diff --git a/sd/source/ui/inc/ShellFactory.hxx b/sd/source/ui/inc/ShellFactory.hxx index 3be6aa17a46c..af410037a300 100644 --- a/sd/source/ui/inc/ShellFactory.hxx +++ b/sd/source/ui/inc/ShellFactory.hxx @@ -50,7 +50,7 @@ public: virtual ShellType* CreateShell ( ShellId nId, vcl::Window* pParentWindow, - FrameView* pFrameView = nullptr) = 0; + FrameView* pFrameView) = 0; /** Tell the factory that a shell is no longer in use. It may destroy it or put it for future use in a cache. diff --git a/sd/source/ui/inc/TemplateScanner.hxx b/sd/source/ui/inc/TemplateScanner.hxx index 3af88714267e..106559ee7012 100644 --- a/sd/source/ui/inc/TemplateScanner.hxx +++ b/sd/source/ui/inc/TemplateScanner.hxx @@ -78,7 +78,7 @@ public: ::std::vector<TemplateEntry*> maEntries; - void EnableSorting(bool bSortingEnabled = true); + void EnableSorting(bool bSortingEnabled); void InsertEntry(TemplateEntry* pNewEntry); private: diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index c1f52acf2a46..844fae7c00a3 100644 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -100,12 +100,12 @@ public: virtual sal_Int8 AcceptDrop ( const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow = nullptr, + ::sd::Window* pTargetWindow, sal_uInt16 nPage = SDRPAGE_NOTFOUND, sal_uInt16 nLayer = SDRPAGE_NOTFOUND); virtual sal_Int8 ExecuteDrop ( const ExecuteDropEvent& rEvt, - ::sd::Window* pTargetWindow = nullptr, + ::sd::Window* pTargetWindow, sal_uInt16 nPage = SDRPAGE_NOTFOUND, sal_uInt16 nLayer = SDRPAGE_NOTFOUND); diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index b20e4e3f99e9..4af99de2b4a9 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -259,7 +259,7 @@ public: bool bScaleAll, Orientation eOrient, sal_uInt16 nPaperBin, bool bBackgroundFullSize ); - void SetStartShowWithDialog( bool bIn = true ) { mbStartShowWithDialog = bIn; } + void SetStartShowWithDialog( bool bIn ) { mbStartShowWithDialog = bIn; } bool IsStartShowWithDialog() const { return mbStartShowWithDialog; } sal_uInt16 GetPrintedHandoutPageNum() const { return mnPrintedHandoutPageNum; } @@ -277,8 +277,8 @@ public: virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow, sal_uInt16 nPage, sal_uInt16 nLayer ); - virtual void WriteUserDataSequence ( css::uno::Sequence < css::beans::PropertyValue >&, bool bBrowse = false ); - virtual void ReadUserDataSequence ( const css::uno::Sequence < css::beans::PropertyValue >&, bool bBrowse = false ); + virtual void WriteUserDataSequence ( css::uno::Sequence < css::beans::PropertyValue >&, bool bBrowse ); + virtual void ReadUserDataSequence ( const css::uno::Sequence < css::beans::PropertyValue >&, bool bBrowse ); /** this method is called when the visible area of the view from this viewshell is changed */ virtual void VisAreaChanged(const Rectangle& rRect); @@ -387,7 +387,7 @@ public: /** Show controls of the UI or hide them, depending on the given flag. As a result the border is adapted. */ - virtual void ShowUIControls (bool bVisible = true); + virtual void ShowUIControls (bool bVisible); bool IsPageFlipMode() const; /** Set the given window as new parent window. This is not possible for diff --git a/sd/source/ui/inc/docprev.hxx b/sd/source/ui/inc/docprev.hxx index d4840730607e..ee7900c60615 100644 --- a/sd/source/ui/inc/docprev.hxx +++ b/sd/source/ui/inc/docprev.hxx @@ -63,7 +63,7 @@ public: SdDocPreviewWin( vcl::Window* pParent, const WinBits nStyle ); virtual ~SdDocPreviewWin(); virtual void dispose() override; - void SetObjectShell( SfxObjectShell* pObj, sal_uInt16 nShowPage = 0 ); + void SetObjectShell( SfxObjectShell* pObj, sal_uInt16 nShowPage ); virtual void Resize() override; void startPreview(); diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx index edad018443a7..cce7b1ad14ea 100644 --- a/sd/source/ui/inc/navigatr.hxx +++ b/sd/source/ui/inc/navigatr.hxx @@ -65,8 +65,8 @@ public: bool HasName() { return bName; } bool IsActive() { return bActive; } - void SetName( bool bOn = true ) { bName = bOn; } - void SetActive( bool bOn = true ) { bActive = bOn; } + void SetName( bool bOn ) { bName = bOn; } + void SetActive( bool bOn ) { bActive = bOn; } private: friend class SdNavigatorWin; @@ -135,7 +135,7 @@ private: */ // bool mbShowAllShapes; - static sal_uInt16 GetDragTypeSdResId( NavigatorDragType eDT, bool bImage = false ); + static sal_uInt16 GetDragTypeSdResId( NavigatorDragType eDT, bool bImage ); NavDocInfo* GetDocInfo(); DECL_LINK_TYPED( SelectToolboxHdl, ToolBox *, void ); diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx index 88cf3e8874b2..818ef212c8d9 100644 --- a/sd/source/ui/inc/optsitem.hxx +++ b/sd/source/ui/inc/optsitem.hxx @@ -130,11 +130,11 @@ public: sal_uInt16 GetMetric() const { Init(); return( ( 0xffff == nMetric ) ? (sal_uInt16)SfxModule::GetCurrentFieldUnit() : nMetric ); } sal_uInt16 GetDefTab() const { Init(); return nDefTab; } - void SetRulerVisible( bool bOn = true ) { if( bRuler != bOn ) { OptionsChanged(); bRuler = bOn; } } - void SetMoveOutline( bool bOn = true ) { if( bMoveOutline != bOn ) { OptionsChanged(); bMoveOutline = bOn; } } - void SetDragStripes( bool bOn = true ) { if( bDragStripes != bOn ) { OptionsChanged(); bDragStripes = bOn; } } - void SetHandlesBezier( bool bOn = true ) { if( bHandlesBezier != bOn ) { OptionsChanged(); bHandlesBezier = bOn; } } - void SetHelplines( bool bOn = true ) { if( bHelplines != bOn ) { OptionsChanged(); bHelplines = bOn; } } + void SetRulerVisible( bool bOn ) { if( bRuler != bOn ) { OptionsChanged(); bRuler = bOn; } } + void SetMoveOutline( bool bOn ) { if( bMoveOutline != bOn ) { OptionsChanged(); bMoveOutline = bOn; } } + void SetDragStripes( bool bOn ) { if( bDragStripes != bOn ) { OptionsChanged(); bDragStripes = bOn; } } + void SetHandlesBezier( bool bOn ) { if( bHandlesBezier != bOn ) { OptionsChanged(); bHandlesBezier = bOn; } } + void SetHelplines( bool bOn ) { if( bHelplines != bOn ) { OptionsChanged(); bHelplines = bOn; } } void SetMetric( sal_uInt16 nInMetric ) { if( nMetric != nInMetric ) { OptionsChanged(); nMetric = nInMetric; } } void SetDefTab( sal_uInt16 nTab ) { if( nDefTab != nTab ) { OptionsChanged(); nDefTab = nTab; } } }; @@ -284,20 +284,20 @@ public: double GetPresentationPenWidth() const { Init(); return mnPenWidth; } void SetPresentationPenWidth( double nPenWidth ) { if( mnPenWidth != nPenWidth ) { OptionsChanged(); mnPenWidth = nPenWidth; } } - void SetStartWithTemplate( bool bOn = true ) { if( bStartWithTemplate != bOn ) { OptionsChanged(); bStartWithTemplate = bOn; } } - void SetMarkedHitMovesAlways( bool bOn = true ) { if( bMarkedHitMovesAlways != bOn ) { OptionsChanged(); bMarkedHitMovesAlways = bOn; } } - void SetMoveOnlyDragging( bool bOn = true ) { if( bMoveOnlyDragging != bOn ) { OptionsChanged(); bMoveOnlyDragging = bOn; } } - void SetCrookNoContortion( bool bOn = true ) { if( bCrookNoContortion != bOn ) { OptionsChanged(); bCrookNoContortion = bOn; } } - void SetQuickEdit( bool bOn = true ) { if( bQuickEdit != bOn ) { OptionsChanged(); bQuickEdit = bOn; } } - void SetMasterPagePaintCaching( bool bOn = true ) { if( bMasterPageCache != bOn ) { OptionsChanged(); bMasterPageCache = bOn; } } - void SetDragWithCopy( bool bOn = true ) { if( bDragWithCopy != bOn ) { OptionsChanged(); bDragWithCopy = bOn; } } - void SetPickThrough( bool bOn = true ) { if( bPickThrough != bOn ) { OptionsChanged(); bPickThrough = bOn; } } - void SetDoubleClickTextEdit( bool bOn = true ) { if( bDoubleClickTextEdit != bOn ) { OptionsChanged(); bDoubleClickTextEdit = bOn; } } - void SetClickChangeRotation( bool bOn = true ) { if( bClickChangeRotation != bOn ) { OptionsChanged(); bClickChangeRotation = bOn; } } - void SetEnableSdremote( bool bOn = true ) { if( bEnableSdremote != bOn ) { OptionsChanged(); bEnableSdremote = bOn; } } - void SetEnablePresenterScreen( bool bOn = true ) { if( bEnablePresenterScreen != bOn ) { OptionsChanged(); bEnablePresenterScreen = bOn; } } - void SetSummationOfParagraphs( bool bOn = true ){ if ( bOn != bSummationOfParagraphs ) { OptionsChanged(); bSummationOfParagraphs = bOn; } } - void SetTabBarVisible( bool bOn = true ){ if ( bOn != bTabBarVisible ) { OptionsChanged(); bTabBarVisible = bOn; } } + void SetStartWithTemplate( bool bOn ) { if( bStartWithTemplate != bOn ) { OptionsChanged(); bStartWithTemplate = bOn; } } + void SetMarkedHitMovesAlways( bool bOn ) { if( bMarkedHitMovesAlways != bOn ) { OptionsChanged(); bMarkedHitMovesAlways = bOn; } } + void SetMoveOnlyDragging( bool bOn ) { if( bMoveOnlyDragging != bOn ) { OptionsChanged(); bMoveOnlyDragging = bOn; } } + void SetCrookNoContortion( bool bOn ) { if( bCrookNoContortion != bOn ) { OptionsChanged(); bCrookNoContortion = bOn; } } + void SetQuickEdit( bool bOn ) { if( bQuickEdit != bOn ) { OptionsChanged(); bQuickEdit = bOn; } } + void SetMasterPagePaintCaching( bool bOn ) { if( bMasterPageCache != bOn ) { OptionsChanged(); bMasterPageCache = bOn; } } + void SetDragWithCopy( bool bOn ) { if( bDragWithCopy != bOn ) { OptionsChanged(); bDragWithCopy = bOn; } } + void SetPickThrough( bool bOn ) { if( bPickThrough != bOn ) { OptionsChanged(); bPickThrough = bOn; } } + void SetDoubleClickTextEdit( bool bOn ) { if( bDoubleClickTextEdit != bOn ) { OptionsChanged(); bDoubleClickTextEdit = bOn; } } + void SetClickChangeRotation( bool bOn ) { if( bClickChangeRotation != bOn ) { OptionsChanged(); bClickChangeRotation = bOn; } } + void SetEnableSdremote( bool bOn ) { if( bEnableSdremote != bOn ) { OptionsChanged(); bEnableSdremote = bOn; } } + void SetEnablePresenterScreen( bool bOn ) { if( bEnablePresenterScreen != bOn ) { OptionsChanged(); bEnablePresenterScreen = bOn; } } + void SetSummationOfParagraphs( bool bOn ){ if ( bOn != bSummationOfParagraphs ) { OptionsChanged(); bSummationOfParagraphs = bOn; } } + void SetTabBarVisible( bool bOn ){ if ( bOn != bTabBarVisible ) { OptionsChanged(); bTabBarVisible = bOn; } } /** Set the printer independent layout mode. @param nOn The default value is to switch printer independent layout on, @@ -305,9 +305,9 @@ public: values are reserved for future use. */ void SetPrinterIndependentLayout (sal_uInt16 nOn = 1 ){ if ( nOn != mnPrinterIndependentLayout ) { OptionsChanged(); mnPrinterIndependentLayout = nOn; } } - void SetSolidDragging( bool bOn = true ) { if( bSolidDragging != bOn ) { OptionsChanged(); bSolidDragging = bOn; } } - void SetShowUndoDeleteWarning( bool bOn = true ) { if( bShowUndoDeleteWarning != bOn ) { OptionsChanged(); bShowUndoDeleteWarning = bOn; } } - void SetSlideshowRespectZOrder( bool bOn = true ) { if( bSlideshowRespectZOrder != bOn ) { OptionsChanged(); bSlideshowRespectZOrder = bOn; } } + void SetSolidDragging( bool bOn ) { if( bSolidDragging != bOn ) { OptionsChanged(); bSolidDragging = bOn; } } + void SetShowUndoDeleteWarning( bool bOn ) { if( bShowUndoDeleteWarning != bOn ) { OptionsChanged(); bShowUndoDeleteWarning = bOn; } } + void SetSlideshowRespectZOrder( bool bOn ) { if( bSlideshowRespectZOrder != bOn ) { OptionsChanged(); bSlideshowRespectZOrder = bOn; } } void SetDefaultObjectSizeWidth( sal_uLong nWidth ) { if( nDefaultObjectSizeWidth != nWidth ) { OptionsChanged(); nDefaultObjectSizeWidth = nWidth; } } void SetDefaultObjectSizeHeight( sal_uLong nHeight ) { if( nDefaultObjectSizeHeight != nHeight ) { OptionsChanged(); nDefaultObjectSizeHeight = nHeight; } } @@ -535,24 +535,24 @@ public: bool IsHandoutHorizontal() const { Init(); return mbHandoutHorizontal; } sal_uInt16 GetHandoutPages() const { Init(); return mnHandoutPages; } - void SetDraw( bool bOn = true ) { if( bDraw != bOn ) { OptionsChanged(); bDraw = bOn; } } - void SetNotes( bool bOn = true ) { if( bNotes != bOn ) { OptionsChanged(); bNotes = bOn; } } - void SetHandout( bool bOn = true ) { if( bHandout != bOn ) { OptionsChanged(); bHandout = bOn; } } - void SetOutline( bool bOn = true ) { if( bOutline != bOn ) { OptionsChanged(); bOutline = bOn; } } - void SetDate( bool bOn = true ) { if( bDate != bOn ) { OptionsChanged(); bDate = bOn; } } - void SetTime( bool bOn = true ) { if( bTime != bOn ) { OptionsChanged(); bTime = bOn; } } - void SetPagename( bool bOn = true ) { if( bPagename != bOn ) { OptionsChanged(); bPagename = bOn; } } - void SetHiddenPages( bool bOn = true ) { if( bHiddenPages != bOn ) { OptionsChanged(); bHiddenPages = bOn; } } - void SetPagesize( bool bOn = true ) { if( bPagesize != bOn ) { OptionsChanged(); bPagesize = bOn; } } - void SetPagetile( bool bOn = true ) { if( bPagetile != bOn ) { OptionsChanged(); bPagetile = bOn; } } - void SetWarningPrinter( bool bOn = true ) { if( bWarningPrinter != bOn ) { OptionsChanged(); bWarningPrinter = bOn; } } - void SetWarningSize( bool bOn = true ) { if( bWarningSize != bOn ) { OptionsChanged(); bWarningSize = bOn; } } - void SetWarningOrientation( bool bOn = true ) { if( bWarningOrientation != bOn ) { OptionsChanged(); bWarningOrientation = bOn; } } - void SetBooklet( bool bOn = true ) { if( bBooklet != bOn ) { OptionsChanged(); bBooklet = bOn; } } - void SetFrontPage( bool bOn = true ) { if( bFront != bOn ) { OptionsChanged(); bFront = bOn; } } - void SetBackPage( bool bOn = true ) { if( bBack != bOn ) { OptionsChanged(); bBack = bOn; } } - void SetCutPage( bool bOn = true ) { if( bCutPage != bOn ) { OptionsChanged(); bCutPage = bOn; } } - void SetPaperbin( bool bOn = true ) { if( bPaperbin != bOn ) { OptionsChanged(); bPaperbin = bOn; } } + void SetDraw( bool bOn ) { if( bDraw != bOn ) { OptionsChanged(); bDraw = bOn; } } + void SetNotes( bool bOn ) { if( bNotes != bOn ) { OptionsChanged(); bNotes = bOn; } } + void SetHandout( bool bOn ) { if( bHandout != bOn ) { OptionsChanged(); bHandout = bOn; } } + void SetOutline( bool bOn ) { if( bOutline != bOn ) { OptionsChanged(); bOutline = bOn; } } + void SetDate( bool bOn ) { if( bDate != bOn ) { OptionsChanged(); bDate = bOn; } } + void SetTime( bool bOn ) { if( bTime != bOn ) { OptionsChanged(); bTime = bOn; } } + void SetPagename( bool bOn ) { if( bPagename != bOn ) { OptionsChanged(); bPagename = bOn; } } + void SetHiddenPages( bool bOn ) { if( bHiddenPages != bOn ) { OptionsChanged(); bHiddenPages = bOn; } } + void SetPagesize( bool bOn ) { if( bPagesize != bOn ) { OptionsChanged(); bPagesize = bOn; } } + void SetPagetile( bool bOn ) { if( bPagetile != bOn ) { OptionsChanged(); bPagetile = bOn; } } + void SetWarningPrinter( bool bOn ) { if( bWarningPrinter != bOn ) { OptionsChanged(); bWarningPrinter = bOn; } } + void SetWarningSize( bool bOn ) { if( bWarningSize != bOn ) { OptionsChanged(); bWarningSize = bOn; } } + void SetWarningOrientation( bool bOn) { if( bWarningOrientation != bOn ) { OptionsChanged(); bWarningOrientation = bOn; } } + void SetBooklet( bool bOn ) { if( bBooklet != bOn ) { OptionsChanged(); bBooklet = bOn; } } + void SetFrontPage( bool bOn ) { if( bFront != bOn ) { OptionsChanged(); bFront = bOn; } } + void SetBackPage( bool bOn ) { if( bBack != bOn ) { OptionsChanged(); bBack = bOn; } } + void SetCutPage( bool bOn ) { if( bCutPage != bOn ) { OptionsChanged(); bCutPage = bOn; } } + void SetPaperbin( bool bOn ) { if( bPaperbin != bOn ) { OptionsChanged(); bPaperbin = bOn; } } void SetOutputQuality( sal_uInt16 nInQuality ) { if( nQuality != nInQuality ) { OptionsChanged(); nQuality = nInQuality; } } void SetHandoutHorizontal( bool bHandoutHorizontal ) { if( mbHandoutHorizontal != bHandoutHorizontal ) { OptionsChanged(); mbHandoutHorizontal = bHandoutHorizontal; } } void SetHandoutPages( sal_uInt16 nHandoutPages ) { if( nHandoutPages != mnHandoutPages ) { OptionsChanged(); mnHandoutPages = nHandoutPages; } } diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index 2976b65ae1d7..7d96dee14162 100644 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -199,7 +199,7 @@ public: void Fill( const SdDrawDocument*, SfxMedium* pSfxMedium, const OUString& rDocName ); void SetShowAllShapes (const bool bShowAllShapes, const bool bFill); bool GetShowAllShapes() const { return mbShowAllShapes;} - bool IsEqualToDoc( const SdDrawDocument* pInDoc = nullptr ); + bool IsEqualToDoc( const SdDrawDocument* pInDoc ); bool HasSelectedChildren( const OUString& rName ); bool SelectEntry( const OUString& rName ); OUString GetSelectEntry(); diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx index 93f3ede65166..e38d87b48cc7 100644 --- a/sd/source/ui/inc/slideshow.hxx +++ b/sd/source/ui/inc/slideshow.hxx @@ -111,7 +111,7 @@ public: bool startPreview( const css::uno::Reference< css::drawing::XDrawPage >& xDrawPage, const css::uno::Reference< css::animations::XAnimationNode >& xAnimationNode, - vcl::Window* pParent = nullptr ); + vcl::Window* pParent ); // uno api diff --git a/sd/source/ui/inc/smarttag.hxx b/sd/source/ui/inc/smarttag.hxx index 270ce7f025d7..0e6b135c3436 100644 --- a/sd/source/ui/inc/smarttag.hxx +++ b/sd/source/ui/inc/smarttag.hxx @@ -70,7 +70,7 @@ public: protected: virtual sal_uLong GetMarkablePointCount() const; virtual sal_uLong GetMarkedPointCount() const; - virtual bool MarkPoint(SdrHdl& rHdl, bool bUnmark=false); + virtual bool MarkPoint(SdrHdl& rHdl, bool bUnmark); virtual void CheckPossibilities(); virtual bool MarkPoints(const Rectangle* pRect, bool bUnmark); @@ -136,7 +136,7 @@ public: bool HasMarkedPoints() const; sal_uLong GetMarkedPointCount() const; static bool IsPointMarkable(const SdrHdl& rHdl); - bool MarkPoint(SdrHdl& rHdl, bool bUnmark=false); + bool MarkPoint(SdrHdl& rHdl, bool bUnmark); bool MarkPoints(const Rectangle* pRect, bool bUnmark); void CheckPossibilities(); diff --git a/sd/source/ui/inc/tools/IdleDetection.hxx b/sd/source/ui/inc/tools/IdleDetection.hxx index 49bc318da711..b6dbb182dd40 100644 --- a/sd/source/ui/inc/tools/IdleDetection.hxx +++ b/sd/source/ui/inc/tools/IdleDetection.hxx @@ -64,7 +64,7 @@ public: IdleStates values or-ed together that describe what the system is currently doing so that the caller can decide what to do. */ - static sal_Int32 GetIdleState (const vcl::Window* pWindow = nullptr); + static sal_Int32 GetIdleState (const vcl::Window* pWindow); private: /** Check whether there are input events pending. diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx index 158b177c21a0..68d0dd758d6c 100644 --- a/sd/source/ui/inc/unomodel.hxx +++ b/sd/source/ui/inc/unomodel.hxx @@ -97,7 +97,7 @@ private: css::uno::Reference<css::uno::XInterface> create( OUString const & aServiceSpecifier, OUString const & referer); - SdPage* InsertSdPage( sal_uInt16 nPage, bool bDuplicate = false ) + SdPage* InsertSdPage( sal_uInt16 nPage, bool bDuplicate ) throw (css::uno::RuntimeException, std::exception); const bool mbImpressDoc; diff --git a/sd/source/ui/presenter/SlideRenderer.cxx b/sd/source/ui/presenter/SlideRenderer.cxx index a81087ecef66..b0a6f088efea 100644 --- a/sd/source/ui/presenter/SlideRenderer.cxx +++ b/sd/source/ui/presenter/SlideRenderer.cxx @@ -184,7 +184,7 @@ BitmapEx SlideRenderer::CreatePreview ( const Image aPreview = maPreviewRenderer.RenderPage ( pPage, Size(aPreviewSize.Width*nFactor, aPreviewSize.Height*nFactor), - OUString()); + OUString(), true); if (nFactor == 1) return aPreview.GetBitmapEx(); else diff --git a/sd/source/ui/sidebar/MasterPageContainer.hxx b/sd/source/ui/sidebar/MasterPageContainer.hxx index 5e23c6a1065e..be616cfbe190 100644 --- a/sd/source/ui/sidebar/MasterPageContainer.hxx +++ b/sd/source/ui/sidebar/MasterPageContainer.hxx @@ -134,7 +134,7 @@ public: OUString GetURLForToken (Token aToken); OUString GetPageNameForToken (Token aToken); OUString GetStyleNameForToken (Token aToken); - SdPage* GetPageObjectForToken (Token aToken, bool bLoad=true); + SdPage* GetPageObjectForToken (Token aToken, bool bLoad); Origin GetOriginForToken (Token aToken); sal_Int32 GetTemplateIndexForToken (Token aToken); std::shared_ptr<MasterPageDescriptor> GetDescriptorForToken (Token aToken); diff --git a/sd/source/ui/sidebar/MasterPageContainerQueue.cxx b/sd/source/ui/sidebar/MasterPageContainerQueue.cxx index 76a121b8a917..924a0e64a0ea 100644 --- a/sd/source/ui/sidebar/MasterPageContainerQueue.cxx +++ b/sd/source/ui/sidebar/MasterPageContainerQueue.cxx @@ -187,7 +187,7 @@ IMPL_LINK_TYPED(MasterPageContainerQueue, DelayedPreviewCreation, Timer*, pTimer break; // First check whether the system is idle. - sal_Int32 nIdleState (tools::IdleDetection::GetIdleState()); + sal_Int32 nIdleState (tools::IdleDetection::GetIdleState(nullptr)); if (nIdleState != tools::IdleDetection::IDET_IDLE) { if ((nIdleState&tools::IdleDetection::IDET_FULL_SCREEN_SHOW_ACTIVE) != 0) diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx index db4a468d0bf1..2c3c2d3b1bca 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx @@ -342,7 +342,7 @@ SdPage* MasterPagesSelector::GetSelectedMasterPage() UserData* pData = GetUserData(nIndex); if (pData != nullptr) { - pMasterPage = mpContainer->GetPageObjectForToken(pData->second); + pMasterPage = mpContainer->GetPageObjectForToken(pData->second, true); } return pMasterPage; } diff --git a/sd/source/ui/slideshow/showwindow.hxx b/sd/source/ui/slideshow/showwindow.hxx index 9e0aa32708c8..0c70d3896291 100644 --- a/sd/source/ui/slideshow/showwindow.hxx +++ b/sd/source/ui/slideshow/showwindow.hxx @@ -54,7 +54,7 @@ public: virtual void dispose() override; void SetEndMode(); - bool SetPauseMode( sal_Int32 nTimeoutSec = SLIDE_NO_TIMEOUT, Graphic* pLogo = nullptr ); + bool SetPauseMode( sal_Int32 nTimeoutSec, Graphic* pLogo = nullptr ); bool SetBlankMode( sal_Int32 nPageIndexToRestart, const Color& rBlankColor ); const Color& GetBlankColor() const { return maShowBackground.GetColor(); } diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index ca4c4167a95c..b339a45c412e 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -185,7 +185,7 @@ bool SlideShow::StartPreview( ViewShellBase& rBase, { rtl::Reference< SlideShow > xSlideShow( GetSlideShow( rBase ) ); if( xSlideShow.is() ) - return xSlideShow->startPreview( xDrawPage, xAnimationNode ); + return xSlideShow->startPreview( xDrawPage, xAnimationNode, nullptr ); return false; } diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index cbb8fd9457b1..73a42555932a 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -675,7 +675,7 @@ void SAL_CALL SlideshowImpl::disposing() } else if( meAnimationMode == ANIMATIONMODE_PREVIEW ) { - mpViewShell->ShowUIControls(); + mpViewShell->ShowUIControls(true); } } diff --git a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx index f440450fc178..07cf9df682e5 100644 --- a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx +++ b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx @@ -100,7 +100,7 @@ public: */ void RequestPreviewBitmap ( const CacheKey aKey, - const bool bMayBeUpToDate = true); + const bool bMayBeUpToDate); /** Tell the cache to replace the bitmap associated with the given request data with a new one that reflects recent changes in the diff --git a/sd/source/ui/slidesorter/cache/SlsPageCache.cxx b/sd/source/ui/slidesorter/cache/SlsPageCache.cxx index 1efb875f2d4c..845bac41d5b7 100644 --- a/sd/source/ui/slidesorter/cache/SlsPageCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsPageCache.cxx @@ -74,7 +74,7 @@ void PageCache::SetMarkedPreviewBitmap ( void PageCache::RequestPreviewBitmap (const CacheKey aKey) { - return mpImplementation->RequestPreviewBitmap(aKey); + return mpImplementation->RequestPreviewBitmap(aKey, true); } void PageCache::InvalidatePreviewBitmap ( diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx index 906e2e84beb9..c5c15808656a 100644 --- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx +++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx @@ -70,7 +70,7 @@ public: shorter then that for a low priority request (denoted by a value of 1.) When the timer is already running it is not modified. */ - void Start (int nPriorityClass = 0); + void Start (int nPriorityClass); void Stop(); void Pause(); void Resume(); diff --git a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx index 3fa783ea896d..010691a107b4 100644 --- a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx +++ b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx @@ -58,10 +58,10 @@ public: void UpdatePosition ( const Point& rMousePosition, const InsertionIndicatorHandler::Mode eMode, - const bool bAllowAutoScroll = true); + const bool bAllowAutoScroll); void SetTargetSlideSorter ( - const Point& rMousePosition = Point(0,0), + const Point& rMousePosition, const InsertionIndicatorHandler::Mode eMode = InsertionIndicatorHandler::UnknownMode); private: diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx index 6ef12537eaa9..beca391f0823 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx @@ -1517,7 +1517,7 @@ DragAndDropModeHandler::~DragAndDropModeHandler() if (mpDragAndDropContext) { // Disconnect the substitution handler from this selection function. - mpDragAndDropContext->SetTargetSlideSorter(); + mpDragAndDropContext->SetTargetSlideSorter(Point(0,0)); mpDragAndDropContext.reset(); } mrSlideSorter.GetController().GetInsertionIndicatorHandler()->End(Animator::AM_Animated); @@ -1563,7 +1563,7 @@ bool DragAndDropModeHandler::ProcessDragEvent (SelectionFunction::EventDescripto { mpDragAndDropContext->UpdatePosition( rDescriptor.maMousePosition, - rDescriptor.meDragMode); + rDescriptor.meDragMode, true); } return true; diff --git a/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx b/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx index 644a4371eb1f..9b301945faf7 100644 --- a/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx @@ -135,7 +135,7 @@ void VisibleAreaManager::MakeVisible() { mnScrollAnimationId = mrSlideSorter.GetController().GetAnimator()->AddAnimation( aAnimation, - 300); + 300, Animator::FinishFunctor()); } else { diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx index af1145d0752c..766058f923c8 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx @@ -94,7 +94,7 @@ public: size does not change (the size does change when the visibility of scroll bars changes.) */ - void Rearrange (bool bForce = false); + void Rearrange (bool bForce); /** Return the descriptor of the page that is rendered under the given position. This takes the IsOnlyPreviewTriggersMouseOver diff --git a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx index 5296db12a3d2..4ce9ec5e05e5 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx @@ -75,7 +75,7 @@ public: AnimationId AddAnimation ( const AnimationFunctor& rAnimation, const sal_Int32 nDuration, - const FinishFunctor& rFinishFunctor = FinishFunctor()); + const FinishFunctor& rFinishFunctor); /** Abort and remove an animation. In order to reduce the bookkeeping on the caller side, it is OK to call this method with an animation diff --git a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx index de6902d83489..689ff3ec55b2 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx @@ -89,14 +89,14 @@ public: sal_Int8 AcceptDrop ( const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow = nullptr, + ::sd::Window* pTargetWindow, sal_uInt16 nPage = SDRPAGE_NOTFOUND, sal_uInt16 nLayer = SDRPAGE_NOTFOUND ); sal_Int8 ExecuteDrop ( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow = nullptr, + ::sd::Window* pTargetWindow, sal_uInt16 nPage = SDRPAGE_NOTFOUND, sal_uInt16 nLayer = SDRPAGE_NOTFOUND); diff --git a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx index ab19184582fa..8e04f8ac7f4f 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx @@ -144,7 +144,7 @@ public: */ void SetPageSelection ( const std::shared_ptr<PageSelection>& rSelection, - const bool bUpdateCurrentPage = true); + const bool bUpdateCurrentPage); /** Call this method after the model has changed to set the number of selected pages. diff --git a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx index a486ee869192..8b40acd9bf4f 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx @@ -84,7 +84,7 @@ public: set and the whole window is repainted. */ void UpdateScrollBars ( - bool bScrollToCurrentPosition = true); + bool bScrollToCurrentPosition); /** Place the scroll bars inside the given area. When the available area is not large enough for the content to display the horizontal diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx index 88073c89fc31..3b1d0df7c530 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx @@ -111,7 +111,7 @@ public: VisualState& GetVisualState() { return maVisualState;} Rectangle GetBoundingBox() const; - Point GetLocation (const bool bIgnoreLocation = false) const; + Point GetLocation (const bool bIgnoreLocation) const; void SetBoundingBox (const Rectangle& rBoundingBox); private: diff --git a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx index dffc74d6e13d..8860817fc101 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx @@ -118,7 +118,7 @@ public: */ Rectangle GetPageObjectBox ( const sal_Int32 nIndex, - const bool bIncludeBorderAndGap = false) const; + const bool bIncludeBorderAndGap) const; /** Return the bounding box in model coordinates of the page that contains the given amount of page objects. @@ -155,7 +155,7 @@ public: */ sal_Int32 GetIndexAtPoint ( const Point& rModelPosition, - const bool bIncludePageBorders = false, + const bool bIncludePageBorders, const bool bClampToValidRange = true) const; /** Return an object that describes the logical and visual properties of diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx index 25f0810c5281..fa0291f88f15 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx @@ -625,7 +625,7 @@ void SlideSorterViewShell::UpdateScrollBars() { // Do not call the overwritten method of the base class: We do all the // scroll bar setup by ourselves. - mpSlideSorter->GetController().GetScrollBarManager().UpdateScrollBars (); + mpSlideSorter->GetController().GetScrollBarManager().UpdateScrollBars(true); } void SlideSorterViewShell::StartDrag ( @@ -681,7 +681,7 @@ void SlideSorterViewShell::SetPageSelection ( const std::shared_ptr<PageSelection>& rSelection) { OSL_ASSERT(mpSlideSorter.get()!=nullptr); - mpSlideSorter->GetController().GetPageSelector().SetPageSelection(rSelection); + mpSlideSorter->GetController().GetPageSelector().SetPageSelection(rSelection, true); } void SlideSorterViewShell::AddSelectionChangeListener ( diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index c5b75a26ea4d..e58e3955284e 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -429,7 +429,7 @@ void SlideSorterView::Layout () while (aPageEnumeration.HasMoreElements()) { model::SharedPageDescriptor pDescriptor (aPageEnumeration.GetNextElement()); - pDescriptor->SetBoundingBox(mpLayouter->GetPageObjectBox(pDescriptor->GetPageIndex())); + pDescriptor->SetBoundingBox(mpLayouter->GetPageObjectBox(pDescriptor->GetPageIndex(), false)); } } diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx b/sd/source/ui/slidesorter/view/SlsLayouter.cxx index 472de645b33c..cc8380e690f4 100644 --- a/sd/source/ui/slidesorter/view/SlsLayouter.cxx +++ b/sd/source/ui/slidesorter/view/SlsLayouter.cxx @@ -103,7 +103,7 @@ public: sal_Int32 GetRowAtPosition ( sal_Int32 nYPosition, bool bIncludeBordersAndGaps, - GapMembership eGapMembership = GM_NONE) const; + GapMembership eGapMembership) const; /** Calculate the column that the point with the given horizontal coordinate is over. The vertical component is ignored. @@ -118,7 +118,7 @@ public: sal_Int32 GetColumnAtPosition ( sal_Int32 nXPosition, bool bIncludeBordersAndGaps, - GapMembership eGapMembership = GM_NONE) const; + GapMembership eGapMembership) const; /** This method is typically called from GetRowAtPosition() and GetColumnAtPosition() to handle a position that lies inside the gap diff --git a/sd/source/ui/uitest/uiobject.cxx b/sd/source/ui/uitest/uiobject.cxx index 03b1538f45fb..c4be758f082e 100644 --- a/sd/source/ui/uitest/uiobject.cxx +++ b/sd/source/ui/uitest/uiobject.cxx @@ -23,7 +23,7 @@ StringMap ImpressWindowUIObject::get_state() { StringMap aMap = WindowUIObject::get_state(); - aMap["SelectedText"] = getViewShell()->GetSelectionText(); + aMap["SelectedText"] = getViewShell()->GetSelectionText(false); aMap["CurrentSlide"] = OUString::number(getViewShell()->GetCurPageId()); return aMap; diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 851f38c11a15..da17846c4a03 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -632,7 +632,7 @@ uno::Reference < container::XIndexAccess > SAL_CALL SdXImpressDocument::getViewD ::sd::FrameView* pFrameView = rList[ i ]; uno::Sequence< beans::PropertyValue > aSeq; - pFrameView->WriteUserDataSequence( aSeq ); + pFrameView->WriteUserDataSequence( aSeq, false ); xCont->insertByIndex( i, uno::makeAny( aSeq ) ); } } @@ -670,7 +670,7 @@ void SAL_CALL SdXImpressDocument::setViewData( const uno::Reference < container: { pFrameView = new ::sd::FrameView( mpDoc ); - pFrameView->ReadUserDataSequence( aSeq ); + pFrameView->ReadUserDataSequence( aSeq, false ); rViews.push_back( pFrameView ); } } @@ -2879,7 +2879,7 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdDrawPagesAccess::insertNewByInde if( mpModel->mpDoc ) { - SdPage* pPage = mpModel->InsertSdPage( (sal_uInt16)nIndex ); + SdPage* pPage = mpModel->InsertSdPage( (sal_uInt16)nIndex, false ); if( pPage ) { uno::Reference< drawing::XDrawPage > xDrawPage( pPage->getUnoPage(), uno::UNO_QUERY ); diff --git a/sd/source/ui/view/FormShellManager.cxx b/sd/source/ui/view/FormShellManager.cxx index dd5a0d69caa7..d978012620e1 100644 --- a/sd/source/ui/view/FormShellManager.cxx +++ b/sd/source/ui/view/FormShellManager.cxx @@ -37,7 +37,7 @@ class FormShellManagerFactory { public: FormShellManagerFactory (ViewShell& rViewShell, FormShellManager& rManager); - virtual FmFormShell* CreateShell (ShellId nId, vcl::Window* pParentWindow, FrameView* pFrameView = nullptr) override; + virtual FmFormShell* CreateShell (ShellId nId, vcl::Window* pParentWindow, FrameView* pFrameView) override; virtual void ReleaseShell (SfxShell* pShell) override; private: diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index ad226729b151..61e06e147a95 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -1595,7 +1595,7 @@ void Outliner::PrepareConversion() mbStringFound = true; mbMatchMayExist = true; - EnterEditMode (); + EnterEditMode(true); mpDrawDocument->GetDocSh()->SetWaitCursor( false ); // Start search at the right end of the current object's text diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index f22a8a4a7486..eb2a8adfce3c 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -694,7 +694,7 @@ void ViewShellBase::WriteUserDataSequence ( // Forward call to main sub shell. ViewShell* pShell = GetMainViewShell().get(); if (pShell != nullptr) - pShell->WriteUserDataSequence (rSequence); + pShell->WriteUserDataSequence (rSequence, false); } void ViewShellBase::ReadUserDataSequence ( diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index d4fc5b7e262e..91931c1db4ff 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -1420,7 +1420,7 @@ void OutlineView::onUpdateStyleSettings( bool bForceUpdate /* = false */ ) IMPL_LINK_NOARG_TYPED(OutlineView, AppEventListenerHdl, VclSimpleEvent&, void) { - onUpdateStyleSettings(); + onUpdateStyleSettings(false); } IMPL_LINK_TYPED(OutlineView, EventMultiplexerListener, ::sd::tools::EventMultiplexerEvent&, rEvent, void) diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index 2f6c5c9016aa..5a7f98a9c769 100644 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -112,7 +112,7 @@ public: /** returns true if the SmartTag consumes this event. */ virtual bool KeyInput( const KeyEvent& rKEvt ) override; - BitmapEx createOverlayImage( int nHighlight = -1 ); + BitmapEx createOverlayImage( int nHighlight ); protected: virtual void addCustomHandles( SdrHdlList& rHandlerList ) override; diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 7ca5c6a451fc..32eb612f3aef 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -105,7 +105,7 @@ public: virtual SfxShell* CreateShell ( ::sd::ShellId nId, vcl::Window* pParentWindow, - ::sd::FrameView* pFrameView = nullptr) override; + ::sd::FrameView* pFrameView) override; virtual void ReleaseShell (SfxShell* pShell) override; private: ::sd::ViewShell& mrViewShell; |