diff -cNr old/sc/source/ui/view/viewfun2.cxx new/sc/source/ui/view/viewfun2.cxx *** old/sc/source/ui/view/viewfun2.cxx Wed Aug 1 00:38:18 2007 --- new/sc/source/ui/view/viewfun2.cxx Thu Oct 25 15:23:48 2007 *************** *** 1189,1195 **** BOOL ScViewFunc::RemoveMerge( BOOL bRecord ) { ScRange aRange; ! if (GetViewData()->GetSimpleArea( aRange )) { ScRange aExtended( aRange ); GetViewData()->GetDocument()->ExtendMerge( aExtended ); --- 1189,1201 ---- BOOL ScViewFunc::RemoveMerge( BOOL bRecord ) { ScRange aRange; ! ScEditableTester aTester( this ); ! if (!aTester.IsEditable()) ! { ! ErrorMessage(aTester.GetMessageId()); ! return FALSE; ! } ! else if (GetViewData()->GetSimpleArea( aRange )) { ScRange aExtended( aRange ); GetViewData()->GetDocument()->ExtendMerge( aExtended );