Kaydet (Commit) 5ed14025 authored tarafından Vladimir Glazounov's avatar Vladimir Glazounov

INTEGRATION: CWS sw8u10bf05 (1.149.68); FILE MERGED

2008/02/25 08:28:19 od 1.149.68.2: RESYNC: (1.149-1.152); FILE MERGED
2008/02/04 13:14:31 ama 1.149.68.1: Fix #i28595#: Select text if object is in background
üst 402adb33
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: edtwin.cxx,v $ * $RCSfile: edtwin.cxx,v $
* *
* $Revision: 1.154 $ * $Revision: 1.155 $
* *
* last change: $Author: kz $ $Date: 2008-03-07 15:04:43 $ * last change: $Author: vg $ $Date: 2008-03-18 16:03:05 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
...@@ -2947,6 +2947,8 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt) ...@@ -2947,6 +2947,8 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
if (!rView.GetDrawFuncPtr()) if (!rView.GetDrawFuncPtr())
rSh.ShowCrsr(); rSh.ShowCrsr();
} }
else
bOnlyText = KEY_MOD1 != rMEvt.GetModifier();
} }
else if ( rSh.IsSelFrmMode() && else if ( rSh.IsSelFrmMode() &&
(aActHitType == SDRHIT_NONE || (aActHitType == SDRHIT_NONE ||
...@@ -3385,7 +3387,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt) ...@@ -3385,7 +3387,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
bNoInterrupt = bTmpNoInterrupt; bNoInterrupt = bTmpNoInterrupt;
} }
if( !bOverURLGrf ) if( !bOverURLGrf && !bOnlyText )
{ {
const int nSelType = rSh.GetSelectionType(); const int nSelType = rSh.GetSelectionType();
if( nSelType == nsSelectionType::SEL_OLE || if( nSelType == nsSelectionType::SEL_OLE ||
......
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