diff options
Diffstat (limited to 'sw/source')
34 files changed, 99 insertions, 114 deletions
diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx index 6c96f8ba2ee9..2738bee0b5b9 100644 --- a/sw/source/filter/xml/xmlexpit.cxx +++ b/sw/source/filter/xml/xmlexpit.cxx @@ -290,10 +290,10 @@ SvXMLExportItemMapper::~SvXMLExportItemMapper() void SvXMLExportItemMapper::exportXML( SvXMLExport& rExport, const SfxItemSet& rSet, const SvXMLUnitConverter& rUnitConverter, - XMLTokenEnum ePropToken, - SvXmlExportFlags nFlags ) const + XMLTokenEnum ePropToken ) const { std::vector<sal_uInt16> aIndexArray; + const SvXmlExportFlags nFlags = SvXmlExportFlags::IGN_WS; exportXML( rExport, rExport.GetAttrList(), rSet, rUnitConverter, rExport.GetNamespaceMap(), nFlags, &aIndexArray ); diff --git a/sw/source/filter/xml/xmlexpit.hxx b/sw/source/filter/xml/xmlexpit.hxx index 04af9f046954..df68321a3cb8 100644 --- a/sw/source/filter/xml/xmlexpit.hxx +++ b/sw/source/filter/xml/xmlexpit.hxx @@ -72,8 +72,7 @@ public: void exportXML( SvXMLExport& rExport, const SfxItemSet& rSet, const SvXMLUnitConverter& rUnitConverter, - ::xmloff::token::XMLTokenEnum ePropToken, - SvXmlExportFlags nFlags ) const; + ::xmloff::token::XMLTokenEnum ePropToken ) const; /** this method is called for every item that has the MID_SW_FLAG_SPECIAL_ITEM_EXPORT flag set */ diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx index 02a261fd3d8d..58551e38a98d 100644 --- a/sw/source/filter/xml/xmlfmt.cxx +++ b/sw/source/filter/xml/xmlfmt.cxx @@ -1052,8 +1052,7 @@ void SwXMLImport::UpdateTextCollConditions( SwDoc *pDoc ) bool SwXMLImport::FindAutomaticStyle( sal_uInt16 nFamily, const OUString& rName, - const SfxItemSet **ppItemSet, - OUString *pParent ) const + const SfxItemSet **ppItemSet ) const { SwXMLItemSetStyleContext_Impl *pStyle = nullptr; if( GetAutoStyles() ) @@ -1080,9 +1079,6 @@ bool SwXMLImport::FindAutomaticStyle( } } - - if( pParent ) - *pParent = pStyle->GetParentName(); } } diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx index 3f68785afccd..f019c04ada59 100644 --- a/sw/source/filter/xml/xmlfmte.cxx +++ b/sw/source/filter/xml/xmlfmte.cxx @@ -154,8 +154,7 @@ void SwXMLExport::ExportFormat( const SwFormat& rFormat, enum XMLTokenEnum eFami GetTableItemMapper().exportXML( *this, rFormat.GetAttrSet(), GetTwipUnitConverter(), - ePropToken, - SvXmlExportFlags::IGN_WS ); + ePropToken ); } } } diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index 261d671410c6..d0b30d969edc 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -977,7 +977,7 @@ XMLTextImportHelper* SwXMLImport::CreateTextImport() { return new SwXMLTextImportHelper( GetModel(), *this, getImportInfo(), IsInsertMode(), - IsStylesOnlyMode(), true/*bShowProgress*/, + IsStylesOnlyMode(), IsBlockMode(), IsOrganizerMode(), m_bPreserveRedlineMode ); } diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx index 93f3ba98028d..e8a7c252db67 100644 --- a/sw/source/filter/xml/xmlimp.hxx +++ b/sw/source/filter/xml/xmlimp.hxx @@ -176,8 +176,7 @@ public: bool FindAutomaticStyle( sal_uInt16 nFamily, const OUString& rName, - const SfxItemSet **ppItemSet, - OUString *pParent=nullptr ) const; + const SfxItemSet **ppItemSet ) const; virtual void SetStatistics( const css::uno::Sequence< css::beans::NamedValue> & i_rStats) override; diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx index e7a356ba8b03..83ad34465c82 100644 --- a/sw/source/filter/xml/xmlimpit.cxx +++ b/sw/source/filter/xml/xmlimpit.cxx @@ -57,10 +57,9 @@ using namespace ::xmloff::token; using uno::Any; SvXMLImportItemMapper::SvXMLImportItemMapper( - SvXMLItemMapEntriesRef const & rMapEntries, - sal_uInt16 nUnknWhich ) : + SvXMLItemMapEntriesRef const & rMapEntries ) : mrMapEntries( rMapEntries ), - nUnknownWhich( nUnknWhich ) + nUnknownWhich( RES_UNKNOWNATR_CONTAINER ) { } diff --git a/sw/source/filter/xml/xmlimpit.hxx b/sw/source/filter/xml/xmlimpit.hxx index 92517db9c174..d0be90e33cf2 100644 --- a/sw/source/filter/xml/xmlimpit.hxx +++ b/sw/source/filter/xml/xmlimpit.hxx @@ -38,8 +38,7 @@ protected: sal_uInt16 nUnknownWhich; public: - SvXMLImportItemMapper( SvXMLItemMapEntriesRef const & rMapEntries , - sal_uInt16 nUnknWhich=USHRT_MAX ); + SvXMLImportItemMapper( SvXMLItemMapEntriesRef const & rMapEntries ); virtual ~SvXMLImportItemMapper(); /** fills the given itemset with the attributes in the given list */ diff --git a/sw/source/filter/xml/xmlitemi.cxx b/sw/source/filter/xml/xmlitemi.cxx index e5b1d5825e6a..2e9903170256 100644 --- a/sw/source/filter/xml/xmlitemi.cxx +++ b/sw/source/filter/xml/xmlitemi.cxx @@ -94,7 +94,7 @@ private: SwXMLImportTableItemMapper_Impl::SwXMLImportTableItemMapper_Impl( SvXMLItemMapEntriesRef rMapEntries ) : - SvXMLImportItemMapper( rMapEntries, RES_UNKNOWNATR_CONTAINER) + SvXMLImportItemMapper( rMapEntries ) { Reset(); } diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx index 461091f6ffe0..7b9137948c9e 100644 --- a/sw/source/filter/xml/xmltexti.cxx +++ b/sw/source/filter/xml/xmltexti.cxx @@ -147,10 +147,10 @@ SwXMLTextImportHelper::SwXMLTextImportHelper( const uno::Reference < XModel>& rModel, SvXMLImport& rImport, const uno::Reference<XPropertySet> & rInfoSet, - bool bInsertM, bool bStylesOnlyM, bool _bProgress, + bool bInsertM, bool bStylesOnlyM, bool bBlockM, bool bOrganizerM, bool /*bPreserveRedlineMode*/ ) : - XMLTextImportHelper( rModel, rImport, bInsertM, bStylesOnlyM, _bProgress, + XMLTextImportHelper( rModel, rImport, bInsertM, bStylesOnlyM, true/*bProgress*/, bBlockM, bOrganizerM ), pRedlineHelper( nullptr ) { diff --git a/sw/source/filter/xml/xmltexti.hxx b/sw/source/filter/xml/xmltexti.hxx index 24f49912afac..5a8704e007d5 100644 --- a/sw/source/filter/xml/xmltexti.hxx +++ b/sw/source/filter/xml/xmltexti.hxx @@ -39,7 +39,7 @@ public: const css::uno::Reference<css::frame::XModel>& rModel, SvXMLImport& rImport, const css::uno::Reference<css::beans::XPropertySet>& rInfoSet, - bool bInsertM, bool bStylesOnlyM, bool bProgress, + bool bInsertM, bool bStylesOnlyM, bool bBlockM, bool bOrganizerM, bool bPreserveRedlineMode ); virtual ~SwXMLTextImportHelper(); diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index 18100659f45b..3e7f79ed095b 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -82,8 +82,8 @@ class SwDropCapsPict : public Control sal_uLong textWidth; ///< Physical width of this segment. sal_uInt16 scriptType; ///< Script type (e.g. Latin, Asian, Complex) sal_Int32 changePos; ///< Character position where the script changes. - ScriptInfo(sal_uLong txtWidth, sal_uInt16 scrptType, sal_Int32 position) - : textWidth(txtWidth), scriptType(scrptType), changePos(position) {} + ScriptInfo(sal_uInt16 scrptType, sal_Int32 position) + : textWidth(0), scriptType(scrptType), changePos(position) {} }; std::vector<ScriptInfo> maScriptChanges; SvxFont maFont; @@ -446,7 +446,7 @@ void SwDropCapsPict::CheckScript() for(;;) { nChg = xBreak->endOfScript( maText, nChg, nScript ); - maScriptChanges.push_back( ScriptInfo(0, nScript, nChg) ); + maScriptChanges.push_back( ScriptInfo(nScript, nChg) ); if( nChg >= maText.getLength() || nChg < 0 ) break; nScript = xBreak->getScriptType( maText, nChg ); diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index d6df1bd1eaeb..dde2cb6360cd 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -408,7 +408,7 @@ bool SwAddPrinterTabPage::FillItemSet( SfxItemSet* rCoreSet ) { if ( bAttrModified ) { - SwAddPrinterItem aAddPrinterAttr (FN_PARAM_ADDPRINTER); + SwAddPrinterItem aAddPrinterAttr; aAddPrinterAttr.m_bPrintGraphic = m_pGrfCB->IsChecked(); aAddPrinterAttr.m_bPrintTable = true; // always enabled since CWS printerpullgpages /*aTabCB.IsChecked();*/ aAddPrinterAttr.m_bPrintDraw = m_pGrfCB->IsChecked(); // UI merged with m_pGrfCB in CWS printerpullgpages @@ -2482,7 +2482,7 @@ bool SwTestTabPage::FillItemSet( SfxItemSet* rCoreSet ) if ( bAttrModified ) { - SwTestItem aTestItem(FN_PARAM_SWTEST); + SwTestItem aTestItem; aTestItem.bTest1=m_pTest1CBox->IsChecked(); aTestItem.bTest2=m_pTest2CBox->IsChecked(); aTestItem.bTest3=m_pTest3CBox->IsChecked(); diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx index b18a7380b32e..644a4de2b142 100644 --- a/sw/source/ui/dbui/mmresultdialogs.cxx +++ b/sw/source/ui/dbui/mmresultdialogs.cxx @@ -218,8 +218,8 @@ public: void SetBCC(const OUString& rSet) {m_pBCCED->SetText(rSet);} }; -SwMMResultSaveDialog::SwMMResultSaveDialog(vcl::Window* pParent) - : SfxModalDialog(pParent, "MMResultSaveDialog", "modules/swriter/ui/mmresultsavedialog.ui"), +SwMMResultSaveDialog::SwMMResultSaveDialog() + : SfxModalDialog(nullptr, "MMResultSaveDialog", "modules/swriter/ui/mmresultsavedialog.ui"), m_bCancelSaving(false) { get(m_pSaveAsOneRB, "singlerb"); @@ -264,8 +264,8 @@ void SwMMResultSaveDialog::dispose() SfxModalDialog::dispose(); } -SwMMResultPrintDialog::SwMMResultPrintDialog(vcl::Window* pParent) - : SfxModalDialog(pParent, "MMResultPrintDialog", "modules/swriter/ui/mmresultprintdialog.ui") +SwMMResultPrintDialog::SwMMResultPrintDialog() + : SfxModalDialog(nullptr, "MMResultPrintDialog", "modules/swriter/ui/mmresultprintdialog.ui") , m_pTempPrinter(nullptr) { get(m_pPrinterFT, "printerft"); @@ -314,8 +314,8 @@ void SwMMResultPrintDialog::dispose() SfxModalDialog::dispose(); } -SwMMResultEmailDialog::SwMMResultEmailDialog(vcl::Window* pParent) - : SfxModalDialog(pParent, "MMResultEmailDialog", "modules/swriter/ui/mmresultemaildialog.ui"), +SwMMResultEmailDialog::SwMMResultEmailDialog() + : SfxModalDialog(nullptr, "MMResultEmailDialog", "modules/swriter/ui/mmresultemaildialog.ui"), m_sConfigureMail(SW_RES(ST_CONFIGUREMAIL)) { get(m_pMailToFT, "mailtoft"); diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx index e9472ce6f1d2..db2a10f1cf07 100644 --- a/sw/source/ui/dbui/selectdbtabledialog.cxx +++ b/sw/source/ui/dbui/selectdbtabledialog.cxx @@ -46,7 +46,7 @@ class SwAddressTable : public SvSimpleTable { public: explicit SwAddressTable(SvSimpleTableContainer& rParent); - void InsertHeaderItem(sal_uInt16 nColumn, const OUString& rText, HeaderBarItemBits nBits); + void InsertHeaderItem(sal_uInt16 nColumn, const OUString& rText); virtual void Resize() override; void setColSizes(); }; @@ -60,9 +60,9 @@ SwAddressTable::SwAddressTable(SvSimpleTableContainer& rParent) EnableAsyncDrag(false); } -void SwAddressTable::InsertHeaderItem(sal_uInt16 nColumn, const OUString& rText, HeaderBarItemBits nBits) +void SwAddressTable::InsertHeaderItem(sal_uInt16 nColumn, const OUString& rText) { - GetTheHeaderBar().InsertItem( nColumn, rText, 0, nBits ); + GetTheHeaderBar().InsertItem( nColumn, rText, 0, HeaderBarItemBits::LEFT | HeaderBarItemBits::VCENTER ); } void SwAddressTable::Resize() @@ -107,8 +107,8 @@ SwSelectDBTableDialog::SwSelectDBTableDialog(vcl::Window* pParent, m_pTable = VclPtr<SwAddressTable>::Create(*pHeaderTreeContainer); long aStaticTabs[]= { 2, 0, 0 }; m_pTable->SetTabs( aStaticTabs ); - m_pTable->InsertHeaderItem(1, m_sName, HeaderBarItemBits::LEFT | HeaderBarItemBits::VCENTER); - m_pTable->InsertHeaderItem(2, m_sType, HeaderBarItemBits::LEFT | HeaderBarItemBits::VCENTER); + m_pTable->InsertHeaderItem(1, m_sName ); + m_pTable->InsertHeaderItem(2, m_sType ); m_pPreviewPB->SetClickHdl(LINK(this, SwSelectDBTableDialog, PreviewHdl)); diff --git a/sw/source/ui/inc/mmresultdialogs.hxx b/sw/source/ui/inc/mmresultdialogs.hxx index 17c0d1fc056d..2a7debc0b15b 100644 --- a/sw/source/ui/inc/mmresultdialogs.hxx +++ b/sw/source/ui/inc/mmresultdialogs.hxx @@ -62,7 +62,7 @@ class SwMMResultSaveDialog : public SfxModalDialog DECL_LINK_TYPED(DocumentSelectionHdl_Impl, Button*, void); public: - SwMMResultSaveDialog(vcl::Window* pParent = nullptr); + SwMMResultSaveDialog(); virtual ~SwMMResultSaveDialog(); virtual void dispose() override; @@ -94,7 +94,7 @@ class SwMMResultPrintDialog : public SfxModalDialog void FillInPrinterSettings(); public: - SwMMResultPrintDialog(vcl::Window* pParent = nullptr); + SwMMResultPrintDialog(); virtual ~SwMMResultPrintDialog(); virtual void dispose() override; @@ -144,7 +144,7 @@ class SwMMResultEmailDialog : public SfxModalDialog void FillInEmailSettings(); public: - SwMMResultEmailDialog(vcl::Window* pParent = nullptr); + SwMMResultEmailDialog(); virtual ~SwMMResultEmailDialog(); virtual void dispose() override; diff --git a/sw/source/uibase/app/appopt.cxx b/sw/source/uibase/app/appopt.cxx index 3740c55caf76..7f9072119685 100644 --- a/sw/source/uibase/app/appopt.cxx +++ b/sw/source/uibase/app/appopt.cxx @@ -118,11 +118,11 @@ SfxItemSet* SwModule::CreateItemSet( sal_uInt16 nId ) #endif 0); - pRet->Put( SwDocDisplayItem( aViewOpt, FN_PARAM_DOCDISP) ); - pRet->Put( SwElemItem( aViewOpt, FN_PARAM_ELEM) ); + pRet->Put( SwDocDisplayItem( aViewOpt ) ); + pRet->Put( SwElemItem( aViewOpt ) ); if( bTextDialog ) { - pRet->Put( SwShadowCursorItem( aViewOpt, FN_PARAM_SHADOWCURSOR )); + pRet->Put( SwShadowCursorItem( aViewOpt )); pRet->Put( SfxBoolItem(FN_PARAM_CRSR_IN_PROTECTED, aViewOpt.IsCursorInProtectedArea())); pRet->Put(SfxBoolItem(FN_PARAM_IGNORE_PROTECTED, aViewOpt.IsIgnoreProtectedArea())); } @@ -227,7 +227,7 @@ SfxItemSet* SwModule::CreateItemSet( sal_uInt16 nId ) if(!pOpt) pOpt = GetPrtOptions(!bTextDialog); - SwAddPrinterItem aAddPrinterItem (FN_PARAM_ADDPRINTER, *pOpt ); + SwAddPrinterItem aAddPrinterItem(*pOpt ); pRet->Put(aAddPrinterItem); // Options for Web background @@ -477,7 +477,7 @@ VclPtr<SfxTabPage> SwModule::CreateTabPage( sal_uInt16 nId, vcl::Window* pParent if( (bWebView && RID_SW_TP_HTML_OPTTABLE_PAGE == nId) || (!bWebView && RID_SW_TP_HTML_OPTTABLE_PAGE != nId) ) { - aSet.Put (SwWrtShellItem(SID_WRT_SHELL,pCurrView->GetWrtShellPtr())); + aSet.Put (SwWrtShellItem(pCurrView->GetWrtShellPtr())); pRet->PageCreated(aSet); } } @@ -499,7 +499,7 @@ VclPtr<SfxTabPage> SwModule::CreateTabPage( sal_uInt16 nId, vcl::Window* pParent SwView* pCurrView = GetView(); if(pCurrView) { - aSet.Put( SwWrtShellItem( SID_WRT_SHELL, pCurrView->GetWrtShellPtr() ) ); + aSet.Put( SwWrtShellItem( pCurrView->GetWrtShellPtr() ) ); pRet->PageCreated(aSet); } } diff --git a/sw/source/uibase/config/cfgitems.cxx b/sw/source/uibase/config/cfgitems.cxx index b4605a755723..00d8f28f3ada 100644 --- a/sw/source/uibase/config/cfgitems.cxx +++ b/sw/source/uibase/config/cfgitems.cxx @@ -30,8 +30,8 @@ #include "crstate.hxx" -SwDocDisplayItem::SwDocDisplayItem( sal_uInt16 _nWhich ) : - SfxPoolItem(_nWhich) +SwDocDisplayItem::SwDocDisplayItem() : + SfxPoolItem(FN_PARAM_DOCDISP) { bParagraphEnd = bTab = @@ -52,8 +52,8 @@ SwDocDisplayItem::SwDocDisplayItem( const SwDocDisplayItem& rDocDisplayItem ): *this = rDocDisplayItem; }; -SwDocDisplayItem::SwDocDisplayItem(const SwViewOption& rVOpt, sal_uInt16 _nWhich ) : - SfxPoolItem( _nWhich ) +SwDocDisplayItem::SwDocDisplayItem(const SwViewOption& rVOpt ) : + SfxPoolItem( FN_PARAM_DOCDISP ) { bParagraphEnd = rVOpt.IsParagraph(true); bTab = rVOpt.IsTab(true); @@ -115,8 +115,8 @@ void SwDocDisplayItem::FillViewOptions( SwViewOption& rVOpt) const rVOpt.SetShowHiddenPara(bShowHiddenPara ); } -SwElemItem::SwElemItem( sal_uInt16 _nWhich ) : - SfxPoolItem(_nWhich) +SwElemItem::SwElemItem() : + SfxPoolItem(FN_PARAM_ELEM) { bVertRuler = bVertRulerRight= @@ -135,8 +135,8 @@ SwElemItem::SwElemItem( const SwElemItem& rElemItem ): *this = rElemItem; } -SwElemItem::SwElemItem(const SwViewOption& rVOpt, sal_uInt16 _nWhich) : - SfxPoolItem( _nWhich ) +SwElemItem::SwElemItem(const SwViewOption& rVOpt) : + SfxPoolItem( FN_PARAM_ELEM ) { bVertRuler = rVOpt.IsViewVRuler(true); bVertRulerRight = rVOpt.IsVRulerRight(); @@ -208,14 +208,14 @@ SwAddPrinterItem::SwAddPrinterItem( const SwAddPrinterItem& rAddPrinterItem ): } // CTOR for empty Item -SwAddPrinterItem::SwAddPrinterItem( sal_uInt16 _nWhich): - SfxPoolItem(_nWhich) +SwAddPrinterItem::SwAddPrinterItem(): + SfxPoolItem(FN_PARAM_ADDPRINTER) { } // CTOR from SwPrintOptions -SwAddPrinterItem::SwAddPrinterItem( sal_uInt16 _nWhich, const SwPrintData& rPrtData ) : - SfxPoolItem(_nWhich) +SwAddPrinterItem::SwAddPrinterItem( const SwPrintData& rPrtData ) : + SfxPoolItem(FN_PARAM_ADDPRINTER) { SwPrintData::operator=(rPrtData); } @@ -235,8 +235,8 @@ bool SwAddPrinterItem::operator==( const SfxPoolItem& rAttr ) const } // Item for Settings dialog, ShadowCursorPage -SwShadowCursorItem::SwShadowCursorItem( sal_uInt16 _nWhich ) - : SfxPoolItem( _nWhich ), +SwShadowCursorItem::SwShadowCursorItem() + : SfxPoolItem( FN_PARAM_SHADOWCURSOR ), eMode( FILL_TAB ) ,bOn( false ) { @@ -250,8 +250,8 @@ SwShadowCursorItem::SwShadowCursorItem( const SwShadowCursorItem& rCpy ) { } -SwShadowCursorItem::SwShadowCursorItem( const SwViewOption& rVOpt, sal_uInt16 _nWhich ) - : SfxPoolItem( _nWhich ), +SwShadowCursorItem::SwShadowCursorItem( const SwViewOption& rVOpt ) + : SfxPoolItem( FN_PARAM_SHADOWCURSOR ), eMode( rVOpt.GetShdwCursorFillMode() ) ,bOn( rVOpt.IsShadowCursor() ) diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx index feffb624c8c6..70a6daad6828 100644 --- a/sw/source/uibase/dbui/dbtree.cxx +++ b/sw/source/uibase/dbui/dbtree.cxx @@ -67,8 +67,8 @@ class SwDBTreeList_Impl : public cppu::WeakImplHelper < XContainerListener > SwWrtShell* m_pWrtShell; public: - explicit SwDBTreeList_Impl(SwWrtShell* pShell) - : m_pWrtShell(pShell) + explicit SwDBTreeList_Impl() + : m_pWrtShell(nullptr) { } virtual ~SwDBTreeList_Impl(); @@ -147,7 +147,7 @@ SwDBTreeList::SwDBTreeList(vcl::Window *pParent, WinBits nStyle) , aImageList(SW_RES(ILIST_DB_DLG)) , bInitialized(false) , bShowColumns(false) - , pImpl(new SwDBTreeList_Impl(nullptr)) + , pImpl(new SwDBTreeList_Impl) { if (IsVisible()) InitTreeList(); diff --git a/sw/source/uibase/dialog/swwrtshitem.cxx b/sw/source/uibase/dialog/swwrtshitem.cxx index e9816626dafd..27a9ab08d398 100644 --- a/sw/source/uibase/dialog/swwrtshitem.cxx +++ b/sw/source/uibase/dialog/swwrtshitem.cxx @@ -18,8 +18,10 @@ */ #include "swwrtshitem.hxx" -SwWrtShellItem::SwWrtShellItem( sal_uInt16 _nWhich, SwWrtShell* pSh ) - : SfxPoolItem( _nWhich ), pWrtSh( pSh ) +#include <globals.hrc> + +SwWrtShellItem::SwWrtShellItem( SwWrtShell* pSh ) + : SfxPoolItem( SID_WRT_SHELL ), pWrtSh( pSh ) { } diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index 8341af327452..596ad57c7bff 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -190,11 +190,10 @@ class SwTrnsfrActionAndUndo SwUndoId eUndoId; public: SwTrnsfrActionAndUndo( SwWrtShell *pS, SwUndoId nId, - const SwRewriter * pRewriter = nullptr, bool bDelSel = false) : pSh( pS ), eUndoId( nId ) { - pSh->StartUndo( eUndoId, pRewriter ); + pSh->StartUndo( eUndoId ); if( bDelSel ) pSh->DelRight(); pSh->StartAllAction(); @@ -1243,8 +1242,7 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData, if( bDelSel ) // #i34830# - pAction.reset(new SwTrnsfrActionAndUndo( &rSh, UNDO_PASTE_CLIPBOARD, nullptr, - true )); + pAction.reset(new SwTrnsfrActionAndUndo( &rSh, UNDO_PASTE_CLIPBOARD, true )); } SwTransferable *pTrans=nullptr, *pTunneledTrans=GetSwTransferable( rData ); diff --git a/sw/source/uibase/frmdlg/colmgr.cxx b/sw/source/uibase/frmdlg/colmgr.cxx index bc47c06e1bef..9b38ce677547 100644 --- a/sw/source/uibase/frmdlg/colmgr.cxx +++ b/sw/source/uibase/frmdlg/colmgr.cxx @@ -109,19 +109,15 @@ void SwColMgr::SetActualWidth(sal_uInt16 nW) } // ctor -SwColMgr::SwColMgr(const SfxItemSet& rSet, sal_uInt16 nActWidth) : - aFormatCol(static_cast<const SwFormatCol&>(rSet.Get(RES_COL))), - nWidth(nActWidth) +SwColMgr::SwColMgr(const SfxItemSet& rSet) : + aFormatCol(static_cast<const SwFormatCol&>(rSet.Get(RES_COL))) { - if(nWidth == USHRT_MAX) - { - nWidth = (sal_uInt16)static_cast<const SwFormatFrameSize&>(rSet.Get(RES_FRM_SIZE)).GetWidth(); - if (nWidth < MINLAY) - nWidth = USHRT_MAX; - const SvxLRSpaceItem &rLR = static_cast<const SvxLRSpaceItem&>(rSet.Get(RES_LR_SPACE)); - nWidth = nWidth - (sal_uInt16)rLR.GetLeft(); - nWidth = nWidth - (sal_uInt16)rLR.GetRight(); - } + nWidth = (sal_uInt16)static_cast<const SwFormatFrameSize&>(rSet.Get(RES_FRM_SIZE)).GetWidth(); + if (nWidth < MINLAY) + nWidth = USHRT_MAX; + const SvxLRSpaceItem &rLR = static_cast<const SvxLRSpaceItem&>(rSet.Get(RES_LR_SPACE)); + nWidth = nWidth - (sal_uInt16)rLR.GetLeft(); + nWidth = nWidth - (sal_uInt16)rLR.GetRight(); ::FitToActualSize(aFormatCol, nWidth); } diff --git a/sw/source/uibase/inc/cfgitems.hxx b/sw/source/uibase/inc/cfgitems.hxx index fce80f1aea10..57a8c5f38bbf 100644 --- a/sw/source/uibase/inc/cfgitems.hxx +++ b/sw/source/uibase/inc/cfgitems.hxx @@ -55,11 +55,10 @@ class SW_DLLPUBLIC SwDocDisplayItem : public SfxPoolItem bool bShowHiddenPara :1; public: - SwDocDisplayItem( sal_uInt16 nWhich = FN_PARAM_DOCDISP ); + SwDocDisplayItem(); SwDocDisplayItem( const SwDocDisplayItem& rSwDocDisplayItem ); - SwDocDisplayItem( const SwViewOption& rVOpt, - sal_uInt16 nWhich ); + SwDocDisplayItem( const SwViewOption& rVOpt ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; @@ -87,9 +86,9 @@ class SW_DLLPUBLIC SwElemItem : public SfxPoolItem friend class SwContentOptPage; public: - SwElemItem( sal_uInt16 nWhich = FN_PARAM_ELEM ); + SwElemItem(); SwElemItem(const SwElemItem& rElemItem); - SwElemItem(const SwViewOption& rVOpt, sal_uInt16 nWhich); + SwElemItem(const SwViewOption& rVOpt); virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; @@ -108,8 +107,8 @@ class SW_DLLPUBLIC SwAddPrinterItem : public SfxPoolItem, public SwPrintData using SwPrintData::operator ==; public: - SwAddPrinterItem( sal_uInt16 nWhich = FN_PARAM_ADDPRINTER ); - SwAddPrinterItem( sal_uInt16 nWhich, const SwPrintData& rPrtData ); + SwAddPrinterItem(); + SwAddPrinterItem( const SwPrintData& rPrtData ); SwAddPrinterItem( const SwAddPrinterItem& rAddPrinterItem); virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; @@ -125,9 +124,9 @@ class SW_DLLPUBLIC SwShadowCursorItem : public SfxPoolItem sal_uInt8 eMode; bool bOn; public: - SwShadowCursorItem( sal_uInt16 nWhich = FN_PARAM_SHADOWCURSOR ); + SwShadowCursorItem(); SwShadowCursorItem( const SwShadowCursorItem& rElemItem ); - SwShadowCursorItem( const SwViewOption& rVOpt, sal_uInt16 nWhich ); + SwShadowCursorItem( const SwViewOption& rVOpt ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; @@ -163,8 +162,7 @@ class SW_DLLPUBLIC SwTestItem : public SfxPoolItem bool bTest10:1; public: - SwTestItem( sal_uInt16 _nWhich): - SfxPoolItem(_nWhich){}; + SwTestItem() : SfxPoolItem(FN_PARAM_SWTEST) {}; SwTestItem( const SwTestItem& pTestItem); virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; diff --git a/sw/source/uibase/inc/colmgr.hxx b/sw/source/uibase/inc/colmgr.hxx index c9b59dcb6fe9..53cc566e1dd7 100644 --- a/sw/source/uibase/inc/colmgr.hxx +++ b/sw/source/uibase/inc/colmgr.hxx @@ -28,7 +28,7 @@ class SW_DLLPUBLIC SwColMgr { public: // lActWidth is passed directly from the page dialogs edits - SwColMgr(const SfxItemSet &rSet, sal_uInt16 nActWidth = USHRT_MAX); + SwColMgr(const SfxItemSet &rSet); ~SwColMgr(); inline sal_uInt16 GetCount() const; diff --git a/sw/source/uibase/inc/numfmtlb.hxx b/sw/source/uibase/inc/numfmtlb.hxx index 300d976cd1fa..4ef3759e9ffb 100644 --- a/sw/source/uibase/inc/numfmtlb.hxx +++ b/sw/source/uibase/inc/numfmtlb.hxx @@ -41,7 +41,7 @@ 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); + SAL_DLLPRIVATE void Init(); SAL_DLLPRIVATE SwView* GetView(); public: diff --git a/sw/source/uibase/inc/swwrtshitem.hxx b/sw/source/uibase/inc/swwrtshitem.hxx index 39003198854a..dcdb04dbda46 100644 --- a/sw/source/uibase/inc/swwrtshitem.hxx +++ b/sw/source/uibase/inc/swwrtshitem.hxx @@ -28,7 +28,7 @@ class SW_DLLPUBLIC SwWrtShellItem: public SfxPoolItem SwWrtShell* pWrtSh; public: - SwWrtShellItem( sal_uInt16 nWhich , SwWrtShell* pWrtSh); + SwWrtShellItem( SwWrtShell* pWrtSh ); SwWrtShellItem( const SwWrtShellItem& ); virtual bool operator==( const SfxPoolItem& ) const override; diff --git a/sw/source/uibase/inc/uiitems.hxx b/sw/source/uibase/inc/uiitems.hxx index 2222ffd2e8ec..add23a7bab5f 100644 --- a/sw/source/uibase/inc/uiitems.hxx +++ b/sw/source/uibase/inc/uiitems.hxx @@ -35,7 +35,7 @@ class SW_DLLPUBLIC SwPageFootnoteInfoItem : public SfxPoolItem public: - SwPageFootnoteInfoItem(const sal_uInt16 nId, SwPageFootnoteInfo& rInfo); + SwPageFootnoteInfoItem(SwPageFootnoteInfo& rInfo); SwPageFootnoteInfoItem(const SwPageFootnoteInfoItem& rItem ); virtual ~SwPageFootnoteInfoItem(); @@ -73,7 +73,7 @@ class SW_DLLPUBLIC SwUINumRuleItem : public SfxPoolItem SwNumRule* pRule; public: - SwUINumRuleItem( const SwNumRule& rRule, const sal_uInt16 = FN_PARAM_ACT_NUMBER); + SwUINumRuleItem( const SwNumRule& rRule ); SwUINumRuleItem( const SwUINumRuleItem& rItem ); virtual ~SwUINumRuleItem(); diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx index 5226c3ad6480..6e633ce13098 100644 --- a/sw/source/uibase/inc/wrtsh.hxx +++ b/sw/source/uibase/inc/wrtsh.hxx @@ -416,7 +416,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); void ExecMacro( const SvxMacro& rMacro, OUString* pRet = nullptr, SbxArray* pArgs = nullptr ); // call into the dark Basic/JavaScript sal_uInt16 CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEvent, - bool bCheckPtr = false, SbxArray* pArgs = nullptr ); + bool bCheckPtr = false ); // a click at the given field. the cursor is on it. // execute the predefined actions. diff --git a/sw/source/uibase/uiview/viewprt.cxx b/sw/source/uibase/uiview/viewprt.cxx index 44b472b05abf..2f401a0c67c0 100644 --- a/sw/source/uibase/uiview/viewprt.cxx +++ b/sw/source/uibase/uiview/viewprt.cxx @@ -320,7 +320,7 @@ void SetAppPrintOptions( SwViewShell* pSh, bool bWeb ) if( rIDDA.getPrinter( false ) ) { // Close application own printing options in SfxPrinter. - SwAddPrinterItem aAddPrinterItem (FN_PARAM_ADDPRINTER, aPrtData); + SwAddPrinterItem aAddPrinterItem(aPrtData); SfxItemSet aSet( pSh->GetAttrPool(), FN_PARAM_ADDPRINTER, FN_PARAM_ADDPRINTER, SID_HTML_MODE, SID_HTML_MODE, diff --git a/sw/source/uibase/uno/SwXDocumentSettings.cxx b/sw/source/uibase/uno/SwXDocumentSettings.cxx index 46ec397055dd..053398b8a6b3 100644 --- a/sw/source/uibase/uno/SwXDocumentSettings.cxx +++ b/sw/source/uibase/uno/SwXDocumentSettings.cxx @@ -889,7 +889,7 @@ void SwXDocumentSettings::_postSetValues () // when setting a printer it should have decent default options SfxItemSet aOptions( mpPrinter->GetOptions() ); SwPrintData aPrtData( mpDoc->getIDocumentDeviceAccess().getPrintData() ); - SwAddPrinterItem aAddPrinterItem (FN_PARAM_ADDPRINTER, aPrtData); + SwAddPrinterItem aAddPrinterItem (aPrtData); aOptions.Put(aAddPrinterItem); mpPrinter->SetOptions( aOptions ); diff --git a/sw/source/uibase/utlui/numfmtlb.cxx b/sw/source/uibase/utlui/numfmtlb.cxx index d54d84ce9866..39fd6b37081a 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); + Init(); } VCL_BUILDER_DECL_FACTORY(NumFormatListBox) @@ -86,7 +86,7 @@ VCL_BUILDER_DECL_FACTORY(NumFormatListBox) rRet = pListBox; } -void NumFormatListBox::Init(short nFormatType) +void NumFormatListBox::Init() { SwView *pView = GetView(); @@ -95,7 +95,7 @@ void NumFormatListBox::Init(short nFormatType) else eCurLanguage = SvtSysLocale().GetLanguageTag().getLanguageType(); - SetFormatType(nFormatType); + SetFormatType(css::util::NumberFormat::NUMBER); SetDefFormat(nDefFormat); SetSelectHdl(LINK(this, NumFormatListBox, SelectHdl)); diff --git a/sw/source/uibase/utlui/uiitems.cxx b/sw/source/uibase/utlui/uiitems.cxx index 8b759ff87d0b..b0180b6131b1 100644 --- a/sw/source/uibase/utlui/uiitems.cxx +++ b/sw/source/uibase/utlui/uiitems.cxx @@ -32,8 +32,8 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -SwPageFootnoteInfoItem::SwPageFootnoteInfoItem( const sal_uInt16 nId, SwPageFootnoteInfo& rInfo) : - SfxPoolItem( nId ), +SwPageFootnoteInfoItem::SwPageFootnoteInfoItem( SwPageFootnoteInfo& rInfo) : + SfxPoolItem( FN_PARAM_FTN_INFO ), aFootnoteInfo(rInfo) { } @@ -221,8 +221,8 @@ bool SwPtrItem::operator==( const SfxPoolItem& rAttr ) const // SwUINumRuleItem for the NumTabPages of the FormatNumRule/Styleists -SwUINumRuleItem::SwUINumRuleItem( const SwNumRule& rRul, const sal_uInt16 nId ) - : SfxPoolItem( nId ), pRule( new SwNumRule( rRul ) ) +SwUINumRuleItem::SwUINumRuleItem( const SwNumRule& rRul ) + : SfxPoolItem( FN_PARAM_ACT_NUMBER ), pRule( new SwNumRule( rRul ) ) { } diff --git a/sw/source/uibase/utlui/uitool.cxx b/sw/source/uibase/utlui/uitool.cxx index c04bd7bfd7b6..514a91aba066 100644 --- a/sw/source/uibase/utlui/uitool.cxx +++ b/sw/source/uibase/utlui/uitool.cxx @@ -560,7 +560,7 @@ void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet) // Integrate footnotes SwPageFootnoteInfo& rInfo = (SwPageFootnoteInfo&)rPageDesc.GetFootnoteInfo(); - SwPageFootnoteInfoItem aFootnoteItem(FN_PARAM_FTN_INFO, rInfo); + SwPageFootnoteInfoItem aFootnoteItem(rInfo); rSet.Put(aFootnoteItem); // Register compliant diff --git a/sw/source/uibase/wrtsh/wrtsh3.cxx b/sw/source/uibase/wrtsh/wrtsh3.cxx index 71b4140ec490..9b5cb4e176b0 100644 --- a/sw/source/uibase/wrtsh/wrtsh3.cxx +++ b/sw/source/uibase/wrtsh/wrtsh3.cxx @@ -160,9 +160,9 @@ void SwWrtShell::ExecMacro( const SvxMacro& rMacro, OUString* pRet, SbxArray* pA } sal_uInt16 SwWrtShell::CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEvent, - bool bChkPtr, SbxArray* pArgs) + bool bChkPtr) { - return GetDoc()->CallEvent( nEvent, rCallEvent, bChkPtr, pArgs ); + return GetDoc()->CallEvent( nEvent, rCallEvent, bChkPtr ); } // If a util::URL-Button is selected, return its util::URL |