[Libreoffice-commits] .: patches/dev300

Michael Meeks michael at kemper.freedesktop.org
Thu Apr 7 05:59:57 PDT 2011


 patches/dev300/apply                                     |   12 --
 patches/dev300/basctl-no-macro-recorder-in-ui.diff       |   19 ---
 patches/dev300/dbaccess-no-macro-recorder-in-ui.diff     |   71 ------------
 patches/dev300/framework-no-macro-recorder-in-ui.diff    |   19 ---
 patches/dev300/reportdesign-no-macro-recorder-in-ui.diff |   19 ---
 patches/dev300/sc-no-macro-recorder-in-ui.diff           |   19 ---
 patches/dev300/sd-no-macro-recorder-in-ui.diff           |   32 -----
 patches/dev300/starmath-no-macro-recorder-in-ui.diff     |   19 ---
 patches/dev300/sw-no-macro-recorder-in-ui.diff           |   84 ---------------
 9 files changed, 294 deletions(-)

New commits:
commit 1724877a8a204e37b1f08dda837797d98273aa5b
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Thu Apr 7 13:58:47 2011 +0100

    remove macro recorder tweaks subsumed by experimental mode setting

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 3685674..62d02a4 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1509,18 +1509,6 @@ svx-ppt-import-fix-bullet-size.diff, n#515972, rodo
 # correctly import connector style attribute.
 # FIXME ooo3330-m4: doesn't apply in m3f svx-msdff-import-connector-style-fix.diff, n#631804, kohei
 
-[ NovellOnly ]
-# remove Macro Recorder from UI since it is borked by design
-basctl-no-macro-recorder-in-ui.diff, fridrich
-dbaccess-no-macro-recorder-in-ui.diff, fridrich
-framework-no-macro-recorder-in-ui.diff, fridrich
-reportdesign-no-macro-recorder-in-ui.diff, fridrich
-sc-no-macro-recorder-in-ui.diff, fridrich
-sd-no-macro-recorder-in-ui.diff, fridrich
-starmath-no-macro-recorder-in-ui.diff, fridrich
-sw-no-macro-recorder-in-ui.diff, fridrich
-
-[ Fixes ]
 filter-fix-build-FCFGMerge.cfg.diff, rodo
 store-crash-fix.diff, thorsten
 sd-ppt-fix-document-summary-reading.diff, n#546758, rodo
