[ooo-build-commit] patches/dev300

[Kohei Yoshida]

 patches/dev300/calc-formula-variable-sep-config-check-sfx2.diff |   36 ----------
 1 file changed, 1 insertion(+), 35 deletions(-)

New commits:
commit 55e59f217dd5468f3f57392fdc6b7a87d45aa8a5
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Wed Dec 16 12:21:17 2009 -0500

    Removed unnecessarily call for CheckConfigOptions().
    
    * patches/dev300/calc-formula-variable-sep-config-check-sfx2.diff: I didn't
      need to call CheckConfigOptions() after the Options dialog is dismissed.
      When the dialog is dismissed, the focus returns to the parent frame at
      which time CheckConfigOptions() gets called from ScGridWindows::GetFocus().

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 ec4c784..442eab1 100644
--- a/patches/dev300/calc-formula-variable-sep-config-check-sfx2.diff
+++ b/patches/dev300/calc-formula-variable-sep-config-check-sfx2.diff
@@ -20,41 +20,7 @@ diff --git sfx2/source/appl/appserv.cxx sfx2/source/appl/appserv.cxx
 index b511170..72b605e 100644
 --- sfx2/source/appl/appserv.cxx
 +++ sfx2/source/appl/appserv.cxx
-@@ -855,6 +855,23 @@ namespace
-     }
- }
- 
-+namespace {
-+
-+void inspectNewOptions()
-+{
-+    SfxViewFrame* pCurView = SfxViewFrame::Current();
-+    if (!pCurView)
-+        return;
-+
-+    SfxObjectShell* pShell = pCurView->GetObjectShell();
-+    if (!pShell)
-+        return;
-+
-+    pShell->CheckConfigOptions();
-+}
-+
-+}
-+
- void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
- {
-     DBG_MEMTEST();
-@@ -876,11 +893,18 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
-             {
-                 VclAbstractDialog* pDlg =
-                     pFact->CreateFrameDialog( NULL, xFrame, rReq.GetSlot(), sPageURL );
--                  pDlg->Execute();
-+                  if (pDlg->Execute() == RET_OK)
-+                  {
-+                      // Do extra sanity check for potentially clashing options.
-+                      inspectNewOptions();
-+                  }
-                   delete pDlg;
+@@ -881,6 +881,9 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
                  SfxViewFrame* pView = SfxViewFrame::GetFirst();
                  while ( pView )
                  {