ooo-build r12736 - in trunk: . patches/dev300

[kyoshida svn gnome org]

Author: kyoshida
Date: Sat May 31 02:29:33 2008
New Revision: 12736
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12736&view=rev

Log:
2008-05-30  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/cws-scsheetprotection02-sc.diff: fixed an inproper
	launching of "Incorrect Password" dialog when the user tries to 
	unprotect a sheet and cancels it.


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/cws-scsheetprotection02-sc.diff

Modified: trunk/patches/dev300/cws-scsheetprotection02-sc.diff
==============================================================================
--- trunk/patches/dev300/cws-scsheetprotection02-sc.diff	(original)
+++ trunk/patches/dev300/cws-scsheetprotection02-sc.diff	Sat May 31 02:29:33 2008
@@ -6986,7 +6986,7 @@
  					if( IS_AVAILABLE( FID_PROTECT_TABLE, &pItem ) )
  						bNewProtection = ((const SfxBoolItem*)pItem)->GetValue();
                      if( bNewProtection == bOldProtection )
-@@ -1040,13 +1044,16 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
+@@ -1048,65 +1052,63 @@
                      }
                  }
  
@@ -7000,7 +7000,6 @@
  
 -                            pDlg = new SfxPasswordDialog( GetDialogParent(), &aText );
 +                ScTableProtection* pProtect = pDoc->GetTabProtection(nTab);
-+                String aPassword;
 +                if (pProtect && pProtect->isProtectedWithPass())
 +                {
 +                    String aText( ScResId(SCSTR_PASSWORDOPT) );
@@ -7008,16 +7007,21 @@
                              pDlg->SetText( ScResId(SCSTR_UNPROTECTTAB) );
                              pDlg->SetMinLen( 0 );
                              pDlg->SetHelpId( FID_PROTECT_TABLE );
-@@ -1054,51 +1061,42 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
+                             pDlg->SetEditHelpId( HID_PASSWD_TABLE );
  
                              if (pDlg->Execute() == RET_OK)
-                                 aPassword = pDlg->GetPassword();
--                            else
--                                bCancel = TRUE;
+-                                aPassword = pDlg->GetPassword();
++                    {
++                        String aPassword = pDlg->GetPassword();
++                        Unprotect(nTab, aPassword);
++                    }
 +                }
+                             else
+-                                bCancel = TRUE;
++                    // this sheet is not password-protected.
++                    Unprotect(nTab, String());
  
 -                            delete pDlg;
-+                Unprotect(nTab, aPassword);
 +                if (!pReqArgs)
 +                {
 +                    rReq.AppendItem( SfxBoolItem(FID_PROTECT_TABLE, false) );