Kaydet (Commit) 3a66e844 authored tarafından Jens-Heiner Rechtien's avatar Jens-Heiner Rechtien

CWS-TOOLING: integrate CWS cmcfixes68

...@@ -270,8 +270,8 @@ void SwXText::insertString(const uno::Reference< text::XTextRange >& xTextRange, ...@@ -270,8 +270,8 @@ void SwXText::insertString(const uno::Reference< text::XTextRange >& xTextRange,
sal::static_int_cast< sal_IntPtr >( xRangeTunnel->getSomething( OTextCursorHelper::getUnoTunnelId()) )); sal::static_int_cast< sal_IntPtr >( xRangeTunnel->getSomething( OTextCursorHelper::getUnoTunnelId()) ));
} }
if(pRange && pRange->GetDoc() == GetDoc() || if( (pRange && pRange->GetDoc() == GetDoc()) ||
pCursor && pCursor->GetDoc() == GetDoc()) (pCursor && pCursor->GetDoc() == GetDoc()) )
{ {
const SwStartNode* pOwnStartNode = GetStartNode(); const SwStartNode* pOwnStartNode = GetStartNode();
if(pCursor) if(pCursor)
......
...@@ -717,6 +717,7 @@ USHORT SwSrcView::StartSearchAndReplace(const SvxSearchItem& rSearchItem, ...@@ -717,6 +717,7 @@ USHORT SwSrcView::StartSearchAndReplace(const SvxSearchItem& rSearchItem,
if(!bApi) if(!bApi)
{
if(bNotFoundMessage) if(bNotFoundMessage)
{ {
InfoBox( 0, SW_RES(MSG_NOT_FOUND)).Execute(); InfoBox( 0, SW_RES(MSG_NOT_FOUND)).Execute();
...@@ -728,6 +729,7 @@ USHORT SwSrcView::StartSearchAndReplace(const SvxSearchItem& rSearchItem, ...@@ -728,6 +729,7 @@ USHORT SwSrcView::StartSearchAndReplace(const SvxSearchItem& rSearchItem,
pTextView->SetSelection( TextSelection( aPaM, aPaM ) ); pTextView->SetSelection( TextSelection( aPaM, aPaM ) );
StartSearchAndReplace( rSearchItem, FALSE, FALSE, TRUE ); StartSearchAndReplace( rSearchItem, FALSE, FALSE, TRUE );
} }
}
} }
return nFound; return nFound;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment