[Libreoffice-commits] .: 2 commits - officecfg/registry xmlscript/source

[Noel Power]

 officecfg/registry/data/org/openoffice/Setup.xcu |    4 ++--
 xmlscript/source/xmldlg_imexp/xmldlg_import.cxx  |    5 -----
 2 files changed, 2 insertions(+), 7 deletions(-)

New commits:
commit 8bc9166f28712e799766cb25989ba1a3f6da2312
Author: Noel Power <noel.power at novell.com>
Date:   Fri Oct 15 13:00:04 2010 +0100

    fix fdo#30856 remove VBAForm property and associated geometry hack

diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
index 8488851..81ba97c 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
@@ -1922,11 +1922,6 @@ Reference< xml::sax::XDocumentHandler > SAL_CALL importDialogModel(
     SAL_THROW( (Exception) )
 {
     DialogImport* pImport = new DialogImport( xContext, xDialogModel, xDocument );
-    uno::Reference< script::vba::XVBACompatibility > xVBAModeSource( pImport->getScriptLibraryContainer(), uno::UNO_QUERY );
-
-    uno::Reference< beans::XPropertySet > xDlgProps( xDialogModel, uno::UNO_QUERY );
-    if ( xVBAModeSource.is() && xDlgProps.is() && xVBAModeSource->getVBACompatibilityMode() )
-        xDlgProps->setPropertyValue( OUSTR("VBAForm"), uno::makeAny( sal_True ) );
     return ::xmlscript::createDocumentHandler(
         static_cast< xml::input::XRoot * >( pImport ) );
 }
commit 0a4cd1834a3b5e229d6d05217db0c3b10f43ee3c
Author: Noel Power <noel.power at novell.com>
Date:   Wed Oct 13 21:51:52 2010 +0100

    migrate OOo 3.x data

diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu b/officecfg/registry/data/org/openoffice/Setup.xcu
index 8e18ca5..149971a 100644
--- a/officecfg/registry/data/org/openoffice/Setup.xcu
+++ b/officecfg/registry/data/org/openoffice/Setup.xcu
@@ -783,12 +783,12 @@
     </node>
   <node oor:name="Migration">
     <node oor:name="SupportedVersions">
-      <node oor:name="OpenOffice.org2+StarOffice8+StarSuite8" oor:op="replace">
+      <node oor:name="OpenOffice.org3+OpenOffice.org2+StarOffice8+StarSuite8" oor:op="replace">
         <prop oor:name="Priority">
           <value>10</value>
         </prop>
         <prop oor:name="VersionIdentifiers">
-          <value oor:separator=",">OpenOffice.org 2=openoffice.org2,StarOffice 8=staroffice8,StarSuite 8=starsuite8</value>
+          <value oor:separator=",">Openofice.org 3=openoffice.org/3,OpenOffice.org 2=openoffice.org2,StarOffice 8=staroffice8,StarSuite 8=starsuite8</value>
         </prop>
         <node oor:name="MigrationSteps">
           <node oor:name="Datasources" oor:op="replace">