diff options
Diffstat (limited to 'sw/source/core/doc')
| -rw-r--r-- | sw/source/core/doc/DocumentContentOperationsManager.cxx | 3 | ||||
| -rw-r--r-- | sw/source/core/doc/docnum.cxx | 7 |
2 files changed, 2 insertions, 8 deletions
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx index c5313a093470..44c5c9ded7f9 100644 --- a/sw/source/core/doc/DocumentContentOperationsManager.cxx +++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx @@ -2552,7 +2552,7 @@ bool DocumentContentOperationsManager::MoveNodeRange( SwNodeRange& rRange, SwNod return true; } -bool DocumentContentOperationsManager::MoveAndJoin( SwPaM& rPaM, SwPosition& rPos ) +void DocumentContentOperationsManager::MoveAndJoin( SwPaM& rPaM, SwPosition& rPos ) { SwNodeIndex aIdx( rPaM.Start()->nNode ); bool bJoinText = aIdx.GetNode().IsTextNode(); @@ -2575,7 +2575,6 @@ bool DocumentContentOperationsManager::MoveAndJoin( SwPaM& rPaM, SwPosition& rPo pTextNd->JoinNext(); } } - return bRet; } // Overwrite only uses the point of the PaM, the mark is ignored; characters diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx index 586324391888..95461208e954 100644 --- a/sw/source/core/doc/docnum.cxx +++ b/sw/source/core/doc/docnum.cxx @@ -1163,10 +1163,9 @@ void SwDoc::StopNumRuleAnimations( const OutputDevice* pOut ) } } -bool SwDoc::ReplaceNumRule( const SwPosition& rPos, +void SwDoc::ReplaceNumRule( const SwPosition& rPos, const OUString& rOldRule, const OUString& rNewRule ) { - bool bRet = false; SwNumRule *pOldRule = FindNumRulePtr( rOldRule ), *pNewRule = FindNumRulePtr( rNewRule ); if( pOldRule && pNewRule && pOldRule != pNewRule ) @@ -1201,12 +1200,8 @@ bool SwDoc::ReplaceNumRule( const SwPosition& rPos, } GetIDocumentUndoRedo().EndUndo( SwUndoId::END, nullptr ); getIDocumentState().SetModified(); - - bRet = true; } } - - return bRet; } namespace |