[ooo-build-commit] .: officecfg/registry sfx2/source

[Fridrich Strba]

 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |   10 ++++
 sfx2/source/appl/appopen.cxx                                      |   25 +++++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)

New commits:
commit 16757437b9e4cc7d39dd8b8c4933eece3043341e
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Thu Sep 16 10:37:52 2010 +0200

    calc-jump-on-formula-ref-sfx2.diff: Migrated
    
    n#464359, i#101018
    
    allow ctrl-[ and ctrl-] to jump to references used in a formula expression.

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 073a2bb..0eb5046 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -1608,6 +1608,16 @@
                     <value xml:lang="en-US">Assign Macro...</value>
                 </prop>
             </node>
+            <node oor:name=".uno:MarkPrecedents" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Mark Precedents</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:MarkDependents" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Mark Dependents</value>
+                </prop>
+            </node>
         </node>
     </node>
 </oor:component-data>
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index b7cf712..e16a694 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/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.
+ *
+ * @param rFilter filter object
+ */
+bool lcl_isFilterNativelySupported(const SfxFilter& rFilter)
+{
+    if (rFilter.IsOwnFormat())
+        return true;
+
+    ::rtl::OUString aName = rFilter.GetFilterName();
+    if (aName.indexOf(::rtl::OUString::createFromAscii("MS Excel")) == 0)
+        // We can handle all Excel variants natively.
+        return true;
+
+    return false;
+}
+
+}
+
 void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
 {
     DBG_MEMTEST();
@@ -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 );
-            if ( !pFilter || !( pFilter->IsOwnFormat() ))
+            if (!pFilter || !lcl_isFilterNativelySupported(*pFilter))
             {
                 // hyperlink does not link to own type => special handling (http, ftp) browser and (other external protocols) OS
                 Reference< XSystemShellExecute > xSystemShellExecute( ::comphelper::getProcessServiceFactory()->createInstance(