[Libreoffice-commits] core.git: basic/source include/vcl vcl/source

[Herbert Dürr]

 basic/source/runtime/methods.cxx |    2 +-
 include/vcl/msgbox.hxx           |    2 ++
 vcl/source/window/msgbox.cxx     |    8 ++++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 3a437baee23d45ab64d557fed75e2e1b14aa5541
Author: Herbert Dürr <hdu at apache.org>
Date:   Mon Dec 2 12:33:06 2013 +0000

    Resolves: #i74854# fix buttons in MsgBox with info icon
    
    Patch by: hanya.runo at gmail.com
    Found by: ooo at catcons.co.uk
    Tested by: hdu at apache.org
    
    (cherry picked from commit 02cc651a1b45cbfbdab0aca6b57bff7bdf9e4f2c)
    
    Conflicts:
    	basic/source/runtime/methods.cxx
    	vcl/inc/vcl/msgbox.hxx
    
    Change-Id: I1656263e189f1a6cfa58436741bfa74ae0e6fffa

diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 083152b..5351606 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 58f818b..b1387f0 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 0e95ea8..82e216a 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();