diff options
48 files changed, 1 insertions, 390 deletions
diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx index 42064d57c899..8890f6b3d203 100644 --- a/sw/inc/calbck.hxx +++ b/sw/inc/calbck.hxx @@ -210,7 +210,6 @@ class SW_DLLPUBLIC SwDepend final : public SwClient SwClient *m_pToTell; public: - SwDepend() : m_pToTell(nullptr) {} SwDepend(SwClient *pTellHim, SwModify *pDepend) : SwClient(pDepend), m_pToTell(pTellHim) {} SwClient* GetToTell() { return m_pToTell; } diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx index 8acdc55009c8..1e409a6d9226 100644 --- a/sw/inc/dbmgr.hxx +++ b/sw/inc/dbmgr.hxx @@ -293,7 +293,6 @@ public: void MergeCancel(); inline bool IsMergeOk() { return MergeStatus::OK == m_aMergeStatus; }; - inline bool IsMergeCancel() { return MergeStatus::CANCEL <= m_aMergeStatus; }; inline bool IsMergeError() { return MergeStatus::ERROR <= m_aMergeStatus; }; static SwMailMergeConfigItem* PerformMailMerge(SwView* pView); diff --git a/sw/inc/edimp.hxx b/sw/inc/edimp.hxx index 20e891a18718..b9bc4a480aa1 100644 --- a/sw/inc/edimp.hxx +++ b/sw/inc/edimp.hxx @@ -30,7 +30,6 @@ struct SwPamRange { sal_uLong nStart, nEnd; - SwPamRange() : nStart( 0 ), nEnd( 0 ) {} SwPamRange( sal_uLong nS, sal_uLong nE ) : nStart( nS ), nEnd( nE ) {} bool operator==( const SwPamRange& rRg ) const diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx index acd164809316..a7d4861a8fe5 100644 --- a/sw/inc/fchrfmt.hxx +++ b/sw/inc/fchrfmt.hxx @@ -33,8 +33,6 @@ class SW_DLLPUBLIC SwFormatCharFormat: public SfxPoolItem, public SwClient SwTextCharFormat* pTextAttr; ///< My text attribute. public: - SwFormatCharFormat() : pTextAttr(nullptr) {} - /// single argument ctors shall be explicit. explicit SwFormatCharFormat( SwCharFormat *pFormat ); virtual ~SwFormatCharFormat(); diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx index f69dee70c5b7..e7e1b6346027 100644 --- a/sw/inc/fmtcol.hxx +++ b/sw/inc/fmtcol.hxx @@ -216,10 +216,6 @@ class SW_DLLPUBLIC SwConditionTextFormatColl : public SwTextFormatColl protected: SwFormatCollConditions m_CondColls; - SwConditionTextFormatColl( SwAttrPool& rPool, const sal_Char* pFormatCollName, - SwTextFormatColl* pDerFrom = nullptr ) - : SwTextFormatColl( rPool, pFormatCollName, pDerFrom, RES_CONDTXTFMTCOLL ) - {} SwConditionTextFormatColl( SwAttrPool& rPool, const OUString &rFormatCollName, SwTextFormatColl* pDerFrom = nullptr ) : SwTextFormatColl( rPool, rFormatCollName, pDerFrom, RES_CONDTXTFMTCOLL ) diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index 1c2d2aed4a7c..4291ced05f6e 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -157,10 +157,6 @@ class SW_DLLPUBLIC SwFlyFrameFormat: public SwFrameFormat SwFlyFrameFormat &operator=( const SwFlyFrameFormat &rCpy ) = delete; protected: - SwFlyFrameFormat( SwAttrPool& rPool, const sal_Char* pFormatNm, - SwFrameFormat *pDrvdFrame ) - : SwFrameFormat( rPool, pFormatNm, pDrvdFrame, RES_FLYFRMFMT ) - {} SwFlyFrameFormat( SwAttrPool& rPool, const OUString &rFormatNm, SwFrameFormat *pDrvdFrame ) : SwFrameFormat( rPool, rFormatNm, pDrvdFrame, RES_FLYFRMFMT ) @@ -236,18 +232,6 @@ class SW_DLLPUBLIC SwDrawFrameFormat: public SwFrameFormat bool mbPosAttrSet; protected: - SwDrawFrameFormat( SwAttrPool& rPool, const sal_Char* pFormatNm, - SwFrameFormat *pDrvdFrame ) - : SwFrameFormat( rPool, pFormatNm, pDrvdFrame, RES_DRAWFRMFMT ), - m_pSdrObjectCached(nullptr), - - meLayoutDir( SwFrameFormat::HORI_L2R ), - - mnPositionLayoutDir( css::text::PositionLayoutDir::PositionInLayoutDirOfAnchor ), - - mbPosAttrSet( false ) - - {} SwDrawFrameFormat( SwAttrPool& rPool, const OUString &rFormatNm, SwFrameFormat *pDrvdFrame ) : SwFrameFormat( rPool, rFormatNm, pDrvdFrame, RES_DRAWFRMFMT ), diff --git a/sw/inc/swbaslnk.hxx b/sw/inc/swbaslnk.hxx index e5b292a997cf..b50f84a3c851 100644 --- a/sw/inc/swbaslnk.hxx +++ b/sw/inc/swbaslnk.hxx @@ -31,9 +31,6 @@ class SwBaseLink : public ::sfx2::SvBaseLink bool bNoDataFlag : 1; bool bIgnoreDataChanged : 1; -protected: - SwBaseLink() {} - public: SwBaseLink( SfxLinkUpdateMode nMode, SotClipboardFormatId nFormat, SwContentNode* pNode = nullptr ) diff --git a/sw/inc/swserv.hxx b/sw/inc/swserv.hxx index c4199f324b23..9a9ad1e610fd 100644 --- a/sw/inc/swserv.hxx +++ b/sw/inc/swserv.hxx @@ -40,8 +40,6 @@ protected: SwSectionNode* pSectNd; } CNTNT_TYPE; - SwServerObject(); - public: SwServerObject( ::sw::mark::IMark& rBookmark ) : eType( BOOKMARK_SERVER ) diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx index 16c8fd41a35a..309f7e34b259 100644 --- a/sw/inc/swtable.hxx +++ b/sw/inc/swtable.hxx @@ -137,8 +137,6 @@ public: private: // @@@ public copy ctor, but no copy assignment? SwTable & operator= (const SwTable &) = delete; - // no default ctor. - SwTable(); bool OldMerge( SwDoc*, const SwSelBoxes&, SwTableBox*, SwUndoTableMerge* ); bool OldSplitRow( SwDoc*, const SwSelBoxes&, sal_uInt16, bool ); bool NewMerge( SwDoc*, const SwSelBoxes&, const SwSelBoxes& rMerged, @@ -340,8 +338,6 @@ class SW_DLLPUBLIC SwTableLine: public SwClient // Client of FrameFormat. public: - SwTableLine() : m_pUpper(nullptr) {} - SwTableLine( SwTableLineFormat*, sal_uInt16 nBoxes, SwTableBox *pUp ); virtual ~SwTableLine(); @@ -404,8 +400,6 @@ class SW_DLLPUBLIC SwTableBox: public SwClient //Client of FrameFormat. public: - SwTableBox(); - SwTableBox( SwTableBoxFormat*, sal_uInt16 nLines, SwTableLine *pUp = nullptr ); SwTableBox( SwTableBoxFormat*, const SwStartNode&, SwTableLine *pUp = nullptr ); SwTableBox( SwTableBoxFormat*, const SwNodeIndex&, SwTableLine *pUp = nullptr ); diff --git a/sw/inc/swtblfmt.hxx b/sw/inc/swtblfmt.hxx index e732d4f67bd6..22f752fc4ce2 100644 --- a/sw/inc/swtblfmt.hxx +++ b/sw/inc/swtblfmt.hxx @@ -28,10 +28,6 @@ class SW_DLLPUBLIC SwTableFormat : public SwFrameFormat friend class SwDoc; protected: - SwTableFormat( SwAttrPool& rPool, const sal_Char* pFormatNm, - SwFrameFormat *pDrvdFrame ) - : SwFrameFormat( rPool, pFormatNm, pDrvdFrame, RES_FRMFMT, aTableSetRange ) - {} SwTableFormat( SwAttrPool& rPool, const OUString &rFormatNm, SwFrameFormat *pDrvdFrame ) : SwFrameFormat( rPool, rFormatNm, pDrvdFrame, RES_FRMFMT, aTableSetRange ) @@ -70,10 +66,6 @@ class SW_DLLPUBLIC SwTableBoxFormat : public SwFrameFormat friend class SwDoc; protected: - SwTableBoxFormat( SwAttrPool& rPool, const sal_Char* pFormatNm, - SwFrameFormat *pDrvdFrame ) - : SwFrameFormat( rPool, pFormatNm, pDrvdFrame, RES_FRMFMT, aTableBoxSetRange ) - {} SwTableBoxFormat( SwAttrPool& rPool, const OUString &rFormatNm, SwFrameFormat *pDrvdFrame ) : SwFrameFormat( rPool, rFormatNm, pDrvdFrame, RES_FRMFMT, aTableBoxSetRange ) diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx index e9f0765573e2..569cd0684b41 100644 --- a/sw/inc/tox.hxx +++ b/sw/inc/tox.hxx @@ -262,13 +262,6 @@ public: /** constructor - @param rTokens vector of tokens - */ - SwFormTokensHelper(const SwFormTokens & rTokens) : m_Tokens(rTokens) {} - - /** - constructor - @param rStr string representation of the tokens */ SwFormTokensHelper(const OUString & rStr); diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx index b569b561b6a2..e1f7f3a88f91 100644 --- a/sw/inc/view.hxx +++ b/sw/inc/view.hxx @@ -615,8 +615,6 @@ public: // or to support printing void SetMailMergeConfigItem(SwMailMergeConfigItem* pConfigItem, sal_uInt16 nRestart, bool bIsSource); SwMailMergeConfigItem* GetMailMergeConfigItem(); - sal_uInt16 GetMailMergeRestartPage() const; - bool IsMailMergeSourceView() const; void ExecFormatPaintbrush(SfxRequest &); void StateFormatPaintbrush(SfxItemSet &); diff --git a/sw/source/core/access/accfrmobjmap.hxx b/sw/source/core/access/accfrmobjmap.hxx index 53ccbd0dc978..84c113a52c01 100644 --- a/sw/source/core/access/accfrmobjmap.hxx +++ b/sw/source/core/access/accfrmobjmap.hxx @@ -47,12 +47,6 @@ public: , nPosNum( 0, 0 ) {} - SwAccessibleChildMapKey( LayerId eId, sal_uInt32 nOrd, Point nPos ) - : eLayerId( eId ) - , nOrdNum( nOrd ) - , nPosNum( nPos ) - {} - bool operator()( const SwAccessibleChildMapKey& r1, const SwAccessibleChildMapKey& r2 ) const { diff --git a/sw/source/core/inc/SwGrammarMarkUp.hxx b/sw/source/core/inc/SwGrammarMarkUp.hxx index 4ef492711bc9..eb2408ead2bf 100644 --- a/sw/source/core/inc/SwGrammarMarkUp.hxx +++ b/sw/source/core/inc/SwGrammarMarkUp.hxx @@ -39,7 +39,6 @@ class SwGrammarMarkUp : public SwWrongList public: SwGrammarMarkUp() : SwWrongList( WRONGLIST_GRAMMAR ) {} - SwGrammarMarkUp( const SwGrammarMarkUp* ); virtual ~SwGrammarMarkUp(); virtual SwWrongList* Clone() override; diff --git a/sw/source/core/inc/drawfont.hxx b/sw/source/core/inc/drawfont.hxx index d5cc3daafda2..c93ad1d95172 100644 --- a/sw/source/core/inc/drawfont.hxx +++ b/sw/source/core/inc/drawfont.hxx @@ -84,7 +84,6 @@ class SW_DLLPUBLIC SwDrawTextInfo // inside second half of bound rect, used for Accessibility bool m_bPosMatchesBounds :1; - SwDrawTextInfo(); // prohibited public: #ifdef DBG_UTIL diff --git a/sw/source/core/inc/unobookmark.hxx b/sw/source/core/inc/unobookmark.hxx index 4772fcc8e840..63efce276034 100644 --- a/sw/source/core/inc/unobookmark.hxx +++ b/sw/source/core/inc/unobookmark.hxx @@ -254,12 +254,6 @@ public: css::uno::RuntimeException, std::exception) override; }; -class SwXODFCheckboxField : public SwXFieldmark -{ -public: - SwXODFCheckboxField( ::sw::mark::IMark* pBkm = nullptr, SwDoc* pDoc = nullptr) : SwXFieldmark(true, - pBkm, pDoc) {} -}; #endif // INCLUDED_SW_SOURCE_CORE_INC_UNOBOOKMARK_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/inc/wrong.hxx b/sw/source/core/inc/wrong.hxx index ce4dfbe18191..c2d122614fe0 100644 --- a/sw/source/core/inc/wrong.hxx +++ b/sw/source/core/inc/wrong.hxx @@ -75,8 +75,6 @@ public: SwWrongList* pSubList); private: - SwWrongArea() : mnPos(0), mnLen(0), mpSubList(nullptr), mColor(0,0,0), mLineType(WRONGAREA_WAVE) {} - static Color getSmartColor ( css::uno::Reference< css::container::XStringKeyMap > xPropertyBag) { try diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx index 336069254f1c..0ac496b05193 100644 --- a/sw/source/core/table/swtable.cxx +++ b/sw/source/core/table/swtable.cxx @@ -1604,15 +1604,6 @@ SwTwips SwTableLine::GetTableLineHeight( bool& bLayoutAvailable ) const return nRet; } -SwTableBox::SwTableBox() - : m_pStartNode(nullptr) - , m_pUpper(nullptr) - , mnRowSpan(1) - , mbDummyFlag(false) - , mbDirectFormatting(false) -{ -} - SwTableBox::SwTableBox( SwTableBoxFormat* pFormat, sal_uInt16 nLines, SwTableLine *pUp ) : SwClient(nullptr) , m_aLines() diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx index 02cc6dbf4724..a627a187df55 100644 --- a/sw/source/core/text/inftxt.hxx +++ b/sw/source/core/text/inftxt.hxx @@ -397,7 +397,6 @@ public: void CtorInitTextPaintInfo( OutputDevice* pRenderContext, SwTextFrame *pFrame, const SwRect &rPaint ); const SvxBrushItem *GetBrushItem() const { return pBrushItem; } - const SwRect &GetBrushRect() const { return aItemRect; } SwTextPaintInfo( SwTextFrame *pFrame, const SwRect &rPaint ); diff --git a/sw/source/core/text/itrtxt.hxx b/sw/source/core/text/itrtxt.hxx index eeb402c4bcd2..97a119d7e90c 100644 --- a/sw/source/core/text/itrtxt.hxx +++ b/sw/source/core/text/itrtxt.hxx @@ -242,10 +242,8 @@ protected: void CalcNewBlock( SwLineLayout *pCurr, const SwLinePortion *pStopAt, SwTwips nReal = 0, bool bSkipKashida = false ); SwTwips CalcKanaAdj( SwLineLayout *pCurr ); -public: - inline SwTextAdjuster( SwTextFrame *pTextFrame, SwTextSizeInfo *pTextSizeInf ) : SwTextMargin(pTextFrame!=nullptr?pTextFrame->GetTextNode():nullptr) - { CtorInitTextMargin( pTextFrame, pTextSizeInf ); } +public: // Is overloaded by SwTextFormatter due to UpdatePos void CalcAdjLine( SwLineLayout *pCurr ); diff --git a/sw/source/core/text/porfly.cxx b/sw/source/core/text/porfly.cxx index ca374158e84f..0eca9ca5ace0 100644 --- a/sw/source/core/text/porfly.cxx +++ b/sw/source/core/text/porfly.cxx @@ -414,20 +414,6 @@ void SwFlyCntPortion::SetBase( const SwTextFrame& rFrame, const Point &rBase, } } -sal_Int32 SwFlyCntPortion::GetFlyCursorOfst( const sal_uInt16 nOfst, - const Point &rPoint, SwPosition *pPos, SwCursorMoveState* pCMS ) const -{ - // As the FlyCnt are not attached to the side, their GetCursorOfst() will - // not be called. - // In order to reduce management overhead for the layout page, the paragraph - // calls the FlyFrame's GetCursorOfst() only when needed - Point aPoint( rPoint ); - if( !pPos || bDraw || !( GetFlyFrame()->GetCursorOfst( pPos, aPoint, pCMS ) ) ) - return SwLinePortion::GetCursorOfst( nOfst ); - else - return 0; -} - sal_Int32 SwFlyCntPortion::GetCursorOfst( const sal_uInt16 nOfst ) const { // OSL_FAIL("SwFlyCntPortion::GetCursorOfst: use GetFlyCursorOfst()"); diff --git a/sw/source/core/text/porfly.hxx b/sw/source/core/text/porfly.hxx index b51efd9dc259..417c347fd68d 100644 --- a/sw/source/core/text/porfly.hxx +++ b/sw/source/core/text/porfly.hxx @@ -79,8 +79,6 @@ public: long nLnAscent, long nLnDescent, long nFlyAscent, long nFlyDescent, AsCharFlags nFlags ); - sal_Int32 GetFlyCursorOfst( const sal_uInt16 nOfst, const Point &rPoint, - SwPosition *pPos, SwCursorMoveState* pCMS ) const; virtual bool Format( SwTextFormatInfo &rInf ) override; virtual void Paint( const SwTextPaintInfo &rInf ) const override; OUTPUT_OPERATOR_OVERRIDE diff --git a/sw/source/filter/html/htmlvsh.hxx b/sw/source/filter/html/htmlvsh.hxx deleted file mode 100644 index 9926d2adb493..000000000000 --- a/sw/source/filter/html/htmlvsh.hxx +++ /dev/null @@ -1,39 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_SW_SOURCE_FILTER_HTML_HTMLVSH_HXX -#define INCLUDED_SW_SOURCE_FILTER_HTML_HTMLVSH_HXX - -#include <calbck.hxx> -class SwViewShell; - -class SwHTMLViewShellClient : public SwClient -{ -protected: - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) override; - -public: - explicit SwHTMLViewShellClient( SwViewShell *pVSh ); - - virtual ~SwHTMLViewShellClient(); -}; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index b419700de59c..304c2bb72122 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -98,7 +98,6 @@ #include <editsh.hxx> #include <docufld.hxx> #include <swcss1.hxx> -#include <htmlvsh.hxx> #include <fltini.hxx> #include <htmltbl.hxx> #include <htmlnum.hxx> diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx index c7be889ea734..41d7c73dc1c2 100644 --- a/sw/source/filter/html/swhtml.hxx +++ b/sw/source/filter/html/swhtml.hxx @@ -29,7 +29,6 @@ #include <com/sun/star/form/XFormComponent.hpp> #include "calbck.hxx" -#include "htmlvsh.hxx" #include <memory> #include <vector> diff --git a/sw/source/filter/inc/rtf.hxx b/sw/source/filter/inc/rtf.hxx index a0288fdd61e2..293e87630edc 100644 --- a/sw/source/filter/inc/rtf.hxx +++ b/sw/source/filter/inc/rtf.hxx @@ -32,8 +32,6 @@ class RTFSurround sal_uInt8 nVal; } Value; public: - RTFSurround( sal_uInt8 nValue ) { Value.nVal = nValue; } - RTFSurround( bool bGoldCut, sal_uInt8 nOrder ) { Value.Flags.nGoldCut = sal_uInt8(bGoldCut); Value.Flags.nOrder = nOrder; diff --git a/sw/source/filter/inc/wrtswtbl.hxx b/sw/source/filter/inc/wrtswtbl.hxx index 7d5871bca30a..e518f8c0755b 100644 --- a/sw/source/filter/inc/wrtswtbl.hxx +++ b/sw/source/filter/inc/wrtswtbl.hxx @@ -101,9 +101,6 @@ class SW_DLLPUBLIC SwWriteTableRow long nPos; // End-Position (twips) der Zeile bool mbUseLayoutHeights; - // Forbidden and not implemented. - SwWriteTableRow(); - SwWriteTableRow & operator= (const SwWriteTableRow &) = delete; protected: diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index ee140b57d95b..683076061470 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -170,11 +170,6 @@ struct WW8_SepInfo ::boost::optional<sal_uInt16> oPgRestartNo; bool bIsFirstParagraph; - WW8_SepInfo() - : pPageDesc(nullptr), pSectionFormat(nullptr), pPDNd(nullptr), nLnNumRestartNo(0), bIsFirstParagraph(false) - - {} - WW8_SepInfo( const SwPageDesc* pPD, const SwSectionFormat* pFormat, sal_uLong nLnRestart, ::boost::optional<sal_uInt16> oPgRestart = boost::none, const SwNode* pNd = nullptr, bool bIsFirstPara = false ) diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 51fae4b44619..8d0d0ebb9d2f 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -430,20 +430,6 @@ private: SwWW8FltAnchorStack& operator=(const SwWW8FltAnchorStack&) = delete; }; -//For fields whose handling cannot be fully resolved until we hit the end of -//the document. -class Position -{ -public: - SwNodeIndex maMkNode; - SwNodeIndex maPtNode; - sal_Int32 mnMkContent; - sal_Int32 mnPtContent; - explicit Position(const SwPaM &rPaM); - Position(const Position &rEntry); -private: - Position& operator=(const Position&) = delete; -}; namespace SwWW8 { diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx index fb15c8002ab6..d013c0779ec0 100644 --- a/sw/source/ui/dbui/mailmergewizard.cxx +++ b/sw/source/ui/dbui/mailmergewizard.cxx @@ -233,28 +233,6 @@ void SwMailMergeWizard::UpdateRoadmap() } } -// enables/disables pages in the roadmap depending on the current page and state -void SwMailMergeWizard::CreateTargetDocument() -{ - svx::ODataAccessDescriptor aDescriptor; - aDescriptor.setDataSource( m_rConfigItem.GetCurrentDBData().sDataSource ); - aDescriptor[ svx::daConnection ] <<= m_rConfigItem.GetConnection().getTyped(); - aDescriptor[ svx::daCursor ] <<= m_rConfigItem.GetResultSet(); - aDescriptor[ svx::daCommand ] <<= m_rConfigItem.GetCurrentDBData().sCommand; - aDescriptor[ svx::daCommandType ] <<= m_rConfigItem.GetCurrentDBData().nCommandType; - aDescriptor[ svx::daSelection ] <<= m_rConfigItem.GetSelection(); - - SwMergeDescriptor aMergeDesc( DBMGR_MERGE_SHELL, GetSwView()->GetWrtShell(), - aDescriptor); - aMergeDesc.pMailMergeConfigItem = &m_rConfigItem; - aMergeDesc.bCreateSingleFile = true; - - GetSwView()->GetWrtShell().GetDBManager()->Merge( aMergeDesc, this ); - m_rConfigItem.SetMergeDone(); - if( m_rConfigItem.GetTargetView() ) - m_rConfigItem.GetTargetView()->GetViewFrame()->GetFrame().Appear(); -} - void SwMailMergeWizard::updateRoadmapItemLabel( WizardState _nState ) { svt::RoadmapWizard::updateRoadmapItemLabel( _nState ); diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 248b60acb51f..94a222f2bed5 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -52,7 +52,6 @@ #include <outline.hxx> #include <cnttab.hxx> #include <swuicnttab.hxx> -#include <formedt.hxx> #include <poolfmt.hxx> #include <poolfmt.hrc> #include <uitool.hxx> diff --git a/sw/source/uibase/cctrl/swlbox.cxx b/sw/source/uibase/cctrl/swlbox.cxx index 08a4b9107694..9b4290234fbd 100644 --- a/sw/source/uibase/cctrl/swlbox.cxx +++ b/sw/source/uibase/cctrl/swlbox.cxx @@ -94,11 +94,6 @@ void SwComboBox::RemoveEntryAt(sal_Int32 const nPos) } } -sal_Int32 SwComboBox::GetSwEntryPos(const SwBoxEntry& rEntry) const -{ - return ComboBox::GetEntryPos(rEntry.aName); -} - const SwBoxEntry& SwComboBox::GetSwEntry(sal_Int32 const nPos) const { if (0 <= nPos && static_cast<size_t>(nPos) < m_EntryList.size()) @@ -107,19 +102,6 @@ const SwBoxEntry& SwComboBox::GetSwEntry(sal_Int32 const nPos) const return aDefault; } -sal_Int32 SwComboBox::GetRemovedCount() const -{ - return static_cast<sal_Int32>(m_DelEntryList.size()); -} - -const SwBoxEntry& SwComboBox::GetRemovedEntry(sal_Int32 nPos) const -{ - if (0 <= nPos && static_cast<size_t>(nPos) < m_DelEntryList.size()) - return m_DelEntryList[nPos]; - - return aDefault; -} - void SwComboBox::InsertSorted(SwBoxEntry const& rEntry) { ComboBox::InsertEntry(rEntry.aName); diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx b/sw/source/uibase/dbui/mmconfigitem.cxx index 031897a202ba..fee73e958c69 100644 --- a/sw/source/uibase/dbui/mmconfigitem.cxx +++ b/sw/source/uibase/dbui/mmconfigitem.cxx @@ -1037,25 +1037,6 @@ const uno::Sequence< OUString>& return m_pImpl->m_aSavedDocuments; } -void SwMailMergeConfigItem::AddSavedDocument(const OUString& rName) -{ - const OUString* pDocs = m_pImpl->m_aSavedDocuments.getConstArray(); - bool bFound = false; - for(sal_Int32 nDoc = 0; nDoc < m_pImpl->m_aSavedDocuments.getLength(); ++nDoc) - { - if(pDocs[nDoc] == rName) - { - bFound = true; - break; - } - } - if(!bFound) - { - m_pImpl->m_aSavedDocuments.realloc(m_pImpl->m_aSavedDocuments.getLength() + 1); - m_pImpl->m_aSavedDocuments[m_pImpl->m_aSavedDocuments.getLength() - 1] = rName; - } -} - bool SwMailMergeConfigItem::IsOutputToLetter()const { return m_pImpl->m_bIsOutputToLetter || !IsMailAvailable(); diff --git a/sw/source/uibase/inc/autoedit.hxx b/sw/source/uibase/inc/autoedit.hxx deleted file mode 100644 index ccfde8c46d85..000000000000 --- a/sw/source/uibase/inc/autoedit.hxx +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_AUTOEDIT_HXX -#define INCLUDED_SW_SOURCE_UIBASE_INC_AUTOEDIT_HXX - -#include <vcl/edit.hxx> - -class AutoEdit : public Edit -{ -public: - AutoEdit( vcl::Window* pParent, ResId aResId ) : Edit( pParent, aResId ){} - -protected: - virtual void KeyInput( const KeyEvent& rEvent ) override; -}; - -// Implementation in autocorr.cxx - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx index 79e5939cbaa8..85664d41b9b5 100644 --- a/sw/source/uibase/inc/column.hxx +++ b/sw/source/uibase/inc/column.hxx @@ -73,10 +73,6 @@ public: class ColumnValueSet : public ValueSet { public: - ColumnValueSet(vcl::Window* pParent, const ResId& rResId) - : ValueSet(pParent, rResId) - { - } ColumnValueSet(vcl::Window* pParent) : ValueSet(pParent, WB_TABSTOP | WB_ITEMBORDER | WB_DOUBLEBORDER) { diff --git a/sw/source/uibase/inc/content.hxx b/sw/source/uibase/inc/content.hxx index 10b547d0071d..27cd9bc747f3 100644 --- a/sw/source/uibase/inc/content.hxx +++ b/sw/source/uibase/inc/content.hxx @@ -102,15 +102,6 @@ public: , pRedline(nullptr) , mbPostIt(true) {} - SwPostItContent( const SwContentType* pCnt, - const OUString& rName, - SwRangeRedline* pRed, - long nYPos ) - : SwContent(pCnt, rName, nYPos) - , pField(nullptr) - , pRedline(pRed) - , mbPostIt(false) - {} const SwFormatField* GetPostIt() const { return pField; } SwRangeRedline* GetRedline() { return pRedline; } diff --git a/sw/source/uibase/inc/fldmgr.hxx b/sw/source/uibase/inc/fldmgr.hxx index ff6ae62304fe..526f5254b0ed 100644 --- a/sw/source/uibase/inc/fldmgr.hxx +++ b/sw/source/uibase/inc/fldmgr.hxx @@ -89,11 +89,6 @@ struct SwInsertField_Data m_cSeparator(cSep), m_bIsAutomaticLanguage(bIsAutoLanguage), m_pParent(nullptr) {} - - SwInsertField_Data() : - m_pSh(nullptr), - m_cSeparator(' '), - m_bIsAutomaticLanguage(true){} }; class SW_DLLPUBLIC SwFieldMgr diff --git a/sw/source/uibase/inc/formedt.hxx b/sw/source/uibase/inc/formedt.hxx deleted file mode 100644 index f03b7835ef20..000000000000 --- a/sw/source/uibase/inc/formedt.hxx +++ /dev/null @@ -1,50 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_FORMEDT_HXX -#define INCLUDED_SW_SOURCE_UIBASE_INC_FORMEDT_HXX - -#include <svx/stddlg.hxx> - -#include <vcl/lstbox.hxx> - -#include <vcl/button.hxx> - -#include <vcl/fixed.hxx> - -#include <vcl/edit.hxx> - -#include "toxe.hxx" - -class SwWrtShell; -class SwForm; - -// insert marker for index entry -class SwIdxFormDlg : public SvxStandardDialog -{ - void Apply() override; - -public: - SwIdxFormDlg( vcl::Window* pParent, SwWrtShell &rShell, const SwForm& rForm ); - virtual ~SwIdxFormDlg(); - virtual void dispose() override; -}; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/inc/mailmergewizard.hxx b/sw/source/uibase/inc/mailmergewizard.hxx index 93eb20507d76..ec8ab14f9fcf 100644 --- a/sw/source/uibase/inc/mailmergewizard.hxx +++ b/sw/source/uibase/inc/mailmergewizard.hxx @@ -73,7 +73,6 @@ public: void SetDocumentLoad(bool bSet) {m_bDocumentLoad = bSet;} void UpdateRoadmap(); - void CreateTargetDocument(); sal_uInt16 GetRestartPage() const {return m_nRestartPage;} void SetRestartPage(sal_uInt16 nPage) { m_nRestartPage = nPage;} diff --git a/sw/source/uibase/inc/mmconfigitem.hxx b/sw/source/uibase/inc/mmconfigitem.hxx index 6a1d7447c1e0..996de36f6391 100644 --- a/sw/source/uibase/inc/mmconfigitem.hxx +++ b/sw/source/uibase/inc/mmconfigitem.hxx @@ -113,7 +113,6 @@ public: css::uno::Sequence< css::uno::Any> GetSelection() const; const css::uno::Sequence<OUString>& GetSavedDocuments() const; - void AddSavedDocument(const OUString& rName); bool IsOutputToLetter()const; void SetOutputToLetter(bool bSet); @@ -225,8 +224,6 @@ public: void MoveGreeting( sal_Int32 nMove) { m_nGreetingMoves += nMove;} sal_Int32 GetGreetingMoves() const { return m_nGreetingMoves;} - bool IsMergeDone() const - { return m_bMergeDone; } void SetMergeDone( ) { m_bMergeDone = true; } diff --git a/sw/source/uibase/inc/numprevw.hxx b/sw/source/uibase/inc/numprevw.hxx index 0792b6090c69..be81ee6cebe8 100644 --- a/sw/source/uibase/inc/numprevw.hxx +++ b/sw/source/uibase/inc/numprevw.hxx @@ -38,13 +38,6 @@ class NumberingPreview : public vcl::Window virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) override; public: - NumberingPreview(vcl::Window* pParent, const ResId& rResId) - : Window(pParent, rResId), - pActNum(nullptr),nPageWidth(0), pOutlineNames(nullptr), - bPosition(false), nActLevel(USHRT_MAX) - { - } - NumberingPreview(vcl::Window* pParent) : Window(pParent) , pActNum(nullptr),nPageWidth(0), pOutlineNames(nullptr), diff --git a/sw/source/uibase/inc/swlbox.hxx b/sw/source/uibase/inc/swlbox.hxx index f4086805ea49..1d2d34aff2af 100644 --- a/sw/source/uibase/inc/swlbox.hxx +++ b/sw/source/uibase/inc/swlbox.hxx @@ -65,11 +65,7 @@ public: virtual void RemoveEntryAt(sal_Int32 nPos) override; - sal_Int32 GetSwEntryPos(const SwBoxEntry& rEntry) const; const SwBoxEntry& GetSwEntry(sal_Int32) const; - - sal_Int32 GetRemovedCount() const; - const SwBoxEntry& GetRemovedEntry(sal_Int32 nPos) const; }; #endif // INCLUDED_SW_SOURCE_UIBASE_INC_SWLBOX_HXX diff --git a/sw/source/uibase/inc/swwrtshitem.hxx b/sw/source/uibase/inc/swwrtshitem.hxx index 21309f06260d..39003198854a 100644 --- a/sw/source/uibase/inc/swwrtshitem.hxx +++ b/sw/source/uibase/inc/swwrtshitem.hxx @@ -28,7 +28,6 @@ class SW_DLLPUBLIC SwWrtShellItem: public SfxPoolItem SwWrtShell* pWrtSh; public: - SwWrtShellItem(); SwWrtShellItem( sal_uInt16 nWhich , SwWrtShell* pWrtSh); SwWrtShellItem( const SwWrtShellItem& ); diff --git a/sw/source/uibase/inc/tablemgr.hxx b/sw/source/uibase/inc/tablemgr.hxx index 10f6a6fa742f..7c92756a9fa7 100644 --- a/sw/source/uibase/inc/tablemgr.hxx +++ b/sw/source/uibase/inc/tablemgr.hxx @@ -50,7 +50,6 @@ private: SAL_DLLPRIVATE int GetRightSeparator(int nNum) const; public: - inline SwTableFUNC(SwFrameFormat &); SwTableFUNC(SwWrtShell *pShell); ~SwTableFUNC(); @@ -72,13 +71,6 @@ public: InsertChart( css::uno::Reference< css::chart2::data::XDataProvider > &rxDataProvider, bool bFillWithData, const OUString &rCellRange, SwFlyFrameFormat** ppFlyFrameFormat = nullptr ); }; -inline SwTableFUNC::SwTableFUNC(SwFrameFormat &rFormat) : - pFormat(&rFormat), - pSh(nullptr), - bCopy(false) -{ -} - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/inc/workctrl.hxx b/sw/source/uibase/inc/workctrl.hxx index 7abe8a6cc869..20b2314a334c 100644 --- a/sw/source/uibase/inc/workctrl.hxx +++ b/sw/source/uibase/inc/workctrl.hxx @@ -116,19 +116,6 @@ public: void GrabFocus() { m_pToolBox->GrabFocus(); } }; -// ImageButtons have to set the HelpText themselves if needed - -class SwHlpImageButton : public ImageButton -{ - bool bUp; - public: - SwHlpImageButton(vcl::Window* pParent, const ResId& rResId, bool bUpBtn) : - ImageButton(pParent, rResId), bUp(bUpBtn){} - - virtual void RequestHelp( const HelpEvent& rHEvt ) override; - -}; - class SwPreviewZoomControl : public SfxToolBoxControl { public: diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx index 009211c77d91..710b5c7c11ca 100644 --- a/sw/source/uibase/ribbar/workctrl.cxx +++ b/sw/source/uibase/ribbar/workctrl.cxx @@ -369,14 +369,6 @@ OUString SwScrollNaviPopup::GetQuickHelpText(bool bNext) return SW_RESSTR(nResId); } -void SwHlpImageButton::RequestHelp( const HelpEvent& rHEvt ) -{ - - SetQuickHelpText(SwScrollNaviPopup::GetQuickHelpText(!bUp)); - - ImageButton::RequestHelp(rHEvt); -} - class SwZoomBox_Impl : public ComboBox { sal_uInt16 nSlotId; diff --git a/sw/source/uibase/table/chartins.cxx b/sw/source/uibase/table/chartins.cxx index a29680e955ee..a96c78ea4e69 100644 --- a/sw/source/uibase/table/chartins.cxx +++ b/sw/source/uibase/table/chartins.cxx @@ -36,7 +36,6 @@ #include <swtable.hxx> #include <tblsel.hxx> #include <unochart.hxx> -#include <autoedit.hxx> #include <doc.hxx> #include <edtwin.hxx> @@ -245,10 +244,4 @@ void SwInsertChart(vcl::Window* pParent, SfxBindings* pBindings ) } } -void AutoEdit::KeyInput( const KeyEvent& rEvt ) -{ - if( rEvt.GetKeyCode().GetCode() != KEY_SPACE ) - Edit::KeyInput( rEvt ); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/uiview/view0.cxx b/sw/source/uibase/uiview/view0.cxx index cdb0ba77bc44..75cfffedcdfd 100644 --- a/sw/source/uibase/uiview/view0.cxx +++ b/sw/source/uibase/uiview/view0.cxx @@ -151,16 +151,6 @@ SwMailMergeConfigItem* SwView::GetMailMergeConfigItem() return m_pViewImpl->GetMailMergeConfigItem(); } -sal_uInt16 SwView::GetMailMergeRestartPage() const -{ - return m_pViewImpl->GetMailMergeRestartPage(); -} - -bool SwView::IsMailMergeSourceView() const -{ - return m_pViewImpl->IsMailMergeSourceView(); -} - #endif static bool lcl_IsViewMarks( const SwViewOption& rVOpt ) |