diff options
| author | Noel Grandin <noel@peralex.com> | 2015-07-21 10:44:17 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-07-21 13:30:13 +0000 |
| commit | 407731c9f403c35357a0d1428c9b99835f79a5f7 (patch) | |
| tree | c3550703ea961e727e9fa155aa8efaa96ae84dd0 /sw | |
| parent | 2b75376a149803865c7cc0dbc72a870c1d86f428 (diff) | |
loplugin:unusedmethods sw
Change-Id: Ied51535fa169451fc4991237122817a34a59f6fe
Reviewed-on: https://gerrit.libreoffice.org/17256
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sw')
84 files changed, 18 insertions, 799 deletions
diff --git a/sw/inc/IDocumentDrawModelAccess.hxx b/sw/inc/IDocumentDrawModelAccess.hxx index a8b5ba2a25d1..857b9cfecf3a 100644 --- a/sw/inc/IDocumentDrawModelAccess.hxx +++ b/sw/inc/IDocumentDrawModelAccess.hxx @@ -61,21 +61,6 @@ public: */ virtual bool IsVisibleLayerId( const SdrLayerID& _nLayerId ) const = 0; - /** method to determine, if the corresponding visible layer ID for a invisible one. - - Note: If given layer ID is a visible one, method returns given layer ID. - Note: If given layer ID is unknown, method returns given layer ID. - - @author OD - - @param _nInvisibleLayerId - input parameter - invisible layer ID for which the corresponding - visible one has to be returned. - - @return sal_Int8, visible layer ID corresponding to given layer ID - */ - virtual SdrLayerID GetVisibleLayerIdByInvisibleOne( const SdrLayerID& _nInvisibleLayerId ) = 0; - /** method to determine, if the corresponding invisible layer ID for a visible one. Note: If given layer ID is a invisible one, method returns given layer ID. diff --git a/sw/inc/IDocumentListItems.hxx b/sw/inc/IDocumentListItems.hxx index f5de583f6e88..6868fa9d700e 100644 --- a/sw/inc/IDocumentListItems.hxx +++ b/sw/inc/IDocumentListItems.hxx @@ -38,10 +38,6 @@ public: const bool bWithNumber = true, const bool bWithSpacesForLevel = false ) const = 0; - /** get vector of all list items - */ - virtual void getListItems( IDocumentListItems::tSortedNodeNumList& orNodeNumList ) const = 0; - /** get vector of all list items, which are numbered */ virtual void getNumItems( IDocumentListItems::tSortedNodeNumList& orNodeNumList ) const = 0; diff --git a/sw/inc/IDocumentState.hxx b/sw/inc/IDocumentState.hxx index a6fc748d16b9..95b7872fb948 100644 --- a/sw/inc/IDocumentState.hxx +++ b/sw/inc/IDocumentState.hxx @@ -39,19 +39,10 @@ public: virtual bool IsInCallModified() const = 0; - /** State of being loaded or not. - Formerly DocInfo. - */ - virtual bool IsLoaded() const = 0; - virtual bool IsUpdateExpField() const = 0; virtual bool IsNewDoc() const = 0; - virtual bool IsPageNums() const = 0; - - virtual void SetPageNums(bool b) = 0; - virtual void SetNewDoc(bool b) = 0; virtual void SetUpdateExpFieldStat(bool b) = 0; diff --git a/sw/inc/IMark.hxx b/sw/inc/IMark.hxx index ad2b75c62ee7..8d7bf0605a12 100644 --- a/sw/inc/IMark.hxx +++ b/sw/inc/IMark.hxx @@ -64,8 +64,6 @@ namespace sw { namespace mark { return GetMarkStart() > rPos; } bool EndsBefore(const SwPosition& rPos) const { return GetMarkEnd() < rPos; } - bool EndsAfter(const SwPosition& rPos) const - { return GetMarkEnd() > rPos; } virtual OUString ToString( ) const =0; virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const = 0; diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx index 8d1ddd0d65f8..d31e4d71ae04 100644 --- a/sw/inc/PostItMgr.hxx +++ b/sw/inc/PostItMgr.hxx @@ -266,14 +266,11 @@ class SwPostItMgr: public SfxListener void RegisterAnswer(OutlinerParaObject* pAnswer) { mpAnswer = pAnswer;} OutlinerParaObject* IsAnswer() {return mpAnswer;} void CheckMetaText(); - void StartSpelling(); sal_uInt16 Replace(SvxSearchItem* pItem); sal_uInt16 SearchReplace(const SwFormatField &pField, const ::com::sun::star::util::SearchOptions& rSearchOptions,bool bSrchForward); sal_uInt16 FinishSearchReplace(const ::com::sun::star::util::SearchOptions& rSearchOptions,bool bSrchForward); - // get the PostIt window by index - sal_Int32 GetPostItCount() const {return mvPostItFields.size();} void AssureStdModeAtShell(); void ConnectSidebarWinToFrm( const SwFrm& rFrm, diff --git a/sw/inc/SwNumberTree.hxx b/sw/inc/SwNumberTree.hxx index 0ade268ecf22..6a00a2c6bd52 100644 --- a/sw/inc/SwNumberTree.hxx +++ b/sw/inc/SwNumberTree.hxx @@ -467,18 +467,6 @@ protected: SetLastValid( mChildren.end() ); } - /** Invalidation of parent node, if its not counted. - - Usage: on <IsCounted()> state change the parent have to be invalidated - */ - inline void InvalidateNotCountedParent() - { - if ( GetParent() && !GetParent()->IsCountedForNumbering() ) - { - GetParent()->InvalidateMe(); - } - } - /** Set the last valid child of this node. @@ -521,19 +509,6 @@ protected: */ void Notify(); - /** Notification of parent node siblings, if its not counted. - - Usage: on <IsCounted()> state change the parent node and its siblings - have to be notified. - */ - inline void NotifyNotCountedParentSiblings() - { - if ( GetParent() && !GetParent()->IsCountedForNumbering() ) - { - GetParent()->NotifyInvalidSiblings(); - } - } - /** notification of children nodes on certain depth @author OD diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx index a19ee55cc09f..6313b167bde6 100644 --- a/sw/inc/calbck.hxx +++ b/sw/inc/calbck.hxx @@ -329,27 +329,12 @@ public: SwIterator( const TSource& rSrc ) : sw::ClientIteratorBase(rSrc) {} SwClient* First() { return static_cast<SwClient*>(GoStart()); } - SwClient* Last() - { - if(!m_pPosition) - m_pPosition = m_rRoot.m_pWriterListeners; - if(!m_pPosition) - return m_pCurrent = nullptr; - while(GetRightOfPos()) - m_pPosition = GetRightOfPos(); - return static_cast<SwClient*>(Sync()); - } SwClient* Next() { if(!IsChanged()) m_pPosition = GetRightOfPos(); return static_cast<SwClient*>(Sync()); } - SwClient* Previous() - { - m_pPosition = GetLeftOfPos(); - return static_cast<SwClient*>(Sync()); - } using sw::ClientIteratorBase::IsChanged; }; diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx index 1fcbfa5c0517..c98638a03a50 100644 --- a/sw/inc/calc.hxx +++ b/sw/inc/calc.hxx @@ -175,8 +175,6 @@ class SwCalc SwSbxValue Term(); SwSbxValue Prim(); - bool ParseTime( sal_uInt16*, sal_uInt16*, sal_uInt16* ); - static OUString GetColumnName( const OUString& rName ); OUString GetDBName( const OUString& rName ); diff --git a/sw/inc/charatr.hxx b/sw/inc/charatr.hxx index 9634ce66f0c8..8a1b5573ece9 100644 --- a/sw/inc/charatr.hxx +++ b/sw/inc/charatr.hxx @@ -134,30 +134,10 @@ inline const SvxShadowItem &SwAttrSet::GetCharShadow( bool bInP ) const // implementation of the character attribute methods of SwFormat -inline const SvxPostureItem &SwFormat::GetPosture(bool bInP) const - { return m_aSet.GetPosture(bInP); } -inline const SvxWeightItem &SwFormat::GetWeight(bool bInP) const - { return m_aSet.GetWeight(bInP); } -inline const SvxShadowedItem &SwFormat::GetShadowed(bool bInP) const - { return m_aSet.GetShadowed(bInP); } -inline const SvxAutoKernItem &SwFormat::GetAutoKern(bool bInP) const - { return m_aSet.GetAutoKern(bInP); } -inline const SvxWordLineModeItem &SwFormat::GetWordLineMode(bool bInP) const - { return m_aSet.GetWordLineMode(bInP); } -inline const SvxContourItem &SwFormat::GetContour(bool bInP) const - { return m_aSet.GetContour(bInP); } -inline const SvxKerningItem &SwFormat::GetKerning(bool bInP) const - { return m_aSet.GetKerning(bInP); } inline const SvxUnderlineItem &SwFormat::GetUnderline(bool bInP) const { return m_aSet.GetUnderline(bInP); } -inline const SvxOverlineItem &SwFormat::GetOverline(bool bInP) const - { return m_aSet.GetOverline(bInP); } -inline const SvxCrossedOutItem &SwFormat::GetCrossedOut(bool bInP) const - { return m_aSet.GetCrossedOut(bInP); } inline const SvxFontHeightItem &SwFormat::GetSize(bool bInP) const { return m_aSet.GetSize(bInP); } -inline const SvxPropSizeItem &SwFormat::GetPropSize(bool bInP) const - { return m_aSet.GetPropSize(bInP); } inline const SvxFontItem &SwFormat::GetFont(bool bInP) const { return m_aSet.GetFont(bInP); } inline const SvxFontItem &SwFormat::GetCJKFont(bool bInP) const @@ -166,38 +146,6 @@ inline const SvxFontItem &SwFormat::GetCTLFont(bool bInP) const { return m_aSet.GetCTLFont(bInP); } inline const SvxColorItem &SwFormat::GetColor(bool bInP) const { return m_aSet.GetColor(bInP); } - inline const SvxCharSetColorItem &SwFormat::GetCharSetColor(bool bInP) const - { return m_aSet.GetCharSetColor(bInP); } -inline const SvxLanguageItem &SwFormat::GetLanguage(bool bInP) const - { return m_aSet.GetLanguage(bInP); } -inline const SvxEscapementItem &SwFormat::GetEscapement(bool bInP) const - { return m_aSet.GetEscapement(bInP); } -inline const SvxCaseMapItem &SwFormat::GetCaseMap(bool bInP) const - { return m_aSet.GetCaseMap(bInP); } -inline const SvxNoHyphenItem &SwFormat::GetNoHyphenHere(bool bInP) const - { return m_aSet.GetNoHyphenHere(bInP); } -inline const SvxBlinkItem &SwFormat::GetBlink(bool bInP) const - { return m_aSet.GetBlink(bInP); } -inline const SvxBrushItem &SwFormat::GetChrBackground(bool bInP) const - { return m_aSet.GetChrBackground(bInP); } -inline const SvxBrushItem &SwFormat::GetChrHighlight(bool bInP) const - { return m_aSet.GetChrHighlight(bInP); } -inline const SvxEmphasisMarkItem &SwFormat::GetEmphasisMark( bool bInP ) const - { return m_aSet.GetEmphasisMark(bInP); } -inline const SvxTwoLinesItem &SwFormat::Get2Lines( bool bInP ) const - { return m_aSet.Get2Lines(bInP); } -inline const SvxCharScaleWidthItem &SwFormat::GetCharScaleW( bool bInP ) const - { return m_aSet.GetCharScaleW(bInP); } -inline const SvxCharRotateItem &SwFormat::GetCharRotate( bool bInP ) const - { return m_aSet.GetCharRotate(bInP); } -inline const SvxCharReliefItem &SwFormat::GetCharRelief( bool bInP ) const - { return m_aSet.GetCharRelief(bInP); } -inline const SvxCharHiddenItem &SwFormat::GetCharHidden( bool bInP ) const - { return m_aSet.GetCharHidden(bInP); } -inline const SvxBoxItem &SwFormat::GetCharBorder( bool bInP ) const - { return m_aSet.GetCharBorder(bInP); } -inline const SvxShadowItem &SwFormat::GetCharShadow( bool bInP ) const - { return m_aSet.GetCharShadow(bInP); } #endif diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index 3e82b0c9a00d..93ed941f5105 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -285,10 +285,6 @@ protected: }; int CompareCursor( CrsrCompareType eType ) const; - // set all PaMs in OldNode to NewPos + Offset - void PaMCorrAbs(const SwNodeIndex &rOldNode, const SwPosition &rNewPos, - const sal_Int32 nOffset = 0 ); - bool _SelTableRowOrCol( bool bRow, bool bRowSimple = false ); bool SetInFrontOfLabel( bool bNew ); @@ -639,8 +635,6 @@ public: { return (const_cast<SwCrsrShell*>(this))->getShellCrsr( bBlock ); } bool IsBlockMode() const { return 0 != m_pBlockCrsr; } - const SwBlockCursor* GetBlockCrsr() const { return m_pBlockCrsr; } - SwBlockCursor* GetBlockCrsr() { return m_pBlockCrsr; } // is the Crsr in a table and is the selection over 2 columns bool IsTableMode() const { return 0 != m_pTableCrsr; } diff --git a/sw/inc/dbfld.hxx b/sw/inc/dbfld.hxx index 7f3d6533ad71..690beef2e4c9 100644 --- a/sw/inc/dbfld.hxx +++ b/sw/inc/dbfld.hxx @@ -88,7 +88,6 @@ public: void Evaluate(); /// Evaluation for header and footer. - void ChangeExpansion( const SwFrm*, const SwTextField* ); void InitContent(); void InitContent(const OUString& rExpansion); @@ -102,7 +101,6 @@ public: virtual OUString GetPar1() const SAL_OVERRIDE; /// access to the command string - OUString GetFieldCode() const { return sFieldCode;} void SetFieldCode(const OUString& rStr) { sFieldCode = rStr; } /// DBName diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx index 0b809f9d928f..4c2bbfa13ff6 100644 --- a/sw/inc/dbmgr.hxx +++ b/sw/inc/dbmgr.hxx @@ -195,7 +195,6 @@ friend class SwConnectionDisposedListener_Impl; OUString sAttached; ///< Mailing: Attached Files. bool bCancel; ///< Mail merge canceled. bool bInitDBFields : 1; - bool bSingleJobs : 1; ///< Printing job when called from Basic. bool bInMerge : 1; ///< merge process active bool bMergeSilent : 1; ///< suppress display of dialogs/boxes (used when called over API) bool bMergeLock : 1; /**< prevent update of database fields while document is @@ -255,14 +254,9 @@ public: inline bool IsInitDBFields() const { return bInitDBFields; } inline void SetInitDBFields(bool b) { bInitDBFields = b; } - /// Print / Save mail merge one by one or all together. - bool IsSingleJobs() const { return bSingleJobs; } - void SetSingleJobs(bool b) { bSingleJobs = b; } - /// Mailing: Set email data. inline void SetEMailColumn(const OUString& sColName) { sEMailAddrField = sColName; } inline void SetSubject(const OUString& sSbj) { sSubject = sSbj; } - inline void SetAttachment(const OUString& sAtt) { sAttached = sAtt; } /// Fill listbox with all table names of a database. bool GetTableNames(ListBox* pListBox, const OUString& rDBName ); diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index d736ff81235a..e7542e1b7b77 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -593,13 +593,11 @@ public: //End of Interfaces - void setDocReadOnly( bool b) { mbReadOnly = b; } bool getDocReadOnly() const { return mbReadOnly; } void setDocAccTitle( const OUString& rTitle ) { msDocAccTitle = rTitle; } const OUString getDocAccTitle() const { return msDocAccTitle; } // INextInterface here - DECL_LINK(BackgroundDone, SvxBrushItem *); DECL_LINK_TYPED(CalcFieldValueHdl, EditFieldInfo*, void); // OLE ??? @@ -609,12 +607,7 @@ public: #ifdef DBG_UTIL bool InXMLExport() const { return mbXMLExport; } - void SetXMLExport( bool bFlag ) { mbXMLExport = bFlag; } #endif - void SetSelAll( bool bSel ) - { - mbIsPrepareSelAll = bSel; - } bool IsPrepareSelAll() const { return mbIsPrepareSelAll; } void SetPrepareSelAll() { mbIsPrepareSelAll = true; } @@ -708,7 +701,6 @@ public: static void CountWords( const SwPaM& rPaM, SwDocStat& rStat ); // Glossary Document - void SetGlossDoc( bool bGlssDc = true ) { mbGlossDoc = bGlssDc; } bool IsInsOnlyTextGlossary() const { return mbInsOnlyTextGlssry; } void Summary( SwDoc* pExtDoc, sal_uInt8 nLevel, sal_uInt8 nPara, bool bImpress ); @@ -735,7 +727,6 @@ public: void ChgDBData( const SwDBData& rNewData ); SwDBData GetDBData(); const SwDBData& GetDBDesc(); - const SwDBData& _GetDBDesc() const { return maDBData; } // Some helper functions OUString GetUniqueGrfName() const; @@ -912,9 +903,6 @@ public: // @return name of document template. Can be 0! const OUString* GetDocPattern(size_t nPos) const; - // Query / connect current document with glossary document. - void SetGlossaryDoc( SwDoc* pDoc ) { mpGlossaryDoc = pDoc; } - // travel over PaM Ring bool InsertGlossary( SwTextBlocks& rBlock, const OUString& rEntry, SwPaM& rPaM, SwCrsrShell* pShell = 0); @@ -991,7 +979,6 @@ public: const OUString& sChkStr ) const; bool SetTOXBaseName(const SwTOXBase& rTOXBase, const OUString& rName); - void SetTOXBaseProtection(const SwTOXBase& rTOXBase, bool bProtect); // After reading file update all tables/indices void SetUpdateTOX( bool bFlag = true ) { mbUpdateTOX = bFlag; } @@ -999,7 +986,6 @@ public: OUString GetTOIAutoMarkURL() const {return msTOIAutoMarkURL;} void SetTOIAutoMarkURL(const OUString& rSet) {msTOIAutoMarkURL = rSet;} - void ApplyAutoMark(); bool IsInReading() const { return mbInReading; } void SetInReading( bool bNew ) { mbInReading = bNew; } @@ -1020,7 +1006,6 @@ public: // Manage types of tables/indices sal_uInt16 GetTOXTypeCount( TOXTypes eTyp ) const; const SwTOXType* GetTOXType( TOXTypes eTyp, sal_uInt16 nId ) const; - bool DeleteTOXType( TOXTypes eTyp, sal_uInt16 nId ); const SwTOXType* InsertTOXType( const SwTOXType& rTyp ); const SwTOXTypes& GetTOXTypes() const { return *mpTOXTypes; } @@ -1389,9 +1374,6 @@ public: bool IsInLoadAsynchron() const { return mbInLoadAsynchron; } void SetInLoadAsynchron( bool bFlag ) { mbInLoadAsynchron = bFlag; } - bool SelectServerObj( const OUString& rStr, SwPaM*& rpPam, - SwNodeRange*& rpRange ) const; - // For Drag&Move: (e.g. allow "moving" of RefMarks) bool IsCopyIsMove() const { return mbCopyIsMove; } void SetCopyIsMove( bool bFlag ) { mbCopyIsMove = bFlag; } diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index 963b8b917962..f65f99e908a5 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -141,14 +141,12 @@ class SW_DLLPUBLIC SwDocShell SAL_DLLPRIVATE sal_uInt16 MakeByExample(const OUString &rName, sal_uInt16 nFamily, sal_uInt16 nMask, SwWrtShell* pShell = 0); - SAL_DLLPRIVATE void InitDraw(); SAL_DLLPRIVATE void SubInitNew(); ///< for InitNew and HtmlSourceMode. SAL_DLLPRIVATE void RemoveOLEObjects(); SAL_DLLPRIVATE void CalcLayoutForOLEObjects(); SAL_DLLPRIVATE void Init_Impl(); - DECL_DLLPRIVATE_STATIC_LINK( SwDocShell, IsLoadFinished, void* ); using SfxObjectShell::GetVisArea; @@ -157,7 +155,6 @@ protected: virtual void DoFlushDocInfo() SAL_OVERRIDE; public: - /// but we implement this ourselves. SFX_DECL_INTERFACE(SW_DOCSHELL) SFX_DECL_OBJECTFACTORY() @@ -168,8 +165,6 @@ private: static void InitInterface_Impl(); public: - static SfxInterface *_GetInterface() { return GetStaticInterface(); } - static OUString GetEventName( sal_Int32 nId ); /// Doc is required for SO data exchange! @@ -195,17 +190,14 @@ public: /// Dispatcher void Execute(SfxRequest &); void ExecStyleSheet(SfxRequest&); - void ExecDB(SfxRequest&); void GetState(SfxItemSet &); - void StateAlways(SfxItemSet &); void StateStyleSheet(SfxItemSet&, SwWrtShell* pSh = 0 ); /// returns Doc. But be careful! inline SwDoc* GetDoc() { return m_pDoc; } inline const SwDoc* GetDoc() const { return m_pDoc; } IDocumentDeviceAccess& getIDocumentDeviceAccess(); - const IDocumentSettingAccess& getIDocumentSettingAccess() const; IDocumentChartDataProviderAccess& getIDocumentChartDataProviderAccess(); void UpdateFontList(); diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx index f7d8cf46dd94..db71e007e32e 100644 --- a/sw/inc/docufld.hxx +++ b/sw/inc/docufld.hxx @@ -529,8 +529,6 @@ class SwExtUserFieldType : public SwFieldType public: SwExtUserFieldType(); - inline void SetData(const OUString& rStr) { aData = rStr; } - static OUString Expand(sal_uInt16 nSubType, sal_uInt32 nFormat); virtual SwFieldType* Copy() const SAL_OVERRIDE; }; diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index aa8118b1534d..20efecf886ab 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -148,8 +148,6 @@ class SW_DLLPUBLIC SwEditShell : public SwCrsrShell /// For the PamCorrAbs/-Rel methods. friend class SwUndo; - SAL_DLLPRIVATE SfxPoolItem& _GetChrFormat( SfxPoolItem& ) const; - /** Returns pointer to a SwGrfNode that will be used by GetGraphic() and GetGraphicSize(). */ SAL_DLLPRIVATE SwGrfNode *_GetGrfNode() const ; diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx index 149ba2b94dba..4aef0156d792 100644 --- a/sw/inc/expfld.hxx +++ b/sw/inc/expfld.hxx @@ -178,7 +178,6 @@ public: sal_uInt16 SetSeqRefNo( SwSetExpField& rField ); size_t GetSeqFieldList( SwSeqFieldList& rList ); - OUString MakeSeqName( sal_uInt16 nSeqNo ); /// Number sequence fields chapterwise if required. OUString GetDelimiter() const { return sDelim; } diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index fa2ff510e89e..b8604d13936e 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -440,9 +440,6 @@ public: const SwRect &rPrt, const SwRect &rFrm ) = 0; - /// Set visible range on object, if it is not yet visible. - void MakeObjVisible( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& ) const; - /// Check resize of OLE-Object. bool IsCheckForOLEInCaption() const { return m_bCheckForOLEInCaption; } void SetCheckForOLEInCaption( bool bFlag ) { m_bCheckForOLEInCaption = bFlag; } @@ -553,7 +550,6 @@ public: void Paste( SvStream& rStm, SwPasteSdr nAction, const Point* pPt = 0 ); bool Paste( const Graphic &rGrf, const OUString& rURL ); - bool Paste( SotDataObject& rObj, const Point& rPt ); bool IsAlignPossible() const; void SetCalcFieldValueHdl(Outliner* pOutliner); @@ -715,9 +711,6 @@ public: /// Not allowed if only empty cells are selected. bool IsAdjustCellWidthAllowed( bool bBalance = false ) const; - /// Adjustment of cell-widths; determine via bTstOnly if more than one cell is selected. - bool BalanceCellWidth( bool bTstOnly ); - /// AutoFormat for table/ table selection. bool SetTableAutoFormat( const SwTableAutoFormat& rNew ); diff --git a/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx index 18f25baa75ee..c5020eed04f4 100644 --- a/sw/inc/fmtclds.hxx +++ b/sw/inc/fmtclds.hxx @@ -44,8 +44,6 @@ public: bool operator==( const SwColumn & ) const; void SetWishWidth( sal_uInt16 nNew ) { nWish = nNew; } - void SetUpper( sal_uInt16 nNew ) { nUpper = nNew; } - void SetLower( sal_uInt16 nNew ) { nLower = nNew; } void SetLeft ( sal_uInt16 nNew ) { nLeft = nNew; } void SetRight( sal_uInt16 nNew ) { nRight = nNew; } diff --git a/sw/inc/fmtflcnt.hxx b/sw/inc/fmtflcnt.hxx index 64115f61d5eb..83cab4bb3214 100644 --- a/sw/inc/fmtflcnt.hxx +++ b/sw/inc/fmtflcnt.hxx @@ -48,8 +48,6 @@ public: const SwTextFlyCnt *GetTextFlyCnt() const { return pTextAttr; } SwTextFlyCnt *GetTextFlyCnt() { return pTextAttr; } - - bool Sw3ioExportAllowed() const; }; #endif diff --git a/sw/inc/fmtftn.hxx b/sw/inc/fmtftn.hxx index 2e6a78894ee1..046efadafdf6 100644 --- a/sw/inc/fmtftn.hxx +++ b/sw/inc/fmtftn.hxx @@ -69,7 +69,6 @@ public: bool IsEndNote() const { return m_bEndNote;} void SetNumStr( const OUString& rStr ) { m_aNumber = rStr; } - void SetNumber( sal_uInt16 nNo ) { m_nNumber = nNo; } void SetEndNote( bool b ); void SetNumber( const SwFormatFootnote& rFootnote ) diff --git a/sw/inc/fmthdft.hxx b/sw/inc/fmthdft.hxx index 2130ac1db86b..0aca211e3890 100644 --- a/sw/inc/fmthdft.hxx +++ b/sw/inc/fmthdft.hxx @@ -58,7 +58,6 @@ public: void RegisterToFormat( SwFormat& rFormat ); bool IsActive() const { return bActive; } - void SetActive( bool bNew = true ) { bActive = bNew; } }; /**Footer, for pageformats @@ -91,7 +90,6 @@ public: void RegisterToFormat( SwFormat& rFormat ); bool IsActive() const { return bActive; } - void SetActive( bool bNew = true ) { bActive = bNew; } }; inline const SwFormatHeader &SwAttrSet::GetHeader(bool bInP) const diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx index 0195015709b8..e9d5cee94afa 100644 --- a/sw/inc/fmtpdsc.hxx +++ b/sw/inc/fmtpdsc.hxx @@ -78,7 +78,6 @@ public: /// Query / set where attribute is anchored. inline const SwModify* GetDefinedIn() const { return pDefinedIn; } void ChgDefinedIn( const SwModify* pNew ) { pDefinedIn = const_cast<SwModify*>(pNew); } - void RegisterToEndNotInfo( SwEndNoteInfo& ); void RegisterToPageDesc( SwPageDesc& ); bool KnowsPageDesc() const; void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx index 68a01bd1e281..f95fe2640b06 100644 --- a/sw/inc/format.hxx +++ b/sw/inc/format.hxx @@ -114,8 +114,6 @@ public: inline OUString GetName() const { return m_aFormatName; } inline bool HasName(const OUString &rName) const { return m_aFormatName == rName; } void SetName( const OUString& rNewName, bool bBroadcast=false ); - inline void SetName( const sal_Char* pNewName, - bool bBroadcast=false); /// For querying the attribute array. inline const SwAttrSet& GetAttrSet() const { return m_aSet; } @@ -184,48 +182,12 @@ public: If nothing is found the defaulted attribute is returned. */ /// Character-attributes - implemented in charatr.hxx - inline const SvxPostureItem &GetPosture( bool = true ) const; - inline const SvxWeightItem &GetWeight( bool = true ) const; - inline const SvxShadowedItem &GetShadowed( bool = true ) const; - inline const SvxAutoKernItem &GetAutoKern( bool = true ) const; - inline const SvxWordLineModeItem &GetWordLineMode( bool = true ) const; - inline const SvxContourItem &GetContour( bool = true ) const; - inline const SvxKerningItem &GetKerning( bool = true ) const; inline const SvxUnderlineItem &GetUnderline( bool = true ) const; - inline const SvxOverlineItem &GetOverline( bool = true ) const; - inline const SvxCrossedOutItem &GetCrossedOut( bool = true ) const; inline const SvxFontHeightItem &GetSize( bool = true ) const; - inline const SvxPropSizeItem &GetPropSize( bool = true ) const; inline const SvxFontItem &GetFont( bool = true ) const; inline const SvxColorItem &GetColor( bool = true ) const; - inline const SvxCharSetColorItem &GetCharSetColor( bool = true ) const; - inline const SvxLanguageItem &GetLanguage( bool = true ) const; - inline const SvxEscapementItem &GetEscapement( bool = true ) const; - inline const SvxCaseMapItem &GetCaseMap( bool = true ) const; - inline const SvxNoHyphenItem &GetNoHyphenHere( bool = true ) const; - inline const SvxBlinkItem &GetBlink( bool = true ) const; - inline const SvxBrushItem &GetChrBackground( bool = true ) const; - inline const SvxBrushItem &GetChrHighlight( bool = true ) const; - inline const SvxFontItem &GetCJKFont( bool = true ) const; - inline const SvxFontHeightItem &GetCJKSize( bool = true ) const; - inline const SvxLanguageItem &GetCJKLanguage( bool = true ) const; - inline const SvxPostureItem &GetCJKPosture( bool = true ) const; - inline const SvxWeightItem &GetCJKWeight( bool = true ) const; inline const SvxFontItem &GetCTLFont( bool = true ) const; - inline const SvxFontHeightItem &GetCTLSize( bool = true ) const; - inline const SvxLanguageItem &GetCTLLanguage( bool = true ) const; - inline const SvxPostureItem &GetCTLPosture( bool = true ) const; - inline const SvxWeightItem &GetCTLWeight( bool = true ) const; - inline const SfxBoolItem &GetWritingDirection( bool = true ) const; - inline const SvxEmphasisMarkItem &GetEmphasisMark( bool = true ) const; - inline const SvxTwoLinesItem &Get2Lines( bool = true ) const; - inline const SvxCharScaleWidthItem &GetCharScaleW( bool = true ) const; - inline const SvxCharRotateItem &GetCharRotate( bool = true ) const; - inline const SvxCharReliefItem &GetCharRelief( bool = true ) const; - inline const SvxCharHiddenItem &GetCharHidden( bool = true ) const; - inline const SvxBoxItem &GetCharBorder( bool = true ) const; - inline const SvxShadowItem &GetCharShadow( bool = true ) const; /// Frame-attributes - implemented in frmatr.hxx. inline const SwFormatFillOrder &GetFillOrder( bool = true ) const; @@ -259,7 +221,6 @@ public: inline const SwFormatLayoutSplit &GetLayoutSplit( bool = true ) const; inline const SwFormatRowSplit &GetRowSplit( bool = true ) const; inline const SwFormatChain &GetChain( bool = true ) const; - inline const SwFormatLineNumber &GetLineNumber( bool = true ) const; inline const SwFormatFootnoteAtTextEnd &GetFootnoteAtTextEnd( bool = true ) const; inline const SwFormatEndAtTextEnd &GetEndAtTextEnd( bool = true ) const; inline const SwFormatNoBalancedColumns &GetBalancedColumns( bool = true ) const; @@ -272,37 +233,11 @@ public: inline const SwFormatWrapInfluenceOnObjPos& GetWrapInfluenceOnObjPos(bool = true) const; inline const SdrTextVertAdjustItem& GetTextVertAdjust(bool = true) const; - /// Graphics-attributes - implemented in grfatr.hxx - inline const SwMirrorGrf &GetMirrorGrf( bool = true ) const; - inline const SwCropGrf &GetCropGrf( bool = true ) const; - inline const SwRotationGrf &GetRotationGrf(bool = true ) const; - inline const SwLuminanceGrf &GetLuminanceGrf(bool = true ) const; - inline const SwContrastGrf &GetContrastGrf(bool = true ) const; - inline const SwChannelRGrf &GetChannelRGrf(bool = true ) const; - inline const SwChannelGGrf &GetChannelGGrf(bool = true ) const; - inline const SwChannelBGrf &GetChannelBGrf(bool = true ) const; - inline const SwGammaGrf &GetGammaGrf(bool = true ) const; - inline const SwInvertGrf &GetInvertGrf(bool = true ) const; - inline const SwTransparencyGrf &GetTransparencyGrf(bool = true ) const; - inline const SwDrawModeGrf &GetDrawModeGrf(bool = true ) const; - /// Paragraph-attributes - implemented in paratr.hxx. inline const SvxLineSpacingItem &GetLineSpacing( bool = true ) const; - inline const SvxAdjustItem &GetAdjust( bool = true ) const; - inline const SvxFormatSplitItem &GetSplit( bool = true ) const; - inline const SwRegisterItem &GetRegister( bool = true ) const; inline const SwNumRuleItem &GetNumRule( bool = true ) const; - inline const SvxWidowsItem &GetWidows( bool = true ) const; - inline const SvxOrphansItem &GetOrphans( bool = true ) const; inline const SvxTabStopItem &GetTabStops( bool = true ) const; - inline const SvxHyphenZoneItem &GetHyphenZone( bool = true ) const; inline const SwFormatDrop &GetDrop( bool = true ) const; - inline const SvxScriptSpaceItem &GetScriptSpace(bool = true) const; - inline const SvxHangingPunctuationItem &GetHangingPunctuation(bool = true) const; - inline const SvxForbiddenRuleItem &GetForbiddenRule(bool = true) const; - inline const SvxParaVertAlignItem &GetParaVertAlign(bool = true) const; - inline const SvxParaGridItem &GetParaGrid(bool = true) const; - inline const SwParaConnectBorderItem &GetParaConnectBorder(bool = true ) const; /// TableBox attributes - implemented in cellatr.hxx. inline const SwTableBoxNumFormat &GetTableBoxNumFormat( bool = true ) const; @@ -326,12 +261,6 @@ public: virtual bool supportsFullDrawingLayerFillAttributeSet() const; }; -inline void SwFormat::SetName( const sal_Char* pNewName, - bool bBroadcast ) -{ - SetName(OUString::createFromAscii(pNewName), bBroadcast); -} - #endif // INCLUDED_SW_INC_FORMAT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index 1e88fa0e45cc..7e8d34877b15 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -290,11 +290,6 @@ public: inline bool IsPosAttrSet() const { return mbPosAttrSet; } inline void PosAttrSet() { mbPosAttrSet = true; } - inline void ResetPosAttr() - { - mbPosAttrSet = false; - } - virtual OUString GetDescription() const SAL_OVERRIDE; DECL_FIXEDMEMPOOL_NEWDEL(SwDrawFrameFormat); diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx index 3b7fed9b6df6..a2c27637c9b0 100644 --- a/sw/inc/grfatr.hxx +++ b/sw/inc/grfatr.hxx @@ -115,7 +115,6 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - void SetUnrotatedSize( const Size& rSz ) { aUnrotatedSize = rSz; } const Size& GetUnrotatedSize() const { return aUnrotatedSize; } }; @@ -314,32 +313,6 @@ inline const SwTransparencyGrf &SwAttrSet::GetTransparencyGrf(bool bInP) const inline const SwDrawModeGrf &SwAttrSet::GetDrawModeGrf(bool bInP) const { return static_cast<const SwDrawModeGrf&>(Get( RES_GRFATR_DRAWMODE,bInP)); } -// Implementation of graphics attributes methods of SwFormat -inline const SwMirrorGrf &SwFormat::GetMirrorGrf(bool bInP) const - { return m_aSet.GetMirrorGrf(bInP); } -inline const SwCropGrf &SwFormat::GetCropGrf(bool bInP) const - { return m_aSet.GetCropGrf(bInP); } -inline const SwRotationGrf &SwFormat::GetRotationGrf(bool bInP) const - { return m_aSet.GetRotationGrf(bInP); } -inline const SwLuminanceGrf &SwFormat::GetLuminanceGrf(bool bInP) const - { return m_aSet.GetLuminanceGrf( bInP); } -inline const SwContrastGrf &SwFormat::GetContrastGrf(bool bInP) const - { return m_aSet.GetContrastGrf( bInP); } -inline const SwChannelRGrf &SwFormat::GetChannelRGrf(bool bInP) const - { return m_aSet.GetChannelRGrf( bInP); } -inline const SwChannelGGrf &SwFormat::GetChannelGGrf(bool bInP) const - { return m_aSet.GetChannelGGrf( bInP); } -inline const SwChannelBGrf &SwFormat::GetChannelBGrf(bool bInP) const - { return m_aSet.GetChannelBGrf( bInP); } -inline const SwGammaGrf &SwFormat::GetGammaGrf(bool bInP) const - { return m_aSet.GetGammaGrf( bInP); } -inline const SwInvertGrf &SwFormat::GetInvertGrf(bool bInP) const - { return m_aSet.GetInvertGrf( bInP); } -inline const SwTransparencyGrf &SwFormat::GetTransparencyGrf(bool bInP) const - { return m_aSet.GetTransparencyGrf( bInP); } -inline const SwDrawModeGrf &SwFormat::GetDrawModeGrf(bool bInP) const - { return m_aSet.GetDrawModeGrf(bInP); } - #endif // INCLUDED_SW_INC_GRFATR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/index.hxx b/sw/inc/index.hxx index a1d5da7af1f8..09289a382e7e 100644 --- a/sw/inc/index.hxx +++ b/sw/inc/index.hxx @@ -123,8 +123,6 @@ protected: virtual void Update( SwIndex const & rPos, const sal_Int32 nChangeLen, const bool bNegative = false, const bool bDelete = false ); - void ChkArr(); - bool HasAnyIndex() const { return 0 != m_pFirst; } public: diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx index 06fc3f1412f5..02d0a18c0093 100644 --- a/sw/inc/modcfg.hxx +++ b/sw/inc/modcfg.hxx @@ -306,14 +306,9 @@ public: void SetMailingFormats( MailTextFormats nSet ) { aMiscConfig.nMailingFormats = nSet; aMiscConfig.SetModified();} - bool IsSinglePrintJob() const { return aMiscConfig.bSinglePrintJob; } void SetSinglePrintJob( bool b ) { aMiscConfig.bSinglePrintJob = b; aMiscConfig.SetModified();} - bool IsNumAlignSize() const { return aMiscConfig.bNumAlignSize; } - void SetNumAlignSize( bool b ) { aMiscConfig.bNumAlignSize = b; - aMiscConfig.SetModified();} - bool IsNameFromColumn() const { return aMiscConfig.bIsNameFromColumn; } void SetIsNameFromColumn( bool bSet ) { @@ -322,11 +317,6 @@ public: } bool IsAskForMailMerge() const { return aMiscConfig.bAskForMailMergeInPrint;} - void SetAskForMailMerge(bool bSet) - { - aMiscConfig.SetModified(); - aMiscConfig.bAskForMailMergeInPrint = bSet; - } OUString GetNameFromColumn() const { return aMiscConfig.sNameFromColumn; } void SetNameFromColumn( const OUString& rSet ) { aMiscConfig.sNameFromColumn = rSet; @@ -336,10 +326,6 @@ public: void SetMailingPath(const OUString& sPath) { aMiscConfig.sMailingPath = sPath; aMiscConfig.SetModified();} - OUString GetMailName() const { return aMiscConfig.sMailName; } - void SetMailName(const OUString& sName){ aMiscConfig.sMailName = sName; - aMiscConfig.SetModified();} - OUString GetWordDelimiter() const { return aMiscConfig.sWordDelimiter; } void SetWordDelimiter(const OUString& sDelim) { aMiscConfig.sWordDelimiter = sDelim; aMiscConfig.SetModified();} diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx index ad085346cade..732fdc203af7 100644 --- a/sw/inc/ndarr.hxx +++ b/sw/inc/ndarr.hxx @@ -189,11 +189,6 @@ public: SwContentNode* GoNext(SwNodeIndex *) const; static SwContentNode* GoPrevious(SwNodeIndex *); - /** Go to next/previous Content/Table-node for which LayoutFrames exist. - While doing this do not leave Header/Footer/Frame etc. */ - SwNode* GoNextWithFrm(SwNodeIndex *) const; - SwNode* GoPreviousWithFrm(SwNodeIndex *) const; - /** Go to next content-node that is not protected or hidden (Both set FALSE ==> GoNext/GoPrevious!!!). */ SwContentNode* GoNextSection( SwNodeIndex *, bool bSkipHidden = true, diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx index 415483558a8d..0f1d84420faa 100644 --- a/sw/inc/node.hxx +++ b/sw/inc/node.hxx @@ -129,7 +129,6 @@ public: inline sal_uInt8 GetAutoFormatLvl() const { return nAFormatNumLvl; } inline void SetAutoFormatLvl( sal_uInt8 nVal ) { nAFormatNumLvl = nVal; } - inline bool IsSetNumLSpace() const { return bSetNumLSpace; } inline void SetNumLSpace( bool bFlag ) { bSetNumLSpace = bFlag; } inline bool IsIgnoreDontExpand() const { return bIgnoreDontExpand; } diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx index 5bdb73884dbf..5bacf498cd10 100644 --- a/sw/inc/pagedesc.hxx +++ b/sw/inc/pagedesc.hxx @@ -163,7 +163,6 @@ protected: public: OUString GetName() const { return m_StyleName; } - bool HasName(const OUString& rThisName) const { return m_StyleName == rThisName; } void SetName(const OUString& rNewName) { m_StyleName = rNewName; } bool GetLandscape() const { return m_IsLandscape; } @@ -204,7 +203,6 @@ public: /** Reset all attrs of the format but keep the ones a pagedesc cannot live without. */ inline void ResetAllMasterAttr(); - inline void ResetAllLeftAttr(); /** Layout uses the following methods to obtain a format in order to be able to create a page. */ @@ -305,11 +303,6 @@ inline void SwPageDesc::ResetAllMasterAttr() ResetAllAttr( false ); } -inline void SwPageDesc::ResetAllLeftAttr() -{ - ResetAllAttr( true ); -} - inline const SwFrameFormat *SwPageDesc::GetRightFormat(bool const bFirst) const { return const_cast<SwPageDesc*>(this)->GetRightFormat(bFirst); diff --git a/sw/inc/pagepreviewlayout.hxx b/sw/inc/pagepreviewlayout.hxx index b6e8196ac99e..809b76d4349a 100644 --- a/sw/inc/pagepreviewlayout.hxx +++ b/sw/inc/pagepreviewlayout.hxx @@ -569,12 +569,6 @@ public: @author FME */ sal_uInt16 ConvertAbsoluteToRelativePageNum( sal_uInt16 _nAbsPageNum ) const; - - /** get the number of preview pages - - @author FME - */ - sal_uInt16 GetNumberOfPreviewPages() { return sal::static_int_cast< sal_uInt16 >(maPreviewPages.size()); } }; #endif // INCLUDED_SW_INC_PAGEPREVIEWLAYOUT_HXX diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx index d0a11094c25a..235bc3577587 100644 --- a/sw/inc/paratr.hxx +++ b/sw/inc/paratr.hxx @@ -239,36 +239,12 @@ inline const SwParaConnectBorderItem &SwAttrSet::GetParaConnectBorder(bool bInP) // Implementation of paragraph-attributes methods of SwFormat inline const SvxLineSpacingItem &SwFormat::GetLineSpacing(bool bInP) const { return m_aSet.GetLineSpacing(bInP); } -inline const SvxAdjustItem &SwFormat::GetAdjust(bool bInP) const - { return m_aSet.GetAdjust(bInP); } -inline const SvxFormatSplitItem &SwFormat::GetSplit(bool bInP) const - { return m_aSet.GetSplit(bInP); } -inline const SwRegisterItem &SwFormat::GetRegister(bool bInP) const - { return m_aSet.GetRegister(bInP); } -inline const SvxWidowsItem &SwFormat::GetWidows(bool bInP) const - { return m_aSet.GetWidows(bInP); } -inline const SvxOrphansItem &SwFormat::GetOrphans(bool bInP) const - { return m_aSet.GetOrphans(bInP); } inline const SvxTabStopItem &SwFormat::GetTabStops(bool bInP) const { return m_aSet.GetTabStops(bInP); } -inline const SvxHyphenZoneItem &SwFormat::GetHyphenZone(bool bInP) const - { return m_aSet.GetHyphenZone(bInP); } inline const SwFormatDrop &SwFormat::GetDrop(bool bInP) const { return m_aSet.GetDrop(bInP); } inline const SwNumRuleItem &SwFormat::GetNumRule(bool bInP) const { return m_aSet.GetNumRule(bInP); } -inline const SvxScriptSpaceItem& SwFormat::GetScriptSpace(bool bInP) const - { return m_aSet.GetScriptSpace(bInP) ; } -inline const SvxHangingPunctuationItem &SwFormat::GetHangingPunctuation(bool bInP) const - { return m_aSet.GetHangingPunctuation(bInP) ; } -inline const SvxForbiddenRuleItem &SwFormat::GetForbiddenRule(bool bInP) const - { return static_cast<const SvxForbiddenRuleItem&>(m_aSet.Get(RES_PARATR_FORBIDDEN_RULES, bInP)); } -inline const SvxParaVertAlignItem &SwFormat::GetParaVertAlign(bool bInP) const - { return static_cast<const SvxParaVertAlignItem&>(m_aSet.Get( RES_PARATR_VERTALIGN, bInP )); } -inline const SvxParaGridItem &SwFormat::GetParaGrid(bool bInP) const - { return static_cast<const SvxParaGridItem&>(m_aSet.Get( RES_PARATR_SNAPTOGRID, bInP )); } -inline const SwParaConnectBorderItem &SwFormat::GetParaConnectBorder(bool bInP) const - { return static_cast<const SwParaConnectBorderItem&>(m_aSet.Get( RES_PARATR_CONNECT_BORDER, bInP )); } #endif diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx index 6fd7ad6f2ed9..2b8b69c63203 100644 --- a/sw/inc/redline.hxx +++ b/sw/inc/redline.hxx @@ -139,8 +139,8 @@ public: { return !operator==( rCmp ); } RedlineType_t GetType() const - { return ((RedlineType_t)(eType & nsRedlineType_t::REDLINE_NO_FLAG_MASK)); } - RedlineType_t GetRealType() const { return eType; } + { return ((RedlineType_t)(eType & nsRedlineType_t::REDLINE_NO_FLAG_MASK)); } + sal_uInt16 GetAuthor() const { return nAuthor; } const OUString& GetComment() const { return sComment; } const DateTime& GetTimeStamp() const { return aStamp; } @@ -150,7 +150,7 @@ public: void SetTimeStamp( const DateTime& rDT ) { aStamp = rDT; } void SetAutoFormatFlag() - { eType = (RedlineType_t)(eType | nsRedlineType_t::REDLINE_FORM_AUTOFMT); } + { eType = (RedlineType_t)(eType | nsRedlineType_t::REDLINE_FORM_AUTOFMT); } bool CanCombine( const SwRedlineData& rCmp ) const { return nAuthor == rCmp.nAuthor && @@ -318,8 +318,6 @@ public: * the RedLineObject.*/ void SetExtraData( const SwRedlineExtraData* pData ) { m_aRedlineData.SetExtraData( pData ); } - const SwRedlineExtraData* GetExtraData() const - { return m_aRedlineData.GetExtraData(); } const SwTableLine& GetTableLine() const { return m_rTableLine; } const SwRedlineData& GetRedlineData() const @@ -341,8 +339,6 @@ public: * the RedLineObject.*/ void SetExtraData( const SwRedlineExtraData* pData ) { m_aRedlineData.SetExtraData( pData ); } - const SwRedlineExtraData* GetExtraData() const - { return m_aRedlineData.GetExtraData(); } const SwTableBox& GetTableBox() const { return m_rTableBox; } const SwRedlineData& GetRedlineData() const @@ -354,20 +350,6 @@ class SW_DLLPUBLIC SwRedlineHint : public SfxHint #define SWREDLINE_INSERTED 1 #define SWREDLINE_FOCUS 3 - const SwRangeRedline* pRedline; - sal_Int16 nWhich; - const SwView* pView; - -public: - SwRedlineHint( const SwRangeRedline* p, sal_Int16 n, const SwView* pV = 0) - : pRedline(p) - , nWhich(n) - , pView(pV) - {} - - const SwRangeRedline* GetRedline() const { return pRedline; } - sal_Int16 Which() const { return nWhich; } - const SwView* GetView() const { return pView; } }; #endif diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx index a3d34be61988..f37600f056d4 100644 --- a/sw/inc/section.hxx +++ b/sw/inc/section.hxx @@ -213,8 +213,6 @@ public: // Get / set password of this section ::com::sun::star::uno::Sequence<sal_Int8> const& GetPassword() const { return m_Data.GetPassword(); } - void SetPassword(::com::sun::star::uno::Sequence <sal_Int8> const& rNew) - { m_Data.SetPassword(rNew); } // Data server methods. void SetRefObject( SwServerObject* pObj ); diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx index 160f858fabc3..418d67d4de63 100644 --- a/sw/inc/swatrset.hxx +++ b/sw/inc/swatrset.hxx @@ -251,7 +251,6 @@ public: inline const SvxLanguageItem &GetCTLLanguage( bool = true ) const; inline const SvxPostureItem &GetCTLPosture( bool = true ) const; inline const SvxWeightItem &GetCTLWeight( bool = true ) const; - inline const SfxBoolItem &GetWritingDirection( bool = true ) const; inline const SvxEmphasisMarkItem &GetEmphasisMark( bool = true ) const; inline const SvxTwoLinesItem &Get2Lines( bool = true ) const; inline const SvxCharScaleWidthItem &GetCharScaleW( bool = true ) const; @@ -295,7 +294,6 @@ public: inline const SwFormatEndAtTextEnd &GetEndAtTextEnd( bool = true ) const; inline const SwFormatNoBalancedColumns &GetBalancedColumns( bool = true ) const; inline const SvxFrameDirectionItem &GetFrmDir( bool = true ) const; - inline const SwTextGridItem &GetTextGrid( bool = true ) const; inline const SwHeaderAndFooterEatSpacingItem &GetHeaderAndFooterEatSpacing( bool = true ) const; inline const SwFormatFollowTextFlow &GetFollowTextFlow(bool = true) const; inline const SwFormatWrapInfluenceOnObjPos& GetWrapInfluenceOnObjPos(bool = true) const; diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx index 7e55f59a8cae..c648324fb5f8 100644 --- a/sw/inc/swcrsr.hxx +++ b/sw/inc/swcrsr.hxx @@ -153,7 +153,6 @@ public: bool GoSentence(SentenceMoveType eMoveType); bool GoNextSentence(){return GoSentence(NEXT_SENT);} bool GoEndSentence(){return GoSentence(END_SENT);} - bool GoPrevSentence(){return GoSentence(PREV_SENT);} bool GoStartSentence(){return GoSentence(START_SENT);} bool ExpandToSentenceBorders(); @@ -178,8 +177,6 @@ public: bool GotoFootnoteText(); bool GotoNextFootnoteAnchor(); bool GotoPrevFootnoteAnchor(); - bool GotoNextFootnoteContent(); - bool GotoPrevFootnoteContent(); bool MovePara( SwWhichPara, SwPosPara ); bool MoveSection( SwWhichSection, SwPosSection ); @@ -215,7 +212,6 @@ public: void SetColumnSelection( bool bNew ) { m_bColumnSelection = bNew; } long GetCrsrRowSpanOffset() const { return m_nRowSpanOffset; } - void SetCrsrRowSpanOffset( long nNew ) { m_nRowSpanOffset = nNew; } DECL_FIXEDMEMPOOL_NEWDEL( SwCursor ) }; diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx index 6c3dc36c738f..f6bdea0d22d9 100644 --- a/sw/inc/swmodule.hxx +++ b/sw/inc/swmodule.hxx @@ -233,8 +233,6 @@ public: inline ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLinguServiceEventListener > GetLngSvcEvtListener(); - inline void SetLngSvcEvtListener( ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XLinguServiceEventListener > & xLstnr); void CreateLngSvcEvtListener(); ::com::sun::star::uno::Reference< @@ -253,13 +251,6 @@ inline ::com::sun::star::uno::Reference< return xLngSvcEvtListener; } -inline void SwModule::SetLngSvcEvtListener( - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XLinguServiceEventListener > & xLstnr) -{ - xLngSvcEvtListener = xLstnr; -} - // Access to SwModule, the View and the shell. #define SW_MOD() ( *reinterpret_cast<SwModule**>(GetAppData(SHL_WRITER))) diff --git a/sw/inc/swrect.hxx b/sw/inc/swrect.hxx index b90d4cd222e7..47c107400c18 100644 --- a/sw/inc/swrect.hxx +++ b/sw/inc/swrect.hxx @@ -77,7 +77,6 @@ public: // Same as Intersection, only assume that Rects are overlapping! SwRect &_Intersection( const SwRect &rRect ); - inline SwRect GetIntersection( const SwRect& rRect ) const; bool IsInside( const Point& rPOINT ) const; bool IsNear(const Point& rPoint, long nTolerance ) const; @@ -299,11 +298,6 @@ inline Rectangle SwRect::SVRect() const m_Point.getY() + m_Size.getHeight() - 1 ); //Bottom() } -inline SwRect SwRect::GetIntersection( const SwRect& rRect ) const -{ - return SwRect( *this ).Intersection( rRect ); -} - inline bool SwRect::HasArea() const { return !IsEmpty(); diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx index c7fd4c7d3b49..8b42d9dfafbe 100644 --- a/sw/inc/swtable.hxx +++ b/sw/inc/swtable.hxx @@ -243,8 +243,6 @@ public: bool DeleteSel( SwDoc*, const SwSelBoxes& rBoxes, const SwSelBoxes* pMerged, SwUndo* pUndo, const bool bDelMakeFrms, const bool bCorrBorder ); bool SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt=1 ); - bool Merge( const SwSelBoxes& rBoxes, - SwTableBox* pMergeBox, SwUndoTableMerge* = 0 ); void FindSuperfluousRows( SwSelBoxes& rBoxes ) { _FindSuperfluousRows( rBoxes, 0, 0 ); } diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx index 8f51b2287392..9ee185f17dd0 100644 --- a/sw/inc/tblafmt.hxx +++ b/sw/inc/tblafmt.hxx @@ -141,8 +141,6 @@ public: const SvxFrameDirectionItem& GetTextOrientation() const { return m_aTextOrientation; } const SwFormatVertOrient& GetVerticalAlignment() const { return m_aVerticalAlignment; } const SvxBoxItem &GetBox() const { return aBox; } - const SvxLineItem &GetTLBR() const { return aTLBR; } - const SvxLineItem &GetBLTR() const { return aBLTR; } const SvxBrushItem &GetBackground() const { return aBackground; } void GetValueFormat( OUString& rFormat, LanguageType& rLng, LanguageType& rSys ) const { rFormat = sNumFormatString; rLng = eNumFormatLanguage; rSys = eSysLanguage; } diff --git a/sw/inc/tgrditem.hxx b/sw/inc/tgrditem.hxx index de112998501d..1d147818d496 100644 --- a/sw/inc/tgrditem.hxx +++ b/sw/inc/tgrditem.hxx @@ -106,8 +106,6 @@ public: void Init(); }; -inline const SwTextGridItem &SwAttrSet::GetTextGrid(bool bInP) const - { return static_cast<const SwTextGridItem&>(Get( RES_TEXTGRID, bInP )); } inline const SwTextGridItem &SwFormat::GetTextGrid(bool bInP) const { return static_cast<const SwTextGridItem&>(m_aSet.Get( RES_TEXTGRID, bInP )); } diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx index 1b75da2d9472..22ad81efc6a5 100644 --- a/sw/inc/tox.hxx +++ b/sw/inc/tox.hxx @@ -127,7 +127,6 @@ public: inline OUString GetTextReading() const; inline OUString GetPrimaryKeyReading() const; inline OUString GetSecondaryKeyReading() const; - inline OUString GetCitationKeyReading() const; bool IsAutoGenerated() const {return bAutoGenerated;} void SetAutoGenerated(bool bSet) {bAutoGenerated = bSet;} @@ -485,9 +484,6 @@ public: // index of objects - // user defined index only - inline void SetTemplateName(const OUString& rName); // Absatzlayout beachten - OUString GetStyleNames(sal_uInt16 nLevel) const { SAL_WARN_IF( nLevel >= MAXLEVEL, "sw", "Which level?"); @@ -645,12 +641,6 @@ inline OUString SwTOXMark::GetSecondaryKeyReading() const return aSecondaryKeyReading; } -inline OUString SwTOXMark::GetCitationKeyReading() const -{ - SAL_WARN_IF(GetTOXType()->GetType() != TOX_CITATION, "sw", "Wrong type"); - return aCitationKeyReading; -} - //SwForm inline void SwForm::SetTemplate(sal_uInt16 nLevel, const OUString& rTemplate) @@ -727,12 +717,6 @@ inline sal_uInt16 SwTOXBase::GetLevel() const return aData.nLevel; } -inline void SwTOXBase::SetTemplateName(const OUString& rName) -{ - SAL_WARN("sw", "SwTOXBase::SetTemplateName obsolete"); - aStyleNames[0] = rName; -} - inline sal_uInt16 SwTOXBase::GetOptions() const { SAL_WARN_IF(GetTOXType()->GetType() != TOX_INDEX, "sw", "Wrong type"); diff --git a/sw/inc/txatbase.hxx b/sw/inc/txatbase.hxx index 390ad58b7260..eeb2edb65ec4 100644 --- a/sw/inc/txatbase.hxx +++ b/sw/inc/txatbase.hxx @@ -117,7 +117,6 @@ public: inline const SwFormatRefMark &GetRefMark() const; inline const SwFormatINetFormat &GetINetFormat() const; inline const SwFormatRuby &GetRuby() const; - inline const SwFormatMeta &GetMeta() const; void dumpAsXml(struct _xmlTextWriter* pWriter) const; }; @@ -230,13 +229,6 @@ inline const SwFormatRuby& SwTextAttr::GetRuby() const return static_cast<const SwFormatRuby&>(*m_pAttr); } -inline const SwFormatMeta& SwTextAttr::GetMeta() const -{ - assert( m_pAttr && (m_pAttr->Which() == RES_TXTATR_META || - m_pAttr->Which() == RES_TXTATR_METAFIELD) ); - return static_cast<const SwFormatMeta&>(*m_pAttr); -} - // these should be static_casts but with virtual inheritance it's not possible template<typename T, typename S> inline T static_txtattr_cast(S * s) { diff --git a/sw/inc/txtatr.hxx b/sw/inc/txtatr.hxx index 02e5a1f2b82d..73700587611a 100644 --- a/sw/inc/txtatr.hxx +++ b/sw/inc/txtatr.hxx @@ -85,7 +85,6 @@ public: SAL_DLLPRIVATE void InitRuby(SwTextNode & rNode); /// Get and set TextNode pointer. - const SwTextNode* GetpTextNode() const { return m_pTextNode; } inline const SwTextNode& GetTextNode() const; void ChgTextNode( SwTextNode* pNew ) { m_pTextNode = pNew; } diff --git a/sw/inc/unobaseclass.hxx b/sw/inc/unobaseclass.hxx index 17ac71c081b6..da3b000a69f6 100644 --- a/sw/inc/unobaseclass.hxx +++ b/sw/inc/unobaseclass.hxx @@ -59,14 +59,12 @@ enum CursorType */ class UnoActionContext { - private: +private: SwDoc * m_pDoc; - public: +public: UnoActionContext(SwDoc *const pDoc); ~UnoActionContext(); - - void InvalidateDocument() { m_pDoc = 0; } }; /* @@ -76,10 +74,10 @@ class UnoActionContext */ class UnoActionRemoveContext { - private: +private: SwDoc *const m_pDoc; - public: +public: UnoActionRemoveContext(SwDoc *const pDoc); UnoActionRemoveContext(SwUnoTableCrsr const& rCursor); ~UnoActionRemoveContext(); diff --git a/sw/inc/unocoll.hxx b/sw/inc/unocoll.hxx index ff27c0ad0586..f786b22b9d3d 100644 --- a/sw/inc/unocoll.hxx +++ b/sw/inc/unocoll.hxx @@ -331,9 +331,6 @@ public: virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - - FlyCntType GetType()const{return eType;} - }; class SwXTextFrames : public SwXFrames diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx index 64c1e269f2f6..c9d5602ad6bd 100644 --- a/sw/inc/viewopt.hxx +++ b/sw/inc/viewopt.hxx @@ -398,25 +398,14 @@ public: #ifdef DBG_UTIL // Correspond to statements in ui/config/cfgvw.src. inline bool IsTest1() const { return m_bTest1; } - inline void SetTest1( bool b ) { m_bTest1 = b; } inline bool IsTest2() const { return m_bTest2; } - inline void SetTest2( bool b ) { m_bTest2 = b; } inline bool IsTest3() const { return m_bTest3; } - inline void SetTest3( bool b ) { m_bTest3 = b; } inline bool IsTest4() const { return m_bTest4; } - inline void SetTest4( bool b ) { m_bTest4 = b; } inline bool IsTest5() const { return m_bTest5; } - inline void SetTest5( bool b ) { m_bTest5 = b; } inline bool IsTest6() const { return m_bTest6; } - inline void SetTest6( bool b ) { m_bTest6 = b; } inline bool IsTest7() const { return m_bTest7; } - inline void SetTest7( bool b ) { m_bTest7 = b; } inline bool IsTest8() const { return m_bTest8; } - inline void SetTest8( bool b ) { m_bTest8 = b; } - static inline bool IsTest9() { return s_bTest9; } - static inline void SetTest9( bool b ) { s_bTest9 = b; } inline bool IsTest10() const { return m_bTest10; } - inline void SetTest10( bool b ) { m_bTest10 = b; } #endif inline sal_uInt16 GetZoom() const { return nZoom; } diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx index b17c3a9fd685..6695b121e5a6 100644 --- a/sw/inc/viewsh.hxx +++ b/sw/inc/viewsh.hxx @@ -487,8 +487,6 @@ public: bool IsPreview() const { return mbPreview; } bool IsFrameView() const { return mbFrameView; } - void SetFrameView( const Size& rBrowseBorder ) - { mbFrameView = true; maBrowseBorder = rBrowseBorder; } // Makes the necessary invalidations: // If BrowseMode has changed bBrowseChgd == true diff --git a/sw/source/core/access/accfrmobjmap.hxx b/sw/source/core/access/accfrmobjmap.hxx index fedc573b97ce..d2593333f819 100644 --- a/sw/source/core/access/accfrmobjmap.hxx +++ b/sw/source/core/access/accfrmobjmap.hxx @@ -118,9 +118,7 @@ public: static bool IsSortingRequired( const SwFrm& rFrm ); - iterator begin() { return maMap.begin(); } const_iterator cbegin() const { return maMap.cbegin(); } - iterator end() { return maMap.end(); } const_iterator cend() const { return maMap.cend(); } const_reverse_iterator crbegin() const { return maMap.crbegin(); } const_reverse_iterator crend() const { return maMap.crend(); } diff --git a/sw/source/core/access/accpage.hxx b/sw/source/core/access/accpage.hxx index 8a589df53de3..2fc6e3f7d498 100644 --- a/sw/source/core/access/accpage.hxx +++ b/sw/source/core/access/accpage.hxx @@ -38,9 +38,6 @@ class SwAccessiblePage : public SwAccessibleContext using SwAccessibleFrame::GetBounds; protected: - // return the bounding box for the page in page preview mode - SwRect GetBounds( /* const SwFrm *pFrm =0 */ ); - // Set states for getAccessibleStateSet. // This derived class additionally sets // FOCUSABLE(1) and FOCUSED(+) diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx index 475886684f73..735324e3b111 100644 --- a/sw/source/core/access/accpara.hxx +++ b/sw/source/core/access/accpara.hxx @@ -197,9 +197,6 @@ protected: return *pPortionData; } - // determine if portion data is currently available - bool HasPortionData() { return (pPortionData != NULL); } - //helpers for word boundaries bool GetCharBoundary( com::sun::star::i18n::Boundary& rBound, diff --git a/sw/source/core/doc/DocumentDrawModelManager.cxx b/sw/source/core/doc/DocumentDrawModelManager.cxx index 50a3ab13af53..a5b7163eb093 100644 --- a/sw/source/core/doc/DocumentDrawModelManager.cxx +++ b/sw/source/core/doc/DocumentDrawModelManager.cxx @@ -306,38 +306,6 @@ bool DocumentDrawModelManager::IsVisibleLayerId( const SdrLayerID& _nLayerId ) c return bRetVal; } -SdrLayerID DocumentDrawModelManager::GetVisibleLayerIdByInvisibleOne( const SdrLayerID& _nInvisibleLayerId ) -{ - SdrLayerID nVisibleLayerId; - - if ( _nInvisibleLayerId == GetInvisibleHeavenId() ) - { - nVisibleLayerId = GetHeavenId(); - } - else if ( _nInvisibleLayerId == GetInvisibleHellId() ) - { - nVisibleLayerId = GetHellId(); - } - else if ( _nInvisibleLayerId == GetInvisibleControlsId() ) - { - nVisibleLayerId = GetControlsId(); - } - else if ( _nInvisibleLayerId == GetHeavenId() || - _nInvisibleLayerId == GetHellId() || - _nInvisibleLayerId == GetControlsId() ) - { - OSL_FAIL( "<SwDoc::GetVisibleLayerIdByInvisibleOne(..)> - given layer ID already an invisible one." ); - nVisibleLayerId = _nInvisibleLayerId; - } - else - { - OSL_FAIL( "<SwDoc::GetVisibleLayerIdByInvisibleOne(..)> - given layer ID is unknown." ); - nVisibleLayerId = _nInvisibleLayerId; - } - - return nVisibleLayerId; -} - SdrLayerID DocumentDrawModelManager::GetInvisibleLayerIdByVisibleOne( const SdrLayerID& _nVisibleLayerId ) { SdrLayerID nInvisibleLayerId; diff --git a/sw/source/core/doc/DocumentListItemsManager.cxx b/sw/source/core/doc/DocumentListItemsManager.cxx index 66de4083f0c7..e095651fd7b7 100644 --- a/sw/source/core/doc/DocumentListItemsManager.cxx +++ b/sw/source/core/doc/DocumentListItemsManager.cxx @@ -76,19 +76,6 @@ OUString DocumentListItemsManager::getListItemText( const SwNodeNum& rNodeNum, : OUString(); } -void DocumentListItemsManager::getListItems( tSortedNodeNumList& orNodeNumList ) const -{ - orNodeNumList.clear(); - orNodeNumList.reserve( mpListItemsList->size() ); - - tImplSortedNodeNumList::iterator aIter; - tImplSortedNodeNumList::iterator aEndIter = mpListItemsList->end(); - for ( aIter = mpListItemsList->begin(); aIter != aEndIter; ++aIter ) - { - orNodeNumList.push_back( (*aIter) ); - } -} - void DocumentListItemsManager::getNumItems( tSortedNodeNumList& orNodeNumList ) const { orNodeNumList.clear(); diff --git a/sw/source/core/doc/DocumentStateManager.cxx b/sw/source/core/doc/DocumentStateManager.cxx index ede8ef96e834..0401fa607d73 100644 --- a/sw/source/core/doc/DocumentStateManager.cxx +++ b/sw/source/core/doc/DocumentStateManager.cxx @@ -33,7 +33,6 @@ DocumentStateManager::DocumentStateManager( SwDoc& i_rSwdoc ) : mbLoaded(false), mbUpdateExpField(false), mbNewDoc(false), - mbPageNums(false), mbInCallModified(false) { } @@ -85,11 +84,6 @@ bool DocumentStateManager::IsInCallModified() const return mbInCallModified; } -bool DocumentStateManager::IsLoaded() const -{ - return mbLoaded; -} - bool DocumentStateManager::IsUpdateExpField() const { return mbUpdateExpField; @@ -100,16 +94,6 @@ bool DocumentStateManager::IsNewDoc() const return mbNewDoc; } -bool DocumentStateManager::IsPageNums() const -{ - return mbPageNums; -} - -void DocumentStateManager::SetPageNums(bool b) -{ - mbPageNums = b; -} - void DocumentStateManager::SetNewDoc(bool b) { mbNewDoc = b; diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx index 1ca85a523cfc..621c4bf040b9 100644 --- a/sw/source/core/doc/doclay.cxx +++ b/sw/source/core/doc/doclay.cxx @@ -1263,22 +1263,6 @@ SwFlyFrameFormat* SwDoc::InsertDrawLabel( return pNewFormat; } -IMPL_LINK( SwDoc, BackgroundDone, SvxBrushItem*, ) -{ - SwViewShell* pStartSh = getIDocumentLayoutAccess().GetCurrentViewShell(); - if(pStartSh) - for(SwViewShell& rShell : pStartSh->GetRingContainer()) - { - if(rShell.GetWin()) - { - // Make sure to repaint with virtual device - rShell.LockPaint(); - rShell.UnlockPaint( true ); - } - } - return 0; -} - static OUString lcl_GetUniqueFlyName( const SwDoc* pDoc, sal_uInt16 nDefStrId ) { if( pDoc->IsInMailMerge()) diff --git a/sw/source/core/frmedt/feflyole.cxx b/sw/source/core/frmedt/feflyole.cxx index cd9804ac3336..9b69a4e727f4 100644 --- a/sw/source/core/frmedt/feflyole.cxx +++ b/sw/source/core/frmedt/feflyole.cxx @@ -92,22 +92,6 @@ OUString SwFEShell::GetUniqueFrameName() const return GetDoc()->GetUniqueFrameName(); } -void SwFEShell::MakeObjVisible( const uno::Reference < embed::XEmbeddedObject >& xObj ) const -{ - SwFlyFrm *pFly = FindFlyFrm( xObj ); - if ( pFly ) - { - SwRect aTmp( pFly->Prt() ); - aTmp += pFly->Frm().Pos(); - if ( !aTmp.IsOver( VisArea() ) ) - { - const_cast<SwFEShell*>(this)->StartAction(); - const_cast<SwFEShell*>(this)->MakeVisible( aTmp ); - const_cast<SwFEShell*>(this)->EndAction(); - } - } -} - bool SwFEShell::FinishOLEObj() // Server is terminated { SfxInPlaceClient* pIPClient = GetSfxViewShell()->GetIPClient(); diff --git a/sw/source/core/inc/DocumentDrawModelManager.hxx b/sw/source/core/inc/DocumentDrawModelManager.hxx index 4fbaf39e6285..dfa406ff80d3 100644 --- a/sw/source/core/inc/DocumentDrawModelManager.hxx +++ b/sw/source/core/inc/DocumentDrawModelManager.hxx @@ -59,8 +59,6 @@ public: virtual bool IsVisibleLayerId( const SdrLayerID& _nLayerId ) const SAL_OVERRIDE; - virtual SdrLayerID GetVisibleLayerIdByInvisibleOne( const SdrLayerID& _nInvisibleLayerId ) SAL_OVERRIDE; - virtual SdrLayerID GetInvisibleLayerIdByVisibleOne( const SdrLayerID& _nVisibleLayerId ) SAL_OVERRIDE; virtual bool Search(const SwPaM& rPaM, const SvxSearchItem& rSearchItem) SAL_OVERRIDE; diff --git a/sw/source/core/inc/DocumentListItemsManager.hxx b/sw/source/core/inc/DocumentListItemsManager.hxx index 1c3e1527dbae..0074881230be 100644 --- a/sw/source/core/inc/DocumentListItemsManager.hxx +++ b/sw/source/core/inc/DocumentListItemsManager.hxx @@ -41,8 +41,6 @@ public: const bool bWithNumber = true, const bool bWithSpacesForLevel = false ) const SAL_OVERRIDE; - void getListItems( IDocumentListItems::tSortedNodeNumList& orNodeNumList ) const SAL_OVERRIDE; - void getNumItems( IDocumentListItems::tSortedNodeNumList& orNodeNumList ) const SAL_OVERRIDE; virtual ~DocumentListItemsManager(); diff --git a/sw/source/core/inc/DocumentStateManager.hxx b/sw/source/core/inc/DocumentStateManager.hxx index edd4319d7340..f5c834384f1f 100644 --- a/sw/source/core/inc/DocumentStateManager.hxx +++ b/sw/source/core/inc/DocumentStateManager.hxx @@ -39,11 +39,8 @@ public: void ResetModified() SAL_OVERRIDE; bool IsModified() const SAL_OVERRIDE; bool IsInCallModified() const SAL_OVERRIDE; - bool IsLoaded() const SAL_OVERRIDE; bool IsUpdateExpField() const SAL_OVERRIDE; bool IsNewDoc() const SAL_OVERRIDE; - bool IsPageNums() const SAL_OVERRIDE; - void SetPageNums(bool b) SAL_OVERRIDE; void SetNewDoc(bool b) SAL_OVERRIDE; void SetUpdateExpFieldStat(bool b) SAL_OVERRIDE; void SetLoaded(bool b) SAL_OVERRIDE; @@ -55,7 +52,6 @@ private: bool mbLoaded ; //< TRUE: Doc loaded. bool mbUpdateExpField ; //< TRUE: Update expression fields. bool mbNewDoc ; //< TRUE: new Doc. - bool mbPageNums ; //< TRUE: There are virtual page numbers. bool mbInCallModified; //< TRUE: in Set/Reset-Modified link. }; diff --git a/sw/source/core/inc/cntfrm.hxx b/sw/source/core/inc/cntfrm.hxx index 18e137ba4690..6442a9408b7c 100644 --- a/sw/source/core/inc/cntfrm.hxx +++ b/sw/source/core/inc/cntfrm.hxx @@ -74,7 +74,6 @@ public: inline const SwContentNode *GetNode() const; inline SwContentNode *GetNode(); - sal_uInt16 GetSectionLevel(); inline const SwContentFrm *GetFollow() const; inline SwContentFrm *GetFollow(); @@ -89,12 +88,6 @@ public: bool bSetInReadOnly = false ) const; virtual bool UnitDown( SwPaM *, const SwTwips nOffset = 0, bool bSetInReadOnly = false ) const; - inline bool StartNextPage( SwPaM * ) const; - inline bool StartPrevPage( SwPaM * ) const; - inline bool StartCurrPage( SwPaM * ) const; - inline bool EndCurrPage( SwPaM * ) const; - inline bool EndNextPage( SwPaM * ) const; - inline bool EndPrevPage( SwPaM * ) const; // nMaxHeight is the required height // bSplit indicates that the paragraph has to be split diff --git a/sw/source/core/inc/docfld.hxx b/sw/source/core/inc/docfld.hxx index b0bd4c3d0396..b2d745619b45 100644 --- a/sw/source/core/inc/docfld.hxx +++ b/sw/source/core/inc/docfld.hxx @@ -84,12 +84,8 @@ public: const SwTextField* GetTextField() const { return TEXTFIELD == eSetGetExpFieldType ? CNTNT.pTextField : 0; } - const SwTextTOXMark* GetTOX() const - { return TEXTTOXMARK == eSetGetExpFieldType ? CNTNT.pTextTOX : 0; } const SwSection* GetSection() const { return SECTIONNODE == eSetGetExpFieldType ? CNTNT.pSection : 0; } - const SwTableBox* GetTableBox() const - { return TABLEBOX == eSetGetExpFieldType ? CNTNT.pTBox : 0; } const SwTextINetFormat* GetINetFormat() const { return TEXTINET == eSetGetExpFieldType ? CNTNT.pTextINet : 0; } const SwFlyFrameFormat* GetFlyFormat() const diff --git a/sw/source/core/inc/doctxm.hxx b/sw/source/core/inc/doctxm.hxx index e73764432ec0..7689e2ae7d69 100644 --- a/sw/source/core/inc/doctxm.hxx +++ b/sw/source/core/inc/doctxm.hxx @@ -46,7 +46,6 @@ class SwTOXBaseSection : public SwTOXBase, public SwSection void UpdateTable( const SwTextNode* pOwnChapterNode ); void UpdateSequence( const SwTextNode* pOwnChapterNode ); void UpdateAuthorities( const SwTOXInternational& rIntl ); - void UpdateAll(); // insert sorted into array for creation void InsertSorted(SwTOXSortTabBase* pBase); @@ -54,12 +53,6 @@ class SwTOXBaseSection : public SwTOXBase, public SwSection // insert alpha delimiter at creation void InsertAlphaDelimitter( const SwTOXInternational& rIntl ); - // generate text body - void GenerateText( sal_uInt16 nArrayIdx, - sal_uInt16 nCount, - const sal_uInt32 _nTOXSectNdIdx, - const SwPageDesc* _pDefaultPageDesc ); - // replace page num placeholder with actual page number void _UpdatePageNum( SwTextNode* pNd, const std::vector<sal_uInt16>& rNums, diff --git a/sw/source/core/inc/drawfont.hxx b/sw/source/core/inc/drawfont.hxx index 83bf4d661d4e..7d36258c8a50 100644 --- a/sw/source/core/inc/drawfont.hxx +++ b/sw/source/core/inc/drawfont.hxx @@ -283,22 +283,6 @@ public: return nIdx + nLen; } - long GetLeft() const - { -#ifdef DBG_UTIL - OSL_ENSURE( m_bLeft, "DrawTextInfo: Undefined left range" ); -#endif - return nLeft; - } - - long GetRight() const - { -#ifdef DBG_UTIL - OSL_ENSURE( m_bRight, "DrawTextInfo: Undefined right range" ); -#endif - return nRight; - } - long GetKanaDiff() const { #ifdef DBG_UTIL diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx index d1c3af05da4b..a619b080ca3b 100644 --- a/sw/source/core/inc/flyfrm.hxx +++ b/sw/source/core/inc/flyfrm.hxx @@ -128,9 +128,6 @@ protected: void Lock() { bLocked = true; } void Unlock() { bLocked = false; } - void SetMinHeight() { bMinHeight = true; } - void ResetMinHeight(){ bMinHeight = false; } - Size CalcRel( const SwFormatFrmSize &rSz ) const; SwTwips CalcAutoWidth() const; @@ -141,8 +138,6 @@ protected: /** method to assure that anchored object is registered at the correct page frame - - #i28701# */ virtual void RegisterAtCorrectPage() SAL_OVERRIDE; @@ -210,13 +205,10 @@ public: void SetNotifyBack() { bNotifyBack = true; } void ResetNotifyBack() { bNotifyBack = false; } bool IsNoShrink() const { return bNoShrink; } - void SetNoShrink( bool bNew ) { bNoShrink = bNew; } bool IsLockDeleteContent() const { return bLockDeleteContent; } - void SetLockDeleteContent( bool bNew ) { bLockDeleteContent = bNew; } bool IsClipped() const { return bHeightClipped || bWidthClipped; } bool IsHeightClipped() const { return bHeightClipped; } - bool IsWidthClipped() const { return bWidthClipped; } bool IsLowerOf( const SwLayoutFrm* pUpper ) const; inline bool IsUpperOf( const SwFlyFrm& _rLower ) const diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx index 8e2109411599..a73901d3de94 100644 --- a/sw/source/core/inc/fntcache.hxx +++ b/sw/source/core/inc/fntcache.hxx @@ -80,10 +80,6 @@ class SwFntObj : public SwCacheObj static MapMode *pPixMap; static VclPtr<OutputDevice> pPixOut; - void calcLinePos(SwDrawTextInfo& rInf, Point& aStart, Point& aEnd, sal_Int32 nStart, - sal_Int32 nWrLen, sal_Int32 nCnt, const bool bSwitchH2V, const bool bSwitchL2R, - long nHalfSpace, long* pKernArray, const bool bBidiPor); - public: DECL_FIXEDMEMPOOL_NEWDEL(SwFntObj) diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx index 6e8dd25a8b43..58df49f40f11 100644 --- a/sw/source/core/inc/frame.hxx +++ b/sw/source/core/inc/frame.hxx @@ -533,19 +533,15 @@ public: bool IsInBalancedSection() const; inline bool IsReverse() const { return mbReverse; } - inline void SetReverse( bool bNew ){ mbReverse = bNew; } inline bool IsVertical() const; inline bool IsVertLR() const; inline bool GetVerticalFlag() const { return mbVertical; } - inline void SetVertical( bool bNew ){ mbVertical = bNew; } - inline void SetbVertLR( bool bNew ) { mbVertLR = bNew; } inline void SetDerivedVert( bool bNew ){ mbDerivedVert = bNew; } inline void SetInvalidVert( bool bNew) { mbInvalidVert = bNew; } inline bool IsRightToLeft() const; inline bool GetRightToLeftFlag() const { return mbRightToLeft; } - inline void SetRightToLeft( bool bNew ){ mbRightToLeft = bNew; } inline void SetDerivedR2L( bool bNew ) { mbDerivedR2L = bNew; } inline void SetInvalidR2L( bool bNew ) { mbInvalidR2L = bNew; } @@ -582,7 +578,6 @@ public: const SwAttrSet *GetAttrSet() const; inline bool HasFixSize() const { return mbFixSize; } - inline void SetFixSize( bool bNew ) { mbFixSize = bNew; } // check all pages (starting from the given) and correct them if needed static void CheckPageDescs( SwPageFrm *pStart, bool bNotifyFields = true, SwPageFrm** ppPrev = 0); @@ -825,10 +820,6 @@ public: void SetBottomTopMargins( long, long ); void SetLeftRightMargins( long, long ); void SetRightLeftMargins( long, long ); - void SetLeftAndWidth( long nLeft, long nWidth ); - void SetTopAndHeight( long nTop, long nHeight ); - void SetRightAndWidth( long nRight, long nWidth ); - void SetBottomAndHeight( long nBottom, long nHeight ); long GetPrtLeft() const; long GetPrtBottom() const; long GetPrtRight() const; @@ -846,7 +837,6 @@ public: // #i65250# inline sal_uInt32 GetFrmId() const { return mnFrmId; } - static inline sal_uInt32 GetLastFrmId() { return mnLastFrmId; } // NEW TABLES // Some functions for covered/covering table cells. This way unnecessary diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx index 23a222659bcb..cc58afc289de 100644 --- a/sw/source/core/inc/frmtool.hxx +++ b/sw/source/core/inc/frmtool.hxx @@ -189,13 +189,7 @@ public: ~SwFrmNotify(); const SwRect &Frm() const { return aFrm; } - const SwRect &Prt() const { return aPrt; } void SetInvaKeep() { bInvaKeep = true; } - // #i49383# - void FrmDeleted() - { - mbFrmDeleted = true; - } }; class SwLayNotify : public SwFrmNotify @@ -221,8 +215,6 @@ class SwFlyNotify : public SwLayNotify public: SwFlyNotify( SwFlyFrm *pFlyFrm ); ~SwFlyNotify(); - - SwPageFrm *GetOldPage() const { return pOldPage; } }; class SwContentNotify : public SwFrmNotify @@ -348,7 +340,6 @@ public: inline const SwAttrSet &GetAttrSet() const { return rAttrSet; } inline const SvxULSpaceItem &GetULSpace() const { return rUL; } - inline const SvxLRSpaceItem &GetLRSpace() const { return rLR; } inline const SvxBoxItem &GetBox() const { return rBox; } inline const SvxShadowItem &GetShadow() const { return rShadow; } @@ -409,7 +400,6 @@ public: SwOrderIter( const SwPageFrm *pPage, bool bFlysOnly = true ); void Current( const SdrObject *pNew ) { pCurrent = pNew; } - const SdrObject *Current() const { return pCurrent; } const SdrObject *operator()() const { return pCurrent; } const SdrObject *Top(); const SdrObject *Bottom(); diff --git a/sw/source/core/inc/layfrm.hxx b/sw/source/core/inc/layfrm.hxx index a0d2d6852ef6..0a39fc113997 100644 --- a/sw/source/core/inc/layfrm.hxx +++ b/sw/source/core/inc/layfrm.hxx @@ -46,8 +46,6 @@ class SwLayoutFrm: public SwFrm friend SwFrm* SwClearDummies( SwFrm* pFrm ); #endif - void CopySubtree( const SwLayoutFrm *pDest ); - protected: virtual void DestroyImpl() SAL_OVERRIDE; diff --git a/sw/source/core/inc/pagefrm.hxx b/sw/source/core/inc/pagefrm.hxx index 45c3989ee88b..38dc3c18eef0 100644 --- a/sw/source/core/inc/pagefrm.hxx +++ b/sw/source/core/inc/pagefrm.hxx @@ -318,11 +318,6 @@ public: virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const SAL_OVERRIDE; - static inline sal_Int8 ShadowPxWidth() - { - return mnShadowPxWidth; - } - const SwRect PrtWithoutHeaderAndFooter() const; // in case this is am empty page, this function returns the 'reference' page diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx index e7a98cdf52d3..25da09538f24 100644 --- a/sw/source/core/inc/rootfrm.hxx +++ b/sw/source/core/inc/rootfrm.hxx @@ -324,7 +324,6 @@ public: static void SetNoVirDev( const bool bNew ) { mbNoVirDev = bNew; } inline long GetBrowseWidth() const; - void SetBrowseWidth( long n ) { mbBrowseWidthValid = true; mnBrowseWidth = n;} inline void InvalidateBrowseWidth(); bool IsNewLayout() const { return mbIsNewLayout; } diff --git a/sw/source/core/inc/sectfrm.hxx b/sw/source/core/inc/sectfrm.hxx index 668578acd815..cbdfbe27365c 100644 --- a/sw/source/core/inc/sectfrm.hxx +++ b/sw/source/core/inc/sectfrm.hxx @@ -99,8 +99,6 @@ public: */ bool SplitSect( SwFrm* pFrm, bool bApres ); void DelEmpty( bool bRemove ); // Like Cut(), except for that Follow chaining is maintained - bool IsToIgnore() const // No size, no content; need to be ignored - { return !Frm().Height() && !ContainsContent(); } SwFootnoteContFrm* ContainsFootnoteCont( const SwFootnoteContFrm* pCont = NULL ) const; bool Growable() const; SwTwips _Shrink( SwTwips, bool bTst ); @@ -145,7 +143,6 @@ public: bool IsFootnoteAtEnd() const { return bFootnoteAtEnd; } bool IsEndnAtEnd() const { return bEndnAtEnd; } bool IsAnyNoteAtEnd() const { return bFootnoteAtEnd || bEndnAtEnd; } - bool AreNotesAtEnd() const { return bFootnoteAtEnd && bEndnAtEnd; } void SetContentLock( bool bNew ) { bContentLock = bNew; } bool IsContentLocked() const { return bContentLock; } diff --git a/sw/source/core/inc/swcache.hxx b/sw/source/core/inc/swcache.hxx index 20f06eb8244c..9897a2032d0a 100644 --- a/sw/source/core/inc/swcache.hxx +++ b/sw/source/core/inc/swcache.hxx @@ -103,7 +103,6 @@ public: bool Insert( SwCacheObj *pNew ); void Delete( const void *pOwner ); -// void Delete( const void *pOwner, const sal_uInt16 nIndex ); void SetLRUOfst( const sal_uInt16 nOfst ); /// nOfst determines how many are not to be touched void ResetLRUOfst() { pFirst = pRealFirst; } @@ -112,7 +111,6 @@ public: inline void DecreaseMax( const sal_uInt16 nSub ); sal_uInt16 GetCurMax() const { return nCurMax; } inline SwCacheObj *First() { return pRealFirst; } - inline SwCacheObj *Last() { return pLast; } static inline SwCacheObj *Next( SwCacheObj *pCacheObj); inline SwCacheObj* operator[](sal_uInt16 nIndex) { return m_aCacheObjects[nIndex]; } inline sal_uInt16 size() { return m_aCacheObjects.size(); } @@ -154,7 +152,6 @@ class SwCacheObj protected: const void *pOwner; - inline void SetOwner( const void *pNew ) { pOwner = pNew; } public: @@ -165,7 +162,6 @@ public: inline bool IsOwner( const void *pNew ) const; inline sal_uInt16 GetCachePos() const { return nCachePos; } - inline void Invalidate() { pOwner = 0; } inline bool IsLocked() const { return 0 != nLock; } @@ -176,10 +172,6 @@ public: inline void Lock() { ++nLock; } inline void Unlock() { --nLock; } #endif - - SwCacheObj *Next() { return pNext; } - SwCacheObj *Prev() { return pPrev; } - }; /** diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx index 97da4572235e..076352107411 100644 --- a/sw/source/core/inc/swfont.hxx +++ b/sw/source/core/inc/swfont.hxx @@ -196,9 +196,6 @@ public: inline void ChkMagic( SwViewShell *pSh, sal_uInt8 nWhich ) { if( !aSub[ nWhich ].pMagic ) GoMagic( pSh, nWhich ); } - // assumes the MagicNumber of a (hopefully not identical) colleague - inline void CopyMagic( const SwFont* pFnt, sal_uInt8 nWhich ) - { aSub[nWhich].CopyMagic( pFnt->aSub[nWhich] ); } inline void GetMagic( const void* &rMagic, sal_uInt16 &rIdx, sal_uInt8 nWhich ) { rMagic = aSub[nWhich].pMagic; rIdx = aSub[nWhich].nFntIndex; } inline void SetMagic( const void* pNew, const sal_uInt16 nIdx, sal_uInt8 nWhich ) @@ -250,32 +247,21 @@ public: // Get/Set-methods for the current setting inline void SetNoHyph( const bool bNew ); - inline bool IsNoHyph() const { return bNoHyph; } inline void SetBlink( const bool bBlink ); inline bool IsBlink() const { return bBlink; } inline sal_uInt8 &GetTox() { return nToxCnt; } - inline sal_uInt8 GetTox() const { return nToxCnt; } inline bool IsTox() const { return ( 0 != nToxCnt ); } inline sal_uInt8 &GetRef() { return nRefCnt; } - inline sal_uInt8 GetRef() const { return nRefCnt; } inline bool IsRef() const { return ( 0 != nRefCnt ); } inline sal_uInt8 &GetMeta() { return m_nMetaCount; } - inline sal_uInt8 GetMeta() const { return m_nMetaCount; } inline bool IsMeta() const { return (0 != m_nMetaCount); } inline sal_uInt8 &GetInputField() { return m_nInputFieldCount; } - inline sal_uInt8 GetInputField() const { return m_nInputFieldCount; } inline bool IsInputField() const { return (0 != m_nInputFieldCount); } - inline void SetURL( const bool bURL ); inline bool IsURL() const { return bURL; } inline void SetGreyWave( const bool bNew ); inline bool IsGreyWave() const { return bGreyWave; } inline void SetNoCol( const bool bNew ); - inline bool IsNoCol() const { return bNoColReplace; } - - inline void SetPaintBlank( const bool bNew ); inline bool IsPaintBlank() const { return bPaintBlank; } - inline void SetPaintWrong( const bool bNew ); - inline bool IsPaintWrong() const { return bPaintWrong; } // setting of the base class font for SwTextCharFormat void SetDiffFnt( const SfxItemSet* pSet, @@ -290,72 +276,37 @@ public: const Color& GetUnderColor() const { return aUnderColor; } FontUnderline GetOverline() const { return aSub[nActual].GetOverline(); } const Color& GetOverColor() const { return aOverColor; } - short GetFixKerning() const { return aSub[nActual].GetFixKerning(); } FontStrikeout GetStrikeout() const { return aSub[nActual].GetStrikeout(); } const Color& GetColor() const { return aSub[nActual].GetColor(); } - bool IsShadow() const { return aSub[nActual].IsShadow(); } bool IsWordLineMode() const { return aSub[nActual].IsWordLineMode(); } - bool IsOutline() const { return aSub[nActual].IsOutline(); } - bool IsKerning() const { return aSub[nActual].IsKerning(); } short GetEscapement() const { return aSub[nActual].GetEscapement(); } SvxCaseMap GetCaseMap() const { return aSub[nActual].GetCaseMap(); } sal_uInt8 GetPropr() const { return aSub[nActual].GetPropr(); } FontItalic GetItalic() const { return aSub[nActual].GetItalic(); } LanguageType GetLanguage() const { return aSub[nActual].GetLanguage(); } - FontAlign GetAlign() const { return aSub[nActual].GetAlign(); } - const OUString& GetName() const { return aSub[nActual].GetName(); } - const OUString& GetStyleName() const {return aSub[nActual].GetStyleName();} - FontFamily GetFamily() const { return aSub[nActual].GetFamily(); } - FontPitch GetPitch() const { return aSub[nActual].GetPitch(); } - rtl_TextEncoding GetCharSet() const { return aSub[nActual].GetCharSet(); } long GetHeight() const { return aSub[nActual].GetSize().Height(); } FontWeight GetWeight() const { return aSub[nActual].GetWeight(); } FontEmphasisMark GetEmphasisMark() const { return aSub[nActual].GetEmphasisMark(); } - sal_uInt16 GetPropWidth() const { return aSub[nActual].GetPropWidth(); } sal_uInt16 GetOrientation( const bool nVertLayout = false ) const; inline const OUString& GetName( const sal_uInt8 nWhich ) const { return aSub[nWhich].GetName(); } inline LanguageType GetLanguage( const sal_uInt8 nWhich ) const { return aSub[nWhich].GetLanguage(); } - inline const OUString& GetStyleName( const sal_uInt8 nWhich ) const - { return aSub[nWhich].GetStyleName(); } - inline FontFamily GetFamily( const sal_uInt8 nWhich ) const - { return aSub[nWhich].GetFamily(); } - inline FontItalic GetItalic( const sal_uInt8 nWhich ) const - { return aSub[nWhich].GetItalic(); } - inline FontPitch GetPitch( const sal_uInt8 nWhich ) const - { return aSub[nWhich].GetPitch(); } inline rtl_TextEncoding GetCharSet( const sal_uInt8 nWhich ) const { return aSub[nWhich].GetCharSet(); } inline long GetHeight( const sal_uInt8 nWhich ) const { return aSub[nWhich].GetSize().Height(); } - inline FontWeight GetWeight( const sal_uInt8 nWhich ) const - { return aSub[nWhich].GetWeight(); } - inline FontEmphasisMark GetEmphasisMark( const sal_uInt8 nWhich ) const - { return aSub[nWhich].GetEmphasisMark(); } // makes the logical font be effective in the OutputDevice void ChgPhysFnt( SwViewShell *pSh, OutputDevice& rOut ); - Size GetCapitalSize( SwDrawTextInfo& rInf ) - { return aSub[nActual].GetCapitalSize( rInf ); } - sal_Int32 GetCapitalBreak( SwViewShell const* pSh, const OutputDevice* pOut, const SwScriptInfo* pScript, const OUString& rText, long nTextWidth, const sal_Int32 nIdx, const sal_Int32 nLen ); - sal_Int32 GetCapitalCrsrOfst( SwDrawTextInfo& rInf ) - { return aSub[nActual].GetCapitalCrsrOfst( rInf ); } - - void DrawCapital( SwDrawTextInfo &rInf ) - { aSub[nActual].DrawCapital( rInf ); } - - void DrawStretchCapital( SwDrawTextInfo &rInf ) - { aSub[nActual].DrawStretchCapital( rInf ); } - void DoOnCapitals( SwDoCapitals &rDo ) { aSub[nActual].DoOnCapitals( rDo ); } @@ -859,16 +810,6 @@ inline void SwFont::SetLanguage( const LanguageType eNewLang, const sal_uInt8 nW } } -inline void SwFont::SetPaintBlank( const bool bNew ) -{ - bPaintBlank = bNew; -} - -inline void SwFont::SetPaintWrong( const bool bNew ) -{ - bPaintWrong = bNew; -} - inline void SwFont::SetNoHyph( const bool bNew ) { bNoHyph = bNew; @@ -879,11 +820,6 @@ inline void SwFont::SetBlink( const bool bNew ) bBlink = bNew; } -inline void SwFont::SetURL( const bool bNew ) -{ - bURL = bNew; -} - inline void SwFont::SetGreyWave( const bool bNew ) { bGreyWave = bNew; @@ -1064,7 +1000,6 @@ public: inline SvStatistics() { Reset(); } - inline void PrintOn( SvStream &rOS ) const; //$ ostream inline bool IsEmpty() const { return !( nGetTextSize || nDrawText || @@ -1077,26 +1012,7 @@ extern SvStatistics g_SvStat; #define SV_STAT(nWhich) ++(g_SvStat.nWhich); -inline void SvStatistics::PrintOn( SvStream &rOS ) const //$ ostream -{ - if( IsEmpty() ) - return; - - rOS.WriteCharPtr( "{ SV called:\n" ); - if( nGetTextSize ) - rOS.WriteCharPtr( "\tnGetTextSize: " ).WriteUInt16( nGetTextSize ).WriteChar( '\n' ); - if( nDrawText ) - rOS.WriteCharPtr( "\tnDrawText: " ).WriteUInt16( nDrawText ).WriteChar( '\n' ); - if( nGetStretchTextSize ) - rOS.WriteCharPtr( "\tnGetStretchTextSize: " ).WriteUInt16( nGetStretchTextSize ).WriteChar( '\n' ); - if( nDrawStretchText ) - rOS.WriteCharPtr( "\tnDrawStretchText: " ).WriteUInt16( nDrawStretchText ).WriteChar( '\n' ); - if( nChangeFont ) - rOS.WriteCharPtr( "\tnChangeFont: " ).WriteUInt16( nChangeFont ).WriteChar( '\n' ); - if( nGetFontMetric ) - rOS.WriteCharPtr( "\tnGetFontMetric: " ).WriteUInt16( nGetFontMetric ).WriteChar( '\n' ); - rOS.WriteCharPtr( "}\n" ); -} + #else #define SV_STAT(nWhich) #endif /* DBG_UTIL */ diff --git a/sw/source/core/inc/tabfrm.hxx b/sw/source/core/inc/tabfrm.hxx index dca483993646..a6e9363e8d4f 100644 --- a/sw/source/core/inc/tabfrm.hxx +++ b/sw/source/core/inc/tabfrm.hxx @@ -34,7 +34,6 @@ class SwTabFrm: public SwLayoutFrm, public SwFlowFrm // does the special treatment for _Get[Next|Prev]Leaf() using SwFrm::GetLeaf; - SwLayoutFrm *GetLeaf( MakePageType eMakePage, bool bFwd ); SwTable * m_pTable; diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx index 693bb16419ec..cc9e9d5871b9 100644 --- a/sw/source/core/inc/txtfrm.hxx +++ b/sw/source/core/inc/txtfrm.hxx @@ -85,8 +85,6 @@ class SwTextFrm: public SwContentFrm // Separates the Master and creates a Follow or adjusts the data in the Follow void _AdjustFollow( SwTextFormatter &rLine, const sal_Int32 nOffset, const sal_Int32 nStrEnd, const sal_uInt8 nMode ); - inline void AdjustFollow( SwTextFormatter &rLine, const sal_Int32 nOffset, - const sal_Int32 nStrEnd, const sal_uInt8 nMode ); // Iterates all Lines and sets the line spacing using the attribute void CalcLineSpace(); @@ -198,13 +196,6 @@ class SwTextFrm: public SwContentFrm */ void _CalcHeightOfLastLine( const bool _bUseFont = false ); - // ST2 - SwWrongList* _SmartTagScan ( const OUString& aTextToScan, SwWrongList *pSmartTagList, - sal_Int32 nBegin,sal_Int32 nEnd, - sal_Int32 nInsertPos, sal_Int32 nActPos, - sal_Int32 &nChgStart, sal_Int32 &nChgEnd, - sal_Int32 &nInvStart, sal_Int32 &nInvEnd); - virtual void DestroyImpl() SAL_OVERRIDE; virtual ~SwTextFrm(); @@ -442,22 +433,12 @@ public: */ SwTwips GetFootnoteLine( const SwTextFootnote *pFootnote ) const; - /** - * Returns the left and the right margin document coordinates - * (taking the paragraph attributes into account) - */ - inline SwTwips GetLeftMargin() const; - inline SwTwips GetRightMargin() const; - virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; virtual void CheckDirection( bool bVert ) SAL_OVERRIDE; /// Returns the sum of line height in pLine sal_uInt16 GetParHeight() const; - /// Returns the remaining height - inline SwTwips GetRstHeight() const; - inline SwTextFrm *GetFollow(); inline const SwTextFrm *GetFollow() const; @@ -490,7 +471,6 @@ public: static void SetTextCache( SwCache *pNew ) { pTextCache = pNew; } static long GetMinPrtLine() { return nMinPrtLine; } - static void SetMinPrtLine( long nNew ) { nMinPrtLine = nNew; } inline sal_uInt16 GetCacheIdx() const { return nCacheIdx; } inline void SetCacheIdx( const sal_uInt16 nNew ) { nCacheIdx = nNew; } @@ -693,23 +673,6 @@ inline bool SwTextFrm::HasPara() const return nCacheIdx!=USHRT_MAX && _HasPara(); } -/// 9104: Frm().Height() - Prt().Height(), see widorp.cxx and 7455, 6114, 7908 -inline SwTwips SwTextFrm::GetRstHeight() const -{ - return !GetUpper() ? 0 : static_cast<const SwFrm*>(GetUpper())->Frm().Top() - + static_cast<const SwFrm*>(GetUpper())->Prt().Top() - + static_cast<const SwFrm*>(GetUpper())->Prt().Height() - - Frm().Top() - (Frm().Height() - Prt().Height()); -} - -inline SwTwips SwTextFrm::GetLeftMargin() const -{ - return Frm().Left() + Prt().Left(); -} -inline SwTwips SwTextFrm::GetRightMargin() const -{ - return Frm().Left() + Prt().Left() + Prt().Width(); -} inline SwTwips SwTextFrm::GrowTst( const SwTwips nGrow ) { return Grow( nGrow, true ); @@ -751,13 +714,6 @@ inline const SwTextFrm *SwTextFrm::GetFrmAtPos( const SwPosition &rPos) const return const_cast<SwTextFrm*>(this)->GetFrmAtPos( rPos ); } -inline void SwTextFrm::AdjustFollow( SwTextFormatter &rLine, - const sal_Int32 nOffset, const sal_Int32 nStrEnd, const sal_uInt8 nMode ) -{ - if ( HasFollow() ) - _AdjustFollow( rLine, nOffset, nStrEnd, nMode ); -} - inline void SwTextFrm::SetOfst( const sal_Int32 nNewOfst ) { if ( nOfst != nNewOfst ) diff --git a/sw/source/core/inc/unoport.hxx b/sw/source/core/inc/unoport.hxx index 53c4e02814dd..036ab7e4b9a6 100644 --- a/sw/source/core/inc/unoport.hxx +++ b/sw/source/core/inc/unoport.hxx @@ -122,8 +122,6 @@ private: bool m_bIsCollapsed; - SwFormatField * GetFieldFormat(bool bInit = false); - void init(const SwUnoCrsr* pPortionCursor); protected: @@ -136,10 +134,6 @@ protected: const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - void GetPropertyValues( const OUString *pPropertyNames, - ::com::sun::star::uno::Any *pValues, - sal_Int32 nLength ); - void GetPropertyValue( ::com::sun::star::uno::Any &rVal, const SfxItemPropertySimpleEntry& rEntry, SwUnoCrsr *pUnoCrsr, SfxItemSet *&pSet ); @@ -234,7 +228,6 @@ public: ::com::sun::star::text::XTextContent > xMeta) { m_xMeta = xMeta; } - bool IsCollapsed() const { return m_bIsCollapsed; } void SetCollapsed(bool bSet) { m_bIsCollapsed = bSet;} SwTextPortionType GetTextPortionType() const { return m_ePortionType; } diff --git a/sw/source/core/inc/viewimp.hxx b/sw/source/core/inc/viewimp.hxx index 3146ec39e893..6e9544a07a41 100644 --- a/sw/source/core/inc/viewimp.hxx +++ b/sw/source/core/inc/viewimp.hxx @@ -191,8 +191,6 @@ public: bool IsIdleAction() const { return pIdleAct != 0; } SwLayAction &GetLayAction() { return *pLayAct; } const SwLayAction &GetLayAction() const { return *pLayAct; } - SwLayIdle &GetIdleAction() { return *pIdleAct;} - const SwLayIdle &GetIdleAction() const { return *pIdleAct;} /** * If an Action is running we ask it to check whether it's time diff --git a/sw/source/core/inc/wrong.hxx b/sw/source/core/inc/wrong.hxx index 10a030982f32..085ab615bea6 100644 --- a/sw/source/core/inc/wrong.hxx +++ b/sw/source/core/inc/wrong.hxx @@ -205,8 +205,6 @@ public: inline WrongListType GetWrongListType() const { return meType; } inline sal_Int32 GetBeginInv() const { return nBeginInvalid; } inline sal_Int32 GetEndInv() const { return nEndInvalid; } - inline bool InsideInvalid( sal_Int32 nChk ) const - { return nChk >= nBeginInvalid && nChk <= nEndInvalid; } void SetInvalid( sal_Int32 nBegin, sal_Int32 nEnd ); inline void Validate(){ nBeginInvalid = nEndInvalid = COMPLETE_STRING; } void Invalidate( sal_Int32 nBegin, sal_Int32 nEnd ); diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx index 1285d1b8d8a3..2b8aa17a272c 100644 --- a/sw/source/core/undo/undobj.cxx +++ b/sw/source/core/undo/undobj.cxx @@ -963,7 +963,7 @@ void SwRedlineSaveData::RedlineToDoc( SwPaM& rPam ) rDoc.getIDocumentRedlineAccess().SetRedlineMode_intern((RedlineMode_t)(eOld | nsRedlineMode_t::REDLINE_DONTCOMBINE_REDLINES)); //#i92154# let UI know about a new redline with comment if (rDoc.GetDocShell() && (!pRedl->GetComment().isEmpty()) ) - rDoc.GetDocShell()->Broadcast(SwRedlineHint(pRedl,SWREDLINE_INSERTED)); + rDoc.GetDocShell()->Broadcast(SwRedlineHint()); bool const bSuccess = rDoc.getIDocumentRedlineAccess().AppendRedline( pRedl, true ); assert(bSuccess); // SwRedlineSaveData::RedlineToDoc: insert redline failed diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx index 73ef5c352318..f1799c99cdb4 100644 --- a/sw/source/uibase/app/docshini.cxx +++ b/sw/source/uibase/app/docshini.cxx @@ -691,8 +691,14 @@ void SwDocShell::SubInitNew() /* * Document Interface Access */ -IDocumentDeviceAccess& SwDocShell::getIDocumentDeviceAccess() { return m_pDoc->getIDocumentDeviceAccess(); } -const IDocumentSettingAccess& SwDocShell::getIDocumentSettingAccess() const { return m_pDoc->getIDocumentSettingAccess(); } -IDocumentChartDataProviderAccess& SwDocShell::getIDocumentChartDataProviderAccess() { return m_pDoc->getIDocumentChartDataProviderAccess(); } +IDocumentDeviceAccess& SwDocShell::getIDocumentDeviceAccess() +{ + return m_pDoc->getIDocumentDeviceAccess(); +} + +IDocumentChartDataProviderAccess& SwDocShell::getIDocumentChartDataProviderAccess() +{ + return m_pDoc->getIDocumentChartDataProviderAccess(); +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index d7bad03efb2e..c5a3c60c8be6 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -777,7 +777,6 @@ void SwDBManager::GetColumnNames(ListBox* pListBox, SwDBManager::SwDBManager(SwDoc* pDoc) : bCancel(false) , bInitDBFields(false) - , bSingleJobs(false) , bInMerge(false) , bMergeSilent(false) , bMergeLock(false) diff --git a/sw/source/uibase/inc/fldmgr.hxx b/sw/source/uibase/inc/fldmgr.hxx index 1656e510a77e..2f34a84300aa 100644 --- a/sw/source/uibase/inc/fldmgr.hxx +++ b/sw/source/uibase/inc/fldmgr.hxx @@ -137,7 +137,6 @@ public: OUString GetCurFieldPar1() const { return aCurPar1; } OUString GetCurFieldPar2() const { return aCurPar2; } - inline sal_uLong GetCurFieldFormat() const; // determine a field SwField* GetCurField(); @@ -148,15 +147,12 @@ public: void SetMacroPath(const OUString& rPath); inline OUString GetMacroPath() const { return sMacroPath; } inline OUString GetMacroName() const { return sMacroName; } - inline void SetMacroModule(SbModule* pMod) { pModule = pMod; } // previous and next of the same type bool GoNextPrev( bool bNext = true, SwFieldType* pTyp = 0 ); bool GoNext( SwFieldType* pTyp = 0 ) { return GoNextPrev( true, pTyp ); } bool GoPrev( SwFieldType* pTyp = 0 ) { return GoNextPrev( false, pTyp ); } - // query values from database fields (BASIC ) -// String GetDataBaseFieldValue(const String &rDBName, const String &rFieldName, SwWrtShell* pSh); bool IsDBNumeric(const OUString& rDBName, const OUString& rTableQryName, bool bIsTable, const OUString& rFieldName); @@ -205,9 +201,6 @@ public: inline void SwFieldMgr::SetEvalExpFields(bool bEval) { bEvalExp = bEval; } -inline sal_uLong SwFieldMgr::GetCurFieldFormat() const - { return nCurFormat; } - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx index cf8b019860b3..19405a0c85bd 100644 --- a/sw/source/uibase/inc/wrtsh.hxx +++ b/sw/source/uibase/inc/wrtsh.hxx @@ -566,14 +566,11 @@ private: // resets the cursor stack after movement by PageUp/-Down SAL_DLLPRIVATE void _ResetCursorStack(); - SAL_DLLPRIVATE void SttDragDrop(Timer *); - using SwCrsrShell::SetCrsr; SAL_DLLPRIVATE long SetCrsr(const Point *, bool bProp=false ); SAL_DLLPRIVATE long SetCrsrKillSel(const Point *, bool bProp=false ); - SAL_DLLPRIVATE long StdSelect(const Point *, bool bProp=false ); SAL_DLLPRIVATE long BeginDrag(const Point *, bool bProp=false ); SAL_DLLPRIVATE long DefaultDrag(const Point *, bool bProp=false ); SAL_DLLPRIVATE long DefaultEndDrag(const Point *, bool bProp=false ); @@ -581,9 +578,6 @@ private: SAL_DLLPRIVATE long ExtSelWrd(const Point *, bool bProp=false ); SAL_DLLPRIVATE long ExtSelLn(const Point *, bool bProp=false ); - // move text from Drag and Drop; Point is destination for all selections. - SAL_DLLPRIVATE long MoveText(const Point *, bool bProp=false ); - SAL_DLLPRIVATE long BeginFrmDrag(const Point *, bool bProp=false ); // after SSize/Move of a frame update; Point is destination. |