openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject svn commit: r1546977 - in /openoffice/trunk/main: basic/source/runtime/methods.cxx vcl/inc/vcl/msgbox.hxx vcl/source/window/msgbox.cxx
Date Mon, 02 Dec 2013 12:33:06 GMT
Author: hdu
Date: Mon Dec  2 12:33:06 2013
New Revision: 1546977

URL: http://svn.apache.org/r1546977
Log:
#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

Modified:
    openoffice/trunk/main/basic/source/runtime/methods.cxx
    openoffice/trunk/main/vcl/inc/vcl/msgbox.hxx
    openoffice/trunk/main/vcl/source/window/msgbox.cxx

Modified: openoffice/trunk/main/basic/source/runtime/methods.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basic/source/runtime/methods.cxx?rev=1546977&r1=1546976&r2=1546977&view=diff
==============================================================================
--- openoffice/trunk/main/basic/source/runtime/methods.cxx (original)
+++ openoffice/trunk/main/basic/source/runtime/methods.cxx Mon Dec  2 12:33:06 2013
@@ -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 );

Modified: openoffice/trunk/main/vcl/inc/vcl/msgbox.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/inc/vcl/msgbox.hxx?rev=1546977&r1=1546976&r2=1546977&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/inc/vcl/msgbox.hxx (original)
+++ openoffice/trunk/main/vcl/inc/vcl/msgbox.hxx Mon Dec  2 12:33:06 2013
@@ -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();

Modified: openoffice/trunk/main/vcl/source/window/msgbox.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/source/window/msgbox.cxx?rev=1546977&r1=1546976&r2=1546977&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/source/window/msgbox.cxx (original)
+++ openoffice/trunk/main/vcl/source/window/msgbox.cxx Mon Dec  2 12:33:06 2013
@@ -515,6 +515,14 @@ InfoBox::InfoBox( Window* pParent, const
 
 // -----------------------------------------------------------------------
 
+InfoBox::InfoBox( Window* pParent, WinBits nStyle, const XubString& rMessage ) :
+	MessBox( pParent, nStyle, ImplGetSVEmptyStr(), rMessage )
+{
+	ImplInitInfoBoxData();
+}
+
+// -----------------------------------------------------------------------
+
 Image InfoBox::GetStandardImage()
 {
 	ImplInitMsgBoxImageList();



Mime
View raw message