diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-20 11:47:00 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-20 11:47:00 +0200 |
| commit | 0705f7da48bf36949dd323ba0103db86708e00e7 (patch) | |
| tree | 7083e0abcc5b9a17700498b97520cd8c8faa72e8 | |
| parent | 85ce992473a435497014f856f95f3914783f8d72 (diff) | |
loplugin:defaultparams
Change-Id: I11ff551955c1ac291ab576f2f18c2dd410427eda
93 files changed, 169 insertions, 182 deletions
diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx index 961914619caf..4aed8dc17152 100644 --- a/sw/qa/core/macros-test.cxx +++ b/sw/qa/core/macros-test.cxx @@ -464,7 +464,7 @@ void SwMacrosTest::testFindReplace() // find newline on 1st paragraph bool bFound = pPaM->Find( - opts, false, DOCPOS_CURR, DOCPOS_END, bCancel, FND_IN_BODY); + opts, false, DOCPOS_CURR, DOCPOS_END, bCancel); CPPUNIT_ASSERT(bFound); CPPUNIT_ASSERT(pPaM->HasMark()); CPPUNIT_ASSERT_EQUAL(OUString(""), pPaM->GetText()); diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx index 95d99d49a5d7..425a556ca099 100644 --- a/sw/qa/core/uwriter.cxx +++ b/sw/qa/core/uwriter.cxx @@ -227,7 +227,7 @@ void SwDocTest::testFileNameFields() CPPUNIT_ASSERT_MESSAGE("Expected Readable FileName", sResult == sExpected); } - m_xDocShRef->DoInitNew(0); + m_xDocShRef->DoInitNew(); } //See http://lists.freedesktop.org/archives/libreoffice/2011-August/016666.html @@ -1629,7 +1629,7 @@ void SwDocTest::setUp() SwGlobals::ensure(); m_pDoc = new SwDoc; m_xDocShRef = new SwDocShell(m_pDoc, SfxObjectCreateMode::EMBEDDED); - m_xDocShRef->DoInitNew(0); + m_xDocShRef->DoInitNew(); } void SwDocTest::tearDown() diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index 9cbbc0729bba..d4ef3b72b7a5 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -1707,14 +1707,14 @@ void SwUiWriterTest::testSearchWithTransliterate() SearchOpt.insertedChars = 0; SearchOpt.transliterateFlags = com::sun::star::i18n::TransliterationModulesExtra::IGNORE_DIACRITICS_CTL; //transliteration option set so that at least one of the search strings is not found - sal_uLong case1 = pWrtShell->SearchPattern(SearchOpt,true,DOCPOS_START,DOCPOS_END,FND_IN_BODY); + sal_uLong case1 = pWrtShell->SearchPattern(SearchOpt,true,DOCPOS_START,DOCPOS_END); SwShellCrsr* pShellCrsr = pWrtShell->getShellCrsr(true); CPPUNIT_ASSERT_EQUAL(OUString(""),pShellCrsr->GetText()); CPPUNIT_ASSERT_EQUAL(0,(int)case1); SearchOpt.searchString = "paragraph"; SearchOpt.transliterateFlags = com::sun::star::i18n::TransliterationModulesExtra::IGNORE_KASHIDA_CTL; //transliteration option set so that all search strings are found - sal_uLong case2 = pWrtShell->SearchPattern(SearchOpt,true,DOCPOS_START,DOCPOS_END,FND_IN_BODY); + sal_uLong case2 = pWrtShell->SearchPattern(SearchOpt,true,DOCPOS_START,DOCPOS_END); pShellCrsr = pWrtShell->getShellCrsr(true); CPPUNIT_ASSERT_EQUAL(OUString("paragraph"),pShellCrsr->GetText()); CPPUNIT_ASSERT_EQUAL(1,(int)case2); @@ -2234,7 +2234,7 @@ void SwUiWriterTest::testTdf83798() SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell(); pWrtShell->GotoNextTOXBase(); const SwTOXBase* pTOXBase = pWrtShell->GetCurTOX(); - pWrtShell->UpdateTableOf(*pTOXBase, nullptr); + pWrtShell->UpdateTableOf(*pTOXBase); SwPaM* pCrsr = pDoc->GetEditShell()->GetCrsr(); pCrsr->SetMark(); pCrsr->Move(fnMoveForward, fnGoNode); diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx index 5383fe2af935..188399bcae66 100644 --- a/sw/source/core/crsr/swcrsr.cxx +++ b/sw/source/core/crsr/swcrsr.cxx @@ -70,7 +70,7 @@ struct _PercentHdl { sal_uLong n = nStt; nStt = nEnd; nEnd = n; } - ::StartProgress( STR_STATSTR_SEARCH, nStt, nEnd, 0 ); + ::StartProgress( STR_STATSTR_SEARCH, nStt, nEnd ); } explicit _PercentHdl( const SwPaM& rPam ) diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx index 13793608e9b7..0bfa49d1377c 100644 --- a/sw/source/core/crsr/viscrs.cxx +++ b/sw/source/core/crsr/viscrs.cxx @@ -131,7 +131,7 @@ void SwVisCrsr::_SetPosAndShow() } // check if cursor should show the current cursor bidi level - m_aTextCrsr.SetDirection( CursorDirection::NONE ); + m_aTextCrsr.SetDirection(); const SwCursor* pTmpCrsr = m_pCrsrShell->_GetCrsr(); if ( pTmpCrsr && !m_pCrsrShell->IsOverwriteCrsr() ) diff --git a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx index 302fb3ecaad0..0a721e921fc7 100644 --- a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx +++ b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx @@ -75,7 +75,7 @@ namespace ::sfx2::SvBaseLinkRef xLink = pLnk; OUString sFName; - sfx2::LinkManager::GetDisplayNames( xLink, 0, &sFName, 0, 0 ); + sfx2::LinkManager::GetDisplayNames( xLink, 0, &sFName ); INetURLObject aURL( sFName ); if( INetProtocol::File == aURL.GetProtocol() || diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx index 4a6d7b31f008..0dad444132bb 100644 --- a/sw/source/core/doc/docfmt.cxx +++ b/sw/source/core/doc/docfmt.cxx @@ -426,7 +426,7 @@ bool SwDoc::UpdateRsid( const SwPaM &rRg, const sal_Int32 nLen ) SfxItemSet aSet(GetAttrPool(), RES_CHRATR_RSID, RES_CHRATR_RSID); aSet.Put(aRsid); bool const bRet(pTextNode->SetAttr(aSet, nStart, - rRg.GetPoint()->nContent.GetIndex(), SetAttrMode::DEFAULT)); + rRg.GetPoint()->nContent.GetIndex())); if (bRet && GetIDocumentUndoRedo().DoesUndo()) { @@ -1832,7 +1832,7 @@ void SwDoc::SetFormatItemByAutoFormat( const SwPaM& rPam, const SfxItemSet& rSet // here, so insert the old attributes as an empty hint to stop expand SwPaM endPam(*pTNd, nEnd); endPam.SetMark(); - getIDocumentContentOperations().InsertItemSet(endPam, currentSet, SetAttrMode::DEFAULT); + getIDocumentContentOperations().InsertItemSet(endPam, currentSet); getIDocumentRedlineAccess().SetRedlineMode_intern( eOld ); } diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx index a16d4d056694..e479b538495c 100644 --- a/sw/source/core/doc/docglbl.cxx +++ b/sw/source/core/doc/docglbl.cxx @@ -270,7 +270,7 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline, if( pStartNd->GetIndex() + 1 < aEndIdx.GetIndex() ) { SfxObjectShellLock xDocSh( new SwDocShell( SfxObjectCreateMode::INTERNAL )); - if( xDocSh->DoInitNew( 0 ) ) + if( xDocSh->DoInitNew() ) { SwDoc* pDoc = static_cast<SwDocShell*>(&xDocSh)->GetDoc(); diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx index 3a870a9f981a..a329912a887b 100644 --- a/sw/source/core/doc/docredln.cxx +++ b/sw/source/core/doc/docredln.cxx @@ -1170,8 +1170,7 @@ void SwRangeRedline::MoveToSection() } else { - pSttNd = SwNodes::MakeEmptySection( SwNodeIndex( rNds.GetEndOfRedlines() ), - SwNormalStartNode ); + pSttNd = SwNodes::MakeEmptySection( SwNodeIndex( rNds.GetEndOfRedlines() ) ); SwPosition aPos( *pSttNd->EndOfSectionNode() ); pDoc->getIDocumentContentOperations().MoveRange( aPam, aPos, @@ -1243,8 +1242,7 @@ void SwRangeRedline::CopyToSection() } else { - pSttNd = SwNodes::MakeEmptySection( SwNodeIndex( rNds.GetEndOfRedlines() ), - SwNormalStartNode ); + pSttNd = SwNodes::MakeEmptySection( SwNodeIndex( rNds.GetEndOfRedlines() ) ); if( pCEndNd ) { diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx index 2b5cf7da6bfd..fb67e0e9b30e 100644 --- a/sw/source/core/doc/tblafmt.cxx +++ b/sw/source/core/doc/tblafmt.cxx @@ -1130,7 +1130,7 @@ bool SwTableAutoFormatTable::Load() bool bRet = false; OUString sNm(AUTOTABLE_FORMAT_NAME); SvtPathOptions aOpt; - if( aOpt.SearchFile( sNm, SvtPathOptions::PATH_USERCONFIG )) + if( aOpt.SearchFile( sNm )) { SfxMedium aStream( sNm, STREAM_STD_READ ); bRet = Load( *aStream.GetInStream() ); diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx index 0c09aa93d17b..800c8ecfd9e3 100644 --- a/sw/source/core/docnode/ndsect.cxx +++ b/sw/source/core/docnode/ndsect.cxx @@ -1082,7 +1082,7 @@ void SwSectionNode::MakeFrms(const SwNodeIndex & rIdx ) OSL_ENSURE( pUp->Lower()->IsLayoutFrm(),"Who's in there?" ); pUp = static_cast<SwLayoutFrm*>(pUp->Lower()); } - pNew->Paste( pUp, NULL ); + pNew->Paste( pUp ); // #i27138# // notify accessibility paragraphs objects about changed // CONTENT_FLOWS_FROM/_TO relation. diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx index e8ec08f70bc0..0571943a5150 100644 --- a/sw/source/core/docnode/section.cxx +++ b/sw/source/core/docnode/section.cxx @@ -1161,7 +1161,7 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd ) { // It's in the Section, so update. But only if it's not in the same File! OUString sFName; - sfx2::LinkManager::GetDisplayNames( pBLink, 0, &sFName, 0, 0 ); + sfx2::LinkManager::GetDisplayNames( pBLink, 0, &sFName ); if( sFName != sName ) { pBLink->DataChanged( sMimeType, aValue ); @@ -1351,7 +1351,7 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd ) if ( pSrcDoc != pDoc && rSection.IsProtectFlag() ) { - pSrcDoc->getIDocumentLinksAdministration().GetLinkManager().UpdateAllLinks( false, true, false, 0 ); + pSrcDoc->getIDocumentLinksAdministration().GetLinkManager().UpdateAllLinks( false ); } if( pCpyRg ) diff --git a/sw/source/core/edit/edtox.cxx b/sw/source/core/edit/edtox.cxx index 579724103f35..e04d160dc224 100644 --- a/sw/source/core/edit/edtox.cxx +++ b/sw/source/core/edit/edtox.cxx @@ -111,7 +111,7 @@ void SwEditShell::SetTOXBaseReadonly(const SwTOXBase& rTOXBase, bool bReadonly) SwSectionData aSectionData(rTOXSect); aSectionData.SetProtectFlag(bReadonly); - UpdateSection( GetSectionFormatPos( *rTOXSect.GetFormat() ), aSectionData, 0 ); + UpdateSection( GetSectionFormatPos( *rTOXSect.GetFormat() ), aSectionData ); } const SwTOXBase* SwEditShell::GetDefaultTOXBase( TOXTypes eTyp, bool bCreate ) diff --git a/sw/source/core/fields/cellfml.cxx b/sw/source/core/fields/cellfml.cxx index 9ea3c4570c48..f4a5c8589f00 100644 --- a/sw/source/core/fields/cellfml.cxx +++ b/sw/source/core/fields/cellfml.cxx @@ -201,7 +201,7 @@ double SwTableBox::GetValue( SwTableCalcPara& rCalcPara ) const { const SwTextInputField * pTextInputField = dynamic_cast< const SwTextInputField* >( - pTextNd->GetTextAttrAt( nSttPos, RES_TXTATR_INPUTFIELD, SwTextNode::DEFAULT ) ); + pTextNd->GetTextAttrAt( nSttPos, RES_TXTATR_INPUTFIELD ) ); if ( pTextInputField == NULL ) break; nRet = rCalcPara.rCalc.Calculate( pTextInputField->GetFieldContent() ).GetDouble(); diff --git a/sw/source/core/fields/postithelper.cxx b/sw/source/core/fields/postithelper.cxx index f5d8514732b2..82dd5afc1ff7 100644 --- a/sw/source/core/fields/postithelper.cxx +++ b/sw/source/core/fields/postithelper.cxx @@ -60,7 +60,7 @@ SwPostItHelper::SwLayoutStatus SwPostItHelper::getLayoutInfos( aRet = VISIBLE; o_rInfo.mpAnchorFrm = pTextFrm; - pTextFrm->GetCharRect( o_rInfo.mPosition, rAnchorPos, 0 ); + pTextFrm->GetCharRect( o_rInfo.mPosition, rAnchorPos ); if ( pAnnotationStartPos != NULL ) { o_rInfo.mnStartNodeIdx = pAnnotationStartPos->nNode.GetIndex(); diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx index 2847c4f924df..afba625ccd3d 100644 --- a/sw/source/core/frmedt/fecopy.cxx +++ b/sw/source/core/frmedt/fecopy.cxx @@ -168,7 +168,7 @@ bool SwFEShell::Copy( SwDoc* pClpDoc, const OUString* pNewClpText ) rIdx.GetIndex(), RES_TXTATR_FLYCNT)); if( pTextFly ) { - const_cast<SwFormatFlyCnt&>(pTextFly->GetFlyCnt()).SetFlyFormat( 0 ); + const_cast<SwFormatFlyCnt&>(pTextFly->GetFlyCnt()).SetFlyFormat(); pTextNd->EraseText( rIdx, 1 ); } } @@ -216,7 +216,7 @@ bool SwFEShell::Copy( SwDoc* pClpDoc, const OUString* pNewClpText ) bRet = true; } else - bRet = _CopySelToDoc( pClpDoc, 0 ); // copy the selections + bRet = _CopySelToDoc( pClpDoc ); // copy the selections pClpDoc->getIDocumentRedlineAccess().SetRedlineMode_intern((RedlineMode_t)0 ); pClpDoc->getIDocumentFieldsAccess().UnlockExpFields(); diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx index d2b84558a0b4..8d4d2695b973 100644 --- a/sw/source/core/frmedt/fefly1.cxx +++ b/sw/source/core/frmedt/fefly1.cxx @@ -523,7 +523,7 @@ Point SwFEShell::FindAnchorPos( const Point& rAbsPos, bool bMoveIt ) { SwPosition pos = *aAnch.GetContentAnchor(); Point aTmpPnt( rAbsPos ); - if( pTextFrm->GetCrsrOfst( &pos, aTmpPnt, NULL ) ) + if( pTextFrm->GetCrsrOfst( &pos, aTmpPnt ) ) { SwRect aTmpRect; pTextFrm->GetCharRect( aTmpRect, pos ); diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index dbc361590990..9597d844eea4 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -663,7 +663,7 @@ long SwFEShell::BeginDrag( const Point* pPt, bool bIsShift) SdrHdl* pHdl = pView->PickHandle( *pPt ); if (pView->BegDragObj( *pPt, 0, pHdl )) pView->GetDragMethod()->SetShiftPressed( bIsShift ); - ::FrameNotify( this, FLY_DRAG ); + ::FrameNotify( this ); return 1; } return 0; @@ -677,7 +677,7 @@ long SwFEShell::Drag( const Point *pPt, bool ) ScrollTo( *pPt ); Imp()->GetDrawView()->MovDragObj( *pPt ); Imp()->GetDrawView()->ShowDragAnchor(); - ::FrameNotify( this, FLY_DRAG ); + ::FrameNotify( this ); return 1; } return 0; @@ -719,7 +719,7 @@ long SwFEShell::EndDrag( const Point *, bool ) } GetDoc()->getIDocumentState().SetModified(); - ::FrameNotify( this, FLY_DRAG ); + ::FrameNotify( this ); return 1; } @@ -1510,7 +1510,7 @@ void SwFEShell::MoveCreate( const Point &rPos ) { ScrollTo( rPos ); Imp()->GetDrawView()->MovCreateObj( rPos ); - ::FrameNotify( this, FLY_DRAG ); + ::FrameNotify( this ); } } @@ -1535,7 +1535,7 @@ bool SwFEShell::EndCreate( sal_uInt16 eSdrCreateCmd ) if ( (SdrCreateCmd)eSdrCreateCmd == SDRCREATE_NEXTPOINT ) { - ::FrameNotify( this, FLY_DRAG ); + ::FrameNotify( this ); return true; } return ImpEndCreate(); @@ -1564,7 +1564,7 @@ bool SwFEShell::ImpEndCreate() // OD 2004-04-05 #i26791# - direct object positioning for group members rSdrObj.NbcSetRelativePos( aTmpPos - aNewAnchor ); rSdrObj.NbcSetAnchorPos( aNewAnchor ); - ::FrameNotify( this, FLY_DRAG ); + ::FrameNotify( this ); return true; } @@ -2040,7 +2040,7 @@ void SwFEShell::ChgAnchor( int eAnchorId, bool bSameOnly, bool bPosCorr ) EndAllAction(); - ::FrameNotify( this, FLY_DRAG ); + ::FrameNotify( this ); } } diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx index bdade3a91e69..9baf44586d81 100644 --- a/sw/source/core/frmedt/fetab.cxx +++ b/sw/source/core/frmedt/fetab.cxx @@ -1885,7 +1885,7 @@ SwTab SwFEShell::WhichMouseTabCol( const Point &rPt ) const bool bSelect = false; // First try: Do we get the row/col move cursor? - const SwCellFrm* pFrm = static_cast<const SwCellFrm*>(GetBox( rPt, &bRow, 0 )); + const SwCellFrm* pFrm = static_cast<const SwCellFrm*>(GetBox( rPt, &bRow )); if ( !pFrm ) { diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index 26488f426c5a..7f098a1f4759 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -1095,7 +1095,7 @@ void SwGrfNode::TriggerAsyncRetrieveInputStream() mpThreadConsumer.reset( new SwAsyncRetrieveInputStreamThreadConsumer( *this ) ); OUString sGrfNm; - sfx2::LinkManager::GetDisplayNames( refLink, 0, &sGrfNm, 0, 0 ); + sfx2::LinkManager::GetDisplayNames( refLink, 0, &sGrfNm ); OUString sReferer; SfxObjectShell * sh = GetDoc()->GetPersist(); if (sh != 0 && sh->HasName()) @@ -1150,7 +1150,7 @@ bool SwGrfNode::IsAsyncRetrieveInputStreamPossible() const if ( IsLinkedFile() ) { OUString sGrfNm; - sfx2::LinkManager::GetDisplayNames( refLink, 0, &sGrfNm, 0, 0 ); + sfx2::LinkManager::GetDisplayNames( refLink, 0, &sGrfNm ); if ( !sGrfNm.startsWith( "vnd.sun.star.pkg:" ) ) { bRet = true; diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index f86f0e1f6421..f985b62a7a48 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -2726,7 +2726,7 @@ SdrObject* SwFrameFormat::FindRealSdrObject() { Point aNullPt; SwFlyFrm* pFly = static_cast<SwFlyFrm*>(::GetFrmOfModify( 0, *this, FRM_FLY, - &aNullPt, 0 )); + &aNullPt )); return pFly ? pFly->GetVirtDrawObj() : 0; } return FindSdrObject(); diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx index 78c96d14e590..e404302126ec 100644 --- a/sw/source/core/layout/calcmove.cxx +++ b/sw/source/core/layout/calcmove.cxx @@ -988,7 +988,7 @@ bool SwContentFrm::MakePrtArea( const SwBorderAttrs &rAttrs ) // 4. The spacing for TextFrms corresponds to the interline lead, // at a minimum. - nUpper = CalcUpperSpace( &rAttrs, NULL ); + nUpper = CalcUpperSpace( &rAttrs ); SwTwips nLower = CalcLowerSpace( &rAttrs ); if (IsCollapse()) { diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx index 2d854d6f1917..99a79a07fdc4 100644 --- a/sw/source/core/layout/fly.cxx +++ b/sw/source/core/layout/fly.cxx @@ -500,7 +500,7 @@ void SwFlyFrm::ChainFrames( SwFlyFrm *pMaster, SwFlyFrm *pFollow ) if( (pInva->Frm().*fnRect->fnBottomDist)( nBottom ) <= 0 ) { pInva->InvalidateSize(); - pInva->Prepare( PREP_CLEAR ); + pInva->Prepare(); pInva = pInva->FindPrev(); } else diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index 6bda3ef91575..205f01a763cd 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -1940,7 +1940,7 @@ bool SwLayIdle::_DoIdleJob( const SwContentFrm *pCnt, IdleJobType eJob ) const sal_Int32 nEnd = pTextNode->GetText().getLength(); SwDocStat aStat; pTextNode->CountWords( aStat, 0, nEnd ); - if ( Application::AnyInput( VCL_INPUT_ANY ) ) + if ( Application::AnyInput() ) return true; break; } diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx index 45196fd40632..71ec07ed4526 100644 --- a/sw/source/core/layout/pagechg.cxx +++ b/sw/source/core/layout/pagechg.cxx @@ -289,7 +289,7 @@ void SwPageFrm::CheckGrid( bool bInvalidate ) SwContentFrm* pFrm = pBody->ContainsContent(); while( pBody->IsAnLower( pFrm ) ) { - static_cast<SwTextFrm*>(pFrm)->Prepare( PREP_CLEAR ); + static_cast<SwTextFrm*>(pFrm)->Prepare(); pFrm = pFrm->GetNextContentFrm(); } } diff --git a/sw/source/core/layout/pagedesc.cxx b/sw/source/core/layout/pagedesc.cxx index a236b1c3740b..666161e1b86e 100644 --- a/sw/source/core/layout/pagedesc.cxx +++ b/sw/source/core/layout/pagedesc.cxx @@ -249,7 +249,7 @@ static const SwFrm* lcl_GetFrmOfNode( const SwNode& rNd ) pMod = 0; Point aNullPt; - return pMod ? ::GetFrmOfModify( 0, *pMod, nFrmType, &aNullPt, 0 ) + return pMod ? ::GetFrmOfModify( 0, *pMod, nFrmType, &aNullPt ) : 0; } diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx index dd82bac59dcc..21a67dc585d7 100644 --- a/sw/source/core/layout/sectfrm.cxx +++ b/sw/source/core/layout/sectfrm.cxx @@ -2483,7 +2483,7 @@ SwFootnoteContFrm* SwSectionFrm::ContainsFootnoteCont( const SwFootnoteContFrm* void SwSectionFrm::InvalidateFootnotePos() { - SwFootnoteContFrm* pCont = ContainsFootnoteCont( NULL ); + SwFootnoteContFrm* pCont = ContainsFootnoteCont(); if( pCont ) { SwFrm *pTmp = pCont->ContainsContent(); diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx index 4f06a3824867..462aef106c8c 100644 --- a/sw/source/core/layout/ssfrm.cxx +++ b/sw/source/core/layout/ssfrm.cxx @@ -255,7 +255,7 @@ void SwFrm::CheckDirChange() pBody->AdjustColumns( pCol, true ); } else if( IsTextFrm() ) - static_cast<SwTextFrm*>(this)->Prepare( PREP_CLEAR ); + static_cast<SwTextFrm*>(this)->Prepare(); // #i31698# - notify anchored objects also for page frames. // Remove code above for special handling of page frames diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index e23ab20cb17a..3f9a4887fa67 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -1318,7 +1318,7 @@ void SwInvalidateAll( SwFrm *pFrm, long nBottom ) ::SwInvalidateAll( pToInvalidate->Lower(), nBottom); } else - pFrm->Prepare( PREP_CLEAR ); + pFrm->Prepare(); pFrm = pFrm->GetNext(); } while ( pFrm && diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx index d2dcfd94b1e7..96b513e320f4 100644 --- a/sw/source/core/ole/ndole.cxx +++ b/sw/source/core/ole/ndole.cxx @@ -267,7 +267,7 @@ bool SwOLENode::RestorePersistentData() // What happens to this document? OSL_ENSURE( false, "Why are we creating a DocShell here?" ); p = new SwDocShell( GetDoc(), SfxObjectCreateMode::INTERNAL ); - p->DoInitNew( NULL ); + p->DoInitNew(); } uno::Reference < container::XChild > xChild( aOLEObj.xOLERef.GetObject(), uno::UNO_QUERY ); @@ -427,7 +427,7 @@ SwContentNode* SwOLENode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const // the created document will be closed by pDoc ( should use SfxObjectShellLock ) pPersistShell = new SwDocShell( pDoc, SfxObjectCreateMode::INTERNAL ); pDoc->SetTmpDocShell( pPersistShell ); - pPersistShell->DoInitNew( NULL ); + pPersistShell->DoInitNew(); } // We insert it at SvPersist level @@ -519,7 +519,7 @@ bool SwOLENode::UpdateLinkURL_Impl() if ( mpObjectLink ) { OUString aNewLinkURL; - sfx2::LinkManager::GetDisplayNames( mpObjectLink, 0, &aNewLinkURL, 0, 0 ); + sfx2::LinkManager::GetDisplayNames( mpObjectLink, 0, &aNewLinkURL ); if ( !aNewLinkURL.equalsIgnoreAsciiCase( maLinkURL ) ) { if ( !aOLEObj.xOLERef.is() ) @@ -609,7 +609,7 @@ void SwOLENode::CheckFileLink_Impl() // this is a file link so the model link manager should handle it mpObjectLink = new SwEmbedObjectLink( this ); maLinkURL = aLinkURL; - GetDoc()->getIDocumentLinksAdministration().GetLinkManager().InsertFileLink( *mpObjectLink, OBJECT_CLIENT_OLE, aLinkURL, NULL, NULL ); + GetDoc()->getIDocumentLinksAdministration().GetLinkManager().InsertFileLink( *mpObjectLink, OBJECT_CLIENT_OLE, aLinkURL ); mpObjectLink->Connect(); } } @@ -730,7 +730,7 @@ void SwOLEObj::SetNode( SwOLENode* pNode ) // What happens to the document? OSL_ENSURE( false, "Why are we creating a DocShell here??" ); p = new SwDocShell( pDoc, SfxObjectCreateMode::INTERNAL ); - p->DoInitNew( NULL ); + p->DoInitNew(); } OUString aObjName; diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx b/sw/source/core/swg/SwXMLTextBlocks.cxx index bae58e4439d1..acc880db734d 100644 --- a/sw/source/core/swg/SwXMLTextBlocks.cxx +++ b/sw/source/core/swg/SwXMLTextBlocks.cxx @@ -63,7 +63,7 @@ SwXMLTextBlocks::SwXMLTextBlocks( const OUString& rFile ) , nCurBlk(0) { SwDocShell* pDocSh = new SwDocShell ( SfxObjectCreateMode::INTERNAL ); - if( !pDocSh->DoInitNew( 0 ) ) + if( !pDocSh->DoInitNew() ) return; bReadOnly = true; pDoc = pDocSh->GetDoc(); @@ -109,7 +109,7 @@ SwXMLTextBlocks::SwXMLTextBlocks( const uno::Reference < embed::XStorage >& rStg , nCurBlk(0) { SwDocShell* pDocSh = new SwDocShell ( SfxObjectCreateMode::INTERNAL ); - if( !pDocSh->DoInitNew( 0 ) ) + if( !pDocSh->DoInitNew() ) return; bReadOnly = false; pDoc = pDocSh->GetDoc(); diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx index 53e6ae0e9230..a767b3c40d51 100644 --- a/sw/source/core/text/frmform.cxx +++ b/sw/source/core/text/frmform.cxx @@ -284,7 +284,7 @@ bool SwTextFrm::CalcFollow( const sal_Int32 nTextOfst ) OSL_ENSURE( !pMyFollow->GetPrev(), "SwTextFrm::CalcFollow: cheesy follow" ); if( pMyFollow->GetPrev() ) { - pMyFollow->Prepare( PREP_CLEAR ); + pMyFollow->Prepare(); pMyFollow->Calc(pRenderContext); OSL_ENSURE( !pMyFollow->GetPrev(), "SwTextFrm::CalcFollow: very cheesy follow" ); } @@ -797,7 +797,7 @@ bool SwTextFrm::CalcPreps() if( bPrepMustFit ) { GetFollow()->SetJustWidow( true ); - GetFollow()->Prepare( PREP_CLEAR ); + GetFollow()->Prepare(); } else if ( bVert ) { @@ -823,7 +823,7 @@ bool SwTextFrm::CalcPreps() nChgHeight = (Prt().*fnRect->fnGetHeight)() - nChgHeight; GetFollow()->SetJustWidow( true ); - GetFollow()->Prepare( PREP_CLEAR ); + GetFollow()->Prepare(); Shrink( nChgHeight ); SwRect &rRepaint = pPara->GetRepaint(); diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index 88fc6517c8d6..83632733d67b 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -1082,7 +1082,7 @@ void SwTextPaintInfo::DrawPostIts( const SwLinePortion&, bool bScript ) const void SwTextPaintInfo::DrawCheckBox(const SwFieldFormCheckboxPortion &rPor, bool bChecked) const { SwRect aIntersect; - CalcRect( rPor, &aIntersect, 0 ); + CalcRect( rPor, &aIntersect ); if ( aIntersect.HasArea() ) { if (OnWin() && SwViewOption::IsFieldShadings() && diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx index 5645b7365d05..68bfd3b7cc19 100644 --- a/sw/source/core/text/porrst.cxx +++ b/sw/source/core/text/porrst.cxx @@ -154,9 +154,9 @@ void SwKernPortion::Paint( const SwTextPaintInfo &rInf ) const OUString aTextDouble(" "); SwRect aClipRect; - rInf.CalcRect( *this, &aClipRect, 0 ); + rInf.CalcRect( *this, &aClipRect ); SwSaveClip aClip( const_cast<OutputDevice*>(rInf.GetOut()) ); - aClip.ChgClip( aClipRect, 0 ); + aClip.ChgClip( aClipRect ); rInf.DrawText( aTextDouble, *this, 0, 2, true ); } } diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx index ed54b5a3d160..4dec5172a829 100644 --- a/sw/source/core/text/txtfrm.cxx +++ b/sw/source/core/text/txtfrm.cxx @@ -623,7 +623,7 @@ void SwTextFrm::HideAndShowObjects() sal_Int32 nHiddenStart; sal_Int32 nHiddenEnd; const sal_Int32 nObjAnchorPos = pContact->GetContentAnchorIndex().GetIndex(); - SwScriptInfo::GetBoundsOfHiddenRange( rNode, nObjAnchorPos, nHiddenStart, nHiddenEnd, 0 ); + SwScriptInfo::GetBoundsOfHiddenRange( rNode, nObjAnchorPos, nHiddenStart, nHiddenEnd ); // #120729# - hotfix // under certain conditions if ( nHiddenStart != COMPLETE_STRING && bShouldBeHidden && @@ -918,7 +918,7 @@ void SwTextFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) if( nWhich == RES_FMT_CHG && getRootFrm()->GetCurrShell() ) { // collection has changed - Prepare( PREP_CLEAR ); + Prepare(); _InvalidatePrt(); lcl_SetWrong( *this, 0, COMPLETE_STRING, false ); SetDerivedR2L( false ); @@ -961,7 +961,7 @@ void SwTextFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) if( nPos ) InvalidateSize(); else - Prepare( PREP_CLEAR ); + Prepare(); } else _InvalidateRange( SwCharRange( nPos, nLen ), nLen ); @@ -1170,7 +1170,7 @@ void SwTextFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) { if ( GetPrev() ) CheckKeep(); - Prepare( PREP_CLEAR ); + Prepare(); InvalidateSize(); nClear |= 0x08; --nCount; @@ -1243,7 +1243,7 @@ void SwTextFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) { if( getRootFrm()->GetCurrShell() ) { - Prepare( PREP_CLEAR ); + Prepare(); _InvalidatePrt(); } @@ -1316,7 +1316,7 @@ void SwTextFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) case RES_PARATR_SPLIT: if ( GetPrev() ) CheckKeep(); - Prepare( PREP_CLEAR ); + Prepare(); bSetFieldsDirty = true; break; case RES_FRAMEDIR : @@ -1325,7 +1325,7 @@ void SwTextFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) break; default: { - Prepare( PREP_CLEAR ); + Prepare(); _InvalidatePrt(); if ( !nWhich ) { diff --git a/sw/source/core/tox/ToxTabStopTokenHandler.cxx b/sw/source/core/tox/ToxTabStopTokenHandler.cxx index 70b283865c72..8ac6c227c480 100644 --- a/sw/source/core/tox/ToxTabStopTokenHandler.cxx +++ b/sw/source/core/tox/ToxTabStopTokenHandler.cxx @@ -106,7 +106,7 @@ DefaultToxTabStopTokenHandler::CanUseLayoutRectangle(const SwTextNode& targetNod if (!pageDescription) { return false; } - const SwFrm* pFrm = targetNode.getLayoutFrm(currentLayout, 0, 0); + const SwFrm* pFrm = targetNode.getLayoutFrm(currentLayout); if (!pFrm) { return false; } diff --git a/sw/source/core/tox/ToxTextGenerator.cxx b/sw/source/core/tox/ToxTextGenerator.cxx index 3fc431d48321..bea3a6e4dabd 100644 --- a/sw/source/core/tox/ToxTextGenerator.cxx +++ b/sw/source/core/tox/ToxTextGenerator.cxx @@ -279,7 +279,7 @@ ToxTextGenerator::CollectAttributesForTox(const SwTextAttr& hint, SwAttrPool& po pItem->Which() == RES_CHRATR_POSTURE || pItem->Which() == RES_CHRATR_CJK_POSTURE || pItem->Which() == RES_CHRATR_CTL_POSTURE) { - SfxPoolItem* clonedItem = pItem->Clone(NULL); + SfxPoolItem* clonedItem = pItem->Clone(); retval->Put(*clonedItem); } if (aIter.IsAtEnd()) { diff --git a/sw/source/core/txtnode/atrftn.cxx b/sw/source/core/txtnode/atrftn.cxx index 4bcd38799c57..fe0c97bccf26 100644 --- a/sw/source/core/txtnode/atrftn.cxx +++ b/sw/source/core/txtnode/atrftn.cxx @@ -384,7 +384,7 @@ void SwTextFootnote::CopyFootnote( SwNodeIndex aEnd( *aStart.GetNode().EndOfSectionNode() ); sal_uLong nDestLen = aEnd.GetIndex() - aStart.GetIndex() - 1; - m_pTextNode->GetDoc()->GetDocumentContentOperationsManager().CopyWithFlyInFly( aRg, 0, aEnd, NULL ); + m_pTextNode->GetDoc()->GetDocumentContentOperationsManager().CopyWithFlyInFly( aRg, 0, aEnd ); // in case the destination section was not empty, delete the old nodes // before: Src: SxxxE, Dst: SnE diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx index 9c69382b2e40..0872df429c6d 100644 --- a/sw/source/core/txtnode/thints.cxx +++ b/sw/source/core/txtnode/thints.cxx @@ -1932,7 +1932,7 @@ bool SwTextNode::SetAttr( static_cast<const SwFormatCharFormat*>(pItem)->GetCharFormat())) { SwIndex aIndex( this, nStt ); - RstTextAttr( aIndex, nEnd - nStt, RES_TXTATR_CHARFMT, 0 ); + RstTextAttr( aIndex, nEnd - nStt, RES_TXTATR_CHARFMT ); DontExpandFormat( aIndex ); } else diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx index fd83a21c4ed6..3f9b25959db0 100644 --- a/sw/source/core/undo/undobj.cxx +++ b/sw/source/core/undo/undobj.cxx @@ -841,7 +841,7 @@ void SwUndoSaveSection::SaveSection( // Keep positions as SwIndex so that this section can be deleted in DTOR sal_uLong nEnd; pMvStt = new SwNodeIndex( rRange.aStart ); - MoveToUndoNds(aPam, pMvStt, &nEnd, 0); + MoveToUndoNds(aPam, pMvStt, &nEnd); nMvLen = nEnd - pMvStt->GetIndex() + 1; } @@ -870,7 +870,7 @@ void SwUndoSaveSection::RestoreSection( SwDoc* pDoc, const SwNodeIndex& rInsPos { SwPosition aInsPos( rInsPos ); sal_uLong nEnd = pMvStt->GetIndex() + nMvLen - 1; - MoveFromUndoNds(*pDoc, pMvStt->GetIndex(), aInsPos, &nEnd, 0); + MoveFromUndoNds(*pDoc, pMvStt->GetIndex(), aInsPos, &nEnd); // destroy indices again, content was deleted from UndoNodes array DELETEZ( pMvStt ); diff --git a/sw/source/core/undo/undobj1.cxx b/sw/source/core/undo/undobj1.cxx index 5dd9949910ba..dccacc7f86aa 100644 --- a/sw/source/core/undo/undobj1.cxx +++ b/sw/source/core/undo/undobj1.cxx @@ -621,7 +621,7 @@ void SwUndoSetFlyFormat::RedoImpl(::sw::UndoRedoContext & rContext) rDoc.SetFrameFormatToFly( *pFrameFormat, *pNewFormat, &aSet ); } else - rDoc.SetFrameFormatToFly( *pFrameFormat, *pNewFormat, 0 ); + rDoc.SetFrameFormatToFly( *pFrameFormat, *pNewFormat ); rContext.SetSelections(pFrameFormat, 0); } diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx index 313d2a49d6a8..e4ccc79c3fdd 100644 --- a/sw/source/core/undo/unins.cxx +++ b/sw/source/core/undo/unins.cxx @@ -811,13 +811,13 @@ void SwUndoReRead::SetAndSave(::sw::UndoRedoContext & rContext) if( pOldNm ) { - pGrfNd->ReRead( *pOldNm, pFltr ? *pFltr : OUString(), 0, 0 ); + pGrfNd->ReRead( *pOldNm, pFltr ? *pFltr : OUString() ); delete pOldNm; delete pOldFltr; } else { - pGrfNd->ReRead( OUString(), OUString(), pOldGrf, 0 ); + pGrfNd->ReRead( OUString(), OUString(), pOldGrf ); delete pOldGrf; } diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index c5d140c84bcd..b7cf85fc4236 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -2018,7 +2018,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) SwFormatField aFormatField( *pPostItField ); delete pPostItField; SwPaM aEnd( *aIntPam.End(), *aIntPam.End() ); - m_pImpl->m_pDoc->getIDocumentContentOperations().InsertPoolItem( aEnd, aFormatField, SetAttrMode::DEFAULT ); + m_pImpl->m_pDoc->getIDocumentContentOperations().InsertPoolItem( aEnd, aFormatField ); // delete former annotation { const SwTextField* pTextField = m_pImpl->m_pFormatField->GetTextField(); diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx index 76184e1d0127..de13f04cca58 100644 --- a/sw/source/core/unocore/unoidx.cxx +++ b/sw/source/core/unocore/unoidx.cxx @@ -1376,7 +1376,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) } //TODO: apply Section attributes (columns and background) SwTOXBaseSection *const pTOX = - pDoc->InsertTableOf( *aPam.GetPoint(), rTOXBase, 0 ); + pDoc->InsertTableOf( *aPam.GetPoint(), rTOXBase ); pDoc->SetTOXBaseName(*pTOX, m_pImpl->m_pProps->GetTOXBase().GetTOXName()); diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx index a0a656931fb6..b4d4fb1d789a 100644 --- a/sw/source/filter/basflt/iodetect.cxx +++ b/sw/source/filter/basflt/iodetect.cxx @@ -230,7 +230,7 @@ const SfxFilter* SwIoSystem::GetFileFilter(const OUString& rFileName) return pFilter; } - return SwIoSystem::GetFilterOfFormat(FILTER_TEXT, 0); + return SwIoSystem::GetFilterOfFormat(FILTER_TEXT); } bool SwIoSystem::IsDetectableText(const sal_Char* pBuf, sal_uLong &rLen, diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx index d5b36ef61088..500150427326 100644 --- a/sw/source/filter/basflt/shellio.cxx +++ b/sw/source/filter/basflt/shellio.cxx @@ -500,7 +500,7 @@ SwDoc* Reader::GetTemplateDoc() SwDocShell *pDocSh = new SwDocShell ( SfxObjectCreateMode::INTERNAL ); SfxObjectShellLock xDocSh = pDocSh; - if( pDocSh->DoInitNew( 0 ) ) + if( pDocSh->DoInitNew() ) { pTemplate = pDocSh->GetDoc(); pTemplate->SetOle2Link( Link<bool,void>() ); diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 7d9dd7dae785..061ce303c77b 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -535,7 +535,7 @@ SvParserState SwHTMLParser::CallParser() { if( !bViewCreated ) { - nEventId = Application::PostUserEvent( LINK( this, SwHTMLParser, AsyncCallback ), 0 ); + nEventId = Application::PostUserEvent( LINK( this, SwHTMLParser, AsyncCallback ) ); } else { diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx index 4ed8ffd314ca..aa12283ade93 100644 --- a/sw/source/filter/ww8/docxexport.cxx +++ b/sw/source/filter/ww8/docxexport.cxx @@ -370,7 +370,7 @@ OString DocxExport::WriteOLEObject( SwOLEObj& rObject, const OUString& sMediaTyp { uno::Reference <embed::XEmbeddedObject> xObj( rObject.GetOleRef() ); comphelper::EmbeddedObjectContainer* aContainer = rObject.GetObject().GetContainer(); - uno::Reference< io::XInputStream > xInStream = aContainer->GetObjectStream( xObj, NULL ); + uno::Reference< io::XInputStream > xInStream = aContainer->GetObjectStream( xObj ); OUString sFileName = "embeddings/oleObject" + OUString::number( ++m_nOLEObjects ) + "." + sFileExtension; uno::Reference< io::XOutputStream > xOutStream = GetFilter().openFragmentStream( OUStringBuffer() diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index 281278e1c73e..c0558940a2b4 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -1634,7 +1634,7 @@ sal_Int32 SwBasicEscherEx::WriteGrfBullet(const Graphic& rGrf) } Point aEmptyPoint; Rectangle aRect( aEmptyPoint, aSize ); - sal_uInt32 nBlibId = mxGlobal->GetBlibID( *(mxGlobal->QueryPictureStream()), aUniqueId,aRect, NULL, 0 ); + sal_uInt32 nBlibId = mxGlobal->GetBlibID( *(mxGlobal->QueryPictureStream()), aUniqueId,aRect ); if (nBlibId) aPropOpt.AddOpt(ESCHER_Prop_pib, nBlibId, true); } @@ -1726,7 +1726,7 @@ sal_Int32 SwBasicEscherEx::WriteGrfFlyFrame(const SwFrameFormat& rFormat, sal_uI Rectangle aRect( aEmptyPoint, aSize ); sal_uInt32 nBlibId = mxGlobal->GetBlibID( *QueryPictureStream(), - aUniqueId, aRect, NULL, 0 ); + aUniqueId, aRect ); if (nBlibId) aPropOpt.AddOpt(ESCHER_Prop_pib, nBlibId, true); } @@ -1932,7 +1932,7 @@ void SwBasicEscherEx::WriteBrushAttr(const SvxBrushItem &rBrush, Rectangle aRect(aEmptyPoint, aSize); sal_uInt32 nBlibId = mxGlobal->GetBlibID( *QueryPictureStream(), - aUniqueId, aRect, NULL, 0); + aUniqueId, aRect); if (nBlibId) rPropOpt.AddOpt(ESCHER_Prop_fillBlip,nBlibId,true); } @@ -2301,7 +2301,7 @@ SwEscherEx::SwEscherEx(SvStream* pStrm, WW8Export& rWW8Wrt) OpenContainer( ESCHER_DgContainer ); - EnterGroup( 0 ); + EnterGroup(); sal_uLong nSecondShapeId = pSdrObjs == rWrt.m_pSdrObjs ? GenerateShapeId() : 0; @@ -3057,7 +3057,7 @@ void SwBasicEscherEx::WriteOLEPicture(EscherPropertyContainer &rPropOpt, aRect.Right() = DrawModelToEmu(aRect.Right()); aRect.Bottom() = DrawModelToEmu(aRect.Bottom()); sal_uInt32 nBlibId = mxGlobal->GetBlibID( *QueryPictureStream(), - aId, aRect, pVisArea, 0); // SJ: the fourth parameter (VisArea) should be set.. + aId, aRect, pVisArea); // SJ: the fourth parameter (VisArea) should be set.. if (nBlibId) rPropOpt.AddOpt(ESCHER_Prop_pib, nBlibId, true); } @@ -3192,15 +3192,13 @@ bool SwMSConvertControls::ExportControl(WW8Export &rWW8Wrt, const SdrUnoObj& rFo //Open the ObjectPool tools::SvRef<SotStorage> xObjPool = rWW8Wrt.GetWriter().GetStorage().OpenSotStorage( - OUString(SL::aObjectPool), STREAM_READWRITE | - StreamMode::SHARE_DENYALL); + OUString(SL::aObjectPool)); //Create a destination storage for the microsoft control OUStringBuffer sStorageName; sal_uInt32 nObjId = GenerateObjectID(); sStorageName.append('_').append( static_cast<sal_Int64>( nObjId )); - tools::SvRef<SotStorage> xOleStg = xObjPool->OpenSotStorage(sStorageName.makeStringAndClear(), - STREAM_READWRITE|StreamMode::SHARE_DENYALL); + tools::SvRef<SotStorage> xOleStg = xObjPool->OpenSotStorage(sStorageName.makeStringAndClear()); if (!xOleStg.Is()) return false; diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index 66dfe4feb721..295bfb2bf1ad 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -2955,7 +2955,7 @@ void WW8AttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFormat, const Po { /* Munge flys in fly into absolutely positioned elements for word 6 */ const SwTextNode* pParTextNode = rAnch.GetContentAnchor()->nNode.GetNode().GetTextNode(); - const SwRect aPageRect = pParTextNode->FindPageFrmRect( false, 0 ); + const SwRect aPageRect = pParTextNode->FindPageFrmRect(); aOffset = rFrameFormat.FindLayoutRect().Pos(); aOffset -= aPageRect.Pos(); diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 588dc5f6b276..1cfab9654227 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -2716,8 +2716,7 @@ void WW8Export::WriteFkpPlcUsw() some magic. */ // avoid memory leak #i120098#, the unnamed obj will be released in destructor. - xEscherStg = GetWriter().GetStorage().OpenSotStorage(OUString(SL::aObjectPool), - STREAM_READWRITE | StreamMode::SHARE_DENYALL); + xEscherStg = GetWriter().GetStorage().OpenSotStorage(OUString(SL::aObjectPool)); } // dggInfo - escher stream diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx index 8f9946a323be..56ed88c90ee8 100644 --- a/sw/source/filter/ww8/wrtww8gr.cxx +++ b/sw/source/filter/ww8/wrtww8gr.cxx @@ -210,8 +210,7 @@ void WW8Export::OutputOLENode( const SwOLENode& rOLENode ) pDataAdr = pSpecOLE + 2; //WW6 sprm is 1 but has 1 byte len as well. tools::SvRef<SotStorage> xObjStg = GetWriter().GetStorage().OpenSotStorage( - OUString(SL::aObjectPool), STREAM_READWRITE | - StreamMode::SHARE_DENYALL ); + OUString(SL::aObjectPool) ); if( xObjStg.Is() ) { @@ -232,8 +231,7 @@ void WW8Export::OutputOLENode( const SwOLENode& rOLENode ) Set_UInt32(pDataAdr, nPictureId); OUString sStorageName('_'); sStorageName += OUString::number( nPictureId ); - tools::SvRef<SotStorage> xOleStg = xObjStg->OpenSotStorage( sStorageName, - STREAM_READWRITE| StreamMode::SHARE_DENYALL ); + tools::SvRef<SotStorage> xOleStg = xObjStg->OpenSotStorage( sStorageName ); if( xOleStg.Is() ) { /* @@ -328,13 +326,11 @@ void WW8Export::OutputLinkedOLE( const OUString& rOleId ) tools::SvRef<SotStorage> xObjSrc = SotStorage::OpenOLEStorage( xOleStg, rOleId, StreamMode::READ ); tools::SvRef<SotStorage> xObjStg = GetWriter().GetStorage().OpenSotStorage( - OUString(SL::aObjectPool), STREAM_READWRITE | - StreamMode::SHARE_DENYALL ); + OUString(SL::aObjectPool) ); if( xObjStg.Is() && xObjSrc.Is() ) { - tools::SvRef<SotStorage> xOleDst = xObjStg->OpenSotStorage( rOleId, - STREAM_READWRITE | StreamMode::SHARE_DENYALL ); + tools::SvRef<SotStorage> xOleDst = xObjStg->OpenSotStorage( rOleId ); if ( xOleDst.Is() ) xObjSrc->CopyTo( xOleDst ); diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx index f125f6914893..f89b8fd0098c 100644 --- a/sw/source/filter/ww8/ww8glsy.cxx +++ b/sw/source/filter/ww8/ww8glsy.cxx @@ -207,7 +207,7 @@ bool WW8Glossary::Load( SwTextBlocks &rBlocks, bool bSaveRelFile ) if ( 0 != (nStrings = static_cast< sal_uInt16 >(aStrings.size()))) { SfxObjectShellLock xDocSh(new SwDocShell(SfxObjectCreateMode::INTERNAL)); - if (xDocSh->DoInitNew(0)) + if (xDocSh->DoInitNew()) { SwDoc *pD = static_cast<SwDocShell*>((&xDocSh))->GetDoc(); diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index 580dc9046353..de4bd8f26243 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -3086,7 +3086,7 @@ SwFlyFrameFormat* SwWW8ImplReader::ImportReplaceableDrawables( SdrObject* &rpObj if (rpOurNewObject) { if (!m_bHdFtFootnoteEdn) - m_pMSDffManager->StoreShapeOrder(pF->nSpId, 0, rpOurNewObject, 0 ); + m_pMSDffManager->StoreShapeOrder(pF->nSpId, 0, rpOurNewObject ); // Das Kontakt-Objekt MUSS in die Draw-Page gesetzt werden, damit in // SwWW8ImplReader::LoadDoc1() die Z-Order festgelegt werden kann !!! diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx index 287d51b9aed5..d041ea3ee882 100644 --- a/sw/source/filter/ww8/ww8graf2.cxx +++ b/sw/source/filter/ww8/ww8graf2.cxx @@ -269,7 +269,7 @@ bool SwWW8ImplReader::ReadGrafFile(OUString& rFileName, Graphic*& rpGraphic, GDIMetaFile aWMF; pSt->Seek( nPosFc ); - bool bOk = ReadWindowMetafile( *pSt, aWMF, NULL ); + bool bOk = ReadWindowMetafile( *pSt, aWMF ); if (!bOk || pSt->GetError() || !aWMF.GetActionSize()) return false; diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index f39e0fa00f95..77409e519607 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -577,8 +577,7 @@ SdrObject* SwMSDffManager::ImportOLE( long nOLEId, uno::Reference < embed::XStorage > xDstStg; if( GetOLEStorageName( nOLEId, sStorageName, xSrcStg, xDstStg )) { - tools::SvRef<SotStorage> xSrc = xSrcStg->OpenSotStorage( sStorageName, - STREAM_READWRITE| StreamMode::SHARE_DENYALL ); + tools::SvRef<SotStorage> xSrc = xSrcStg->OpenSotStorage( sStorageName ); OSL_ENSURE(rReader.m_pFormImpl, "No Form Implementation!"); ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape; if ( (!(rReader.m_bIsHeader || rReader.m_bIsFooter)) && @@ -6083,7 +6082,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportDOC(const OUString &rURL SwGlobals::ensure(); SfxObjectShellLock xDocSh(new SwDocShell(SfxObjectCreateMode::INTERNAL)); - xDocSh->DoInitNew(0); + xDocSh->DoInitNew(); SwDoc *pD = static_cast<SwDocShell*>((&xDocSh))->GetDoc(); SwNodeIndex aIdx( diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index 00892215b7bf..35ce8629211a 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -2375,7 +2375,7 @@ void WW8TabDesc::CreateSwTable(SvxULSpaceItem* pULSpaceItem) // rows of a band can be duplicated easy. pTable = pIo->m_rDoc.InsertTable( SwInsertTableOptions( tabopts::HEADLINE_NO_BORDER, 0 ), - *pTmpPos, nBands, nDefaultSwCols, eOri, 0, 0 ); + *pTmpPos, nBands, nDefaultSwCols, eOri ); OSL_ENSURE(pTable && pTable->GetFrameFormat(), "insert table failed"); if (!pTable || !pTable->GetFrameFormat()) @@ -3811,7 +3811,7 @@ bool WW8RStyle::PrepareStyle(SwWW8StyInf &rSI, ww::sti eSti, sal_uInt16 nThisSty } } else if( pIo->m_bNewDoc && bStyExist ) - rSI.pFormat->SetDerivedFrom(0); + rSI.pFormat->SetDerivedFrom(); rSI.nFollow = nNextStyle; // remember Follow diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx index ccf4e87c0957..f14fcbcb4149 100644 --- a/sw/source/filter/ww8/ww8par4.cxx +++ b/sw/source/filter/ww8/ww8par4.cxx @@ -156,7 +156,7 @@ static bool SwWw6ReadMetaStream(GDIMetaFile& rWMF, OLE_MFP* pMfp, OSL_ENSURE( !pSt, "+OLE: size of 0?" ); return false; } - bool bOk = ReadWindowMetafile( *pSt, rWMF, NULL ); // read WMF + bool bOk = ReadWindowMetafile( *pSt, rWMF ); // read WMF // *pSt >> aWMF doesn't work without the placable header if (!bOk || pSt->GetError() || rWMF.GetActionSize() == 0) { @@ -348,8 +348,7 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph, aSrcStgName += OUString::number( m_nObjLocFc ); tools::SvRef<SotStorage> xSrc0 = m_pStg->OpenSotStorage(OUString(SL::aObjectPool)); - tools::SvRef<SotStorage> xSrc1 = xSrc0->OpenSotStorage( aSrcStgName, - STREAM_READWRITE| StreamMode::SHARE_DENYALL ); + tools::SvRef<SotStorage> xSrc1 = xSrc0->OpenSotStorage( aSrcStgName ); if (pGrf) { diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index 189aa79645cc..46bcedfdc550 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -2771,7 +2771,7 @@ void SwXMLTableContext::MakeTable() pLineFormat = static_cast<SwTableLineFormat*>(pLine1->GetFrameFormat()); pBoxFormat = static_cast<SwTableBoxFormat*>(pBox1->GetFrameFormat()); - _MakeTable( 0 ); + _MakeTable(); if( bSetHoriOrient ) pFrameFormat->SetFormatAttr( SwFormatHoriOrient( 0, eHoriOrient ) ); diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx index 9d8447bda9bf..533f2fce92b3 100644 --- a/sw/source/ui/chrdlg/swuiccoll.cxx +++ b/sw/source/ui/chrdlg/swuiccoll.cxx @@ -92,7 +92,7 @@ SwCondCollPage::SwCondCollPage(vcl::Window *pParent, const SfxItemSet &rSet) m_pTbLinks->SetStyle(m_pTbLinks->GetStyle()|WB_HSCROLL|WB_CLIPCHILDREN); m_pTbLinks->SetSelectionMode( SINGLE_SELECTION ); - m_pTbLinks->SetTabs( &nTabs[0], MAP_APPFONT ); + m_pTbLinks->SetTabs( &nTabs[0] ); m_pTbLinks->Resize(); // OS: Hack for the right selection m_pTbLinks->SetSpaceBetweenEntries( 0 ); diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index 5c65f3ff498c..98da05807554 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -974,7 +974,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection, rSh.StartAllAction(); bool bUndo = rSh.DoesUndo(); if( bUndo ) - rSh.StartUndo( UNDO_EMPTY ); + rSh.StartUndo(); bool bAsTable = m_pRbAsTable->IsChecked(); SvNumberFormatter& rNumFormatr = *rSh.GetNumberFormatter(); @@ -1413,7 +1413,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection, { rSh.DoUndo(); rSh.AppendUndoForInsertFromDB( bAsTable ); - rSh.EndUndo( UNDO_EMPTY ); + rSh.EndUndo(); } rSh.ClearMark(); rSh.EndAllAction(); diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx index 6f949aee867a..dbd3d81f2f28 100644 --- a/sw/source/ui/dbui/mmoutputpage.cxx +++ b/sw/source/ui/dbui/mmoutputpage.cxx @@ -748,7 +748,7 @@ IMPL_LINK_TYPED(SwMailMergeOutputPage, SaveOutputHdl_Impl, Button*, pButton, voi //now extract a document from the target document // the shell will be closed at the end, but it is more safe to use SfxObjectShellLock here SfxObjectShellLock xTempDocShell( new SwDocShell( SfxObjectCreateMode::STANDARD ) ); - xTempDocShell->DoInitNew( 0 ); + xTempDocShell->DoInitNew(); SfxViewFrame* pTempFrame = SfxViewFrame::LoadHiddenDocument( *xTempDocShell, 0 ); SwView* pTempView = static_cast<SwView*>( pTempFrame->GetViewShell() ); pTargetView->GetWrtShell().StartAction(); @@ -1146,7 +1146,7 @@ IMPL_LINK_TYPED(SwMailMergeOutputPage, SendDocumentsHdl_Impl, Button*, pButton, //now extract a document from the target document // the shell will be closed at the end, but it is more safe to use SfxObjectShellLock here SfxObjectShellLock xTempDocShell( new SwDocShell( SfxObjectCreateMode::STANDARD ) ); - xTempDocShell->DoInitNew( 0 ); + xTempDocShell->DoInitNew(); SfxViewFrame* pTempFrame = SfxViewFrame::LoadHiddenDocument( *xTempDocShell, 0 ); SwView* pTempView = static_cast<SwView*>( pTempFrame->GetViewShell() ); pTargetView->GetWrtShell().StartAction(); diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 7c5cc8584e60..19f4763050ab 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -1022,7 +1022,7 @@ IMPL_LINK_TYPED( SwEditRegionDlg, UseFileHdl, Button *, pButton, void ) // call dialog paste file IMPL_LINK_NOARG_TYPED(SwEditRegionDlg, FileSearchHdl, Button*, void) { - if(!CheckPasswd(0)) + if(!CheckPasswd()) return; m_pOldDefDlgParent = Application::GetDefDialogParent(); Application::SetDefDialogParent( this ); @@ -1231,7 +1231,7 @@ IMPL_LINK_TYPED( SwEditRegionDlg, DDEHdl, Button*, pButton, void ) IMPL_LINK_TYPED( SwEditRegionDlg, ChangePasswdHdl, Button *, pBox, void ) { bool bChange = pBox == m_pPasswdPB; - if(!CheckPasswd(0)) + if(!CheckPasswd()) { if(!bChange) m_pPasswdCB->Check(!m_pPasswdCB->IsChecked()); @@ -1284,7 +1284,7 @@ IMPL_LINK_TYPED( SwEditRegionDlg, ChangePasswdHdl, Button *, pBox, void ) // editing, with empty string no Ok() IMPL_LINK_NOARG_TYPED(SwEditRegionDlg, NameEditHdl, Edit&, void) { - if(!CheckPasswd(0)) + if(!CheckPasswd()) return; SvTreeListEntry* pEntry = m_pTree->FirstSelected(); OSL_ENSURE(pEntry,"no entry found"); @@ -1302,7 +1302,7 @@ IMPL_LINK_NOARG_TYPED(SwEditRegionDlg, NameEditHdl, Edit&, void) IMPL_LINK_TYPED( SwEditRegionDlg, ConditionEditHdl, Edit&, rEdit, void ) { Selection aSelect = rEdit.GetSelection(); - if(!CheckPasswd(0)) + if(!CheckPasswd()) return; rEdit.SetSelection(aSelect); SvTreeListEntry* pEntry = m_pTree->FirstSelected(); @@ -2199,7 +2199,7 @@ void SwSectionIndentTabPage::SetWrtShell(SwWrtShell& rSh) //set sensible values at the preview m_pPreviewWin->SetAdjust(SVX_ADJUST_BLOCK); m_pPreviewWin->SetLastLine(SVX_ADJUST_BLOCK); - const SwRect& rPageRect = rSh.GetAnyCurRect( RECT_PAGE, 0 ); + const SwRect& rPageRect = rSh.GetAnyCurRect( RECT_PAGE ); Size aPageSize(rPageRect.Width(), rPageRect.Height()); m_pPreviewWin->SetSize(aPageSize); } diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 95b8aee2f1c9..f3b0f1d5ab0b 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -2235,14 +2235,14 @@ void SwFrmPage::Init(const SfxItemSet& rSet, bool bReset) m_pAutoHeightCB->Check( bCheck ); HandleAutoCB( bCheck, *m_pHeightFT, *m_pHeightAutoFT, *m_aWidthED.get() ); if( eSize == ATT_VAR_SIZE ) - m_aHeightED.SetValue( m_aHeightED.GetMin(), FUNIT_NONE ); + m_aHeightED.SetValue( m_aHeightED.GetMin() ); eSize = rSize.GetWidthSizeType(); bCheck = eSize != ATT_FIX_SIZE; m_pAutoWidthCB->Check( bCheck ); HandleAutoCB( bCheck, *m_pWidthFT, *m_pWidthAutoFT, *m_aWidthED.get() ); if( eSize == ATT_VAR_SIZE ) - m_aWidthED.SetValue( m_aWidthED.GetMin(), FUNIT_NONE ); + m_aWidthED.SetValue( m_aWidthED.GetMin() ); if ( !bFormat ) { diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index d4cad9b07265..529d04b8897e 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -3883,8 +3883,7 @@ SwEntryBrowseBox::SwEntryBrowseBox(vcl::Window* pParent, VclBuilderContainer* pB nWidth /=7; --nWidth; for(sal_uInt16 i = 1; i < 8; i++) - InsertDataColumn( i, *aTitles[i - 1], nWidth, - HeaderBarItemBits::STDSTYLE ); + InsertDataColumn( i, *aTitles[i - 1], nWidth ); } SwEntryBrowseBox::~SwEntryBrowseBox() diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx index 59d9bf13e465..576e8821ecb8 100644 --- a/sw/source/ui/misc/glosbib.cxx +++ b/sw/source/ui/misc/glosbib.cxx @@ -67,7 +67,7 @@ SwGlossaryGroupDlg::SwGlossaryGroupDlg(vcl::Window * pParent, 0, nAppFontUnits }; - m_pGroupTLB->SetTabs( &nTabs[0], MAP_APPFONT ); + m_pGroupTLB->SetTabs( &nTabs[0] ); m_pGroupTLB->SetSelectHdl(LINK(this, SwGlossaryGroupDlg, SelectHdl)); m_pGroupTLB->GetModel()->SetSortMode(SortAscending); m_pNewPB->SetClickHdl(LINK(this, SwGlossaryGroupDlg, NewHdl)); diff --git a/sw/source/uibase/app/appenv.cxx b/sw/source/uibase/app/appenv.cxx index bb5dcef67782..efa59c5fd6fd 100644 --- a/sw/source/uibase/app/appenv.cxx +++ b/sw/source/uibase/app/appenv.cxx @@ -160,7 +160,7 @@ void SwModule::InsertEnv( SfxRequest& rReq ) // Create new document (don't show!) SfxObjectShellLock xDocSh( new SwDocShell( SfxObjectCreateMode::STANDARD ) ); - xDocSh->DoInitNew( 0 ); + xDocSh->DoInitNew(); pFrame = SfxViewFrame::LoadHiddenDocument( *xDocSh, 0 ); pNewView = static_cast<SwView*>( pFrame->GetViewShell()); pNewView->AttrChangedNotify( &pNewView->GetWrtShell() ); // so that SelectShell is being called @@ -268,7 +268,7 @@ void SwModule::InsertEnv( SfxRequest& rReq ) //not be deleted on inserting envelopes pSh->EnterStdMode(); // Here it goes (insert) - pSh->StartUndo(UNDO_UI_INSERT_ENVELOPE, NULL); + pSh->StartUndo(UNDO_UI_INSERT_ENVELOPE); pSh->StartAllAction(); pSh->SttEndDoc(true); diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx index e4166bfc0fb4..09f6414684f4 100644 --- a/sw/source/uibase/app/apphdl.cxx +++ b/sw/source/uibase/app/apphdl.cxx @@ -911,7 +911,7 @@ void NewXForms( SfxRequest& rReq ) // create new document SfxObjectShellLock xDocSh( new SwDocShell( SfxObjectCreateMode::STANDARD) ); - xDocSh->DoInitNew( 0 ); + xDocSh->DoInitNew(); // initialize XForms static_cast<SwDocShell*>( &xDocSh )->GetDoc()->initXForms( true ); diff --git a/sw/source/uibase/app/applab.cxx b/sw/source/uibase/app/applab.cxx index 0eb052492ba3..d643ae567230 100644 --- a/sw/source/uibase/app/applab.cxx +++ b/sw/source/uibase/app/applab.cxx @@ -191,7 +191,7 @@ void SwModule::InsertLab(SfxRequest& rReq, bool bLabel) // Create new document SfxObjectShellLock xDocSh( new SwDocShell( SfxObjectCreateMode::STANDARD)); - xDocSh->DoInitNew( 0 ); + xDocSh->DoInitNew(); // Printer Printer *pPrt = pDlg->GetPrt(); diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index b6dd0809eca0..2d88c5bb58b8 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -875,7 +875,7 @@ Rectangle SwDocShell::GetVisArea( sal_uInt16 nAspect ) const SwNodeIndex aIdx( m_pDoc->GetNodes().GetEndOfExtras(), 1 ); SwContentNode* pNd = m_pDoc->GetNodes().GoNext( &aIdx ); - const SwRect aPageRect = pNd->FindPageFrmRect( false, 0 ); + const SwRect aPageRect = pNd->FindPageFrmRect(); return aPageRect.SVRect(); } return SfxObjectShell::GetVisArea( nAspect ); @@ -1115,7 +1115,7 @@ void SwDocShell::LoadingFinished() // before <FinishedLoading(..)> is called. const bool bHasDocToStayModified( m_pDoc->getIDocumentState().IsModified() && m_pDoc->getIDocumentLinksAdministration().LinksUpdated() ); - FinishedLoading( SfxLoadedFlags::ALL ); + FinishedLoading(); SfxViewFrame* pVFrame = SfxViewFrame::GetFirst(this); if(pVFrame) { diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx index 68f5f9c172ba..fd7d888a1d51 100644 --- a/sw/source/uibase/app/docsh2.cxx +++ b/sw/source/uibase/app/docsh2.cxx @@ -700,7 +700,7 @@ void SwDocShell::Execute(SfxRequest& rReq) sal_uInt8 nPara = pDlg->GetPara(); SwDoc* pSmryDoc = new SwDoc(); SfxObjectShellLock xDocSh( new SwDocShell( pSmryDoc, SfxObjectCreateMode::STANDARD)); - xDocSh->DoInitNew( 0 ); + xDocSh->DoInitNew(); bool bImpress = FN_ABSTRACT_STARIMPRESS == nWhich; m_pDoc->Summary( pSmryDoc, nLevel, nPara, bImpress ); diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx index 92d266117c2f..a9c70c29f185 100644 --- a/sw/source/uibase/app/docstyle.cxx +++ b/sw/source/uibase/app/docstyle.cxx @@ -1401,7 +1401,7 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet, const OUString sStyle = pCondItem->GetStyle( i ); if (sStyle.isEmpty()) continue; - SwFormat *const pFindFormat = lcl_FindParaFormat( rDoc, sStyle, 0 ); + SwFormat *const pFindFormat = lcl_FindParaFormat( rDoc, sStyle ); if (pFindFormat) { aCond.RegisterToFormat( *pFindFormat ); @@ -1433,7 +1433,7 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet, const OUString sStyle = pCondItem->GetStyle( i ); if (sStyle.isEmpty()) continue; - SwTextFormatColl *const pFindFormat = lcl_FindParaFormat( rDoc, sStyle, 0 ); + SwTextFormatColl *const pFindFormat = lcl_FindParaFormat( rDoc, sStyle ); if (pFindFormat) { pCColl->InsertCondition( SwCollCondition( pFindFormat, @@ -1445,9 +1445,9 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet, pColl = pCColl; } if ( bResetIndentAttrsAtParagraphStyle && - rSet.GetItemState( RES_PARATR_NUMRULE, false, 0 ) == SfxItemState::SET && - rSet.GetItemState( RES_LR_SPACE, false, 0 ) != SfxItemState::SET && - pColl->GetItemState( RES_LR_SPACE, false, 0 ) == SfxItemState::SET ) + rSet.GetItemState( RES_PARATR_NUMRULE, false ) == SfxItemState::SET && + rSet.GetItemState( RES_LR_SPACE, false ) != SfxItemState::SET && + pColl->GetItemState( RES_LR_SPACE, false ) == SfxItemState::SET ) { rDoc.ResetAttrAtFormat( RES_LR_SPACE, *pColl ); } diff --git a/sw/source/uibase/config/modcfg.cxx b/sw/source/uibase/config/modcfg.cxx index be274b9747de..eb03eaeddaf8 100644 --- a/sw/source/uibase/config/modcfg.cxx +++ b/sw/source/uibase/config/modcfg.cxx @@ -649,9 +649,9 @@ void SwInsertConfig::ImplCommit() const InsCaptionOpt* pOLEDrawOpt = 0; if(pCapOptions) { - pWriterTableOpt = pCapOptions->Find(TABLE_CAP, 0); - pWriterFrameOpt = pCapOptions->Find(FRAME_CAP, 0); - pWriterGraphicOpt = pCapOptions->Find(GRAPHIC_CAP, 0); + pWriterTableOpt = pCapOptions->Find(TABLE_CAP); + pWriterFrameOpt = pCapOptions->Find(FRAME_CAP); + pWriterGraphicOpt = pCapOptions->Find(GRAPHIC_CAP); pOLECalcOpt = pCapOptions->Find(OLE_CAP, &aGlobalNames[GLOB_NAME_CALC]); pOLEImpressOpt = pCapOptions->Find(OLE_CAP, &aGlobalNames[GLOB_NAME_IMPRESS]); pOLEDrawOpt = pCapOptions->Find(OLE_CAP, &aGlobalNames[GLOB_NAME_DRAW ]); @@ -883,9 +883,9 @@ void SwInsertConfig::Load() InsCaptionOpt* pOLEDrawOpt = 0; if (pCapOptions) { - pWriterTableOpt = pCapOptions->Find(TABLE_CAP, 0); - pWriterFrameOpt = pCapOptions->Find(FRAME_CAP, 0); - pWriterGraphicOpt = pCapOptions->Find(GRAPHIC_CAP, 0); + pWriterTableOpt = pCapOptions->Find(TABLE_CAP); + pWriterFrameOpt = pCapOptions->Find(FRAME_CAP); + pWriterGraphicOpt = pCapOptions->Find(GRAPHIC_CAP); pOLECalcOpt = pCapOptions->Find(OLE_CAP, &aGlobalNames[GLOB_NAME_CALC]); pOLEImpressOpt = pCapOptions->Find(OLE_CAP, &aGlobalNames[GLOB_NAME_IMPRESS]); pOLEDrawOpt = pCapOptions->Find(OLE_CAP, &aGlobalNames[GLOB_NAME_DRAW ]); diff --git a/sw/source/uibase/config/uinums.cxx b/sw/source/uibase/config/uinums.cxx index 427c085ac819..bc33fb86d2f7 100644 --- a/sw/source/uibase/config/uinums.cxx +++ b/sw/source/uibase/config/uinums.cxx @@ -84,7 +84,7 @@ void SwChapterNumRules::Init() OUString sNm(CHAPTER_FILENAME); SvtPathOptions aOpt; - if( aOpt.SearchFile( sNm, SvtPathOptions::PATH_USERCONFIG )) + if( aOpt.SearchFile( sNm )) { SfxMedium aStrm( sNm, STREAM_STD_READ ); sw::ImportStoredChapterNumberingRules(*this, *aStrm.GetInStream(), diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index 92f929e5d2b1..278fad0bccbd 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -545,7 +545,7 @@ void SwDBManager::ImportFromConnection( SwWrtShell* pSh ) { { pSh->StartAllAction(); - pSh->StartUndo(UNDO_EMPTY); + pSh->StartUndo(); bool bGroupUndo(pSh->DoesGroupUndo()); pSh->DoGroupUndo(false); @@ -566,7 +566,7 @@ void SwDBManager::ImportFromConnection( SwWrtShell* pSh ) } pSh->DoGroupUndo(bGroupUndo); - pSh->EndUndo(UNDO_EMPTY); + pSh->EndUndo(); pSh->EndAllAction(); } } @@ -1032,7 +1032,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell, { // create a target docshell to put the merged document into xTargetDocShell = new SwDocShell( SfxObjectCreateMode::STANDARD ); - xTargetDocShell->DoInitNew( 0 ); + xTargetDocShell->DoInitNew(); if (nMaxDumpDocs) lcl_SaveDoc( xTargetDocShell, "MergeDoc" ); SfxViewFrame* pTargetFrame = SfxViewFrame::LoadHiddenDocument( *xTargetDocShell, 0 ); @@ -2100,7 +2100,7 @@ bool SwDBManager::FillCalcWithMergeData( SvNumberFormatter *pDocFormatter, // aNumber is overwritten by SwDBField::FormatValue, so store initial status bool colIsNumber = aNumber != DBL_MAX; bool bValidValue = SwDBField::FormatValue( pDocFormatter, aString, nFormat, - aNumber, nColumnType, NULL ); + aNumber, nColumnType ); if( colIsNumber ) { if( bValidValue ) diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index eda6c25fe60b..5b46cd3f5ff2 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -597,7 +597,7 @@ bool SwTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo SwDocShell* pNewDocSh = new SwDocShell( pDoc, SfxObjectCreateMode::EMBEDDED ); m_aDocShellRef = pNewDocSh; - m_aDocShellRef->DoInitNew( NULL ); + m_aDocShellRef->DoInitNew(); SwTransferable::InitOle( m_aDocShellRef, *pDoc ); } bOK = SetObject( &m_aDocShellRef, SWTRANSFER_OBJECTTYPE_SWOLE, @@ -826,7 +826,7 @@ int SwTransferable::PrepareForCopy( bool bIsCut ) m_pClpDocFac = new SwDocFac; SwDoc *const pDoc = lcl_GetDoc(*m_pClpDocFac); m_aDocShellRef = new SwDocShell( pDoc, SfxObjectCreateMode::EMBEDDED); - m_aDocShellRef->DoInitNew( NULL ); + m_aDocShellRef->DoInitNew(); m_pWrtShell->Copy( pDoc ); AddFormat( SotClipboardFormatId::EMBED_SOURCE ); @@ -1056,7 +1056,7 @@ int SwTransferable::CopyGlossary( SwTextBlocks& rGlossary, const OUString& rStr pCDoc->getIDocumentFieldsAccess().LockExpFields(); // never update fields - leave text as it is - pCDoc->InsertGlossary( rGlossary, rStr, aPam, 0 ); + pCDoc->InsertGlossary( rGlossary, rStr, aPam ); // a new one was created in CORE (OLE-Objects copied!) m_aDocShellRef = pCDoc->GetTmpDocShell(); diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx b/sw/source/uibase/docvw/PageBreakWin.cxx index 7ea5db098421..cc180b5cd0d0 100644 --- a/sw/source/uibase/docvw/PageBreakWin.cxx +++ b/sw/source/uibase/docvw/PageBreakWin.cxx @@ -289,7 +289,7 @@ void SwPageBreakWin::Select( ) aSet.Put( SwFormatPageDesc( NULL ) ); SwPaM aPaM( *pNd ); - pNd->GetDoc()->getIDocumentContentOperations().InsertItemSet( aPaM, aSet, SetAttrMode::DEFAULT ); + pNd->GetDoc()->getIDocumentContentOperations().InsertItemSet( aPaM, aSet ); pNd->GetDoc()->GetIDocumentUndoRedo( ).EndUndo( UNDO_UI_DELETE_PAGE_BREAK, NULL ); } diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx index d06acb2f7a72..44c6602999e0 100644 --- a/sw/source/uibase/docvw/PostItMgr.cxx +++ b/sw/source/uibase/docvw/PostItMgr.cxx @@ -161,7 +161,7 @@ SwPostItMgr::SwPostItMgr(SwView* pView) if (!mvPostItFields.empty()) { mbWaitingForCalcRects = true; - mnEventId = Application::PostUserEvent( LINK( this, SwPostItMgr, CalcHdl), 0 ); + mnEventId = Application::PostUserEvent( LINK( this, SwPostItMgr, CalcHdl) ); } } @@ -262,7 +262,7 @@ void SwPostItMgr::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) if ( !mbWaitingForCalcRects && !mvPostItFields.empty()) { mbWaitingForCalcRects = true; - mnEventId = Application::PostUserEvent( LINK( this, SwPostItMgr, CalcHdl), 0 ); + mnEventId = Application::PostUserEvent( LINK( this, SwPostItMgr, CalcHdl) ); } } } @@ -288,7 +288,7 @@ void SwPostItMgr::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) if ( !mbWaitingForCalcRects && !mvPostItFields.empty()) { mbWaitingForCalcRects = true; - mnEventId = Application::PostUserEvent( LINK( this, SwPostItMgr, CalcHdl), 0 ); + mnEventId = Application::PostUserEvent( LINK( this, SwPostItMgr, CalcHdl) ); } } break; diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx index bda41ecf7786..46f0039016f2 100644 --- a/sw/source/uibase/lingu/olmenu.cxx +++ b/sw/source/uibase/lingu/olmenu.cxx @@ -218,8 +218,8 @@ void SwSpellPopup::fillLangPopupMenu( if ( SvtLanguageTable::GetLanguageString( LANGUAGE_NONE ) == aCurLang ) pPopupMenu->CheckItem( nLangItemIdStart + MN_NONE_OFFSET ); - pPopupMenu->InsertItem( nLangItemIdStart + MN_RESET_OFFSET, OUString(SW_RES( STR_RESET_TO_DEFAULT_LANGUAGE )), MenuItemBits::NONE ); - pPopupMenu->InsertItem( nLangItemIdStart + MN_MORE_OFFSET, OUString(SW_RES( STR_LANGSTATUS_MORE )), MenuItemBits::NONE ); + pPopupMenu->InsertItem( nLangItemIdStart + MN_RESET_OFFSET, OUString(SW_RES( STR_RESET_TO_DEFAULT_LANGUAGE )) ); + pPopupMenu->InsertItem( nLangItemIdStart + MN_MORE_OFFSET, OUString(SW_RES( STR_LANGSTATUS_MORE )) ); } OUString RetrieveLabelFromCommand( const OUString& aCmdURL ) diff --git a/sw/source/uibase/misc/glshell.cxx b/sw/source/uibase/misc/glshell.cxx index 9774f7e05412..38fe702238f1 100644 --- a/sw/source/uibase/misc/glshell.cxx +++ b/sw/source/uibase/misc/glshell.cxx @@ -215,7 +215,7 @@ SwDocShellRef SwGlossaries::EditGroupDoc( const OUString& rGroup, const OUString { SwWebGlosDocShell* pDocSh = new SwWebGlosDocShell(); xDocSh = pDocSh; - pDocSh->DoInitNew( 0 ); + pDocSh->DoInitNew(); pDocSh->SetLongName( sLongName ); pDocSh->SetShortName( rShortName); pDocSh->SetGroupName( rGroup ); @@ -224,7 +224,7 @@ SwDocShellRef SwGlossaries::EditGroupDoc( const OUString& rGroup, const OUString { SwGlosDocShell* pDocSh = new SwGlosDocShell(bShow); xDocSh = pDocSh; - pDocSh->DoInitNew( 0 ); + pDocSh->DoInitNew(); pDocSh->SetLongName( sLongName ); pDocSh->SetShortName( rShortName ); pDocSh->SetGroupName( rGroup ); diff --git a/sw/source/uibase/ribbar/drawbase.cxx b/sw/source/uibase/ribbar/drawbase.cxx index 90226cd4ae2b..e302afa0b5da 100644 --- a/sw/source/uibase/ribbar/drawbase.cxx +++ b/sw/source/uibase/ribbar/drawbase.cxx @@ -199,7 +199,7 @@ bool SwDrawBase::MouseButtonDown(const MouseEvent& rMEvt) } } if (!m_pSh->IsSelFrmMode()) - m_pSh->EnterSelFrmMode(NULL); + m_pSh->EnterSelFrmMode(); if( (bReturn = m_pSh->BeginMark(m_aStartPos)) ) m_pWin->SetDrawAction(true); diff --git a/sw/source/uibase/shells/grfsh.cxx b/sw/source/uibase/shells/grfsh.cxx index 0a5120785575..a64baf5692ef 100644 --- a/sw/source/uibase/shells/grfsh.cxx +++ b/sw/source/uibase/shells/grfsh.cxx @@ -442,7 +442,7 @@ void SwGrfShell::Execute(SfxRequest &rReq) rSh.ReRead( URIHelper::SmartRel2Abs( aAbs, sGrfNm, URIHelper::GetMaybeFileHdl() ), - sFilterNm, 0 ); + sFilterNm ); } } if ( SfxItemState::SET == pSet->GetItemState( diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx index d004a735f1d5..0c254c7b2fa2 100644 --- a/sw/source/uibase/shells/textsh.cxx +++ b/sw/source/uibase/shells/textsh.cxx @@ -254,7 +254,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) INetURLObject url; url.SetSmartProtocol( INetProtocol::File ); - if ( url.SetURL( aStrURL, INetURLObject::WAS_ENCODED ) ) + if ( url.SetURL( aStrURL ) ) { OUString aName; comphelper::EmbeddedObjectContainer aCnt; diff --git a/sw/source/uibase/shells/txtattr.cxx b/sw/source/uibase/shells/txtattr.cxx index 7f6e9382a40c..ddd1de7e8288 100644 --- a/sw/source/uibase/shells/txtattr.cxx +++ b/sw/source/uibase/shells/txtattr.cxx @@ -236,7 +236,7 @@ void SwTextShell::ExecCharAttrArgs(SfxRequest &rReq) else vItems = rWrtSh.GetItemWithPaM( RES_CHRATR_FONTSIZE ); - rWrtSh.StartUndo( UNDO_INSATTR, NULL); + rWrtSh.StartUndo( UNDO_INSATTR ); for( std::pair< const SfxPoolItem*, std::unique_ptr<SwPaM> >& iPair : vItems ) { std::unique_ptr<SwPaM> pPaM = std::move(iPair.second); @@ -265,7 +265,7 @@ void SwTextShell::ExecCharAttrArgs(SfxRequest &rReq) rWrtSh.SetAttrSet( aAttrSet, SetAttrMode::DEFAULT, pPaM.get() ); } } - rWrtSh.EndUndo( UNDO_INSATTR, NULL); + rWrtSh.EndUndo( UNDO_INSATTR ); rReq.Done(); } break; diff --git a/sw/source/uibase/shells/txtnum.cxx b/sw/source/uibase/shells/txtnum.cxx index 9b3e89563f7d..1db6124b9e3a 100644 --- a/sw/source/uibase/shells/txtnum.cxx +++ b/sw/source/uibase/shells/txtnum.cxx @@ -151,7 +151,7 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq) // #i89178# numfunc::GetDefaultPositionAndSpaceMode() ); SvxNumRule aSvxRule = aRule.MakeSvxNumRule(); - const bool bRightToLeft = GetShell().IsInRightToLeftText( 0 ); + const bool bRightToLeft = GetShell().IsInRightToLeftText(); if ( bHtml || bRightToLeft ) { diff --git a/sw/source/uibase/sidebar/StylePresetsPanel.cxx b/sw/source/uibase/sidebar/StylePresetsPanel.cxx index ab1ca1189c6c..8351617a40ba 100644 --- a/sw/source/uibase/sidebar/StylePresetsPanel.cxx +++ b/sw/source/uibase/sidebar/StylePresetsPanel.cxx @@ -133,7 +133,7 @@ BitmapEx CreatePreview(OUString& aUrl, OUString& aName) SfxMedium aMedium(aUrl, STREAM_STD_READWRITE); SfxObjectShell* pObjectShell = SfxObjectShell::Current(); SfxObjectShellLock xTemplDoc = SfxObjectShell::CreateObjectByFactoryName(pObjectShell->GetFactory().GetFactoryName(), SfxObjectCreateMode::ORGANIZER); - xTemplDoc->DoInitNew(0); + xTemplDoc->DoInitNew(); if (xTemplDoc->LoadFrom(aMedium)) { return GenerateStylePreview(*xTemplDoc, aName); diff --git a/sw/source/uibase/uiview/viewdraw.cxx b/sw/source/uibase/uiview/viewdraw.cxx index 421f2dce5a7e..a00996a27d30 100644 --- a/sw/source/uibase/uiview/viewdraw.cxx +++ b/sw/source/uibase/uiview/viewdraw.cxx @@ -241,7 +241,7 @@ void SwView::ExecDraw(SfxRequest& rReq) } if (m_pWrtShell->IsObjSelected() && !m_pWrtShell->IsSelFrmMode()) - m_pWrtShell->EnterSelFrmMode(NULL); + m_pWrtShell->EnterSelFrmMode(); LeaveDrawCreate(); GetViewFrame()->GetBindings().Invalidate(SID_INSERT_DRAW); @@ -384,7 +384,7 @@ void SwView::ExecDraw(SfxRequest& rReq) else { if (m_pWrtShell->IsObjSelected() && !m_pWrtShell->IsSelFrmMode()) - m_pWrtShell->EnterSelFrmMode(NULL); + m_pWrtShell->EnterSelFrmMode(); } if(bEndTextEdit && pSdrView && pSdrView->IsTextEdit()) diff --git a/sw/source/uibase/uiview/viewprt.cxx b/sw/source/uibase/uiview/viewprt.cxx index 760e480c355f..04c4ac34680f 100644 --- a/sw/source/uibase/uiview/viewprt.cxx +++ b/sw/source/uibase/uiview/viewprt.cxx @@ -232,7 +232,7 @@ void SwView::ExecutePrint(SfxRequest& rReq) //#i61455# if master documentes are printed silently without loaded links then update the links now if( bSilent && pSh->IsGlobalDoc() && !pSh->IsGlblDocSaveLinks() ) { - pSh->GetLinkManager().UpdateAllLinks( false, false, false, 0 ); + pSh->GetLinkManager().UpdateAllLinks( false, false ); } SfxRequest aReq( rReq ); SfxBoolItem aBool(SID_SELECTION, bPrintSelection); diff --git a/sw/source/uibase/uiview/viewtab.cxx b/sw/source/uibase/uiview/viewtab.cxx index fbb5d3ba5ec1..921eacd5669b 100644 --- a/sw/source/uibase/uiview/viewtab.cxx +++ b/sw/source/uibase/uiview/viewtab.cxx @@ -358,8 +358,8 @@ void SwView::ExecTabWin( SfxRequest& rReq ) { //change the section indents and the columns if available //at first determine the changes - SwRect aSectRect = rSh.GetAnyCurRect(RECT_SECTION_PRT, 0); - const SwRect aTmpRect = rSh.GetAnyCurRect(RECT_SECTION, 0); + SwRect aSectRect = rSh.GetAnyCurRect(RECT_SECTION_PRT); + const SwRect aTmpRect = rSh.GetAnyCurRect(RECT_SECTION); aSectRect.Pos() += aTmpRect.Pos(); long nLeftDiff = aLongLR.GetLeft() - (long)(aSectRect.Left() - rPageRect.Left() ); long nRightDiff = aLongLR.GetRight() - (long)( rPageRect.Right() - aSectRect.Right()); @@ -471,8 +471,8 @@ void SwView::ExecTabWin( SfxRequest& rReq ) { //change the section indents and the columns if available //at first determine the changes - SwRect aSectRect = rSh.GetAnyCurRect(RECT_SECTION_PRT, 0); - const SwRect aTmpRect = rSh.GetAnyCurRect(RECT_SECTION, 0); + SwRect aSectRect = rSh.GetAnyCurRect(RECT_SECTION_PRT); + const SwRect aTmpRect = rSh.GetAnyCurRect(RECT_SECTION); aSectRect.Pos() += aTmpRect.Pos(); const long nLeftDiff = aLongULSpace.GetUpper() - (long)(aSectRect.Top() - rPageRect.Top()); const long nRightDiff = aLongULSpace.GetLower() - (long)(nPageHeight - aSectRect.Bottom() + rPageRect.Top()); diff --git a/sw/source/uibase/uno/unomailmerge.cxx b/sw/source/uibase/uno/unomailmerge.cxx index 657d5d54d6a1..df76382caa63 100644 --- a/sw/source/uibase/uno/unomailmerge.cxx +++ b/sw/source/uibase/uno/unomailmerge.cxx @@ -385,7 +385,7 @@ SwXMailMerge::SwXMailMerge() : // create empty document // like in: SwModule::InsertEnv (appenv.cxx) xDocSh = new SwDocShell( SfxObjectCreateMode::STANDARD ); - xDocSh->DoInitNew( 0 ); + xDocSh->DoInitNew(); SfxViewFrame *pFrame = SfxViewFrame::LoadHiddenDocument( *xDocSh, 0 ); SwView *pView = static_cast<SwView*>( pFrame->GetViewShell() ); pView->AttrChangedNotify( &pView->GetWrtShell() ); //So that SelectShell is called. diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index e37d68a55cc4..3cd15f0ca1b7 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -191,7 +191,7 @@ static SwPrintUIOptions * lcl_GetPrintUIOptions( if (pSh) { SwPaM* pShellCrsr = pSh->GetCrsr(); - nCurrentPage = pShellCrsr->GetPageNum(true, 0); + nCurrentPage = pShellCrsr->GetPageNum(); } else if (!bSwSrcView) { @@ -900,8 +900,7 @@ SwUnoCrsr* SwXTextDocument::FindAny(const Reference< util::XSearchDescriptor > & nResult = (sal_Int32)pUnoCrsr->Find( aSearch, !pSearch->bStyles, eStart, eEnd, bCancel, (FindRanges)eRanges, - !pSearch->sSearchText.isEmpty() ? &aSearchOpt : 0, - 0 ); + !pSearch->sSearchText.isEmpty() ? &aSearchOpt : 0 ); } else if(pSearch->bStyles) { diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx index bc17d71536b1..9b8a22effcf2 100644 --- a/sw/source/uibase/uno/unotxvw.cxx +++ b/sw/source/uibase/uno/unotxvw.cxx @@ -645,7 +645,7 @@ SfxObjectShellLock SwXTextView::BuildTmpSelectionDoc() SfxPrinter *pPrt = rOldSh.getIDocumentDeviceAccess().getPrinter( false ); SwDocShell* pDocSh; SfxObjectShellLock xDocSh( pDocSh = new SwDocShell( /*pPrtDoc, */SfxObjectCreateMode::STANDARD ) ); - xDocSh->DoInitNew( 0 ); + xDocSh->DoInitNew(); SwDoc *const pTempDoc( pDocSh->GetDoc() ); // #i103634#, #i112425#: do not expand numbering and fields on PDF export pTempDoc->SetClipBoard(true); @@ -1314,7 +1314,7 @@ sal_Int16 SwXTextViewCursor::getPage() { SwWrtShell& rSh = m_pView->GetWrtShell(); SwPaM* pShellCrsr = rSh.GetCrsr(); - nRet = static_cast<sal_Int16>(pShellCrsr->GetPageNum( true, 0 )); + nRet = static_cast<sal_Int16>(pShellCrsr->GetPageNum()); } else throw uno::RuntimeException(); diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index 878269290623..338198eb9e5b 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -368,7 +368,7 @@ void SwContentType::Init(bool* pbInvalidateWindow) break; case ContentTypeId::REFERENCE: { - nMemberCount = pWrtShell->GetRefMarks( 0 ); + nMemberCount = pWrtShell->GetRefMarks(); bDelete = false; } break; |