diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2012-12-19 19:03:11 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2012-12-20 12:12:07 +0100 |
| commit | bdd9d06c129344f8a10cbb691c129dc914600862 (patch) | |
| tree | 93d07749db58b9498027ec5829ffe9023caeb587 | |
| parent | 6fe0d1b7e46564cdfaa4134964ce35ce650b3026 (diff) | |
incorrect if body alignment
Change-Id: Ic5076bc7be30e72686840c06f1f9b441b774f3ba
| -rw-r--r-- | sw/source/ui/docvw/edtwin.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index e47b40412be7..3ceee2610048 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -3237,12 +3237,12 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt) bFrmDrag = sal_False; if ( !bHandledFlyClick && !bIsDocReadOnly && rSh.IsInsideSelectedObj(aDocPos) && 0 == rSh.IsSelObjProtected( FLYPROTECT_CONTENT|FLYPROTECT_PARENT ) ) - + { /* this is no good, on the one hand GetSelectionType is used as flag field (take a look into the GetSelectionType method) on the other hand the return value is used in a switch without proper masking (very nice), this must lead to trouble */ - switch ( rSh.GetSelectionType() &~ ( nsSelectionType::SEL_FONTWORK | nsSelectionType::SEL_EXTRUDED_CUSTOMSHAPE ) ) - { + switch ( rSh.GetSelectionType() &~ ( nsSelectionType::SEL_FONTWORK | nsSelectionType::SEL_EXTRUDED_CUSTOMSHAPE ) ) + { case nsSelectionType::SEL_GRF: RstMBDownFlags(); GetView().GetViewFrame()->GetBindings().Execute( @@ -3271,6 +3271,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt) if ( rView.GetCurShell()->ISA(SwDrawTextShell) ) ((SwDrawTextShell*)rView.GetCurShell())->Init(); return; + } } // if the cursor position was corrected or if a Fly @@ -5328,7 +5329,7 @@ void SwEditWin::Command( const CommandEvent& rCEvt ) xub_StrLen nMarkIdx = pCrsr->GetMark()->nContent.GetIndex(); if( !rSh.GetCrsr()->HasMark() ) - rSh.GetCrsr()->SetMark(); + rSh.GetCrsr()->SetMark(); rSh.SttCrsrMove(); |