[Libreoffice-commits] .: 2 commits - chart2/source oox/inc

[Lubos Lunak]

 chart2/source/view/axes/VAxisProperties.cxx |    2 +-
 oox/inc/oox/core/contexthandler.hxx         |    4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 49750862171c8d23f60bd1f1a1983b6e834ef9bf
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Sat Mar 17 08:09:53 2012 +0100

    workaround for msvc instantiating things it shouldn't
    
    The cppu::ImplInheritanceHelper1 ctor should not get instantiated, but MSVC2008
    does so and then it fails to compile.

diff --git a/oox/inc/oox/core/contexthandler.hxx b/oox/inc/oox/core/contexthandler.hxx
index f0562ec..9d09848 100644
--- a/oox/inc/oox/core/contexthandler.hxx
+++ b/oox/inc/oox/core/contexthandler.hxx
@@ -105,6 +105,10 @@ protected:
 
     void                implSetLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& rxLocator );
 
+#if _MSC_VER
+    ContextHandler() {} // workaround
+#endif
+
 private:
     ContextHandler&     operator=( const ContextHandler& );
 
commit 0c9a6bf5f791778c8ce59d60a84b62f32c1a2f79
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Sat Mar 17 08:04:45 2012 +0100

    do not initialize a field with itself

diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx
index 44f44b2..64b2dc6 100644
--- a/chart2/source/view/axes/VAxisProperties.cxx
+++ b/chart2/source/view/axes/VAxisProperties.cxx
@@ -199,7 +199,7 @@ AxisProperties::AxisProperties( const uno::Reference< XAxis >& xAxisModel
 
 AxisProperties::AxisProperties( const AxisProperties& rAxisProperties )
     : m_xAxisModel( rAxisProperties.m_xAxisModel )
-    , m_nDimensionIndex( m_nDimensionIndex )
+    , m_nDimensionIndex( rAxisProperties.m_nDimensionIndex )
     , m_bIsMainAxis( rAxisProperties.m_bIsMainAxis )
     , m_bSwapXAndY( rAxisProperties.m_bSwapXAndY )
     , m_eCrossoverType( rAxisProperties.m_eCrossoverType )