[Libreoffice-commits] core.git: Branch 'aoo/trunk' - basic/source vcl/inc vcl/source

[Herbert Dürr]

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

New commits:
commit 02cc651a1b45cbfbdab0aca6b57bff7bdf9e4f2c
Author: Herbert Dürr <h...@apache.org>
Date:   Mon Dec 2 12:33:06 2013 +0000

    #i74854# fix buttons in MsgBox with info icon
    
    Patch by: hanya.r...@gmail.com
    Found by: o...@catcons.co.uk
    Tested by: h...@apache.org

diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index f561809..8ba8880 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -4311,7 +4311,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/vcl/inc/vcl/msgbox.hxx b/vcl/inc/vcl/msgbox.hxx
index de01fda..0a12a97 100644
--- a/vcl/inc/vcl/msgbox.hxx
+++ b/vcl/inc/vcl/msgbox.hxx
@@ -120,6 +120,8 @@ private:
 public:
                         InfoBox( Window* pParent, const XubString& rMessage );
                         InfoBox( Window* pParent, const ResId & rResId );
+                        InfoBox( Window* pParent, WinBits nStyle,
+                                const XubString& rMessage );
 
     static Image        GetStandardImage();
     static Image        GetStandardImageHC();
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index 0b6bfab..54e8563 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -515,6 +515,14 @@ InfoBox::InfoBox( Window* pParent, const ResId & rResId ) :
 
 // -----------------------------------------------------------------------
 
+InfoBox::InfoBox( Window* pParent, WinBits nStyle, const XubString& rMessage ) 
:
+    MessBox( pParent, nStyle, ImplGetSVEmptyStr(), rMessage )
+{
+    ImplInitInfoBoxData();
+}
+
+// -----------------------------------------------------------------------
+
 Image InfoBox::GetStandardImage()
 {
     ImplInitMsgBoxImageList();

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits