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 | 3a66e8444c9086c53a27159a1a0edad3b6e85ff5 (patch) | |
| tree | 030fc5ce35168a4272d740eee989a999e92c7dd4 | |
| parent | 342de2755fd2cfc797ca8ea35dc3d91e6c0d2756 (diff) | |
| parent | ff016bd9d3e87d93db950c60ad7ccb5c31b5fa7a (diff) | |
CWS-TOOLING: integrate CWS cmcfixes68
Notes
split repo tag: writer_ooo/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 7ae4b209f49f..ee1055b276c9 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 92467fe455d0..26a1253c5486 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; } |