diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-01-05 14:01:00 +0100 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-01-05 14:01:00 +0100 |
| commit | 0329cf725b6af7f4df33e1ee9a5845e45a9be673 (patch) | |
| tree | b62e4e4d6636ef94f9a662a9eca18cf290fc6fb3 | |
| parent | 8bfd7efc07f735520771ff50eb044835602567c8 (diff) | |
| parent | 79018ea0d1127408bc83c6a9ef9c810116799ec4 (diff) | |
CWS-TOOLING: integrate CWS cmcfixes68ooo/DEV300_m69
| -rw-r--r-- | sw/source/core/unocore/unotext.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/uiview/srcview.cxx | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx index 0373d8877a..3876f861b2 100644 --- a/sw/source/core/unocore/unotext.cxx +++ b/sw/source/core/unocore/unotext.cxx @@ -270,8 +270,8 @@ void SwXText::insertString(const uno::Reference< text::XTextRange >& xTextRange, sal::static_int_cast< sal_IntPtr >( xRangeTunnel->getSomething( OTextCursorHelper::getUnoTunnelId()) )); } - if(pRange && pRange->GetDoc() == GetDoc() || - pCursor && pCursor->GetDoc() == GetDoc()) + if( (pRange && pRange->GetDoc() == GetDoc()) || + (pCursor && pCursor->GetDoc() == GetDoc()) ) { const SwStartNode* pOwnStartNode = GetStartNode(); if(pCursor) diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx index 07cfce2d2e..b2c046a7c6 100644 --- a/sw/source/ui/uiview/srcview.cxx +++ b/sw/source/ui/uiview/srcview.cxx @@ -717,6 +717,7 @@ USHORT SwSrcView::StartSearchAndReplace(const SvxSearchItem& rSearchItem, if(!bApi) + { if(bNotFoundMessage) { InfoBox( 0, SW_RES(MSG_NOT_FOUND)).Execute(); @@ -728,6 +729,7 @@ USHORT SwSrcView::StartSearchAndReplace(const SvxSearchItem& rSearchItem, pTextView->SetSelection( TextSelection( aPaM, aPaM ) ); StartSearchAndReplace( rSearchItem, FALSE, FALSE, TRUE ); } + } } return nFound; } |