mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolves: #i74854# fix buttons in MsgBox with info icon

Browse Source 
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
This commit is contained in:
Herbert Dürr
2013-12-02 12:33:06 +00:00
committed by Caolán McNamara
parent bdb5114bb7
commit 3a437baee2
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
basic/source/runtime/methods.cxx
View File

@@ -4631,7 +4631,7 @@ RTLFUNC(MsgBox)
pBox = new WarningBox( pParent, nWinBits, aMsg ); pBox = new WarningBox( pParent, nWinBits, aMsg );
break; break;
case 64: case 64:
pBox = new InfoBox( pParent, aMsg ); pBox = new InfoBox( pParent, nWinBits, aMsg );
break; break;
default: default:
pBox = new MessBox( pParent, nWinBits, aTitle, aMsg ); pBox = new MessBox( pParent, nWinBits, aTitle, aMsg );

2
include/vcl/msgbox.hxx
View File

@@ -86,6 +86,8 @@ private:
public: public:
InfoBox( Window* pParent, const OUString& rMessage ); InfoBox( Window* pParent, const OUString& rMessage );
InfoBox( Window* pParent, const ResId & rResId ); InfoBox( Window* pParent, const ResId & rResId );
InfoBox( Window* pParent, WinBits nStyle,
const OUString& rMessage );
static Image GetStandardImage(); static Image GetStandardImage();
}; };

8
vcl/source/window/msgbox.cxx
View File

@@ -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() Image InfoBox::GetStandardImage()
{ {
ImplInitMsgBoxImageList(); ImplInitMsgBoxImageList();