diff --git a/patches/dev300/basctl-no-macro-recorder-in-ui.diff b/patches/dev300/basctl-no-macro-recorder-in-ui.diff
deleted file mode 100644
index f2c1123..0000000
--- a/patches/dev300/basctl-no-macro-recorder-in-ui.diff
+++ /dev/null
@@ -1,19 +0,0 @@
----
- basctl/uiconfig/basicide/menubar/menubar.xml |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git basctl/uiconfig/basicide/menubar/menubar.xml basctl/uiconfig/basicide/menubar/menubar.xml
-index 9a40215..0ab1c50 100644
---- basctl/uiconfig/basicide/menubar/menubar.xml
-+++ basctl/uiconfig/basicide/menubar/menubar.xml
-@@ -56,7 +56,6 @@
-         <menu:menupopup>
-             <menu:menu menu:id=".uno:MacrosMenu">
-                 <menu:menupopup>
--                    <menu:menuitem menu:id=".uno:MacroRecorder"/>
-                     <menu:menuitem menu:id=".uno:RunMacro"/>
-                     <menu:menu menu:id=".uno:ScriptOrganizer"/>
-                     <menu:menuseparator/>
--- 
-1.7.0.1
-
diff --git a/patches/dev300/dbaccess-no-macro-recorder-in-ui.diff b/patches/dev300/dbaccess-no-macro-recorder-in-ui.diff
deleted file mode 100644
index 78d23e9..0000000
--- a/patches/dev300/dbaccess-no-macro-recorder-in-ui.diff
+++ /dev/null
@@ -1,71 +0,0 @@
----
- dbaccess/uiconfig/dbapp/menubar/menubar.xml      |    1 -
- dbaccess/uiconfig/dbquery/menubar/menubar.xml    |    1 -
- dbaccess/uiconfig/dbrelation/menubar/menubar.xml |    1 -
- dbaccess/uiconfig/dbtable/menubar/menubar.xml    |    1 -
- dbaccess/uiconfig/dbtdata/menubar/menubar.xml    |    1 -
- 5 files changed, 0 insertions(+), 5 deletions(-)
-
-diff --git dbaccess/uiconfig/dbapp/menubar/menubar.xml dbaccess/uiconfig/dbapp/menubar/menubar.xml
-index e0e15ed..91ca1e9 100644
---- dbaccess/uiconfig/dbapp/menubar/menubar.xml
-+++ dbaccess/uiconfig/dbapp/menubar/menubar.xml
-@@ -109,7 +109,6 @@
-             <menu:menuseparator/>
-             <menu:menu menu:id=".uno:MacrosMenu">
-                 <menu:menupopup>
--                    <menu:menuitem menu:id=".uno:MacroRecorder"/>
-                     <menu:menuitem menu:id=".uno:RunMacro"/>
-                     <menu:menu menu:id=".uno:ScriptOrganizer"/>
-                     <menu:menuseparator/>
-diff --git dbaccess/uiconfig/dbquery/menubar/menubar.xml dbaccess/uiconfig/dbquery/menubar/menubar.xml
-index 715b043..ff4ad4e 100644
---- dbaccess/uiconfig/dbquery/menubar/menubar.xml
-+++ dbaccess/uiconfig/dbquery/menubar/menubar.xml
-@@ -52,7 +52,6 @@
-         <menu:menupopup>
-             <menu:menu menu:id=".uno:MacrosMenu">
-                 <menu:menupopup>
--                    <menu:menuitem menu:id=".uno:MacroRecorder"/>
-                     <menu:menuitem menu:id=".uno:RunMacro"/>
-                     <menu:menu menu:id=".uno:ScriptOrganizer"/>
-                     <menu:menuseparator/>
-diff --git dbaccess/uiconfig/dbrelation/menubar/menubar.xml dbaccess/uiconfig/dbrelation/menubar/menubar.xml
-index 0bb81c0..25dbf3a 100644
---- dbaccess/uiconfig/dbrelation/menubar/menubar.xml
-+++ dbaccess/uiconfig/dbrelation/menubar/menubar.xml
-@@ -35,7 +35,6 @@
-         <menu:menupopup>
-             <menu:menu menu:id=".uno:MacrosMenu">
-                 <menu:menupopup>
--                    <menu:menuitem menu:id=".uno:MacroRecorder"/>
-                     <menu:menuitem menu:id=".uno:RunMacro"/>
-                     <menu:menu menu:id=".uno:ScriptOrganizer"/>
-                     <menu:menuseparator/>
-diff --git dbaccess/uiconfig/dbtable/menubar/menubar.xml dbaccess/uiconfig/dbtable/menubar/menubar.xml
-index d132309..2cac4db 100644
---- dbaccess/uiconfig/dbtable/menubar/menubar.xml
-+++ dbaccess/uiconfig/dbtable/menubar/menubar.xml
-@@ -36,7 +36,6 @@
-             <menu:menuseparator/>
-             <menu:menu menu:id=".uno:MacrosMenu">
-                 <menu:menupopup>
--                    <menu:menuitem menu:id=".uno:MacroRecorder"/>
-                     <menu:menuitem menu:id=".uno:RunMacro"/>
-                     <menu:menu menu:id=".uno:ScriptOrganizer"/>
-                     <menu:menuseparator/>
-diff --git dbaccess/uiconfig/dbtdata/menubar/menubar.xml dbaccess/uiconfig/dbtdata/menubar/menubar.xml
-index 6b26167..a672b8d 100644
---- dbaccess/uiconfig/dbtdata/menubar/menubar.xml
-+++ dbaccess/uiconfig/dbtdata/menubar/menubar.xml
-@@ -44,7 +44,6 @@
-         <menu:menupopup>
-             <menu:menu menu:id=".uno:MacrosMenu">
-                 <menu:menupopup>
--                    <menu:menuitem menu:id=".uno:MacroRecorder"/>
-                     <menu:menuitem menu:id=".uno:RunMacro"/>
-                     <menu:menu menu:id=".uno:ScriptOrganizer"/>
-                     <menu:menuseparator/>
--- 
-1.7.0.1
-
diff --git a/patches/dev300/framework-no-macro-recorder-in-ui.diff b/patches/dev300/framework-no-macro-recorder-in-ui.diff
deleted file mode 100644
index 8956967..0000000
--- a/patches/dev300/framework-no-macro-recorder-in-ui.diff
+++ /dev/null
@@ -1,19 +0,0 @@
----
- framework/uiconfig/startmodule/menubar/menubar.xml |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git framework/uiconfig/startmodule/menubar/menubar.xml framework/uiconfig/startmodule/menubar/menubar.xml
-index e9a0f33..40e3ba7 100644
---- framework/uiconfig/startmodule/menubar/menubar.xml
-+++ framework/uiconfig/startmodule/menubar/menubar.xml
-@@ -50,7 +50,6 @@
-         <menu:menupopup>
-             <menu:menu menu:id=".uno:MacrosMenu">
-                 <menu:menupopup>
--                    <menu:menuitem menu:id=".uno:MacroRecorder"/>
-                     <menu:menuitem menu:id=".uno:RunMacro"/>
-                     <menu:menu menu:id=".uno:ScriptOrganizer"/>
-                     <menu:menuseparator/>
--- 
-1.7.0.1
-
diff --git a/patches/dev300/reportdesign-no-macro-recorder-in-ui.diff b/patches/dev300/reportdesign-no-macro-recorder-in-ui.diff
deleted file mode 100644
index 68822b0..0000000
--- a/patches/dev300/reportdesign-no-macro-recorder-in-ui.diff
+++ /dev/null
@@ -1,19 +0,0 @@
----
- reportdesign/uiconfig/dbreport/menubar/menubar.xml |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git reportdesign/uiconfig/dbreport/menubar/menubar.xml reportdesign/uiconfig/dbreport/menubar/menubar.xml
-index a0de35e..95cb375 100644
---- reportdesign/uiconfig/dbreport/menubar/menubar.xml
-+++ reportdesign/uiconfig/dbreport/menubar/menubar.xml
-@@ -383,7 +383,6 @@
-         <menu:menupopup>
-             <menu:menu menu:id=".uno:MacrosMenu" >
-                 <menu:menupopup>
--                    <menu:menuitem menu:id=".uno:MacroRecorder"/>
-                     <menu:menuitem menu:id=".uno:RunMacro"/>
-                     <menu:menu menu:id=".uno:ScriptOrganizer"/>
-                     <menu:menuitem menu:id=".uno:MacroSignature"/>
--- 
-1.7.0.1
-
diff --git a/patches/dev300/sc-no-macro-recorder-in-ui.diff b/patches/dev300/sc-no-macro-recorder-in-ui.diff
deleted file mode 100644
index cab3b42..0000000
--- a/patches/dev300/sc-no-macro-recorder-in-ui.diff
+++ /dev/null
@@ -1,19 +0,0 @@
----
- sc/uiconfig/scalc/menubar/menubar.xml |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git sc/uiconfig/scalc/menubar/menubar.xml sc/uiconfig/scalc/menubar/menubar.xml
-index 67ef111..b092a1c 100644
---- sc/uiconfig/scalc/menubar/menubar.xml
-+++ sc/uiconfig/scalc/menubar/menubar.xml
-@@ -370,7 +370,6 @@
-             <menu:menuseparator/>
-             <menu:menu menu:id=".uno:MacrosMenu">
-                 <menu:menupopup>
--                    <menu:menuitem menu:id=".uno:MacroRecorder"/>
-                     <menu:menuitem menu:id=".uno:RunMacro"/>
-                     <menu:menu menu:id=".uno:ScriptOrganizer"/>
-                     <menu:menuitem menu:id=".uno:MacroSignature"/>
--- 
-1.7.0.1
-
diff --git a/patches/dev300/sd-no-macro-recorder-in-ui.diff b/patches/dev300/sd-no-macro-recorder-in-ui.diff
deleted file mode 100644
index 996f3fe..0000000
--- a/patches/dev300/sd-no-macro-recorder-in-ui.diff
+++ /dev/null
@@ -1,32 +0,0 @@
----
- sd/uiconfig/sdraw/menubar/menubar.xml    |    1 -
- sd/uiconfig/simpress/menubar/menubar.xml |    1 -
- 2 files changed, 0 insertions(+), 2 deletions(-)
-
-diff --git sd/uiconfig/sdraw/menubar/menubar.xml sd/uiconfig/sdraw/menubar/menubar.xml
-index da9c2df..b7e754f 100644
---- sd/uiconfig/sdraw/menubar/menubar.xml
-+++ sd/uiconfig/sdraw/menubar/menubar.xml
-@@ -226,7 +226,6 @@
-       <menu:menuseparator/>
-       <menu:menu menu:id=".uno:MacrosMenu">
-         <menu:menupopup>
--          <menu:menuitem menu:id=".uno:MacroRecorder"/>
-           <menu:menuitem menu:id=".uno:RunMacro"/>
-           <menu:menu menu:id=".uno:ScriptOrganizer"/>
-           <menu:menuitem menu:id=".uno:MacroSignature"/>
-diff --git sd/uiconfig/simpress/menubar/menubar.xml sd/uiconfig/simpress/menubar/menubar.xml
-index 4fb01e3..de213b8 100755
---- sd/uiconfig/simpress/menubar/menubar.xml
-+++ sd/uiconfig/simpress/menubar/menubar.xml
-@@ -253,7 +253,6 @@
-             <menu:menuseparator/>
-             <menu:menu menu:id=".uno:MacrosMenu">
-                 <menu:menupopup>
--                    <menu:menuitem menu:id=".uno:MacroRecorder"/>
-                     <menu:menuitem menu:id=".uno:RunMacro"/>
-                     <menu:menu menu:id=".uno:ScriptOrganizer"/>
-                     <menu:menuitem menu:id=".uno:MacroSignature"/>
--- 
-1.7.0.1
-
diff --git a/patches/dev300/starmath-no-macro-recorder-in-ui.diff b/patches/dev300/starmath-no-macro-recorder-in-ui.diff
deleted file mode 100644
index cf82feb..0000000
--- a/patches/dev300/starmath-no-macro-recorder-in-ui.diff
+++ /dev/null
@@ -1,19 +0,0 @@
----
- starmath/uiconfig/smath/menubar/menubar.xml |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git starmath/uiconfig/smath/menubar/menubar.xml starmath/uiconfig/smath/menubar/menubar.xml
-index dc3af92..353161f 100644
---- starmath/uiconfig/smath/menubar/menubar.xml
-+++ starmath/uiconfig/smath/menubar/menubar.xml
-@@ -87,7 +87,6 @@
-       <menu:menuseparator/>
-       <menu:menu menu:id=".uno:MacrosMenu">
-         <menu:menupopup>
--          <menu:menuitem menu:id=".uno:MacroRecorder"/>
-           <menu:menuitem menu:id=".uno:RunMacro"/>
-           <menu:menu menu:id=".uno:ScriptOrganizer"/>
-           <menu:menuseparator/>
--- 
-1.7.0.1
-
diff --git a/patches/dev300/sw-no-macro-recorder-in-ui.diff b/patches/dev300/sw-no-macro-recorder-in-ui.diff
deleted file mode 100644
index 45c90a2..0000000
--- a/patches/dev300/sw-no-macro-recorder-in-ui.diff
+++ /dev/null
@@ -1,84 +0,0 @@
----
- sw/uiconfig/sglobal/menubar/menubar.xml  |    1 -
- sw/uiconfig/sweb/menubar/menubar.xml     |    1 -
- sw/uiconfig/swform/menubar/menubar.xml   |    1 -
- sw/uiconfig/swreport/menubar/menubar.xml |    1 -
- sw/uiconfig/swriter/menubar/menubar.xml  |    1 -
- sw/uiconfig/swxform/menubar/menubar.xml  |    1 -
- 6 files changed, 0 insertions(+), 6 deletions(-)
-
-diff --git sw/uiconfig/sglobal/menubar/menubar.xml sw/uiconfig/sglobal/menubar/menubar.xml
-index 8945195..a776183 100644
---- sw/uiconfig/sglobal/menubar/menubar.xml
-+++ sw/uiconfig/sglobal/menubar/menubar.xml
-@@ -425,7 +425,6 @@
-       <menu:menuseparator/>
-       <menu:menu menu:id=".uno:MacrosMenu">
-         <menu:menupopup>
--          <menu:menuitem menu:id=".uno:MacroRecorder"/>
-           <menu:menuitem menu:id=".uno:RunMacro"/>
-           <menu:menu menu:id=".uno:ScriptOrganizer"/>
-           <menu:menuitem menu:id=".uno:MacroSignature"/>
-diff --git sw/uiconfig/sweb/menubar/menubar.xml sw/uiconfig/sweb/menubar/menubar.xml
-index a99cdee..a8f48ad 100644
---- sw/uiconfig/sweb/menubar/menubar.xml
-+++ sw/uiconfig/sweb/menubar/menubar.xml
-@@ -355,7 +355,6 @@
-       <menu:menuseparator/>
-       <menu:menu menu:id=".uno:MacrosMenu">
-         <menu:menupopup>
--          <menu:menuitem menu:id=".uno:MacroRecorder"/>
-           <menu:menuitem menu:id=".uno:RunMacro"/>
-           <menu:menu menu:id=".uno:ScriptOrganizer"/>
-           <menu:menuseparator/>
-diff --git sw/uiconfig/swform/menubar/menubar.xml sw/uiconfig/swform/menubar/menubar.xml
-index 69b65cf..cc81d76 100644
---- sw/uiconfig/swform/menubar/menubar.xml
-+++ sw/uiconfig/swform/menubar/menubar.xml
-@@ -421,7 +421,6 @@
-       <menu:menuseparator/>
-       <menu:menu menu:id=".uno:MacrosMenu">
-         <menu:menupopup>
--          <menu:menuitem menu:id=".uno:MacroRecorder"/>
-           <menu:menuitem menu:id=".uno:RunMacro"/>
-           <menu:menu menu:id=".uno:ScriptOrganizer"/>
-           <menu:menuseparator/>
-diff --git sw/uiconfig/swreport/menubar/menubar.xml sw/uiconfig/swreport/menubar/menubar.xml
-index 69b65cf..cc81d76 100644
---- sw/uiconfig/swreport/menubar/menubar.xml
-+++ sw/uiconfig/swreport/menubar/menubar.xml
-@@ -421,7 +421,6 @@
-       <menu:menuseparator/>
-       <menu:menu menu:id=".uno:MacrosMenu">
-         <menu:menupopup>
--          <menu:menuitem menu:id=".uno:MacroRecorder"/>
-           <menu:menuitem menu:id=".uno:RunMacro"/>
-           <menu:menu menu:id=".uno:ScriptOrganizer"/>
-           <menu:menuseparator/>
-diff --git sw/uiconfig/swriter/menubar/menubar.xml sw/uiconfig/swriter/menubar/menubar.xml
-index 98eeddd..0454aa7 100644
---- sw/uiconfig/swriter/menubar/menubar.xml
-+++ sw/uiconfig/swriter/menubar/menubar.xml
-@@ -428,7 +428,6 @@
-       <menu:menuseparator/>
-       <menu:menu menu:id=".uno:MacrosMenu">
-         <menu:menupopup>
--          <menu:menuitem menu:id=".uno:MacroRecorder"/>
-           <menu:menuitem menu:id=".uno:RunMacro"/>
-           <menu:menu menu:id=".uno:ScriptOrganizer"/>
-           <menu:menuitem menu:id=".uno:MacroSignature"/>
-diff --git sw/uiconfig/swxform/menubar/menubar.xml sw/uiconfig/swxform/menubar/menubar.xml
-index ae0df22..62ec3a8 100644
---- sw/uiconfig/swxform/menubar/menubar.xml
-+++ sw/uiconfig/swxform/menubar/menubar.xml
-@@ -422,7 +422,6 @@
-       <menu:menuseparator/>
-       <menu:menu menu:id=".uno:MacrosMenu">
-         <menu:menupopup>
--          <menu:menuitem menu:id=".uno:MacroRecorder"/>
-           <menu:menuitem menu:id=".uno:RunMacro"/>
-           <menu:menu menu:id=".uno:ScriptOrganizer"/>
-           <menu:menuitem menu:id=".uno:MacroSignature"/>
--- 
-1.7.0.1
-


More information about the Libreoffice-commits mailing list