ooo-build r12727 - in trunk: . patches/dev300 patches/vba

[noelpwer svn gnome org]

Author: noelpwer
Date: Fri May 30 14:00:33 2008
New Revision: 12727
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12727&view=rev

Log:
2008-05-30  Noel Power <noel power novell com>

        * patches/vba/vba-dialogs-fixsmoketest.diff:
        * patches/dev300/apply:
        * patches/dev300/vba-default-enable-calcmacros.diff: switch on vba
        import by default


Added:
   trunk/patches/dev300/vba-default-enable-calcmacros.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/vba/vba-dialogs-fixsmoketest.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri May 30 14:00:33 2008
@@ -344,6 +344,8 @@
 pdfimport-no-license.diff
 presenterscreen-no-license.diff
 
+# ensure macros are imported ( not as comments ) for calc
+vba-default-enable-calcmacros.diff
 [ swextFixes ]
 wiki-publisher-no-license.diff
 

Added: trunk/patches/dev300/vba-default-enable-calcmacros.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/vba-default-enable-calcmacros.diff	Fri May 30 14:00:33 2008
@@ -0,0 +1,11 @@
+--- officecfg/registry/schema/org/openoffice/Office/Calc.xcs	2008-05-29 23:19:11.000000000 +0100
++++ officecfg/registry/schema/org/openoffice/Office/Calc.xcs	2008-05-30 15:24:26.000000000 +0100
+@@ -1313,7 +1313,7 @@
+               <desc>Indicates whether VBA macros are imported without comments to be executable.</desc>
+               <label>Executable code</label>
+             </info>
+-            <value>false</value>
++            <value>true</value>
+           </prop>
+           <prop oor:name="Save" oor:type="xs:boolean">
+ 						<!-- OldPath: Filter/MS_Office/Basic/Excel -->

Modified: trunk/patches/vba/vba-dialogs-fixsmoketest.diff
==============================================================================
--- trunk/patches/vba/vba-dialogs-fixsmoketest.diff	(original)
+++ trunk/patches/vba/vba-dialogs-fixsmoketest.diff	Fri May 30 14:00:33 2008
@@ -2,7 +2,7 @@
 index 81d7cd0..45f53ac 100644
 --- xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
 +++ xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
-@@ -1452,7 +1452,18 @@ void ImportContext::importEvents(
+@@ -1452,7 +1452,19 @@ void ImportContext::importEvents(
                              descr.ScriptCode = buf.makeStringAndClear();
                          }
                      }
@@ -17,6 +17,7 @@
 +                            ::rtl::OUStringBuffer buf;
 +                            buf.append( OUString( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.script:" ) ) );
 +                            buf.append( descr.ScriptCode );
++                            descr.ScriptCode = buf.makeStringAndClear();
 +                        }
 +                    }