[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                          |    5 +++++
 patches/dev300/import-export-dialogmodel.diff |   20 ++++++++++++++++++++
 2 files changed, 25 insertions(+)

New commits:
commit b3260adf127f33ad8ef84c7f6f92a737a43adc51
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Sep 4 11:26:45 2009 +0300

    Fixify calls of import/exportDialogModel
    
    * patches/dev300/import-export-dialogmodel.diff: New patch. Add new
      parameter to calls of ::xmlscript::importDialogModel and
      ::xmlscript::exportDialogModel in
      dbaccess/source/ext/macromigration/migrationengine.cxx.
    
    * patches/dev300/apply: Add it to Fixes.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index d3d23d5..a5aa33a 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3253,6 +3253,11 @@ link-with-uno-cppu.diff, tml
 # is found.
 link-with-comphelper.diff, tml
 
+# Needed for some reason, although I don't see that the change in API
+# of the ::xmlscript::importDialogModel and exportDialogModel methods
+# would be caused by our patches?
+import-export-dialogmodel.diff, tml
+
 [ OOXML ]
 oox-pptx-import-fix-placeholder-text-style.diff, n#479834, rodo
 
diff --git a/patches/dev300/import-export-dialogmodel.diff b/patches/dev300/import-export-dialogmodel.diff
new file mode 100644
index 0000000..b8cd09e
--- /dev/null
+++ b/patches/dev300/import-export-dialogmodel.diff
@@ -0,0 +1,20 @@
+--- dbaccess/source/ext/macromigration/migrationengine.cxx
++++ dbaccess/source/ext/macromigration/migrationengine.cxx
+@@ -1838,7 +1838,7 @@
+             Reference< XInputStream > xInput( xISP->createInputStream(), UNO_QUERY_THROW );
+ 
+             Reference< XNameContainer > xDialogModel( m_aContext.createComponent( "com.sun.star.awt.UnoControlDialogModel" ), UNO_QUERY_THROW );
+-            ::xmlscript::importDialogModel( xInput, xDialogModel, m_aContext.getUNOContext() );
++            ::xmlscript::importDialogModel( xInput, xDialogModel, m_aContext.getUNOContext(), m_xDocumentModel );
+ 
+             // adjust the events of the dialog
+             impl_adjustDialogElementEvents_throw( xDialogModel );
+@@ -1853,7 +1853,7 @@
+             }
+ 
+             // export dialog model
+-            xISP = ::xmlscript::exportDialogModel( xDialogModel, m_aContext.getUNOContext() );
++            xISP = ::xmlscript::exportDialogModel( xDialogModel, m_aContext.getUNOContext(), m_xDocumentModel );
+             _inout_rDialogLibraryElement <<= xISP;
+         }
+         catch( const Exception& )