diff options
| author | Noel Power <noel.power@novell.com> | 2010-10-13 10:17:11 +0100 |
|---|---|---|
| committer | Noel Power <noel.power@novell.com> | 2010-10-13 10:17:11 +0100 |
| commit | 5a9064d007fb1268ef72073466c554f43f0b8439 (patch) | |
| tree | bbc57d9f7210e36f48d2b32ea6cd3c62a38af529 /basctl/source/basicide/moduldlg.cxx | |
| parent | 762dbbb4b11279cf087cc52c0dd4c3d38f3ca220 (diff) | |
| parent | e31e563d728078ea564a3d398b74d3467e0ba56a (diff) | |
Merge branch 'vba' fix conflics ( below ), trailing ws and leading tabs
Conflicts:
forms/source/component/RadioButton.cxx
forms/source/inc/property.hrc
Diffstat (limited to 'basctl/source/basicide/moduldlg.cxx')
| -rw-r--r-- | basctl/source/basicide/moduldlg.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx index 02e6a4940dd8..325befcde8e4 100644 --- a/basctl/source/basicide/moduldlg.cxx +++ b/basctl/source/basicide/moduldlg.cxx @@ -308,7 +308,7 @@ void BasicIDEShell::CopyDialogResources( Reference< io::XInputStreamProvider >& Reference< beans::XPropertySet > xProps( xMSF, UNO_QUERY ); OSL_ASSERT( xProps.is() ); OSL_VERIFY( xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext ); - ::xmlscript::importDialogModel( xInput, xDialogModel, xContext ); + ::xmlscript::importDialogModel( xInput, xDialogModel, xContext, rSourceDoc.isDocument() ? rSourceDoc.getDocument() : Reference< frame::XModel >() ); if( xDialogModel.is() ) { @@ -325,7 +325,7 @@ void BasicIDEShell::CopyDialogResources( Reference< io::XInputStreamProvider >& { LocalizationMgr::setResourceIDsForDialog( xDialogModel, xDestMgr ); } - io_xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext ); + io_xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, rDestDoc.isDocument() ? rDestDoc.getDocument() : Reference< frame::XModel >() ); } } |