[Libreoffice-commits] .: Branch 'libreoffice-3-5' - writerfilter/source

[Eike Rathke]

 writerfilter/source/dmapper/GraphicHelpers.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 84cb526d0e64ee291ab6bc7ab3e8fee68a5c0f29
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 17 20:11:20 2012 +0100

    WaE: MacOSX itemZOrder may be unused uninitialized
    (cherry picked from commit b92de73fdd81acc5fdb92005af34b3ce9f8ed37b)
    
    Signed-off-by: Eike Rathke <erack at redhat.com>

diff --git a/writerfilter/source/dmapper/GraphicHelpers.cxx b/writerfilter/source/dmapper/GraphicHelpers.cxx
index e79e8b4..31cded9 100644
--- a/writerfilter/source/dmapper/GraphicHelpers.cxx
+++ b/writerfilter/source/dmapper/GraphicHelpers.cxx
@@ -244,7 +244,7 @@ sal_Int32 GraphicZOrderHelper::findZOrder( sal_Int32 relativeHeight )
     {
         if( items.empty())
             return 0;
-        sal_Int32 itemZOrder;
+        sal_Int32 itemZOrder(0);
         --it;
         if( it->second->getPropertyValue(PropertyNameSupplier::GetPropertyNameSupplier()
             .GetName( PROP_Z_ORDER )) >>= itemZOrder )
@@ -252,7 +252,7 @@ sal_Int32 GraphicZOrderHelper::findZOrder( sal_Int32 relativeHeight )
     }
     else
     {
-        sal_Int32 itemZOrder;
+        sal_Int32 itemZOrder(0);
         if( it->second->getPropertyValue(PropertyNameSupplier::GetPropertyNameSupplier()
             .GetName( PROP_Z_ORDER )) >>= itemZOrder )
             return itemZOrder; // before the item