diff options
| author | Herbert Dürr <hdu@apache.org> | 2013-12-02 12:33:06 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-12-02 16:49:47 +0000 |
| commit | ea616972c06dec25b1baeb6b7d674c71c7af52fc (patch) | |
| tree | 84df9bfe354adf97e0ff30df3a5a21e1a510d777 | |
| parent | 0a34d4a5af3658be10ea9091096027a159cc7316 (diff) | |
Resolves: #i74854# fix buttons in MsgBox with info icon
Patch by: hanya.runo@gmail.com
Found by: ooo@catcons.co.uk
Tested by: hdu@apache.org
(cherry picked from commit 02cc651a1b45cbfbdab0aca6b57bff7bdf9e4f2c)
Conflicts:
basic/source/runtime/methods.cxx
vcl/inc/vcl/msgbox.hxx
Change-Id: I1656263e189f1a6cfa58436741bfa74ae0e6fffa
(cherry picked from commit 3a437baee23d45ab64d557fed75e2e1b14aa5541)
| -rw-r--r-- | basic/source/runtime/methods.cxx | 2 | ||||
| -rw-r--r-- | include/vcl/msgbox.hxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/msgbox.cxx | 8 |
3 files changed, 11 insertions, 1 deletions
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index 083152b63fb0..535160608f70 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -4631,7 +4631,7 @@ RTLFUNC(MsgBox) pBox = new WarningBox( pParent, nWinBits, aMsg ); break; case 64: - pBox = new InfoBox( pParent, aMsg ); + pBox = new InfoBox( pParent, nWinBits, aMsg ); break; default: pBox = new MessBox( pParent, nWinBits, aTitle, aMsg ); diff --git a/include/vcl/msgbox.hxx b/include/vcl/msgbox.hxx index 58f818bf06ac..b1387f00ce59 100644 --- a/include/vcl/msgbox.hxx +++ b/include/vcl/msgbox.hxx @@ -86,6 +86,8 @@ private: public: InfoBox( Window* pParent, const OUString& rMessage ); InfoBox( Window* pParent, const ResId & rResId ); + InfoBox( Window* pParent, WinBits nStyle, + const OUString& rMessage ); static Image GetStandardImage(); }; diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx index 0e95ea8adced..82e216ade356 100644 --- a/vcl/source/window/msgbox.cxx +++ b/vcl/source/window/msgbox.cxx @@ -456,6 +456,14 @@ InfoBox::InfoBox( Window* pParent, const ResId & rResId ) : // ----------------------------------------------------------------------- +InfoBox::InfoBox( Window* pParent, WinBits nStyle, const OUString& rMessage ) : + MessBox( pParent, nStyle, OUString(), rMessage ) +{ + ImplInitInfoBoxData(); +} + +// ----------------------------------------------------------------------- + Image InfoBox::GetStandardImage() { ImplInitMsgBoxImageList(); |