diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 13:04:55 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 13:04:55 +0000 |
| commit | 03f40af7a5ea589b1a6323982acb496dec457ac5 (patch) | |
| tree | d939af89b0cbcfe8c5843f445adf65a9397ccbbb /desktop/source/deployment | |
| parent | 8c98a4b8f9b033663420b3f63f06e2a8ab308a30 (diff) | |
INTEGRATION: CWS jl13 (1.4.10); FILE MERGED
2004/10/09 00:12:50 dbo 1.4.10.3: #i35194# handling invalid manifest entries, resource mgr shutdown crash
Issue number:
Submitted by:
Reviewed by:
2004/09/29 16:16:25 dbo 1.4.10.2: #i34555##i34409# GUI filter list, legacy bundles error warnings
2004/09/23 16:40:12 dbo 1.4.10.1: #i34409# + misc fixes
Diffstat (limited to 'desktop/source/deployment')
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui.h | 41 |
1 files changed, 23 insertions, 18 deletions
diff --git a/desktop/source/deployment/gui/dp_gui.h b/desktop/source/deployment/gui/dp_gui.h index f2b47f7ce860..715af2d677ba 100644 --- a/desktop/source/deployment/gui/dp_gui.h +++ b/desktop/source/deployment/gui/dp_gui.h @@ -2,9 +2,9 @@ * * $RCSfile: dp_gui.h,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: obo $ $Date: 2004-08-12 12:04:11 $ + * last change: $Author: hr $ $Date: 2004-11-09 14:04:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -86,14 +86,14 @@ namespace css = ::com::sun::star; -namespace dp_gui -{ +namespace dp_gui { enum PackageState { REGISTERED, NOT_REGISTERED, AMBIGUOUS, NOT_AVAILABLE }; -//------------------------------------------------------------------------------ PackageState getPackageState( - css::uno::Reference<css::deployment::XPackage> const & xPackage ); + css::uno::Reference<css::deployment::XPackage> const & xPackage, + css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv = + css::uno::Reference<css::ucb::XCommandEnvironment>() ); //============================================================================== struct DialogImpl : @@ -116,10 +116,12 @@ struct DialogImpl : css::uno::Reference<css::deployment::XPackageManager> const & xPackageManager, css::uno::Reference<css::deployment::XPackage> const & xPackage, + css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv, bool sortIn = true ); SvLBoxEntry * addPackageNode( SvLBoxEntry * parentNode, - css::uno::Reference<css::deployment::XPackage> const & xPackage ); + css::uno::Reference<css::deployment::XPackage> const & xPackage, + css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv); DialogImpl * m_dialog; SvLBoxEntry * m_currentEntry; @@ -201,9 +203,12 @@ struct DialogImpl : void clickExport( USHORT id ); bool m_allowSharedLayerModification; - void updateButtonStates(); + void updateButtonStates( + css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv = + com::sun::star::uno::Reference< + com::sun::star::ucb::XCommandEnvironment>() ); - void errbox( css::uno::Any const & exc ); + void errbox( ::rtl::OUString const & msg ); css::uno::Reference<css::uno::XComponentContext> m_xComponentContext; css::uno::Reference<css::deployment::XPackageManagerFactory> m_xPkgMgrFac; @@ -218,14 +223,14 @@ struct DialogImpl : long m_ftFontHeight; long m_descriptionYSpace; - String m_strAddPackages; - String m_strAddingPackages; - String m_strRemovingPackages; - String m_strEnablingPackages; - String m_strDisablingPackages; - String m_strExportPackage; - String m_strExportPackages; - String m_strExportingPackages; + const String m_strAddPackages; + const String m_strAddingPackages; + const String m_strRemovingPackages; + const String m_strEnablingPackages; + const String m_strDisablingPackages; + const String m_strExportPackage; + const String m_strExportPackages; + const String m_strExportingPackages; // controls: ::std::auto_ptr<FixedText> m_ftPackages; @@ -267,6 +272,6 @@ struct DialogImpl : css::lang::EventObject const & evt ) throw (css::uno::RuntimeException); }; -} +} // namespace dp_gui #endif |