[ooo-build-commit] .: patches/dev300

[Kohei Yoshida]

 patches/dev300/apply                              |    2 
 patches/dev300/calc-jump-on-formula-ref-sfx2.diff |   89 ++--------------------
 2 files changed, 10 insertions(+), 81 deletions(-)

New commits:
commit 9a86f43e9a4cc6075f802f490879a6978cf0c3fa
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Fri May 28 11:42:31 2010 -0400

    Fixed a patch for sfx2 for calc's reference jump feature.
    
    * patches/dev300/apply:
    * patches/dev300/calc-jump-on-formula-ref-sfx2.diff: No need to
      move the code block including the JumpToMark call any more.
      The baseline code already does what I need it to do.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 40c5bb4..b9b4b01 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -800,7 +800,7 @@ calc-autoinput-case-insensitive-matching.diff, n#472395, i#101046, kohei
 calc-jump-on-formula-ref-offapi.diff,    n#464359, i#101018, kohei
 calc-jump-on-formula-ref-officecfg.diff, n#464359, i#101018, kohei
 calc-jump-on-formula-ref-sc.diff,        n#464359, i#101018, kohei
-# FIXME dev300-m77 calc-jump-on-formula-ref-sfx2.diff,      n#464359, i#101018, kohei # FIXME disabled
+calc-jump-on-formula-ref-sfx2.diff,      n#464359, i#101018, kohei
 calc-jump-on-formula-ref-vcl.diff,       n#464359, i#101018, kohei
 
 # support ods import/export of sheet options and password hash.
diff --git a/patches/dev300/calc-jump-on-formula-ref-sfx2.diff b/patches/dev300/calc-jump-on-formula-ref-sfx2.diff
index e049139..b9dc282 100644
--- a/patches/dev300/calc-jump-on-formula-ref-sfx2.diff
+++ b/patches/dev300/calc-jump-on-formula-ref-sfx2.diff
@@ -1,26 +1,16 @@
-From 7809a89040d46efba8d81b5d41232f37c48374b3 Mon Sep 17 00:00:00 2001
-From: Jan Holesovsky <kendy at suse.cz>
-Date: Fri, 14 May 2010 16:56:06 +0200
-Subject: [PATCH 191/878] calc-jump-on-formula-ref-sfx2.diff
-
----
- sfx2/source/appl/appopen.cxx |   25 ++++++++++++++++++++++++-
- sfx2/source/view/topfrm.cxx  |   40 ++++++++++++++++++++--------------------
- 2 files changed, 44 insertions(+), 21 deletions(-)
-
-diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
-index d1be977..490a5a5 100644
---- a/sfx2/source/appl/appopen.cxx
-+++ b/sfx2/source/appl/appopen.cxx
-@@ -838,6 +838,29 @@ void SfxApplication::NewDocExec_Impl( SfxRequest& rReq )
+diff --git sfx2/source/appl/appopen.cxx sfx2/source/appl/appopen.cxx
+index b7cf712..588a7be 100644
+--- sfx2/source/appl/appopen.cxx
++++ sfx2/source/appl/appopen.cxx
+@@ -652,6 +652,29 @@ void SfxApplication::NewDocExec_Impl( SfxRequest& rReq )
  
  //---------------------------------------------------------------------------
  
 +namespace {
 +
-+/**
-+ * Check if a given filter type should open the hyperlinked document
-+ * natively.
++/** 
++ * Check if a given filter type should open the hyperlinked document 
++ * natively. 
 + *
 + * @param rFilter filter object
 + */
@@ -42,7 +32,7 @@ index d1be977..490a5a5 100644
  void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
  {
      DBG_MEMTEST();
-@@ -1147,7 +1170,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
+@@ -961,7 +984,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
              aTypeName = xTypeDetection->queryTypeByURL( aURL.Main );
              SfxFilterMatcher& rMatcher = SFX_APP()->GetFilterMatcher();
              const SfxFilter* pFilter = rMatcher.GetFilter4EA( aTypeName );
@@ -51,64 +41,3 @@ index d1be977..490a5a5 100644
              {
                  // hyperlink does not link to own type => special handling (http, ftp) browser and (other external protocols) OS
                  Reference< XSystemShellExecute > xSystemShellExecute( ::comphelper::getProcessServiceFactory()->createInstance(
-diff --git a/sfx2/source/view/topfrm.cxx b/sfx2/source/view/topfrm.cxx
-index a7b2bd2..2d63f81 100644
---- a/sfx2/source/view/topfrm.cxx
-+++ b/sfx2/source/view/topfrm.cxx
-@@ -916,26 +916,6 @@ sal_Bool SfxTopFrame::InsertDocument( SfxObjectShell* pDoc )
-     if ( pMarkItem )
-         aMark = pMarkItem->GetValue();
- 
--    if ( pDoc->Get_Impl()->nLoadedFlags & SFX_LOADED_MAINDOCUMENT )
--    {
--        if ( pViewDataItem )
--            pFrame->GetViewShell()->ReadUserData( pViewDataItem->GetValue(), sal_True );
--        else if( aMark.Len() )
--            GetCurrentViewFrame()->GetViewShell()->JumpToMark( aMark );
--    }
--    else
--    {
--        // Daten setzen, die in FinishedLoading ausgewertet werden
--        MarkData_Impl*& rpMark = pDoc->Get_Impl()->pMarkData;
--        if (!rpMark)
--            rpMark = new MarkData_Impl;
--        rpMark->pFrame = GetCurrentViewFrame();
--        if ( pViewDataItem )
--            rpMark->aUserData = pViewDataItem->GetValue();
--        else
--            rpMark->aMark = aMark;
--    }
--
-     // Position und Groesse setzen
-     //sal_uInt16 nWinMode = pModeItem ? pModeItem->GetValue() : 1;
-     if ( pAreaItem && !pOld )
-@@ -1003,6 +983,26 @@ sal_Bool SfxTopFrame::InsertDocument( SfxObjectShell* pDoc )
-         GetWindow().Show();
-     }
- 
-+    if ( pDoc->Get_Impl()->nLoadedFlags & SFX_LOADED_MAINDOCUMENT )
-+    {
-+        if ( pViewDataItem )
-+            pFrame->GetViewShell()->ReadUserData( pViewDataItem->GetValue(), sal_True );
-+        else if( aMark.Len() )
-+            GetCurrentViewFrame()->GetViewShell()->JumpToMark( aMark );
-+    }
-+    else
-+    {
-+        // Daten setzen, die in FinishedLoading ausgewertet werden
-+        MarkData_Impl*& rpMark = pDoc->Get_Impl()->pMarkData;
-+        if (!rpMark)
-+            rpMark = new MarkData_Impl;
-+        rpMark->pFrame = GetCurrentViewFrame();
-+        if ( pViewDataItem )
-+            rpMark->aUserData = pViewDataItem->GetValue();
-+        else
-+            rpMark->aMark = aMark;
-+    }
-+
-     // Jetzt UpdateTitle, hidden TopFrames haben sonst keinen Namen!
-     pFrame->UpdateTitle();
- 
--- 
-1.7.0.1
-