applied_patches/0127-sc-read-only-colrow-resize.diff

   1 Index: sc/source/ui/view/colrowba.cxx
   2 ===================================================================
   3 RCS file: /cvs/sc/sc/source/ui/view/colrowba.cxx,v
   4 retrieving revision 1.13
   5 diff -u -w -p -r1.13 colrowba.cxx
   6 --- sc/source/ui/view/colrowba.cxx      8 Sep 2005 22:54:00 -0000       1.13
   7 +++ sc/source/ui/view/colrowba.cxx      28 Jun 2006 18:49:21 -0000
   8 @@ -220,8 +227,7 @@ BOOL ScColBar::IsDisabled()
   9
  10  BOOL ScColBar::ResizeAllowed()
  11  {
  12 -       return !pViewData->HasEditView( pViewData->GetActivePart() ) &&
  13 -                       !pViewData->GetDocShell()->IsReadOnly();
  14 +       return !pViewData->HasEditView( pViewData->GetActivePart() );
  15  }
  16
  17  void ScColBar::DrawInvert( long nDragPosP )
  18 @@ -386,8 +392,7 @@ BOOL ScRowBar::IsDisabled()
  19
  20  BOOL ScRowBar::ResizeAllowed()
  21  {
  22 -       return !pViewData->HasEditView( pViewData->GetActivePart() ) &&
  23 -                       !pViewData->GetDocShell()->IsReadOnly();
  24 +       return !pViewData->HasEditView( pViewData->GetActivePart() );
  25  }
  26
  27  void ScRowBar::DrawInvert( long nDragPosP )
  28 Index: sc/source/ui/view/viewfunc.cxx
  29 ===================================================================
  30 RCS file: /cvs/sc/sc/source/ui/view/viewfunc.cxx,v
  31 retrieving revision 1.32
  32 diff -u -w -p -r1.32 viewfunc.cxx
  33 --- sc/source/ui/view/viewfunc.cxx      2 May 2006 15:54:05 -0000       1.32
  34 +++ sc/source/ui/view/viewfunc.cxx      28 Jun 2006 18:49:24 -0000
  35 @@ -1943,7 +1948,10 @@ void ScViewFunc::SetWidthOrHeight( BOOL
  36                          bOnlyMatrix;
  37                         }
  38                 }
  39 -       if ( !bAllowed )
  40 +
  41 +       // Allow users to resize cols/rows in readonly docs despite the r/o state.
  42 +       // It is frustrating to be unable to see content in mis-sized cells.
  43 +       if( !bAllowed && !pDocSh->IsReadOnly() )
  44         {
  45                 ErrorMessage(STR_PROTECTIONERR);
  46                 return;
  47 @@ -2169,6 +2177,7 @@ void ScViewFunc::SetWidthOrHeight( BOOL
  48                         }
  49
  50                 pDocSh->UpdateOle(GetViewData());
  51 +               if( !pDocSh->IsReadOnly() )
  52                 aModificator.SetDocumentModified();
  53
  54                 ShowCursor();