diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-03-07 10:04:07 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-03-07 10:04:07 +0000 |
| commit | 6109d6c6268faee5f32ee1ff8dcddc5eae19e606 (patch) | |
| tree | f57b9cec9ca332c9e89529c3a49b614850599b4a /desktop | |
| parent | 81fe180caedcc77792116aff58a2ad99d91ee59e (diff) | |
INTEGRATION: CWS jl91_DEV300 (1.6.82); FILE MERGED
2008/02/28 14:51:10 jl 1.6.82.4: #86468# build problem on unix
2008/02/28 11:48:46 jl 1.6.82.3: #i86189# extension update dialog does not show publisher name for a disabled update
2008/02/27 08:07:39 jl 1.6.82.2: #i85373# added string Version after the name of the extension in the update dialog
2008/02/26 14:52:03 jl 1.6.82.1: #i80423# warning box for modifying shared extensions will ony be shown once
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_updatedialog.hxx | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx index 0275dfee8cde..8e61c706ee1e 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx @@ -4,9 +4,9 @@ * * $RCSfile: dp_gui_updatedialog.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: ihi $ $Date: 2007-11-22 15:25:55 $ + * last change: $Author: kz $ $Date: 2008-03-07 11:04:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -101,6 +101,8 @@ namespace dp_gui { namespace dp_gui { + struct DialogImpl; + /** The modal “Check for Updates” dialog. */ @@ -128,6 +130,7 @@ public: com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const & context, Window * parent, + rtl::Reference<DialogImpl> const & extensionManagerDialog, rtl::Reference< dp_gui::SelectedPackageIterator > const & selectedPackages, com::sun::star::uno::Sequence< com::sun::star::uno::Reference< @@ -209,7 +212,8 @@ private: void initDescription(); void clearDescription(); - bool showDescription( const dp_gui::UpdateData& rData ); + bool showDescription( ::com::sun::star::uno::Reference< + ::com::sun::star::xml::dom::XNode > const & aUpdateInfo); bool showDescription( const String& rDescription, bool bWithPublisher ); DECL_LINK(selectionHandler, void *); @@ -246,6 +250,7 @@ private: rtl::OUString m_noPermission; rtl::OUString m_noPermissionVista; rtl::OUString m_browserbased; + rtl::OUString m_version; std::vector< dp_gui::UpdateData > m_enabledUpdates; std::vector< UpdateDialog::DisabledUpdate > m_disabledUpdates; std::vector< rtl::OUString > m_generalErrors; @@ -257,6 +262,9 @@ private: Size m_aFirstLineSize; long m_nFirstLineDelta; long m_nOneLineMissing; + // The dialog only knows if we already showed the warning about + //updating a shared extension during this session. + const ::rtl::Reference<DialogImpl> m_extensionManagerDialog; }; } |