summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-05-25 11:28:58 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-05-26 07:26:47 +0000
commit509f0c6a8aa36b7fa532f784e10bbe9ec4e57c4b (patch)
treea05e37827bdee103d11362388acbf6d0d57dca48 /sw
parent92d3025521ec8939b66500347f8d38ed5b24e3c8 (diff)
loplugin:unusedreturntypes
and clean up the python script Change-Id: I0a7068153290fbbb60bfeb4c8bda1c24d514500f Reviewed-on: https://gerrit.libreoffice.org/25439 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/IDocumentListsAccess.hxx2
-rw-r--r--sw/inc/editsh.hxx2
-rw-r--r--sw/inc/fesh.hxx2
-rw-r--r--sw/source/core/doc/DocumentListsManager.cxx10
-rw-r--r--sw/source/core/edit/edtox.cxx4
-rw-r--r--sw/source/core/frmedt/feshview.cxx4
-rw-r--r--sw/source/core/inc/DocumentListsManager.hxx2
7 files changed, 12 insertions, 14 deletions
diff --git a/sw/inc/IDocumentListsAccess.hxx b/sw/inc/IDocumentListsAccess.hxx
index f53cfa84a3c0..a6bf287b8ccd 100644
--- a/sw/inc/IDocumentListsAccess.hxx
+++ b/sw/inc/IDocumentListsAccess.hxx
@@ -34,7 +34,7 @@ class IDocumentListsAccess
virtual void deleteList( const OUString& rListId ) = 0;
virtual SwList* getListByName( const OUString& rListId ) const = 0;
- virtual SwList* createListForListStyle( const OUString& rListStyleName ) = 0;
+ virtual void createListForListStyle( const OUString& rListStyleName ) = 0;
virtual SwList* getListForListStyle( const OUString& rListStyleName ) const = 0;
virtual void deleteListForListStyle( const OUString& rListStyleName ) = 0;
virtual void deleteListsByDefaultListStyle( const OUString& rListStyleName ) = 0;
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 47d472b8c942..d918b5696148 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -451,7 +451,7 @@ public:
void ApplyAutoMark();
/// Key for managing index.
- sal_uInt16 GetTOIKeys( SwTOIKeyType eTyp, std::vector<OUString>& rArr ) const;
+ void GetTOIKeys( SwTOIKeyType eTyp, std::vector<OUString>& rArr ) const;
void SetOutlineNumRule(const SwNumRule&);
const SwNumRule* GetOutlineNumRule() const;
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 52e77192384e..edb6ff5d01ae 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -479,7 +479,7 @@ public:
rRect contains rect of Fly (for its highlight). */
SwChainRet Chainable( SwRect &rRect, const SwFrameFormat &rSource, const Point &rPt ) const;
SwChainRet Chain( SwFrameFormat &rSource, const Point &rPt );
- SwChainRet Chain( SwFrameFormat &rSource, const SwFrameFormat &rDest );
+ void Chain( SwFrameFormat &rSource, const SwFrameFormat &rDest );
void Unchain( SwFrameFormat &rFormat );
void HideChainMarker();
void SetChainMarker();
diff --git a/sw/source/core/doc/DocumentListsManager.cxx b/sw/source/core/doc/DocumentListsManager.cxx
index d2b86ae45154..7b071ee397ce 100644
--- a/sw/source/core/doc/DocumentListsManager.cxx
+++ b/sw/source/core/doc/DocumentListsManager.cxx
@@ -83,25 +83,25 @@ SwList* DocumentListsManager::getListByName( const OUString& sListId ) const
return pList;
}
-SwList* DocumentListsManager::createListForListStyle( const OUString& sListStyleName )
+void DocumentListsManager::createListForListStyle( const OUString& sListStyleName )
{
if ( sListStyleName.isEmpty() )
{
OSL_FAIL( "<DocumentListsManager::createListForListStyle(..)> - no list style name provided. Serious defect." );
- return nullptr;
+ return;
}
if ( getListForListStyle( sListStyleName ) )
{
OSL_FAIL( "<DocumentListsManager::createListForListStyle(..)> - a list for the provided list style name already exists. Serious defect." );
- return nullptr;
+ return;
}
SwNumRule* pNumRule = m_rDoc.FindNumRulePtr( sListStyleName );
if ( !pNumRule )
{
OSL_FAIL( "<DocumentListsManager::createListForListStyle(..)> - for provided list style name no list style is found. Serious defect." );
- return nullptr;
+ return;
}
OUString sListId( pNumRule->GetDefaultListId() ); // can be empty String
@@ -112,8 +112,6 @@ SwList* DocumentListsManager::createListForListStyle( const OUString& sListStyle
SwList* pNewList = createList( sListId, sListStyleName );
maListStyleLists[sListStyleName] = pNewList;
pNumRule->SetDefaultListId( pNewList->GetListId() );
-
- return pNewList;
}
SwList* DocumentListsManager::getListForListStyle( const OUString& sListStyleName ) const
diff --git a/sw/source/core/edit/edtox.cxx b/sw/source/core/edit/edtox.cxx
index d52205a968e1..fcb9ec294831 100644
--- a/sw/source/core/edit/edtox.cxx
+++ b/sw/source/core/edit/edtox.cxx
@@ -217,9 +217,9 @@ const SwTOXType* SwEditShell::GetTOXType(TOXTypes eTyp, sal_uInt16 nId) const
// manage keys for the alphabetical index
-sal_uInt16 SwEditShell::GetTOIKeys( SwTOIKeyType eTyp, std::vector<OUString>& rArr ) const
+void SwEditShell::GetTOIKeys( SwTOIKeyType eTyp, std::vector<OUString>& rArr ) const
{
- return GetDoc()->GetTOIKeys( eTyp, rArr );
+ GetDoc()->GetTOIKeys( eTyp, rArr );
}
sal_uInt16 SwEditShell::GetTOXCount() const
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index c921e7fd8fc5..35f3421b4e3d 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -2587,9 +2587,9 @@ SwChainRet SwFEShell::Chainable( SwRect &rRect, const SwFrameFormat &rSource,
return nRet;
}
-SwChainRet SwFEShell::Chain( SwFrameFormat &rSource, const SwFrameFormat &rDest )
+void SwFEShell::Chain( SwFrameFormat &rSource, const SwFrameFormat &rDest )
{
- return GetDoc()->Chain(rSource, rDest);
+ GetDoc()->Chain(rSource, rDest);
}
SwChainRet SwFEShell::Chain( SwFrameFormat &rSource, const Point &rPt )
diff --git a/sw/source/core/inc/DocumentListsManager.hxx b/sw/source/core/inc/DocumentListsManager.hxx
index 0bb6c2f8b33a..5ad855934265 100644
--- a/sw/source/core/inc/DocumentListsManager.hxx
+++ b/sw/source/core/inc/DocumentListsManager.hxx
@@ -41,7 +41,7 @@ class DocumentListsManager : public IDocumentListsAccess
void deleteList( const OUString& rListId ) override;
SwList* getListByName( const OUString& rListId ) const override;
- SwList* createListForListStyle( const OUString& rListStyleName ) override;
+ void createListForListStyle( const OUString& rListStyleName ) override;
SwList* getListForListStyle( const OUString& rListStyleName ) const override;
void deleteListForListStyle( const OUString& rListStyleName ) override;
void deleteListsByDefaultListStyle( const OUString& rListStyleName ) override;