[Libreoffice-commits] .: 2 commits - dbaccess/source
Noel Power
noelp at kemper.freedesktop.org
Wed Oct 13 07:21:47 PDT 2010
dbaccess/source/ext/macromigration/migrationengine.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 596b945afcdb38a3c2481595d6e08cd7a541fc23
Merge: 2d66bde... b453af9...
Author: Noel Power <noel.power at novell.com>
Date: Wed Oct 13 15:16:17 2010 +0100
Merge branch 'master' of ssh://noelp@git.freedesktop.org/git/libreoffice/base
commit 2d66bdeb628aeed96070bb6d61c62cac2951cd41
Author: Noel Power <noel.power at novell.com>
Date: Wed Oct 6 10:03:48 2010 +0100
initial apply of vba patches ( no container controls, no operator precedence )
diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx b/dbaccess/source/ext/macromigration/migrationengine.cxx
index a66c39f..c354335 100644
--- a/dbaccess/source/ext/macromigration/migrationengine.cxx
+++ b/dbaccess/source/ext/macromigration/migrationengine.cxx
@@ -1836,7 +1836,7 @@ namespace dbmm
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 );
@@ -1851,7 +1851,7 @@ namespace dbmm
}
// 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& )
More information about the Libreoffice-commits
mailing list