[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - drawinglayer/source dtrans/source vcl/unx

[Herbert Dürr]

 drawinglayer/source/processor2d/vclprocessor2d.cxx |    3 ++-
 dtrans/source/win32/dtobj/FetcList.cxx             |    7 ++++---
 vcl/unx/gtk/window/gtkframe.cxx                    |    2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit a609daa146c5588c6a35c2c145e9573c625ec123
Author: Herbert Dürr <hdu at apache.org>
Date:   Tue Jul 16 13:30:18 2013 +0000

    #i122752# check iterator in each iteration of CFormatEtcContainer::nextFormatEtc()'s loop
    
    Don't trust nextFormatEtc()'s aNum argument not to mislead the iterator beyond
    the container bounds. The comparable loop in CFormatEtcContainer::skipFormatEtc()
    already checks the iterator against the container end in each iteration.

diff --git a/dtrans/source/win32/dtobj/FetcList.cxx b/dtrans/source/win32/dtobj/FetcList.cxx
index 531ae38..ca455dc 100644
--- a/dtrans/source/win32/dtobj/FetcList.cxx
+++ b/dtrans/source/win32/dtobj/FetcList.cxx
@@ -143,10 +143,11 @@ sal_uInt32 SAL_CALL CFormatEtcContainer::nextFormatEtc( LPFORMATETC lpFetc,
 
     sal_uInt32 nFetched = 0;
 
-    if ( m_EnumIterator != m_FormatMap.end( ) )
+    for ( sal_uInt32 i = 0; i < aNum; i++, nFetched++, lpFetc++, ++m_EnumIterator )
     {
-        for ( sal_uInt32 i = 0; i < aNum; i++, nFetched++, lpFetc++, ++m_EnumIterator )
-            CopyFormatEtc( lpFetc, *m_EnumIterator );
+        if ( m_EnumIterator == m_FormatMap.end() )
+            break;
+        CopyFormatEtc( lpFetc, *m_EnumIterator );
     }
 
     return nFetched;
commit f56ded7c2aac573e4e5f060892327843eed23d0c
Author: Andre Fischer <af at apache.org>
Date:   Tue Jul 16 13:03:12 2013 +0000

    122709: Also test for small heights.

diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index 870d63e..52c1eaa 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -1245,7 +1245,7 @@ Size GtkSalFrame::calcDefaultSize()
     long h = aScreenSize.Height();
 
 
-    if (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
commit db4affff17f202e69447fd22c246843a6cda3e52
Author: Armin Le Grand <alg at apache.org>
Date:   Tue Jul 16 12:51:14 2013 +0000

    i122758 Initialize Mask with non-transparent

diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index 7b9d474..2fc409d 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -425,7 +425,8 @@ namespace drawinglayer
 #if defined(MACOSX)
                 const AlphaMask aMaskBmp( aContent.GetSizePixel());
 #else
-                const Bitmap aMaskBmp( aContent.GetSizePixel(), 1);
+                Bitmap aMaskBmp( aContent.GetSizePixel(), 1);
+                aMaskBmp.Erase(Color(COL_BLACK)); // #122758# Initialize to non-transparent
 #endif
                 aBitmapEx = BitmapEx(aContent, aMaskBmp);
             }