diff options
author | Caolán McNamara <caolanm@redhat.com> | 2010-11-16 17:00:33 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2010-11-16 17:00:33 +0000 |
commit | 8458bfa33ce5bf3f98fc9d0a353b956fd4b42617 (patch) | |
tree | 372d12f27257367f8cd100febd0bf06987c9de21 | |
parent | c04f8c48e69f01622a2104d7f91dfd7de25d560f (diff) |
fix this to build again
-rwxr-xr-x | desktop/source/deployment/gui/dp_gui.hrc | 1 | ||||
-rw-r--r-- | desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 7 | ||||
-rw-r--r-- | desktop/source/deployment/gui/dp_gui_updatedialog.hxx | 3 | ||||
-rw-r--r-- | desktop/source/deployment/gui/dp_gui_updatedialog.src | 5 | ||||
-rw-r--r-- | svx/inc/svx/checklbx.hxx | 3 | ||||
-rw-r--r-- | svx/source/dialog/checklbx.cxx | 6 |
6 files changed, 7 insertions, 18 deletions
diff --git a/desktop/source/deployment/gui/dp_gui.hrc b/desktop/source/deployment/gui/dp_gui.hrc index 17897aece094..d0ae3c468d9b 100755 --- a/desktop/source/deployment/gui/dp_gui.hrc +++ b/desktop/source/deployment/gui/dp_gui.hrc @@ -107,7 +107,6 @@ #define RID_DLG_UPDATE_OK 10 #define RID_DLG_UPDATE_CANCEL 11 #define RID_DLG_UPDATE_NORMALALERT 12 -#define RID_DLG_UPDATE_HIGHCONTRASTALERT 13 #define RID_DLG_UPDATE_ERROR 14 #define RID_DLG_UPDATE_NONE 15 #define RID_DLG_UPDATE_NOINSTALLABLE 16 diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx index b2e176550f0f..d82f70e397e9 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx @@ -565,8 +565,7 @@ UpdateDialog::UpdateDialog( m_update(this, DpGuiResId(RID_DLG_UPDATE_UPDATE)), m_updates( *this, DpGuiResId(RID_DLG_UPDATE_UPDATES), - Image(DpGuiResId(RID_DLG_UPDATE_NORMALALERT)), - Image(DpGuiResId(RID_DLG_UPDATE_HIGHCONTRASTALERT))), + Image(DpGuiResId(RID_DLG_UPDATE_NORMALALERT))), m_all(this, DpGuiResId(RID_DLG_UPDATE_ALL)), m_description(this, DpGuiResId(RID_DLG_UPDATE_DESCRIPTION)), m_PublisherLabel(this, DpGuiResId(RID_DLG_UPDATE_PUBLISHER_LABEL)), @@ -667,9 +666,9 @@ short UpdateDialog::Execute() { UpdateDialog::CheckListBox::CheckListBox( UpdateDialog & dialog, ResId const & resource, - Image const & normalStaticImage, Image const & highContrastStaticImage): + Image const & normalStaticImage): SvxCheckListBox( - &dialog, resource, normalStaticImage, highContrastStaticImage), + &dialog, resource, normalStaticImage), m_dialog(dialog) {} diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx index b9882123d0fd..f59cdd5eb13f 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx @@ -122,8 +122,7 @@ private: public: CheckListBox( UpdateDialog & dialog, ResId const & resource, - Image const & normalStaticImage, - Image const & highContrastStaticImage); + Image const & normalStaticImage); virtual ~CheckListBox(); diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.src b/desktop/source/deployment/gui/dp_gui_updatedialog.src index 325d98c88d48..47497cb3846b 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.src +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.src @@ -212,11 +212,6 @@ ModalDialog RID_DLG_UPDATE { File = "caution_12.png"; }; }; - Image RID_DLG_UPDATE_HIGHCONTRASTALERT { - ImageBitmap = Bitmap { - File = "caution_12_h.png"; - }; - }; String RID_DLG_UPDATE_ERROR { Text[en-US] = "Error"; }; diff --git a/svx/inc/svx/checklbx.hxx b/svx/inc/svx/checklbx.hxx index 5bac454a652b..2925fe950397 100644 --- a/svx/inc/svx/checklbx.hxx +++ b/svx/inc/svx/checklbx.hxx @@ -61,8 +61,7 @@ public: SvxCheckListBox( Window* pParent, WinBits nWinStyle = 0 ); SvxCheckListBox( Window* pParent, const ResId& rResId ); SvxCheckListBox( Window* pParent, const ResId& rResId, - const Image& rNormalStaticImage, - const Image& rHighContrastStaticImage ); + const Image& rNormalStaticImage ); ~SvxCheckListBox(); void InsertEntry ( const String& rStr, diff --git a/svx/source/dialog/checklbx.cxx b/svx/source/dialog/checklbx.cxx index 2aee16f32aac..e66fdf975559 100644 --- a/svx/source/dialog/checklbx.cxx +++ b/svx/source/dialog/checklbx.cxx @@ -62,10 +62,8 @@ SvxCheckListBox::SvxCheckListBox( Window* pParent, const ResId& rResId ) : // ----------------------------------------------------------------------- SvxCheckListBox::SvxCheckListBox( Window* pParent, const ResId& rResId, - const Image& rNormalStaticImage, - const Image& /*TODO#i72485# rHighContrastStaticImage*/ ) : - - SvTreeListBox( pParent, rResId ) + const Image& rNormalStaticImage ) + : SvTreeListBox( pParent, rResId ) { Init_Impl(); |