[ooo-build-commit] patches/dev300

[Kohei Yoshida]

 patches/dev300/calc-formula-variable-sep-config-check-sfx2.diff |   19 +++++++---
 1 file changed, 14 insertions(+), 5 deletions(-)

New commits:
commit 5d5f078163a0c0115c629c236b99d724d2fae945
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Wed Dec 16 12:37:47 2009 -0500

    Check config options *only when* the Options dialog is dismissed with OK.
    
    * patches/dev300/calc-formula-variable-sep-config-check-sfx2.diff:

diff --git a/patches/dev300/calc-formula-variable-sep-config-check-sfx2.diff b/patches/dev300/calc-formula-variable-sep-config-check-sfx2.diff
index 442eab1..9e15edd 100644
--- a/patches/dev300/calc-formula-variable-sep-config-check-sfx2.diff
+++ b/patches/dev300/calc-formula-variable-sep-config-check-sfx2.diff
@@ -17,16 +17,25 @@ index 488acea..9c7e99f 100644
      sal_Bool                    SaveChildren(BOOL bObjectsOnly=FALSE);
      sal_Bool                    SaveAsChildren( SfxMedium &rMedium );
 diff --git sfx2/source/appl/appserv.cxx sfx2/source/appl/appserv.cxx
-index b511170..72b605e 100644
+index b511170..f32c895 100644
 --- sfx2/source/appl/appserv.cxx
 +++ sfx2/source/appl/appserv.cxx
-@@ -881,6 +881,9 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
+@@ -876,11 +876,17 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
+             {
+                 VclAbstractDialog* pDlg =
+                     pFact->CreateFrameDialog( NULL, xFrame, rReq.GetSlot(), sPageURL );
+-                  pDlg->Execute();
++                  short nRet = pDlg->Execute();
+                   delete pDlg;
                  SfxViewFrame* pView = SfxViewFrame::GetFirst();
                  while ( pView )
                  {
-+                    SfxObjectShell* pObjSh = pView->GetObjectShell();
-+                    if (pObjSh)
-+                        pObjSh->SetConfigOptionsChecked(false);
++                    if (nRet == RET_OK)
++                    {
++                        SfxObjectShell* pObjSh = pView->GetObjectShell();
++                        if (pObjSh)
++                            pObjSh->SetConfigOptionsChecked(false);
++                    }
                      pView->GetBindings().InvalidateAll(FALSE);
                      pView = SfxViewFrame::GetNext( *pView );
                  }