strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS residcleanup (1.4.22); FILE MERGED

Browse source 
2007/03/28 15:00:51 pl 1.4.22.3: #i74635# try to fix build problem on MacOSX
2007/03/20 15:18:16 pl 1.4.22.2: RESYNC: (1.4-1.5); FILE MERGED
2007/02/24 19:59:50 pl 1.4.22.1: #i74635# residcleanup
This commit is contained in:
Rüdiger Timm 2007-04-26 07:23:53 +00:00
parent 409289d3e6
commit 0ca3d76a4e
1 changed files with 27 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
desktop/source/deployment/gui/dp_gui_updatedialog.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: dp_gui_updatedialog.cxx,v $
*
* $Revision: 1.5 $
* $Revision: 1.6 $
*
* last change: $Author: obo $ $Date: 2007-03-14 08:32:22 $
* last change: $Author: rt $ $Date: 2007-04-26 08:23:53 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -111,6 +111,7 @@
#include "dp_gui_thread.hxx"
#include "dp_gui_updatedata.hxx"
#include "dp_gui_updatedialog.hxx"
#include "dp_gui_shared.hxx"
class KeyEvent;
class MouseEvent;
@ -123,8 +124,6 @@ using dp_gui::UpdateDialog;
namespace {
namespace css = com::sun::star;
static sal_Unicode const LF = 0x000A;
static sal_Unicode const CR = 0x000D;
@ -581,35 +580,31 @@ UpdateDialog::UpdateDialog(
css::uno::Sequence< css::uno::Reference<
css::deployment::XPackageManager > > const & packageManagers,
std::vector< dp_gui::UpdateData > * updateData):
ModalDialog(
parent,
ResId(
RID_DLG_UPDATE,
ResMgr::CreateResMgr("deploymentgui" LIBRARY_SOLARUPD()))),
ModalDialog(parent,DpGuiResId(RID_DLG_UPDATE)),
m_context(context),
m_checking(this, ResId(RID_DLG_UPDATE_CHECKING)),
m_update(this, ResId(RID_DLG_UPDATE_UPDATE)),
m_checking(this, DpGuiResId(RID_DLG_UPDATE_CHECKING)),
m_update(this, DpGuiResId(RID_DLG_UPDATE_UPDATE)),
m_updates(
*this, ResId(RID_DLG_UPDATE_UPDATES),
Image(ResId(RID_DLG_UPDATE_NORMALALERT)),
Image(ResId(RID_DLG_UPDATE_HIGHCONTRASTALERT))),
m_all(this, ResId(RID_DLG_UPDATE_ALL)),
m_description(this, ResId(RID_DLG_UPDATE_DESCRIPTION)),
m_descriptions(this, ResId(RID_DLG_UPDATE_DESCRIPTIONS)),
m_line(this, ResId(RID_DLG_UPDATE_LINE)),
m_help(this, ResId(RID_DLG_UPDATE_HELP)),
m_ok(this, ResId(RID_DLG_UPDATE_OK)),
m_cancel(this, ResId(RID_DLG_UPDATE_CANCEL)),
m_error(String(ResId(RID_DLG_UPDATE_ERROR))),
m_none(String(ResId(RID_DLG_UPDATE_NONE))),
m_noInstallable(String(ResId(RID_DLG_UPDATE_NOINSTALLABLE))),
m_failure(String(ResId(RID_DLG_UPDATE_FAILURE))),
m_unknownError(String(ResId(RID_DLG_UPDATE_UNKNOWNERROR))),
m_noDescription(String(ResId(RID_DLG_UPDATE_NODESCRIPTION))),
m_noInstall(String(ResId(RID_DLG_UPDATE_NOINSTALL))),
m_noDependency(String(ResId(RID_DLG_UPDATE_NODEPENDENCY))),
m_noPermission(String(ResId(RID_DLG_UPDATE_NOPERMISSION))),
m_noUpdate(String(ResId(RID_DLG_UPDATE_NOUPDATE))),
*this, DpGuiResId(RID_DLG_UPDATE_UPDATES),
Image(DpGuiResId(RID_DLG_UPDATE_NORMALALERT)),
Image(DpGuiResId(RID_DLG_UPDATE_HIGHCONTRASTALERT))),
m_all(this, DpGuiResId(RID_DLG_UPDATE_ALL)),
m_description(this, DpGuiResId(RID_DLG_UPDATE_DESCRIPTION)),
m_descriptions(this, DpGuiResId(RID_DLG_UPDATE_DESCRIPTIONS)),
m_line(this, DpGuiResId(RID_DLG_UPDATE_LINE)),
m_help(this, DpGuiResId(RID_DLG_UPDATE_HELP)),
m_ok(this, DpGuiResId(RID_DLG_UPDATE_OK)),
m_cancel(this, DpGuiResId(RID_DLG_UPDATE_CANCEL)),
m_error(String(DpGuiResId(RID_DLG_UPDATE_ERROR))),
m_none(String(DpGuiResId(RID_DLG_UPDATE_NONE))),
m_noInstallable(String(DpGuiResId(RID_DLG_UPDATE_NOINSTALLABLE))),
m_failure(String(DpGuiResId(RID_DLG_UPDATE_FAILURE))),
m_unknownError(String(DpGuiResId(RID_DLG_UPDATE_UNKNOWNERROR))),
m_noDescription(String(DpGuiResId(RID_DLG_UPDATE_NODESCRIPTION))),
m_noInstall(String(DpGuiResId(RID_DLG_UPDATE_NOINSTALL))),
m_noDependency(String(DpGuiResId(RID_DLG_UPDATE_NODEPENDENCY))),
m_noPermission(String(DpGuiResId(RID_DLG_UPDATE_NOPERMISSION))),
m_noUpdate(String(DpGuiResId(RID_DLG_UPDATE_NOUPDATE))),
m_updateData(*updateData),
m_thread(
new UpdateDialog::Thread(
@ -633,7 +628,7 @@ UpdateDialog::UpdateDialog(
} catch (css::uno::Exception & e) {
throw css::uno::RuntimeException(e.Message, e.Context);
}
Control c(this, ResId(RID_DLG_UPDATE_THROBBER));
Control c(this, DpGuiResId(RID_DLG_UPDATE_THROBBER));
Point pos(c.GetPosPixel());
Size size(c.GetSizePixel());
try {