incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arie...@apache.org
Subject svn commit: r1224933 - in /incubator/ooo/trunk/main/cui/source/dialogs: about.cxx makefile.mk
Date Tue, 27 Dec 2011 15:57:17 GMT
Author: arielch
Date: Tue Dec 27 15:57:16 2011
New Revision: 1224933

URL: http://svn.apache.org/viewvc?rev=1224933&view=rev
Log:
Fix some issues with BUILD_VER_STRING on About dialog

Modified:
    incubator/ooo/trunk/main/cui/source/dialogs/about.cxx
    incubator/ooo/trunk/main/cui/source/dialogs/makefile.mk

Modified: incubator/ooo/trunk/main/cui/source/dialogs/about.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/cui/source/dialogs/about.cxx?rev=1224933&r1=1224932&r2=1224933&view=diff
==============================================================================
--- incubator/ooo/trunk/main/cui/source/dialogs/about.cxx (original)
+++ incubator/ooo/trunk/main/cui/source/dialogs/about.cxx Tue Dec 27 15:57:16 2011
@@ -231,7 +231,9 @@ AboutDialog::AboutDialog( Window* pParen
 	aBuildData.SetFont( aNewFont );
 	aBuildData.SetBackground( aWall );
 #ifdef BUILD_VER_STRING
-	String aBuildString( DEFINE_CONST_UNICODE( BUILD_VER_STRING ) );
+#define _STRINGIFY(x) #x
+#define STRINGIFY(x) _STRINGIFY(x)
+	String aBuildString( DEFINE_CONST_UNICODE( STRINGIFY( BUILD_VER_STRING ) ) );
 #else
 	String aBuildString;
 #endif
@@ -250,10 +252,16 @@ AboutDialog::AboutDialog( Window* pParen
     long nTextWidth  = aOutSiz.Width() - nDlgMargin;
 
     aCopyrightText.SetText( aCopyrightTextStr );
-	
+
+    // layout fixed text controls
     layoutText( aVersionText, nY, nTextWidth, a6Size );
-	nY += nCtrlMargin;
-    
+    if( aBuildString.Len() > 0 )
+    {
+        nY += ( a6Size.Height() / 2 );
+        layoutText( aBuildData, nY, nTextWidth, a6Size );
+    }
+    nY += nCtrlMargin;
+
 	// OK-Button-Position (at the bottom and centered)
 	Size aOKSiz = aOKButton.GetSizePixel();
 	Point aOKPnt = aOKButton.GetPosPixel();

Modified: incubator/ooo/trunk/main/cui/source/dialogs/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/cui/source/dialogs/makefile.mk?rev=1224933&r1=1224932&r2=1224933&view=diff
==============================================================================
--- incubator/ooo/trunk/main/cui/source/dialogs/makefile.mk (original)
+++ incubator/ooo/trunk/main/cui/source/dialogs/makefile.mk Tue Dec 27 15:57:16 2011
@@ -38,6 +38,10 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= -DENABLE_LAYOUT=1 -I../$(PRJ)/layout/inc -I../$(PRJ)/layout/$(INPATH)/inc
 .ENDIF # ENABLE_LAYOUT == TRUE
 
+.IF "$(BUILD_VER_STRING)" != ""
+CFLAGS+= -DBUILD_VER_STRING="$(BUILD_VER_STRING)"
+.ENDIF
+
 # --- Files --------------------------------------------------------
 
 SRS1NAME=dialogs



Mime
View raw message