diff options
Diffstat (limited to 'sw/inc')
-rw-r--r-- | sw/inc/dbmgr.hxx | 7 | ||||
-rw-r--r-- | sw/inc/doc.hxx | 4 | ||||
-rw-r--r-- | sw/inc/editsh.hxx | 4 | ||||
-rw-r--r-- | sw/inc/expfld.hxx | 2 | ||||
-rw-r--r-- | sw/inc/fesh.hxx | 2 | ||||
-rw-r--r-- | sw/inc/ndtxt.hxx | 2 | ||||
-rw-r--r-- | sw/inc/node.hxx | 2 | ||||
-rw-r--r-- | sw/inc/pam.hxx | 2 | ||||
-rw-r--r-- | sw/inc/shellio.hxx | 2 | ||||
-rw-r--r-- | sw/inc/tox.hxx | 6 | ||||
-rw-r--r-- | sw/inc/txtftn.hxx | 2 | ||||
-rw-r--r-- | sw/inc/view.hxx | 2 | ||||
-rw-r--r-- | sw/inc/viewsh.hxx | 2 |
13 files changed, 18 insertions, 21 deletions
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx index c54712abc765..8b0af90c35b6 100644 --- a/sw/inc/dbmgr.hxx +++ b/sw/inc/dbmgr.hxx @@ -352,9 +352,6 @@ public: SvNumberFormatter* pNFormatr, long nLanguage ); - static sal_Int32 GetRowCount(css::uno::Reference< css::sdbc::XConnection> xConnection, - const OUString& rTableName); - sal_uLong GetColumnFormat( const OUString& rDBName, const OUString& rTableName, const OUString& rColNm, @@ -389,8 +386,8 @@ public: css::uno::Reference< css::sdbc::XConnection> RegisterConnection(OUString const& rSource); - const SwDSParam* CreateDSData(const SwDBData& rData) - {return FindDSData(rData, true);} + void CreateDSData(const SwDBData& rData) + { FindDSData(rData, true); } const SwDSParams_t& GetDSParamArray() const { return m_DataSourceParams; } /// close all data sources - after fields were updated diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index c752fa385526..d6c5c08f3c07 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -960,7 +960,7 @@ public: const SwTOXBase& rTOX, const SfxItemSet* pSet = nullptr, bool bExpand = false ); - const SwTOXBaseSection* InsertTableOf( sal_uLong nSttNd, sal_uLong nEndNd, + void InsertTableOf( sal_uLong nSttNd, sal_uLong nEndNd, const SwTOXBase& rTOX, const SfxItemSet* pSet = nullptr ); static SwTOXBase* GetCurTOX( const SwPosition& rPos ); @@ -1523,7 +1523,7 @@ public: // Interface for the list of Ruby - texts/attributes static sal_uInt16 FillRubyList( const SwPaM& rPam, SwRubyList& rList, sal_uInt16 nMode ); - sal_uInt16 SetRubyList( const SwPaM& rPam, const SwRubyList& rList, + void SetRubyList( const SwPaM& rPam, const SwRubyList& rList, sal_uInt16 nMode ); void ReadLayoutCache( SvStream& rStream ); diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index 6a48ab001d9b..d12f6172e6f7 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -415,7 +415,7 @@ public: void DeleteTOXMark(SwTOXMark* pMark); /// Get all marks at current SPoint. - sal_uInt16 GetCurTOXMarks(SwTOXMarks& rMarks) const ; + void GetCurTOXMarks(SwTOXMarks& rMarks) const ; /// Insert content table. Renew if required. void InsertTableOf(const SwTOXBase& rTOX, @@ -926,7 +926,7 @@ public: bool IsLabelDoc() const; /// Interface for TextInputData - (for input of Japanese/Chinese chars.) - SwExtTextInput* CreateExtTextInput(LanguageType eInputLanguage); + void CreateExtTextInput(LanguageType eInputLanguage); OUString DeleteExtTextInput( SwExtTextInput* pDel = nullptr, bool bInsText = true); void SetExtTextInputData( const CommandExtTextInputData& ); diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx index b2dbe78d15d8..5263bac5e25f 100644 --- a/sw/inc/expfld.hxx +++ b/sw/inc/expfld.hxx @@ -175,7 +175,7 @@ public: /// Overlay, because set-field takes care for its being updated by itself. inline OUString GetSetRefName() const; - sal_uInt16 SetSeqRefNo( SwSetExpField& rField ); + void SetSeqRefNo( SwSetExpField& rField ); size_t GetSeqFieldList( SwSeqFieldList& rList ); diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index e17cab3c8a75..3ee18574b0c8 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -341,7 +341,7 @@ public: long BeginDrag( const Point *pPt, bool bProp ); long Drag ( const Point *pPt, bool bProp ); - long EndDrag ( const Point *pPt, bool bProp ); + void EndDrag ( const Point *pPt, bool bProp ); void BreakDrag(); /// Methods for status line. diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx index c603430c2e26..c5da3964d0b5 100644 --- a/sw/inc/ndtxt.hxx +++ b/sw/inc/ndtxt.hxx @@ -355,7 +355,7 @@ public: virtual SwContentFrame *MakeFrame( SwFrame* ) override; virtual SwContentNode *SplitContentNode( const SwPosition & ) override; virtual SwContentNode *JoinNext() override; - virtual SwContentNode *JoinPrev() override; + virtual void JoinPrev() override; SwContentNode *AppendNode( const SwPosition & ); diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx index d1ef7366d0f4..fbb4b36f9e46 100644 --- a/sw/inc/node.hxx +++ b/sw/inc/node.hxx @@ -387,7 +387,7 @@ public: virtual SwContentNode *SplitContentNode(const SwPosition & ) = 0; virtual SwContentNode *JoinNext(); - virtual SwContentNode *JoinPrev(); + virtual void JoinPrev(); /** Is it possible to join two nodes? In pIdx the second position can be returned. */ bool CanJoinNext( SwNodeIndex* pIdx =nullptr ) const; diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx index 01d32fb21bd1..295aaf5d804b 100644 --- a/sw/inc/pam.hxx +++ b/sw/inc/pam.hxx @@ -282,7 +282,7 @@ public: @param bPointFirst true: If the point is behind the mark then swap. false: If the mark is behind the point then swap. */ - SwPaM & Normalize(bool bPointFirst = true); + void Normalize(bool bPointFirst = true); /// @return the document (SwDoc) at which the PaM is registered SwDoc* GetDoc() const { return m_pPoint->nNode.GetNode().GetDoc(); } diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx index cd05f4eb91ce..fc7c612d1b63 100644 --- a/sw/inc/shellio.hxx +++ b/sw/inc/shellio.hxx @@ -313,7 +313,7 @@ public: OUString GetLongName( sal_uInt16 ) const; // Get long name for index. bool Delete( sal_uInt16 ); - sal_uInt16 Rename( sal_uInt16, const OUString*, const OUString* ); + void Rename( sal_uInt16, const OUString*, const OUString* ); sal_uLong CopyBlock( SwTextBlocks& rSource, OUString& rSrcShort, const OUString& rLong ); diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx index 541df563bcc8..13d1e15d1df8 100644 --- a/sw/inc/tox.hxx +++ b/sw/inc/tox.hxx @@ -431,12 +431,12 @@ public: virtual bool GetInfo( SfxPoolItem& rInfo ) const override; // a kind of CopyCtor - check if the TOXBase is at TOXType of the doc. - // If not, so create it an copy all other used things. The return is this - SwTOXBase& CopyTOXBase( SwDoc*, const SwTOXBase& ); + // If not, so create it an copy all other used things. + void CopyTOXBase( SwDoc*, const SwTOXBase& ); const SwTOXType* GetTOXType() const; - sal_uInt16 GetCreateType() const; // creation types + sal_uInt16 GetCreateType() const; // creation types OUString GetTOXName() const {return m_aName;} void SetTOXName(const OUString& rSet) {m_aName = rSet;} diff --git a/sw/inc/txtftn.hxx b/sw/inc/txtftn.hxx index daf1bb163bb0..ea72481a8f98 100644 --- a/sw/inc/txtftn.hxx +++ b/sw/inc/txtftn.hxx @@ -58,7 +58,7 @@ public: void CheckCondColl(); // For references to footnotes. - sal_uInt16 SetSeqRefNo(); + void SetSeqRefNo(); void SetSeqNo( sal_uInt16 n ) { m_nSeqNo = n; } // For Readers. sal_uInt16 GetSeqRefNo() const { return m_nSeqNo; } diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx index e9dcca02605b..7081637f0536 100644 --- a/sw/inc/view.hxx +++ b/sw/inc/view.hxx @@ -285,7 +285,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SAL_DLLPRIVATE long PhyPageUp(); SAL_DLLPRIVATE long PhyPageDown(); - SAL_DLLPRIVATE int _CreateScrollbar( bool bHori ); + SAL_DLLPRIVATE void _CreateScrollbar( bool bHori ); DECL_DLLPRIVATE_LINK_TYPED( ScrollHdl, ScrollBar*, void ); DECL_DLLPRIVATE_LINK_TYPED( EndScrollHdl, ScrollBar*, void ); SAL_DLLPRIVATE bool UpdateScrollbars(); diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx index 7069de10e2cf..afdd0608cd4f 100644 --- a/sw/inc/viewsh.hxx +++ b/sw/inc/viewsh.hxx @@ -370,7 +370,7 @@ public: vcl::RenderContext& rRenderContext, const Rectangle& rRect ); // Fill temporary doc with selected text for Print or PDF export. - SwDoc * FillPrtDoc( SwDoc* pPrtDoc, const SfxPrinter* pPrt ); + void FillPrtDoc( SwDoc* pPrtDoc, const SfxPrinter* pPrt ); // Called internally for Shell. Formats pages. void CalcPagesForPrint( sal_uInt16 nMax ); |