You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by af...@apache.org on 2013/07/16 15:09:48 UTC

svn commit: r1503704 - /openoffice/branches/AOO400/main/vcl/unx/gtk/window/gtkframe.cxx

Author: af
Date: Tue Jul 16 13:09:48 2013
New Revision: 1503704

URL: http://svn.apache.org/r1503704
Log:
122709: Removed debug code and testing for small heights.

Modified:
    openoffice/branches/AOO400/main/vcl/unx/gtk/window/gtkframe.cxx   (contents, props changed)

Modified: openoffice/branches/AOO400/main/vcl/unx/gtk/window/gtkframe.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO400/main/vcl/unx/gtk/window/gtkframe.cxx?rev=1503704&r1=1503703&r2=1503704&view=diff
==============================================================================
--- openoffice/branches/AOO400/main/vcl/unx/gtk/window/gtkframe.cxx (original)
+++ openoffice/branches/AOO400/main/vcl/unx/gtk/window/gtkframe.cxx Tue Jul 16 13:09:48 2013
@@ -1245,7 +1245,7 @@ Size GtkSalFrame::calcDefaultSize()
     long h = aScreenSize.Height();
 
     
-    if (true || aScreenSize.Width() <= 1024)
+    if (aScreenSize.Width() <= 1024 || aScreenSize.Height() <= 768)
     {
         // For small screen use the old default values.  Original comment:
         // fill in holy default values brought to us by product management

Propchange: openoffice/branches/AOO400/main/vcl/unx/gtk/window/gtkframe.cxx
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jul 16 13:09:48 2013
@@ -0,0 +1,7 @@
+/incubator/ooo/branches/AOO34/main/vcl/unx/gtk/window/gtkframe.cxx:1346776-1346777,1347535,1348052,1348914,1350569,1352456,1358991,1359004,1359010,1359024,1359546-1359547,1359553,1359555-1359556,1360552,1368968,1369110,1371068
+/incubator/ooo/branches/alg/linecap/main/vcl/unx/gtk/window/gtkframe.cxx:1226811-1232461
+/incubator/ooo/branches/alg/svgreplacement/main/vcl/unx/gtk/window/gtkframe.cxx:1205420-1220782
+/incubator/ooo/branches/writer001/main/vcl/unx/gtk/window/gtkframe.cxx:1356067-1386577
+/openoffice/branches/alg/clibboard/main/vcl/unx/gtk/window/gtkframe.cxx:1428975-1437368
+/openoffice/branches/sidebar/main/vcl/unx/gtk/window/gtkframe.cxx:1415095-1466374
+/openoffice/trunk/main/vcl/unx/gtk/window/gtkframe.cxx:1502467,1503702