eddel.cxx (d1b67b9f) eddel.cxx (23d8f725)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 104 unchanged lines hidden (view full) ---

113 rPam.DeleteMark();
114}
115
116
117long SwEditShell::Delete()
118{
119 SET_CURR_SHELL( this );
120 long nRet = 0;
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 104 unchanged lines hidden (view full) ---

113 rPam.DeleteMark();
114}
115
116
117long SwEditShell::Delete()
118{
119 SET_CURR_SHELL( this );
120 long nRet = 0;
121 if( !HasReadonlySel() )
121 if ( !HasReadonlySel() || CrsrInsideInputFld() )
122 {
123 StartAllAction();
124
125 sal_Bool bUndo = GetCrsr()->GetNext() != GetCrsr();
126 if( bUndo ) // mehr als eine Selection ?
127 {
128 SwRewriter aRewriter;
129 aRewriter.AddRule(UNDO_ARG1, String(SW_RES(STR_MULTISEL)));

--- 226 unchanged lines hidden --- 		122 {
123 StartAllAction();
124
125 sal_Bool bUndo = GetCrsr()->GetNext() != GetCrsr();
126 if( bUndo ) // mehr als eine Selection ?
127 {
128 SwRewriter aRewriter;
129 aRewriter.AddRule(UNDO_ARG1, String(SW_RES(STR_MULTISEL)));

--- 226 unchanged lines hidden ---