diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-01-21 16:10:37 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-01-21 16:10:37 +0000 |
| commit | 223ebed808d7baba7c1c02bb18605aafb196fa1b (patch) | |
| tree | 50dcddd403e30f7ae14ab05064d355849d30d64f /desktop/source | |
| parent | ed5d445699c9ee1d1339b20dba686025b6461ee5 (diff) | |
INTEGRATION: CWS impress23 (1.5.16); FILE MERGED
2004/12/30 09:31:30 dbo 1.5.16.2: #i38957# using Any templated ctor instead of makeAny(): testing compilers
2004/12/29 14:39:34 dbo 1.5.16.1: #i38957# removed extract_throw<>(), using Any::get<>() now
Diffstat (limited to 'desktop/source')
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_dialog.cxx | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_dialog.cxx b/desktop/source/deployment/gui/dp_gui_dialog.cxx index 76e28bddc322..7fd55a0cf827 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dp_gui_dialog.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: rt $ $Date: 2004-12-07 10:51:27 $ + * last change: $Author: kz $ $Date: 2005-01-21 17:10:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -567,10 +567,9 @@ void DialogImpl::clickAdd( USHORT ) m_xPkgMgrFac->getPackageManager( context ) ); OSL_ASSERT( xPackageManager.is() ); - Any mode( - makeAny( static_cast<sal_Int16>( - ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE ) ) ); - Reference<ui::dialogs::XFilePicker> xFilePicker( + const Any mode( static_cast<sal_Int16>( + ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE ) ); + const Reference<ui::dialogs::XFilePicker> xFilePicker( m_xComponentContext->getServiceManager() ->createInstanceWithArgumentsAndContext( OUSTR("com.sun.star.ui.dialogs.FilePicker"), @@ -643,9 +642,8 @@ void DialogImpl::clickAdd( USHORT ) else file = files[ pos ]; currentCmdEnv->progressSection( - extract_throw<OUString>( - ::ucb::Content( file, currentCmdEnv.get() ).getPropertyValue( - OUSTR("Title") ) ), xAbortChannel ); + ::ucb::Content( file, currentCmdEnv.get() ).getPropertyValue( + OUSTR("Title") ).get<OUString>(), xAbortChannel ); try { Reference<deployment::XPackage> xPackage( xPackageManager->addPackage( @@ -763,11 +761,9 @@ void DialogImpl::clickExport( USHORT ) } else // single item selected { - Any mode( - makeAny( - static_cast<sal_Int16>( - ui::dialogs::TemplateDescription::FILESAVE_SIMPLE ) ) ); - Reference<ui::dialogs::XFilePicker> xFilePicker( + const Any mode( static_cast<sal_Int16>( + ui::dialogs::TemplateDescription::FILESAVE_SIMPLE ) ); + const Reference<ui::dialogs::XFilePicker> xFilePicker( m_xComponentContext->getServiceManager() ->createInstanceWithArgumentsAndContext( OUSTR("com.sun.star.ui.dialogs.FilePicker"), @@ -808,8 +804,7 @@ void DialogImpl::clickExport( USHORT ) // set default selection: ::ucb::Content sourceContent( xPackage->getURL(), currentCmdEnv.get() ); xFilePicker->setDefaultName( - extract_throw<OUString>( sourceContent.getPropertyValue( - OUSTR("Title") ) ) ); + sourceContent.getPropertyValue( OUSTR("Title") ).get<OUString>() ); if (xFilePicker->execute() != ui::dialogs::ExecutableDialogResults::OK) return; // cancelled @@ -924,9 +919,8 @@ struct DeploymentGuiResMgr : struct BrandName : public rtl::StaticWithInit<const OUString, BrandName> { const OUString operator () () { - return extract_throw<OUString>( - ::utl::ConfigManager::GetDirectConfigProperty( - ::utl::ConfigManager::PRODUCTNAME ) ); + return ::utl::ConfigManager::GetDirectConfigProperty( + ::utl::ConfigManager::PRODUCTNAME ).get<OUString>(); } }; } // anon namespace |