diff options
88 files changed, 215 insertions, 288 deletions
diff --git a/sw/inc/IDocumentFieldsAccess.hxx b/sw/inc/IDocumentFieldsAccess.hxx index d573e767fe11..4eb6b1088573 100644 --- a/sw/inc/IDocumentFieldsAccess.hxx +++ b/sw/inc/IDocumentFieldsAccess.hxx @@ -56,7 +56,7 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; } } virtual void RemoveFieldType(size_t nField) = 0; - virtual void UpdateFields( SfxPoolItem* pNewHt, bool bCloseDB) = 0; + virtual void UpdateFields(bool bCloseDB) = 0; virtual void InsDeletedFieldType(SwFieldType &) = 0; @@ -112,7 +112,7 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; } } */ virtual bool SetFieldsDirty(bool b, const SwNode* pChk, sal_uLong nLen) = 0; - virtual void SetFixFields(bool bOnlyTimeDate, const DateTime* pNewDateTime) = 0; + virtual void SetFixFields(const DateTime* pNewDateTime) = 0; // In Calculator set all SetExpression fields that are valid up to the indicated position // (Node [ + css::ucb::Content]). diff --git a/sw/inc/IDocumentLinksAdministration.hxx b/sw/inc/IDocumentLinksAdministration.hxx index db7aebed2bf8..0c9edea72da3 100644 --- a/sw/inc/IDocumentLinksAdministration.hxx +++ b/sw/inc/IDocumentLinksAdministration.hxx @@ -46,7 +46,7 @@ using rtl::OUString; /** #i42634# Moved common code of SwReader::Read() and SwDocShell::UpdateLinks() to new SwDoc::UpdateLinks(): */ - virtual void UpdateLinks(bool bUI) = 0; + virtual void UpdateLinks() = 0; /** SS fuers Linken von Dokumentteilen / ?? for linking of parts of documents. */ diff --git a/sw/inc/anchoredobject.hxx b/sw/inc/anchoredobject.hxx index 8b72e4c77fe1..e1907b3279a3 100644 --- a/sw/inc/anchoredobject.hxx +++ b/sw/inc/anchoredobject.hxx @@ -200,7 +200,7 @@ class SW_DLLPUBLIC SwAnchoredObject @author OD */ - void SetTmpConsiderWrapInfluenceOfOtherObjs( const bool bTmpConsiderWrapInfluence ); + void SetTmpConsiderWrapInfluenceOfOtherObjs(); virtual bool _SetObjTop( const SwTwips _nTop) = 0; virtual bool _SetObjLeft( const SwTwips _nLeft) = 0; @@ -339,7 +339,7 @@ class SW_DLLPUBLIC SwAnchoredObject @author OD */ - void InvalidateObjPosForConsiderWrapInfluence( const bool _bNotifyBackgrd ); + void InvalidateObjPosForConsiderWrapInfluence(); /** method to trigger notification of 'background' diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index 79d0e236871e..a12d746ada61 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -322,7 +322,7 @@ public: // only for usage in special cases allowed! void ExtendedSelectAll(bool bFootnotes = true); /// If ExtendedSelectAll() was called and selection didn't change since then. - bool ExtendedSelectedAll(bool bFootnotes = true); + bool ExtendedSelectedAll(); /// If document body starts with a table. bool StartsWithTable(); @@ -735,7 +735,7 @@ public: bool IsEndOfDoc() const; bool IsInFrontOfLabel() const; bool IsAtLeftMargin() const { return IsAtLRMargin( true ); } - bool IsAtRightMargin(bool bAPI = false) const { return IsAtLRMargin( false, bAPI ); } + bool IsAtRightMargin() const { return IsAtLRMargin( false, true/*bAPI*/ ); } // delete all created cursors, set the table cursor and the last cursor to // its TextNode (or StartNode?) diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 2eddfa94f91a..5905a7b8f0a9 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -1338,7 +1338,7 @@ public: static SwSection* GetCurrSection( const SwPosition& rPos ); SwSectionFormats& GetSections() { return *mpSectionFormatTable; } const SwSectionFormats& GetSections() const { return *mpSectionFormatTable; } - SwSectionFormat *MakeSectionFormat( SwSectionFormat *pDerivedFrom ); + SwSectionFormat *MakeSectionFormat(); void DelSectionFormat( SwSectionFormat *pFormat, bool bDelNodes = false ); void UpdateSection(size_t const nSect, SwSectionData &, SfxItemSet const*const = nullptr, bool const bPreventLinkUpdate = false); diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index 6f4088aa82e6..8fd8fa06fd3e 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -196,7 +196,7 @@ public: void SetNumberingRestart(); /// Embeds all local links (ranges/graphics). - sal_uInt16 GetLinkUpdMode(bool bDocSettings = false) const; + sal_uInt16 GetLinkUpdMode() const; void SetLinkUpdMode( sal_uInt16 nMode ); /// Copy content of all ranges at current position of cursor to given Shell. @@ -394,7 +394,7 @@ public: void UnlockExpFields(); bool IsExpFieldsLocked() const; - SwFieldUpdateFlags GetFieldUpdateFlags(bool bDocSettings = false) const; + SwFieldUpdateFlags GetFieldUpdateFlags() const; void SetFieldUpdateFlags( SwFieldUpdateFlags eFlags ); /// For evaluation of DB fields (new DB-manager). @@ -538,8 +538,7 @@ public: /** Searches for a text node with a numbering rule. in case a list style is found, <sListId> holds the list id, to which the text node belongs, which applies the found list style. */ - const SwNumRule * SearchNumRule(const bool bForward, - const bool bNum, + const SwNumRule * SearchNumRule(const bool bNum, const bool bOutline, int nNonEmptyAllowed, OUString& sListId ); @@ -602,7 +601,7 @@ public: const Graphic* GetGraphic( bool bWait = true ) const; const GraphicObject* GetGraphicObj() const; - bool IsGrfSwapOut( bool bOnlyLinked = false ) const; + bool IsLinkedGrfSwapOut() const; sal_uInt16 GetGraphicType() const; const tools::PolyPolygon *GetGraphicPolygon() const; @@ -801,7 +800,7 @@ public: bool IsOutlineMovable( sal_uInt16 nIdx ) const; bool IsOutlineCopyable( sal_uInt16 nIdx ) const; - sal_uInt16 GetLineCount( bool bActPos = true ); + sal_uInt16 GetLineCount(); /// Query and set footnote-text/number. Set.. to current SSelection! bool GetCurFootnote( SwFormatFootnote* pToFillFootnote = nullptr ); @@ -926,7 +925,7 @@ public: /// Interface for TextInputData - (for input of Japanese/Chinese chars.) void CreateExtTextInput(LanguageType eInputLanguage); - OUString DeleteExtTextInput( SwExtTextInput* pDel = nullptr, bool bInsText = true); + OUString DeleteExtTextInput( bool bInsText = true); void SetExtTextInputData( const CommandExtTextInputData& ); /// Interface for access to AutoComplete-list. diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index d67c16502781..888916417151 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -592,7 +592,7 @@ public: /// Hide or show layout-selection and pass call to CursorSh. void ShellLoseFocus(); - void ShellGetFocus( bool bUpdate = true ); + void ShellGetFocus(); /// PageDescriptor-interface void ChgCurPageDesc( const SwPageDesc& ); diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx index dea2afc64019..fd00b7ce7df6 100644 --- a/sw/inc/node.hxx +++ b/sw/inc/node.hxx @@ -267,7 +267,7 @@ public: /** Search PageDesc with which this node is formatted. If layout is existent search over layout, else only the hard way is left: search over the nodes to the front!! */ - const SwPageDesc* FindPageDesc( bool bCalcLay, size_t* pPgDescNdIdx = nullptr ) const; + const SwPageDesc* FindPageDesc( size_t* pPgDescNdIdx = nullptr ) const; /// If node is in a fly return the respective format. SwFrameFormat* GetFlyFormat() const; diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx index db943eb00686..16c54bded936 100644 --- a/sw/inc/pagedesc.hxx +++ b/sw/inc/pagedesc.hxx @@ -158,7 +158,7 @@ class SW_DLLPUBLIC SwPageDesc : public SwModify No adjustment at any other place. */ SAL_DLLPRIVATE void Mirror(); - SAL_DLLPRIVATE void ResetAllAttr( bool bLeft ); + SAL_DLLPRIVATE void ResetAllAttr(); SAL_DLLPRIVATE SwPageDesc(const OUString&, SwFrameFormat*, SwDoc *pDc ); @@ -307,7 +307,7 @@ inline UseOnPage SwPageDesc::GetUseOn() const inline void SwPageDesc::ResetAllMasterAttr() { - ResetAllAttr( false ); + ResetAllAttr(); } inline const SwFrameFormat *SwPageDesc::GetRightFormat(bool const bFirst) const diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx index f6108fc547d0..60b81d394c90 100644 --- a/sw/inc/swabstdlg.hxx +++ b/sw/inc/swabstdlg.hxx @@ -329,8 +329,8 @@ public: virtual AbstractSwWordCountFloatDlg* CreateSwWordCountDialog(SfxBindings* pBindings, SfxChildWindow* pChild, vcl::Window *pParent, SfxChildWinInfo* pInfo) = 0; - virtual AbstractSwInsertAbstractDlg * CreateSwInsertAbstractDlg(vcl::Window* pParent) = 0; - virtual AbstractSwAsciiFilterDlg* CreateSwAsciiFilterDlg ( vcl::Window* pParent, SwDocShell& rDocSh, + virtual AbstractSwInsertAbstractDlg * CreateSwInsertAbstractDlg() = 0; + virtual AbstractSwAsciiFilterDlg* CreateSwAsciiFilterDlg ( SwDocShell& rDocSh, SvStream* pStream ) = 0; virtual VclAbstractDialog * CreateSwInsertBookmarkDlg( vcl::Window *pParent, SwWrtShell &rSh, SfxRequest& rReq, int nResId ) = 0; @@ -347,11 +347,11 @@ public: const SwDBData& rData) = 0; virtual SfxAbstractTabDialog * CreateSwFootNoteOptionDlg(vcl::Window *pParent, SwWrtShell &rSh) = 0; - virtual AbstractDropDownFieldDialog * CreateDropDownFieldDialog(vcl::Window *pParent, SwWrtShell &rSh, + virtual AbstractDropDownFieldDialog * CreateDropDownFieldDialog(SwWrtShell &rSh, SwField* pField, bool bNextButton = false) = 0; virtual SfxAbstractTabDialog* CreateSwEnvDlg ( vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, bool bInsert ) = 0; - virtual AbstractSwLabDlg* CreateSwLabDlg(vcl::Window* pParent, const SfxItemSet& rSet, + virtual AbstractSwLabDlg* CreateSwLabDlg(const SfxItemSet& rSet, SwDBManager* pDBManager, bool bLabel) = 0; virtual SwLabDlgMethod GetSwLabDlgStaticMethod () =0; @@ -364,7 +364,7 @@ public: bool bDraw = false, const OString& sDefPage = OString() ) = 0; - virtual AbstractSwSelGlossaryDlg * CreateSwSelGlossaryDlg(vcl::Window * pParent, const OUString &rShortName) = 0; + virtual AbstractSwSelGlossaryDlg * CreateSwSelGlossaryDlg(const OUString &rShortName) = 0; virtual VclAbstractDialog * CreateVclAbstractDialog ( vcl::Window * pParent, SwWrtShell &rSh, int nResId ) = 0; virtual AbstractSplitTableDialog * CreateSplitTableDialog ( vcl::Window * pParent, SwWrtShell &rSh ) = 0; @@ -398,7 +398,6 @@ public: /// Identifies optional Slot by which the creation of the Template (Style) dialog is triggered. /// Currently used, if nRegion == SFX_STYLE_FAMILY_PAGE in order to activate certain dialog pane virtual SfxAbstractApplyTabDialog* CreateTemplateDialog( - vcl::Window* pParent, SfxStyleSheetBase& rBase, sal_uInt16 nRegion, const OString& sPage = OString(), diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index 3f96b4b1f46f..ce2d3c5f6ec5 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -973,7 +973,7 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL SwAccessibleParagraph::getAccess "<SwAccessibleParagraph::getAccessibleRelationSet()> - missing text frame"); if ( pTextFrame ) { - const SwContentFrame* pPrevContentFrame( pTextFrame->FindPrevCnt( true ) ); + const SwContentFrame* pPrevContentFrame( pTextFrame->FindPrevCnt() ); if ( pPrevContentFrame ) { uno::Sequence< uno::Reference<XInterface> > aSequence { GetMap()->GetContext( pPrevContentFrame ) }; diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index 9cc500f81700..0f8d88e1991b 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -230,7 +230,7 @@ void SwCursorShell::StartAction() void SwCursorShell::EndAction( const bool bIdleEnd, const bool DoSetPosX ) { - comphelper::FlagRestorationGuard g(mbSelectAll, StartsWithTable() && ExtendedSelectedAll(/*bFootnotes =*/ false)); + comphelper::FlagRestorationGuard g(mbSelectAll, StartsWithTable() && ExtendedSelectedAll()); bool bVis = m_bSVCursorVis; sal_uInt16 eFlags = SwCursorShell::CHKRANGE; @@ -611,10 +611,10 @@ void SwCursorShell::ExtendedSelectAll(bool bFootnotes) pPos->nContent.Assign( pCNd, pCNd ? pCNd->Len() : 0 ); } -bool SwCursorShell::ExtendedSelectedAll(bool bFootnotes) +bool SwCursorShell::ExtendedSelectedAll() { SwNodes& rNodes = GetDoc()->GetNodes(); - SwNodeIndex nNode = bFootnotes ? rNodes.GetEndOfPostIts() : rNodes.GetEndOfAutotext(); + SwNodeIndex nNode = rNodes.GetEndOfAutotext(); SwContentNode* pStart = rNodes.GoNext(&nNode); nNode = rNodes.GetEndOfContent(); @@ -1263,7 +1263,7 @@ bool SwCursorShell::GoPrevCursor() void SwCursorShell::Paint(vcl::RenderContext& rRenderContext, const Rectangle &rRect) { - comphelper::FlagRestorationGuard g(mbSelectAll, StartsWithTable() && ExtendedSelectedAll(/*bFootnotes =*/ false)); + comphelper::FlagRestorationGuard g(mbSelectAll, StartsWithTable() && ExtendedSelectedAll()); SET_CURR_SHELL( this ); // always switch off all cursors when painting diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx b/sw/source/core/doc/DocumentFieldsManager.cxx index 7180489ce1f3..8d50969ff193 100644 --- a/sw/source/core/doc/DocumentFieldsManager.cxx +++ b/sw/source/core/doc/DocumentFieldsManager.cxx @@ -335,7 +335,7 @@ void DocumentFieldsManager::RemoveFieldType(size_t nField) } // All have to be re-evaluated. -void DocumentFieldsManager::UpdateFields( SfxPoolItem *pNewHt, bool bCloseDB ) +void DocumentFieldsManager::UpdateFields( bool bCloseDB ) { // Call Modify() for every field type, // dependent SwTextField get notified ... @@ -355,13 +355,8 @@ void DocumentFieldsManager::UpdateFields( SfxPoolItem *pNewHt, bool bCloseDB ) case RES_DDEFLD: { - if( !pNewHt ) - { - SwMsgPoolItem aUpdateDDE( RES_UPDATEDDETBL ); - pFieldType->ModifyNotification( nullptr, &aUpdateDDE ); - } - else - pFieldType->ModifyNotification( nullptr, pNewHt ); + SwMsgPoolItem aUpdateDDE( RES_UPDATEDDETBL ); + pFieldType->ModifyNotification( nullptr, &aUpdateDDE ); break; } case RES_GETEXPFLD: @@ -369,10 +364,9 @@ void DocumentFieldsManager::UpdateFields( SfxPoolItem *pNewHt, bool bCloseDB ) case RES_HIDDENTXTFLD: case RES_HIDDENPARAFLD: // Expression fields are treated separately - if( !pNewHt ) - break; + break; default: - pFieldType->ModifyNotification ( nullptr, pNewHt ); + pFieldType->ModifyNotification ( nullptr, nullptr ); } } @@ -380,10 +374,10 @@ void DocumentFieldsManager::UpdateFields( SfxPoolItem *pNewHt, bool bCloseDB ) UpdateExpFields( nullptr, false ); // update expression fields // Tables - UpdateTableFields(pNewHt); + UpdateTableFields(nullptr); // References - UpdateRefFields(pNewHt); + UpdateRefFields(nullptr); if( bCloseDB ) { #if HAVE_FEATURE_DBCONNECTIVITY @@ -1281,7 +1275,7 @@ bool DocumentFieldsManager::SetFieldsDirty( bool b, const SwNode* pChk, sal_uLon return bFieldsFnd; } -void DocumentFieldsManager::SetFixFields( bool bOnlyTimeDate, const DateTime* pNewDateTime ) +void DocumentFieldsManager::SetFixFields( const DateTime* pNewDateTime ) { bool bIsModified = m_rDoc.getIDocumentState().IsModified(); @@ -1305,9 +1299,7 @@ void DocumentFieldsManager::SetFixFields( bool bOnlyTimeDate, const DateTime* pN /*3*/ RES_FILENAMEFLD, /*4*/ RES_DATETIMEFLD }; // MUST be at the end! - sal_uInt16 nStt = bOnlyTimeDate ? 4 : 0; - - for( ; nStt < 5; ++nStt ) + for( sal_uInt16 nStt = 0; nStt < 5; ++nStt ) { SwFieldType* pFieldType = GetSysFieldType( aTypes[ nStt ] ); SwIterator<SwFormatField,SwFieldType> aIter( *pFieldType ); diff --git a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx index 27dba28b24b5..cd75d2416342 100644 --- a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx +++ b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx @@ -197,7 +197,7 @@ const sfx2::LinkManager& DocumentLinksAdministrationManager::GetLinkManager() co // #i42634# Moved common code of SwReader::Read() and SwDocShell::UpdateLinks() // to new SwDoc::UpdateLinks(): -void DocumentLinksAdministrationManager::UpdateLinks( bool bUI ) +void DocumentLinksAdministrationManager::UpdateLinks() { SfxObjectCreateMode eMode; sal_uInt16 nLinkMode = m_rDoc.GetDocumentSettingManager().getLinkUpdateMode( true ); @@ -228,7 +228,7 @@ void DocumentLinksAdministrationManager::UpdateLinks( bool bUI ) bAskUpdate = true; } } - if( bUpdate && (bUI || !bAskUpdate) ) + if( bUpdate ) { SfxMedium* pMedium = m_rDoc.GetDocShell()->GetMedium(); SfxFrame* pFrame = pMedium ? pMedium->GetLoadTargetFrame() : nullptr; diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx index b82d7f99816a..623883dd3c9b 100644 --- a/sw/source/core/doc/docglbl.cxx +++ b/sw/source/core/doc/docglbl.cxx @@ -410,7 +410,7 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline, const OUString sNm( INetURLObject( sFileName ).GetName() ); SwSectionData aSectData( FILE_LINK_SECTION, GetUniqueSectionName( &sNm )); - SwSectionFormat* pFormat = MakeSectionFormat( nullptr ); + SwSectionFormat* pFormat = MakeSectionFormat(); aSectData.SetLinkFileName(sFileName); aSectData.SetProtectFlag(true); diff --git a/sw/source/core/doc/docglos.cxx b/sw/source/core/doc/docglos.cxx index 6f26c6c4431d..647a8000b0ec 100644 --- a/sw/source/core/doc/docglos.cxx +++ b/sw/source/core/doc/docglos.cxx @@ -150,7 +150,7 @@ bool SwDoc::InsertGlossary( SwTextBlocks& rBlock, const OUString& rEntry, OSL_ENSURE(pGDoc->GetDocShell(), "no SwDocShell at glossary"); if (GetDocShell() && pGDoc->GetDocShell()) pGDoc->ReplaceDocumentProperties( *this ); - pGDoc->getIDocumentFieldsAccess().SetFixFields(false, nullptr); + pGDoc->getIDocumentFieldsAccess().SetFixFields(nullptr); // StartAllAction(); getIDocumentFieldsAccess().LockExpFields(); diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx index cb7c8c170e50..cad5f2c2cc45 100644 --- a/sw/source/core/doc/doclay.cxx +++ b/sw/source/core/doc/doclay.cxx @@ -1619,7 +1619,7 @@ short SwDoc::GetTextDirection( const SwPosition& rPos, if( !pItem ) { - const SwPageDesc* pPgDsc = pNd->FindPageDesc( false ); + const SwPageDesc* pPgDsc = pNd->FindPageDesc(); if( pPgDsc ) pItem = &pPgDsc->GetMaster().GetFrameDir(); } diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx index 3c04abe971ed..edb1aaba2f91 100644 --- a/sw/source/core/doc/docnew.cxx +++ b/sw/source/core/doc/docnew.cxx @@ -1155,7 +1155,7 @@ else this->GetIDocumentUndoRedo().EndUndo( UNDO_INSGLOSSARY, nullptr ); getIDocumentFieldsAccess().UnlockExpFields(); - getIDocumentFieldsAccess().UpdateFields(nullptr, false); + getIDocumentFieldsAccess().UpdateFields(false); if ( pTargetShell ) pTargetShell->EndAllAction(); diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx index e942770948b1..887175809dbe 100644 --- a/sw/source/core/doc/doctxm.cxx +++ b/sw/source/core/doc/doctxm.cxx @@ -359,7 +359,7 @@ SwTOXBaseSection* SwDoc::InsertTableOf( const SwPosition& rPos, SwSectionData headerData( TOX_HEADER_SECTION, pNewSection->GetTOXName()+"_Head" ); SwNodeIndex aStt( *pHeadNd ); --aIdx; - SwSectionFormat* pSectFormat = MakeSectionFormat( nullptr ); + SwSectionFormat* pSectFormat = MakeSectionFormat(); GetNodes().InsertTextSection( aStt, *pSectFormat, headerData, nullptr, &aIdx, true, false); } @@ -390,7 +390,7 @@ void SwDoc::InsertTableOf( sal_uLong nSttNd, sal_uLong nEndNd, SwSectionData aSectionData( TOX_CONTENT_SECTION, sSectNm ); SwNodeIndex aStt( GetNodes(), nSttNd ), aEnd( GetNodes(), nEndNd ); - SwSectionFormat* pFormat = MakeSectionFormat( nullptr ); + SwSectionFormat* pFormat = MakeSectionFormat(); if(pSet) pFormat->SetFormatAttr(*pSet); @@ -769,7 +769,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr, // determine page description of table-of-content size_t nPgDescNdIdx = pSectNd->GetIndex() + 1; size_t* pPgDescNdIdx = &nPgDescNdIdx; - pDefaultPageDesc = pSectNd->FindPageDesc( false, pPgDescNdIdx ); + pDefaultPageDesc = pSectNd->FindPageDesc( pPgDescNdIdx ); if ( nPgDescNdIdx < pSectNd->GetIndex() ) { pDefaultPageDesc = nullptr; @@ -790,7 +790,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr, eBreak == SVX_BREAK_PAGE_BOTH ) ) { - pDefaultPageDesc = pNdAfterTOX->FindPageDesc( false ); + pDefaultPageDesc = pNdAfterTOX->FindPageDesc(); } } // consider start node of content section in the node array. @@ -802,7 +802,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr, // determine page description of content before table-of-content SwNodeIndex aIdx( *pSectNd ); pDefaultPageDesc = - SwNodes::GoPrevious( &aIdx )->FindPageDesc( false ); + SwNodes::GoPrevious( &aIdx )->FindPageDesc(); } if ( !pDefaultPageDesc ) @@ -882,7 +882,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr, SwSectionData headerData( TOX_HEADER_SECTION, GetTOXName()+"_Head" ); SwNodeIndex aStt( *pHeadNd ); --aIdx; - SwSectionFormat* pSectFormat = pDoc->MakeSectionFormat( nullptr ); + SwSectionFormat* pSectFormat = pDoc->MakeSectionFormat(); pDoc->GetNodes().InsertTextSection( aStt, *pSectFormat, headerData, nullptr, &aIdx, true, false); } diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx index 419d0fb37e62..b65f244f20c0 100644 --- a/sw/source/core/docnode/ndsect.cxx +++ b/sw/source/core/docnode/ndsect.cxx @@ -190,7 +190,7 @@ SwDoc::InsertSwSection(SwPaM const& rRange, SwSectionData & rNewData, GetIDocumentUndoRedo().DoUndo(false); } - SwSectionFormat* const pFormat = MakeSectionFormat( nullptr ); + SwSectionFormat* const pFormat = MakeSectionFormat(); if ( pAttr ) { pFormat->SetFormatAttr( *pAttr ); @@ -506,10 +506,9 @@ SwSection* SwDoc::GetCurrSection( const SwPosition& rPos ) return nullptr; } -SwSectionFormat* SwDoc::MakeSectionFormat( SwSectionFormat *pDerivedFrom ) +SwSectionFormat* SwDoc::MakeSectionFormat() { - SwSectionFormat* pNew = new SwSectionFormat( - pDerivedFrom == nullptr ? mpDfltFrameFormat : pDerivedFrom, this ); + SwSectionFormat* pNew = new SwSectionFormat( mpDfltFrameFormat, this ); mpSectionFormatTable->push_back( pNew ); return pNew; } @@ -1096,7 +1095,7 @@ void SwSectionNode::MakeFrames(const SwNodeIndex & rIdx ) { pViewShell->InvalidateAccessibleParaFlowRelation( dynamic_cast<SwTextFrame*>(pNew->FindNextCnt( true )), - dynamic_cast<SwTextFrame*>(pNew->FindPrevCnt( true )) ); + dynamic_cast<SwTextFrame*>(pNew->FindPrevCnt()) ); } } pNew = pSct; @@ -1122,7 +1121,7 @@ void SwSectionNode::MakeFrames(const SwNodeIndex & rIdx ) { pViewShell->InvalidateAccessibleParaFlowRelation( dynamic_cast<SwTextFrame*>(pNew->FindNextCnt( true )), - dynamic_cast<SwTextFrame*>(pNew->FindPrevCnt( true )) ); + dynamic_cast<SwTextFrame*>(pNew->FindPrevCnt()) ); } } if ( bInitNewSect ) @@ -1196,7 +1195,7 @@ SwSectionNode* SwSectionNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) c const SwNodes& rNds = GetNodes(); // Copy the SectionFrameFormat - SwSectionFormat* pSectFormat = pDoc->MakeSectionFormat( nullptr ); + SwSectionFormat* pSectFormat = pDoc->MakeSectionFormat(); pSectFormat->CopyAttrs( *GetSection().GetFormat() ); std::unique_ptr<SwTOXBase> pTOXBase; diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index e5d68c8752f3..813dad939947 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -2422,7 +2422,7 @@ void SwTableNode::MakeFrames( SwNodeIndex* pIdxBehind ) { pViewShell->InvalidateAccessibleParaFlowRelation( dynamic_cast<SwTextFrame*>(pNew->FindNextCnt( true )), - dynamic_cast<SwTextFrame*>(pNew->FindPrevCnt( true )) ); + dynamic_cast<SwTextFrame*>(pNew->FindPrevCnt()) ); } } pNew->RegistFlys(); @@ -2457,7 +2457,7 @@ void SwTableNode::DelFrames() { pViewShell->InvalidateAccessibleParaFlowRelation( dynamic_cast<SwTextFrame*>(pFrame->FindNextCnt( true )), - dynamic_cast<SwTextFrame*>(pFrame->FindPrevCnt( true )) ); + dynamic_cast<SwTextFrame*>(pFrame->FindPrevCnt()) ); } } pFrame->Cut(); diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx index 91767f76ca0f..fc8dcf5c94da 100644 --- a/sw/source/core/docnode/node.cxx +++ b/sw/source/core/docnode/node.cxx @@ -452,8 +452,7 @@ bool SwNode::IsProtect() const /// Find the PageDesc that is used to format this node. If the Layout is available, /// we search through that. Else we can only do it the hard way by searching onwards through the nodes. -const SwPageDesc* SwNode::FindPageDesc( bool bCalcLay, - size_t* pPgDescNdIdx ) const +const SwPageDesc* SwNode::FindPageDesc( size_t* pPgDescNdIdx ) const { if ( !GetNodes().IsDocNodes() ) { @@ -485,7 +484,7 @@ const SwPageDesc* SwNode::FindPageDesc( bool bCalcLay, { const SwFrame* pFrame; const SwPageFrame* pPage; - if( pNode && nullptr != ( pFrame = pNode->getLayoutFrame( pNode->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), nullptr, nullptr, bCalcLay ) ) && + if( pNode && nullptr != ( pFrame = pNode->getLayoutFrame( pNode->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), nullptr, nullptr, false/*bCalcLay*/ ) ) && nullptr != ( pPage = pFrame->FindPageFrame() ) ) { pPgDesc = pPage->GetPageDesc(); @@ -1302,7 +1301,7 @@ void SwContentNode::MakeFrames( SwContentNode& rNode ) { pViewShell->InvalidateAccessibleParaFlowRelation( dynamic_cast<SwTextFrame*>(pNew->FindNextCnt( true )), - dynamic_cast<SwTextFrame*>(pNew->FindPrevCnt( true )) ); + dynamic_cast<SwTextFrame*>(pNew->FindPrevCnt()) ); } } } @@ -1335,7 +1334,7 @@ void SwContentNode::DelFrames( bool bIsDisposeAccTable ) { pViewShell->InvalidateAccessibleParaFlowRelation( dynamic_cast<SwTextFrame*>(pFrame->FindNextCnt( true )), - dynamic_cast<SwTextFrame*>(pFrame->FindPrevCnt( true )) ); + dynamic_cast<SwTextFrame*>(pFrame->FindPrevCnt()) ); } } diff --git a/sw/source/core/edit/eddel.cxx b/sw/source/core/edit/eddel.cxx index 08e06d841665..0d54fe0ea35b 100644 --- a/sw/source/core/edit/eddel.cxx +++ b/sw/source/core/edit/eddel.cxx @@ -36,7 +36,7 @@ void SwEditShell::DeleteSel( SwPaM& rPam, bool* pUndo ) { - bool bSelectAll = StartsWithTable() && ExtendedSelectedAll(/*bFootnotes =*/ false); + bool bSelectAll = StartsWithTable() && ExtendedSelectedAll(); // only for selections if( !rPam.HasMark() || *rPam.GetPoint() == *rPam.GetMark()) return; diff --git a/sw/source/core/edit/edfld.cxx b/sw/source/core/edit/edfld.cxx index a2d5e0d80bdc..cfc69628eb5d 100644 --- a/sw/source/core/edit/edfld.cxx +++ b/sw/source/core/edit/edfld.cxx @@ -398,9 +398,9 @@ void SwEditShell::SetFieldUpdateFlags( SwFieldUpdateFlags eFlags ) getIDocumentSettingAccess().setFieldUpdateFlags( eFlags ); } -SwFieldUpdateFlags SwEditShell::GetFieldUpdateFlags(bool bDocSettings) const +SwFieldUpdateFlags SwEditShell::GetFieldUpdateFlags() const { - return getIDocumentSettingAccess().getFieldUpdateFlags( !bDocSettings ); + return getIDocumentSettingAccess().getFieldUpdateFlags( false ); } void SwEditShell::SetLabelDoc( bool bFlag ) diff --git a/sw/source/core/edit/edglss.cxx b/sw/source/core/edit/edglss.cxx index 325888b2bc3e..34f2eb90c4c4 100644 --- a/sw/source/core/edit/edglss.cxx +++ b/sw/source/core/edit/edglss.cxx @@ -201,7 +201,7 @@ bool SwEditShell::_CopySelToDoc( SwDoc* pInsDoc ) bool bColSel = _GetCursor()->IsColumnSelection(); if( bColSel && pInsDoc->IsClipBoard() ) pInsDoc->SetColumnSelection( true ); - bool bSelectAll = StartsWithTable() && ExtendedSelectedAll(/*bFootnotes =*/ false); + bool bSelectAll = StartsWithTable() && ExtendedSelectedAll(); { for(SwPaM& rPaM : GetCursor()->GetRingContainer()) { diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx index 8c395b697d58..03bafcc913d2 100644 --- a/sw/source/core/edit/editsh.cxx +++ b/sw/source/core/edit/editsh.cxx @@ -243,14 +243,13 @@ const Graphic* SwEditShell::GetGraphic( bool bWait ) const return pGrf; } -bool SwEditShell::IsGrfSwapOut( bool bOnlyLinked ) const +bool SwEditShell::IsLinkedGrfSwapOut() const { SwGrfNode *pGrfNode = _GetGrfNode(); return pGrfNode && - (bOnlyLinked ? ( pGrfNode->IsLinkedFile() && - ( GRAPHIC_DEFAULT == pGrfNode->GetGrfObj().GetType()|| - pGrfNode->GetGrfObj().IsSwappedOut())) - : pGrfNode->GetGrfObj().IsSwappedOut()); + ( pGrfNode->IsLinkedFile() && + ( GRAPHIC_DEFAULT == pGrfNode->GetGrfObj().GetType() || + pGrfNode->GetGrfObj().IsSwappedOut())); } const GraphicObject* SwEditShell::GetGraphicObj() const @@ -809,7 +808,7 @@ void SwEditShell::SetNumberingRestart() EndAllAction(); } -sal_uInt16 SwEditShell::GetLineCount( bool bActPos ) +sal_uInt16 SwEditShell::GetLineCount() { sal_uInt16 nRet = 0; CalcLayout(); @@ -818,49 +817,15 @@ sal_uInt16 SwEditShell::GetLineCount( bool bActPos ) SwNodeIndex aStart( rPtIdx ); SwContentNode* pCNd; SwContentFrame *pContentFrame = nullptr; - sal_uLong nTmpPos; - if( !bActPos ) - aStart = 0; - else if( rPtIdx > ( nTmpPos = GetDoc()->GetNodes().GetEndOfExtras().GetIndex()) ) - // BodyArea => Start is EndOfIcons + 1 - aStart = nTmpPos + 1; - else - { - if( nullptr != ( pCNd = pPam->GetContentNode() ) && - nullptr != ( pContentFrame = pCNd->getLayoutFrame( GetLayout() ) ) ) - { - const SwStartNode *pTmp; - if( pContentFrame->IsInFly() ) // Fly - pTmp = pCNd->FindFlyStartNode(); - else if( pContentFrame->IsInFootnote() ) // Footnote - pTmp = pCNd->FindFootnoteStartNode(); - else - { // Footer/Header - const sal_uInt16 nTyp = FRM_HEADER | FRM_FOOTER; - SwFrame* pFrame = pContentFrame; - while( pFrame && !(pFrame->GetType() & nTyp) ) - pFrame = pFrame->GetUpper(); - OSL_ENSURE( pFrame, "Wo bin ich?" ); - if( pFrame && ( pFrame->GetType() & FRM_FOOTER ) ) - pTmp = pCNd->FindFooterStartNode(); - else - pTmp = pCNd->FindHeaderStartNode(); - } - OSL_ENSURE( pTmp, "Missing StartNode" ); - aStart = *pTmp; - } - OSL_ENSURE( pCNd && pContentFrame, "Missing Layout-Information" ); - } + aStart = 0; while( nullptr != ( pCNd = GetDoc()->GetNodes().GoNextSection( - &aStart, true, false )) && ( !bActPos || aStart <= rPtIdx ) ) + &aStart, true, false )) ) { if( nullptr != ( pContentFrame = pCNd->getLayoutFrame( GetLayout() ) ) && pContentFrame->IsTextFrame() ) { - const sal_Int32 nActPos = bActPos && aStart == rPtIdx ? - pPam->GetPoint()->nContent.GetIndex() : COMPLETE_STRING; - nRet = nRet + static_cast<SwTextFrame*>(pContentFrame)->GetLineCount( nActPos ); + nRet = nRet + static_cast<SwTextFrame*>(pContentFrame)->GetLineCount( COMPLETE_STRING ); } } return nRet; @@ -923,9 +888,9 @@ void SwEditShell::SetLineNumberInfo(const SwLineNumberInfo& rInfo) EndAllAction(); } -sal_uInt16 SwEditShell::GetLinkUpdMode(bool bDocSettings) const +sal_uInt16 SwEditShell::GetLinkUpdMode() const { - return getIDocumentSettingAccess().getLinkUpdateMode( !bDocSettings ); + return getIDocumentSettingAccess().getLinkUpdateMode( false ); } void SwEditShell::SetLinkUpdMode( sal_uInt16 nMode ) @@ -941,20 +906,17 @@ void SwEditShell::CreateExtTextInput(LanguageType eInputLanguage) pRet->SetOverwriteCursor( SwCursorShell::IsOverwriteCursor() ); } -OUString SwEditShell::DeleteExtTextInput( SwExtTextInput* pDel, bool bInsText ) +OUString SwEditShell::DeleteExtTextInput( bool bInsText ) { + const SwPosition& rPos = *GetCursor()->GetPoint(); + SwExtTextInput* pDel = GetDoc()->GetExtTextInput( rPos.nNode.GetNode(), + rPos.nContent.GetIndex() ); if( !pDel ) { - const SwPosition& rPos = *GetCursor()->GetPoint(); - pDel = GetDoc()->GetExtTextInput( rPos.nNode.GetNode(), - rPos.nContent.GetIndex() ); - if( !pDel ) - { - //JP 25.10.2001: under UNIX the cursor is moved before the Input- - // Engine event comes in. So take any - normally there - // exist only one at the time. -- Task 92016 - pDel = GetDoc()->GetExtTextInput(); - } + //JP 25.10.2001: under UNIX the cursor is moved before the Input- + // Engine event comes in. So take any - normally there + // exist only one at the time. -- Task 92016 + pDel = GetDoc()->GetExtTextInput(); } OUString sRet; if( pDel ) diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx index 6fe38d1adc7e..27c0c04d4be2 100644 --- a/sw/source/core/edit/ednumber.cxx +++ b/sw/source/core/edit/ednumber.cxx @@ -855,14 +855,13 @@ sal_uInt16 SwEditShell::GetNodeNumStart( SwPaM* pPaM ) const return USHRT_MAX; } -const SwNumRule * SwEditShell::SearchNumRule( const bool bForward, - const bool bNum, +const SwNumRule * SwEditShell::SearchNumRule( const bool bNum, const bool bOutline, int nNonEmptyAllowed, OUString& sListId ) { - return GetDoc()->SearchNumRule( *(bForward ? GetCursor()->End() : GetCursor()->Start()), - bForward, bNum, bOutline, nNonEmptyAllowed, + return GetDoc()->SearchNumRule( *(GetCursor()->Start()), + false/*bForward*/, bNum, bOutline, nNonEmptyAllowed, sListId ); } diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx index 1fdc283b6052..2a99fa227f00 100644 --- a/sw/source/core/frmedt/fecopy.cxx +++ b/sw/source/core/frmedt/fecopy.cxx @@ -664,7 +664,7 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt, pDestShell->StartAllAction(); } pDestShell->GetDoc()->getIDocumentFieldsAccess().UnlockExpFields(); - pDestShell->GetDoc()->getIDocumentFieldsAccess().UpdateFields(nullptr, false); + pDestShell->GetDoc()->getIDocumentFieldsAccess().UpdateFields(false); pDestShell->EndAllAction(); return bRet; @@ -1102,7 +1102,7 @@ bool SwFEShell::Paste( SwDoc* pClpDoc ) StartAllAction(); } GetDoc()->getIDocumentFieldsAccess().UnlockExpFields(); - GetDoc()->getIDocumentFieldsAccess().UpdateFields(nullptr, false); + GetDoc()->getIDocumentFieldsAccess().UpdateFields(false); EndAllAction(); return bRet; @@ -1187,7 +1187,7 @@ bool SwFEShell::PastePages( SwFEShell& rToFill, sal_uInt16 nStartPage, sal_uInt1 } } GetDoc()->getIDocumentFieldsAccess().UnlockExpFields(); - GetDoc()->getIDocumentFieldsAccess().UpdateFields(nullptr, false); + GetDoc()->getIDocumentFieldsAccess().UpdateFields(false); Pop(false); EndAllAction(); diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx index e745ef883b2b..29bf8088c473 100644 --- a/sw/source/core/frmedt/fetab.cxx +++ b/sw/source/core/frmedt/fetab.cxx @@ -196,7 +196,7 @@ bool SwFEShell::InsertRow( sal_uInt16 nCnt, bool bBehind ) // search boxes via the layout SwSelBoxes aBoxes; - bool bSelectAll = StartsWithTable() && ExtendedSelectedAll(/*bFootnotes=*/false); + bool bSelectAll = StartsWithTable() && ExtendedSelectedAll(); if (bSelectAll) { // Set the end of the selection to the last paragraph of the last cell of the table. diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx index 01dc5203a423..d5c8f9746da9 100644 --- a/sw/source/core/frmedt/fews.cxx +++ b/sw/source/core/frmedt/fews.cxx @@ -275,10 +275,10 @@ FrameTypeFlags SwFEShell::GetFrameType( const Point *pPt, bool bStopAtFly ) cons return nReturn; } -void SwFEShell::ShellGetFocus( bool bUpdate ) +void SwFEShell::ShellGetFocus() { ::SetShell( this ); - SwCursorShell::ShellGetFocus( bUpdate ); + SwCursorShell::ShellGetFocus( false/*bUpdate*/ ); if ( HasDrawView() ) { diff --git a/sw/source/core/inc/DocumentFieldsManager.hxx b/sw/source/core/inc/DocumentFieldsManager.hxx index 4c05c29cbf81..45ebc0624879 100644 --- a/sw/source/core/inc/DocumentFieldsManager.hxx +++ b/sw/source/core/inc/DocumentFieldsManager.hxx @@ -41,7 +41,7 @@ public: virtual SwFieldType *GetSysFieldType( const sal_uInt16 eWhich ) const override; virtual SwFieldType* GetFieldType(sal_uInt16 nResId, const OUString& rName, bool bDbFieldMatching) const override; virtual void RemoveFieldType(size_t nField) override; - virtual void UpdateFields( SfxPoolItem* pNewHt, bool bCloseDB) override; + virtual void UpdateFields(bool bCloseDB) override; virtual void InsDeletedFieldType(SwFieldType &) override; virtual bool PutValueToField(const SwPosition & rPos, const css::uno::Any& rVal, sal_uInt16 nWhich) override; virtual bool UpdateField(SwTextField * rDstFormatField, SwField & rSrcField, SwMsgPoolItem * pMsgHint, bool bUpdateTableFields) override; @@ -55,7 +55,7 @@ public: virtual bool IsExpFieldsLocked() const override; virtual SwDocUpdateField& GetUpdateFields() const override; virtual bool SetFieldsDirty(bool b, const SwNode* pChk, sal_uLong nLen) override; - virtual void SetFixFields(bool bOnlyTimeDate, const DateTime* pNewDateTime) override; + virtual void SetFixFields(const DateTime* pNewDateTime) override; virtual void FieldsToCalc(SwCalc& rCalc, sal_uLong nLastNd, sal_uInt16 nLastCnt) override; virtual void FieldsToCalc(SwCalc& rCalc, const _SetGetExpField& rToThisField) override; virtual void FieldsToExpand(SwHash**& ppTable, sal_uInt16& rTableSize, const _SetGetExpField& rToThisField) override; diff --git a/sw/source/core/inc/DocumentLinksAdministrationManager.hxx b/sw/source/core/inc/DocumentLinksAdministrationManager.hxx index dcd329978cb8..1fbd4039d106 100644 --- a/sw/source/core/inc/DocumentLinksAdministrationManager.hxx +++ b/sw/source/core/inc/DocumentLinksAdministrationManager.hxx @@ -47,7 +47,7 @@ public: const sfx2::LinkManager& GetLinkManager() const override; - void UpdateLinks(bool bUI) override; + void UpdateLinks() override; bool GetData(const OUString& rItem, const OUString& rMimeType, css::uno::Any& rValue) const override; diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx index 22c766066d69..4b77327b2a7f 100644 --- a/sw/source/core/inc/flyfrm.hxx +++ b/sw/source/core/inc/flyfrm.hxx @@ -61,8 +61,8 @@ class SwFlyFrame : public SwLayoutFrame, public SwAnchoredObject friend void Notify( SwFlyFrame *, SwPageFrame *pOld, const SwRect &rOld, const SwRect* pOldPrt ); - void InitDrawObj( bool bNotify ); // these to methods are called in the - void FinitDrawObj(); // constructors + void InitDrawObj(); // these to methods are called in the + void FinitDrawObj(); // constructors void _UpdateAttr( const SfxPoolItem*, const SfxPoolItem*, sal_uInt8 &, SwAttrSetChg *pa = nullptr, SwAttrSetChg *pb = nullptr ); diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx index f45b8966a5d5..f59411146cdb 100644 --- a/sw/source/core/inc/frame.hxx +++ b/sw/source/core/inc/frame.hxx @@ -376,8 +376,7 @@ public: const SwSortedObjs *GetDrawObjs() const { return mpDrawObjs; } SwSortedObjs *GetDrawObjs() { return mpDrawObjs; } // #i28701# - change purpose of method and adjust its name - void InvalidateObjs( const bool _bInvaPosOnly, - const bool _bNoInvaOfAsCharAnchoredObjs = true ); + void InvalidateObjs( const bool _bNoInvaOfAsCharAnchoredObjs = true ); virtual void PaintBorder( const SwRect&, const SwPageFrame *pPage, const SwBorderAttrs & ) const; @@ -523,9 +522,9 @@ public: inline const SwFrame *FindPrev() const; const SwFrame *GetLower() const; - SwContentFrame* FindPrevCnt( const bool _bInSameFootnote = false ); + SwContentFrame* FindPrevCnt(); - const SwContentFrame* FindPrevCnt( const bool _bInSameFootnote = false ) const; + const SwContentFrame* FindPrevCnt() const; // #i79774# SwFrame* _GetIndPrev() const; diff --git a/sw/source/core/layout/anchoredobject.cxx b/sw/source/core/layout/anchoredobject.cxx index 07a0fb71dab9..77aec53a61e0 100644 --- a/sw/source/core/layout/anchoredobject.cxx +++ b/sw/source/core/layout/anchoredobject.cxx @@ -389,8 +389,7 @@ void SwAnchoredObject::UpdateLayoutDir() #i28701# */ -void SwAnchoredObject::InvalidateObjPosForConsiderWrapInfluence( - const bool _bNotifyBackgrd ) +void SwAnchoredObject::InvalidateObjPosForConsiderWrapInfluence() { if ( ConsiderObjWrapInfluenceOnObjPos() ) { @@ -400,11 +399,8 @@ void SwAnchoredObject::InvalidateObjPosForConsiderWrapInfluence( UnlockPosition(); // invalidate position InvalidateObjPos(); - // invalidate 'background', if requested - if ( _bNotifyBackgrd ) - { - NotifyBackground( GetPageFrame(), GetObjRectWithSpaces(), PREP_FLY_LEAVE ); - } + // invalidate 'background' + NotifyBackground( GetPageFrame(), GetObjRectWithSpaces(), PREP_FLY_LEAVE ); } } @@ -638,7 +634,7 @@ void SwAnchoredObject::UpdateObjInSortedList() { SwAnchoredObject* pAnchoredObj = (*pObjs)[i]; if ( pAnchoredObj->ConsiderObjWrapInfluenceOnObjPos() ) - pAnchoredObj->InvalidateObjPosForConsiderWrapInfluence( true ); + pAnchoredObj->InvalidateObjPosForConsiderWrapInfluence(); else pAnchoredObj->InvalidateObjPos(); } @@ -652,7 +648,7 @@ void SwAnchoredObject::UpdateObjInSortedList() { SwAnchoredObject* pAnchoredObj = (*pObjs)[i]; if ( pAnchoredObj->ConsiderObjWrapInfluenceOnObjPos() ) - pAnchoredObj->InvalidateObjPosForConsiderWrapInfluence( true ); + pAnchoredObj->InvalidateObjPosForConsiderWrapInfluence(); else pAnchoredObj->InvalidateObjPos(); } @@ -756,7 +752,7 @@ void SwAnchoredObject::SetTmpConsiderWrapInfluence( const bool _bTmpConsiderWrap } -void SwAnchoredObject::SetTmpConsiderWrapInfluenceOfOtherObjs( const bool bTmpConsiderWrapInfluence ) +void SwAnchoredObject::SetTmpConsiderWrapInfluenceOfOtherObjs() { const SwSortedObjs* pObjs = GetAnchorFrame()->GetDrawObjs(); if ( pObjs->size() > 1 ) @@ -766,7 +762,7 @@ void SwAnchoredObject::SetTmpConsiderWrapInfluenceOfOtherObjs( const bool bTmpCo SwAnchoredObject* pAnchoredObj = (*pObjs)[i]; if ( pAnchoredObj != this ) { - pAnchoredObj->SetTmpConsiderWrapInfluence( bTmpConsiderWrapInfluence ); + pAnchoredObj->SetTmpConsiderWrapInfluence( true/*bTmpConsiderWrapInfluence*/ ); } } } diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx index 3c30c4c1560c..326fa3a6c31e 100644 --- a/sw/source/core/layout/findfrm.cxx +++ b/sw/source/core/layout/findfrm.cxx @@ -166,20 +166,20 @@ SwFrame* SwFrame::GetLower() return IsLayoutFrame() ? static_cast<SwLayoutFrame*>(this)->Lower() : nullptr; } -SwContentFrame* SwFrame::FindPrevCnt( const bool _bInSameFootnote ) +SwContentFrame* SwFrame::FindPrevCnt( ) { if ( GetPrev() && GetPrev()->IsContentFrame() ) return static_cast<SwContentFrame*>(GetPrev()); else - return _FindPrevCnt( _bInSameFootnote ); + return _FindPrevCnt( true ); } -const SwContentFrame* SwFrame::FindPrevCnt( const bool _bInSameFootnote ) const +const SwContentFrame* SwFrame::FindPrevCnt() const { if ( GetPrev() && GetPrev()->IsContentFrame() ) return static_cast<const SwContentFrame*>(GetPrev()); else - return const_cast<SwFrame*>(this)->_FindPrevCnt( _bInSameFootnote ); + return const_cast<SwFrame*>(this)->_FindPrevCnt( true ); } SwContentFrame *SwFrame::FindNextCnt( const bool _bInSameFootnote ) diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx index 5a08f6dbde82..42070f9bc39a 100644 --- a/sw/source/core/layout/fly.cxx +++ b/sw/source/core/layout/fly.cxx @@ -146,7 +146,7 @@ SwFlyFrame::SwFlyFrame( SwFlyFrameFormat *pFormat, SwFrame* pSib, SwFrame *pAnch // First the Init, then the Content: // This is due to the fact that the Content may have Objects/Frames, // which are then registered - InitDrawObj( false ); + InitDrawObj(); Chain( pAnch ); @@ -397,7 +397,7 @@ SwVirtFlyDrawObj* SwFlyFrame::CreateNewRef( SwFlyDrawContact *pContact ) return pDrawObj; } -void SwFlyFrame::InitDrawObj( bool bNotify ) +void SwFlyFrame::InitDrawObj() { // Find ContactObject from the Format. If there's already one, we just // need to create a new Ref, else we create the Contact now. @@ -422,8 +422,6 @@ void SwFlyFrame::InitDrawObj( bool bNotify ) GetVirtDrawObj()->SetLayer( GetFormat()->GetOpaque().GetValue() ? nHeavenId : nHellId ); - if ( bNotify ) - NotifyDrawObj(); } void SwFlyFrame::FinitDrawObj() @@ -2180,8 +2178,7 @@ void SwFrame::RemoveDrawObj( SwAnchoredObject& _rToRemoveObj ) assert(!mpDrawObjs || mpDrawObjs->is_sorted()); } -void SwFrame::InvalidateObjs( const bool _bInvaPosOnly, - const bool _bNoInvaOfAsCharAnchoredObjs ) +void SwFrame::InvalidateObjs( const bool _bNoInvaOfAsCharAnchoredObjs ) { if ( GetDrawObjs() ) { @@ -2236,8 +2233,6 @@ void SwFrame::InvalidateObjs( const bool _bInvaPosOnly, SwFlyFrame* pFly = static_cast<SwFlyFrame*>(pAnchoredObj); pFly->_Invalidate(); pFly->_InvalidatePos(); - if ( !_bInvaPosOnly ) - pFly->_InvalidateSize(); } else { diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx index 475431451304..4aedeb46e2eb 100644 --- a/sw/source/core/layout/flycnt.cxx +++ b/sw/source/core/layout/flycnt.cxx @@ -524,7 +524,7 @@ void SwFlyAtContentFrame::MakeAll(vcl::RenderContext* pRenderContext) { SetTmpConsiderWrapInfluence( true ); SetRestartLayoutProcess( true ); - SetTmpConsiderWrapInfluenceOfOtherObjs( true ); + SetTmpConsiderWrapInfluenceOfOtherObjs(); } bSetCompletePaintOnInvalidate = false; } diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index 100efd736dc9..7e676ab50a35 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -428,7 +428,7 @@ static void lcl_InvalidatePosOfLowers( SwLayoutFrame& _rLayoutFrame ) { if( _rLayoutFrame.IsFlyFrame() && _rLayoutFrame.GetDrawObjs() ) { - _rLayoutFrame.InvalidateObjs( true, false ); + _rLayoutFrame.InvalidateObjs( false ); } SwFrame* pLowerFrame = _rLayoutFrame.Lower(); @@ -444,7 +444,7 @@ static void lcl_InvalidatePosOfLowers( SwLayoutFrame& _rLayoutFrame ) pLowerFrame->InvalidatePrt(); } - pLowerFrame->InvalidateObjs( true, false ); + pLowerFrame->InvalidateObjs( false ); pLowerFrame = pLowerFrame->GetNext(); } @@ -1325,7 +1325,7 @@ void _InsertCnt( SwLayoutFrame *pLay, SwDoc *pDoc, { pViewShell->InvalidateAccessibleParaFlowRelation( dynamic_cast<SwTextFrame*>(pFrame->FindNextCnt( true )), - dynamic_cast<SwTextFrame*>(pFrame->FindPrevCnt( true )) ); + dynamic_cast<SwTextFrame*>(pFrame->FindPrevCnt()) ); // #i68958# // The information flags of the text frame are validated // in methods <FindNextCnt(..)> and <FindPrevCnt(..)>. @@ -1375,7 +1375,7 @@ void _InsertCnt( SwLayoutFrame *pLay, SwDoc *pDoc, { pViewShell->InvalidateAccessibleParaFlowRelation( dynamic_cast<SwTextFrame*>(pFrame->FindNextCnt( true )), - dynamic_cast<SwTextFrame*>(pFrame->FindPrevCnt( true )) ); + dynamic_cast<SwTextFrame*>(pFrame->FindPrevCnt()) ); } } if ( bObjsDirect && !pTable->empty() ) @@ -1450,7 +1450,7 @@ void _InsertCnt( SwLayoutFrame *pLay, SwDoc *pDoc, { pViewShell->InvalidateAccessibleParaFlowRelation( dynamic_cast<SwTextFrame*>(pFrame->FindNextCnt( true )), - dynamic_cast<SwTextFrame*>(pFrame->FindPrevCnt( true )) ); + dynamic_cast<SwTextFrame*>(pFrame->FindPrevCnt()) ); } } pFrame->CheckDirChange(); diff --git a/sw/source/core/layout/objectformattertxtfrm.cxx b/sw/source/core/layout/objectformattertxtfrm.cxx index 0c5aa4aa6e10..e7625d938feb 100644 --- a/sw/source/core/layout/objectformattertxtfrm.cxx +++ b/sw/source/core/layout/objectformattertxtfrm.cxx @@ -484,7 +484,7 @@ void SwObjectFormatterTextFrame::_InvalidatePrevObjs( SwAnchoredObject& _rAnchor // #i35017# - constant name has changed text::WrapInfluenceOnPosition::ONCE_CONCURRENT ) { - pAnchoredObj->InvalidateObjPosForConsiderWrapInfluence( true ); + pAnchoredObj->InvalidateObjPosForConsiderWrapInfluence(); } } } @@ -496,7 +496,7 @@ void SwObjectFormatterTextFrame::_InvalidateFollowObjs( SwAnchoredObject& _rAnch { if ( _bInclObj ) { - _rAnchoredObj.InvalidateObjPosForConsiderWrapInfluence( true ); + _rAnchoredObj.InvalidateObjPosForConsiderWrapInfluence(); } const SwSortedObjs* pObjs = GetPageFrame().GetSortedObjs(); @@ -506,7 +506,7 @@ void SwObjectFormatterTextFrame::_InvalidateFollowObjs( SwAnchoredObject& _rAnch for ( size_t i = pObjs->ListPosOf( _rAnchoredObj ) + 1; i < pObjs->size(); ++i ) { SwAnchoredObject* pAnchoredObj = (*pObjs)[i]; - pAnchoredObj->InvalidateObjPosForConsiderWrapInfluence( true ); + pAnchoredObj->InvalidateObjPosForConsiderWrapInfluence(); } } } diff --git a/sw/source/core/layout/pagedesc.cxx b/sw/source/core/layout/pagedesc.cxx index e8f3ffe6713f..fecbd0ac88aa 100644 --- a/sw/source/core/layout/pagedesc.cxx +++ b/sw/source/core/layout/pagedesc.cxx @@ -124,9 +124,9 @@ void SwPageDesc::Mirror() m_Left.SetFormatAttr( aSet ); } -void SwPageDesc::ResetAllAttr( bool bLeft ) +void SwPageDesc::ResetAllAttr() { - SwFrameFormat& rFormat = bLeft ? GetLeft() : GetMaster(); + SwFrameFormat& rFormat = GetMaster(); // #i73790# - method renamed rFormat.ResetAllFormatAttr(); diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx index 4295f4a520cc..7be0bfdda6de 100644 --- a/sw/source/core/layout/sectfrm.cxx +++ b/sw/source/core/layout/sectfrm.cxx @@ -174,7 +174,7 @@ void SwSectionFrame::DelEmpty( bool bRemove ) { pViewShell->InvalidateAccessibleParaFlowRelation( dynamic_cast<SwTextFrame*>(FindNextCnt( true )), - dynamic_cast<SwTextFrame*>(FindPrevCnt( true )) ); + dynamic_cast<SwTextFrame*>(FindPrevCnt()) ); } } _Cut( bRemove ); diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx index c3bc3479663d..b24acaf35368 100644 --- a/sw/source/core/layout/wsfrm.cxx +++ b/sw/source/core/layout/wsfrm.cxx @@ -3744,7 +3744,7 @@ void SwRootFrame::InvalidateAllObjPos() // #i28701# - special invalidation for anchored // objects, whose wrapping style influence has to be considered. if ( pAnchoredObj->ConsiderObjWrapInfluenceOnObjPos() ) - pAnchoredObj->InvalidateObjPosForConsiderWrapInfluence( true ); + pAnchoredObj->InvalidateObjPosForConsiderWrapInfluence(); else pAnchoredObj->InvalidateObjPos(); } diff --git a/sw/source/core/tox/ToxTabStopTokenHandler.cxx b/sw/source/core/tox/ToxTabStopTokenHandler.cxx index 9be242d3cd53..3b6ae4b060c4 100644 --- a/sw/source/core/tox/ToxTabStopTokenHandler.cxx +++ b/sw/source/core/tox/ToxTabStopTokenHandler.cxx @@ -84,7 +84,7 @@ long DefaultToxTabStopTokenHandler::CalculatePageMarginFromPageDescription(const SwTextNode& targetNode) const { size_t nPgDescNdIdx = targetNode.GetIndex() + 1; - const SwPageDesc *pPageDesc = targetNode.FindPageDesc(false, &nPgDescNdIdx); + const SwPageDesc *pPageDesc = targetNode.FindPageDesc(&nPgDescNdIdx); if (!pPageDesc || nPgDescNdIdx < mIndexOfSectionNode) { // Use default page description, if none is found or the found one is given by a Node before the // table-of-content section. diff --git a/sw/source/core/undo/unsect.cxx b/sw/source/core/undo/unsect.cxx index d588a0227a2d..982c7f5e4a4c 100644 --- a/sw/source/core/undo/unsect.cxx +++ b/sw/source/core/undo/unsect.cxx @@ -332,7 +332,7 @@ void SwUndoDelSection::UndoImpl(::sw::UndoRedoContext & rContext) { SwNodeIndex aStt( rDoc.GetNodes(), m_nStartNode ); SwNodeIndex aEnd( rDoc.GetNodes(), m_nEndNode-2 ); - SwSectionFormat* pFormat = rDoc.MakeSectionFormat( nullptr ); + SwSectionFormat* pFormat = rDoc.MakeSectionFormat(); if (m_pAttrSet.get()) { pFormat->SetFormatAttr( *m_pAttrSet ); diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index e28803dd3be8..55e3d98cf70c 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -2929,7 +2929,7 @@ void SAL_CALL SwXTextFieldTypes::refresh() throw (uno::RuntimeException, std::ex throw uno::RuntimeException(); UnoActionContext aContext(GetDoc()); GetDoc()->getIDocumentStatistics().UpdateDocStat( false, true ); - GetDoc()->getIDocumentFieldsAccess().UpdateFields(nullptr, false); + GetDoc()->getIDocumentFieldsAccess().UpdateFields(false); } // call refresh listeners (without SolarMutex locked) lang::EventObject const event(static_cast< ::cppu::OWeakObject*>(this)); diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx index 08213898f90b..31bc7f2cfc97 100644 --- a/sw/source/core/unocore/unotext.cxx +++ b/sw/source/core/unocore/unotext.cxx @@ -95,7 +95,6 @@ public: uno::Reference< text::XTextRange > finishOrAppendParagraph( - const bool bFinish, const uno::Sequence< beans::PropertyValue >& rCharacterAndParagraphProperties, const uno::Reference< text::XTextRange >& xInsertPosition) @@ -1239,7 +1238,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard g; - return m_pImpl->finishOrAppendParagraph(true, rProperties, uno::Reference< text::XTextRange >()); + return m_pImpl->finishOrAppendParagraph(rProperties, uno::Reference< text::XTextRange >()); } uno::Reference< text::XTextRange > SAL_CALL @@ -1250,12 +1249,11 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard g; - return m_pImpl->finishOrAppendParagraph(true, rProperties, xInsertPosition); + return m_pImpl->finishOrAppendParagraph(rProperties, xInsertPosition); } uno::Reference< text::XTextRange > SwXText::Impl::finishOrAppendParagraph( - const bool bFinish, const uno::Sequence< beans::PropertyValue > & rProperties, const uno::Reference< text::XTextRange >& xInsertPosition) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) @@ -1296,10 +1294,7 @@ SwXText::Impl::finishOrAppendParagraph( m_pDoc->ResetAttrs(aPam); // in case of finishParagraph the PaM needs to be moved to the // previous paragraph - if (bFinish) - { - aPam.Move( fnMoveBackward, fnGoNode ); - } + aPam.Move( fnMoveBackward, fnGoNode ); try { diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index 01e0378a5d4e..bd77cc8736df 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -651,7 +651,7 @@ void SwViewShell::UpdateFields(bool bCloseDB) else StartAction(); - GetDoc()->getIDocumentFieldsAccess().UpdateFields(nullptr, bCloseDB); + GetDoc()->getIDocumentFieldsAccess().UpdateFields(bCloseDB); if ( bCursor ) static_cast<SwCursorShell*>(this)->EndAction(); diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx index a2e6a5c6c6e5..a5be1d655303 100644 --- a/sw/source/filter/basflt/shellio.cxx +++ b/sw/source/filter/basflt/shellio.cxx @@ -364,7 +364,7 @@ sal_uLong SwReader::Read( const Reader& rOptions ) // #i42634# Moved common code of SwReader::Read() and // SwDocShell::UpdateLinks() to new SwDoc::UpdateLinks(): // ATM still with Update - pDoc->getIDocumentLinksAdministration().UpdateLinks( true ); + pDoc->getIDocumentLinksAdministration().UpdateLinks(); // not insert: set the redline mode read from settings.xml eOld = static_cast<RedlineMode_t>( @@ -536,7 +536,7 @@ bool Reader::SetTemplate( SwDoc& rDoc ) { rDoc.RemoveAllFormatLanguageDependencies(); rDoc.ReplaceStyles( *pTemplate ); - rDoc.getIDocumentFieldsAccess().SetFixFields(false, nullptr); + rDoc.getIDocumentFieldsAccess().SetFixFields(nullptr); bRet = true; } diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 3f602a68cc0c..9d9f461ccbd6 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -332,7 +332,7 @@ void RtfAttributeOutput::SectionBreaks(const SwNode& rNode) const SwTextNode* pTextNode = static_cast< SwTextNode* >(&aNextIndex.GetNode()); m_rExport.OutputSectionBreaks(pTextNode->GetpSwAttrSet(), *pTextNode); // Save the current page description for now, so later we will be able to access the previous one. - m_pPrevPageDesc = pTextNode->FindPageDesc(false); + m_pPrevPageDesc = pTextNode->FindPageDesc(); } else if (aNextIndex.GetNode().IsTableNode()) { diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index f621e9c52957..16a413547916 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -2643,7 +2643,7 @@ void MSWordExportBase::WriteText() { SwContentNode* pCNd = static_cast<SwContentNode*>(&rNd); - const SwPageDesc* pTemp = rNd.FindPageDesc(false); + const SwPageDesc* pTemp = rNd.FindPageDesc(); if ( pTemp ) m_pAktPageDesc = pTemp; diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index d69307470cac..96674f9cdeb5 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -406,7 +406,7 @@ void MSWordExportBase::OutputSectionBreaks( const SfxItemSet *pSet, const SwNode //section. bool bBreakSet = false; - const SwPageDesc * pPageDesc = rNd.FindPageDesc(false); + const SwPageDesc * pPageDesc = rNd.FindPageDesc(); // Even if pAktPageDesc != pPageDesc ,it might be because of the different header & footer types. if (m_pAktPageDesc != pPageDesc) diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 0bb49e74f310..f21acd041aeb 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -280,8 +280,8 @@ void SwLoadOptPage::Reset( const SfxItemSet* rSet) m_nOldLinkMode = GLOBALSETTING; if (m_pWrtShell) { - eFieldFlags = m_pWrtShell->GetFieldUpdateFlags(true); - m_nOldLinkMode = m_pWrtShell->GetLinkUpdMode(true); + eFieldFlags = m_pWrtShell->GetFieldUpdateFlags(); + m_nOldLinkMode = m_pWrtShell->GetLinkUpdMode(); } if(GLOBALSETTING == m_nOldLinkMode) m_nOldLinkMode = pUsrPref->GetUpdateLinkMode(); diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx index f71c8ee3fecb..565d6e7e7d11 100644 --- a/sw/source/ui/dialog/docstdlg.cxx +++ b/sw/source/ui/dialog/docstdlg.cxx @@ -146,7 +146,7 @@ IMPL_LINK_NOARG_TYPED(SwDocStatPage, UpdateHdl, Button*, void) SwDocShell* pDocShell = static_cast<SwDocShell*>( SfxObjectShell::Current()); SwFEShell* pFEShell = pDocShell->GetFEShell(); if(pFEShell) - m_pLineNo->SetText( OUString::number( pFEShell->GetLineCount(false))); + m_pLineNo->SetText( OUString::number( pFEShell->GetLineCount())); //pButton->Disable(); } diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index a64a3bdfd926..4312e94421f5 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -628,9 +628,9 @@ sal_uInt16 AbstractMailMergeWizard_Impl::GetRestartPage() const return pDlg->GetRestartPage(); } -AbstractSwInsertAbstractDlg * SwAbstractDialogFactory_Impl::CreateSwInsertAbstractDlg(vcl::Window* pParent) +AbstractSwInsertAbstractDlg * SwAbstractDialogFactory_Impl::CreateSwInsertAbstractDlg() { - VclPtr<SwInsertAbstractDlg> pDlg = VclPtr<SwInsertAbstractDlg>::Create( pParent); + VclPtr<SwInsertAbstractDlg> pDlg = VclPtr<SwInsertAbstractDlg>::Create(nullptr); return new AbstractSwInsertAbstractDlg_Impl(pDlg); } @@ -664,11 +664,10 @@ SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSfxDialog( vcl::Window* p return nullptr; } -AbstractSwAsciiFilterDlg* SwAbstractDialogFactory_Impl::CreateSwAsciiFilterDlg( vcl::Window* pParent, - SwDocShell& rDocSh, +AbstractSwAsciiFilterDlg* SwAbstractDialogFactory_Impl::CreateSwAsciiFilterDlg( SwDocShell& rDocSh, SvStream* pStream ) { - VclPtr<SwAsciiFilterDlg> pDlg = VclPtr<SwAsciiFilterDlg>::Create( pParent, rDocSh, pStream ); + VclPtr<SwAsciiFilterDlg> pDlg = VclPtr<SwAsciiFilterDlg>::Create( nullptr, rDocSh, pStream ); return new AbstractSwAsciiFilterDlg_Impl( pDlg ); } @@ -752,10 +751,10 @@ SfxAbstractTabDialog * SwAbstractDialogFactory_Impl::CreateSwFootNoteOptionDlg( return new AbstractTabDialog_Impl( pDlg ); } -AbstractDropDownFieldDialog * SwAbstractDialogFactory_Impl::CreateDropDownFieldDialog(vcl::Window *pParent, +AbstractDropDownFieldDialog * SwAbstractDialogFactory_Impl::CreateDropDownFieldDialog( SwWrtShell &rSh, SwField* pField, bool bNextButton) { - VclPtr<sw::DropDownFieldDialog> pDlg = VclPtr<sw::DropDownFieldDialog>::Create(pParent, rSh, pField, bNextButton); + VclPtr<sw::DropDownFieldDialog> pDlg = VclPtr<sw::DropDownFieldDialog>::Create(nullptr, rSh, pField, bNextButton); return new AbstractDropDownFieldDialog_Impl( pDlg ); } @@ -767,10 +766,10 @@ SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwEnvDlg ( vcl::Window return new AbstractTabDialog_Impl( pDlg ); } -AbstractSwLabDlg* SwAbstractDialogFactory_Impl::CreateSwLabDlg(vcl::Window* pParent, const SfxItemSet& rSet, +AbstractSwLabDlg* SwAbstractDialogFactory_Impl::CreateSwLabDlg(const SfxItemSet& rSet, SwDBManager* pDBManager, bool bLabel) { - VclPtr<SwLabDlg> pDlg = VclPtr<SwLabDlg>::Create(pParent, rSet, pDBManager, bLabel); + VclPtr<SwLabDlg> pDlg = VclPtr<SwLabDlg>::Create(nullptr, rSet, pDBManager, bLabel); return new AbstractSwLabDlg_Impl(pDlg); } @@ -821,9 +820,9 @@ AbstractSplitTableDialog * SwAbstractDialogFactory_Impl::CreateSplitTableDialog return new AbstractSplitTableDialog_Impl( VclPtr<SwSplitTableDlg>::Create( pParent, rSh) ); } -AbstractSwSelGlossaryDlg * SwAbstractDialogFactory_Impl::CreateSwSelGlossaryDlg(vcl::Window * pParent, const OUString &rShortName) +AbstractSwSelGlossaryDlg * SwAbstractDialogFactory_Impl::CreateSwSelGlossaryDlg(const OUString &rShortName) { - VclPtr<SwSelGlossaryDlg> pDlg = VclPtr<SwSelGlossaryDlg>::Create(pParent, rShortName); + VclPtr<SwSelGlossaryDlg> pDlg = VclPtr<SwSelGlossaryDlg>::Create(nullptr, rShortName); return new AbstractSwSelGlossaryDlg_Impl(pDlg); } @@ -937,14 +936,13 @@ SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateFrameTabDialog(const O } SfxAbstractApplyTabDialog* SwAbstractDialogFactory_Impl::CreateTemplateDialog( - vcl::Window* pParent, SfxStyleSheetBase& rBase, sal_uInt16 nRegion, const OString& sPage, SwWrtShell* pActShell, bool bNew ) { - VclPtr<SfxTabDialog> pDlg = VclPtr<SwTemplateDlg>::Create( pParent, rBase, nRegion, sPage, pActShell, bNew ); + VclPtr<SfxTabDialog> pDlg = VclPtr<SwTemplateDlg>::Create( nullptr, rBase, nRegion, sPage, pActShell, bNew ); return new AbstractApplyTabDialog_Impl( pDlg ); } diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx index 47d27b36130b..7005058c6bea 100644 --- a/sw/source/ui/dialog/swdlgfact.hxx +++ b/sw/source/ui/dialog/swdlgfact.hxx @@ -375,8 +375,8 @@ public: ) override; virtual AbstractSwWordCountFloatDlg* CreateSwWordCountDialog(SfxBindings* pBindings, SfxChildWindow* pChild, vcl::Window *pParent, SfxChildWinInfo* pInfo) override; - virtual AbstractSwInsertAbstractDlg * CreateSwInsertAbstractDlg(vcl::Window* pParent) override; - virtual AbstractSwAsciiFilterDlg* CreateSwAsciiFilterDlg ( vcl::Window* pParent, SwDocShell& rDocSh, + virtual AbstractSwInsertAbstractDlg * CreateSwInsertAbstractDlg() override; + virtual AbstractSwAsciiFilterDlg* CreateSwAsciiFilterDlg ( SwDocShell& rDocSh, SvStream* pStream ) override; virtual VclAbstractDialog * CreateSwInsertBookmarkDlg( vcl::Window *pParent, SwWrtShell &rSh, SfxRequest& rReq, int nResId ) override; virtual AbstractSwBreakDlg * CreateSwBreakDlg(vcl::Window *pParent, SwWrtShell &rSh) override; @@ -392,10 +392,10 @@ public: const SwDBData& rData) override; virtual SfxAbstractTabDialog * CreateSwFootNoteOptionDlg(vcl::Window *pParent, SwWrtShell &rSh) override; - virtual AbstractDropDownFieldDialog * CreateDropDownFieldDialog (vcl::Window *pParent, SwWrtShell &rSh, + virtual AbstractDropDownFieldDialog * CreateDropDownFieldDialog(SwWrtShell &rSh, SwField* pField, bool bNextButton = false) override; virtual SfxAbstractTabDialog* CreateSwEnvDlg ( vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, bool bInsert ) override; - virtual AbstractSwLabDlg* CreateSwLabDlg(vcl::Window* pParent, const SfxItemSet& rSet, + virtual AbstractSwLabDlg* CreateSwLabDlg(const SfxItemSet& rSet, SwDBManager* pDBManager, bool bLabel) override; virtual SwLabDlgMethod GetSwLabDlgStaticMethod () override; @@ -407,7 +407,7 @@ public: bool bDraw = false, const OString& sDefPage = OString() ) override; - virtual AbstractSwSelGlossaryDlg * CreateSwSelGlossaryDlg(vcl::Window * pParent, const OUString &rShortName) override; + virtual AbstractSwSelGlossaryDlg * CreateSwSelGlossaryDlg(const OUString &rShortName) override; virtual VclAbstractDialog * CreateVclAbstractDialog ( vcl::Window * pParent, SwWrtShell &rSh, int nResId ) override; virtual AbstractSplitTableDialog * CreateSplitTableDialog ( vcl::Window * pParent, SwWrtShell &rSh ) override; @@ -436,7 +436,6 @@ public: const OString& sDefPage = OString(), const OUString* pFormatStr = nullptr) override; virtual SfxAbstractApplyTabDialog* CreateTemplateDialog( - vcl::Window* pParent, SfxStyleSheetBase& rBase, sal_uInt16 nRegion, const OString& sPage = OString(), diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index ae931682d6ec..395de1168ee0 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -725,7 +725,7 @@ void SwVisitingCardPage::Reset(const SfxItemSet* rSet) { lcl_SelectBlock(*m_pAutoTextLB, aLabItem.m_sGlossaryBlockName); if(m_xAutoText.is() && pExampleFrame->IsInitialized()) - pExampleFrame->ClearDocument( true ); + pExampleFrame->ClearDocument(); } } } diff --git a/sw/source/ui/envelp/labelexp.cxx b/sw/source/ui/envelp/labelexp.cxx index 26ff44dd7d9a..b9b0fa67471c 100644 --- a/sw/source/ui/envelp/labelexp.cxx +++ b/sw/source/ui/envelp/labelexp.cxx @@ -135,7 +135,7 @@ IMPL_LINK_NOARG_TYPED(SwVisitingCardPage, FrameControlInitializedHdl, SwOneExamp IMPL_LINK_NOARG_TYPED( SwVisitingCardPage, AutoTextSelectTreeListBoxHdl, SvTreeListBox*, void ) { if(m_xAutoText.is() && pExampleFrame->IsInitialized()) - pExampleFrame->ClearDocument( true ); + pExampleFrame->ClearDocument(); } IMPL_LINK_TYPED( SwVisitingCardPage, AutoTextSelectHdl, ListBox&, rBox, void ) { @@ -157,7 +157,7 @@ IMPL_LINK_TYPED( SwVisitingCardPage, AutoTextSelectHdl, ListBox&, rBox, void ) aBlockNames.getConstArray() ); } if(pExampleFrame->IsInitialized()) - pExampleFrame->ClearDocument( true ); + pExampleFrame->ClearDocument(); } } diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx index 23c26b837c80..ed95e6e8db0f 100644 --- a/sw/source/ui/fldui/fldedt.cxx +++ b/sw/source/ui/fldui/fldedt.cxx @@ -107,7 +107,7 @@ SwFieldEditDlg::SwFieldEditDlg(SwView& rVw) EnsureSelection(pCurField, aMgr); - sal_uInt16 nGroup = SwFieldMgr::GetGroup(false, pCurField->GetTypeId(), pCurField->GetSubType()); + sal_uInt16 nGroup = SwFieldMgr::GetGroup(pCurField->GetTypeId(), pCurField->GetSubType()); CreatePage(nGroup); @@ -282,7 +282,7 @@ IMPL_LINK_TYPED( SwFieldEditDlg, NextPrevHdl, Button *, pButton, void ) EnsureSelection(pCurField, rMgr); - sal_uInt16 nGroup = SwFieldMgr::GetGroup(false, pCurField->GetTypeId(), pCurField->GetSubType()); + sal_uInt16 nGroup = SwFieldMgr::GetGroup(pCurField->GetTypeId(), pCurField->GetSubType()); if (nGroup != pTabPage->GetGroup()) pTabPage = static_cast<SwFieldPage*>(CreatePage(nGroup).get()); diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 3823b67dc3fd..6fce5a371900 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -506,7 +506,7 @@ IMPL_LINK_NOARG_TYPED( SwMultiTOXTabDialog, ShowPreviewHdl, Button*, void ) if(!pExampleFrame->IsServiceAvailable()) { - SwOneExampleFrame::CreateErrorMessage(nullptr); + SwOneExampleFrame::CreateErrorMessage(); } } m_pShowExampleCB->Show(pExampleFrame && pExampleFrame->IsServiceAvailable()); diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index 7107511a2fdb..2ce310ccaf3b 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -1079,7 +1079,7 @@ void SwGlossaryDlg::ShowAutoText(const OUString& rGroup, const OUString& rShortN { SetResumeData(rGroup, rShortName); //try to make an Undo() - pExampleFrame->ClearDocument( true ); + pExampleFrame->ClearDocument(); } } diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx index 9ccf945ae00c..7e1e651d6567 100644 --- a/sw/source/ui/vba/vbadocumentproperties.cxx +++ b/sw/source/ui/vba/vbadocumentproperties.cxx @@ -309,7 +309,7 @@ public: SwFEShell* pFEShell = mpDocShell->GetFEShell(); if(pFEShell) { - aReturn <<= pFEShell->GetLineCount(false); + aReturn <<= pFEShell->GetLineCount(); } } } diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx index a2fa67c7486b..ab8ba8cd8d00 100644 --- a/sw/source/uibase/app/apphdl.cxx +++ b/sw/source/uibase/app/apphdl.cxx @@ -703,7 +703,7 @@ void SwModule::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) const SfxBoolItem* pTemplateItem = SfxItemSet::GetItem<SfxBoolItem>(pDocSh->GetMedium()->GetItemSet(), SID_TEMPLATE, false); if (pTemplateItem && pTemplateItem->GetValue()) { - pDocSh->GetDoc()->getIDocumentFieldsAccess().SetFixFields(false, nullptr); + pDocSh->GetDoc()->getIDocumentFieldsAccess().SetFixFields(nullptr); } } break; diff --git a/sw/source/uibase/app/applab.cxx b/sw/source/uibase/app/applab.cxx index d49a4e428d7a..6cf5c41718fd 100644 --- a/sw/source/uibase/app/applab.cxx +++ b/sw/source/uibase/app/applab.cxx @@ -172,7 +172,7 @@ void SwModule::InsertLab(SfxRequest& rReq, bool bLabel) SwAbstractDialogFactory* pDialogFactory = SwAbstractDialogFactory::Create(); OSL_ENSURE(pDialogFactory, "SwAbstractDialogFactory fail!"); - std::unique_ptr<AbstractSwLabDlg> pDlg(pDialogFactory->CreateSwLabDlg(nullptr, aSet, + std::unique_ptr<AbstractSwLabDlg> pDlg(pDialogFactory->CreateSwLabDlg(aSet, #if HAVE_FEATURE_DBCONNECTIVITY pDBManager.get(), #else diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index 19b5c9152cab..d46c60ea1ec6 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -1206,7 +1206,7 @@ void SwDocShell::CalcLayoutForOLEObjects() // read by the binary filter: void SwDocShell::UpdateLinks() { - GetDoc()->getIDocumentLinksAdministration().UpdateLinks(true); + GetDoc()->getIDocumentLinksAdministration().UpdateLinks(); // #i50703# Update footnote numbers SwTextFootnote::SetUniqueSeqRefNo( *GetDoc() ); SwNodeIndex aTmp( GetDoc()->GetNodes() ); diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx index aa57f45b1da6..b952c3270bfd 100644 --- a/sw/source/uibase/app/docsh2.cxx +++ b/sw/source/uibase/app/docsh2.cxx @@ -692,7 +692,7 @@ void SwDocShell::Execute(SfxRequest& rReq) SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); - std::unique_ptr<AbstractSwInsertAbstractDlg> pDlg(pFact->CreateSwInsertAbstractDlg(nullptr)); + std::unique_ptr<AbstractSwInsertAbstractDlg> pDlg(pFact->CreateSwInsertAbstractDlg()); OSL_ENSURE(pDlg, "Dialog creation failed!"); if(RET_OK == pDlg->Execute()) { @@ -832,7 +832,7 @@ void SwDocShell::Execute(SfxRequest& rReq) //pWrtShell is not set in page preview if (m_pWrtShell) m_pWrtShell->StartAllAction(); - m_pDoc->getIDocumentFieldsAccess().UpdateFields( nullptr, false ); + m_pDoc->getIDocumentFieldsAccess().UpdateFields( false ); m_pDoc->getIDocumentLinksAdministration().EmbedAllLinks(); m_IsRemovedInvisibleContent = officecfg::Office::Security::HiddenContent::RemoveHiddenContent::get(); diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx index c6680785c650..9a7799e2226b 100644 --- a/sw/source/uibase/app/docst.cxx +++ b/sw/source/uibase/app/docst.cxx @@ -792,7 +792,7 @@ sal_uInt16 SwDocShell::Edit( SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); assert( pFact ); std::unique_ptr<SfxAbstractApplyTabDialog> pDlg(pFact->CreateTemplateDialog( - nullptr, *(xTmp.get()), nFamily, sPage, + *(xTmp.get()), nFamily, sPage, pActShell ? pActShell : m_pWrtShell, bNew)); assert( pDlg ); ApplyStyle aApplyStyleHelper(*this, bNew, pStyle, nRet, xTmp, nFamily, pDlg.get(), m_xBasePool, bModified); @@ -1284,7 +1284,7 @@ void SwDocShell::_LoadStyles( SfxObjectShell& rSource, bool bPreserveCurrentDocu // of the template, update all the Source's // FixFields once. if(!bPreserveCurrentDocument) - static_cast<SwDocShell&>(rSource).m_pDoc->getIDocumentFieldsAccess().SetFixFields(false, nullptr); + static_cast<SwDocShell&>(rSource).m_pDoc->getIDocumentFieldsAccess().SetFixFields(nullptr); if (m_pWrtShell) { // rhbz#818557, fdo#58893: EndAllAction will call SelectShell(), diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx index 464deac80767..159ef0c60c1f 100644 --- a/sw/source/uibase/dochdl/gloshdl.cxx +++ b/sw/source/uibase/dochdl/gloshdl.cxx @@ -440,7 +440,7 @@ bool SwGlossaryHdl::Expand( const OUString& rShortName, SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); assert(pFact && "SwAbstractDialogFactory fail!"); - std::unique_ptr<AbstractSwSelGlossaryDlg> pDlg(pFact->CreateSwSelGlossaryDlg(nullptr, aShortName)); + std::unique_ptr<AbstractSwSelGlossaryDlg> pDlg(pFact->CreateSwSelGlossaryDlg(aShortName)); assert(pDlg && "Dialog creation failed!"); for(size_t i = 0; i < aFoundArr.size(); ++i) { diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index 21051b61e14b..b8624c356dc9 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -5985,7 +5985,7 @@ void QuickHelpData::Start( SwWrtShell& rSh, sal_uInt16 nWrdLen ) void QuickHelpData::Stop( SwWrtShell& rSh ) { if( !m_bIsTip ) - rSh.DeleteExtTextInput( nullptr, false ); + rSh.DeleteExtTextInput( false ); else if( nTipId ) { vcl::Window& rWin = rSh.GetView().GetEditWin(); diff --git a/sw/source/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx index b8aed6cec604..02cf4a75015a 100644 --- a/sw/source/uibase/fldui/fldmgr.cxx +++ b/sw/source/uibase/fldui/fldmgr.cxx @@ -346,7 +346,7 @@ static SwFieldGroupRgn const aWebRanges[] = } // determine GroupId -sal_uInt16 SwFieldMgr::GetGroup(bool bHtmlMode, sal_uInt16 nTypeId, sal_uInt16 nSubType) +sal_uInt16 SwFieldMgr::GetGroup(sal_uInt16 nTypeId, sal_uInt16 nSubType) { if (nTypeId == TYP_SETINPFLD) nTypeId = TYP_SETFLD; @@ -362,7 +362,7 @@ sal_uInt16 SwFieldMgr::GetGroup(bool bHtmlMode, sal_uInt16 nTypeId, sal_uInt16 n for (sal_uInt16 i = GRP_DOC; i <= GRP_VAR; i++) { - const SwFieldGroupRgn& rRange = GetGroupRange(bHtmlMode, i); + const SwFieldGroupRgn& rRange = GetGroupRange(false/*bHtmlMode*/, i); for (sal_uInt16 nPos = rRange.nStart; nPos < rRange.nEnd; nPos++) { if (aSwFields[nPos].nTypeId == nTypeId) diff --git a/sw/source/uibase/inc/fldmgr.hxx b/sw/source/uibase/inc/fldmgr.hxx index d80a0348e927..65e91492ed78 100644 --- a/sw/source/uibase/inc/fldmgr.hxx +++ b/sw/source/uibase/inc/fldmgr.hxx @@ -167,7 +167,7 @@ public: // access via TypeId from the dialog // Ids for a range of fields static const SwFieldGroupRgn& GetGroupRange(bool bHtmlMode, sal_uInt16 nGrpId); - static sal_uInt16 GetGroup(bool bHtmlMode, sal_uInt16 nTypeId, sal_uInt16 nSubType = 0); + static sal_uInt16 GetGroup(sal_uInt16 nTypeId, sal_uInt16 nSubType = 0); // the current field's TypeId sal_uInt16 GetCurTypeId() const; diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx index f7153da1bef4..21a5a77a883c 100644 --- a/sw/source/uibase/inc/navipi.hxx +++ b/sw/source/uibase/inc/navipi.hxx @@ -112,7 +112,7 @@ class SwNavigationPI : public vcl::Window, DECL_LINK_TYPED( PageEditModifyHdl, SpinField&, void ); DECL_LINK_TYPED( PopupModeEndHdl, FloatingWindow*, void ); DECL_LINK_TYPED( ClosePopupWindow, SfxPopupWindow *, void ); - void UsePage(SwWrtShell *); + void UsePage(); void InitImageList(); void SetPopupWindow( SfxPopupWindow* ); diff --git a/sw/source/uibase/inc/unotools.hxx b/sw/source/uibase/inc/unotools.hxx index f551e8f2efaa..79a2637af50a 100644 --- a/sw/source/uibase/inc/unotools.hxx +++ b/sw/source/uibase/inc/unotools.hxx @@ -106,14 +106,14 @@ public: css::uno::Reference< css::frame::XController > & GetController() {return _xController;} css::uno::Reference< css::text::XTextCursor > & GetTextCursor() {return _xCursor;} - void ClearDocument( bool bStartTimer = false ); + void ClearDocument(); bool IsInitialized() const {return bIsInitialized;} bool IsServiceAvailable() const {return bServiceAvailable;} void CreatePopup(const Point& rPt); - static void CreateErrorMessage(vcl::Window* pParent); + static void CreateErrorMessage(); }; #endif diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx index 5a6778bdb1ff..5c6dfd2a13be 100644 --- a/sw/source/uibase/inc/wrtsh.hxx +++ b/sw/source/uibase/inc/wrtsh.hxx @@ -349,7 +349,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); void SetPageStyle(const OUString &rCollName); - OUString GetCurPageStyle( const bool bCalcFrame = true ) const; + OUString GetCurPageStyle() const; // change current style using the attributes in effect void QuickUpdateStyle(); diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx index 6c1d56eff45e..cd0f8b002019 100644 --- a/sw/source/uibase/shells/basesh.cxx +++ b/sw/source/uibase/shells/basesh.cxx @@ -1432,7 +1432,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet ) // If the swapping of the graphic is finished, the status // must be determined asynchronously, until this the slot // will be disabled. - if ( bHas && bIsGraphicSelection && rSh.IsGrfSwapOut( true ) ) + if ( bHas && bIsGraphicSelection && rSh.IsLinkedGrfSwapOut() ) { if( AddGrfUpdateSlot( nWhich )) rSh.GetGraphic(false); // start the loading @@ -1466,7 +1466,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet ) if(!bDisable && pVFrame->HasChildWindow( nId )) { if(rSh.GetSelectionType() == nsSelectionType::SEL_GRF - && rSh.IsGrfSwapOut(true)) + && rSh.IsLinkedGrfSwapOut()) { if( AddGrfUpdateSlot( nWhich )) rSh.GetGraphic(false); // start the loading @@ -1515,7 +1515,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet ) // must be determined asynchronously, until this the slot // will be disabled. else if ( bHas && (nSel & nsSelectionType::SEL_GRF) && - rSh.IsGrfSwapOut(true) ) + rSh.IsLinkedGrfSwapOut() ) { if( AddGrfUpdateSlot( nWhich )) rSh.GetGraphic(false); // start the loading @@ -1707,7 +1707,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet ) { int nSel = rSh.GetSelectionType(); if( (nSel & nsSelectionType::SEL_GRF) && - rSh.IsGrfSwapOut(true)) + rSh.IsLinkedGrfSwapOut()) { if( AddGrfUpdateSlot( nWhich )) rSh.GetGraphic(false); // start the loading diff --git a/sw/source/uibase/shells/grfsh.cxx b/sw/source/uibase/shells/grfsh.cxx index be650428ec35..43362f444017 100644 --- a/sw/source/uibase/shells/grfsh.cxx +++ b/sw/source/uibase/shells/grfsh.cxx @@ -799,7 +799,7 @@ void SwGrfShell::GetAttrState(SfxItemSet &rSet) const sal_uInt16 eGraphicType( rSh.GetGraphicType() ); if ( ( eGraphicType == GRAPHIC_NONE || eGraphicType == GRAPHIC_DEFAULT ) && - rSh.IsGrfSwapOut( true ) ) + rSh.IsLinkedGrfSwapOut() ) { rSet.DisableItem( nWhich ); if( AddGrfUpdateSlot( nWhich )) diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx index ab92183f94d6..c44f881eb7ca 100644 --- a/sw/source/uibase/shells/tabsh.cxx +++ b/sw/source/uibase/shells/tabsh.cxx @@ -170,7 +170,7 @@ static SwTableRep* lcl_TableParamToItemSet( SfxItemSet& rSet, SwWrtShell &rSh ) if(rSh.GetBoxDirection( aBoxDirection )) rSet.Put(aBoxDirection, FN_TABLE_BOX_TEXTORIENTATION); - bool bSelectAll = rSh.StartsWithTable() && rSh.ExtendedSelectedAll(/*bFootnotes=*/false); + bool bSelectAll = rSh.StartsWithTable() && rSh.ExtendedSelectedAll(); bool bTableSel = rSh.IsTableMode() || bSelectAll; if(!bTableSel) { diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx index 588a0e922dd2..ddce7968ac63 100644 --- a/sw/source/uibase/shells/textsh1.cxx +++ b/sw/source/uibase/shells/textsh1.cxx @@ -1120,12 +1120,12 @@ void SwTextShell::Execute(SfxRequest &rReq) { OUString sContinuedListId; const SwNumRule* pRule = - rWrtSh.SearchNumRule( false, true, false, -1, sContinuedListId ); + rWrtSh.SearchNumRule( true, false, -1, sContinuedListId ); // #i86492# // Search also for bullet list if ( !pRule ) { - pRule = rWrtSh.SearchNumRule( false, false, false, -1, sContinuedListId ); + pRule = rWrtSh.SearchNumRule( false, false, -1, sContinuedListId ); } if ( pRule ) { @@ -1882,10 +1882,10 @@ void SwTextShell::GetState( SfxItemSet &rSet ) // Search also for bullet list OUString aDummy; const SwNumRule* pRule = - rSh.SearchNumRule( false, true, false, -1, aDummy ); + rSh.SearchNumRule( true, false, -1, aDummy ); if ( !pRule ) { - pRule = rSh.SearchNumRule( false, false, false, -1, aDummy ); + pRule = rSh.SearchNumRule( false, false, -1, aDummy ); } if ( !pRule ) rSet.DisableItem(nWhich); diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx index a4addf97ba21..f739b86ec335 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -942,7 +942,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) SET_CURR_SHELL( m_pWrtShell ); m_pWrtShell->StartAction(); m_pWrtShell->CalcLayout(); - m_pWrtShell->GetDoc()->getIDocumentFieldsAccess().UpdateFields(nullptr, false); + m_pWrtShell->GetDoc()->getIDocumentFieldsAccess().UpdateFields(false); m_pWrtShell->EndAction(); } m_pWrtShell->GetDoc()->getIDocumentState().SetUpdateExpFieldStat( false ); diff --git a/sw/source/uibase/uiview/view1.cxx b/sw/source/uibase/uiview/view1.cxx index a65e31d7f966..6957fb5b484e 100644 --- a/sw/source/uibase/uiview/view1.cxx +++ b/sw/source/uibase/uiview/view1.cxx @@ -71,7 +71,7 @@ void SwView::Activate(bool bMDIActivate) if ( bMDIActivate ) { - m_pWrtShell->ShellGetFocus(false); // Selections visible + m_pWrtShell->ShellGetFocus(); // Selections visible if( !m_sSwViewData.isEmpty() ) { diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx index 11fe98d0d0d0..61982672d601 100644 --- a/sw/source/uibase/uiview/view2.cxx +++ b/sw/source/uibase/uiview/view2.cxx @@ -1365,7 +1365,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet) case FN_STAT_TEMPLATE: { rSet.Put(SfxStringItem( FN_STAT_TEMPLATE, - rShell.GetCurPageStyle(false))); + rShell.GetCurPageStyle())); } break; @@ -1927,7 +1927,7 @@ bool SwView::JumpToSwMark( const OUString& rMark ) // For scrolling the FrameSet, the corresponding shell needs to have the focus. bool bHasShFocus = m_pWrtShell->HasShellFocus(); if( !bHasShFocus ) - m_pWrtShell->ShellGetFocus( false ); + m_pWrtShell->ShellGetFocus(); const SwFormatINetFormat* pINet; OUString sCmp; diff --git a/sw/source/uibase/uiview/viewcoll.cxx b/sw/source/uibase/uiview/viewcoll.cxx index 3a3e20f3ce93..0dd49becfe7f 100644 --- a/sw/source/uibase/uiview/viewcoll.cxx +++ b/sw/source/uibase/uiview/viewcoll.cxx @@ -50,7 +50,7 @@ void SwView::ExecColl(SfxRequest &rReq) SfxItemState::SET == pArgs->GetItemState( nWhich , true, &pItem )) { if( static_cast<const SfxStringItem*>(pItem)->GetValue() != - GetWrtShell().GetCurPageStyle(false) ) + GetWrtShell().GetCurPageStyle() ) { SfxStringItem aName(SID_STYLE_APPLY, static_cast<const SfxStringItem*>(pItem)->GetValue()); diff --git a/sw/source/uibase/uno/SwXFilterOptions.cxx b/sw/source/uibase/uno/SwXFilterOptions.cxx index 252c740db290..f3a54efab12f 100644 --- a/sw/source/uibase/uno/SwXFilterOptions.cxx +++ b/sw/source/uibase/uno/SwXFilterOptions.cxx @@ -108,7 +108,7 @@ sal_Int16 SwXFilterOptions::execute() throw (uno::RuntimeException, std::excepti SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); - std::unique_ptr<AbstractSwAsciiFilterDlg> pAsciiDlg(pFact->CreateSwAsciiFilterDlg(nullptr, *pDocShell, + std::unique_ptr<AbstractSwAsciiFilterDlg> pAsciiDlg(pFact->CreateSwAsciiFilterDlg(*pDocShell, pInStream.get())); OSL_ENSURE(pAsciiDlg, "Dialog creation failed!"); if(RET_OK == pAsciiDlg->Execute()) diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx index 1c61342daacc..91849d97ecac 100644 --- a/sw/source/uibase/uno/unotxvw.cxx +++ b/sw/source/uibase/uno/unotxvw.cxx @@ -781,7 +781,7 @@ uno::Any SAL_CALL SwXTextView::getPropertyValue( if (nWID == WID_PAGE_COUNT) nCount = m_pView->GetWrtShell().GetPageCount(); else // WID_LINE_COUNT - nCount = m_pView->GetWrtShell().GetLineCount( false /*of whole document*/ ); + nCount = m_pView->GetWrtShell().GetLineCount(); aRet <<= nCount; } break; @@ -1673,7 +1673,7 @@ sal_Bool SwXTextViewCursor::isAtEndOfLine() if (!IsTextSelection( false )) throw uno::RuntimeException("no text selection", static_cast < cppu::OWeakObject * > ( this ) ); - bRet = m_pView->GetWrtShell().IsAtRightMargin(true); + bRet = m_pView->GetWrtShell().IsAtRightMargin(); } else throw uno::RuntimeException(); diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index b87f14457c23..70fdbd26b740 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -174,14 +174,11 @@ void SwNavigationPI::FillBox() } } -void SwNavigationPI::UsePage(SwWrtShell *pSh) +void SwNavigationPI::UsePage() { - if (!pSh) - { - SwView *pView = GetCreateView(); - pSh = pView ? &pView->GetWrtShell() : nullptr; - GetPageEdit().SetValue(1); - } + SwView *pView = GetCreateView(); + SwWrtShell *pSh = pView ? &pView->GetWrtShell() : nullptr; + GetPageEdit().SetValue(1); if (pSh) { const sal_uInt16 nPageCnt = pSh->GetPageCnt(); @@ -518,7 +515,7 @@ void SwNavigationPI::GotoPage() _ZoomIn(); if(IsGlobalMode()) ToggleTree(); - UsePage(nullptr); + UsePage(); GetPageEdit().GrabFocus(); } @@ -819,7 +816,7 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings, } else m_aContentTree->GrabFocus(); - UsePage(nullptr); + UsePage(); m_aPageChgIdle.SetIdleHdl(LINK(this, SwNavigationPI, ChangePageHdl)); m_aPageChgIdle.SetPriority(SchedulerPriority::LOWEST); diff --git a/sw/source/uibase/utlui/unotools.cxx b/sw/source/uibase/utlui/unotools.cxx index 5ed25c464adf..184c49980817 100644 --- a/sw/source/uibase/utlui/unotools.cxx +++ b/sw/source/uibase/utlui/unotools.cxx @@ -90,13 +90,13 @@ SwOneExampleFrame::SwOneExampleFrame( vcl::Window& rWin, aTopWindow->Show(); } -void SwOneExampleFrame::CreateErrorMessage(vcl::Window* pParent) +void SwOneExampleFrame::CreateErrorMessage() { if(SwOneExampleFrame::bShowServiceNotAvailableMessage) { OUString sInfo(SW_RES(STR_SERVICE_UNAVAILABLE)); sInfo += cFrameControl; - ScopedVclPtr<InfoBox>::Create(pParent, sInfo)->Execute(); + ScopedVclPtr<InfoBox>::Create(nullptr, sInfo)->Execute(); SwOneExampleFrame::bShowServiceNotAvailableMessage = false; } } @@ -401,7 +401,7 @@ IMPL_LINK_TYPED( SwOneExampleFrame, TimeoutHdl, Idle*, pTimer, void ) pTimer->Start(); } -void SwOneExampleFrame::ClearDocument( bool bStartUpdateTimer ) +void SwOneExampleFrame::ClearDocument() { uno::Reference< lang::XUnoTunnel> xTunnel( _xCursor, uno::UNO_QUERY); if( xTunnel.is() ) @@ -419,13 +419,12 @@ void SwOneExampleFrame::ClearDocument( bool bStartUpdateTimer ) pDoc->ClearDoc(); pSh->ClearUpCursors(); - if( aLoadedIdle.IsActive() || !bStartUpdateTimer ) + if( aLoadedIdle.IsActive()) { pSh->EndAllAction(); pSh->UnlockPaint(); } - if( bStartUpdateTimer ) - aLoadedIdle.Start(); + aLoadedIdle.Start(); } else { @@ -550,7 +549,7 @@ Size SwFrameCtrlWindow::GetOptimalSize() const void SwFrameCtrlWindow::Resize() { VclEventBox::Resize(); - pExampleFrame->ClearDocument(true); + pExampleFrame->ClearDocument(); } MenuResource::MenuResource(const ResId& rResId) : diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index 675a4609cbca..f1053fbafb7b 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -1514,9 +1514,9 @@ void SwWrtShell::SetPageStyle(const OUString &rCollName) // Access templates -OUString SwWrtShell::GetCurPageStyle( const bool bCalcFrame ) const +OUString SwWrtShell::GetCurPageStyle() const { - return GetPageDesc(GetCurPageDesc( bCalcFrame )).GetName(); + return GetPageDesc(GetCurPageDesc( false/*bCalcFrame*/ )).GetName(); } // Change the current template referring to the existing change. diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx b/sw/source/uibase/wrtsh/wrtsh2.cxx index 4cc21fa0bfd0..7948ddc61558 100644 --- a/sw/source/uibase/wrtsh/wrtsh2.cxx +++ b/sw/source/uibase/wrtsh/wrtsh2.cxx @@ -259,7 +259,7 @@ bool SwWrtShell::StartDropDownFieldDlg(SwField* pField, bool bNextButton, OStrin SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); - std::unique_ptr<AbstractDropDownFieldDialog> pDlg(pFact->CreateDropDownFieldDialog(nullptr, *this, pField, bNextButton)); + std::unique_ptr<AbstractDropDownFieldDialog> pDlg(pFact->CreateDropDownFieldDialog(*this, pField, bNextButton)); OSL_ENSURE(pDlg, "Dialog creation failed!"); if(pWindowState && !pWindowState->isEmpty()) pDlg->SetWindowState(*pWindowState); |