diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-01-24 21:11:49 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-01-25 15:37:18 +0000 |
| commit | 1d4e0d9ec5b3781f8ab778e3e1630db3c2c39c4b (patch) | |
| tree | cfcfc2417a6c860ddfe90cab5c75ac682ef50b71 /desktop | |
| parent | bb147bbb801b53dba8928340df7e2aa2d4545349 (diff) | |
reduce unnecessary includes
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx index a5d9ab3d9d24..f81a92f7a6eb 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx @@ -97,7 +97,6 @@ #include "tools/link.hxx" #include "tools/resid.hxx" #include "tools/solar.h" -#include "tools/string.hxx" #include "unotools/configmgr.hxx" #include "vcl/button.hxx" #include "vcl/dialog.hxx" @@ -533,18 +532,18 @@ UpdateDialog::UpdateDialog( m_help(this, DpGuiResId(RID_DLG_UPDATE_HELP)), m_ok(this, DpGuiResId(RID_DLG_UPDATE_OK)), m_close(this, DpGuiResId(RID_DLG_UPDATE_CLOSE)), - 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_noDependencyCurVer(String(DpGuiResId(RID_DLG_UPDATE_NODEPENDENCY_CUR_VER))), - m_browserbased(String(DpGuiResId(RID_DLG_UPDATE_BROWSERBASED))), - m_version(String(DpGuiResId(RID_DLG_UPDATE_VERSION))), - m_ignoredUpdate(String(DpGuiResId(RID_DLG_UPDATE_IGNORED_UPDATE))), + m_error(ResId::toString(DpGuiResId(RID_DLG_UPDATE_ERROR))), + m_none(ResId::toString(DpGuiResId(RID_DLG_UPDATE_NONE))), + m_noInstallable(ResId::toString(DpGuiResId(RID_DLG_UPDATE_NOINSTALLABLE))), + m_failure(ResId::toString(DpGuiResId(RID_DLG_UPDATE_FAILURE))), + m_unknownError(ResId::toString(DpGuiResId(RID_DLG_UPDATE_UNKNOWNERROR))), + m_noDescription(ResId::toString(DpGuiResId(RID_DLG_UPDATE_NODESCRIPTION))), + m_noInstall(ResId::toString(DpGuiResId(RID_DLG_UPDATE_NOINSTALL))), + m_noDependency(ResId::toString(DpGuiResId(RID_DLG_UPDATE_NODEPENDENCY))), + m_noDependencyCurVer(ResId::toString(DpGuiResId(RID_DLG_UPDATE_NODEPENDENCY_CUR_VER))), + m_browserbased(ResId::toString(DpGuiResId(RID_DLG_UPDATE_BROWSERBASED))), + m_version(ResId::toString(DpGuiResId(RID_DLG_UPDATE_VERSION))), + m_ignoredUpdate(ResId::toString(DpGuiResId(RID_DLG_UPDATE_IGNORED_UPDATE))), m_updateData(*updateData), m_thread( new UpdateDialog::Thread( @@ -622,9 +621,9 @@ short UpdateDialog::Execute() { UpdateDialog::CheckListBox::CheckListBox( UpdateDialog & dialog, ResId const & resource, Image const & normalStaticImage ): SvxCheckListBox( &dialog, resource, normalStaticImage ), - m_ignoreUpdate( String( DpGuiResId( RID_DLG_UPDATE_IGNORE ) ) ), - m_ignoreAllUpdates( String( DpGuiResId( RID_DLG_UPDATE_IGNORE_ALL ) ) ), - m_enableUpdate( String( DpGuiResId( RID_DLG_UPDATE_ENABLE ) ) ), + m_ignoreUpdate( ResId::toString( DpGuiResId( RID_DLG_UPDATE_IGNORE ) ) ), + m_ignoreAllUpdates( ResId::toString( DpGuiResId( RID_DLG_UPDATE_IGNORE_ALL ) ) ), + m_enableUpdate( ResId::toString( DpGuiResId( RID_DLG_UPDATE_ENABLE ) ) ), m_dialog(dialog) {} |