[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - 2 commits - oox/source vcl/source

[Libreoffice Gerrit user]

 oox/source/drawingml/transform2dcontext.cxx |    4 ++--
 vcl/source/gdi/bitmap3.cxx                  |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 755ceb2f5ba5f605ae2a0c7c84dadfb41c34e264
Author: Andras Timar <atimar at suse.com>
Date:   Sat Oct 13 16:50:57 2012 +0200

    it seems we still need the ::rtl:: prefix for OUString at some places
    
    Change-Id: I0c043e2c33ee51d73cf8e00a1032e5953e8c1639

diff --git a/oox/source/drawingml/transform2dcontext.cxx b/oox/source/drawingml/transform2dcontext.cxx
index 53d27eb..d5ce984 100644
--- a/oox/source/drawingml/transform2dcontext.cxx
+++ b/oox/source/drawingml/transform2dcontext.cxx
@@ -71,8 +71,8 @@ Reference< XFastContextHandler > Transform2DContext::createFastChildContext( sal
         {
             case A_TOKEN( off ):
                 {
-                    OUString sXValue = xAttribs->getOptionalValue( XML_x );
-                    OUString sYValue = xAttribs->getOptionalValue( XML_y );
+                    ::rtl::OUString sXValue = xAttribs->getOptionalValue( XML_x );
+                    ::rtl::OUString sYValue = xAttribs->getOptionalValue( XML_y );
                     if( !sXValue.isEmpty() )
                         mrShape.getTextBody()->getTextProperties().moTextOffX = GetCoordinate( sXValue.toInt32() - mrShape.getPosition().X );
                     if( !sYValue.isEmpty() )
commit 644f7894153a9a9631de307b0ffeadf4bfa283e4
Author: Andras Timar <atimar at suse.com>
Date:   Sat Oct 13 12:46:07 2012 +0200

    confusion around parantheses near fabs()
    
    Change-Id: Ifcab9f9ef73eb044288ed68014dc05acd9a2efa8

diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index a469681..42e7de3 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -2316,7 +2316,7 @@ void Bitmap::ImplCalculateContributions( const int aSourceSize, const int aDesti
             aWeight = aKernel.Calculate( aFilterFactor * ( aCenter - (double) j ) );
 
             // Reduce calculations with ignoring weights of 0.0
-            if (fabs(aWeight < 0.0001))
+            if (fabs(aWeight) < 0.0001)
                 continue;
 
             // Handling on edges