diff options
Diffstat (limited to 'sw/source/ui/docvw/edtwin.cxx')
| -rw-r--r-- | sw/source/ui/docvw/edtwin.cxx | 33 |
1 files changed, 23 insertions, 10 deletions
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index 1282d02a44c8..b16bb6af6181 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -193,10 +193,10 @@ class SwAnchorMarker bool bTopRightHandle; // <-- public: - SwAnchorMarker( SdrHdl* pH ) + SwAnchorMarker( SdrHdl* pH ) : pHdl( pH ) , aHdlPos( pH->GetPos() ) - , aLastPos( pH->GetPos() ) + , aLastPos( pH->GetPos() ) // --> OD 2010-09-16 #i114522# , bTopRightHandle( pH->GetKind() == HDL_ANCHOR_TR ) // <-- @@ -206,8 +206,8 @@ public: void SetPos( const Point& rNew ) { pHdl->SetPos( rNew ); } const Point& GetPos() { return pHdl->GetPos(); } const Point& GetHdlPos() { return aHdlPos; } - void ChgHdl( SdrHdl* pNew ) - { + void ChgHdl( SdrHdl* pNew ) + { pHdl = pNew; // --> OD 2010-09-16 #i114522# if ( pHdl ) @@ -228,9 +228,9 @@ public: else { aHitTestPos += Point( 1, 1 ); - } + } aHitTestPos = rOut.PixelToLogic( aHitTestPos ); - + return aHitTestPos; } // <-- @@ -1755,9 +1755,17 @@ KEYINPUT_CHECKTABLE_INSDEL: break; case KEY_DELETE: - if (rSh.IsInFrontOfLabel() && - rSh.NumOrNoNum(FALSE)) - eKeyState = KS_NumOrNoNum; + if ( !rSh.HasReadonlySel() ) + { + if (rSh.IsInFrontOfLabel() && + rSh.NumOrNoNum(FALSE)) + eKeyState = KS_NumOrNoNum; + } + else + { + InfoBox( this, SW_RES( MSG_READONLY_CONTENT )).Execute(); + eKeyState = KS_Ende; + } break; case KEY_DELETE | KEY_MOD2: @@ -1921,6 +1929,11 @@ KEYINPUT_CHECKTABLE_INSDEL: // <-- } } + else + { + InfoBox( this, SW_RES( MSG_READONLY_CONTENT )).Execute(); + eKeyState = KS_Ende; + } break; case KEY_RIGHT: @@ -2361,7 +2374,7 @@ KEYINPUT_CHECKTABLE_INSDEL: ChgToEnEmDash | SetINetAttr | Autocorrect ) && !rSh.HasReadonlySel() ) - /* { + /* { pACorr->IsAutoCorrFlag( CptlSttSntnc | CptlSttWrd | ChgFractionSymbol | ChgOrdinalNumber | ChgToEnEmDash | SetINetAttr | |