6 files changed, 17 insertions, 8 deletions
diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx
index ccfdc0d2b..b7dfd60f8 100644
--- a/chart2/source/tools/AxisHelper.cxx
+++ b/chart2/source/tools/AxisHelper.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,7 +42,7 @@
 #include "DataSeriesHelper.hxx"
 #include "Scaling.hxx"
 
-#include <svtools/saveopt.hxx>
+#include <unotools/saveopt.hxx>
 
 #include <com/sun/star/chart/ChartAxisPosition.hpp>
 
@@ -128,7 +128,7 @@ Reference< XAxis > AxisHelper::createAxis(
     if( xAxis.is())
     {
         xCooSys->setAxisByDimension( nDimensionIndex, xAxis, nAxisIndex );
-        
+
         if( nAxisIndex>0 )//when inserting secondary axes copy some things from the main axis
         {
             ::com::sun::star::chart::ChartAxisPosition eNewAxisPos( ::com::sun::star::chart::ChartAxisPosition_END );
@@ -937,7 +937,7 @@ Reference< XChartType > AxisHelper::getFirstChartTypeWithSeriesAttachedToAxisInd
     ::std::vector< Reference< XDataSeries > >::const_iterator aIter = aSeriesVector.begin();
     for( ; aIter != aSeriesVector.end(); aIter++ )
     {
-        sal_Int32 nCurrentIndex = DataSeriesHelper::getAttachedAxisIndex( *aIter ); 
+        sal_Int32 nCurrentIndex = DataSeriesHelper::getAttachedAxisIndex( *aIter );
         if( nAttachedAxisIndex == nCurrentIndex )
         {
             xChartType = DiagramHelper::getChartTypeOfSeries( xDiagram, *aIter );
diff --git a/chart2/source/tools/CharacterProperties.cxx b/chart2/source/tools/CharacterProperties.cxx
index 66a1e1880..6981d7fab 100644
--- a/chart2/source/tools/CharacterProperties.cxx
+++ b/chart2/source/tools/CharacterProperties.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -58,7 +58,7 @@
 
 // header for struct SvtLinguConfig
 #ifndef _SVTOOLS_LINGUCFG_HXX_
-#include <svtools/lingucfg.hxx>
+#include <unotools/lingucfg.hxx>
 #endif
 #ifndef INCLUDED_I18NPOOL_MSLANGID_HXX
 #include <i18npool/mslangid.hxx>
@@ -490,7 +490,7 @@ void CharacterProperties::AddDefaultsToMap(
     using namespace ::com::sun::star::i18n::ScriptType;
     LanguageType nLang;
     nLang = MsLangId::resolveSystemLanguageByScriptType(MsLangId::convertLocaleToLanguage(aDefaultLocale), LATIN);
-    Font aFont = OutputDevice::GetDefaultFont( DEFAULTFONT_LATIN_SPREADSHEET, nLang, DEFAULTFONT_FLAGS_ONLYONE, 0 );   
+    Font aFont = OutputDevice::GetDefaultFont( DEFAULTFONT_LATIN_SPREADSHEET, nLang, DEFAULTFONT_FLAGS_ONLYONE, 0 );
     nLang = MsLangId::resolveSystemLanguageByScriptType(MsLangId::convertLocaleToLanguage( aDefaultLocale_CJK), ASIAN);
     Font aFontCJK = OutputDevice::GetDefaultFont( DEFAULTFONT_CJK_SPREADSHEET, nLang, DEFAULTFONT_FLAGS_ONLYONE, 0 );
     nLang = MsLangId::resolveSystemLanguageByScriptType(MsLangId::convertLocaleToLanguage( aDefaultLocale_CTL), COMPLEX);
diff --git a/chart2/source/tools/ConfigColorScheme.cxx b/chart2/source/tools/ConfigColorScheme.cxx
index e3d6162d5..1cb3db0c4 100644
--- a/chart2/source/tools/ConfigColorScheme.cxx
+++ b/chart2/source/tools/ConfigColorScheme.cxx
@@ -76,6 +76,7 @@ public:
 
 protected:
     // ____ ::utl::ConfigItem ____
+    virtual void                    Commit();
     virtual void Notify( const Sequence< OUString > & aPropertyNames );
 
 private:
@@ -100,6 +101,9 @@ void ChartConfigItem::Notify( const Sequence< OUString > & aPropertyNames )
     }
 }
 
+void ChartConfigItem::Commit()
+{}
+
 void ChartConfigItem::addPropertyNotification( const OUString & rPropertyName )
 {
     m_aPropertiesToNotify.insert( rPropertyName );
diff --git a/chart2/source/tools/ImplUndoManager.cxx b/chart2/source/tools/ImplUndoManager.cxx
index f2309a90c..00eaa3367 100644
--- a/chart2/source/tools/ImplUndoManager.cxx
+++ b/chart2/source/tools/ImplUndoManager.cxx
@@ -463,6 +463,10 @@ void UndoStepsConfigItem::Notify( const Sequence< OUString > & aPropertyNames )
     }
 }
 
+void UndoStepsConfigItem::Commit()
+{
+}
+
 // mtehod is not const, because GetProperties is not const
 sal_Int32 UndoStepsConfigItem::getUndoSteps()
 {
diff --git a/chart2/source/tools/ImplUndoManager.hxx b/chart2/source/tools/ImplUndoManager.hxx
index ccb023d99..28aa62622 100644
--- a/chart2/source/tools/ImplUndoManager.hxx
+++ b/chart2/source/tools/ImplUndoManager.hxx
@@ -200,6 +200,7 @@ public:
 protected:
     // ____ ::utl::ConfigItem ____
     virtual void Notify( const ::com::sun::star::uno::Sequence< ::rtl::OUString > & aPropertyNames );
+    virtual void Commit();
 
 private:
     ConfigItemListener &    m_rListener;
diff --git a/chart2/source/tools/OPropertySet.cxx b/chart2/source/tools/OPropertySet.cxx
index 9e33e1e54..029ae7c86 100644
--- a/chart2/source/tools/OPropertySet.cxx
+++ b/chart2/source/tools/OPropertySet.cxx
@@ -377,7 +377,7 @@ void SAL_CALL OPropertySet::getFastPropertyValue
         uno::Reference< beans::XFastPropertySet > xStylePropSet( m_pImplProperties->GetStyle(), uno::UNO_QUERY );
         if( xStylePropSet.is() )
         {
-#ifndef NDEBUG
+#ifdef DBG_UTIL
             {
                 // check if the handle of the style points to the same property
                 // name as the handle in this property set