Kaydet (Commit) e378fd12 authored tarafından Kurt Zenker's avatar Kurt Zenker

INTEGRATION: CWS extmgrui01 (1.6.24); FILE MERGED

2008/04/28 10:58:15 dv 1.6.24.4: RESYNC: (1.7-1.8); FILE MERGED
2008/03/25 12:44:44 dv 1.6.24.3: quick fix of merge problem
2008/03/25 08:06:26 dv 1.6.24.2: RESYNC: (1.6-1.7); FILE MERGED
2008/02/28 15:16:51 dv 1.6.24.1: #i83902# Added support for updating a single extension via context menu
üst ea9c54df
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: dp_gui_updatedialog.hxx,v $ * $RCSfile: dp_gui_updatedialog.hxx,v $
* $Revision: 1.8 $ * $Revision: 1.9 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
...@@ -65,7 +65,7 @@ namespace com { namespace sun { namespace star { ...@@ -65,7 +65,7 @@ namespace com { namespace sun { namespace star {
namespace uno { class XComponentContext; } namespace uno { class XComponentContext; }
} } } } } }
namespace dp_gui { namespace dp_gui {
class SelectedPackageIterator; class SelectedPackage;
struct UpdateData; struct UpdateData;
} }
...@@ -100,9 +100,7 @@ public: ...@@ -100,9 +100,7 @@ public:
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
const & context, const & context,
Window * parent, Window * parent,
rtl::Reference<DialogImpl> const & extensionManagerDialog, rtl::Reference< dp_gui::SelectedPackage > const & selectedPackage,
rtl::Reference< dp_gui::SelectedPackageIterator > const &
selectedPackages,
com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::uno::Sequence< com::sun::star::uno::Reference<
com::sun::star::deployment::XPackageManager > > const & com::sun::star::deployment::XPackageManager > > const &
packageManagers, packageManagers,
...@@ -232,9 +230,10 @@ private: ...@@ -232,9 +230,10 @@ private:
Size m_aFirstLineSize; Size m_aFirstLineSize;
long m_nFirstLineDelta; long m_nFirstLineDelta;
long m_nOneLineMissing; long m_nOneLineMissing;
// TODO: check
// The dialog only knows if we already showed the warning about // The dialog only knows if we already showed the warning about
//updating a shared extension during this session. // updating a shared extension during this session.
const ::rtl::Reference<DialogImpl> m_extensionManagerDialog; // const ::rtl::Reference<DialogImpl> m_extensionManagerDialog;
}; };
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment