From 7642124388aed86c54d202cfcd105a89be234bcc Mon Sep 17 00:00:00 2001 From: Thomas Benisch Date: Tue, 3 Jul 2001 15:33:31 +0000 Subject: [PATCH] #88677# GPF when calling Tools/Macro... --- basctl/source/basicide/baside2.cxx | 32 ++++++++++++++--------------- basctl/source/basicide/makefile.mk | 5 +++-- basctl/source/basicide/moduldl2.cxx | 18 ++++++++-------- 3 files changed, 28 insertions(+), 27 deletions(-) diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index 04c8e09fbe34..494c111e7ad7 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: baside2.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: tbe $ $Date: 2001-06-28 15:26:41 $ + * last change: $Author: tbe $ $Date: 2001-07-03 16:33:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,17 +75,17 @@ #ifndef _COMPHELPER_PROCESSFACTORY_HXX_ #include #endif -#ifndef _COM_SUN_STAR_UI_XFILTERMANAGER_HPP_ -#include +#ifndef _COM_SUN_STAR_UI_DIALOGS_XFILTERMANAGER_HPP_ +#include #endif -#ifndef _COM_SUN_STAR_UI_XFILEPICKER_HPP_ -#include +#ifndef _COM_SUN_STAR_UI_DIALOGS_XFILEPICKER_HPP_ +#include #endif -#ifndef _COM_SUN_STAR_UI_FILEPICKERELEMENTID_HPP_ -#include +#ifndef _COM_SUN_STAR_UI_DIALOGS_EXTENDEDFILEPICKERELEMENTIDS_HPP_ +#include #endif -#ifndef _COM_SUN_STAR_UI_XFILEPICKERCONTROLACCESS_HPP_ -#include +#ifndef _COM_SUN_STAR_UI_DIALOGS_XFILEPICKERCONTROLACCESS_HPP_ +#include #endif #ifndef _SFXDOCFILE_HXX //autogen @@ -142,7 +142,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::ui; +using namespace ::com::sun::star::ui::dialogs; using namespace utl; using namespace comphelper; @@ -471,7 +471,7 @@ BOOL ModulWindow::LoadBasic() Sequence aProps(1); aProps.getArray()[0] <<= ::rtl::OUString::createFromAscii("FileOpen"); xFP = Reference< XFilePicker >( xMSF->createInstanceWithArguments( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.FilePicker" ) ), aProps ), UNO_QUERY ); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FilePicker" ) ), aProps ), UNO_QUERY ); } if ( aCurPath.Len() ) @@ -486,7 +486,7 @@ BOOL ModulWindow::LoadBasic() if( xFP->execute() == RET_OK ) { - Sequence< ::rtl::OUString > aPaths = xFP->getPath(); + Sequence< ::rtl::OUString > aPaths = xFP->getFiles(); aCurPath = aPaths[0]; SfxMedium aMedium( aCurPath, STREAM_READ | STREAM_SHARE_DENYWRITE | STREAM_NOCREATE, TRUE ); SvStream* pStream = aMedium.GetInStream(); @@ -527,11 +527,11 @@ BOOL ModulWindow::SaveBasicSource() Sequence aProps(1); aProps.getArray()[0] <<= ::rtl::OUString::createFromAscii("FileSave_AutoextPwdBox"); xFP = Reference< XFilePicker >( xMSF->createInstanceWithArguments( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.FilePicker" ) ), aProps ), UNO_QUERY ); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FilePicker" ) ), aProps ), UNO_QUERY ); } Reference< XFilePickerControlAccess > xFPControl(xFP, UNO_QUERY); - xFPControl->enableControl(FilePickerElementID::CBX_PASSWORD, sal_False); + xFPControl->enableControl(ExtendedFilePickerElementIds::CHECKBOX_PASSWORD, sal_False); if ( aCurPath.Len() ) xFP->setDisplayDirectory ( aCurPath ); @@ -545,7 +545,7 @@ BOOL ModulWindow::SaveBasicSource() if( xFP->execute() == RET_OK ) { - Sequence< ::rtl::OUString > aPaths = xFP->getPath(); + Sequence< ::rtl::OUString > aPaths = xFP->getFiles(); aCurPath = aPaths[0]; SfxMedium aMedium( aCurPath, STREAM_WRITE | STREAM_SHARE_DENYWRITE | STREAM_TRUNC, TRUE, FALSE ); SvStream* pStream = aMedium.GetOutStream(); diff --git a/basctl/source/basicide/makefile.mk b/basctl/source/basicide/makefile.mk index 2326d282724d..d1c20f0586cf 100644 --- a/basctl/source/basicide/makefile.mk +++ b/basctl/source/basicide/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.7 $ +# $Revision: 1.8 $ # -# last change: $Author: tbe $ $Date: 2001-06-28 15:26:41 $ +# last change: $Author: tbe $ $Date: 2001-07-03 16:33:31 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -115,6 +115,7 @@ EXCEPTIONSFILES=$(SLO)$/basidesh.obj \ $(SLO)$/basides1.obj \ $(SLO)$/basides2.obj \ $(SLO)$/basides3.obj \ + $(SLO)$/baside2.obj \ $(SLO)$/baside3.obj \ $(SLO)$/basobj2.obj \ $(SLO)$/basobj3.obj \ diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index 38fd970ba73b..6c69eae5350a 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: moduldl2.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: tbe $ $Date: 2001-06-28 15:26:41 $ + * last change: $Author: tbe $ $Date: 2001-07-03 16:33:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -91,11 +91,11 @@ #include #endif -#ifndef _COM_SUN_STAR_UI_XFILTERMANAGER_HPP_ -#include +#ifndef _COM_SUN_STAR_UI_DIALOGS_XFILTERMANAGER_HPP_ +#include #endif -#ifndef _COM_SUN_STAR_UI_XFILEPICKER_HPP_ -#include +#ifndef _COM_SUN_STAR_UI_DIALOGS_XFILEPICKER_HPP_ +#include #endif #ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX @@ -113,7 +113,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::ucb; -using namespace ::com::sun::star::ui; +using namespace ::com::sun::star::ui::dialogs; LibPage::LibPage( Window * pParent ) : @@ -491,7 +491,7 @@ void LibPage::InsertLib() Sequence aProps(1); aProps.getArray()[0] <<= ::rtl::OUString::createFromAscii("FileOpen"); xFP = Reference< XFilePicker >( xMSF->createInstanceWithArguments( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.FilePicker" ) ), aProps ), UNO_QUERY ); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FilePicker" ) ), aProps ), UNO_QUERY ); } xFP->setTitle( String( IDEResId( RID_STR_APPENDLIBS ) ) ); @@ -519,7 +519,7 @@ void LibPage::InsertLib() if( xFP->execute() == RET_OK ) { - Sequence< ::rtl::OUString > aPaths = xFP->getPath(); + Sequence< ::rtl::OUString > aPaths = xFP->getFiles(); aPath = aPaths[0]; IDE_DLL()->GetExtraData()->SetAddLibPath( aPath ); IDE_DLL()->GetExtraData()->SetAddLibFilter( xFltMgr->getCurrentFilter() );