diff options
Diffstat (limited to 'sw/source/uibase')
51 files changed, 90 insertions, 157 deletions
diff --git a/sw/source/uibase/app/appenv.cxx b/sw/source/uibase/app/appenv.cxx index ad0ed53ddfeb..63cfd8458b7b 100644 --- a/sw/source/uibase/app/appenv.cxx +++ b/sw/source/uibase/app/appenv.cxx @@ -58,7 +58,6 @@ #include <poolfmt.hxx> #include <expfld.hxx> #include <SwStyleNameMapper.hxx> -#include <crsskip.hxx> #include <fmtpdsc.hxx> #include <cmdid.h> diff --git a/sw/source/uibase/config/usrpref.cxx b/sw/source/uibase/config/usrpref.cxx index cf3970ab9bbb..b124c797b2ae 100644 --- a/sw/source/uibase/config/usrpref.cxx +++ b/sw/source/uibase/config/usrpref.cxx @@ -209,8 +209,8 @@ void SwContentViewConfig::Load() rParent.SetUpdateLinkMode(nSet, true); } break;// "Update/Link", - case 17: rParent.SetUpdateFields(bSet, true); break;// "Update/Field", - case 18: rParent.SetUpdateCharts(bSet, true); break;// "Update/Chart" + case 17: rParent.SetUpdateFields(bSet); break;// "Update/Field", + case 18: rParent.SetUpdateCharts(bSet); break;// "Update/Chart" } } } diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index 58951865cf79..f69fcc230dfa 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -2183,7 +2183,7 @@ bool SwDBManager::ToNextMergeRecord() } bool SwDBManager::FillCalcWithMergeData( SvNumberFormatter *pDocFormatter, - sal_uInt16 nLanguage, bool asString, SwCalc &rCalc ) + sal_uInt16 nLanguage, SwCalc &rCalc ) { if (!(pImpl->pMergeData && pImpl->pMergeData->xResultSet.is())) return false; @@ -2232,10 +2232,7 @@ bool SwDBManager::FillCalcWithMergeData( SvNumberFormatter *pDocFormatter, if( bValidValue ) { SwSbxValue aValue; - if( !asString ) - aValue.PutDouble( aNumber ); - else - aValue.PutString( aString ); + aValue.PutString( aString ); SAL_INFO( "sw.ui", "'" << pColNames[nCol] << "': " << aNumber << " / " << aString ); rCalc.VarChange( pColNames[nCol], aValue ); } @@ -2911,8 +2908,7 @@ void SwDBManager::LoadAndRegisterEmbeddedDataSource(const SwDBData& rData, const } void SwDBManager::ExecuteFormLetter( SwWrtShell& rSh, - const uno::Sequence<beans::PropertyValue>& rProperties, - bool bWithDataSourceBrowser) + const uno::Sequence<beans::PropertyValue>& rProperties) { //prevent second call if(pImpl->pMergeDialog) @@ -2953,8 +2949,7 @@ void SwDBManager::ExecuteFormLetter( SwWrtShell& rSh, sDataSource, sDataTableOrQuery, nCmdType, - xConnection, - bWithDataSourceBrowser ? nullptr : &aSelection); + xConnection); OSL_ENSURE(pImpl->pMergeDialog, "Dialog creation failed!"); if(pImpl->pMergeDialog->Execute() == RET_OK) { diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx index 581189b35aee..630149f39d9b 100644 --- a/sw/source/uibase/dochdl/gloshdl.cxx +++ b/sw/source/uibase/dochdl/gloshdl.cxx @@ -45,7 +45,6 @@ #include <gloslst.hxx> #include <swdtflvr.hxx> #include <docsh.hxx> -#include <crsskip.hxx> #include <dochdl.hrc> #include <swerror.h> @@ -408,7 +407,7 @@ bool SwGlossaryHdl::Expand( const OUString& rShortName, for(size_t i = 0; i < nGroupCount; ++i) { // get group name with path-extension - const OUString sGroupName = pGlossaryList->GetGroupName(i, false); + const OUString sGroupName = pGlossaryList->GetGroupName(i); if(sGroupName == pGlossary->GetName()) continue; const sal_uInt16 nBlockCount = pGlossaryList->GetBlockCount(i); diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx index 0f28c5de41ab..7380e27239e3 100644 --- a/sw/source/uibase/docvw/PostItMgr.cxx +++ b/sw/source/uibase/docvw/PostItMgr.cxx @@ -228,7 +228,7 @@ void SwPostItMgr::InsertItem(SfxBroadcaster* pItem, bool bCheckExistance, bool b } mbLayout = bFocus; if (dynamic_cast< const SwFormatField *>( pItem ) != nullptr) - mvPostItFields.push_back(new SwAnnotationItem(static_cast<SwFormatField&>(*pItem), true, bFocus) ); + mvPostItFields.push_back(new SwAnnotationItem(static_cast<SwFormatField&>(*pItem), bFocus) ); OSL_ENSURE(dynamic_cast< const SwFormatField *>( pItem ) != nullptr,"Mgr::InsertItem: seems like new stuff was added"); StartListening(*pItem); } diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index a354e1b6a188..7df99e62e88c 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -116,7 +116,6 @@ #include <swcalwrp.hxx> #include <swdtflvr.hxx> #include <wdocsh.hxx> -#include <crsskip.hxx> #include <breakit.hxx> #include <checkit.hxx> #include <pagefrm.hxx> diff --git a/sw/source/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx index 02cf4a75015a..a25ea0615ca4 100644 --- a/sw/source/uibase/fldui/fldmgr.cxx +++ b/sw/source/uibase/fldui/fldmgr.cxx @@ -72,7 +72,6 @@ #include <authfld.hxx> #include <flddat.hxx> #include <fldmgr.hxx> -#include <crsskip.hxx> #include <flddropdown.hxx> #include <fldui.hrc> #include <tox.hxx> @@ -523,7 +522,7 @@ void SwFieldMgr::GetSubTypes(sal_uInt16 nTypeId, std::vector<OUString>& rToFill) // determine format // ACCESS over TYP_.... -sal_uInt16 SwFieldMgr::GetFormatCount(sal_uInt16 nTypeId, bool bIsText, bool bHtmlMode) const +sal_uInt16 SwFieldMgr::GetFormatCount(sal_uInt16 nTypeId, bool bHtmlMode) const { OSL_ENSURE(nTypeId < TYP_END, "forbidden TypeId"); { @@ -535,9 +534,6 @@ sal_uInt16 SwFieldMgr::GetFormatCount(sal_uInt16 nTypeId, bool bIsText, bool bHt sal_uLong nStart = aSwFields[nPos].nFormatBegin; sal_uLong nEnd = aSwFields[nPos].nFormatEnd; - if (bIsText && nEnd - nStart >= 2) - return 2; - if (nTypeId == TYP_FILENAMEFLD) nEnd -= 2; // no range or template diff --git a/sw/source/uibase/inc/cnttab.hxx b/sw/source/uibase/inc/cnttab.hxx index e5626bb74c37..e81d0f276b33 100644 --- a/sw/source/uibase/inc/cnttab.hxx +++ b/sw/source/uibase/inc/cnttab.hxx @@ -61,7 +61,7 @@ struct CurTOXType CurTOXType () : eType (TOX_INDEX), nIndex (0) {}; - CurTOXType (TOXTypes t, sal_uInt16 i) : eType (t), nIndex (i) {}; + CurTOXType (TOXTypes t) : eType (t), nIndex (0) {}; }; class SwOLENames : public Resource diff --git a/sw/source/uibase/inc/fldmgr.hxx b/sw/source/uibase/inc/fldmgr.hxx index 65e91492ed78..0d479b19c0e1 100644 --- a/sw/source/uibase/inc/fldmgr.hxx +++ b/sw/source/uibase/inc/fldmgr.hxx @@ -184,7 +184,7 @@ public: void GetSubTypes(sal_uInt16 nId, std::vector<OUString>& rToFill); // format to a type - sal_uInt16 GetFormatCount(sal_uInt16 nTypeId, bool bIsText, bool bHtmlMode = false) const; + sal_uInt16 GetFormatCount(sal_uInt16 nTypeId, bool bHtmlMode) const; OUString GetFormatStr(sal_uInt16 nTypeId, sal_uLong nFormatId) const; sal_uInt16 GetFormatId(sal_uInt16 nTypeId, sal_uLong nFormatId) const; sal_uLong GetDefaultFormat(sal_uInt16 nTypeId, bool bIsText, SvNumberFormatter* pFormatter); diff --git a/sw/source/uibase/inc/glosdoc.hxx b/sw/source/uibase/inc/glosdoc.hxx index e460e81bb1d3..64eab46ea637 100644 --- a/sw/source/uibase/inc/glosdoc.hxx +++ b/sw/source/uibase/inc/glosdoc.hxx @@ -63,22 +63,21 @@ public: ~SwGlossaries(); /** returns the cached AutoTextGroup (if any) for the given group name + The group is created if it does not yet exist @precond If <arg>_bCreate</arg> is <TRUE/>, the SolarMutex must be locked when calling into this method. @param _rGroupName the name of the glossaries group - @param _bCreate - if <TRUE/>, the group is created if it does not yet exist */ css::uno::Reference< css::text::XAutoTextGroup > GetAutoTextGroup( - const OUString& _rGroupName, - bool _bCreate = false + const OUString& _rGroupName ); /** returns the cached AutoTextEntry (if any) for the given group/with the given name + The entry is created if it does not yet exist @precond If <arg>_bCreate</arg> is <TRUE/>, the SolarMutex must be locked when calling into this method. @@ -89,15 +88,12 @@ public: the name of the glossaries group, as to be passed to the entry @param _rEntryName the name of the auto text entry - @param _bCreate - if <TRUE/>, the entry is created if it does not yet exist */ css::uno::Reference< css::text::XAutoTextEntry > GetAutoTextEntry( const OUString& _rCompleteGroupName, const OUString& _rGroupName, - const OUString& _rEntryName, - bool _bCreate = false + const OUString& _rEntryName ); size_t GetGroupCnt(); diff --git a/sw/source/uibase/inc/gloslst.hxx b/sw/source/uibase/inc/gloslst.hxx index 0011330c5d30..978c453b8e7f 100644 --- a/sw/source/uibase/inc/gloslst.hxx +++ b/sw/source/uibase/inc/gloslst.hxx @@ -61,7 +61,7 @@ public: OUString& rShortName, OUString& rGroupName ); size_t GetGroupCount(); - OUString GetGroupName(size_t nPos, bool bNoPath = true); + OUString GetGroupName(size_t nPos); OUString GetGroupTitle(size_t nPos); sal_uInt16 GetBlockCount(size_t nGroup); diff --git a/sw/source/uibase/inc/numfmtlb.hxx b/sw/source/uibase/inc/numfmtlb.hxx index 9a252de063d2..33761318e5b9 100644 --- a/sw/source/uibase/inc/numfmtlb.hxx +++ b/sw/source/uibase/inc/numfmtlb.hxx @@ -41,8 +41,8 @@ class SW_DLLPUBLIC NumFormatListBox : public ListBox DECL_DLLPRIVATE_LINK_TYPED( SelectHdl, ListBox&, void ); SAL_DLLPRIVATE double GetDefValue(const short nFormatType) const; - SAL_DLLPRIVATE void Init(short nFormatType, bool bUsrFormats); - SAL_DLLPRIVATE SwView* GetView(); + SAL_DLLPRIVATE void Init(short nFormatType); + SAL_DLLPRIVATE SwView* GetView(); public: NumFormatListBox(vcl::Window* pWin, WinBits nStyle); diff --git a/sw/source/uibase/inc/prcntfld.hxx b/sw/source/uibase/inc/prcntfld.hxx index b0355555337b..15344025a919 100644 --- a/sw/source/uibase/inc/prcntfld.hxx +++ b/sw/source/uibase/inc/prcntfld.hxx @@ -53,7 +53,7 @@ public: void SetModifyHdl(const Link<Edit&,void>& rLink) { m_pField->SetModifyHdl(rLink); } void SetLoseFocusHdl(const Link<Control&,void>& rLink) { m_pField->SetLoseFocusHdl(rLink); } void SetMetric(FieldUnit eUnit) { ::SetMetric(*m_pField, eUnit); } - void Enable(bool bEnable = true, bool bChild = true) { m_pField->Enable(bEnable, bChild); } + void Enable(bool bEnable = true) { m_pField->Enable(bEnable); } void Disable() { m_pField->Disable(); } bool HasFocus() const { return m_pField->HasFocus(); } void SetAccessibleName(const OUString& rName) { m_pField->SetAccessibleName(rName); } diff --git a/sw/source/uibase/inc/srcview.hxx b/sw/source/uibase/inc/srcview.hxx index 7db2669a745c..93956394651a 100644 --- a/sw/source/uibase/inc/srcview.hxx +++ b/sw/source/uibase/inc/srcview.hxx @@ -45,7 +45,6 @@ class SwSrcView: public SfxViewShell protected: void StartSearchAndReplace(const SvxSearchItem& rItem, - bool bFromStart, bool bApi, bool bRecursive = false); diff --git a/sw/source/uibase/inc/tablemgr.hxx b/sw/source/uibase/inc/tablemgr.hxx index eb512826605b..10f6a6fa742f 100644 --- a/sw/source/uibase/inc/tablemgr.hxx +++ b/sw/source/uibase/inc/tablemgr.hxx @@ -51,7 +51,7 @@ private: public: inline SwTableFUNC(SwFrameFormat &); - SwTableFUNC(SwWrtShell *pShell, bool bCopyFormat = false); + SwTableFUNC(SwWrtShell *pShell); ~SwTableFUNC(); void InitTabCols(); diff --git a/sw/source/uibase/inc/unomod.hxx b/sw/source/uibase/inc/unomod.hxx index 055167216cad..e41af1200b7a 100644 --- a/sw/source/uibase/inc/unomod.hxx +++ b/sw/source/uibase/inc/unomod.hxx @@ -176,7 +176,7 @@ protected: virtual ~SwXViewSettings() throw(); public: - SwXViewSettings(bool bWeb, SwView* pView); + SwXViewSettings(SwView* pView); //XServiceInfo virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; diff --git a/sw/source/uibase/inc/usrpref.hxx b/sw/source/uibase/inc/usrpref.hxx index 636a4d495fb9..31e8b6ba26c5 100644 --- a/sw/source/uibase/inc/usrpref.hxx +++ b/sw/source/uibase/inc/usrpref.hxx @@ -171,19 +171,15 @@ public: } sal_Int32 GetUpdateLinkMode() const {return nLinkUpdateMode; } - void SetUpdateFields(bool bSet, bool bNoModify = false) + void SetUpdateFields(bool bSet) { if(bSet && eFieldUpdateFlags == AUTOUPD_OFF) { eFieldUpdateFlags = AUTOUPD_FIELD_ONLY; - if(!bNoModify) - aContentConfig.SetModified(); } else if(!bSet) { eFieldUpdateFlags = AUTOUPD_OFF; - if(!bNoModify) - aContentConfig.SetModified(); } }; bool IsUpdateFields()const {return eFieldUpdateFlags != AUTOUPD_OFF; } @@ -195,19 +191,15 @@ public: aContentConfig.SetModified(); } - void SetUpdateCharts(bool bSet, bool bNoModify = false) + void SetUpdateCharts(bool bSet) { if(bSet) { eFieldUpdateFlags = AUTOUPD_FIELD_AND_CHARTS; - if(!bNoModify) - aContentConfig.SetModified(); } else if(eFieldUpdateFlags == AUTOUPD_FIELD_AND_CHARTS) { eFieldUpdateFlags = AUTOUPD_FIELD_ONLY; - if(!bNoModify) - aContentConfig.SetModified(); } }; bool IsUpdateCharts()const {return eFieldUpdateFlags == AUTOUPD_FIELD_AND_CHARTS; } diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx index 5c6dfd2a13be..51adb0336c9a 100644 --- a/sw/source/uibase/inc/wrtsh.hxx +++ b/sw/source/uibase/inc/wrtsh.hxx @@ -177,10 +177,10 @@ public: // select word / sentence bool SelNearestWrd(); - bool SelWrd (const Point * = nullptr, bool bProp=false ); + bool SelWrd (const Point * = nullptr ); // #i32329# Enhanced selection - void SelSentence (const Point * = nullptr, bool bProp=false ); - void SelPara (const Point * = nullptr, bool bProp=false ); + void SelSentence (const Point * = nullptr ); + void SelPara (const Point * = nullptr ); long SelAll(); // basecursortravelling @@ -191,8 +191,8 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); sal_uInt16 nCount, bool bBasicCall, bool bVisual = false ); bool Right ( sal_uInt16 nMode, bool bSelect, sal_uInt16 nCount, bool bBasicCall, bool bVisual = false ); - bool Up ( bool bSelect, sal_uInt16 nCount = 1, bool bBasicCall = false ); - bool Down ( bool bSelect, sal_uInt16 nCount = 1, bool bBasicCall = false ); + bool Up ( bool bSelect, bool bBasicCall = false ); + bool Down ( bool bSelect, bool bBasicCall = false ); void NxtWrd ( bool bSelect = false ) { SimpleMove( &SwWrtShell::_NxtWrd, bSelect ); } bool PrvWrd ( bool bSelect = false ) { return SimpleMove( &SwWrtShell::_PrvWrd, bSelect ); } @@ -298,7 +298,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); void InsertLineBreak(); void InsertColumnBreak(); void InsertFootnote(const OUString &, bool bEndNote = false, bool bEdit = true ); - void SplitNode( bool bAutoFormat = false, bool bCheckTableStart = true ); + void SplitNode( bool bAutoFormat = false ); bool CanInsert(); // indexes @@ -321,7 +321,6 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); void InsertObject( /*SvInPlaceObjectRef *pObj, */ // != 0 for clipboard const svt::EmbeddedObjectRef&, SvGlobalName *pName = nullptr, // != 0 create object accordingly - bool bActivate = true, sal_uInt16 nSlotId = 0); // SlotId for dialog bool InsertOleObject( const svt::EmbeddedObjectRef& xObj, SwFlyFrameFormat **pFlyFrameFormat = nullptr ); @@ -396,7 +395,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); // jump to bookmark and set the "selections-flags" correctly again void GotoMark( const ::sw::mark::IMark* const pMark ); - bool GotoMark( const ::sw::mark::IMark* const pMark, bool bSelect, bool bStart ); + bool GotoMark( const ::sw::mark::IMark* const pMark, bool bSelect ); void GotoMark( const OUString& rName ); bool GoNextBookmark(); // true when there still was one bool GoPrevBookmark(); diff --git a/sw/source/uibase/index/toxmgr.cxx b/sw/source/uibase/index/toxmgr.cxx index 676944636673..eba05c80ae07 100644 --- a/sw/source/uibase/index/toxmgr.cxx +++ b/sw/source/uibase/index/toxmgr.cxx @@ -22,7 +22,6 @@ #include <swwait.hxx> #include <view.hxx> #include <toxmgr.hxx> -#include <crsskip.hxx> #include <doc.hxx> #include <IDocumentUndoRedo.hxx> #include <swundo.hxx> diff --git a/sw/source/uibase/lingu/hhcwrp.cxx b/sw/source/uibase/lingu/hhcwrp.cxx index 0974e870343f..a3b10dbee5ec 100644 --- a/sw/source/uibase/lingu/hhcwrp.cxx +++ b/sw/source/uibase/lingu/hhcwrp.cxx @@ -36,7 +36,6 @@ #include <docsh.hxx> #include <mdiexp.hxx> #include <edtwin.hxx> -#include <crsskip.hxx> #include <index.hxx> #include <pam.hxx> #include <swcrsr.hxx> diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx index 17318f982956..fd9128a5effc 100644 --- a/sw/source/uibase/lingu/olmenu.cxx +++ b/sw/source/uibase/lingu/olmenu.cxx @@ -21,7 +21,6 @@ #include "chrdlg.hrc" #include "cmdid.h" #include "comcore.hrc" -#include "crsskip.hxx" #include "doc.hxx" #include "docsh.hxx" #include "edtwin.hxx" diff --git a/sw/source/uibase/misc/glosdoc.cxx b/sw/source/uibase/misc/glosdoc.cxx index badc48d938d5..fa503d054a33 100644 --- a/sw/source/uibase/misc/glosdoc.cxx +++ b/sw/source/uibase/misc/glosdoc.cxx @@ -548,8 +548,9 @@ void SwGlossaries::InvalidateUNOOjects() m_aGlossaryEntries.swap( aTmpe ); } -Reference< text::XAutoTextGroup > SwGlossaries::GetAutoTextGroup( const OUString& _rGroupName, bool _bCreate ) +Reference< text::XAutoTextGroup > SwGlossaries::GetAutoTextGroup( const OUString& _rGroupName ) { + bool _bCreate = true; // first, find the name with path-extension const OUString sCompleteGroupName = GetCompleteGroupName( _rGroupName ); @@ -605,8 +606,7 @@ Reference< text::XAutoTextGroup > SwGlossaries::GetAutoTextGroup( const OUString Reference< text::XAutoTextEntry > SwGlossaries::GetAutoTextEntry( const OUString& rCompleteGroupName, const OUString& rGroupName, - const OUString& rEntryName, - bool _bCreate ) + const OUString& rEntryName ) { //standard must be created bool bCreate = ( rCompleteGroupName == GetDefName() ); @@ -650,7 +650,7 @@ Reference< text::XAutoTextEntry > SwGlossaries::GetAutoTextEntry( ++aSearch; } - if ( !xReturn.is() && _bCreate ) + if ( !xReturn.is() ) { xReturn = new SwXAutoTextEntry( this, rGroupName, rEntryName ); // cache it diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx index 506e4de330fd..27df6fd819fc 100644 --- a/sw/source/uibase/ribbar/workctrl.cxx +++ b/sw/source/uibase/ribbar/workctrl.cxx @@ -144,7 +144,7 @@ IMPL_STATIC_LINK_TYPED(SwTbxAutoTextCtrl, PopupHdl, Menu*, pMenu, bool) sal_uInt16 nBlock = nId / 100; SwGlossaryList* pGlossaryList = ::GetGlossaryList(); - OUString sGroup = pGlossaryList->GetGroupName(nBlock - 1, false); + OUString sGroup = pGlossaryList->GetGroupName(nBlock - 1); OUString sShortName = pGlossaryList->GetBlockShortName(nBlock - 1, nId - (100 * nBlock) - 1); diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx index 73715d1aca41..2876d0b1a650 100644 --- a/sw/source/uibase/shells/annotsh.cxx +++ b/sw/source/uibase/shells/annotsh.cxx @@ -544,7 +544,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq ) SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); - std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwParaDlg( rView.GetWindow(), rView, aDlgAttr,DLG_STD, nullptr, true )); + std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwParaDlg( rView.GetWindow(), rView, aDlgAttr, nullptr, true )); OSL_ENSURE(pDlg, "Dialog creation failed!"); sal_uInt16 nRet = pDlg->Execute(); if(RET_OK == nRet) diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx index cd0f8b002019..44c1f42462e2 100644 --- a/sw/source/uibase/shells/basesh.cxx +++ b/sw/source/uibase/shells/basesh.cxx @@ -91,7 +91,6 @@ #include <statstr.hrc> #include <globals.h> #include <unotxdoc.hxx> -#include <crsskip.hxx> #include <fmtinfmt.hxx> #include <doc.hxx> #include <IDocumentSettingAccess.hxx> @@ -612,7 +611,7 @@ void SwBaseShell::Execute(SfxRequest &rReq) if( rSh.IsCursorInTable() ) { if( !rSh.IsTableComplexForChart() ) - SwTableFUNC( &rSh, false).UpdateChart(); + SwTableFUNC( &rSh ).UpdateChart(); rSh.ClearTableBoxContent(); rSh.SaveTableBoxContent(); } diff --git a/sw/source/uibase/shells/drwbassh.cxx b/sw/source/uibase/shells/drwbassh.cxx index 126986d782ff..6ebd85b4f153 100644 --- a/sw/source/uibase/shells/drwbassh.cxx +++ b/sw/source/uibase/shells/drwbassh.cxx @@ -148,7 +148,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq) SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); - std::unique_ptr<SfxAbstractDialog> pDlg(pFact->CreateSwWrapDlg( GetView().GetWindow(), aSet, pSh, true, RC_DLG_SWWRAPDLG )); + std::unique_ptr<SfxAbstractDialog> pDlg(pFact->CreateSwWrapDlg( GetView().GetWindow(), aSet, pSh, RC_DLG_SWWRAPDLG )); OSL_ENSURE(pDlg, "Dialog creation failed!"); if (pDlg->Execute() == RET_OK) diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx index ac2a781158a4..00b10a52d151 100644 --- a/sw/source/uibase/shells/drwtxtex.cxx +++ b/sw/source/uibase/shells/drwtxtex.cxx @@ -422,7 +422,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq ) SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); assert(pFact && "SwAbstractDialogFactory fail!"); - std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwParaDlg( GetView().GetWindow(), GetView(), aDlgAttr,DLG_STD, nullptr, true )); + std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwParaDlg( GetView().GetWindow(), GetView(), aDlgAttr, nullptr, true )); assert(pDlg && "Dialog creation failed!"); sal_uInt16 nRet = pDlg->Execute(); if(RET_OK == nRet) diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx index c44f881eb7ca..71bdf6ae2dc9 100644 --- a/sw/source/uibase/shells/tabsh.cxx +++ b/sw/source/uibase/shells/tabsh.cxx @@ -1139,7 +1139,7 @@ void SwTableShell::Execute(SfxRequest &rReq) // The last case branch which needs a table manager!! case FN_TABLE_SET_COL_WIDTH: { - SwTableFUNC aMgr( &rSh, false); + SwTableFUNC aMgr( &rSh ); aMgr.ColWidthDlg(GetView().GetWindow()); break; } diff --git a/sw/source/uibase/shells/textfld.cxx b/sw/source/uibase/shells/textfld.cxx index 652f607d731e..e9db87ffe399 100644 --- a/sw/source/uibase/shells/textfld.cxx +++ b/sw/source/uibase/shells/textfld.cxx @@ -18,7 +18,6 @@ */ #include <chrdlgmodes.hxx> -#include <crsskip.hxx> #include <hintids.hxx> #include <SidebarWin.hxx> #include <IDocumentFieldsAccess.hxx> diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx index 312dc99ae4da..cf44195e9f12 100644 --- a/sw/source/uibase/shells/textsh.cxx +++ b/sw/source/uibase/shells/textsh.cxx @@ -86,7 +86,6 @@ #include <idxmrk.hxx> #include <poolfmt.hxx> #include <breakit.hxx> -#include <crsskip.hxx> #include <modcfg.hxx> #include <column.hxx> #include <edtwin.hxx> @@ -249,7 +248,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) } svt::EmbeddedObjectRef xObj; - rSh.InsertObject( xObj, pName, true, nSlot); + rSh.InsertObject( xObj, pName, nSlot); rReq.Done(); break; } @@ -316,7 +315,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) } else { - rSh.InsertObject( xObj, nullptr, true, nSlot); + rSh.InsertObject( xObj, nullptr, nSlot); rReq.Done(); } } @@ -348,7 +347,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) else bFillWithData = false; // will create chart with only it's default image - SwTableFUNC( &rSh, false ).InsertChart( xDataProvider, bFillWithData, aRangeString ); + SwTableFUNC( &rSh ).InsertChart( xDataProvider, bFillWithData, aRangeString ); rSh.LaunchOLEObj(); svt::EmbeddedObjectRef& xObj = rSh.GetOLEObject(); diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx index ddce7968ac63..70ddbcfccb63 100644 --- a/sw/source/uibase/shells/textsh1.cxx +++ b/sw/source/uibase/shells/textsh1.cxx @@ -86,7 +86,6 @@ #include <app.hrc> #include <web.hrc> #include "paratr.hxx" -#include <crsskip.hxx> #include <vcl/svapp.hxx> #include <sfx2/app.hxx> #include <breakit.hxx> @@ -1006,7 +1005,7 @@ void SwTextShell::Execute(SfxRequest &rReq) SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); - pDlg.reset(pFact->CreateSwParaDlg( GetView().GetWindow(),GetView(), aCoreSet, DLG_STD, nullptr, false, sDefPage )); + pDlg.reset(pFact->CreateSwParaDlg( GetView().GetWindow(),GetView(), aCoreSet, nullptr, false, sDefPage )); OSL_ENSURE(pDlg, "Dialog creation failed!"); } SfxItemSet* pSet = nullptr; @@ -1120,12 +1119,12 @@ void SwTextShell::Execute(SfxRequest &rReq) { OUString sContinuedListId; const SwNumRule* pRule = - rWrtSh.SearchNumRule( true, false, -1, sContinuedListId ); + rWrtSh.SearchNumRule( true, -1, sContinuedListId ); // #i86492# // Search also for bullet list if ( !pRule ) { - pRule = rWrtSh.SearchNumRule( false, false, -1, sContinuedListId ); + pRule = rWrtSh.SearchNumRule( false, -1, sContinuedListId ); } if ( pRule ) { @@ -1882,10 +1881,10 @@ void SwTextShell::GetState( SfxItemSet &rSet ) // Search also for bullet list OUString aDummy; const SwNumRule* pRule = - rSh.SearchNumRule( true, false, -1, aDummy ); + rSh.SearchNumRule( true, -1, aDummy ); if ( !pRule ) { - pRule = rSh.SearchNumRule( false, false, -1, aDummy ); + pRule = rSh.SearchNumRule( false, -1, aDummy ); } if ( !pRule ) rSet.DisableItem(nWhich); diff --git a/sw/source/uibase/shells/txtcrsr.cxx b/sw/source/uibase/shells/txtcrsr.cxx index 7b5ad39ae64d..3319993658d9 100644 --- a/sw/source/uibase/shells/txtcrsr.cxx +++ b/sw/source/uibase/shells/txtcrsr.cxx @@ -32,7 +32,6 @@ #include <textsh.hxx> #include <num.hxx> #include <edtwin.hxx> -#include <crsskip.hxx> #include <doc.hxx> #include <docsh.hxx> diff --git a/sw/source/uibase/table/chartins.cxx b/sw/source/uibase/table/chartins.cxx index e1d39e7661c1..a29680e955ee 100644 --- a/sw/source/uibase/table/chartins.cxx +++ b/sw/source/uibase/table/chartins.cxx @@ -163,7 +163,7 @@ void SwInsertChart(vcl::Window* pParent, SfxBindings* pBindings ) } SwFlyFrameFormat *pFlyFrameFormat = nullptr; - xChartModel.set( SwTableFUNC( &rWrtShell, false ).InsertChart( xDataProvider, xDataProvider.is(), aRangeString, &pFlyFrameFormat )); + xChartModel.set( SwTableFUNC( &rWrtShell ).InsertChart( xDataProvider, xDataProvider.is(), aRangeString, &pFlyFrameFormat )); //open wizard //@todo get context from writer if that has one diff --git a/sw/source/uibase/table/tablemgr.cxx b/sw/source/uibase/table/tablemgr.cxx index e6bed55bb587..a82738dce1db 100644 --- a/sw/source/uibase/table/tablemgr.cxx +++ b/sw/source/uibase/table/tablemgr.cxx @@ -166,10 +166,10 @@ void SwTableFUNC::InitTabCols() pSh->GetTabCols( aCols ); } -SwTableFUNC::SwTableFUNC(SwWrtShell *pShell, bool bCopyFormat) +SwTableFUNC::SwTableFUNC(SwWrtShell *pShell) : pFormat(pShell->GetTableFormat()), pSh(pShell), - bCopy(bCopyFormat) + bCopy(false) { // if applicable copy the format for edit if( pFormat && bCopy ) diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx index bb1b5c83aa55..47136c11bfb6 100644 --- a/sw/source/uibase/uiview/pview.cxx +++ b/sw/source/uibase/uiview/pview.cxx @@ -252,7 +252,7 @@ void SwPagePreviewWin::CalcWish( sal_uInt8 nNewRow, sal_uInt8 nNewCol ) if( mnSttPage > nLastSttPg ) mnSttPage = nLastSttPg; - mpPgPreviewLayout->Init( mnCol, mnRow, maPxWinSize, true ); + mpPgPreviewLayout->Init( mnCol, mnRow, maPxWinSize ); mpPgPreviewLayout->Prepare( mnSttPage, Point(0,0), maPxWinSize, mnSttPage, maPaintedPreviewDocRect ); SetSelectedPage( mnSttPage ); @@ -399,7 +399,7 @@ void SwPagePreviewWin::SetWinSize( const Size& rNewSize ) if ( mbCalcScaleForPreviewLayout ) { - mpPgPreviewLayout->Init( mnCol, mnRow, maPxWinSize, true ); + mpPgPreviewLayout->Init( mnCol, mnRow, maPxWinSize ); maScale = GetMapMode().GetScaleX(); } mpPgPreviewLayout->Prepare( mnSttPage, Point(0,0), maPxWinSize, @@ -1763,7 +1763,7 @@ void SwPagePreviewWin::AdjustPreviewToNewZoom( const sal_uInt16 _nZoomFactor, { mnRow = 1; mnCol = 1; - mpPgPreviewLayout->Init( mnCol, mnRow, maPxWinSize, true ); + mpPgPreviewLayout->Init( mnCol, mnRow, maPxWinSize ); mpPgPreviewLayout->Prepare( mnSttPage, Point(0,0), maPxWinSize, mnSttPage, maPaintedPreviewDocRect ); SetSelectedPage( mnSttPage ); diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx index 0def762c6410..37c366f57d96 100644 --- a/sw/source/uibase/uiview/srcview.cxx +++ b/sw/source/uibase/uiview/srcview.cxx @@ -369,7 +369,7 @@ void SwSrcView::Execute(SfxRequest& rReq) OSL_ENSURE( nWhich, "Which for SearchItem ?" ); const SfxPoolItem& rItem = pTmpArgs->Get( nWhich ); SetSearchItem( static_cast<const SvxSearchItem&>(rItem)); - StartSearchAndReplace( static_cast<const SvxSearchItem&>(rItem), false, rReq.IsAPI() ); + StartSearchAndReplace( static_cast<const SvxSearchItem&>(rItem), rReq.IsAPI() ); if(aEditWin->IsModified()) GetDocShell()->GetDoc()->getIDocumentState().SetModified(); } @@ -379,7 +379,7 @@ void SwSrcView::Execute(SfxRequest& rReq) SvxSearchItem* pSrchItem = GetSearchItem(); if(pSrchItem) { - StartSearchAndReplace( *pSrchItem, false, rReq.IsAPI() ); + StartSearchAndReplace( *pSrchItem, rReq.IsAPI() ); if(aEditWin->IsModified()) GetDocShell()->GetDoc()->getIDocumentState().SetModified(); } @@ -567,7 +567,6 @@ void SwSrcView::SetSearchItem( const SvxSearchItem& rItem ) } void SwSrcView::StartSearchAndReplace(const SvxSearchItem& rSearchItem, - bool bFromStart, bool bApi, bool bRecursive) { @@ -581,12 +580,6 @@ void SwSrcView::StartSearchAndReplace(const SvxSearchItem& rSearchItem, if( !bForward ) aPaM = TextPaM( TEXT_PARA_ALL, TEXT_INDEX_ALL ); - if( bFromStart ) - { - aSel = pTextView->GetSelection(); - pTextView->SetSelection( TextSelection( aPaM, aPaM )); - } - util::SearchOptions2 aSearchOpt( rSearchItem.GetSearchOptions() ); aSearchOpt.Locale = GetAppLanguageTag().getLocale(); @@ -613,15 +606,7 @@ void SwSrcView::StartSearchAndReplace(const SvxSearchItem& rSearchItem, bool bNotFoundMessage = false; if(!bRecursive) { - if(!bFromStart) - { - bNotFoundMessage = bAtStart; - } - else - { - bNotFoundMessage = true; - pTextView->SetSelection( aSel ); - } + bNotFoundMessage = bAtStart; } else if(bAtStart) { @@ -653,7 +638,7 @@ void SwSrcView::StartSearchAndReplace(const SvxSearchItem& rSearchItem, if (nRet == RET_YES) { pTextView->SetSelection( TextSelection( aPaM, aPaM ) ); - StartSearchAndReplace( rSearchItem, false, false, true ); + StartSearchAndReplace( rSearchItem, false, true ); } } } diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx index 990513f769fb..a976ea9cda54 100644 --- a/sw/source/uibase/uiview/view2.cxx +++ b/sw/source/uibase/uiview/view2.cxx @@ -216,7 +216,7 @@ OUString SwView::GetPageStr(sal_uInt16 nPhyNum, sal_uInt16 nVirtNum, const OUStr int SwView::InsertGraphic( const OUString &rPath, const OUString &rFilter, bool bLink, GraphicFilter *pFilter, - Graphic* pPreviewGrf, bool bRule ) + Graphic* pPreviewGrf ) { SwWait aWait( *GetDocShell(), true ); @@ -278,8 +278,7 @@ int SwView::InsertGraphic( const OUString &rPath, const OUString &rFilter, OUString sURL = URIHelper::SmartRel2Abs( aTemp, rPath, URIHelper::GetMaybeFileHdl() ); - rShell.Insert( sURL, - rFilter, aGraphic, &aFrameManager, bRule ); + rShell.Insert( sURL, rFilter, aGraphic, &aFrameManager ); } else { @@ -1114,7 +1113,7 @@ void SwView::Execute(SfxRequest &rReq) pValues[0].Value <<= aData.sDataSource; pValues[1].Value <<= aData.sCommand; pValues[2].Value <<= aData.nCommandType; - pDBManager->ExecuteFormLetter(rSh, aProperties, true); + pDBManager->ExecuteFormLetter(rSh, aProperties); } } #endif @@ -2005,7 +2004,7 @@ bool SwView::JumpToSwMark( const OUString& rMark ) } else if( pMarkAccess->getAllMarksEnd() != (ppMark = pMarkAccess->findMark(sMark)) ) { - m_pWrtShell->GotoMark( ppMark->get(), false, true ); + m_pWrtShell->GotoMark( ppMark->get(), false ); bRet = true; } else if( nullptr != ( pINet = m_pWrtShell->FindINetAttr( sMark ) )) { @@ -2032,7 +2031,7 @@ bool SwView::JumpToSwMark( const OUString& rMark ) } else if( pMarkAccess->getAllMarksEnd() != (ppMark = pMarkAccess->findMark(sMark))) { - m_pWrtShell->GotoMark( ppMark->get(), false, true ); + m_pWrtShell->GotoMark( ppMark->get(), false ); bRet = true; } else if( nullptr != ( pINet = m_pWrtShell->FindINetAttr( sMark ) )) @@ -2415,7 +2414,7 @@ void SwView::GenerateFormLetter(bool bUseCurrentDocument) pValues[0].Value <<= aData.sDataSource; pValues[1].Value <<= aData.sCommand; pValues[2].Value <<= aData.nCommandType; - pDBManager->ExecuteFormLetter(GetWrtShell(), aProperties, true); + pDBManager->ExecuteFormLetter(GetWrtShell(), aProperties); } } else diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx index 3050d02eee54..29072b039691 100644 --- a/sw/source/uibase/uiview/viewling.cxx +++ b/sw/source/uibase/uiview/viewling.cxx @@ -54,7 +54,6 @@ #include <olmenu.hxx> #include <pam.hxx> #include <edtwin.hxx> -#include <crsskip.hxx> #include <ndtxt.hxx> #include <txtfrm.hxx> #include <vcl/lstbox.hxx> diff --git a/sw/source/uibase/uiview/viewport.cxx b/sw/source/uibase/uiview/viewport.cxx index 5ecfd6260431..b68af257e300 100644 --- a/sw/source/uibase/uiview/viewport.cxx +++ b/sw/source/uibase/uiview/viewport.cxx @@ -41,7 +41,6 @@ #include <usrpref.hxx> #include <pagedesc.hxx> #include <workctrl.hxx> -#include <crsskip.hxx> #include <touch/touch.h> #include <PostItMgr.hxx> diff --git a/sw/source/uibase/uno/unoatxt.cxx b/sw/source/uibase/uno/unoatxt.cxx index 8ee1ad987c56..c4ed4e58bcf8 100644 --- a/sw/source/uibase/uno/unoatxt.cxx +++ b/sw/source/uibase/uno/unoatxt.cxx @@ -106,7 +106,7 @@ uno::Any SwXAutoTextContainer::getByName(const OUString& GroupName) uno::Reference< text::XAutoTextGroup > xGroup; if ( pGlossaries && hasByName( GroupName ) ) // group name already known? // true = create group if not already available - xGroup = pGlossaries->GetAutoTextGroup( GroupName, true ); + xGroup = pGlossaries->GetAutoTextGroup( GroupName ); if ( !xGroup.is() ) throw container::NoSuchElementException(); @@ -178,7 +178,7 @@ uno::Reference< text::XAutoTextGroup > SwXAutoTextContainer::insertNewByName( } pGlossaries->NewGroupDoc(sGroup, sGroup.getToken(0, GLOS_DELIM)); - uno::Reference< text::XAutoTextGroup > xGroup = pGlossaries->GetAutoTextGroup( sGroup, true ); + uno::Reference< text::XAutoTextGroup > xGroup = pGlossaries->GetAutoTextGroup( sGroup ); OSL_ENSURE( xGroup.is(), "SwXAutoTextContainer::insertNewByName: no UNO object created? How this?" ); // We just inserted the group into the glossaries, so why doesn't it exist? @@ -412,7 +412,7 @@ uno::Reference< text::XAutoTextEntry > SwXAutoTextGroup::insertNewByName(const try { xEntry = pGlossaries ? - pGlossaries->GetAutoTextEntry( m_sGroupName, sName, sShortName, true ) : + pGlossaries->GetAutoTextEntry( m_sGroupName, sName, sShortName ) : uno::Reference< text::XAutoTextEntry >(); OSL_ENSURE( xEntry.is(), "SwXAutoTextGroup::insertNewByName: no UNO object created? How this?" ); // we just inserted the entry into the group, so why doesn't it exist? @@ -540,7 +540,7 @@ uno::Any SwXAutoTextGroup::getByName(const OUString& _rName) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; - uno::Reference< text::XAutoTextEntry > xEntry = pGlossaries->GetAutoTextEntry( m_sGroupName, sName, _rName, true ); + uno::Reference< text::XAutoTextEntry > xEntry = pGlossaries->GetAutoTextEntry( m_sGroupName, sName, _rName ); OSL_ENSURE( xEntry.is(), "SwXAutoTextGroup::getByName: GetAutoTextEntry is fractious!" ); // we told it to create the object, so why didn't it? return makeAny( xEntry ); diff --git a/sw/source/uibase/uno/unomod.cxx b/sw/source/uibase/uno/unomod.cxx index 0220afac1b23..195dfcee2479 100644 --- a/sw/source/uibase/uno/unomod.cxx +++ b/sw/source/uibase/uno/unomod.cxx @@ -209,7 +209,7 @@ Reference< XPropertySet > SwXModule::getViewSettings() throw( uno::RuntimeExcep if(!mxViewSettings.is()) { OSL_FAIL("Web or Text?"); - mxViewSettings = static_cast < HelperBaseNoState * > ( new SwXViewSettings( false, nullptr ) ); + mxViewSettings = static_cast < HelperBaseNoState * > ( new SwXViewSettings( nullptr ) ); } return mxViewSettings; } @@ -537,13 +537,13 @@ Sequence< OUString > SwXPrintSettings::getSupportedServiceNames() throw( Runtime return aRet; } -SwXViewSettings::SwXViewSettings(bool bWebView, SwView* pVw) +SwXViewSettings::SwXViewSettings(SwView* pVw) : ChainableHelperNoState( lcl_createViewSettingsInfo (), &Application::GetSolarMutex() ) , pView(pVw) , mpViewOption(nullptr) , mpConstViewOption(nullptr) , bObjectValid(true) - , bWeb(bWebView) + , bWeb(false) , mbApplyZoom(false) , eHRulerUnit(FUNIT_CM) , mbApplyHRulerMetric(false) diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx index 91849d97ecac..ef20d115eca4 100644 --- a/sw/source/uibase/uno/unotxvw.cxx +++ b/sw/source/uibase/uno/unotxvw.cxx @@ -60,7 +60,6 @@ #include <shellio.hxx> #include <ndtxt.hxx> #include <SwStyleNameMapper.hxx> -#include <crsskip.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/drawing/ShapeCollection.hpp> #include <editeng/outliner.hxx> @@ -514,7 +513,7 @@ uno::Reference< beans::XPropertySet > SwXTextView::getViewSettings() throw( uno { if(!mxViewSettings.is()) { - mxViewSettings = static_cast < HelperBaseNoState * > ( new SwXViewSettings( false, m_pView ) ); + mxViewSettings = static_cast < HelperBaseNoState * > ( new SwXViewSettings( m_pView ) ); } } else @@ -1621,7 +1620,7 @@ sal_Bool SwXTextViewCursor::goDown(sal_Int16 nCount, sal_Bool bExpand) throw uno::RuntimeException("no text selection", static_cast < cppu::OWeakObject * > ( this ) ); for( sal_uInt16 i = 0; i < nCount; i++ ) - bRet = m_pView->GetWrtShell().Down( bExpand, 1, true ); + bRet = m_pView->GetWrtShell().Down( bExpand, true ); } else throw uno::RuntimeException(); @@ -1639,7 +1638,7 @@ sal_Bool SwXTextViewCursor::goUp(sal_Int16 nCount, sal_Bool bExpand) throw uno::RuntimeException("no text selection", static_cast < cppu::OWeakObject * > ( this ) ); for( sal_uInt16 i = 0; i < nCount; i++ ) - bRet = m_pView->GetWrtShell().Up( bExpand, 1, true ); + bRet = m_pView->GetWrtShell().Up( bExpand, true ); } else throw uno::RuntimeException(); diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index 6280e001a199..36ecbb27c1a2 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -55,7 +55,6 @@ #include <IDocumentOutlineNodes.hxx> #include <unotools.hxx> #include <unotxvw.hxx> -#include <crsskip.hxx> #include <cmdid.h> #include <helpid.h> #include <navipi.hrc> diff --git a/sw/source/uibase/utlui/gloslst.cxx b/sw/source/uibase/utlui/gloslst.cxx index 3af10c9fd928..94678dee00ac 100644 --- a/sw/source/uibase/utlui/gloslst.cxx +++ b/sw/source/uibase/utlui/gloslst.cxx @@ -186,15 +186,13 @@ size_t SwGlossaryList::GetGroupCount() return aGroupArr.size(); } -OUString SwGlossaryList::GetGroupName(size_t nPos, bool bNoPath) +OUString SwGlossaryList::GetGroupName(size_t nPos) { OSL_ENSURE(aGroupArr.size() > nPos, "group not available"); if(nPos < aGroupArr.size()) { AutoTextGroup* pGroup = aGroupArr[nPos]; OUString sRet = pGroup->sName; - if(bNoPath) - sRet = sRet.getToken(0, GLOS_DELIM); return sRet; } return OUString(); diff --git a/sw/source/uibase/utlui/numfmtlb.cxx b/sw/source/uibase/utlui/numfmtlb.cxx index dc7d5eb4a118..0a535a8d6948 100644 --- a/sw/source/uibase/utlui/numfmtlb.cxx +++ b/sw/source/uibase/utlui/numfmtlb.cxx @@ -64,7 +64,7 @@ NumFormatListBox::NumFormatListBox(vcl::Window* pWin, WinBits nStyle) : bShowLanguageControl(false), bUseAutomaticLanguage(true) { - Init(css::util::NumberFormat::NUMBER, true); + Init(css::util::NumberFormat::NUMBER); } VCL_BUILDER_DECL_FACTORY(NumFormatListBox) @@ -86,7 +86,7 @@ VCL_BUILDER_DECL_FACTORY(NumFormatListBox) rRet = pListBox; } -void NumFormatListBox::Init(short nFormatType, bool bUsrFormats) +void NumFormatListBox::Init(short nFormatType) { SwView *pView = GetView(); @@ -95,11 +95,6 @@ void NumFormatListBox::Init(short nFormatType, bool bUsrFormats) else eCurLanguage = SvtSysLocale().GetLanguageTag().getLanguageType(); - if (!bUsrFormats) - { - pOwnFormatter = new SvNumberFormatter(comphelper::getProcessComponentContext(), eCurLanguage); - } - SetFormatType(nFormatType); SetDefFormat(nDefFormat); diff --git a/sw/source/uibase/wrtsh/delete.cxx b/sw/source/uibase/wrtsh/delete.cxx index 340b39a696a8..3375cbb2f33f 100644 --- a/sw/source/uibase/wrtsh/delete.cxx +++ b/sw/source/uibase/wrtsh/delete.cxx @@ -18,7 +18,6 @@ */ #include <wrtsh.hxx> -#include <crsskip.hxx> #include <swcrsr.hxx> #include <editeng/lrspitem.hxx> #include <view.hxx> diff --git a/sw/source/uibase/wrtsh/move.cxx b/sw/source/uibase/wrtsh/move.cxx index baaba962613d..02cbb152fc2a 100644 --- a/sw/source/uibase/wrtsh/move.cxx +++ b/sw/source/uibase/wrtsh/move.cxx @@ -21,7 +21,6 @@ #include <wrtsh.hxx> #include <view.hxx> #include <viewopt.hxx> -#include <crsskip.hxx> /** Always: @@ -128,7 +127,7 @@ bool SwWrtShell::Right( sal_uInt16 nMode, bool bSelect, } } -bool SwWrtShell::Up( bool bSelect, sal_uInt16 nCount, bool bBasicCall ) +bool SwWrtShell::Up( bool bSelect, bool bBasicCall ) { if ( !bSelect && !bBasicCall && IsCursorReadonly() && !GetViewOptions()->IsSelectionInReadonly()) { @@ -139,10 +138,10 @@ bool SwWrtShell::Up( bool bSelect, sal_uInt16 nCount, bool bBasicCall ) } ShellMoveCursor aTmp( this, bSelect ); - return SwCursorShell::Up( nCount ); + return SwCursorShell::Up(); } -bool SwWrtShell::Down( bool bSelect, sal_uInt16 nCount, bool bBasicCall ) +bool SwWrtShell::Down( bool bSelect, bool bBasicCall ) { if ( !bSelect && !bBasicCall && IsCursorReadonly() && !GetViewOptions()->IsSelectionInReadonly()) { @@ -154,7 +153,7 @@ bool SwWrtShell::Down( bool bSelect, sal_uInt16 nCount, bool bBasicCall ) } ShellMoveCursor aTmp( this, bSelect ); - return SwCursorShell::Down( nCount ); + return SwCursorShell::Down(); } bool SwWrtShell::LeftMargin( bool bSelect, bool bBasicCall ) @@ -577,11 +576,11 @@ bool SwWrtShell::GotoPage(sal_uInt16 nPage, bool bRecord) return false; } -bool SwWrtShell::GotoMark( const ::sw::mark::IMark* const pMark, bool bSelect, bool bStart ) +bool SwWrtShell::GotoMark( const ::sw::mark::IMark* const pMark, bool bSelect ) { ShellMoveCursor aTmp( this, bSelect ); SwPosition aPos = *GetCursor()->GetPoint(); - bool bRet = SwCursorShell::GotoMark( pMark, bStart ); + bool bRet = SwCursorShell::GotoMark( pMark, true/*bStart*/ ); if (bRet) m_aNavigationMgr.addEntry(aPos); return bRet; diff --git a/sw/source/uibase/wrtsh/select.cxx b/sw/source/uibase/wrtsh/select.cxx index 35b0b19cc850..823cef83601b 100644 --- a/sw/source/uibase/wrtsh/select.cxx +++ b/sw/source/uibase/wrtsh/select.cxx @@ -36,7 +36,6 @@ #include <swundo.hxx> #include <swevent.hxx> #include <swdtflvr.hxx> -#include <crsskip.hxx> #include <doc.hxx> #include <wordcountdialog.hxx> #include <memory> @@ -70,7 +69,7 @@ bool SwWrtShell::SelNearestWrd() return SelWrd(); } -bool SwWrtShell::SelWrd(const Point *pPt, bool ) +bool SwWrtShell::SelWrd(const Point *pPt ) { bool bRet; { @@ -88,7 +87,7 @@ bool SwWrtShell::SelWrd(const Point *pPt, bool ) return bRet; } -void SwWrtShell::SelSentence(const Point *pPt, bool ) +void SwWrtShell::SelSentence(const Point *pPt ) { { SwMvContext aMvContext(this); @@ -104,7 +103,7 @@ void SwWrtShell::SelSentence(const Point *pPt, bool ) m_bSelWrd = false; // disable SelWord, otherwise no SelLine goes on } -void SwWrtShell::SelPara(const Point *pPt, bool ) +void SwWrtShell::SelPara(const Point *pPt ) { { SwMvContext aMvContext(this); diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index 0c89f8c535e6..2c87f3f52144 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -80,7 +80,6 @@ #include <caption.hxx> #include <viscrs.hxx> #include <swdtflvr.hxx> -#include <crsskip.hxx> #include <doc.hxx> #include <IDocumentSettingAccess.hxx> #include <wrtsh.hrc> @@ -339,7 +338,7 @@ void SwWrtShell::Insert( const OUString &rPath, const OUString &rFilter, // if no object is transferred, then one will be created. void SwWrtShell::InsertObject( const svt::EmbeddedObjectRef& xRef, SvGlobalName *pName, - bool bActivate, sal_uInt16 nSlotId ) + sal_uInt16 nSlotId ) { ResetCursorStack(); if( !CanInsert() ) @@ -401,7 +400,7 @@ void SwWrtShell::InsertObject( const svt::EmbeddedObjectRef& xRef, SvGlobalName if ( xObj.is() ) { - if( InsertOleObject( xObj ) && bActivate && bDoVerb ) + if( InsertOleObject( xObj ) && bDoVerb ) { SfxInPlaceClient* pClient = GetView().FindIPClient( xObj.GetObject(), &GetView().GetEditWin() ); if ( !pClient ) @@ -947,7 +946,7 @@ void SwWrtShell::InsertFootnote(const OUString &rStr, bool bEndNote, bool bEdit // - of deleting selected content; // - of reset of the Cursorstack if necessary. -void SwWrtShell::SplitNode( bool bAutoFormat, bool bCheckTableStart ) +void SwWrtShell::SplitNode( bool bAutoFormat ) { ResetCursorStack(); if( CanInsert() ) @@ -962,7 +961,7 @@ void SwWrtShell::SplitNode( bool bAutoFormat, bool bCheckTableStart ) DelRight(); } - SwFEShell::SplitNode( bAutoFormat, bCheckTableStart ); + SwFEShell::SplitNode( bAutoFormat ); if( bHasSel ) EndUndo( UNDO_INSERT ); } diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx b/sw/source/uibase/wrtsh/wrtsh2.cxx index 0c50310dae6a..700c30284071 100644 --- a/sw/source/uibase/wrtsh/wrtsh2.cxx +++ b/sw/source/uibase/wrtsh/wrtsh2.cxx @@ -52,7 +52,6 @@ #include <section.hxx> #include <navicont.hxx> #include <navipi.hxx> -#include <crsskip.hxx> #include <txtinet.hxx> #include <cmdid.h> #include <wrtsh.hrc> diff --git a/sw/source/uibase/wrtsh/wrtsh4.cxx b/sw/source/uibase/wrtsh/wrtsh4.cxx index 49e7353f6aa3..60db3754d6a2 100644 --- a/sw/source/uibase/wrtsh/wrtsh4.cxx +++ b/sw/source/uibase/wrtsh/wrtsh4.cxx @@ -18,7 +18,6 @@ */ #include <wrtsh.hxx> -#include <crsskip.hxx> // Private methods, which move the cursor over search. // The removal of the selection must be made on the level above. |