[Libreoffice-commits] .: 4 commits - cui/source

[Kohei Yoshida]

 cui/source/options/treeopt.cxx |    1 +
 cui/source/options/treeopt.src |    1 +
 2 files changed, 2 insertions(+)

New commits:
commit 07d03e0a830bc3aba604d508d38ac7d7674fb299
Merge: 2f7fec2... 45e3569...
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Wed Oct 13 23:23:35 2010 -0400

    Merge branch 'feature/calc-key-binding-compat' of ssh://git.freedesktop.org/git/libreoffice/components into feature/calc-key-binding-compat

commit 2f7fec2ae1631f4defe284f801bd18d8a6555700
Merge: d83d9d8... 8e83621...
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Wed Oct 13 23:21:44 2010 -0400

    Merge branch 'master' into feature/calc-key-binding-compat

commit d83d9d8310b5e06cdf8af8d3e5e7baedee61d943
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Mon Oct 11 18:06:02 2010 -0400

    Added new tab page in the Options dialog.
    
    This options tab page is for Calc's compatibility settings, e.g.
    default key bindings between the old OOo Calc and Excel.

diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 5665784..468fba6 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -454,6 +454,7 @@ static OptionsMapping_Impl __READONLY_DATA OptionsMap_Impl[] =
     { "Calc",               "Formula",              SID_SC_TP_FORMULA },
     { "Calc",               "SortLists",            SID_SC_TP_USERLISTS },
     { "Calc",               "Changes",              SID_SC_TP_CHANGES },
+    { "Calc",               "Compatibility",        SID_SC_TP_COMPATIBILITY },
     { "Calc",               "Grid",                 SID_SC_TP_GRID },
     { "Calc",               "Print",                RID_SC_TP_PRINT },
     { "Impress",            NULL,                   SID_SD_EDITOPTIONS },
diff --git a/cui/source/options/treeopt.src b/cui/source/options/treeopt.src
index 5b22727..62f1c29 100644
--- a/cui/source/options/treeopt.src
+++ b/cui/source/options/treeopt.src
@@ -242,6 +242,7 @@ Resource RID_OFADLG_OPTIONS_TREE_PAGES
             < "Formula" ;       SID_SC_TP_FORMULA ;> ;
             < "Sort Lists" ;		SID_SC_TP_USERLISTS			;> ;
             < "Changes" ;		SID_SC_TP_CHANGES			;> ;
+            < "Compatibility" ; SID_SC_TP_COMPATIBILITY ;> ;
             < "Grid" ;			SID_SC_TP_GRID				;> ;
             < "Print" ;			RID_SC_TP_PRINT				;> ;
         };
commit 45e356969cccf091506ba46004fccaaa1c3210eb
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Mon Oct 11 18:06:02 2010 -0400

    Added new tab page in the Options dialog.
    
    This options tab page is for Calc's compatibility settings, e.g.
    default key bindings between the old OOo Calc and Excel.

diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 5665784..468fba6 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -454,6 +454,7 @@ static OptionsMapping_Impl __READONLY_DATA OptionsMap_Impl[] =
     { "Calc",               "Formula",              SID_SC_TP_FORMULA },
     { "Calc",               "SortLists",            SID_SC_TP_USERLISTS },
     { "Calc",               "Changes",              SID_SC_TP_CHANGES },
+    { "Calc",               "Compatibility",        SID_SC_TP_COMPATIBILITY },
     { "Calc",               "Grid",                 SID_SC_TP_GRID },
     { "Calc",               "Print",                RID_SC_TP_PRINT },
     { "Impress",            NULL,                   SID_SD_EDITOPTIONS },
diff --git a/cui/source/options/treeopt.src b/cui/source/options/treeopt.src
index 5b22727..62f1c29 100644
--- a/cui/source/options/treeopt.src
+++ b/cui/source/options/treeopt.src
@@ -242,6 +242,7 @@ Resource RID_OFADLG_OPTIONS_TREE_PAGES
             < "Formula" ;       SID_SC_TP_FORMULA ;> ;
             < "Sort Lists" ;		SID_SC_TP_USERLISTS			;> ;
             < "Changes" ;		SID_SC_TP_CHANGES			;> ;
+            < "Compatibility" ; SID_SC_TP_COMPATIBILITY ;> ;
             < "Grid" ;			SID_SC_TP_GRID				;> ;
             < "Print" ;			RID_SC_TP_PRINT				;> ;
         };