[Libreoffice-commits] core.git: 2 commits - filter/source Repository.mk

[Matúš Kukan]

 Repository.mk                       |    2 +-
 filter/source/msfilter/msdffimp.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 79a532c1be0917ec085f29233f79f76bd2c9d3ee
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Wed Jan 29 19:17:29 2014 +0100

    -Werror=maybe-uninitialized
    
    Change-Id: I696dc966bce7a19d0de898fc107aa29784011bb4

diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 54b8dd6..7c50cf5 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -4460,7 +4460,7 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r
                                 (sal_uInt16)nStartAngle / 10, (sal_uInt16)nEndAngle / 10, sal_True );
                             Rectangle aPolyPieRect( aXPoly.GetBoundRect() );
 
-                            double  fYScale, fXScale;
+                            double  fYScale = 0.0, fXScale = 0.0;
                             double  fYOfs, fXOfs;
 
                             Point aP( aObjData.aBoundRect.Center() );
commit 9aa500f3ea2d11c5a1c985489679a322f18a5875
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Wed Jan 29 19:14:12 2014 +0100

    Add a condition for chartopengl in Repository.mk.
    
    Change-Id: I899fed47873ee48b556bbda9417570b2d637b7bb

diff --git a/Repository.mk b/Repository.mk
index 8e54757..e91efd6 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -222,7 +222,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	canvastools \
 	chartcore \
 	chartcontroller \
-	chartopengl \
+	$(if $(filter LINUX FREEBSD WNT,$(OS)),chartopengl) \
 	$(if $(filter $(OS),WNT),,cmdmail) \
 	cppcanvas \
 	configmgr \