Merge branch 'master' into feature/gnumake4

707 files changed, 4475 insertions, 8516 deletions

diff --git a/chart2/AllLangResTarget_chartcontroller.mk b/chart2/AllLangResTarget_chartcontroller.mk
new file mode 100644
index 000000000000..98ad177bea5b
--- /dev/null
+++ b/chart2/AllLangResTarget_chartcontroller.mk
@@ -0,0 +1,102 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       David Tardon, Red Hat Inc. <dtardon@redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,chartcontroller))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,chartcontroller,chart2))
+
+$(eval $(call gb_AllLangResTarget_add_srs,chartcontroller,\
+    chart2/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,chart2/res))
+
+$(eval $(call gb_SrsTarget_set_include,chart2/res,\
+    $$(INCLUDE) \
+    -I$(realpath $(SRCDIR)/chart2/source/controller/dialogs) \
+    -I$(realpath $(SRCDIR)/chart2/source/controller/inc) \
+    -I$(realpath $(SRCDIR)/chart2/source/controller/main) \
+    -I$(realpath $(SRCDIR)/chart2/source/inc) \
+    -I$(WORKDIR)/inc/chart2 \
+    -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_SrsTarget_add_files,chart2/res,\
+    chart2/source/controller/dialogs/Bitmaps.src \
+    chart2/source/controller/dialogs/dlg_ChartType.src \
+    chart2/source/controller/dialogs/dlg_CreationWizard.src \
+    chart2/source/controller/dialogs/dlg_DataEditor.src \
+    chart2/source/controller/dialogs/dlg_DataSource.src \
+    chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src \
+    chart2/source/controller/dialogs/dlg_InsertDataLabel.src \
+    chart2/source/controller/dialogs/dlg_InsertErrorBars.src \
+    chart2/source/controller/dialogs/dlg_InsertLegend.src \
+    chart2/source/controller/dialogs/dlg_InsertTitle.src \
+    chart2/source/controller/dialogs/dlg_InsertTrendline.src \
+    chart2/source/controller/dialogs/dlg_ObjectProperties.src \
+    chart2/source/controller/dialogs/dlg_ShapeFont.src \
+    chart2/source/controller/dialogs/dlg_ShapeParagraph.src \
+    chart2/source/controller/dialogs/dlg_View3D.src \
+    chart2/source/controller/dialogs/res_BarGeometry.src \
+    chart2/source/controller/dialogs/res_TextSeparator.src \
+    chart2/source/controller/dialogs/Strings_AdditionalControls.src \
+    chart2/source/controller/dialogs/Strings_ChartTypes.src \
+    chart2/source/controller/dialogs/Strings_Scale.src \
+    chart2/source/controller/dialogs/Strings.src \
+    chart2/source/controller/dialogs/Strings_Statistic.src \
+    chart2/source/controller/dialogs/tp_3D_SceneAppearance.src \
+    chart2/source/controller/dialogs/tp_3D_SceneGeometry.src \
+    chart2/source/controller/dialogs/tp_3D_SceneIllumination.src \
+    chart2/source/controller/dialogs/tp_AxisLabel.src \
+    chart2/source/controller/dialogs/tp_AxisPositions.src \
+    chart2/source/controller/dialogs/tp_ChartType.src \
+    chart2/source/controller/dialogs/tp_DataLabel.src \
+    chart2/source/controller/dialogs/tp_DataSource.src \
+    chart2/source/controller/dialogs/tp_ErrorBars.src \
+    chart2/source/controller/dialogs/tp_LegendPosition.src \
+    chart2/source/controller/dialogs/tp_PointGeometry.src \
+    chart2/source/controller/dialogs/tp_PolarOptions.src \
+    chart2/source/controller/dialogs/tp_RangeChooser.src \
+    chart2/source/controller/dialogs/tp_Scale.src \
+    chart2/source/controller/dialogs/tp_SeriesToAxis.src \
+    chart2/source/controller/dialogs/tp_TitleRotation.src \
+    chart2/source/controller/dialogs/tp_Trendline.src \
+    chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src \
+    chart2/source/controller/menus/ShapeContextMenu.src \
+    chart2/source/controller/menus/ShapeEditContextMenu.src \
+))
+
+$(eval $(call gb_SrsTarget_add_templates,chart2/res,\
+    chart2/source/controller/dialogs/res_DataLabel_tmpl.hrc \
+    chart2/source/controller/dialogs/res_ErrorBar_tmpl.hrc \
+    chart2/source/controller/dialogs/res_LegendPosition_tmpl.hrc \
+    chart2/source/controller/dialogs/res_SecondaryAxisCheckBoxes_tmpl.hrc \
+    chart2/source/controller/dialogs/res_Titlesx_tmpl.hrc \
+    chart2/source/controller/dialogs/res_Trendline_tmpl.hrc \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/chart2/JunitTest_chart2_unoapi.mk b/chart2/JunitTest_chart2_unoapi.mk
new file mode 100644
index 000000000000..1571f3dde8cb
--- /dev/null
+++ b/chart2/JunitTest_chart2_unoapi.mk
@@ -0,0 +1,49 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Bjoern Michaelsen, Canonical Ltd. <bjoern.michaelsen@canonical.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_JunitTest_JunitTest,chart2_unoapi))
+
+$(eval $(call gb_JunitTest_set_defs,chart2_unoapi,\
+    $$(DEFS) \
+    -Dorg.openoffice.test.arg.sce=$(SRCDIR)/chart2/qa/unoapi/sch.sce \
+    -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/chart2/qa/unoapi/knownissues.xcl \
+    -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/chart2/qa/unoapi/testdocuments \
+))
+
+$(eval $(call gb_JunitTest_add_jars,chart2_unoapi,\
+    $(OUTDIR)/bin/OOoRunner.jar \
+    $(OUTDIR)/bin/ridl.jar \
+    $(OUTDIR)/bin/test.jar \
+    $(OUTDIR)/bin/unoil.jar \
+    $(OUTDIR)/bin/jurt.jar \
+))
+
+$(eval $(call gb_JunitTest_add_classes,chart2_unoapi,\
+    org.openoffice.test.UnoApiTest \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk
new file mode 100644
index 000000000000..b717c2ddadee
--- /dev/null
+++ b/chart2/Library_chartcontroller.mk
@@ -0,0 +1,220 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       David Tardon, Red Hat Inc. <dtardon@redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,chartcontroller))
+
+$(eval $(call gb_Library_add_precompiled_header,chartcontroller,$(SRCDIR)/chart2/inc/pch/precompiled_chart2))
+
+$(eval $(call gb_Library_set_include,chartcontroller,\
+    $$(INCLUDE) \
+    -I$(realpath $(SRCDIR)/chart2/inc/pch) \
+    -I$(realpath $(SRCDIR)/chart2/source/controller/inc) \
+    -I$(realpath $(SRCDIR)/chart2/source/inc) \
+    -I$(OUTDIR)/inc \
+    -I$(OUTDIR)/inc/offuh \
+))
+
+# TODO: is this still necessary?
+# (from chart2/source/controller/dialogs/makefile.mk)
+# # i26518 the gcc-3.0.4 requires to enhance the template-depth
+# # this seems to be a compiler issue, so we recommend not to use 3.0.x anymore
+# .IF "$(COM)"=="GCC"
+#     CFLAGS+=-ftemplate-depth-128
+# .ENDIF
+
+$(eval $(call gb_Library_add_linked_libs,chartcontroller,\
+    basegfx \
+    charttools \
+    chartview \
+    comphelper \
+    cppu \
+    cppuhelper \
+    drawinglayer \
+    editeng \
+    sal \
+    sfx \
+    sot \
+    svl \
+    svt \
+    svxcore \
+    svx \
+    tk \
+    tl \
+    ucbhelper \
+    utl \
+    vcl \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_set_componentfile,chartcontroller,chart2/source/controller/chartcontroller))
+
+$(eval $(call gb_Library_add_exception_objects,chartcontroller,\
+    chart2/source/controller/accessibility/AccessibleBase \
+    chart2/source/controller/accessibility/AccessibleChartElement \
+    chart2/source/controller/accessibility/AccessibleChartShape \
+    chart2/source/controller/accessibility/AccessibleChartView \
+    chart2/source/controller/accessibility/AccessibleTextHelper \
+    chart2/source/controller/accessibility/AccessibleViewForwarder \
+    chart2/source/controller/accessibility/ChartElementFactory \
+    chart2/source/controller/chartapiwrapper/AreaWrapper \
+    chart2/source/controller/chartapiwrapper/AxisWrapper \
+    chart2/source/controller/chartapiwrapper/Chart2ModelContact \
+    chart2/source/controller/chartapiwrapper/ChartDataWrapper \
+    chart2/source/controller/chartapiwrapper/ChartDocumentWrapper \
+    chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper \
+    chart2/source/controller/chartapiwrapper/DiagramWrapper \
+    chart2/source/controller/chartapiwrapper/GridWrapper \
+    chart2/source/controller/chartapiwrapper/LegendWrapper \
+    chart2/source/controller/chartapiwrapper/MinMaxLineWrapper \
+    chart2/source/controller/chartapiwrapper/TitleWrapper \
+    chart2/source/controller/chartapiwrapper/UpDownBarWrapper \
+    chart2/source/controller/chartapiwrapper/WallFloorWrapper \
+    chart2/source/controller/chartapiwrapper/WrappedAddInProperty \
+    chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties \
+    chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties \
+    chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty \
+    chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties \
+    chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty \
+    chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty \
+    chart2/source/controller/chartapiwrapper/WrappedScaleProperty \
+    chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties \
+    chart2/source/controller/chartapiwrapper/WrappedSceneProperty \
+    chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty \
+    chart2/source/controller/chartapiwrapper/WrappedSplineProperties \
+    chart2/source/controller/chartapiwrapper/WrappedStatisticProperties \
+    chart2/source/controller/chartapiwrapper/WrappedStockProperties \
+    chart2/source/controller/chartapiwrapper/WrappedSymbolProperties \
+    chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty \
+    chart2/source/controller/dialogs/ChangingResource \
+    chart2/source/controller/dialogs/ChartTypeDialogController \
+    chart2/source/controller/dialogs/DataBrowser \
+    chart2/source/controller/dialogs/DataBrowserModel \
+    chart2/source/controller/dialogs/DialogModel \
+    chart2/source/controller/dialogs/dlg_ChartType \
+    chart2/source/controller/dialogs/dlg_ChartType_UNO \
+    chart2/source/controller/dialogs/dlg_CreationWizard \
+    chart2/source/controller/dialogs/dlg_CreationWizard_UNO \
+    chart2/source/controller/dialogs/dlg_DataEditor \
+    chart2/source/controller/dialogs/dlg_DataSource \
+    chart2/source/controller/dialogs/dlg_InsertAxis_Grid \
+    chart2/source/controller/dialogs/dlg_InsertDataLabel \
+    chart2/source/controller/dialogs/dlg_InsertErrorBars \
+    chart2/source/controller/dialogs/dlg_InsertLegend \
+    chart2/source/controller/dialogs/dlg_InsertTitle \
+    chart2/source/controller/dialogs/dlg_InsertTrendline \
+    chart2/source/controller/dialogs/dlg_NumberFormat \
+    chart2/source/controller/dialogs/dlg_ObjectProperties \
+    chart2/source/controller/dialogs/dlg_ShapeFont \
+    chart2/source/controller/dialogs/dlg_ShapeParagraph \
+    chart2/source/controller/dialogs/dlg_View3D \
+    chart2/source/controller/dialogs/ObjectNameProvider \
+    chart2/source/controller/dialogs/RangeEdit \
+    chart2/source/controller/dialogs/RangeSelectionButton \
+    chart2/source/controller/dialogs/RangeSelectionHelper \
+    chart2/source/controller/dialogs/RangeSelectionListener \
+    chart2/source/controller/dialogs/res_BarGeometry \
+    chart2/source/controller/dialogs/res_DataLabel \
+    chart2/source/controller/dialogs/res_ErrorBar \
+    chart2/source/controller/dialogs/res_LegendPosition \
+    chart2/source/controller/dialogs/res_TextSeparator \
+    chart2/source/controller/dialogs/res_Titles \
+    chart2/source/controller/dialogs/res_Trendline \
+    chart2/source/controller/dialogs/TextDirectionListBox \
+    chart2/source/controller/dialogs/TimerTriggeredControllerLock \
+    chart2/source/controller/dialogs/TitleDialogData \
+    chart2/source/controller/dialogs/tp_3D_SceneAppearance \
+    chart2/source/controller/dialogs/tp_3D_SceneGeometry \
+    chart2/source/controller/dialogs/tp_3D_SceneIllumination \
+    chart2/source/controller/dialogs/tp_AxisLabel \
+    chart2/source/controller/dialogs/tp_AxisPositions \
+    chart2/source/controller/dialogs/tp_ChartType \
+    chart2/source/controller/dialogs/tp_DataLabel \
+    chart2/source/controller/dialogs/tp_DataSourceControls \
+    chart2/source/controller/dialogs/tp_DataSource \
+    chart2/source/controller/dialogs/tp_ErrorBars \
+    chart2/source/controller/dialogs/tp_LegendPosition \
+    chart2/source/controller/dialogs/tp_PointGeometry \
+    chart2/source/controller/dialogs/tp_PolarOptions \
+    chart2/source/controller/dialogs/tp_RangeChooser \
+    chart2/source/controller/dialogs/tp_Scale \
+    chart2/source/controller/dialogs/tp_SeriesToAxis \
+    chart2/source/controller/dialogs/tp_TitleRotation \
+    chart2/source/controller/dialogs/tp_Trendline \
+    chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects \
+    chart2/source/controller/drawinglayer/DrawViewWrapper \
+    chart2/source/controller/drawinglayer/ViewElementListProvider \
+    chart2/source/controller/itemsetwrapper/AxisItemConverter \
+    chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter \
+    chart2/source/controller/itemsetwrapper/DataPointItemConverter \
+    chart2/source/controller/itemsetwrapper/ErrorBarItemConverter \
+    chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter \
+    chart2/source/controller/itemsetwrapper/ItemConverter \
+    chart2/source/controller/itemsetwrapper/LegendItemConverter \
+    chart2/source/controller/itemsetwrapper/MultipleChartConverters \
+    chart2/source/controller/itemsetwrapper/MultipleItemConverter \
+    chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter \
+    chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter \
+    chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter \
+    chart2/source/controller/itemsetwrapper/StatisticsItemConverter \
+    chart2/source/controller/itemsetwrapper/TitleItemConverter \
+    chart2/source/controller/main/ChartController \
+    chart2/source/controller/main/ChartController_EditData \
+    chart2/source/controller/main/ChartController_Insert \
+    chart2/source/controller/main/ChartController_Position \
+    chart2/source/controller/main/ChartController_Properties \
+    chart2/source/controller/main/ChartController_TextEdit \
+    chart2/source/controller/main/ChartController_Tools \
+    chart2/source/controller/main/ChartController_Window \
+    chart2/source/controller/main/ChartDropTargetHelper \
+    chart2/source/controller/main/ChartFrameloader \
+    chart2/source/controller/main/ChartModelClone \
+    chart2/source/controller/main/ChartRenderer \
+    chart2/source/controller/main/ChartTransferable \
+    chart2/source/controller/main/ChartWindow \
+    chart2/source/controller/main/CommandDispatchContainer \
+    chart2/source/controller/main/CommandDispatch \
+    chart2/source/controller/main/ConfigurationAccess \
+    chart2/source/controller/main/ControllerCommandDispatch \
+    chart2/source/controller/main/DragMethod_Base \
+    chart2/source/controller/main/DragMethod_PieSegment \
+    chart2/source/controller/main/DragMethod_RotateDiagram \
+    chart2/source/controller/main/DrawCommandDispatch \
+    chart2/source/controller/main/ElementSelector \
+    chart2/source/controller/main/FeatureCommandDispatchBase \
+    chart2/source/controller/main/ObjectHierarchy \
+    chart2/source/controller/main/PositionAndSizeHelper \
+    chart2/source/controller/main/SelectionHelper \
+    chart2/source/controller/main/_serviceregistration_controller \
+    chart2/source/controller/main/ShapeController \
+    chart2/source/controller/main/ShapeToolbarController \
+    chart2/source/controller/main/StatusBarCommandDispatch \
+    chart2/source/controller/main/UndoActions \
+    chart2/source/controller/main/UndoCommandDispatch \
+    chart2/source/controller/main/UndoGuard \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/chart2/Library_chartmodel.mk b/chart2/Library_chartmodel.mk
new file mode 100644
index 000000000000..cf258737e1bc
--- /dev/null
+++ b/chart2/Library_chartmodel.mk
@@ -0,0 +1,118 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       David Tardon, Red Hat Inc. <dtardon@redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,chartmodel))
+
+$(eval $(call gb_Library_add_precompiled_header,chartmodel,$(SRCDIR)/chart2/inc/pch/precompiled_chart2))
+
+$(eval $(call gb_Library_set_include,chartmodel,\
+    $$(INCLUDE) \
+    -I$(realpath $(SRCDIR)/chart2/inc/pch) \
+    -I$(realpath $(SRCDIR)/chart2/source/model/inc) \
+    -I$(realpath $(SRCDIR)/chart2/source/inc) \
+    -I$(OUTDIR)/inc \
+    -I$(OUTDIR)/inc/offuh \
+))
+
+# TODO: is this still necessary?
+# (from chart2/source/model/template/makefile.mk)
+# # i26518 the gcc-3.0.4 requires to enhance the template-depth
+# # this seems to be a compiler issue, so we recommend not to use 3.0.x anymore
+# .IF "$(COM)"=="GCC" 
+#     CFLAGS+=-ftemplate-depth-128
+# .ENDIF
+
+$(eval $(call gb_Library_add_linked_libs,chartmodel,\
+    charttools \
+    comphelper \
+    cppu \
+    cppuhelper \
+    fwe \
+    sal \
+    svl \
+    svt \
+    ucbhelper \
+    utl \
+    vcl \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_set_componentfile,chartmodel,chart2/source/model/chartmodel))
+
+$(eval $(call gb_Library_add_exception_objects,chartmodel,\
+    chart2/source/model/filter/XMLFilter \
+    chart2/source/model/main/Axis \
+    chart2/source/model/main/BaseCoordinateSystem \
+    chart2/source/model/main/CartesianCoordinateSystem \
+    chart2/source/model/main/ChartModel \
+    chart2/source/model/main/ChartModel_Persistence \
+    chart2/source/model/main/DataPoint \
+    chart2/source/model/main/DataPointProperties \
+    chart2/source/model/main/DataSeries \
+    chart2/source/model/main/DataSeriesProperties \
+    chart2/source/model/main/Diagram \
+    chart2/source/model/main/FormattedString \
+    chart2/source/model/main/GridProperties \
+    chart2/source/model/main/Legend \
+    chart2/source/model/main/PageBackground \
+    chart2/source/model/main/PolarCoordinateSystem \
+    chart2/source/model/main/_serviceregistration_model \
+    chart2/source/model/main/StockBar \
+    chart2/source/model/main/Title \
+    chart2/source/model/main/UndoManager \
+    chart2/source/model/main/Wall \
+    chart2/source/model/template/AreaChartType \
+    chart2/source/model/template/AreaChartTypeTemplate \
+    chart2/source/model/template/BarChartType \
+    chart2/source/model/template/BarChartTypeTemplate \
+    chart2/source/model/template/BubbleChartType \
+    chart2/source/model/template/BubbleChartTypeTemplate \
+    chart2/source/model/template/BubbleDataInterpreter \
+    chart2/source/model/template/CandleStickChartType \
+    chart2/source/model/template/ChartType \
+    chart2/source/model/template/ChartTypeManager \
+    chart2/source/model/template/ChartTypeTemplate \
+    chart2/source/model/template/ColumnChartType \
+    chart2/source/model/template/ColumnLineChartTypeTemplate \
+    chart2/source/model/template/ColumnLineDataInterpreter \
+    chart2/source/model/template/DataInterpreter \
+    chart2/source/model/template/FilledNetChartType \
+    chart2/source/model/template/LineChartType \
+    chart2/source/model/template/LineChartTypeTemplate \
+    chart2/source/model/template/NetChartType \
+    chart2/source/model/template/NetChartTypeTemplate \
+    chart2/source/model/template/PieChartType \
+    chart2/source/model/template/PieChartTypeTemplate \
+    chart2/source/model/template/ScatterChartType \
+    chart2/source/model/template/ScatterChartTypeTemplate \
+    chart2/source/model/template/_serviceregistration_charttypes \
+    chart2/source/model/template/StockChartTypeTemplate \
+    chart2/source/model/template/StockDataInterpreter \
+    chart2/source/model/template/XYDataInterpreter \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/chart2/Library_charttools.mk b/chart2/Library_charttools.mk
new file mode 100644
index 000000000000..2bf40ca05750
--- /dev/null
+++ b/chart2/Library_charttools.mk
@@ -0,0 +1,131 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       David Tardon, Red Hat Inc. <dtardon@redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,charttools))
+
+$(eval $(call gb_Library_add_precompiled_header,charttools,$(SRCDIR)/chart2/inc/pch/precompiled_chart2))
+
+$(eval $(call gb_Library_set_include,charttools,\
+    $$(INCLUDE) \
+    -I$(realpath $(SRCDIR)/chart2/inc/pch) \
+    -I$(realpath $(SRCDIR)/chart2/source/inc) \
+    -I$(OUTDIR)/inc \
+    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_set_defs,charttools,\
+    $$(DEFS) \
+    -DOOO_DLLIMPLEMENTATION_CHARTTOOLS \
+))
+
+$(eval $(call gb_Library_add_linked_libs,charttools,\
+    basegfx \
+    comphelper \
+    cppu \
+    cppuhelper \
+    i18nisolang1 \
+    sal \
+    svl \
+    tl \
+    utl \
+    vcl \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_set_componentfile,charttools,chart2/source/tools/charttools))
+
+$(eval $(call gb_Library_add_exception_objects,charttools,\
+    chart2/source/tools/AxisHelper \
+    chart2/source/tools/BaseGFXHelper \
+    chart2/source/tools/CachedDataSequence \
+    chart2/source/tools/CharacterProperties \
+    chart2/source/tools/ChartDebugTrace \
+    chart2/source/tools/ChartModelHelper \
+    chart2/source/tools/ChartTypeHelper \
+    chart2/source/tools/ChartViewHelper \
+    chart2/source/tools/ColorPerPointHelper \
+    chart2/source/tools/CommonConverters \
+    chart2/source/tools/ConfigColorScheme \
+    chart2/source/tools/ControllerLockGuard \
+    chart2/source/tools/DataSeriesHelper \
+    chart2/source/tools/DataSource \
+    chart2/source/tools/DataSourceHelper \
+    chart2/source/tools/DiagramHelper \
+    chart2/source/tools/ErrorBar \
+    chart2/source/tools/ExplicitCategoriesProvider \
+    chart2/source/tools/ExponentialRegressionCurveCalculator \
+    chart2/source/tools/FillProperties \
+    chart2/source/tools/FormattedStringHelper \
+    chart2/source/tools/ImplOPropertySet \
+    chart2/source/tools/InternalData \
+    chart2/source/tools/InternalDataProvider \
+    chart2/source/tools/LabeledDataSequence \
+    chart2/source/tools/LegendHelper \
+    chart2/source/tools/LifeTime \
+    chart2/source/tools/LinearRegressionCurveCalculator \
+    chart2/source/tools/LineProperties \
+    chart2/source/tools/LogarithmicRegressionCurveCalculator \
+    chart2/source/tools/MeanValueRegressionCurveCalculator \
+    chart2/source/tools/MediaDescriptorHelper \
+    chart2/source/tools/ModifyListenerCallBack \
+    chart2/source/tools/ModifyListenerHelper \
+    chart2/source/tools/MutexContainer \
+    chart2/source/tools/NameContainer \
+    chart2/source/tools/NumberFormatterWrapper \
+    chart2/source/tools/ObjectIdentifier \
+    chart2/source/tools/OPropertySet \
+    chart2/source/tools/PotentialRegressionCurveCalculator \
+    chart2/source/tools/PropertyHelper \
+    chart2/source/tools/RangeHighlighter \
+    chart2/source/tools/ReferenceSizeProvider \
+    chart2/source/tools/RegressionCurveCalculator \
+    chart2/source/tools/RegressionCurveHelper \
+    chart2/source/tools/RegressionCurveModel \
+    chart2/source/tools/RegressionEquation \
+    chart2/source/tools/RelativePositionHelper \
+    chart2/source/tools/RelativeSizeHelper \
+    chart2/source/tools/ResId \
+    chart2/source/tools/RessourceManager \
+    chart2/source/tools/Scaling \
+    chart2/source/tools/SceneProperties \
+    chart2/source/tools/_serviceregistration_tools \
+    chart2/source/tools/StatisticsHelper \
+    chart2/source/tools/ThreeDHelper \
+    chart2/source/tools/TitleHelper \
+    chart2/source/tools/TrueGuard \
+    chart2/source/tools/UncachedDataSequence \
+    chart2/source/tools/UserDefinedProperties \
+    chart2/source/tools/WeakListenerAdapter \
+    chart2/source/tools/WrappedDefaultProperty \
+    chart2/source/tools/WrappedDirectStateProperty \
+    chart2/source/tools/WrappedIgnoreProperty \
+    chart2/source/tools/WrappedProperty \
+    chart2/source/tools/WrappedPropertySet \
+    chart2/source/tools/XMLRangeHelper \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/chart2/Library_chartview.mk b/chart2/Library_chartview.mk
new file mode 100644
index 000000000000..802a13d40728
--- /dev/null
+++ b/chart2/Library_chartview.mk
@@ -0,0 +1,118 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       David Tardon, Red Hat Inc. <dtardon@redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,chartview))
+
+$(eval $(call gb_Library_add_precompiled_header,chartview,$(SRCDIR)/chart2/inc/pch/precompiled_chart2))
+
+$(eval $(call gb_Library_set_include,chartview,\
+    $$(INCLUDE) \
+    -I$(realpath $(SRCDIR)/chart2/inc/pch) \
+    -I$(realpath $(SRCDIR)/chart2/source/view/inc) \
+    -I$(realpath $(SRCDIR)/chart2/source/inc) \
+    -I$(OUTDIR)/inc \
+    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_set_defs,chartview,\
+    $$(DEFS) \
+    -DOOO_DLLIMPLEMENTATION_CHARTVIEW \
+))
+
+$(eval $(call gb_Library_add_linked_libs,chartview,\
+    basegfx \
+    charttools \
+    comphelper \
+    cppu \
+    cppuhelper \
+    editeng \
+    sal \
+    sfx \
+    svl \
+    svt \
+    svxcore \
+    tl \
+    utl \
+    vcl \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_set_componentfile,chartview,chart2/source/view/chartview))
+
+$(eval $(call gb_Library_add_exception_objects,chartview,\
+    chart2/source/view/axes/DateHelper \
+    chart2/source/view/axes/DateScaling \
+    chart2/source/view/axes/MinimumAndMaximumSupplier \
+    chart2/source/view/axes/ScaleAutomatism \
+    chart2/source/view/axes/Tickmarks \
+    chart2/source/view/axes/Tickmarks_Dates \
+    chart2/source/view/axes/Tickmarks_Equidistant \
+    chart2/source/view/axes/VAxisBase \
+    chart2/source/view/axes/VAxisOrGridBase \
+    chart2/source/view/axes/VAxisProperties \
+    chart2/source/view/axes/VCartesianAxis \
+    chart2/source/view/axes/VCartesianCoordinateSystem \
+    chart2/source/view/axes/VCartesianGrid \
+    chart2/source/view/axes/VCoordinateSystem \
+    chart2/source/view/axes/VPolarAngleAxis \
+    chart2/source/view/axes/VPolarAxis \
+    chart2/source/view/axes/VPolarCoordinateSystem \
+    chart2/source/view/axes/VPolarGrid \
+    chart2/source/view/axes/VPolarRadiusAxis \
+    chart2/source/view/charttypes/AreaChart \
+    chart2/source/view/charttypes/BarChart \
+    chart2/source/view/charttypes/BarPositionHelper \
+    chart2/source/view/charttypes/BubbleChart \
+    chart2/source/view/charttypes/CandleStickChart \
+    chart2/source/view/charttypes/CategoryPositionHelper \
+    chart2/source/view/charttypes/PieChart \
+    chart2/source/view/charttypes/Splines \
+    chart2/source/view/charttypes/VSeriesPlotter \
+    chart2/source/view/diagram/VDiagram \
+    chart2/source/view/main/ChartItemPool \
+    chart2/source/view/main/ChartView \
+    chart2/source/view/main/Clipping \
+    chart2/source/view/main/DataPointSymbolSupplier \
+    chart2/source/view/main/DrawModelWrapper \
+    chart2/source/view/main/LabelPositionHelper \
+    chart2/source/view/main/Linear3DTransformation \
+    chart2/source/view/main/PlotterBase \
+    chart2/source/view/main/PlottingPositionHelper \
+    chart2/source/view/main/PolarLabelPositionHelper \
+    chart2/source/view/main/PropertyMapper \
+    chart2/source/view/main/_serviceregistration_view \
+    chart2/source/view/main/ShapeFactory \
+    chart2/source/view/main/Stripe \
+    chart2/source/view/main/VDataSeries \
+    chart2/source/view/main/VLegend \
+    chart2/source/view/main/VLegendSymbolFactory \
+    chart2/source/view/main/VLineProperties \
+    chart2/source/view/main/VPolarTransformation \
+    chart2/source/view/main/VTitle \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/chart2/util/target.pmk b/chart2/Makefile
index 79f6dc2f2410..a79aff831024 100644
--- a/chart2/util/target.pmk
+++ b/chart2/Makefile
@@ -1,4 +1,3 @@
-# -*- makefile -*-
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -25,8 +24,15 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-$(OUT)$/misc$/$(TARGET).idls: makefile.mk
-    -$(RM) $@
-    $(TYPE) $(mktmp $(foreach,i,$(IDLFILES) $(PACKAGE)$/$i)) >>$@
 
-ALLTAR: $(OUT)$/misc$/$(TARGET).idls
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/chart2/Module_chart2.mk b/chart2/Module_chart2.mk
new file mode 100644
index 000000000000..24a0b3af833a
--- /dev/null
+++ b/chart2/Module_chart2.mk
@@ -0,0 +1,43 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Bjoern Michaelsen, Canonical Ltd. <bjoern.michaelsen@canonical.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Module_Module,chart2))
+
+$(eval $(call gb_Module_add_targets,chart2,\
+    AllLangResTarget_chartcontroller \
+    Library_chartcontroller \
+    Library_chartmodel \
+    Library_charttools \
+    Library_chartview \
+    Package_uiconfig \
+))
+
+$(eval $(call gb_Module_add_subsequentcheck_targets,chart2,\
+    JunitTest_chart2_unoapi \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/chart2/Package_uiconfig.mk b/chart2/Package_uiconfig.mk
new file mode 100644
index 000000000000..a0814719b3d5
--- /dev/null
+++ b/chart2/Package_uiconfig.mk
@@ -0,0 +1,44 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       David Tardon, Red Hat Inc. <dtardon@redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,chart2_uiconfig,$(SRCDIR)/chart2/uiconfig))
+
+# TODO: this was not listed in d.lst
+# $(eval $(call gb_Package_add_file,chart2_uiconfig,xml/uiconfig/modules/schart/accelerator/en-US/default.xml,accelerator/en-US/default.xml))
+$(eval $(call gb_Package_add_file,chart2_uiconfig,xml/uiconfig/modules/schart/menubar/menubar.xml,menubar/menubar.xml))
+$(eval $(call gb_Package_add_file,chart2_uiconfig,xml/uiconfig/modules/schart/statusbar/statusbar.xml,statusbar/statusbar.xml))
+$(eval $(call gb_Package_add_file,chart2_uiconfig,xml/uiconfig/modules/schart/toolbar/arrowshapes.xml,toolbar/arrowshapes.xml))
+$(eval $(call gb_Package_add_file,chart2_uiconfig,xml/uiconfig/modules/schart/toolbar/basicshapes.xml,toolbar/basicshapes.xml))
+$(eval $(call gb_Package_add_file,chart2_uiconfig,xml/uiconfig/modules/schart/toolbar/calloutshapes.xml,toolbar/calloutshapes.xml))
+$(eval $(call gb_Package_add_file,chart2_uiconfig,xml/uiconfig/modules/schart/toolbar/drawbar.xml,toolbar/drawbar.xml))
+$(eval $(call gb_Package_add_file,chart2_uiconfig,xml/uiconfig/modules/schart/toolbar/flowchartshapes.xml,toolbar/flowchartshapes.xml))
+$(eval $(call gb_Package_add_file,chart2_uiconfig,xml/uiconfig/modules/schart/toolbar/standardbar.xml,toolbar/standardbar.xml))
+$(eval $(call gb_Package_add_file,chart2_uiconfig,xml/uiconfig/modules/schart/toolbar/starshapes.xml,toolbar/starshapes.xml))
+$(eval $(call gb_Package_add_file,chart2_uiconfig,xml/uiconfig/modules/schart/toolbar/symbolshapes.xml,toolbar/symbolshapes.xml))
+$(eval $(call gb_Package_add_file,chart2_uiconfig,xml/uiconfig/modules/schart/toolbar/toolbar.xml,toolbar/toolbar.xml))
+
+# vim: set noet ts=4 sw=4:
diff --git a/chart2/inc/makefile.mk b/chart2/inc/makefile.mk
deleted file mode 100644
index e3e7d19cd3ed..000000000000
--- a/chart2/inc/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..
-
-PRJNAME=chart2
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
diff --git a/chart2/inc/pch/precompiled_chart2.cxx b/chart2/inc/pch/precompiled_chart2.cxx
index a1ea4db5fe99..d1c378632c2a 100644
--- a/chart2/inc/pch/precompiled_chart2.cxx
+++ b/chart2/inc/pch/precompiled_chart2.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,3 +28,4 @@
 
 #include "precompiled_chart2.hxx"
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/inc/pch/precompiled_chart2.hxx b/chart2/inc/pch/precompiled_chart2.hxx
index fed813c55c76..8fc5070c1af8 100755..100644
--- a/chart2/inc/pch/precompiled_chart2.hxx
+++ b/chart2/inc/pch/precompiled_chart2.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -270,6 +271,8 @@
 
 #include "tools/fldunit.hxx"
 
-#include "vos/mutex.hxx"
+#include "osl/mutex.hxx"
 //---MARKER---
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/prj/build.lst b/chart2/prj/build.lst
index 5b534700a4f0..ac3381587de3 100644
--- a/chart2/prj/build.lst
+++ b/chart2/prj/build.lst
@@ -1,27 +1,3 @@
-ch	chart2	:    offapi offuh L10N:l10n comphelper cppu cppuhelper sal svtools svx tools vcl toolkit unotools sfx2 LIBXSLT:libxslt NULL
+ch	chart2	:    offapi offuh TRANSLATIONS:translations comphelper cppu cppuhelper sal svtools svx tools vcl toolkit unotools sfx2 LIBXSLT:libxslt NULL
 ch	chart2										usr1	-	all	ch_mkout NULL
-ch	chart2\inc									nmake	-	all	ch_inc NULL
-ch	chart2\source\inc							get		-	all	ch_source_inc NULL
-ch	chart2\source\inc\chartview					get		-	all	ch_source_inc_chartview NULL
-ch	chart2\source\tools							nmake	-	all	ch_source_tools ch_inc NULL
-ch	chart2\source\model							nmake	-	all	ch_source_model ch_source_tools ch_source_model_main ch_source_model_template ch_source_model_filter ch_inc NULL
-ch	chart2\source\model\main					nmake	-	all ch_source_model_main ch_inc NULL
-ch	chart2\source\model\template				nmake	-	all ch_source_model_template ch_inc NULL
-ch	chart2\source\model\filter					nmake	-	all ch_source_model_filter ch_inc NULL
-ch	chart2\source\view							nmake	-	all	ch_source_view ch_source_tools ch_source_view_charttypes ch_source_view_axes ch_source_view_diagram ch_source_view_main ch_inc NULL
-ch	chart2\source\view\inc						get		-	all	ch_source_view_inc NULL
-ch	chart2\source\view\axes						nmake	-	all	ch_source_view_axes ch_source_tools ch_inc NULL
-ch	chart2\source\view\charttypes				nmake	-	all	ch_source_view_charttypes ch_inc NULL
-ch	chart2\source\view\diagram					nmake	-	all	ch_source_view_diagram ch_inc NULL
-ch	chart2\source\view\main						nmake	-	all	ch_source_view_main ch_inc NULL
-ch	chart2\source\controller					nmake	-	all	ch_source_controller ch_source_tools ch_source_view ch_source_controller_drawinglayer ch_source_controller_itemsetwrapper ch_source_controller_dialogs ch_source_controller_main ch_source_controller_chartapiwrapper ch_source_controller_accessibility ch_inc ch_source_controller_menus NULL
-ch	chart2\source\controller\inc				get		-	all	ch_source_controller_inc NULL
-ch	chart2\source\controller\accessibility		nmake	-	all	ch_source_controller_accessibility ch_inc NULL
-ch	chart2\source\controller\dialogs			nmake	-	all	ch_source_controller_dialogs ch_inc NULL
-ch	chart2\source\controller\drawinglayer		nmake	-	all	ch_source_controller_drawinglayer ch_inc NULL
-ch	chart2\source\controller\itemsetwrapper		nmake	-	all	ch_source_controller_itemsetwrapper ch_inc NULL
-ch  chart2\source\controller\chartapiwrapper	nmake   -   all ch_source_controller_chartapiwrapper ch_inc NULL
-ch	chart2\source\controller\main				nmake	-	all	ch_source_controller_main ch_inc NULL
-ch	chart2\source\controller\menus				nmake	-	all	ch_source_controller_menus ch_inc NULL
-ch	chart2\prj									get		-	all	ch_prj NULL
-ch	chart2\qa\unoapi                            nmake   -   all ch_qa_unoapi NULL
+ch	chart2\prj									nmake	-	all	ch_prj NULL
diff --git a/chart2/prj/d.lst b/chart2/prj/d.lst
index bf1085336c05..e69de29bb2d1 100644
--- a/chart2/prj/d.lst
+++ b/chart2/prj/d.lst
@@ -1,27 +0,0 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-mkdir: %_DEST%\xml%_EXT%\uiconfig
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\schart
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\schart\menubar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\schart\toolbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\schart\statusbar
-
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.jar
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl
-..\%__SRC%\bin\*.bin %_DEST%\bin%_EXT%\*.bin
-..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
-..\%__SRC%\bin\*.rdb %_DEST%\rdb%_EXT%\*.rdb
-
-..\uiconfig\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\schart\menubar\*.xml
-..\uiconfig\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\schart\toolbar\*.xml
-..\uiconfig\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\schart\statusbar\*.xml
-
-mkdir: %_DEST%\inc%_EXT%\chart2
-..\%__SRC%\misc\chartcontroller.component %_DEST%\xml%_EXT%\chartcontroller.component
-..\%__SRC%\misc\chartmodel.component %_DEST%\xml%_EXT%\chartmodel.component
-..\%__SRC%\misc\charttools.component %_DEST%\xml%_EXT%\charttools.component
-..\%__SRC%\misc\chartview.component %_DEST%\xml%_EXT%\chartview.component
diff --git a/chart2/chartview.pmk b/chart2/prj/makefile.mk
index eee577e42287..e312a7ccab65 100644..100755
--- a/chart2/chartview.pmk
+++ b/chart2/prj/makefile.mk
@@ -25,6 +25,16 @@
 #
 #*************************************************************************
 
-VISIBILITY_HIDDEN = TRUE
+PRJ=..
+TARGET=prj
 
-CDEFS += -DOOO_DLLIMPLEMENTATION_CHARTVIEW
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+all:
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/chart2/qa/makefile.mk b/chart2/qa/makefile.mk
deleted file mode 100644
index 0471e10e11a4..000000000000
--- a/chart2/qa/makefile.mk
+++ /dev/null
@@ -1,70 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJNAME	= chart2
-PRJ		= ..
-TARGET	= chart_qa
-
-PACKAGE = qa
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-MAXLINELENGTH = 100000
-
-# - rdb ----
-
-RDB 		= $(SOLARBINDIR)$/types.rdb
-JAVADIR 	= $(OUT)$/misc$/java
-JARFILES	= ridl.jar
-
-# --- Files --------------------------------------------------------
-
-JAVACLASSFILES = \
-    $(CLASSDIR)$/$(PACKAGE)$/TestCaseOldAPI.class
-
-JARFILES  = ridl.jar jurt.jar unoil.jar juh.jar OOoRunner.jar
-JAVAFILES = $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES)))
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-# --- Dependencies -------------------------------------------------
-
-# Note: define dependencies after including target.mk (otherwise no targets are
-# defined)
-
-ALLTAR: runtest
-
-# --- Rules --------------------------------------------------------
-
-runtest: $(subst,.class,.run $(JAVACLASSFILES))
-
-%.run: %.class
-    +@java -classpath $(CLASSPATH) org.openoffice.Runner -TestBase java_complex -o $(subst,$(CLASSDIR)$/$(PACKAGE)$/,$(PACKAGE). $(subst,.class, $<))
diff --git a/chart2/qa/unoapi/Test.java b/chart2/qa/unoapi/Test.java
deleted file mode 100644
index c1b6fd05983d..000000000000
--- a/chart2/qa/unoapi/Test.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*************************************************************************
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
-* Copyright 2000, 2010 Oracle and/or its affiliates.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org.  If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
-************************************************************************/
-
-package org.openoffice.chart2.qa.unoapi;
-
-import org.openoffice.Runner;
-import org.openoffice.test.OfficeConnection;
-import static org.junit.Assert.*;
-
-public final class Test {
-    @org.junit.Before public void setUp() throws Exception {
-        connection.setUp();
-    }
-
-    @org.junit.After public void tearDown()
-        throws InterruptedException, com.sun.star.uno.Exception
-    {
-        connection.tearDown();
-    }
-
-    @org.junit.Test public void test() {
-        assertTrue(
-            Runner.run(
-                "-sce", "sch.sce", "-xcl", "knownissues.xcl", "-tdoc",
-                "testdocuments", "-cs", connection.getDescription()));
-    }
-
-    private final OfficeConnection connection = new OfficeConnection();
-}
diff --git a/chart2/qa/unoapi/makefile.mk b/chart2/qa/unoapi/makefile.mk
deleted file mode 100644
index de494ead5449..000000000000
--- a/chart2/qa/unoapi/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#***********************************************************************/
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../..
-PRJNAME = chart2
-TARGET = qa_unoapi
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = org/openoffice/chart2/qa/unoapi
-JAVATESTFILES = Test.java
-JAVAFILES = $(JAVATESTFILES)
-JARFILES = OOoRunner.jar ridl.jar test.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
diff --git a/chart2/source/controller/accessibility/AccStatisticsObject.cxx b/chart2/source/controller/accessibility/AccStatisticsObject.cxx
index 9028973936e0..f9e852992772 100644
--- a/chart2/source/controller/accessibility/AccStatisticsObject.cxx
+++ b/chart2/source/controller/accessibility/AccStatisticsObject.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,27 +40,9 @@ namespace chart
 
 AccStatisticsObject::AccStatisticsObject( const AccessibleElementInfo& rAccInfo )
         : AccessibleChartElement( rAccInfo, false/*NoChildren*/, true/*AlwaysTransparent*/ )
-        //, m_eType( eType )
-        //, m_nSeriesIndex( nSeriesIndex )
-{
-//    ChartModel * pModel = GetChartModel();
-//    OSL_ASSERT( pModel );
 
-    // /-- solar
-    ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
-/*    switch( eType )
-    {
-        case MEAN_VAL_LINE:
-            SetItemSet( pModel->GetAverageAttr( m_nSeriesIndex ));
-            break;
-        case ERROR_BARS:
-            SetItemSet( pModel->GetErrorAttr( m_nSeriesIndex ));
-            break;
-        case REGRESSION:
-            SetItemSet( pModel->GetRegressAttr( m_nSeriesIndex ));
-            break;
-    }*/
-    // \-- solar
+{
+    SolarMutexGuard aSolarGuard;
 }
 
 AccStatisticsObject::~AccStatisticsObject()
@@ -79,3 +62,5 @@ OUString SAL_CALL AccStatisticsObject::getImplementationName()
 }
 
 }  // namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/accessibility/AccStatisticsObject.hxx b/chart2/source/controller/accessibility/AccStatisticsObject.hxx
index da09342cd8b0..a11951aaa42b 100644
--- a/chart2/source/controller/accessibility/AccStatisticsObject.hxx
+++ b/chart2/source/controller/accessibility/AccStatisticsObject.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,9 +28,7 @@
 #ifndef _CHART2_ACCSTATISTICSOBJECT_HXX
 #define _CHART2_ACCSTATISTICSOBJECT_HXX
 
-#ifndef _CHART2_ACCESSIBLE_CHART_ELEMENT_HXX_
 #include "AccessibleChartElement.hxx"
-#endif
 
 #include "ObjectIdentifier.hxx"
 
@@ -39,15 +38,6 @@ namespace chart
 class AccStatisticsObject : public AccessibleChartElement
 {
 public:
-    /*
-    enum StatisticsObjectType
-    {
-        MEAN_VAL_LINE = OBJECTTYPE_AVERAGEVALUE,
-        ERROR_BARS    = OBJECTTYPE_ERROR,
-        REGRESSION    = OBJECTTYPE_REGRESSION
-    };
-    */
-
     AccStatisticsObject( const AccessibleElementInfo& rAccInfo );
 
     virtual ~AccStatisticsObject();
@@ -57,12 +47,10 @@ public:
 
     // ________ XServiceInfo ________
     virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);
-
-private:
-    //const StatisticsObjectType    m_eType;
-    //const sal_uInt16              m_nSeriesIndex;
 };
 
 }  // accessibility
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx
index 00335eab296e..da0ffe71eca7 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -60,6 +61,7 @@
 #include <vcl/window.hxx>
 
 #include <algorithm>
+#include <o3tl/compat_functional.hxx>
 
 #include "ChartElementFactory.hxx"
 
@@ -199,12 +201,11 @@ bool AccessibleBase::NotifyEvent( EventType eEventType, const AccessibleUniqueId
     else if( m_bMayHaveChildren )
     {
         bool bStop = false;
-        // /--
+
         ClearableMutexGuard aGuard( GetMutex() );
         // make local copy for notification
         ChildListVectorType aLocalChildList( m_aChildList );
         aGuard.clear();
-        // \--
 
         ChildListVectorType::iterator aEndIter = aLocalChildList.end();
         for( ChildListVectorType::iterator aIter = aLocalChildList.begin() ;
@@ -244,7 +245,6 @@ bool AccessibleBase::UpdateChildren()
 {
     bool bMustUpdateChildren = false;
     {
-        // /--
         MutexGuard aGuard( GetMutex() );
         if( ! m_bMayHaveChildren ||
             m_bIsDisposed )
@@ -252,7 +252,6 @@ bool AccessibleBase::UpdateChildren()
 
         bMustUpdateChildren = ( m_bMayHaveChildren &&
                                 ! m_bChildrenInitialized );
-        // \--
     }
 
     // update unguarded
@@ -274,7 +273,7 @@ bool AccessibleBase::ImplUpdateChildren()
         aAccChildren.reserve( aModelChildren.size());
         ::std::transform( m_aChildOIDMap.begin(), m_aChildOIDMap.end(),
                           ::std::back_inserter( aAccChildren ),
-                          ::std::select1st< ChildOIDMap::value_type >());
+                          ::o3tl::select1st< ChildOIDMap::value_type >());
 
         ::std::sort( aModelChildren.begin(), aModelChildren.end());
 
@@ -318,7 +317,6 @@ void AccessibleBase::AddChild( AccessibleBase * pChild  )
     OSL_ENSURE( pChild != NULL, "Invalid Child" );
     if( pChild )
     {
-        // /--
         ClearableMutexGuard aGuard( GetMutex() );
 
         Reference< XAccessible > xChild( pChild );
@@ -333,10 +331,8 @@ void AccessibleBase::AddChild( AccessibleBase * pChild  )
             aNew <<= xChild;
 
             aGuard.clear();
-            // \-- (1st)
             BroadcastAccEvent( AccessibleEventId::CHILD, aNew, aEmpty );
         }
-        // \-- (2nd)
     }
 }
 
@@ -345,7 +341,6 @@ void AccessibleBase::AddChild( AccessibleBase * pChild  )
  */
 void AccessibleBase::RemoveChildByOId( const ObjectIdentifier& rOId )
 {
-    // /--
     ClearableMutexGuard aGuard( GetMutex() );
 
     ChildOIDMap::iterator aIt( m_aChildOIDMap.find( rOId ));
@@ -369,7 +364,6 @@ void AccessibleBase::RemoveChildByOId( const ObjectIdentifier& rOId )
 
         // call listeners unguarded
         aGuard.clear();
-        // \-- (1st)
 
         // inform listeners of removed child
         if( bInitialized )
@@ -392,18 +386,16 @@ awt::Point AccessibleBase::GetUpperLeftOnScreen() const
     awt::Point aResult;
     if( m_aAccInfo.m_pParent )
     {
-        // /--
         ClearableMutexGuard aGuard( GetMutex() );
         AccessibleBase * pParent = m_aAccInfo.m_pParent;
         aGuard.clear();
-        // \--
 
         if( pParent )
         {
             aResult = pParent->GetUpperLeftOnScreen();
         }
         else
-            OSL_ENSURE( false, "Default position used is probably incorrect." );
+            OSL_FAIL( "Default position used is probably incorrect." );
     }
 
     return aResult;
@@ -415,7 +407,6 @@ void AccessibleBase::BroadcastAccEvent(
     const Any & rOld,
     bool bSendGlobally ) const
 {
-    // /--
     ClearableMutexGuard aGuard( GetMutex() );
 
     if ( !m_nEventNotifierId && !bSendGlobally )
@@ -433,7 +424,6 @@ void AccessibleBase::BroadcastAccEvent(
         ::comphelper::AccessibleEventNotifier::addEvent( m_nEventNotifierId, aEvent );
 
     aGuard.clear();
-    // \--
 
     // send event to global message queue
     if( bSendGlobally )
@@ -444,7 +434,6 @@ void AccessibleBase::BroadcastAccEvent(
 
 void AccessibleBase::KillAllChildren()
 {
-    // /--
     ClearableMutexGuard aGuard( GetMutex() );
 
     // make local copy for notification
@@ -455,7 +444,6 @@ void AccessibleBase::KillAllChildren()
     m_aChildOIDMap.clear();
 
     aGuard.clear();
-    // \--
 
     // call dispose for all children
     // and notify listeners
@@ -506,7 +494,6 @@ AccessibleUniqueId AccessibleBase::GetId() const
 // ________ (XComponent::dispose) ________
 void SAL_CALL AccessibleBase::disposing()
 {
-    // /--
     ClearableMutexGuard aGuard( GetMutex() );
     OSL_ENSURE( ! m_bIsDisposed, "dispose() called twice" );
 
@@ -535,7 +522,6 @@ void SAL_CALL AccessibleBase::disposing()
 
     // call listeners unguarded
     aGuard.clear();
-    // \--
 
     if( m_bMayHaveChildren )
     {
@@ -556,7 +542,6 @@ Reference< XAccessibleContext > SAL_CALL AccessibleBase::getAccessibleContext()
 sal_Int32 SAL_CALL AccessibleBase::getAccessibleChildCount()
     throw (RuntimeException)
 {
-    // /--
     ClearableMutexGuard aGuard( GetMutex() );
     if( ! m_bMayHaveChildren ||
         m_bIsDisposed )
@@ -566,7 +551,6 @@ sal_Int32 SAL_CALL AccessibleBase::getAccessibleChildCount()
                                  ! m_bChildrenInitialized );
 
     aGuard.clear();
-    // \--
 
     // update unguarded
     if( bMustUpdateChildren )
@@ -587,13 +571,11 @@ Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleChild( sal_Int32
     CheckDisposeState();
     Reference< XAccessible > xResult;
 
-    // /--
     ResettableMutexGuard aGuard( GetMutex() );
     bool bMustUpdateChildren = ( m_bMayHaveChildren &&
                                  ! m_bChildrenInitialized );
 
     aGuard.clear();
-    // \--
 
     if( bMustUpdateChildren )
         UpdateChildren();
@@ -601,14 +583,13 @@ Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleChild( sal_Int32
     xResult.set( ImplGetAccessibleChildById( i ));
 
     return xResult;
-    // \--
 }
 
 Reference< XAccessible > AccessibleBase::ImplGetAccessibleChildById( sal_Int32 i ) const
     throw (lang::IndexOutOfBoundsException, RuntimeException)
 {
     Reference< XAccessible > xResult;
-    // /--
+
     MutexGuard aGuard( GetMutex());
     if( ! m_bMayHaveChildren ||
         i < 0 ||
@@ -726,11 +707,9 @@ Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleAtPoint( const aw
     if( ( aRect.X <= aPoint.X && aPoint.X <= (aRect.X + aRect.Width) ) &&
         ( aRect.Y <= aPoint.Y && aPoint.Y <= (aRect.Y + aRect.Height)))
     {
-        // /--
         ClearableMutexGuard aGuard( GetMutex() );
         ChildListVectorType aLocalChildList( m_aChildList );
         aGuard.clear();
-        // \--
 
         Reference< XAccessibleComponent > aComp;
         for( ChildListVectorType::const_iterator aIter = aLocalChildList.begin();
@@ -767,8 +746,7 @@ awt::Rectangle SAL_CALL AccessibleBase::getBounds()
             Rectangle aRect( aLogicRect.X, aLogicRect.Y,
                              aLogicRect.X + aLogicRect.Width,
                              aLogicRect.Y + aLogicRect.Height );
-            // /-- solar
-            ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+            SolarMutexGuard aSolarGuard;
             aRect = pWindow->LogicToPixel( aRect );
 
             // aLogicRect ist relative to the page, but we need a value relative
@@ -778,14 +756,12 @@ awt::Rectangle SAL_CALL AccessibleBase::getBounds()
             if( xParent.is() )
                 aParentLocOnScreen = xParent->getLocationOnScreen();
 
-            // aOffset = aParentLocOnScreen - GetUpperLeftOnScreen()
             awt::Point aULOnScreen = GetUpperLeftOnScreen();
             awt::Point aOffset( aParentLocOnScreen.X - aULOnScreen.X,
                                 aParentLocOnScreen.Y - aULOnScreen.Y );
 
             return awt::Rectangle( aRect.getX() - aOffset.X, aRect.getY() - aOffset.Y,
                                    aRect.getWidth(), aRect.getHeight());
-            // \-- solar
         }
     }
 
@@ -1008,3 +984,5 @@ void SAL_CALL AccessibleBase::removeEventListener( const Reference< XAccessibleE
 }
 
 } // namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.cxx b/chart2/source/controller/accessibility/AccessibleChartElement.cxx
index 2361cc62c389..d720e30fcb15 100644
--- a/chart2/source/controller/accessibility/AccessibleChartElement.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartElement.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -45,23 +46,6 @@
 #include <vcl/svapp.hxx>
 #include <rtl/ustrbuf.hxx>
 
-// #ifndef _RTL_UUID_H_
-// #include <rtl/uuid.h>
-// #endif
-// #ifndef _CPPUHELPER_QUERYINTERFACE_HXX_
-// #include <cppuhelper/queryinterface.hxx>
-// #endif
-// #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-// #include <toolkit/helper/vclunohelper.hxx>
-// #endif
-// #ifndef _SV_WINDOW_HXX
-// #include <vcl/window.hxx>
-// #endif
-
-// #ifndef _SVX_ACCESSILE_TEXT_HELPER_HXX_
-// #include <svx/AccessibleTextHelper.hxx>
-// #endif
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
 
@@ -146,30 +130,6 @@ void AccessibleChartElement::InitTextEdit()
             ASSERT_EXCEPTION( ex );
         }
 }
-//     OSL_ASSERT( m_pTextHelper == 0 );
-
-//     // /-- solar
-//     ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
-//     Window* pWindow( VCLUnoHelper::GetWindow( GetInfo().m_xWindow ));
-//     if( pWindow )
-//     {
-//         // we need ChartController::m_pDrawViewWrapper here
-//         SdrView * pView = 0;
-//         if( pView )
-//         {
-//             SdrObject * pTextObj = m_pDrawViewWrapper->getTextEditObject();
-//             if( pTextObj )
-//             {
-//                 SvxEditSource * pEditSource = new SvxEditSource( pTextObj, pView, pWindow );
-//                 m_pTextHelper = new ::accessibility::AccessibleTextHelper(
-//                     ::std::auto_ptr< SvxEditSource >( pEditSource ));
-//                 if( m_pTextHelper )
-//                     m_pTextHelper->SetEventSource( this );
-//             }
-//         }
-//     }
-//     // \-- solar
-// }
 
 // ____________________________________
 // ____________________________________
@@ -185,14 +145,7 @@ Reference< XAccessible > AccessibleChartElement::ImplGetAccessibleChildById( sal
     Reference< XAccessible > xResult;
 
     if( m_bHasText )
-    {
         xResult.set( m_xTextHelper->getAccessibleChild( i ));
-        // /-- solar
-//         ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
-//         if( m_pTextHelper )
-//             xResult.set( m_pTextHelper->GetChild( i ) );
-        // \-- solar
-    }
     else
         xResult.set( AccessibleBase::ImplGetAccessibleChildById( i ));
 
@@ -330,3 +283,5 @@ sal_Int32 SAL_CALL AccessibleChartElement::getBackground()
 
 
 } // namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.hxx b/chart2/source/controller/accessibility/AccessibleChartElement.hxx
index d74b5d9d11b9..95813e4f2322 100644
--- a/chart2/source/controller/accessibility/AccessibleChartElement.hxx
+++ b/chart2/source/controller/accessibility/AccessibleChartElement.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -140,3 +141,5 @@ private:
 }  // namespace chart
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.cxx b/chart2/source/controller/accessibility/AccessibleChartShape.cxx
index bbf6176641da..41567440e835 100644
--- a/chart2/source/controller/accessibility/AccessibleChartShape.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartShape.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -287,3 +288,5 @@ Reference< awt::XFont > AccessibleChartShape::getFont()
 }
 
 } // namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.hxx b/chart2/source/controller/accessibility/AccessibleChartShape.hxx
index a1236b697a69..0b45585b1b05 100644
--- a/chart2/source/controller/accessibility/AccessibleChartShape.hxx
+++ b/chart2/source/controller/accessibility/AccessibleChartShape.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -102,3 +103,5 @@ private:
 }  // namespace chart
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx b/chart2/source/controller/accessibility/AccessibleChartView.cxx
index 4833991ad7cc..cfa3d17da075 100644
--- a/chart2/source/controller/accessibility/AccessibleChartView.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -92,20 +93,15 @@ awt::Rectangle AccessibleChartView::GetWindowPosSize() const
     if( ! xWindow.is())
         return awt::Rectangle();
 
-    // this should do, but it doesn't => HACK
-//     return xWindow->getPosSize();
-
     awt::Rectangle aBBox( xWindow->getPosSize() );
 
     Window* pWindow( VCLUnoHelper::GetWindow( GetInfo().m_xWindow ));
     if( pWindow )
     {
-        // /-- solar
-        ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarGuard;
         Point aVCLPoint( pWindow->OutputToAbsoluteScreenPixel( Point( 0, 0 ) ));
         aBBox.X = aVCLPoint.getX();
         aBBox.Y = aVCLPoint.getY();
-        // \-- solar
     }
 
     return aBBox;
@@ -414,3 +410,5 @@ void SAL_CALL AccessibleChartView::disposing( const lang::EventObject& /*Source*
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
index 0ba078e82886..818a7b90256c 100644
--- a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
+++ b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,7 +33,7 @@
 #include "DrawViewWrapper.hxx"
 
 #include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 
 #include <svx/AccessibleTextHelper.hxx>
 #include <svx/unoshtxt.hxx>
@@ -85,8 +86,7 @@ void SAL_CALL AccessibleTextHelper::initialize( const Sequence< uno::Any >& aArg
     if( !xEventSource.is() || aCID.getLength() == 0 )
         return;
 
-    // /-- solar
-    ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarGuard;
 
     if( m_pTextHelper )
         delete m_pTextHelper;
@@ -110,7 +110,6 @@ void SAL_CALL AccessibleTextHelper::initialize( const Sequence< uno::Any >& aArg
     }
 
     OSL_ENSURE( m_pTextHelper, "Couldn't create text helper" );
-    // \-- solar
 }
 
 // ____ XAccessibleContext ____
@@ -119,10 +118,8 @@ void SAL_CALL AccessibleTextHelper::initialize( const Sequence< uno::Any >& aArg
 {
     if( m_pTextHelper )
     {
-        // /-- solar
-        ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarGuard;
         return m_pTextHelper->GetChildCount();
-        // \-- solar
     }
     return 0;
 }
@@ -133,10 +130,8 @@ Reference< XAccessible > SAL_CALL AccessibleTextHelper::getAccessibleChild( ::sa
 {
     if( m_pTextHelper )
     {
-        // /-- solar
-        ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aSolarGuard;
         return m_pTextHelper->GetChild( i );
-        // \-- solar
     }
     return Reference< XAccessible >();
 }
@@ -144,49 +139,49 @@ Reference< XAccessible > SAL_CALL AccessibleTextHelper::getAccessibleChild( ::sa
 Reference< XAccessible > SAL_CALL AccessibleTextHelper::getAccessibleParent()
     throw (uno::RuntimeException)
 {
-    OSL_ENSURE( false, "Not implemented in this helper" );
+    OSL_FAIL( "Not implemented in this helper" );
     return Reference< XAccessible >();
 }
 
 ::sal_Int32 SAL_CALL AccessibleTextHelper::getAccessibleIndexInParent()
     throw (uno::RuntimeException)
 {
-    OSL_ENSURE( false, "Not implemented in this helper" );
+    OSL_FAIL( "Not implemented in this helper" );
     return -1;
 }
 
 ::sal_Int16 SAL_CALL AccessibleTextHelper::getAccessibleRole()
     throw (uno::RuntimeException)
 {
-    OSL_ENSURE( false, "Not implemented in this helper" );
+    OSL_FAIL( "Not implemented in this helper" );
     return AccessibleRole::UNKNOWN;
 }
 
 OUString SAL_CALL AccessibleTextHelper::getAccessibleDescription()
     throw (uno::RuntimeException)
 {
-    OSL_ENSURE( false, "Not implemented in this helper" );
+    OSL_FAIL( "Not implemented in this helper" );
     return OUString();
 }
 
 OUString SAL_CALL AccessibleTextHelper::getAccessibleName()
     throw (uno::RuntimeException)
 {
-    OSL_ENSURE( false, "Not implemented in this helper" );
+    OSL_FAIL( "Not implemented in this helper" );
     return OUString();
 }
 
 Reference< XAccessibleRelationSet > SAL_CALL AccessibleTextHelper::getAccessibleRelationSet()
     throw (uno::RuntimeException)
 {
-    OSL_ENSURE( false, "Not implemented in this helper" );
+    OSL_FAIL( "Not implemented in this helper" );
     return Reference< XAccessibleRelationSet >();
 }
 
 Reference< XAccessibleStateSet > SAL_CALL AccessibleTextHelper::getAccessibleStateSet()
     throw (uno::RuntimeException)
 {
-    OSL_ENSURE( false, "Not implemented in this helper" );
+    OSL_FAIL( "Not implemented in this helper" );
     return Reference< XAccessibleStateSet >();
 }
 
@@ -194,10 +189,12 @@ lang::Locale SAL_CALL AccessibleTextHelper::getLocale()
     throw (IllegalAccessibleComponentStateException,
            uno::RuntimeException)
 {
-    OSL_ENSURE( false, "Not implemented in this helper" );
+    OSL_FAIL( "Not implemented in this helper" );
     return lang::Locale();
 }
 
 
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx b/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx
index 7936efb3d899..67fa0d2ece5d 100644
--- a/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx
+++ b/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -114,3 +115,5 @@ Size AccessibleViewForwarder::PixelToLogic( const Size& rSize ) const
 }
 
 } // namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx b/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx
index e85e68b23830..98c58a00a444 100644
--- a/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx
+++ b/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -63,3 +64,5 @@ private:
 }  // namespace chart
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/accessibility/ChartElementFactory.cxx b/chart2/source/controller/accessibility/ChartElementFactory.cxx
index b2599fec0c74..71f5ce8c910d 100644
--- a/chart2/source/controller/accessibility/ChartElementFactory.cxx
+++ b/chart2/source/controller/accessibility/ChartElementFactory.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -76,70 +77,8 @@ AccessibleBase* ChartElementFactory::CreateChartElement( const AccessibleElement
     }
 
     return 0;
-
-    /*
-    sal_uInt16 nObjId = rId.GetObjectId();
-    switch( nObjId )
-    {
-        case CHOBJID_LEGEND:
-            return new AccLegend( pParent );
-        case AccLegendEntry::ObjectId:
-            return new AccLegendEntry( pParent, rId.GetIndex1() );
-
-        case CHOBJID_TITLE_MAIN:
-            return new AccTitle( pParent, Title::MAIN );
-        case CHOBJID_TITLE_SUB:
-            return new AccTitle( pParent, Title::SUB );
-        case CHOBJID_DIAGRAM_TITLE_X_AXIS:
-            return new AccTitle( pParent, Title::X_AXIS );
-        case CHOBJID_DIAGRAM_TITLE_Y_AXIS:
-            return new AccTitle( pParent, Title::Y_AXIS );
-        case CHOBJID_DIAGRAM_TITLE_Z_AXIS:
-            return new AccTitle( pParent, Title::Z_AXIS );
-
-        case CHOBJID_DIAGRAM:
-            return new AccDiagram( pParent );
-
-        // series
-        case CHOBJID_DIAGRAM_ROWGROUP:
-            return new AccDataSeries( pParent, rId.GetIndex1() );
-
-        // data points
-        case CHOBJID_DIAGRAM_DATA:
-            return new AccDataPoint( pParent, rId.GetIndex1(), rId.GetIndex2() );
-
-        case Axis::X_AXIS:
-        case Axis::Y_AXIS:
-        case Axis::Z_AXIS:
-        case Axis::SEC_X_AXIS:
-        case Axis::SEC_Y_AXIS:
-            return new AccAxis( pParent, static_cast< Axis::AxisType >( nObjId ) );
-
-        case Grid::X_MAJOR:
-        case Grid::Y_MAJOR:
-        case Grid::Z_MAJOR:
-        case Grid::X_MINOR:
-        case Grid::Y_MINOR:
-        case Grid::Z_MINOR:
-            return new AccGrid( pParent, static_cast< AccGrid::GridType >( nObjId ) );
-
-        case AccStatisticsObject::MEAN_VAL_LINE:
-        case AccStatisticsObject::ERROR_BARS:
-        case AccStatisticsObject::REGRESSION:
-            return new AccStatisticsObject( pParent,
-                                         static_cast< AccStatisticsObject::StatisticsObjectType >( nObjId ),
-                                         rId.GetIndex1() );
-
-        case CHOBJID_DIAGRAM_WALL:
-            return new AccWall( pParent );
-
-        case CHOBJID_DIAGRAM_FLOOR:
-            return new AccFloor( pParent );
-
-        case CHOBJID_DIAGRAM_AREA:
-            return new AccArea( pParent );
-    }
-    */
 }
 
 } // namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/accessibility/ChartElementFactory.hxx b/chart2/source/controller/accessibility/ChartElementFactory.hxx
index 399ba93c1b55..3cc3713037d9 100644
--- a/chart2/source/controller/accessibility/ChartElementFactory.hxx
+++ b/chart2/source/controller/accessibility/ChartElementFactory.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -46,3 +47,5 @@ public:
 }  // namespace chart
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/accessibility/makefile.mk b/chart2/source/controller/accessibility/makefile.mk
deleted file mode 100644
index 44c816d90d0e..000000000000
--- a/chart2/source/controller/accessibility/makefile.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=				..$/..$/..
-PRJINC=				$(PRJ)$/source
-PRJNAME=			chart2
-TARGET=				chcaccessibility
-
-ENABLE_EXCEPTIONS=	TRUE
-VISIBILITY_HIDDEN=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE: settings.mk
-
-# --- export library -------------------------------------------------
-
-#object files to build and link together to lib $(SLB)$/$(TARGET).lib
-SLOFILES=	$(SLO)$/AccessibleChartView.obj		\
-            $(SLO)$/ChartElementFactory.obj		\
-            $(SLO)$/AccessibleBase.obj	\
-            $(SLO)$/AccessibleChartElement.obj \
-            $(SLO)$/AccessibleChartShape.obj \
-            $(SLO)$/AccessibleTextHelper.obj \
-            $(SLO)$/AccessibleViewForwarder.obj
-
-# --- Targets -----------------------------------------------------------------
-
-.INCLUDE: target.mk
-
diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
index b4422c5442ec..95b206c09774 100755..100644
--- a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -71,7 +72,6 @@ private:
         ::std::vector< ::com::sun::star::beans::Property > aProperties;
         ::chart::LineProperties::AddPropertiesToVector( aProperties );
         ::chart::FillProperties::AddPropertiesToVector( aProperties );
-        //::chart::NamedProperties::AddPropertiesToVector( aProperties );
         ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
 
         ::std::sort( aProperties.begin(), aProperties.end(),
@@ -115,7 +115,7 @@ awt::Point SAL_CALL AreaWrapper::getPosition()
 void SAL_CALL AreaWrapper::setPosition( const awt::Point& /*aPosition*/ )
     throw (uno::RuntimeException)
 {
-    OSL_ENSURE( false, "trying to set position of chart area" );
+    OSL_FAIL( "trying to set position of chart area" );
 }
 
 awt::Size SAL_CALL AreaWrapper::getSize()
@@ -128,7 +128,7 @@ void SAL_CALL AreaWrapper::setSize( const awt::Size& /*aSize*/ )
     throw (beans::PropertyVetoException,
            uno::RuntimeException)
 {
-    OSL_ENSURE( false, "trying to set size of chart area" );
+    OSL_FAIL( "trying to set size of chart area" );
 }
 
 // ____ XShapeDescriptor (base of XShape) ____
@@ -145,10 +145,8 @@ void SAL_CALL AreaWrapper::dispose()
     Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) );
     m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) );
 
-    // /--
     MutexGuard aGuard( GetMutex());
     clearWrappedPropertySet();
-    // \--
 }
 
 void SAL_CALL AreaWrapper::addEventListener(
@@ -173,7 +171,7 @@ Reference< beans::XPropertySet > AreaWrapper::getInnerPropertySet()
     Reference< chart2::XChartDocument > xChartDoc( m_spChart2ModelContact->getChart2Document() );
     if( xChartDoc.is() )
         return xChartDoc->getPageBackground();
-    OSL_ENSURE(false,"AreaWrapper::getInnerPropertySet() is NULL");
+    OSL_FAIL("AreaWrapper::getInnerPropertySet() is NULL");
     return 0;
 }
 
@@ -209,3 +207,5 @@ APPHELPER_XSERVICEINFO_IMPL( AreaWrapper, lcl_aServiceName );
 
 } //  namespace wrapper
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx
index ec888d6f8f8d..40a2b3762c3e 100644
--- a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -103,3 +104,5 @@ private:
 
 // CHART_AREAWRAPPER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
index 80b7cd20574b..f7d13280d263 100755..100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -367,7 +368,6 @@ private:
         lcl_AddPropertiesToVector( aProperties );
         ::chart::CharacterProperties::AddPropertiesToVector( aProperties );
         ::chart::LineProperties::AddPropertiesToVector( aProperties );
-        //::chart::NamedLineProperties::AddPropertiesToVector( aProperties );
         ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
         ::chart::wrapper::WrappedScaleTextProperties::addProperties( aProperties );
 
@@ -491,7 +491,7 @@ awt::Point SAL_CALL AxisWrapper::getPosition()
 void SAL_CALL AxisWrapper::setPosition( const awt::Point& /*aPosition*/ )
     throw (uno::RuntimeException)
 {
-    OSL_ENSURE( false, "trying to set position of Axis" );
+    OSL_FAIL( "trying to set position of Axis" );
 }
 
 awt::Size SAL_CALL AxisWrapper::getSize()
@@ -505,7 +505,7 @@ void SAL_CALL AxisWrapper::setSize( const awt::Size& /*aSize*/ )
     throw (beans::PropertyVetoException,
            uno::RuntimeException)
 {
-    OSL_ENSURE( false, "trying to set size of Axis" );
+    OSL_FAIL( "trying to set size of Axis" );
 }
 
 // ____ XShapeDescriptor (base of XShape) ____
@@ -694,8 +694,6 @@ Sequence< OUString > AxisWrapper::getSupportedServiceNames_Static()
     aServices[ 0 ] = C2U( "com.sun.star.chart.ChartAxis" );
     aServices[ 1 ] = C2U( "com.sun.star.xml.UserDefinedAttributeSupplier" );
     aServices[ 2 ] = C2U( "com.sun.star.style.CharacterProperties" );
-//     aServices[ 3 ] = C2U( "com.sun.star.beans.PropertySet" );
-//     aServices[ 4 ] = C2U( "com.sun.star.drawing.LineProperties" );
 
     return aServices;
 }
@@ -705,3 +703,5 @@ APPHELPER_XSERVICEINFO_IMPL( AxisWrapper, lcl_aServiceName );
 
 } //  namespace wrapper
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
index f7a7d514e1f4..d55db6e0f34c 100755..100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -147,3 +148,5 @@ private: //member
 
 // CHART_AXISWRAPPER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
index 1b0d8fb4889c..8814be1dc7bd 100644
--- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
+++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -317,3 +318,5 @@ awt::Point Chart2ModelContact::GetAxisPosition( const uno::Reference<
 
 } //  namespace wrapper
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx
index dafef0f2aa72..26d1d5af76a7 100755..100644
--- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx
+++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -166,3 +167,5 @@ private: //member
 
 // CHART_CHART2MODELCONTACT_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
index 3498b812557a..aec879688e1e 100755..100644
--- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -632,12 +633,7 @@ void SAL_CALL ChartDataWrapper::disposing( const lang::EventObject& /* Source */
 {
 }
 
-//  ::com::sun::star::chart::ChartDataChangeEvent aEvent;
-//  aEvent.Type = chart::ChartDataChangeType_ALL;
-//  aEvent.StartColumn = 0;
-//  aEvent.EndColumn = 0;
-//  aEvent.StartRow = 0;
-//  aEvent.EndRow = 0;
+
 void ChartDataWrapper::fireChartDataChangeEvent(
     ::com::sun::star::chart::ChartDataChangeEvent& aEvent )
 {
@@ -780,3 +776,5 @@ APPHELPER_XSERVICEINFO_IMPL( ChartDataWrapper, lcl_aServiceName );
 
 } //  namespace wrapper
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx
index 16695914f892..ac28d23cfb41 100755..100644
--- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -167,3 +168,5 @@ private: //member
 
 // CHART_CHARTDATAWRAPPER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index 42d5667b7d82..75d232dcb36e 100755..100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -62,8 +63,6 @@
 #include <comphelper/InlineContainer.hxx>
 // header for function SvxShapeCollection_NewInstance
 #include <svx/unoshcol.hxx>
-// header for define DBG_ASSERT
-#include <tools/debug.hxx>
 #include <vcl/svapp.hxx>
 
 #include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
@@ -75,6 +74,7 @@
 #include <vector>
 #include <algorithm>
 #include <functional>
+#include <o3tl/compat_functional.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart;
@@ -279,8 +279,7 @@ namespace chart
 namespace wrapper
 {
 //-----------------------------------------------------------------------------------------------------------------
-//-----------------------------------------------------------------------------------------------------------------
-//-----------------------------------------------------------------------------------------------------------------
+
 
 //PROP_DOCUMENT_LABELS_IN_FIRST_ROW
 class WrappedDataSourceLabelsInFirstRowProperty : public WrappedProperty
@@ -381,8 +380,7 @@ Any WrappedDataSourceLabelsInFirstRowProperty::getPropertyDefault( const Referen
 }
 
 //-----------------------------------------------------------------------------------------------------------------
-//-----------------------------------------------------------------------------------------------------------------
-//-----------------------------------------------------------------------------------------------------------------
+
 
 //PROP_DOCUMENT_LABELS_IN_FIRST_COLUMN
 class WrappedDataSourceLabelsInFirstColumnProperty : public WrappedProperty
@@ -483,8 +481,7 @@ Any WrappedDataSourceLabelsInFirstColumnProperty::getPropertyDefault( const Refe
 }
 
 //-----------------------------------------------------------------------------------------------------------------
-//-----------------------------------------------------------------------------------------------------------------
-//-----------------------------------------------------------------------------------------------------------------
+
 
 //PROP_DOCUMENT_HAS_LEGEND
 class WrappedHasLegendProperty : public WrappedProperty
@@ -571,8 +568,7 @@ Any WrappedHasLegendProperty::getPropertyDefault( const Reference< beans::XPrope
 }
 
 //-----------------------------------------------------------------------------------------------------------------
-//-----------------------------------------------------------------------------------------------------------------
-//-----------------------------------------------------------------------------------------------------------------
+
 
 //PROP_DOCUMENT_HAS_MAIN_TITLE
 class WrappedHasMainTitleProperty : public WrappedProperty
@@ -648,8 +644,7 @@ Any WrappedHasMainTitleProperty::getPropertyDefault( const Reference< beans::XPr
 }
 
 //-----------------------------------------------------------------------------------------------------------------
-//-----------------------------------------------------------------------------------------------------------------
-//-----------------------------------------------------------------------------------------------------------------
+
 
 //PROP_DOCUMENT_HAS_SUB_TITLE
 class WrappedHasSubTitleProperty : public WrappedProperty
@@ -726,8 +721,7 @@ Any WrappedHasSubTitleProperty::getPropertyDefault( const Reference< beans::XPro
 }
 
 //-----------------------------------------------------------------------------------------------------------------
-//-----------------------------------------------------------------------------------------------------------------
-//-----------------------------------------------------------------------------------------------------------------
+
 ChartDocumentWrapper::ChartDocumentWrapper(
     const Reference< uno::XComponentContext > & xContext ) :
         m_spChart2ModelContact( new Chart2ModelContact( xContext ) ),
@@ -1138,7 +1132,7 @@ Reference< drawing::XShapes > ChartDocumentWrapper::getAdditionalShapes() const
         // create a shape collection
         xFoundShapes = uno::Reference< drawing::XShapes >( SvxShapeCollection_NewInstance(), uno::UNO_QUERY );
 
-        DBG_ASSERT( xFoundShapes.is(), "Couldn't create a shape collection!" );
+        OSL_ENSURE( xFoundShapes.is(), "Couldn't create a shape collection!" );
         if( xFoundShapes.is())
         {
             ::std::vector< uno::Reference< drawing::XShape > >::iterator aIter;
@@ -1305,20 +1299,17 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance(
             case SERVICE_NAME_MARKER_TABLE:
                 {
                     uno::Reference< lang::XMultiServiceFactory > xTableFactory( xChartDoc, uno::UNO_QUERY );
-                    DBG_ASSERT( xTableFactory.get() != this, "new model is expected to implement service factory for gradient table etc" );
+                    OSL_ENSURE( xTableFactory.get() != this, "new model is expected to implement service factory for gradient table etc" );
                     if( xTableFactory.is() && xTableFactory.get() != this )
                         xResult.set( xTableFactory->createInstance( aIt->first ), uno::UNO_QUERY );
                 }
                 break;
 
             case SERVICE_NAME_NAMESPACE_MAP:
-//                 xResult = svx::NamespaceMap_createInstance( aWhichIds, &m_pModel->GetPool() );
                 break;
             case SERVICE_NAME_EXPORT_GRAPHIC_RESOLVER:
-//                 xResult = static_cast< ::cppu::OWeakObject * >( new SvXMLGraphicHelper( GRAPHICHELPER_MODE_WRITE ));
                 break;
             case SERVICE_NAME_IMPORT_GRAPHIC_RESOLVER:
-//                 xResult = static_cast< ::cppu::OWeakObject * >( new SvXMLGraphicHelper( GRAPHICHELPER_MODE_READ ));
                 break;
         }
 
@@ -1329,7 +1320,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance(
                 uno::Reference< chart2::XDiagram > xDia( xChartDoc->getFirstDiagram());
                 if( xDia.is())
                 {
-                    // /-- locked controllers
+                    // locked controllers
                     Reference< frame::XModel > xModel( xChartDoc, uno::UNO_QUERY );
                     ControllerLockGuard aCtrlLockGuard( xModel );
                     Reference< chart2::XDiagram > xDiagram = ChartModelHelper::findDiagram( xModel );
@@ -1343,17 +1334,15 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance(
                     if( Application::GetSettings().GetLayoutRTL() )
                         AxisHelper::setRTLAxisLayout( AxisHelper::getCoordinateSystemByIndex( xDiagram, 0 ) );
                     ThreeDHelper::setScheme( xDiagram, e3DScheme );
-                    // \-- locked controllers
                 }
                 else
                 {
-                    // /-- locked controllers
+                    // locked controllers
                     ControllerLockGuard aCtrlLockGuard( Reference< frame::XModel >( xChartDoc, uno::UNO_QUERY ));
                     xDia.set( xTemplate->createDiagramByDataSource(
                                   uno::Reference< chart2::data::XDataSource >(),
                                   uno::Sequence< beans::PropertyValue >()));
                     xChartDoc->setFirstDiagram( xDia );
-                    // \-- locked controllers
                 }
 
                 xResult = static_cast< ::cppu::OWeakObject* >( new DiagramWrapper( m_spChart2ModelContact ));
@@ -1487,23 +1476,10 @@ uno::Sequence< ::rtl::OUString > SAL_CALL ChartDocumentWrapper::getAvailableServ
 
     ::std::transform( rMap.begin(), rMap.end(),
                       aResult.getArray(),
-                      ::std::select1st< tServiceNameMap::value_type >() );
+                      ::o3tl::select1st< tServiceNameMap::value_type >() );
 
     return aResult;
 
-//         // shapes
-// //         uno::Sequence< OUString > aDrawServices( SvxUnoDrawMSFactory::getAvailableServiceNames() );
-// //         const OUString * pArr = aDrawServices.getConstArray();
-// //         aServices.insert( aServices.end(), pArr, pArr + aDrawServices.getLength() );
-//     }
-
-
-    // add-ins
- //    uno::Sequence< OUString > aAddIns( GetAddInCollection().GetAddInNames() );
-//     pArr = aAddIns.getConstArray();
-//     aServices.insert( aServices.end(), pArr, pArr + aAddIns.getLength() );
-
-//     return ContainerToSequence( aServices );
 }
 
 // ____ XAggregation ____
@@ -1615,3 +1591,5 @@ APPHELPER_XSERVICEINFO_IMPL( ChartDocumentWrapper, CHART_CHARTAPIWRAPPER_IMPLEME
 
 } //  namespace wrapper
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
index b79cab0930c6..7b5360bb902f 100755..100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -51,8 +52,6 @@
 #include "WrappedTextRotationProperty.hxx"
 #include <rtl/ustrbuf.hxx>
 #include <rtl/math.hxx>
-// header for define DBG_ASSERT
-#include <tools/debug.hxx>
 
 #include <algorithm>
 #include <comphelper/InlineContainer.hxx>
@@ -224,8 +223,7 @@ struct StaticPointWrapperPropertyArray : public rtl::StaticAggregate< Sequence<
 };
 
 //----------------------------------------------------------------------------------------------------------------------
-//----------------------------------------------------------------------------------------------------------------------
-//----------------------------------------------------------------------------------------------------------------------
+
 
 //PROP_SERIES_ATTACHED_AXIS
 class WrappedAttachedAxisProperty : public ::chart::WrappedProperty
@@ -461,12 +459,9 @@ void WrappedLineStyleProperty::setPropertyToDefault( const Reference< beans::XPr
         WrappedSeriesAreaOrLineProperty::setPropertyToDefault( xInnerPropertyState );
 }
 
-//----------------------------------------------------------------------------------------------------------------------
-//----------------------------------------------------------------------------------------------------------------------
-//----------------------------------------------------------------------------------------------------------------------
-
 } // anonymous namespace
 
+
 // --------------------------------------------------------------------------------
 
 namespace chart
@@ -490,7 +485,7 @@ DataSeriesPointWrapper::DataSeriesPointWrapper(
 void SAL_CALL DataSeriesPointWrapper::initialize( const uno::Sequence< uno::Any >& aArguments )
                 throw ( uno::Exception, uno::RuntimeException)
 {
-    DBG_ASSERT(aArguments.getLength() >= 1,"need at least 1 argument to initialize the DataSeriesPointWrapper: series reference + optional datapoint index");
+    OSL_PRECOND(aArguments.getLength() >= 1,"need at least 1 argument to initialize the DataSeriesPointWrapper: series reference + optional datapoint index");
 
     m_nSeriesIndexInNewAPI = -1;//ignored in this case
     m_nPointIndex = -1;
@@ -743,13 +738,7 @@ const std::vector< WrappedProperty* > DataSeriesPointWrapper::createWrappedPrope
     WrappedDataCaptionProperties::addWrappedPropertiesForSeries( aWrappedProperties, m_spChart2ModelContact );
     WrappedScaleTextProperties::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact );
 
-    //add unnamed fill properties (different inner names here)
-//     aWrappedProperties.push_back( new  WrappedUnnamedProperty( C2U( "FillGradient" ), C2U( "GradientName" ) ) );
-//     aWrappedProperties.push_back( new  WrappedUnnamedProperty( C2U( "FillHatch" ), C2U( "HatchName" ) ) );
-//     aWrappedProperties.push_back( new  WrappedUnnamedProperty( C2U( "FillTransparenceGradient" ), C2U( "TransparencyGradientName" ) ) );
-
     //add unnamed line properties (different inner names here)
-//     aWrappedProperties.push_back( new WrappedUnnamedProperty( C2U( "LineDash" ), C2U( "LineDashName" ) ) );
 
     aWrappedProperties.push_back( new WrappedProperty( C2U( "FillColor" ), C2U( "Color" ) ) );
     aWrappedProperties.push_back( new WrappedLineStyleProperty( this ) );
@@ -899,3 +888,5 @@ APPHELPER_XSERVICEINFO_IMPL( DataSeriesPointWrapper, lcl_aServiceName );
 
 } //  namespace wrapper
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
index b7246306959c..a35c3095557d 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -135,8 +136,6 @@ private:
         sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue )
         throw (::com::sun::star::uno::Exception);
 
-    // ----------------------------------------
-
     ::boost::shared_ptr< Chart2ModelContact >   m_spChart2ModelContact;
     ::cppu::OInterfaceContainerHelper           m_aEventListenerContainer;
 
@@ -158,3 +157,5 @@ private:
 
 // CHART_DATASERIESPOINTWRAPPER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index e365edb7bd46..e9640af7e3a0 100755..100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -73,8 +74,6 @@
 #include <map>
 #include <algorithm>
 #include <rtl/ustrbuf.hxx>
-// header for define DBG_ERROR
-#include <tools/debug.hxx>
 #include <com/sun/star/lang/XServiceName.hpp>
 #include <com/sun/star/util/XRefreshable.hpp>
 
@@ -563,46 +562,47 @@ OUString lcl_getDiagramType( const OUString & rTemplateServiceName )
         if( aName.indexOf( C2U("Line") ) != -1 || aName.indexOf( C2U("Symbol") ) != -1 )
             return C2U( "com.sun.star.chart.LineDiagram" );
 
-        OSL_ENSURE( false, "unknown template" );
+        OSL_FAIL( "unknown template" );
     }
 
     return OUString();
 }
 
 typedef ::comphelper::MakeMap< ::rtl::OUString, ::rtl::OUString > tMakeStringStringMap;
+
 const tMakeStringStringMap& lcl_getChartTypeNameMap()
 {
     static tMakeStringStringMap g_aChartTypeNameMap =
         tMakeStringStringMap
-        ( ::rtl::OUString::createFromAscii( "com.sun.star.chart2.LineChartType" )
-        , ::rtl::OUString::createFromAscii( "com.sun.star.chart.LineDiagram" ) )
+        ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.LineChartType" ) )
+        , rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.LineDiagram" ) ) )
 
-        ( ::rtl::OUString::createFromAscii( "com.sun.star.chart2.AreaChartType" )
-        , ::rtl::OUString::createFromAscii( "com.sun.star.chart.AreaDiagram" ) )
+        ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.AreaChartType" ) )
+        , rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.AreaDiagram" ) ) )
 
-        ( ::rtl::OUString::createFromAscii( "com.sun.star.chart2.ColumnChartType" )
-        , ::rtl::OUString::createFromAscii( "com.sun.star.chart.BarDiagram" ) )
+        ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.ColumnChartType" ) )
+        , rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.BarDiagram" ) ) )
 
-        ( ::rtl::OUString::createFromAscii( "com.sun.star.chart2.PieChartType" )
-        , ::rtl::OUString::createFromAscii( "com.sun.star.chart.PieDiagram" ) )
+        ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.PieChartType" ) )
+        , rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.PieDiagram" ) ) )
 
-        ( ::rtl::OUString::createFromAscii( "com.sun.star.chart2.DonutChartType" )
-        , ::rtl::OUString::createFromAscii( "com.sun.star.chart.DonutDiagram" ) )
+        ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.DonutChartType" ) )
+        , rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.DonutDiagram" ) ) )
 
-        ( ::rtl::OUString::createFromAscii( "com.sun.star.chart2.ScatterChartType" )
-        , ::rtl::OUString::createFromAscii( "com.sun.star.chart.XYDiagram" ) )
+        ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.ScatterChartType" ) )
+        , rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.XYDiagram" ) ) )
 
-        ( ::rtl::OUString::createFromAscii( "com.sun.star.chart2.FilledNetChartType" )
-        , ::rtl::OUString::createFromAscii( "com.sun.star.chart.FilledNetDiagram" ) )
+        ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.FilledNetChartType" ) )
+        , rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.FilledNetDiagram" ) ) )
 
-        ( ::rtl::OUString::createFromAscii( "com.sun.star.chart2.NetChartType" )
-        , ::rtl::OUString::createFromAscii( "com.sun.star.chart.NetDiagram" ) )
+        ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.NetChartType" ) )
+        , rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.NetDiagram" ) ) )
 
-        ( ::rtl::OUString::createFromAscii( "com.sun.star.chart2.CandleStickChartType" )
-        , ::rtl::OUString::createFromAscii( "com.sun.star.chart.StockDiagram" ) )
+        ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.CandleStickChartType" ) )
+        , rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.StockDiagram" ) ) )
 
-        ( ::rtl::OUString::createFromAscii( "com.sun.star.chart2.BubbleChartType" )
-        , ::rtl::OUString::createFromAscii( "com.sun.star.chart.BubbleDiagram" ) )
+        ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.BubbleChartType" ) )
+        , rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.BubbleDiagram" ) ) )
 
         ;
     return g_aChartTypeNameMap;
@@ -756,7 +756,7 @@ void SAL_CALL DiagramWrapper::setPosition( const awt::Point& aPosition )
         aRelativePosition.Secondary = double(aPosition.Y)/double(aPageSize.Height);
         if( aRelativePosition.Primary < 0 || aRelativePosition.Secondary < 0 || aRelativePosition.Primary > 1 || aRelativePosition.Secondary > 1 )
         {
-            DBG_ERROR("DiagramWrapper::setPosition called with a position out of range -> automatic values are taken instead" );
+            OSL_FAIL("DiagramWrapper::setPosition called with a position out of range -> automatic values are taken instead" );
             uno::Any aEmpty;
             xProp->setPropertyValue( C2U( "RelativePosition" ), aEmpty );
             return;
@@ -789,7 +789,7 @@ void SAL_CALL DiagramWrapper::setSize( const awt::Size& aSize )
 
         if( aRelativeSize.Primary > 1 || aRelativeSize.Secondary > 1 )
         {
-            DBG_ERROR("DiagramWrapper::setSize called with sizes bigger than page -> automatic values are taken instead" );
+            OSL_FAIL("DiagramWrapper::setSize called with sizes bigger than page -> automatic values are taken instead" );
             uno::Any aEmpty;
             xProp->setPropertyValue( C2U( "RelativeSize" ), aEmpty );
             return;
@@ -1174,7 +1174,6 @@ void SAL_CALL DiagramWrapper::dispose()
 {
     m_aEventListenerContainer.disposeAndClear( lang::EventObject( static_cast< ::cppu::OWeakObject* >( this )));
 
-    // /--
     MutexGuard aGuard( GetMutex());
 
     DisposeHelper::DisposeAndClear( m_xXAxis );
@@ -1189,7 +1188,6 @@ void SAL_CALL DiagramWrapper::dispose()
     DisposeHelper::DisposeAndClear( m_xDownBarWrapper );
 
     clearWrappedPropertySet();
-    // \--
 }
 
 void SAL_CALL DiagramWrapper::addEventListener(
@@ -1206,14 +1204,6 @@ void SAL_CALL DiagramWrapper::removeEventListener(
     m_aEventListenerContainer.removeInterface( aListener );
 }
 
-// ____ XEventListener ____
-// void SAL_CALL DiagramWrapper::disposing( const lang::EventObject& Source )
-//     throw (uno::RuntimeException)
-// {
-// }
-
-//-----------------------------------------------------------------------------------------------------------------
-//-----------------------------------------------------------------------------------------------------------------
 //-----------------------------------------------------------------------------------------------------------------
 
 //PROP_DIAGRAM_DATAROW_SOURCE
@@ -1317,9 +1307,6 @@ Any WrappedDataRowSourceProperty::getPropertyDefault( const Reference< beans::XP
 }
 
 //-----------------------------------------------------------------------------------------------------------------
-//-----------------------------------------------------------------------------------------------------------------
-//-----------------------------------------------------------------------------------------------------------------
-
 
 //PROP_DIAGRAM_STACKED
 //PROP_DIAGRAM_DEEP
@@ -1366,7 +1353,7 @@ WrappedStackingProperty::WrappedStackingProperty( StackMode eStackMode, ::boost:
         m_aOuterName = C2U( "Deep" );
         break;
     default:
-        OSL_ENSURE( false, "unexpected stack mode" );
+        OSL_FAIL( "unexpected stack mode" );
         break;
     }
 }
@@ -1436,8 +1423,6 @@ Any WrappedStackingProperty::getPropertyDefault( const Reference< beans::XProper
 }
 
 //-----------------------------------------------------------------------------------------------------------------
-//-----------------------------------------------------------------------------------------------------------------
-//-----------------------------------------------------------------------------------------------------------------
 
 //PROP_DIAGRAM_THREE_D
 class WrappedDim3DProperty : public WrappedProperty
@@ -1511,8 +1496,6 @@ Any WrappedDim3DProperty::getPropertyDefault( const Reference< beans::XPropertyS
 }
 
 //-----------------------------------------------------------------------------------------------------------------
-//-----------------------------------------------------------------------------------------------------------------
-//-----------------------------------------------------------------------------------------------------------------
 
 //PROP_DIAGRAM_VERTICAL
 class WrappedVerticalProperty : public WrappedProperty
@@ -1591,8 +1574,6 @@ Any WrappedVerticalProperty::getPropertyDefault( const Reference< beans::XProper
 }
 
 //-----------------------------------------------------------------------------------------------------------------
-//-----------------------------------------------------------------------------------------------------------------
-//-----------------------------------------------------------------------------------------------------------------
 
 //PROP_DIAGRAM_NUMBER_OF_LINES
 class WrappedNumberOfLinesProperty : public WrappedProperty
@@ -1717,12 +1698,11 @@ void WrappedNumberOfLinesProperty::setPropertyValue( const Any& rOuterValue, con
         {
             try
             {
-                // /-- locked controllers
+                // locked controllers
                 ControllerLockGuard aCtrlLockGuard( m_spChart2ModelContact->getChartModel() );
                 uno::Reference< beans::XPropertySet > xProp( xTemplate, uno::UNO_QUERY );
                 xProp->setPropertyValue( C2U( "NumberOfLines" ), uno::makeAny(nNewValue) );
                 xTemplate->changeDiagram( xDiagram );
-                // \-- locked controllers
             }
             catch( uno::Exception & ex )
             {
@@ -1750,8 +1730,6 @@ Any WrappedNumberOfLinesProperty::getPropertyDefault( const Reference< beans::XP
 }
 
 //-----------------------------------------------------------------------------------------------------------------
-//-----------------------------------------------------------------------------------------------------------------
-//-----------------------------------------------------------------------------------------------------------------
 
 //PROP_DIAGRAM_ATTRIBUTED_DATA_POINTS
 class WrappedAttributedDataPointsProperty : public WrappedProperty
@@ -1871,8 +1849,6 @@ Any WrappedAttributedDataPointsProperty::getPropertyDefault( const Reference< be
 }
 
 //-----------------------------------------------------------------------------------------------------------------
-//-----------------------------------------------------------------------------------------------------------------
-//-----------------------------------------------------------------------------------------------------------------
 
 //PROP_DIAGRAM_SOLIDTYPE
 class WrappedSolidTypeProperty : public WrappedProperty
@@ -1949,8 +1925,6 @@ Any WrappedSolidTypeProperty::getPropertyDefault( const Reference< beans::XPrope
 }
 
 //-----------------------------------------------------------------------------------------------------------------
-//-----------------------------------------------------------------------------------------------------------------
-//-----------------------------------------------------------------------------------------------------------------
 
 class WrappedAutomaticSizeProperty : public WrappedProperty
 {
@@ -2024,8 +1998,6 @@ Any WrappedAutomaticSizeProperty::getPropertyDefault( const Reference< beans::XP
 }
 
 //-----------------------------------------------------------------------------------------------------------------
-//-----------------------------------------------------------------------------------------------------------------
-//-----------------------------------------------------------------------------------------------------------------
 
 //PROP_DIAGRAM_INCLUDE_HIDDEN_CELLS
 class WrappedIncludeHiddenCellsProperty : public WrappedProperty
@@ -2062,8 +2034,6 @@ void WrappedIncludeHiddenCellsProperty::setPropertyValue( const Any& rOuterValue
 }
 
 //-----------------------------------------------------------------------------------------------------------------
-//-----------------------------------------------------------------------------------------------------------------
-//-----------------------------------------------------------------------------------------------------------------
 
 // ____ XDiagramProvider ____
 Reference< chart2::XDiagram > SAL_CALL DiagramWrapper::getDiagram()
@@ -2077,7 +2047,7 @@ void SAL_CALL DiagramWrapper::setDiagram(
     throw (uno::RuntimeException)
 {
     //@todo: remove this method from interface
-    DBG_ERROR("DiagramWrapper::setDiagram is not implemented, should be removed and not be called" );
+    OSL_FAIL("DiagramWrapper::setDiagram is not implemented, should be removed and not be called" );
 }
 
 // ================================================================================
@@ -2138,9 +2108,6 @@ uno::Sequence< OUString > DiagramWrapper::getSupportedServiceNames_Static()
     aServices[ 5 ] = C2U( "com.sun.star.chart.ChartAxisZSupplier" );
     aServices[ 6 ] = C2U( "com.sun.star.chart.ChartTwoAxisXSupplier" );
     aServices[ 7 ] = C2U( "com.sun.star.chart.ChartTwoAxisYSupplier" );
-//     aServices[ x ] = C2U( "com.sun.star.beans.PropertySet" );
-//     aServices[ x ] = C2U( "com.sun.star.drawing.FillProperties" );
-//     aServices[ x ] = C2U( "com.sun.star.drawing.LineProperties" );
 
     return aServices;
 }
@@ -2151,3 +2118,4 @@ APPHELPER_XSERVICEINFO_IMPL( DiagramWrapper, lcl_aServiceName );
 } //  namespace wrapper
 } //  namespace chart
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
index 678041420cf3..c58fb6ab0fa2 100755..100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -79,8 +80,7 @@ class DiagramWrapper : public ::comphelper::ImplInheritanceHelper13<
                      , ::com::sun::star::chart::X3DDisplay
                      , ::com::sun::star::chart::X3DDefaultSetter
                      , ::com::sun::star::lang::XServiceInfo
-                        , ::com::sun::star::lang::XComponent
-//                      , ::com::sun::star::lang::XEventListener
+                     , ::com::sun::star::lang::XComponent
                      , ::com::sun::star::chart::XDiagramPositioning
                      , ::com::sun::star::chart2::XDiagramProvider
                      , ::com::sun::star::chart::XSecondAxisTitleSupplier
@@ -222,12 +222,7 @@ public:
     virtual void SAL_CALL setDefaultRotation() throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setDefaultIllumination() throw (::com::sun::star::uno::RuntimeException);
 
-//     // ____ XEventListener ____
-//     virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source )
-//         throw (::com::sun::star::uno::RuntimeException);
-
     // ____ XDiagramPositioning ____
-
     virtual void SAL_CALL setAutomaticDiagramPositioning(  ) throw (::com::sun::star::uno::RuntimeException);
     virtual ::sal_Bool SAL_CALL isAutomaticDiagramPositioning(  ) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setDiagramPositionExcludingAxes( const ::com::sun::star::awt::Rectangle& PositionRect ) throw (::com::sun::star::uno::RuntimeException);
@@ -287,3 +282,5 @@ private:
 
 // CHART_DIAGRAMWRAPPER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
index 51c269d7dd40..be184b30150d 100755..100644
--- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -71,7 +72,6 @@ private:
     {
         ::std::vector< ::com::sun::star::beans::Property > aProperties;
         ::chart::LineProperties::AddPropertiesToVector( aProperties );
-        //::chart::NamedLineProperties::AddPropertiesToVector( aProperties );
         ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
 
         ::std::sort( aProperties.begin(), aProperties.end(),
@@ -210,3 +210,4 @@ APPHELPER_XSERVICEINFO_IMPL( GridWrapper, lcl_aServiceName );
 } //  namespace wrapper
 } //  namespace chart
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.hxx b/chart2/source/controller/chartapiwrapper/GridWrapper.hxx
index 653c46353676..5d4769574d7f 100755..100644
--- a/chart2/source/controller/chartapiwrapper/GridWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/GridWrapper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -100,3 +101,5 @@ private:
 
 // CHART_GRIDWRAPPER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
index 05848422f885..c2982c11451e 100755..100644
--- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -62,7 +63,6 @@ using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 
 namespace chart
 {
@@ -221,9 +221,6 @@ Any WrappedLegendAlignmentProperty::convertOuterToInnerValue( const Any& rOuterV
 }
 }
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 
 namespace
 {
@@ -270,7 +267,6 @@ private:
         ::chart::CharacterProperties::AddPropertiesToVector( aProperties );
         ::chart::LineProperties::AddPropertiesToVector( aProperties );
         ::chart::FillProperties::AddPropertiesToVector( aProperties );
-        //::chart::NamedProperties::AddPropertiesToVector( aProperties );
         ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
         ::chart::wrapper::WrappedAutomaticPositionProperties::addProperties( aProperties );
         ::chart::wrapper::WrappedScaleTextProperties::addProperties( aProperties );
@@ -289,7 +285,6 @@ struct StaticLegendWrapperPropertyArray : public rtl::StaticAggregate< Sequence<
 } // anonymous namespace
 
 // --------------------------------------------------------------------------------
-// --------------------------------------------------------------------------------
 
 namespace chart
 {
@@ -367,10 +362,8 @@ void SAL_CALL LegendWrapper::dispose()
     Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) );
     m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) );
 
-    // /--
     MutexGuard aGuard( GetMutex());
     clearWrappedPropertySet();
-    // \--
 }
 
 void SAL_CALL LegendWrapper::addEventListener(
@@ -457,9 +450,6 @@ Sequence< ::rtl::OUString > LegendWrapper::getSupportedServiceNames_Static()
     aServices[ 1 ] = C2U( "com.sun.star.drawing.Shape" );
     aServices[ 2 ] = C2U( "com.sun.star.xml.UserDefinedAttributeSupplier" );
     aServices[ 3 ] = C2U( "com.sun.star.style.CharacterProperties" );
-//     aServices[ 4 ] = C2U( "com.sun.star.beans.PropertySet" );
-//     aServices[ 5 ] = C2U( "com.sun.star.drawing.FillProperties" );
-//     aServices[ 6 ] = C2U( "com.sun.star.drawing.LineProperties" );
 
     return aServices;
 }
@@ -469,3 +459,5 @@ APPHELPER_XSERVICEINFO_IMPL( LegendWrapper, lcl_aServiceName );
 
 } //  namespace wrapper
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx
index 94434a387d4e..57a19262bdae 100644
--- a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -111,3 +112,5 @@ private:
 
 // CHART_LEGENDWRAPPER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
index 2885a79afe6d..ad6584b796f6 100755..100644
--- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -89,7 +90,6 @@ private:
         ::std::vector< ::com::sun::star::beans::Property > aProperties;
 
         ::chart::LineProperties::AddPropertiesToVector( aProperties );
-        //::chart::NamedLineProperties::AddPropertiesToVector( aProperties );
         ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
 
         ::std::sort( aProperties.begin(), aProperties.end(),
@@ -266,22 +266,22 @@ uno::Any SAL_CALL MinMaxLineWrapper::getPropertyValue( const ::rtl::OUString& rP
 void SAL_CALL MinMaxLineWrapper::addPropertyChangeListener( const ::rtl::OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
                     throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented");
+    OSL_FAIL("not implemented");
 }
 void SAL_CALL MinMaxLineWrapper::removePropertyChangeListener( const ::rtl::OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ )
                     throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented");
+    OSL_FAIL("not implemented");
 }
 void SAL_CALL MinMaxLineWrapper::addVetoableChangeListener( const ::rtl::OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
                     throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented");
+    OSL_FAIL("not implemented");
 }
 void SAL_CALL MinMaxLineWrapper::removeVetoableChangeListener( const ::rtl::OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
                     throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented");
+    OSL_FAIL("not implemented");
 }
 
 //XMultiPropertySet
@@ -289,7 +289,6 @@ void SAL_CALL MinMaxLineWrapper::removeVetoableChangeListener( const ::rtl::OUSt
 void SAL_CALL MinMaxLineWrapper::setPropertyValues( const uno::Sequence< ::rtl::OUString >& rNameSeq, const uno::Sequence< uno::Any >& rValueSeq )
                     throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    bool bUnknownProperty = false;
     sal_Int32 nMinCount = std::min( rValueSeq.getLength(), rNameSeq.getLength() );
     for(sal_Int32 nN=0; nN<nMinCount; nN++)
     {
@@ -301,12 +300,9 @@ void SAL_CALL MinMaxLineWrapper::setPropertyValues( const uno::Sequence< ::rtl::
         catch( beans::UnknownPropertyException& ex )
         {
             ASSERT_EXCEPTION( ex );
-            bUnknownProperty = true;
         }
     }
     //todo: store unknown properties elsewhere
-//    if( bUnknownProperty )
-//        throw beans::UnknownPropertyException();
 }
 uno::Sequence< uno::Any > SAL_CALL MinMaxLineWrapper::getPropertyValues( const uno::Sequence< ::rtl::OUString >& rNameSeq )
                     throw (uno::RuntimeException)
@@ -328,20 +324,20 @@ void SAL_CALL MinMaxLineWrapper::addPropertiesChangeListener(
     const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ )
                     throw (uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented");
+    OSL_FAIL("not implemented");
 }
 void SAL_CALL MinMaxLineWrapper::removePropertiesChangeListener(
     const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ )
                     throw (uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented");
+    OSL_FAIL("not implemented");
 }
 void SAL_CALL MinMaxLineWrapper::firePropertiesChangeEvent(
     const uno::Sequence< ::rtl::OUString >& /* aPropertyNames */,
     const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ )
                     throw (uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented");
+    OSL_FAIL("not implemented");
 }
 
 //XPropertyState
@@ -445,3 +441,5 @@ APPHELPER_XSERVICEINFO_IMPL( MinMaxLineWrapper, lcl_aServiceName );
 
 } //  namespace wrapper
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
index 31a67b600536..0e02ed3294e4 100755..100644
--- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -63,9 +64,6 @@ class MinMaxLineWrapper : public MutexContainer
                         , ::com::sun::star::beans::XMultiPropertySet
                         , ::com::sun::star::beans::XPropertyState
                         , ::com::sun::star::beans::XMultiPropertyStates
-                        //  , ::com::sun::star::uno::XWeak          // implemented by WeakImplHelper(optional interface)
-                        //  , ::com::sun::star::uno::XInterface     // implemented by WeakImplHelper
-                        //  , ::com::sun::star::lang::XTypeProvider // implemented by WeakImplHelper
                         >
 {
 public:
@@ -131,3 +129,5 @@ private: //member
 
 // CHART_MINMAXLINEWRAPPER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/ReferenceSizePropertyProvider.hxx b/chart2/source/controller/chartapiwrapper/ReferenceSizePropertyProvider.hxx
index 085128cddeeb..1740132ccec1 100644
--- a/chart2/source/controller/chartapiwrapper/ReferenceSizePropertyProvider.hxx
+++ b/chart2/source/controller/chartapiwrapper/ReferenceSizePropertyProvider.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -46,3 +47,5 @@ public:
 
 // CHART_WRAPPER_REFERENCESIZEPROPERTYPROVIDER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
index 9a2183f089fe..01af102984fe 100755..100644
--- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -121,7 +122,6 @@ Any WrappedTitleStringProperty::getPropertyDefault( const Reference< beans::XPro
 }
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 
 class WrappedStackedTextProperty : public WrappedProperty
 {
@@ -140,10 +140,6 @@ WrappedStackedTextProperty::~WrappedStackedTextProperty()
 
 }// end namespace chart
 
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 
 namespace
@@ -198,7 +194,6 @@ private:
         ::chart::CharacterProperties::AddPropertiesToVector( aProperties );
         ::chart::LineProperties::AddPropertiesToVector( aProperties );
         ::chart::FillProperties::AddPropertiesToVector( aProperties );
-        //::chart::NamedProperties::AddPropertiesToVector( aProperties );
         ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
         ::chart::wrapper::WrappedAutomaticPositionProperties::addProperties( aProperties );
         ::chart::wrapper::WrappedScaleTextProperties::addProperties( aProperties );
@@ -271,7 +266,7 @@ void SAL_CALL TitleWrapper::setSize( const awt::Size& /*aSize*/ )
     throw (beans::PropertyVetoException,
            uno::RuntimeException)
 {
-    OSL_ENSURE( false, "trying to set size of title" );
+    OSL_FAIL( "trying to set size of title" );
 }
 
 // ____ XShapeDescriptor (base of XShape) ____
@@ -288,10 +283,8 @@ void SAL_CALL TitleWrapper::dispose()
     Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) );
     m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) );
 
-    // /--
     MutexGuard aGuard( GetMutex());
     clearWrappedPropertySet();
-    // \--
 }
 
 void SAL_CALL TitleWrapper::addEventListener(
@@ -554,9 +547,6 @@ Sequence< OUString > TitleWrapper::getSupportedServiceNames_Static()
     aServices[ 1 ] = C2U( "com.sun.star.drawing.Shape" );
     aServices[ 2 ] = C2U( "com.sun.star.xml.UserDefinedAttributeSupplier" );
     aServices[ 3 ] = C2U( "com.sun.star.style.CharacterProperties" );
-//     aServices[ 4 ] = C2U( "com.sun.star.beans.PropertySet" );
-//     aServices[ 5 ] = C2U( "com.sun.star.drawing.FillProperties" );
-//     aServices[ 6 ] = C2U( "com.sun.star.drawing.LineProperties" );
 
     return aServices;
 }
@@ -566,3 +556,5 @@ APPHELPER_XSERVICEINFO_IMPL( TitleWrapper, lcl_aServiceName );
 
 } //  namespace wrapper
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx
index 63902e452ee3..8cb57eecfe80 100644
--- a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -134,3 +135,5 @@ private:
 
 // CHART_TITLEWRAPPER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
index 16f576453869..a972e61a6119 100755..100644
--- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,7 +40,6 @@
 
 #include "LineProperties.hxx"
 #include "FillProperties.hxx"
-// #include "NamedProperties.hxx"
 #include "UserDefinedProperties.hxx"
 
 using namespace ::com::sun::star;
@@ -72,7 +72,6 @@ private:
 
         ::chart::LineProperties::AddPropertiesToVector( aProperties );
         ::chart::FillProperties::AddPropertiesToVector( aProperties );
-        //::chart::NamedProperties::AddPropertiesToVector( aProperties );
         ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
 
         ::std::sort( aProperties.begin(), aProperties.end(),
@@ -238,22 +237,22 @@ uno::Any SAL_CALL UpDownBarWrapper::getPropertyValue( const ::rtl::OUString& rPr
 void SAL_CALL UpDownBarWrapper::addPropertyChangeListener( const ::rtl::OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
                     throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented");
+    OSL_FAIL("not implemented");
 }
 void SAL_CALL UpDownBarWrapper::removePropertyChangeListener( const ::rtl::OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ )
                     throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented");
+    OSL_FAIL("not implemented");
 }
 void SAL_CALL UpDownBarWrapper::addVetoableChangeListener( const ::rtl::OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
                     throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented");
+    OSL_FAIL("not implemented");
 }
 void SAL_CALL UpDownBarWrapper::removeVetoableChangeListener( const ::rtl::OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
                     throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented");
+    OSL_FAIL("not implemented");
 }
 
 //XMultiPropertySet
@@ -261,7 +260,6 @@ void SAL_CALL UpDownBarWrapper::removeVetoableChangeListener( const ::rtl::OUStr
 void SAL_CALL UpDownBarWrapper::setPropertyValues( const uno::Sequence< ::rtl::OUString >& rNameSeq, const uno::Sequence< uno::Any >& rValueSeq )
                     throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    bool bUnknownProperty = false;
     sal_Int32 nMinCount = std::min( rValueSeq.getLength(), rNameSeq.getLength() );
     for(sal_Int32 nN=0; nN<nMinCount; nN++)
     {
@@ -273,12 +271,9 @@ void SAL_CALL UpDownBarWrapper::setPropertyValues( const uno::Sequence< ::rtl::O
         catch( beans::UnknownPropertyException& ex )
         {
             ASSERT_EXCEPTION( ex );
-            bUnknownProperty = true;
         }
     }
     //todo: store unknown properties elsewhere
-//    if( bUnknownProperty )
-//        throw beans::UnknownPropertyException();
 }
 uno::Sequence< uno::Any > SAL_CALL UpDownBarWrapper::getPropertyValues( const uno::Sequence< ::rtl::OUString >& rNameSeq )
                     throw (uno::RuntimeException)
@@ -298,17 +293,17 @@ uno::Sequence< uno::Any > SAL_CALL UpDownBarWrapper::getPropertyValues( const un
 void SAL_CALL UpDownBarWrapper::addPropertiesChangeListener( const uno::Sequence< ::rtl::OUString >& /* aPropertyNames */, const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ )
                     throw (uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented");
+    OSL_FAIL("not implemented");
 }
 void SAL_CALL UpDownBarWrapper::removePropertiesChangeListener( const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ )
                     throw (uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented");
+    OSL_FAIL("not implemented");
 }
 void SAL_CALL UpDownBarWrapper::firePropertiesChangeEvent( const uno::Sequence< ::rtl::OUString >& /* aPropertyNames */, const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ )
                     throw (uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented");
+    OSL_FAIL("not implemented");
 }
 
 //XPropertyState
@@ -397,10 +392,10 @@ uno::Sequence< uno::Any > SAL_CALL UpDownBarWrapper::getPropertyDefaults( const
 Sequence< OUString > UpDownBarWrapper::getSupportedServiceNames_Static()
 {
     Sequence< OUString > aServices( 4 );
-    aServices[ 0 ] = ::rtl::OUString::createFromAscii( "com.sun.star.chart.ChartArea" );
-    aServices[ 1 ] = ::rtl::OUString::createFromAscii( "com.sun.star.drawing.LineProperties" );
-    aServices[ 2 ] = ::rtl::OUString::createFromAscii( "com.sun.star.drawing.FillProperties" );
-    aServices[ 3 ] = ::rtl::OUString::createFromAscii( "com.sun.star.xml.UserDefinedAttributeSupplier" );
+    aServices[ 0 ] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart.ChartArea"));
+    aServices[ 1 ] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.LineProperties"));
+    aServices[ 2 ] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.FillProperties"));
+    aServices[ 3 ] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.UserDefinedAttributeSupplier"));
 
     return aServices;
 }
@@ -410,3 +405,5 @@ APPHELPER_XSERVICEINFO_IMPL( UpDownBarWrapper, lcl_aServiceName );
 
 } //  namespace wrapper
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
index f271bcbf2bb5..7e3602f0aa36 100755..100644
--- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -62,9 +63,6 @@ class UpDownBarWrapper : public MutexContainer
                         , ::com::sun::star::beans::XMultiPropertySet
                         , ::com::sun::star::beans::XPropertyState
                         , ::com::sun::star::beans::XMultiPropertyStates
-                        //  , ::com::sun::star::uno::XWeak          // implemented by WeakImplHelper(optional interface)
-                        //  , ::com::sun::star::uno::XInterface     // implemented by WeakImplHelper
-                        //  , ::com::sun::star::lang::XTypeProvider // implemented by WeakImplHelper
                         >
 {
 public:
@@ -130,3 +128,5 @@ private: //member
 
 // CHART_UPDOWNBARWRAPPER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
index be485f86aac4..76ef90ffffc9 100755..100644
--- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -73,7 +74,6 @@ private:
         ::std::vector< ::com::sun::star::beans::Property > aProperties;
         ::chart::FillProperties::AddPropertiesToVector( aProperties );
         ::chart::LineProperties::AddPropertiesToVector( aProperties );
-        //::chart::NamedProperties::AddPropertiesToVector( aProperties );
         ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
 
         ::std::sort( aProperties.begin(), aProperties.end(),
@@ -116,10 +116,8 @@ void SAL_CALL WallFloorWrapper::dispose()
     Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) );
     m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) );
 
-    // /--
     MutexGuard aGuard( GetMutex());
     clearWrappedPropertySet();
-    // \--
 }
 
 void SAL_CALL WallFloorWrapper::addEventListener(
@@ -192,3 +190,5 @@ APPHELPER_XSERVICEINFO_IMPL( WallFloorWrapper, lcl_aServiceName );
 
 } //  namespace wrapper
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx
index 44cb241281e3..a1d5cda14b9c 100644
--- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -87,3 +88,5 @@ private:
 
 // CHART_WALLFLOORWRAPPER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx
index 8315a22d8ab4..1dac7ccba5c9 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -69,8 +70,6 @@ Any WrappedAddInProperty::getPropertyValue( const Reference< beans::XPropertySet
 }
 
 //.............................................................................
-//.............................................................................
-//.............................................................................
 
 WrappedBaseDiagramProperty::WrappedBaseDiagramProperty( ChartDocumentWrapper& rChartDocumentWrapper )
     : ::chart::WrappedProperty( C2U( "BaseDiagram" ), OUString() )
@@ -98,8 +97,6 @@ Any WrappedBaseDiagramProperty::getPropertyValue( const Reference< beans::XPrope
 }
 
 //.............................................................................
-//.............................................................................
-//.............................................................................
 
 WrappedAdditionalShapesProperty::WrappedAdditionalShapesProperty( ChartDocumentWrapper& rChartDocumentWrapper )
     : ::chart::WrappedProperty( C2U( "AdditionalShapes" ), OUString() )
@@ -123,8 +120,6 @@ Any WrappedAdditionalShapesProperty::getPropertyValue( const Reference< beans::X
 }
 
 //.............................................................................
-//.............................................................................
-//.............................................................................
 
 WrappedRefreshAddInAllowedProperty::WrappedRefreshAddInAllowedProperty( ChartDocumentWrapper& rChartDocumentWrapper )
     : ::chart::WrappedProperty( C2U( "RefreshAddInAllowed" ), OUString() )
@@ -151,8 +146,9 @@ Any WrappedRefreshAddInAllowedProperty::getPropertyValue( const Reference< beans
     return uno::makeAny( m_rChartDocumentWrapper.getUpdateAddIn() );
 }
 
-}
+} //namespace wrapper
 
-//.............................................................................
 } //namespace chart
-//.............................................................................
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx
index e807873c82dc..117f82d9d6a1 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -101,11 +102,12 @@ private:
     ChartDocumentWrapper& m_rChartDocumentWrapper;
 };
 
-}
+} //namespace wrapper
 
-//.............................................................................
 } //namespace chart
-//.............................................................................
+
 
 // CHART_WRAPPED_ADDIN_PROPERTY_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
index 925b9694ba5f..ab91436809f9 100755..100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -129,8 +130,7 @@ void lcl_addWrappedProperties( std::vector< WrappedProperty* >& rList )
 }//anonymous namespace
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
+
 void WrappedAutomaticPositionProperties::addProperties( ::std::vector< Property > & rOutProperties )
 {
     rOutProperties.push_back(
@@ -142,7 +142,6 @@ void WrappedAutomaticPositionProperties::addProperties( ::std::vector< Property
 }
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 
 void WrappedAutomaticPositionProperties::addWrappedProperties( std::vector< WrappedProperty* >& rList )
 {
@@ -152,3 +151,5 @@ void WrappedAutomaticPositionProperties::addWrappedProperties( std::vector< Wrap
 } //namespace wrapper
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx
index 1211f76c8f1f..9f9d2a57176d 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -47,3 +48,5 @@ public:
 } //namespace wrapper
 } //namespace chart
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
index 11e49850b694..75eee8549812 100755..100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -214,8 +215,6 @@ Any WrappedAxisAndGridExistenceProperty::getPropertyDefault( const Reference< be
 }
 
 //---------------------------------------------------------------------------------------------------------------
-//---------------------------------------------------------------------------------------------------------------
-//---------------------------------------------------------------------------------------------------------------
 
 class WrappedAxisTitleExistenceProperty : public WrappedProperty
 {
@@ -332,8 +331,6 @@ Any WrappedAxisTitleExistenceProperty::getPropertyDefault( const Reference< bean
 }
 
 //---------------------------------------------------------------------------------------------------------------
-//---------------------------------------------------------------------------------------------------------------
-//---------------------------------------------------------------------------------------------------------------
 
 class WrappedAxisLabelExistenceProperty : public WrappedProperty
 {
@@ -443,3 +440,5 @@ Any WrappedAxisLabelExistenceProperty::getPropertyDefault( const Reference< bean
 } //namespace wrapper
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.hxx
index a02e19d2a67c..6227998f111a 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -47,8 +48,6 @@ public:
 };
 
 //---------------------------------------------------------------------------------------------------------------
-//---------------------------------------------------------------------------------------------------------------
-//---------------------------------------------------------------------------------------------------------------
 
 class WrappedAxisTitleExistenceProperties
 {
@@ -58,8 +57,6 @@ public:
 };
 
 //---------------------------------------------------------------------------------------------------------------
-//---------------------------------------------------------------------------------------------------------------
-//---------------------------------------------------------------------------------------------------------------
 
 class WrappedAxisLabelExistenceProperties
 {
@@ -74,3 +71,5 @@ public:
 
 // CHART_WRAPPED_SCALE_PROPERTY_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx
index bd7c49052804..2744514b8933 100755..100644
--- a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,19 +34,12 @@
 #include "RelativeSizeHelper.hxx"
 #include "ReferenceSizePropertyProvider.hxx"
 
-// header for define DBG_ASSERT
-#include <tools/debug.hxx>
-
 using namespace ::com::sun::star;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Any;
 using ::rtl::OUString;
 
 //.............................................................................
-//.............................................................................
-
-//.............................................................................
-//.............................................................................
 
 namespace chart
 {
@@ -125,18 +119,16 @@ beans::PropertyState WrappedCharacterHeightProperty_Base::getPropertyState( cons
 
 Any WrappedCharacterHeightProperty_Base::convertInnerToOuterValue( const Any& rInnerValue ) const
 {
-    OSL_ASSERT("should not be used: WrappedCharacterHeightProperty_Base::convertInnerToOuterValue - check if you miss data");
+    OSL_FAIL("should not be used: WrappedCharacterHeightProperty_Base::convertInnerToOuterValue - check if you miss data");
     return rInnerValue;
 }
 Any WrappedCharacterHeightProperty_Base::convertOuterToInnerValue( const Any& rOuterValue ) const
 {
-    OSL_ASSERT("should not be used: WrappedCharacterHeightProperty_Base::convertOuterToInnerValue - check if you miss data");
+    OSL_FAIL("should not be used: WrappedCharacterHeightProperty_Base::convertOuterToInnerValue - check if you miss data");
     return rOuterValue;
 }
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 
 WrappedCharacterHeightProperty::WrappedCharacterHeightProperty( ReferenceSizePropertyProvider* pRefSizePropProvider )
         : WrappedCharacterHeightProperty_Base( C2U( "CharHeight" ), pRefSizePropProvider )
@@ -169,3 +161,5 @@ WrappedComplexCharacterHeightProperty::~WrappedComplexCharacterHeightProperty()
 } //namespace wrapper
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx
index 34329d6d3a52..a2cad186dc26 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -100,3 +101,5 @@ public:
 
 // CHART_WRAPPED_CHARACTERHEIGHT_PROPERTY_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
index 902938f04a78..45539f76f5a6 100755..100644
--- a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -50,8 +51,6 @@ namespace wrapper
 {
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 
 class WrappedDataCaptionProperty : public WrappedSeriesOrDiagramProperty< sal_Int32 >
 {
@@ -117,8 +116,7 @@ void lcl_addWrappedProperties( std::vector< WrappedProperty* >& rList
 }//anonymous namespace
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
+
 void WrappedDataCaptionProperties::addProperties( ::std::vector< Property > & rOutProperties )
 {
     rOutProperties.push_back(
@@ -130,7 +128,6 @@ void WrappedDataCaptionProperties::addProperties( ::std::vector< Property > & rO
 }
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 
 void WrappedDataCaptionProperties::addWrappedPropertiesForSeries( std::vector< WrappedProperty* >& rList
                                     , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
@@ -139,7 +136,6 @@ void WrappedDataCaptionProperties::addWrappedPropertiesForSeries( std::vector< W
 }
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 
 void WrappedDataCaptionProperties::addWrappedPropertiesForDiagram( std::vector< WrappedProperty* >& rList
                                     , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
@@ -148,8 +144,6 @@ void WrappedDataCaptionProperties::addWrappedPropertiesForDiagram( std::vector<
 }
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 
 WrappedDataCaptionProperty::WrappedDataCaptionProperty(
       ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact
@@ -182,9 +176,9 @@ void WrappedDataCaptionProperty::setValueToSeries( const Reference< beans::XProp
 }
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 
 } //namespace wrapper
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx
index f805d7e87fa0..9752ba19a87b 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,8 +41,6 @@ namespace wrapper
 {
 
 //-----------------------------------------------------------------------------------------------------------------
-//-----------------------------------------------------------------------------------------------------------------
-//-----------------------------------------------------------------------------------------------------------------
 
 class WrappedDataCaptionProperties
 {
@@ -59,3 +58,5 @@ public:
 
 // CHART_WRAPPED_DATACAPTION_PROPERTIES_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx
index a5dc9b23feed..19fc4eaee21b 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -49,8 +50,6 @@ const sal_Int32 DEFAULT_GAPWIDTH = 100;
 const sal_Int32 DEFAULT_OVERLAP = 0;
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 
 WrappedBarPositionProperty_Base::WrappedBarPositionProperty_Base(
                   const ::rtl::OUString& rOuterName
@@ -171,8 +170,6 @@ Any WrappedBarPositionProperty_Base::getPropertyValue( const Reference< beans::X
 }
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 
 WrappedGapwidthProperty::WrappedGapwidthProperty(
         ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
@@ -184,8 +181,6 @@ WrappedGapwidthProperty::~WrappedGapwidthProperty()
 }
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 
 WrappedBarOverlapProperty::WrappedBarOverlapProperty(
         ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
@@ -199,3 +194,5 @@ WrappedBarOverlapProperty::~WrappedBarOverlapProperty()
 } //  namespace wrapper
 } //  namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx
index 1ec7180d5455..c747c2fb29da 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -85,3 +86,5 @@ public:
 
 // CHART_WRAPPED_GAPWIDTH_PROPERTY_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
index 7a8d1554df7d..136a2f18f010 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,9 +32,6 @@
 #include "WrappedNumberFormatProperty.hxx"
 #include "macros.hxx"
 
-// header for define DBG_ERROR
-#include <tools/debug.hxx>
-
 using namespace ::com::sun::star;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Any;
@@ -89,7 +87,7 @@ Any WrappedNumberFormatProperty::getPropertyValue( const Reference< beans::XProp
 {
     if( !xInnerPropertySet.is() )
     {
-        DBG_ERROR("missing xInnerPropertySet in WrappedNumberFormatProperty::getPropertyValue");
+        OSL_FAIL("missing xInnerPropertySet in WrappedNumberFormatProperty::getPropertyValue");
         return Any();
     }
     Any aRet( xInnerPropertySet->getPropertyValue( m_aInnerName ));
@@ -116,8 +114,6 @@ Any WrappedNumberFormatProperty::getPropertyDefault( const Reference< beans::XPr
 }
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 
 WrappedLinkNumberFormatProperty::WrappedLinkNumberFormatProperty( WrappedNumberFormatProperty* pWrappedNumberFormatProperty )
         : WrappedProperty( C2U("LinkNumberFormatToSource"), C2U("") )
@@ -143,7 +139,7 @@ void WrappedLinkNumberFormatProperty::setPropertyValue( const Any& rOuterValue,
 {
     if( !xInnerPropertySet.is() )
     {
-        DBG_ERROR("missing xInnerPropertySet in WrappedNumberFormatProperty::setPropertyValue");
+        OSL_FAIL("missing xInnerPropertySet in WrappedNumberFormatProperty::setPropertyValue");
         return;
     }
 
@@ -179,7 +175,7 @@ Any WrappedLinkNumberFormatProperty::getPropertyValue( const Reference< beans::X
 {
     if( !xInnerPropertySet.is() )
     {
-        DBG_ERROR("missing xInnerPropertySet in WrappedNumberFormatProperty::getPropertyValue");
+        OSL_FAIL("missing xInnerPropertySet in WrappedNumberFormatProperty::getPropertyValue");
         return getPropertyDefault(0);
     }
     bool bLink = ! xInnerPropertySet->getPropertyValue( C2U("NumberFormat" )).hasValue();
@@ -197,3 +193,5 @@ Any WrappedLinkNumberFormatProperty::getPropertyDefault( const Reference< beans:
 } //namespace wrapper
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx
index 51e9b253150b..f5933c5d5a82 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -90,3 +91,5 @@ private:
 
 // CHART2_WRAPPEDNUMBERFORMATPROPERTY_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
index 64773ad062f9..0fa172ae2f18 100755..100644
--- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -107,7 +108,7 @@ WrappedScaleProperty::WrappedScaleProperty( tScaleProperty eScaleProperty
             m_aOuterName = C2U("ReverseDirection");
             break;
         default:
-            OSL_ENSURE(false,"unknown scale property");
+            OSL_FAIL("unknown scale property");
             break;
     }
 }
@@ -190,9 +191,10 @@ void WrappedScaleProperty::setPropertyValue( tScaleProperty eScaleProperty, cons
             if( rSubIncrements.getLength() == 0 )
                 rSubIncrements.realloc( 1 );
 
-            double fStepMain = 0, fStepHelp = 0;
+            double fStepHelp = 0;
             if( (rOuterValue >>= fStepHelp) )
             {
+                double fStepMain = 0;
                 if( AxisHelper::isLogarithmic(aScaleData.Scaling) )
                 {
                     sal_Int32 nIntervalCount = static_cast< sal_Int32 >(fStepHelp);
@@ -347,7 +349,7 @@ void WrappedScaleProperty::setPropertyValue( tScaleProperty eScaleProperty, cons
         }
         default:
         {
-            OSL_ENSURE(false,"unknown scale property");
+            OSL_FAIL("unknown scale property");
             break;
         }
     }
@@ -587,7 +589,7 @@ Any WrappedScaleProperty::getPropertyValue( tScaleProperty eScaleProperty, const
         }
         default:
         {
-            OSL_ENSURE(false,"unknown scale property");
+            OSL_FAIL("unknown scale property");
             break;
         }
     }
@@ -598,3 +600,5 @@ Any WrappedScaleProperty::getPropertyValue( tScaleProperty eScaleProperty, const
 } //  namespace wrapper
 } //  namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx
index 8df55339a46e..8863906c8db9 100755..100644
--- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -93,3 +94,5 @@ private: //member
 
 // CHART_WRAPPED_SCALE_PROPERTY_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
index 2249ac1c41c3..a76f6e17436c 100755..100644
--- a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -139,8 +140,6 @@ enum
 }//anonymous namespace
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 void WrappedScaleTextProperties::addProperties( ::std::vector< Property > & rOutProperties )
 {
     rOutProperties.push_back(
@@ -152,7 +151,6 @@ void WrappedScaleTextProperties::addProperties( ::std::vector< Property > & rOut
 }
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 
 void WrappedScaleTextProperties::addWrappedProperties( std::vector< WrappedProperty* >& rList
                                  , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
@@ -163,3 +161,5 @@ void WrappedScaleTextProperties::addWrappedProperties( std::vector< WrappedPrope
 } //namespace wrapper
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx
index 0094e30f7def..b2c4c988e597 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -52,3 +53,5 @@ public:
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx
index 79c09b8b41b0..23039f73f7a7 100755..100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -53,8 +54,6 @@ void WrappedSceneProperty::addWrappedProperties( std::vector< WrappedProperty* >
 }
 
 //----------------------------------------------------------------------------------------------------------------------
-//----------------------------------------------------------------------------------------------------------------------
-//----------------------------------------------------------------------------------------------------------------------
 
 WrappedD3DTransformMatrixProperty::WrappedD3DTransformMatrixProperty(
             ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
@@ -128,3 +127,5 @@ Any WrappedD3DTransformMatrixProperty::getPropertyDefault( const Reference< bean
 } //namespace wrapper
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx
index 23a186de6406..0a9bf3a87bd1 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,9 +41,6 @@ namespace wrapper
 {
 
 //-----------------------------------------------------------------------------------------------------------------
-//-----------------------------------------------------------------------------------------------------------------
-//-----------------------------------------------------------------------------------------------------------------
-
 class WrappedSceneProperty
 {
 public:
@@ -51,9 +49,6 @@ public:
 };
 
 //----------------------------------------------------------------------------------------------------------------------
-//----------------------------------------------------------------------------------------------------------------------
-//----------------------------------------------------------------------------------------------------------------------
-
 class WrappedD3DTransformMatrixProperty : public WrappedProperty
 {
 public:
@@ -80,3 +75,5 @@ private:
 
 // CHART_WRAPPED_SCENE_PROPERTY_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx
index 6124e2baf506..0a5a9b4890e1 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -68,3 +69,5 @@ WrappedSeriesAreaOrLineProperty::~WrappedSeriesAreaOrLineProperty()
 } //namespace wrapper
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.hxx
index 6045802f4a5d..2d9fe34f0f0c 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -58,3 +59,5 @@ protected:
 
 // CHART_WRAPPED_SERIES_AREA_OR_LINE_PROPERTY_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx
index 02ab979163bb..81a01226fb47 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -187,3 +188,5 @@ protected:
 
 // CHART_WRAPPED_SERIES_OR_DIAGRAM_PROPERTY_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
index 6890e06a1641..ae2910d865be 100755..100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -49,9 +50,6 @@ namespace wrapper
 {
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
 //PROPERTYTYPE is the type of the outer property
 
 template< typename PROPERTYTYPE >
@@ -118,7 +116,7 @@ public:
         m_aOuterValue = rOuterValue;
 
         bool bHasAmbiguousValue = false;
-        PROPERTYTYPE aOldValue;
+        PROPERTYTYPE aOldValue = PROPERTYTYPE();
         if( detectInnerValue( aOldValue, bHasAmbiguousValue ) )
         {
             if( bHasAmbiguousValue || aNewValue != aOldValue )
@@ -195,8 +193,6 @@ enum
 }//anonymous namespace
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 void WrappedSplineProperties::addProperties( ::std::vector< Property > & rOutProperties )
 {
     rOutProperties.push_back(
@@ -223,8 +219,6 @@ void WrappedSplineProperties::addProperties( ::std::vector< Property > & rOutPro
 }
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
 void WrappedSplineProperties::addWrappedProperties( std::vector< WrappedProperty* >& rList
                                     , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
 {
@@ -234,9 +228,6 @@ void WrappedSplineProperties::addWrappedProperties( std::vector< WrappedProperty
 }
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
 
 WrappedSplineTypeProperty::WrappedSplineTypeProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
     : WrappedSplineProperty<sal_Int32>( C2U("SplineType"), C2U("CurveStyle"), uno::makeAny(sal_Int32(0)), spChart2ModelContact )
@@ -276,10 +267,9 @@ Any WrappedSplineTypeProperty::convertOuterToInnerValue( const Any& rOuterValue
 
     return uno::makeAny(aInnerValue);
 }
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 
 } //namespace wrapper
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx
index 877d9cbe9a51..62ea0f08b726 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,8 +41,6 @@ namespace wrapper
 {
 
 //-----------------------------------------------------------------------------------------------------------------
-//-----------------------------------------------------------------------------------------------------------------
-//-----------------------------------------------------------------------------------------------------------------
 
 class WrappedSplineProperties
 {
@@ -57,3 +56,5 @@ public:
 
 // CHART_WRAPPED_SPLINE_PROPERTIES_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
index 145e3423ccd8..aea06297bcee 100755..100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -69,7 +70,6 @@ Any lcl_getRegressionDefault()
 }
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 
 ::com::sun::star::chart::ChartRegressionCurveType lcl_getRegressionCurveType( RegressionCurveHelper::tRegressionType eRegressionType )
 {
@@ -96,7 +96,6 @@ Any lcl_getRegressionDefault()
 }
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 
 RegressionCurveHelper::tRegressionType lcl_getRegressionType( ::com::sun::star::chart::ChartRegressionCurveType eRegressionCurveType )
 {
@@ -180,8 +179,6 @@ void lcl_ConvertRangeToXML(
 }//anonymous namespace
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 
 template< typename PROPERTYTYPE >
 class WrappedStatisticProperty : public WrappedSeriesOrDiagramProperty< PROPERTYTYPE >
@@ -218,8 +215,6 @@ protected:
 };
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 //PROP_CHART_STATISTIC_CONST_ERROR_LOW
 class WrappedConstantErrorLowProperty : public WrappedStatisticProperty< double >
 {
@@ -260,6 +255,7 @@ double WrappedConstantErrorLowProperty::getValueFromSeries( const Reference< bea
     }
     return aRet;
 }
+
 void WrappedConstantErrorLowProperty::setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, double aNewValue ) const
 {
     uno::Reference< beans::XPropertySet > xErrorBarProperties( getOrCreateErrorBarProperties(xSeriesPropertySet) );
@@ -272,8 +268,7 @@ void WrappedConstantErrorLowProperty::setValueToSeries( const Reference< beans::
         }
     }
 }
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
+
 //-----------------------------------------------------------------------------
 //PROP_CHART_STATISTIC_CONST_ERROR_HIGH
 class WrappedConstantErrorHighProperty : public WrappedStatisticProperty< double >
@@ -315,6 +310,7 @@ double WrappedConstantErrorHighProperty::getValueFromSeries( const Reference< be
     }
     return aRet;
 }
+
 void WrappedConstantErrorHighProperty::setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, double aNewValue ) const
 {
     uno::Reference< beans::XPropertySet > xErrorBarProperties( getOrCreateErrorBarProperties(xSeriesPropertySet) );
@@ -327,8 +323,7 @@ void WrappedConstantErrorHighProperty::setValueToSeries( const Reference< beans:
         }
     }
 }
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
+
 //-----------------------------------------------------------------------------
 //PROP_CHART_STATISTIC_MEAN_VALUE
 class WrappedMeanValueProperty : public WrappedStatisticProperty< sal_Bool >
@@ -360,6 +355,7 @@ sal_Bool WrappedMeanValueProperty::getValueFromSeries( const Reference< beans::X
         bRet = RegressionCurveHelper::hasMeanValueLine( xRegCnt );
     return bRet;
 }
+
 void WrappedMeanValueProperty::setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, sal_Bool aNewValue ) const
 {
     uno::Reference< chart2::XRegressionCurveContainer > xRegCnt( xSeriesPropertySet, uno::UNO_QUERY );
@@ -371,8 +367,7 @@ void WrappedMeanValueProperty::setValueToSeries( const Reference< beans::XProper
             RegressionCurveHelper::removeMeanValueLine( xRegCnt );
     }
 }
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
+
 //-----------------------------------------------------------------------------
 //PROP_CHART_STATISTIC_ERROR_CATEGORY
 // deprecated, replaced by ErrorBarStyle
@@ -474,8 +469,6 @@ void WrappedErrorCategoryProperty::setValueToSeries( const Reference< beans::XPr
 }
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 //PROP_CHART_STATISTIC_PERCENT_ERROR
 class WrappedPercentageErrorProperty : public WrappedStatisticProperty< double >
 {
@@ -531,8 +524,6 @@ void WrappedPercentageErrorProperty::setValueToSeries( const Reference< beans::X
 }
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 //PROP_CHART_STATISTIC_ERROR_MARGIN
 class WrappedErrorMarginProperty : public WrappedStatisticProperty< double >
 {
@@ -588,8 +579,6 @@ void WrappedErrorMarginProperty::setValueToSeries( const Reference< beans::XProp
 }
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 //PROP_CHART_STATISTIC_ERROR_INDICATOR
 class WrappedErrorIndicatorProperty : public WrappedStatisticProperty< ::com::sun::star::chart::ChartErrorIndicatorType >
 {
@@ -664,8 +653,6 @@ void WrappedErrorIndicatorProperty::setValueToSeries( const Reference< beans::XP
 
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 //PROP_CHART_STATISTIC_ERROR_BAR_STYLE
 // this is the new constant group that replaces the deprecated enum ChartErrorCategory
 class WrappedErrorBarStyleProperty : public WrappedStatisticProperty< sal_Int32 >
@@ -714,8 +701,6 @@ void WrappedErrorBarStyleProperty::setValueToSeries( const Reference< beans::XPr
 }
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 //PROP_CHART_STATISTIC_ERROR_RANGE_POSITIVE
 class WrappedErrorBarRangePositiveProperty : public WrappedStatisticProperty< OUString >
 {
@@ -783,8 +768,6 @@ void WrappedErrorBarRangePositiveProperty::setValueToSeries( const Reference< be
 }
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 //PROP_CHART_STATISTIC_ERROR_RANGE_NEGATIVE
 class WrappedErrorBarRangeNegativeProperty : public WrappedStatisticProperty< OUString >
 {
@@ -852,8 +835,6 @@ void WrappedErrorBarRangeNegativeProperty::setValueToSeries( const Reference< be
 }
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 //PROP_CHART_STATISTIC_REGRESSION_CURVES
 class WrappedRegressionCurvesProperty : public WrappedStatisticProperty< ::com::sun::star::chart::ChartRegressionCurveType >
 {
@@ -902,8 +883,6 @@ void WrappedRegressionCurvesProperty::setValueToSeries( const Reference< beans::
 }
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 //PROP_CHART_STATISTIC_REGRESSION_PROPERTIES
 //PROP_CHART_STATISTIC_ERROR_PROPERTIES
 //PROP_CHART_STATISTIC_MEAN_VALUE_PROPERTIES
@@ -979,8 +958,6 @@ void WrappedStatisticPropertySetProperty::setValueToSeries(
 }
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 
 namespace
 {
@@ -1125,8 +1102,6 @@ void WrappedStatisticProperties::addProperties( ::std::vector< Property > & rOut
 }
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
 void WrappedStatisticProperties::addWrappedPropertiesForSeries( std::vector< WrappedProperty* >& rList
                                     , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
 {
@@ -1134,18 +1109,14 @@ void WrappedStatisticProperties::addWrappedPropertiesForSeries( std::vector< Wra
 }
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
 void WrappedStatisticProperties::addWrappedPropertiesForDiagram( std::vector< WrappedProperty* >& rList
                                     , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
 {
     lcl_addWrappedProperties( rList, spChart2ModelContact, DIAGRAM  );
 }
 
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
 } //namespace wrapper
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx
index 973f0fef8ec8..d2db2b88fc1e 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -55,3 +56,5 @@ public:
 
 // CHART_WRAPPED_STATISTIC_PROPERTIES_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
index 37db09b977b6..7dc04fe121ad 100755..100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -50,9 +51,6 @@ namespace chart
 namespace wrapper
 {
 
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 
 class WrappedStockProperty : public WrappedProperty
@@ -115,10 +113,9 @@ void WrappedStockProperty::setPropertyValue( const ::com::sun::star::uno::Any& r
         {
             try
             {
-                // /-- locked controllers
+                // locked controllers
                 ControllerLockGuard aCtrlLockGuard( m_spChart2ModelContact->getChartModel() );
                 xTemplate->changeDiagram( xDiagram );
-                // \-- locked controllers
             }
             catch( uno::Exception & ex )
             {
@@ -135,8 +132,6 @@ void WrappedStockProperty::setPropertyValue( const ::com::sun::star::uno::Any& r
 }
 
 //-------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------
 
 class WrappedVolumeProperty : public WrappedStockProperty
 {
@@ -210,8 +205,6 @@ uno::Reference< chart2::XChartTypeTemplate > WrappedVolumeProperty::getNewTempla
 }
 
 //-------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------
-
 
 class WrappedUpDownProperty : public WrappedStockProperty
 {
@@ -289,8 +282,6 @@ enum
 }//anonymous namespace
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 void WrappedStockProperties::addProperties( ::std::vector< Property > & rOutProperties )
 {
     rOutProperties.push_back(
@@ -310,8 +301,6 @@ void WrappedStockProperties::addProperties( ::std::vector< Property > & rOutProp
 }
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
 void WrappedStockProperties::addWrappedProperties( std::vector< WrappedProperty* >& rList
                                     , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
 {
@@ -319,10 +308,8 @@ void WrappedStockProperties::addWrappedProperties( std::vector< WrappedProperty*
     rList.push_back( new WrappedUpDownProperty( spChart2ModelContact ) );
 }
 
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
 } //namespace wrapper
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx
index 3693b521b7dc..01aca55cedee 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,8 +41,6 @@ namespace wrapper
 {
 
 //-----------------------------------------------------------------------------------------------------------------
-//-----------------------------------------------------------------------------------------------------------------
-//-----------------------------------------------------------------------------------------------------------------
 
 class WrappedStockProperties
 {
@@ -57,3 +56,5 @@ public:
 
 // CHART_WRAPPED_STOCK_PROPERTIES_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
index 068f65f415be..5707a0aa8f21 100755..100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -68,8 +69,6 @@ namespace wrapper
 
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 
 class WrappedSymbolTypeProperty : public WrappedSeriesOrDiagramProperty< sal_Int32 >
 {
@@ -199,8 +198,6 @@ void lcl_addWrappedProperties( std::vector< WrappedProperty* >& rList
 }//anonymous namespace
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 void WrappedSymbolProperties::addProperties( ::std::vector< Property > & rOutProperties )
 {
     rOutProperties.push_back(
@@ -233,8 +230,6 @@ void WrappedSymbolProperties::addProperties( ::std::vector< Property > & rOutPro
 }
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
 void WrappedSymbolProperties::addWrappedPropertiesForSeries( std::vector< WrappedProperty* >& rList
                                     , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
 {
@@ -242,8 +237,6 @@ void WrappedSymbolProperties::addWrappedPropertiesForSeries( std::vector< Wrappe
 }
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
 void WrappedSymbolProperties::addWrappedPropertiesForDiagram( std::vector< WrappedProperty* >& rList
                                     , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
 {
@@ -251,8 +244,6 @@ void WrappedSymbolProperties::addWrappedPropertiesForDiagram( std::vector< Wrapp
 }
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 
 WrappedSymbolTypeProperty::WrappedSymbolTypeProperty(
     ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact,
@@ -341,8 +332,6 @@ beans::PropertyState WrappedSymbolTypeProperty::getPropertyState( const Referenc
 }
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 
 WrappedSymbolBitmapURLProperty::WrappedSymbolBitmapURLProperty(
     ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact,
@@ -416,8 +405,6 @@ void WrappedSymbolBitmapURLProperty::setValueToSeries(
 
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 
 namespace
 {
@@ -542,8 +529,6 @@ beans::PropertyState WrappedSymbolSizeProperty::getPropertyState( const Referenc
 }
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 
 WrappedSymbolAndLinesProperty::WrappedSymbolAndLinesProperty(
     ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact,
@@ -592,10 +577,8 @@ beans::PropertyState WrappedSymbolAndLinesProperty::getPropertyState( const Refe
     return beans::PropertyState_DEFAULT_VALUE;
 }
 
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
 } //namespace wrapper
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx
index 5a175623e441..d056c2a30778 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,8 +41,6 @@ namespace wrapper
 {
 
 //-----------------------------------------------------------------------------------------------------------------
-//-----------------------------------------------------------------------------------------------------------------
-//-----------------------------------------------------------------------------------------------------------------
 
 class WrappedSymbolProperties
 {
@@ -59,3 +58,5 @@ public:
 
 // CHART_WRAPPED_SYMBOL_PROPERTIES_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx
index a5d5afe6debc..86fbc3e62212 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,7 +41,6 @@ using ::rtl::OUString;
 //.............................................................................
 namespace chart
 {
-//.............................................................................
 
 WrappedTextRotationProperty::WrappedTextRotationProperty( bool bDirectState )
     : ::chart::WrappedProperty( C2U( "TextRotation" ), C2U( "TextRotation" ) )
@@ -82,6 +82,7 @@ Any WrappedTextRotationProperty::convertOuterToInnerValue( const Any& rOuterValu
     return aRet;
 }
 
-//.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx
index ba0bf8919919..01c9b77692e7 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,7 +33,6 @@
 //.............................................................................
 namespace chart
 {
-//.............................................................................
 
 class WrappedTextRotationProperty : public WrappedProperty
 {
@@ -50,9 +50,10 @@ protected:
     bool m_bDirectState;
 };
 
-//.............................................................................
 } //namespace chart
 //.............................................................................
 
 // CHART_WRAPPED_TEXTROTATION_PROPERTY_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/makefile.mk b/chart2/source/controller/chartapiwrapper/makefile.mk
deleted file mode 100644
index 0af72c700a41..000000000000
--- a/chart2/source/controller/chartapiwrapper/makefile.mk
+++ /dev/null
@@ -1,77 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=				..$/..$/..
-PRJNAME=			chart2
-TARGET=				chchartapiwrapper
-
-PRJINC=				$(PRJ)$/source
-
-ENABLE_EXCEPTIONS=	TRUE
-VISIBILITY_HIDDEN=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE: settings.mk
-
-# --- export library -------------------------------------------------
-
-#Specifies object files to bind into linked libraries.
-SLOFILES=	\
-    $(SLO)$/Chart2ModelContact.obj \
-    $(SLO)$/AreaWrapper.obj \
-    $(SLO)$/AxisWrapper.obj \
-    $(SLO)$/ChartDataWrapper.obj \
-    $(SLO)$/ChartDocumentWrapper.obj \
-    $(SLO)$/DataSeriesPointWrapper.obj \
-    $(SLO)$/DiagramWrapper.obj \
-    $(SLO)$/GridWrapper.obj \
-    $(SLO)$/LegendWrapper.obj \
-    $(SLO)$/TitleWrapper.obj \
-    $(SLO)$/MinMaxLineWrapper.obj \
-    $(SLO)$/UpDownBarWrapper.obj \
-    $(SLO)$/WallFloorWrapper.obj \
-    $(SLO)$/WrappedAutomaticPositionProperties.obj \
-    $(SLO)$/WrappedCharacterHeightProperty.obj \
-    $(SLO)$/WrappedDataCaptionProperties.obj \
-    $(SLO)$/WrappedTextRotationProperty.obj \
-    $(SLO)$/WrappedGapwidthProperty.obj \
-    $(SLO)$/WrappedScaleProperty.obj \
-    $(SLO)$/WrappedSplineProperties.obj \
-    $(SLO)$/WrappedStockProperties.obj \
-    $(SLO)$/WrappedSymbolProperties.obj \
-    $(SLO)$/WrappedAxisAndGridExistenceProperties.obj \
-    $(SLO)$/WrappedNumberFormatProperty.obj \
-    $(SLO)$/WrappedStatisticProperties.obj \
-    $(SLO)$/WrappedSceneProperty.obj \
-    $(SLO)$/WrappedSeriesAreaOrLineProperty.obj \
-    $(SLO)$/WrappedAddInProperty.obj \
-    $(SLO)$/WrappedScaleTextProperties.obj
-
-# --- Targets -----------------------------------------------------------------
-
-.INCLUDE: target.mk
diff --git a/chart2/source/controller/dialogs/Bitmaps.src b/chart2/source/controller/dialogs/Bitmaps.src
index 3945090217e0..cf7b30410210 100644
--- a/chart2/source/controller/dialogs/Bitmaps.src
+++ b/chart2/source/controller/dialogs/Bitmaps.src
@@ -33,7 +33,7 @@ Image IMG_TYPE_COLUMN
 };
 Image IMG_TYPE_BAR
 {
-    ImageBitmap = Bitmap { File = "typebar_16.png " ; };
+    ImageBitmap = Bitmap { File = "typebar_16.png" ; };
     MaskColor = STD_MASKCOLOR;
 };
 Image IMG_TYPE_PIE
@@ -501,35 +501,35 @@ Image BMP_REGRESSION_NONE
 {
     ImageBitmap = Bitmap
     {
-        File = "regno.bmp" ;
+        File = "regno.png" ;
     };
 };
 Image BMP_REGRESSION_LINEAR
 {
     ImageBitmap = Bitmap
     {
-        File = "reglin.bmp" ;
+        File = "reglin.png" ;
     };
 };
 Image BMP_REGRESSION_LOG
 {
     ImageBitmap = Bitmap
     {
-        File = "reglog.bmp" ;
+        File = "reglog.png" ;
     };
 };
 Image BMP_REGRESSION_EXP
 {
     ImageBitmap = Bitmap
     {
-        File = "regexp.bmp" ;
+        File = "regexp.png" ;
     };
 };
 Image BMP_REGRESSION_POWER
 {
     ImageBitmap = Bitmap
     {
-        File = "regpow.bmp" ;
+        File = "regpow.png" ;
     };
 };
 //---------------------
diff --git a/chart2/source/controller/dialogs/Bitmaps_HC.hrc b/chart2/source/controller/dialogs/Bitmaps_HC.hrc
deleted file mode 100644
index 16bffd0cf86d..000000000000
--- a/chart2/source/controller/dialogs/Bitmaps_HC.hrc
+++ /dev/null
@@ -1,213 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SOLAR_HRC
-#include <svl/solar.hrc>
-#endif
-
-// RID_SCH_START is 30512 (see svl/solar.hrc)
-
-// next free: 100
-
-#ifndef SC_HC_MASKCOLOR
-#define SC_HC_MASKCOLOR Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; }
-#endif
-
-//-----------------------------------------------------------------------------
-// chart types
-// Images:
-
-#define IMG_TYPE_COLUMN_HC (RID_SCH_START + 1)
-#define IMG_TYPE_BAR_HC    (RID_SCH_START + 2)
-#define IMG_TYPE_PIE_HC    (RID_SCH_START + 3)
-#define IMG_TYPE_AREA_HC   (RID_SCH_START + 4)
-#define IMG_TYPE_LINE_HC   (RID_SCH_START + 5)
-#define IMG_TYPE_XY_HC     (RID_SCH_START + 6)
-#define IMG_TYPE_BUBBLE_HC (RID_SCH_START + 7)
-#define IMG_TYPE_NET_HC    (RID_SCH_START + 8)
-#define IMG_TYPE_STOCK_HC  (RID_SCH_START + 9)
-#define IMG_TYPE_COLUMN_LINE_HC  (RID_SCH_START + 10)
-
-//-----------------------------------------------------------------------------
-//Chart Subtypes
-// Bitmaps:
-
-//----------------------
-// Column Chart Subtypes
-#define BMP_COLUMNS_2D_1_HC (RID_SCH_START + 1)
-#define BMP_COLUMNS_2D_2_HC (RID_SCH_START + 2)
-#define BMP_COLUMNS_2D_3_HC (RID_SCH_START + 3)
-
-#define BMP_COLUMNS_3D_HC (RID_SCH_START + 4)
-#define BMP_COLUMNS_3D_1_HC (RID_SCH_START + 5)
-#define BMP_COLUMNS_3D_2_HC (RID_SCH_START + 6)
-#define BMP_COLUMNS_3D_3_HC (RID_SCH_START + 7)
-
-#define BMP_SAEULE_3D_1_HC (RID_SCH_START + 8)
-#define BMP_SAEULE_3D_2_HC (RID_SCH_START + 9)
-#define BMP_SAEULE_3D_3_HC (RID_SCH_START + 10)
-#define BMP_SAEULE_3D_4_HC (RID_SCH_START + 11)
-
-#define BMP_KEGEL_3D_1_HC (RID_SCH_START + 12)
-#define BMP_KEGEL_3D_2_HC (RID_SCH_START + 13)
-#define BMP_KEGEL_3D_3_HC (RID_SCH_START + 14)
-#define BMP_KEGEL_3D_4_HC (RID_SCH_START + 15)
-
-#define BMP_PYRAMID_3D_1_HC (RID_SCH_START + 16)
-#define BMP_PYRAMID_3D_2_HC (RID_SCH_START + 17)
-#define BMP_PYRAMID_3D_3_HC (RID_SCH_START + 18)
-#define BMP_PYRAMID_3D_4_HC (RID_SCH_START + 19)
-
-//----------------------
-// Bar Chart Subtypes
-
-#define BMP_BARS_2D_1_HC (RID_SCH_START + 20)
-#define BMP_BARS_2D_2_HC (RID_SCH_START + 21)
-#define BMP_BARS_2D_3_HC (RID_SCH_START + 22)
-
-#define BMP_BARS_3D_HC (RID_SCH_START + 23)
-#define BMP_BARS_3D_1_HC (RID_SCH_START + 24)
-#define BMP_BARS_3D_2_HC (RID_SCH_START + 25)
-#define BMP_BARS_3D_3_HC (RID_SCH_START + 26)
-
-#define BMP_ROEHRE_3D_1_HC (RID_SCH_START + 27)
-#define BMP_ROEHRE_3D_2_HC (RID_SCH_START + 28)
-#define BMP_ROEHRE_3D_3_HC (RID_SCH_START + 29)
-#define BMP_ROEHRE_3D_4_HC (RID_SCH_START + 30)
-
-#define BMP_KEGELQ_3D_1_HC (RID_SCH_START + 31)
-#define BMP_KEGELQ_3D_2_HC (RID_SCH_START + 32)
-#define BMP_KEGELQ_3D_3_HC (RID_SCH_START + 33)
-#define BMP_KEGELQ_3D_4_HC (RID_SCH_START + 34)
-
-#define BMP_PYRAMIDQ_3D_1_HC (RID_SCH_START + 35)
-#define BMP_PYRAMIDQ_3D_2_HC (RID_SCH_START + 36)
-#define BMP_PYRAMIDQ_3D_3_HC (RID_SCH_START + 37)
-#define BMP_PYRAMIDQ_3D_4_HC (RID_SCH_START + 38)
-
-//----------------------
-// Pie and Donut Chart Subtypes
-
-#define BMP_CIRCLES_2D_HC (RID_SCH_START + 39)
-#define BMP_CIRCLES_2D_EXPLODED_HC (RID_SCH_START + 40)
-#define BMP_CIRCLES_3D_HC (RID_SCH_START + 41)
-#define BMP_CIRCLES_3D_EXPLODED_HC (RID_SCH_START + 42)
-#define BMP_DONUT_2D_HC (RID_SCH_START + 43)
-#define BMP_DONUT_2D_EXPLODED_HC (RID_SCH_START + 44)
-#define BMP_DONUT_3D_HC (RID_SCH_START + 45)
-#define BMP_DONUT_3D_EXPLODED_HC (RID_SCH_START + 46)
-
-//----------------------
-// Points and Lines Chart Subtypes
-
-#define BMP_POINTS_XVALUES_HC (RID_SCH_START + 47)
-#define BMP_POINTS_XCATEGORY_HC (RID_SCH_START + 48)
-#define BMP_POINTS_STACKED_HC (RID_SCH_START + 49)
-
-#define BMP_LINE_P_XVALUES_HC (RID_SCH_START + 50)
-#define BMP_LINE_O_XVALUES_HC (RID_SCH_START + 51)
-#define BMP_LINE3D_XVALUES_HC (RID_SCH_START + 52)
-
-#define BMP_LINE_P_XCATEGORY_HC (RID_SCH_START + 53)
-#define BMP_LINE_O_XCATEGORY_HC (RID_SCH_START + 54)
-#define BMP_LINE3D_XCATEGORY_HC (RID_SCH_START + 55)
-
-#define BMP_LINE_P_STACKED_HC (RID_SCH_START + 56)
-#define BMP_LINE_O_STACKED_HC (RID_SCH_START + 57)
-#define BMP_LINE3D_STACKED_HC (RID_SCH_START + 58)
-
-#define BMP_LINE_P_XVALUES_SMOOTH_HC (RID_SCH_START + 59)
-#define BMP_LINE_O_XVALUES_SMOOTH_HC (RID_SCH_START + 60)
-#define BMP_LINE3D_XVALUES_SMOOTH_HC (RID_SCH_START + 61)
-
-#define BMP_LINE_P_XCATEGORY_SMOOTH_HC (RID_SCH_START + 62)
-#define BMP_LINE_O_XCATEGORY_SMOOTH_HC (RID_SCH_START + 63)
-#define BMP_LINE3D_XCATEGORY_SMOOTH_HC (RID_SCH_START + 64)
-
-#define BMP_LINE_P_STACKED_SMOOTH_HC (RID_SCH_START + 65)
-#define BMP_LINE_O_STACKED_SMOOTH_HC (RID_SCH_START + 66)
-#define BMP_LINE3D_STACKED_SMOOTH_HC (RID_SCH_START + 67)
-
-//----------------------
-// Area Chart Subtypes
-
-#define BMP_AREAS_2D_HC (RID_SCH_START + 68)
-#define BMP_AREAS_2D_1_HC (RID_SCH_START + 69)
-#define BMP_AREAS_2D_3_HC (RID_SCH_START + 70)
-#define BMP_AREAS_3D_HC (RID_SCH_START + 71)
-#define BMP_AREAS_3D_1_HC (RID_SCH_START + 72)
-#define BMP_AREAS_3D_2_HC (RID_SCH_START + 73)
-
-//----------------------
-// Net Chart Subtypes
-
-#define BMP_NET_HC (RID_SCH_START + 74)
-#define BMP_NET_STACK_HC (RID_SCH_START + 75)
-#define BMP_NET_SYMB_HC (RID_SCH_START + 76)
-#define BMP_NET_SYMB_STACK_HC (RID_SCH_START + 77)
-#define BMP_NET_LINESYMB_HC (RID_SCH_START + 78)
-#define BMP_NET_LINESYMB_STACK_HC (RID_SCH_START + 79)
-#define BMP_NET_FILL_HC (RID_SCH_START + 80)
-#define BMP_NET_FILL_STACK_HC (RID_SCH_START + 81)
-
-//----------------------
-// Stock Chart Subtypes
-
-#define BMP_STOCK_1_HC (RID_SCH_START + 82)
-#define BMP_STOCK_2_HC (RID_SCH_START + 83)
-#define BMP_STOCK_3_HC (RID_SCH_START + 84)
-#define BMP_STOCK_4_HC (RID_SCH_START + 85)
-
-//----------------------
-// Column + Line Chart Subtypes
-
-#define BMP_COLUMN_LINE_HC (RID_SCH_START + 86)
-#define BMP_COLUMN_LINE_STACKED_HC (RID_SCH_START + 87)
-
-//----------------------
-// Bubble Chart Subtypes
-#define BMP_BUBBLE_1_HC (RID_SCH_START + 88)
-
-//-----------------------------------------------------------------------------
-//further Images:
-
-//SchStatisticTabPage and SchDataStatisticsDlg part 1
-#define BMP_INDICATE_BOTH_VERTI_HC (RID_SCH_START + 89)
-#define BMP_INDICATE_UP_HC (RID_SCH_START + 90)
-#define BMP_INDICATE_DOWN_HC (RID_SCH_START + 91)
-#define BMP_INDICATE_BOTH_HORI_HC (RID_SCH_START + 97)
-#define BMP_INDICATE_RIGHT_HC (RID_SCH_START + 98)
-#define BMP_INDICATE_LEFT_HC (RID_SCH_START + 99)
-
-//SchStatisticTabPage and SchDataStatisticsDlg part 2
-#define BMP_REGRESSION_NONE_HC (RID_SCH_START + 92)
-#define BMP_REGRESSION_LINEAR_HC (RID_SCH_START + 93)
-#define BMP_REGRESSION_LOG_HC (RID_SCH_START + 94)
-#define BMP_REGRESSION_EXP_HC (RID_SCH_START + 95)
-#define BMP_REGRESSION_POWER_HC (RID_SCH_START + 96)
-
-// hide-button for range-choosing
-#define IMG_SELECTRANGE_HC (RID_SCH_START + 100)
diff --git a/chart2/source/controller/dialogs/Bitmaps_HC.src b/chart2/source/controller/dialogs/Bitmaps_HC.src
deleted file mode 100644
index 738c133483e1..000000000000
--- a/chart2/source/controller/dialogs/Bitmaps_HC.src
+++ /dev/null
@@ -1,543 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#include "Bitmaps_HC.hrc"
-
-Image IMG_TYPE_COLUMN_HC
-{
-    ImageBitmap = Bitmap { File = "typecolumn_16.png" ; };
-    MaskColor = SC_HC_MASKCOLOR;
-};
-Image IMG_TYPE_BAR_HC
-{
-    ImageBitmap = Bitmap { File = "typebar_16.png " ; };
-    MaskColor = SC_HC_MASKCOLOR;
-};
-Image IMG_TYPE_PIE_HC
-{
-    ImageBitmap = Bitmap { File = "typepie_16.png" ; };
-    MaskColor = SC_HC_MASKCOLOR;
-};
-Image IMG_TYPE_LINE_HC
-{
-    ImageBitmap = Bitmap { File = "typepointline_16.png" ; };
-    MaskColor = SC_HC_MASKCOLOR;
-};
-Image IMG_TYPE_XY_HC
-{
-    ImageBitmap = Bitmap { File = "typexy_16.png" ; };
-    MaskColor = SC_HC_MASKCOLOR;
-};
-Image IMG_TYPE_AREA_HC
-{
-    ImageBitmap = Bitmap { File = "typearea_16.png" ; };
-    MaskColor = SC_HC_MASKCOLOR;
-};
-Image IMG_TYPE_NET_HC
-{
-    ImageBitmap = Bitmap { File = "typenet_16.png" ; };
-    MaskColor = SC_HC_MASKCOLOR;
-};
-Image IMG_TYPE_STOCK_HC
-{
-    ImageBitmap = Bitmap { File = "typestock_16.png" ; };
-    MaskColor = SC_HC_MASKCOLOR;
-};
-Image IMG_TYPE_COLUMN_LINE_HC
-{
-    ImageBitmap = Bitmap { File = "typecolumnline_16.png" ; };
-    MaskColor = SC_HC_MASKCOLOR;
-};
-Image IMG_TYPE_BUBBLE_HC
-{
-    ImageBitmap = Bitmap { File = "typebubble_16.png" ; };
-    MaskColor = SC_HC_MASKCOLOR;
-};
-Bitmap BMP_BUBBLE_1_HC
-{
-    File = "bubble_52x60_h.png" ;
-};
-Bitmap BMP_AREAS_2D_HC
-{
-    File = "areas_52x60_h.png" ;
-};
-Bitmap BMP_AREAS_2D_1_HC
-{
-    File = "areaspiled_52x60_h.png" ;
-};
-Bitmap BMP_AREAS_2D_3_HC
-{
-    File = "areasfull_52x60_h.png" ;
-};
-Bitmap BMP_AREAS_3D_HC
-{
-    File = "areaspiled3d_52x60_h.png" ;
-};
-Bitmap BMP_AREAS_3D_1_HC
-{
-    File = "areas3d_52x60_h.png" ;
-};
-Bitmap BMP_AREAS_3D_2_HC
-{
-    File = "areasfull3d_52x60_h.png" ;
-};
-//---------------------
-Bitmap BMP_BARS_2D_1_HC
-{
-    File = "bar_52x60_h.png" ;
-};
-Bitmap BMP_BARS_2D_2_HC
-{
-    File = "barstack_52x60_h.png" ;
-};
-Bitmap BMP_BARS_2D_3_HC
-{
-    File = "barpercent_52x60_h.png" ;
-};
-Bitmap BMP_BARS_3D_HC
-{
-    File = "bar3ddeep_52x60_h.png" ;
-};
-Bitmap BMP_BARS_3D_1_HC
-{
-    File = "bar3d_52x60_h.png" ;
-};
-Bitmap BMP_BARS_3D_2_HC
-{
-    File = "barstack3d_52x60_h.png" ;
-};
-Bitmap BMP_BARS_3D_3_HC
-{
-    File = "barpercent3d_52x60_h.png" ;
-};
-//---------------------
-Bitmap BMP_CIRCLES_2D_HC
-{
-    File = "pie_52x60_h.png" ;
-};
-Bitmap BMP_CIRCLES_2D_EXPLODED_HC
-{
-    File = "pieexploded_52x60_h.png" ;
-};
-Bitmap BMP_CIRCLES_3D_HC
-{
-    File = "pie3d_52x60_h.png" ;
-};
-Bitmap BMP_CIRCLES_3D_EXPLODED_HC
-{
-    File = "pie3dexploded_52x60_h.png" ;
-};
-//---------------------
-Bitmap BMP_DONUT_2D_HC
-{
-    File = "donut_52x60_h.png" ;
-};
-Bitmap BMP_DONUT_2D_EXPLODED_HC
-{
-    File = "donutexploded_52x60_h.png" ;
-};
-Bitmap BMP_DONUT_3D_HC
-{
-    File = "donut3d_52x60_h.png" ;
-};
-Bitmap BMP_DONUT_3D_EXPLODED_HC
-{
-    File = "donut3dexploded_52x60_h.png" ;
-};
-//---------------------
-Bitmap BMP_COLUMNS_2D_1_HC
-{
-    File = "columns_52x60_h.png" ;
-};
-Bitmap BMP_COLUMNS_2D_2_HC
-{
-    File = "columnstack_52x60_h.png" ;
-};
-Bitmap BMP_COLUMNS_2D_3_HC
-{
-    File = "columnpercent_52x60_h.png" ;
-};
-Bitmap BMP_COLUMN_LINE_HC
-{
-    File = "columnline_52x60_h.png" ;
-};
-Bitmap BMP_COLUMN_LINE_STACKED_HC
-{
-    File = "columnstackline_52x60_h.png" ;
-};
-//---------------------
-Bitmap BMP_COLUMNS_3D_HC
-{
-    File = "columns3ddeep_52x60_h.png" ;
-};
-Bitmap BMP_COLUMNS_3D_1_HC
-{
-    File = "columns3d_52x60_h.png" ;
-};
-Bitmap BMP_COLUMNS_3D_2_HC
-{
-    File = "columnstack3d_52x60_h.png" ;
-};
-Bitmap BMP_COLUMNS_3D_3_HC
-{
-    File = "columnpercent3d_52x60_h.png" ;
-};
-//---------------------
-Bitmap BMP_KEGELQ_3D_1_HC
-{
-    File = "conehori_52x60_h.png" ;
-};
-Bitmap BMP_KEGELQ_3D_2_HC
-{
-    File = "conehoristack_52x60_h.png" ;
-};
-Bitmap BMP_KEGELQ_3D_3_HC
-{
-    File = "conehoripercent_52x60_h.png" ;
-};
-Bitmap BMP_KEGELQ_3D_4_HC
-{
-    File = "conehorideep_52x60_h.png" ;
-};
-Bitmap BMP_KEGEL_3D_1_HC
-{
-    File = "cone_52x60_h.png" ;
-};
-Bitmap BMP_KEGEL_3D_2_HC
-{
-    File = "conestack_52x60_h.png" ;
-};
-Bitmap BMP_KEGEL_3D_3_HC
-{
-    File = "conepercent_52x60_h.png" ;
-};
-Bitmap BMP_KEGEL_3D_4_HC
-{
-    File = "conedeep_52x60_h.png" ;
-};
-//---------------------
-Bitmap BMP_POINTS_XVALUES_HC
-{
-    File = "valueaxisdirectpoints_52x60_h.png" ;
-};
-Bitmap BMP_POINTS_XCATEGORY_HC
-{
-    File = "nostackdirectpoints_52x60_h.png" ;
-};
-Bitmap BMP_POINTS_STACKED_HC
-{
-    File = "stackdirectpoints_52x60_h.png" ;
-};
-//---------------------
-
-Bitmap BMP_LINE_P_XVALUES_HC
-{
-    File = "valueaxisdirectboth_52x60_h.png" ;
-};
-Bitmap BMP_LINE_O_XVALUES_HC
-{
-    File = "valueaxisdirectlines_52x60_h.png" ;
-};
-Bitmap BMP_LINE3D_XVALUES_HC
-{
-    File = "valueaxisdirect3d_52x60_h.png" ;
-};
-
-
-Bitmap BMP_LINE_P_XCATEGORY_HC
-{
-    File = "nostackdirectboth_52x60_h.png" ;
-};
-Bitmap BMP_LINE_O_XCATEGORY_HC
-{
-    File = "nostackdirectlines_52x60_h.png" ;
-};
-Bitmap BMP_LINE3D_XCATEGORY_HC
-{
-    File = "nostackdirect3d_52x60_h.png" ;
-};
-
-
-Bitmap BMP_LINE_P_STACKED_HC
-{
-    File = "stackdirectboth_52x60_h.png" ;
-};
-Bitmap BMP_LINE_O_STACKED_HC
-{
-    File = "stackdirectlines_52x60_h.png" ;
-};
-Bitmap BMP_LINE3D_STACKED_HC
-{
-    File = "stackdirect3d_52x60_h.png" ;
-};
-
-//---------------------
-Bitmap BMP_LINE_P_XVALUES_SMOOTH_HC
-{
-    File = "valueaxissmoothboth_52x60_h.png" ;
-};
-Bitmap BMP_LINE_O_XVALUES_SMOOTH_HC
-{
-    File = "valueaxissmoothlines_52x60_h.png" ;
-};
-Bitmap BMP_LINE3D_XVALUES_SMOOTH_HC
-{
-    File = "valueaxissmooth3d_52x60_h.png" ;
-};
-Bitmap BMP_LINE_P_XCATEGORY_SMOOTH_HC
-{
-    File = "nostacksmoothboth_52x60_h.png" ;
-};
-Bitmap BMP_LINE_O_XCATEGORY_SMOOTH_HC
-{
-    File = "nostacksmoothlines_52x60_h.png" ;
-};
-Bitmap BMP_LINE3D_XCATEGORY_SMOOTH_HC
-{
-    File = "nostacksmooth3d_52x60_h.png" ;
-};
-Bitmap BMP_LINE_P_STACKED_SMOOTH_HC
-{
-    File = "stacksmoothboth_52x60_h.png" ;
-};
-Bitmap BMP_LINE_O_STACKED_SMOOTH_HC
-{
-    File = "stacksmoothlines_52x60_h.png" ;
-};
-Bitmap BMP_LINE3D_STACKED_SMOOTH_HC
-{
-    File = "stacksmooth3d_52x60_h.png" ;
-};
-//---------------------
-Bitmap BMP_NET_HC
-{
-    File = "net_52x60_h.png" ;
-};
-Bitmap BMP_NET_STACK_HC
-{
-    File = "netstack_52x60_h.png" ;
-};
-Bitmap BMP_NET_SYMB_HC
-{
-    File = "netpoint_52x60_h.png" ;
-};
-Bitmap BMP_NET_SYMB_STACK_HC
-{
-    File = "netpointstack_52x60_h.png" ;
-};
-Bitmap BMP_NET_LINESYMB_HC
-{
-    File = "netlinepoint_52x60_h.png" ;
-};
-Bitmap BMP_NET_LINESYMB_STACK_HC
-{
-    File = "netlinepointstack_52x60_h.png" ;
-};
-Bitmap BMP_NET_FILL_HC
-{
-    File = "netfill_52x60_h.png" ;
-};
-Bitmap BMP_NET_FILL_STACK_HC
-{
-    File = "netstackfill_52x60_h.png" ;
-};
-//---------------------
-Bitmap BMP_PYRAMIDQ_3D_1_HC
-{
-    File = "pyramindhori_52x60_h.png" ;
-};
-Bitmap BMP_PYRAMIDQ_3D_2_HC
-{
-    File = "pyramindhoristack_52x60_h.png" ;
-};
-Bitmap BMP_PYRAMIDQ_3D_3_HC
-{
-    File = "pyramindhoripercent_52x60_h.png" ;
-};
-Bitmap BMP_PYRAMIDQ_3D_4_HC
-{
-    File = "pyramindhorideep_52x60_h.png" ;
-};
-Bitmap BMP_PYRAMID_3D_1_HC
-{
-    File = "pyramind_52x60_h.png" ;
-};
-Bitmap BMP_PYRAMID_3D_2_HC
-{
-    File = "pyramindstack_52x60_h.png" ;
-};
-Bitmap BMP_PYRAMID_3D_3_HC
-{
-    File = "pyramindpercent_52x60_h.png" ;
-};
-Bitmap BMP_PYRAMID_3D_4_HC
-{
-    File = "pyraminddeep_52x60_h.png" ;
-};
-//---------------------
-Bitmap BMP_ROEHRE_3D_1_HC
-{
-    File = "cylinderhori_52x60_h.png" ;
-};
-Bitmap BMP_ROEHRE_3D_2_HC
-{
-    File = "cylinderhoristack_52x60_h.png" ;
-};
-Bitmap BMP_ROEHRE_3D_3_HC
-{
-    File = "cylinderhoriprocent_52x60_h.png" ;
-};
-Bitmap BMP_ROEHRE_3D_4_HC
-{
-    File = "cylinderhorideep_52x60_h.png" ;
-};
-//---------------------
-Bitmap BMP_SAEULE_3D_1_HC
-{
-    File = "cylinder_52x60_h.png" ;
-};
-Bitmap BMP_SAEULE_3D_2_HC
-{
-    File = "cylinderstack_52x60_h.png" ;
-};
-Bitmap BMP_SAEULE_3D_3_HC
-{
-    File = "cylinderpercent_52x60_h.png" ;
-};
-Bitmap BMP_SAEULE_3D_4_HC
-{
-    File = "cylinderdeep_52x60_h.png" ;
-};
-//---------------------
-Bitmap BMP_STOCK_1_HC
-{
-    File = "stock_52x60_h.png" ;
-};
-Bitmap BMP_STOCK_2_HC
-{
-    File = "stockblock_52x60_h.png" ;
-};
-Bitmap BMP_STOCK_3_HC
-{
-    File = "stockcolumns_52x60_h.png" ;
-};
-Bitmap BMP_STOCK_4_HC
-{
-    File = "stockcolumnsattach_52x60_h.png" ;
-};
-//---------------------
-//---------------------
-//---------------------
-//error indicator
-Image BMP_INDICATE_BOTH_VERTI_HC
-{
-    ImageBitmap = Bitmap
-    {
-        File = "errorbothverti_30_h.png" ;
-    };
-};
-Image BMP_INDICATE_DOWN_HC
-{
-    ImageBitmap = Bitmap
-    {
-        File = "errordown_30_h.png" ;
-    };
-};
-Image BMP_INDICATE_UP_HC
-{
-    ImageBitmap = Bitmap
-    {
-        File = "errorup_30_h.png" ;
-    };
-};
-Image BMP_INDICATE_BOTH_HORI_HC
-{
-    ImageBitmap = Bitmap
-    {
-        File = "errorbothhori_30_h.png" ;
-    };
-};
-Image BMP_INDICATE_RIGHT_HC
-{
-    ImageBitmap = Bitmap
-    {
-        File = "errorright_30_h.png" ;
-    };
-};
-Image BMP_INDICATE_LEFT_HC
-{
-    ImageBitmap = Bitmap
-    {
-        File = "errorleft_30_h.png" ;
-    };
-};
-
-//---------------------
-//regression curves
-Image BMP_REGRESSION_NONE_HC
-{
-    ImageBitmap = Bitmap
-    {
-        File = "regno_h.bmp" ;
-    };
-};
-Image BMP_REGRESSION_LINEAR_HC
-{
-    ImageBitmap = Bitmap
-    {
-        File = "reglin_h.bmp" ;
-    };
-};
-Image BMP_REGRESSION_LOG_HC
-{
-    ImageBitmap = Bitmap
-    {
-        File = "reglog_h.bmp" ;
-    };
-};
-Image BMP_REGRESSION_EXP_HC
-{
-    ImageBitmap = Bitmap
-    {
-        File = "regexp_h.bmp" ;
-    };
-};
-Image BMP_REGRESSION_POWER_HC
-{
-    ImageBitmap = Bitmap
-    {
-        File = "regpow_h.bmp" ;
-    };
-};
-//---------------------
-Image IMG_SELECTRANGE_HC
-{
-    ImageBitmap = Bitmap
-    {
-        File = "selectrange.png";
-    };
-    MaskColor = SC_HC_MASKCOLOR;
-};
diff --git a/chart2/source/controller/dialogs/ChangingResource.cxx b/chart2/source/controller/dialogs/ChangingResource.cxx
index 22886c9b6108..0e60e798e196 100644
--- a/chart2/source/controller/dialogs/ChangingResource.cxx
+++ b/chart2/source/controller/dialogs/ChangingResource.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -54,3 +55,5 @@ void ChangingResource::setChangeListener( ResourceChangeListener* pListener )
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/ChangingResource.hxx b/chart2/source/controller/dialogs/ChangingResource.hxx
index ed6be33b912e..e9e122bf293a 100644
--- a/chart2/source/controller/dialogs/ChangingResource.hxx
+++ b/chart2/source/controller/dialogs/ChangingResource.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -61,3 +62,5 @@ protected:
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index 4f52f7f23220..148175596967 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,7 +34,6 @@
 #include "HelpIds.hrc"
 #include "Strings.hrc"
 #include "Bitmaps.hrc"
-#include "Bitmaps_HC.hrc"
 #include "macros.hxx"
 #include "ChartModelHelper.hxx"
 #include "DiagramHelper.hxx"
@@ -44,9 +44,7 @@
 #include <com/sun/star/chart2/PieChartOffsetMode.hpp>
 #include <com/sun/star/chart2/XDataSeriesContainer.hpp>
 
-#ifndef _SVT_CONTROLDIMS_HRC_
 #include <svtools/controldims.hrc>
-#endif
 // header for class Image
 #include <vcl/image.hxx>
 // header for class Bitmap
@@ -62,16 +60,6 @@ namespace chart
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
 
-// macro for selecting a normal or high contrast bitmap the stack variable
-// bIsHighContrast must exist and reflect the correct state
-#define SELECT_BITMAP(name) Bitmap( SchResId( bIsHighContrast ? name ## _HC : name ))
-#define SELECT_IMAGE(name) Image( SchResId( bIsHighContrast ? name ## _HC : name ))
-
-/*
-        ( C2U( "com.sun.star.chart2.template.Surface" ),                        CHSTYLE_3D_SURFACE)
-        ( C2U( "com.sun.star.chart2.template.Addin" ),                          CHSTYLE_ADDIN)
-*/
-
 ChartTypeParameter::ChartTypeParameter()
                     : nSubTypeIndex( 1 )
                     , bXAxisWithValues( false )
@@ -147,7 +135,7 @@ ChartTypeDialogController::ChartTypeDialogController()
 ChartTypeDialogController::~ChartTypeDialogController()
 {
 }
-Image ChartTypeDialogController::getImage( bool /*bIsHighContrast*/ )
+Image ChartTypeDialogController::getImage()
 {
     return Image();
 }
@@ -230,7 +218,7 @@ void ChartTypeDialogController::adjustParameterToMainType( ChartTypeParameter& r
     const tTemplateServiceChartTypeParameterMap::const_iterator aEnd  = rMap.end();
     for( sal_Int32 nMatchPrecision=0; nMatchPrecision<7 && !bFoundSomeMatch; nMatchPrecision++ )
     {
-        for( aIter = rMap.begin(); aIter != aEnd; aIter++ )
+        for( aIter = rMap.begin(); aIter != aEnd; ++aIter )
         {
             if( rParameter.mapsToSimilarService( (*aIter).second, nMatchPrecision ) )
             {
@@ -275,16 +263,16 @@ rtl::OUString ChartTypeDialogController::getServiceNameForParameter( const Chart
     const tTemplateServiceChartTypeParameterMap& rMap = getTemplateMap();
     tTemplateServiceChartTypeParameterMap::const_iterator       aIter = rMap.begin();
     const tTemplateServiceChartTypeParameterMap::const_iterator aEnd  = rMap.end();
-    for( ; aIter != aEnd; aIter++ )
+    for( ; aIter != aEnd; ++aIter )
     {
         if( aParameter.mapsToSameService( (*aIter).second ) )
             return (*aIter).first;
     }
 
-    OSL_ENSURE( false, "ChartType not implemented yet - use fallback to similar type" );
+    OSL_FAIL( "ChartType not implemented yet - use fallback to similar type" );
     for( sal_Int32 nMatchPrecision=1; nMatchPrecision<8; nMatchPrecision++ )
     {
-        for( aIter = rMap.begin(); aIter != aEnd; aIter++ )
+        for( aIter = rMap.begin(); aIter != aEnd; ++aIter )
         {
             if( aParameter.mapsToSimilarService( (*aIter).second, nMatchPrecision ) )
                 return (*aIter).first;
@@ -350,7 +338,7 @@ bool ChartTypeDialogController::commitToModel( const ChartTypeParameter& rParame
     {
         uno::Reference< frame::XModel > xModel( xChartModel, uno::UNO_QUERY);
 
-        // /-- locked controllers
+        // locked controllers
         ControllerLockGuard aCtrlLockGuard( xModel );
         uno::Reference< XDiagram > xDiagram = ChartModelHelper::findDiagram( xModel );
         DiagramHelper::tTemplateWithServiceName aTemplateWithService(
@@ -369,11 +357,10 @@ bool ChartTypeDialogController::commitToModel( const ChartTypeParameter& rParame
             if( xDiaProp.is() )
                 xDiaProp->setPropertyValue( C2U( "SortByXValues" ), uno::makeAny( rParameter.bSortByXValues ) );
         }
-        // \-- locked controllers
     }
     return false;
 }
-void ChartTypeDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool /*bIsHighContrast*/, const ChartTypeParameter& /*rParameter*/ )
+void ChartTypeDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& /*rParameter*/ )
 {
     rSubTypeList.Clear();
 }
@@ -455,9 +442,9 @@ String ColumnChartDialogController::getName()
 {
     return String( SchResId( STR_TYPE_COLUMN ));
 }
-Image ColumnChartDialogController::getImage( bool bIsHighContrast )
+Image ColumnChartDialogController::getImage()
 {
-    return SELECT_IMAGE( IMG_TYPE_COLUMN );
+    return Image( SchResId( IMG_TYPE_COLUMN ));
 }
 const tTemplateServiceChartTypeParameterMap& ColumnChartDialogController::getTemplateMap() const
 {
@@ -473,7 +460,7 @@ const tTemplateServiceChartTypeParameterMap& ColumnChartDialogController::getTem
         ;
     return m_aTemplateMap;
 }
-void ColumnChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter )
+void ColumnChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter )
 {
     rSubTypeList.Clear();
 
@@ -482,36 +469,36 @@ void ColumnChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool
         switch(rParameter.nGeometry3D)
         {
             case DataPointGeometry3D::CYLINDER:
-                rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_SAEULE_3D_1 ) );
-                rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_SAEULE_3D_2 ) );
-                rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_SAEULE_3D_3 ) );
-                rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_SAEULE_3D_4 ) );
+                rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_SAEULE_3D_1 )));
+                rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_SAEULE_3D_2 )));
+                rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_SAEULE_3D_3 )));
+                rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_SAEULE_3D_4 )));
             break;
             case DataPointGeometry3D::CONE:
-                rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_KEGEL_3D_1 ) );
-                rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_KEGEL_3D_2 ) );
-                rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_KEGEL_3D_3 ) );
-                rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_KEGEL_3D_4 ) );
+                rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_KEGEL_3D_1 )));
+                rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_KEGEL_3D_2 )));
+                rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_KEGEL_3D_3 )));
+                rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_KEGEL_3D_4 )));
             break;
             case DataPointGeometry3D::PYRAMID:
-                rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_PYRAMID_3D_1 ) );
-                rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_PYRAMID_3D_2 ) );
-                rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_PYRAMID_3D_3 ) );
-                rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_PYRAMID_3D_4 ) );
+                rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_PYRAMID_3D_1 )));
+                rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_PYRAMID_3D_2 )));
+                rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_PYRAMID_3D_3 )));
+                rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_PYRAMID_3D_4 )));
             break;
             default: //DataPointGeometry3D::CUBOID:
-                rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_COLUMNS_3D_1 ) );
-                rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_COLUMNS_3D_2 ) );
-                rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_COLUMNS_3D_3 ) );
-                rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_COLUMNS_3D ) );
+                rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_COLUMNS_3D_1 )));
+                rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_COLUMNS_3D_2 )));
+                rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_COLUMNS_3D_3 )));
+                rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_COLUMNS_3D )));
             break;
         }
     }
     else
     {
-        rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_COLUMNS_2D_1 ) );
-        rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_COLUMNS_2D_2 ) );
-        rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_COLUMNS_2D_3 ) );
+        rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_COLUMNS_2D_1 )));
+        rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_COLUMNS_2D_2 )));
+        rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_COLUMNS_2D_3 )));
     }
 
     rSubTypeList.SetItemText( 1, String( SchResId( STR_NORMAL )) );
@@ -532,9 +519,9 @@ String BarChartDialogController::getName()
 {
     return String( SchResId( STR_TYPE_BAR ));
 }
-Image BarChartDialogController::getImage( bool bIsHighContrast )
+Image BarChartDialogController::getImage()
 {
-    return SELECT_IMAGE( IMG_TYPE_BAR );
+    return Image( SchResId( IMG_TYPE_BAR ));
 }
 const tTemplateServiceChartTypeParameterMap& BarChartDialogController::getTemplateMap() const
 {
@@ -550,7 +537,7 @@ const tTemplateServiceChartTypeParameterMap& BarChartDialogController::getTempla
         ;
     return m_aTemplateMap;
 }
-void BarChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter )
+void BarChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter )
 {
     rSubTypeList.Clear();
 
@@ -559,36 +546,36 @@ void BarChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIs
         switch(rParameter.nGeometry3D)
         {
             case DataPointGeometry3D::CYLINDER:
-                rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_ROEHRE_3D_1 ) );
-                rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_ROEHRE_3D_2 ) );
-                rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_ROEHRE_3D_3 ) );
-                rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_ROEHRE_3D_4 ) );
+                rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_ROEHRE_3D_1 )));
+                rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_ROEHRE_3D_2 )));
+                rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_ROEHRE_3D_3 )));
+                rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_ROEHRE_3D_4 )));
             break;
             case DataPointGeometry3D::CONE:
-                rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_KEGELQ_3D_1 ) );
-                rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_KEGELQ_3D_2 ) );
-                rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_KEGELQ_3D_3 ) );
-                rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_KEGELQ_3D_4 ) );
+                rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_KEGELQ_3D_1 )));
+                rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_KEGELQ_3D_2 )));
+                rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_KEGELQ_3D_3 )));
+                rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_KEGELQ_3D_4 )));
             break;
             case DataPointGeometry3D::PYRAMID:
-                rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_PYRAMIDQ_3D_1 ) );
-                rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_PYRAMIDQ_3D_2 ) );
-                rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_PYRAMIDQ_3D_3 ) );
-                rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_PYRAMIDQ_3D_4 ) );
+                rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_PYRAMIDQ_3D_1 )));
+                rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_PYRAMIDQ_3D_2 )));
+                rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_PYRAMIDQ_3D_3 )));
+                rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_PYRAMIDQ_3D_4 )));
             break;
             default: //DataPointGeometry3D::CUBOID:
-                rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_BARS_3D_1 ) );
-                rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_BARS_3D_2 ) );
-                rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_BARS_3D_3 ) );
-                rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_BARS_3D ) );
+                rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_BARS_3D_1 )));
+                rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_BARS_3D_2 )));
+                rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_BARS_3D_3 )));
+                rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_BARS_3D )));
             break;
         }
     }
     else
     {
-        rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_BARS_2D_1 ) );
-        rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_BARS_2D_2 ) );
-        rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_BARS_2D_3 ) );
+        rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_BARS_2D_1 )));
+        rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_BARS_2D_2 )));
+        rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_BARS_2D_3 )));
     }
     rSubTypeList.SetItemText( 1, String( SchResId( STR_NORMAL )) );
     rSubTypeList.SetItemText( 2, String( SchResId( STR_STACKED )) );
@@ -608,9 +595,9 @@ String PieChartDialogController::getName()
 {
     return String( SchResId( STR_TYPE_PIE ));
 }
-Image PieChartDialogController::getImage( bool bIsHighContrast )
+Image PieChartDialogController::getImage()
 {
-    return SELECT_IMAGE( IMG_TYPE_PIE );
+    return Image( SchResId( IMG_TYPE_PIE ));
 }
 const tTemplateServiceChartTypeParameterMap& PieChartDialogController::getTemplateMap() const
 {
@@ -627,29 +614,30 @@ const tTemplateServiceChartTypeParameterMap& PieChartDialogController::getTempla
     ;
     return m_aTemplateMap;
 }
-void PieChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter )
+void PieChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter )
 {
     rSubTypeList.Clear();
 
     if( rParameter.b3DLook )
     {
-        rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_CIRCLES_3D ) );
-        rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_CIRCLES_3D_EXPLODED ) );
-        rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_DONUT_3D ) );
-        rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_DONUT_3D_EXPLODED ) );
+        rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_CIRCLES_3D )));
+        rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_CIRCLES_3D_EXPLODED )));
+        rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_DONUT_3D )));
+        rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_DONUT_3D_EXPLODED )));
     }
     else
     {
-        rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_CIRCLES_2D ) );
-        rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_CIRCLES_2D_EXPLODED ) );
-        rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_DONUT_2D ) );
-        rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_DONUT_2D_EXPLODED ) );
+        rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_CIRCLES_2D )));
+        rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_CIRCLES_2D_EXPLODED )));
+        rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_DONUT_2D )));
+        rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_DONUT_2D_EXPLODED )));
     }
-    rSubTypeList.SetItemText( 1, String( SchResId( STR_NORMAL )) );
-    rSubTypeList.SetItemText( 2, String( SchResId( STR_PIE_EXPLODED )) );
-    rSubTypeList.SetItemText( 3, String( SchResId( STR_DONUT )) );
-    rSubTypeList.SetItemText( 4, String( SchResId( STR_DONUT_EXPLODED )) );
+    rSubTypeList.SetItemText( 1, String( SchResId( STR_NORMAL         ) ) );
+    rSubTypeList.SetItemText( 2, String( SchResId( STR_PIE_EXPLODED   ) ) );
+    rSubTypeList.SetItemText( 3, String( SchResId( STR_DONUT          ) ) );
+    rSubTypeList.SetItemText( 4, String( SchResId( STR_DONUT_EXPLODED ) ) );
 }
+
 bool PieChartDialogController::shouldShow_3DLookControl() const
 {
     return true;
@@ -670,9 +658,9 @@ String LineChartDialogController::getName()
 {
     return String( SchResId( STR_TYPE_LINE ));
 }
-Image LineChartDialogController::getImage( bool bIsHighContrast )
+Image LineChartDialogController::getImage()
 {
-    return SELECT_IMAGE( IMG_TYPE_LINE );
+    return Image( SchResId( IMG_TYPE_LINE ));
 }
 const tTemplateServiceChartTypeParameterMap& LineChartDialogController::getTemplateMap() const
 {
@@ -689,7 +677,6 @@ const tTemplateServiceChartTypeParameterMap& LineChartDialogController::getTempl
     ( C2U( "com.sun.star.chart2.template.StackedLine" ),                ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y,false,true) )
     ( C2U( "com.sun.star.chart2.template.PercentStackedLine" ),         ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y_PERCENT,false,true) )
     //-------------------------------------------------------
-    //( C2U( "com.sun.star.chart2.template.ThreeDLine" ),                 ChartTypeParameter(4,false,true,GlobalStackMode_NONE,false,true) )
     ( C2U( "com.sun.star.chart2.template.StackedThreeDLine" ),          ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Y,false,true) )
     ( C2U( "com.sun.star.chart2.template.PercentStackedThreeDLine" ),   ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Y_PERCENT,false,true) )
     ( C2U( "com.sun.star.chart2.template.ThreeDLineDeep" ),             ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Z,false,true) )
@@ -697,7 +684,7 @@ const tTemplateServiceChartTypeParameterMap& LineChartDialogController::getTempl
     ;
     return m_aTemplateMap;
 }
-void LineChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter )
+void LineChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter )
 {
     rSubTypeList.Clear();
 
@@ -706,34 +693,34 @@ void LineChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bI
         //direct lines
         if( GlobalStackMode_NONE == rParameter.eStackMode || GlobalStackMode_STACK_Z == rParameter.eStackMode )
         {
-            rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_POINTS_XCATEGORY ) );
-            rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_LINE_P_XCATEGORY ) );
-            rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_LINE_O_XCATEGORY ) );
-            rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_LINE3D_XCATEGORY ) );
+            rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_POINTS_XCATEGORY )));
+            rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_LINE_P_XCATEGORY )));
+            rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_LINE_O_XCATEGORY )));
+            rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_LINE3D_XCATEGORY )));
         }
         else
         {
-            rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_POINTS_STACKED ) );
-            rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_LINE_P_STACKED ) );
-            rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_LINE_O_STACKED ) );
-            rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_LINE3D_STACKED ) );
+            rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_POINTS_STACKED )));
+            rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_LINE_P_STACKED )));
+            rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_LINE_O_STACKED )));
+            rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_LINE3D_STACKED )));
         }
     }
     else //CurveStyle_LINES
     {
         if( GlobalStackMode_NONE == rParameter.eStackMode || GlobalStackMode_STACK_Z == rParameter.eStackMode )
         {
-            rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_POINTS_XCATEGORY ) );
-            rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_LINE_P_XCATEGORY_SMOOTH ) );
-            rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_LINE_O_XCATEGORY_SMOOTH ) );
-            rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_LINE3D_XCATEGORY_SMOOTH ) );
+            rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_POINTS_XCATEGORY )));
+            rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_LINE_P_XCATEGORY_SMOOTH )));
+            rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_LINE_O_XCATEGORY_SMOOTH )));
+            rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_LINE3D_XCATEGORY_SMOOTH )));
         }
         else
         {
-            rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_POINTS_STACKED ) );
-            rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_LINE_P_STACKED_SMOOTH ) );
-            rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_LINE_O_STACKED_SMOOTH ) );
-            rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_LINE3D_STACKED_SMOOTH ) );
+            rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_POINTS_STACKED )));
+            rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_LINE_P_STACKED_SMOOTH )));
+            rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_LINE_O_STACKED_SMOOTH )));
+            rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_LINE3D_STACKED_SMOOTH )));
         }
     }
 
@@ -803,9 +790,9 @@ String XYChartDialogController::getName()
 {
     return String( SchResId( STR_TYPE_XY ));
 }
-Image XYChartDialogController::getImage( bool bIsHighContrast )
+Image XYChartDialogController::getImage()
 {
-    return SELECT_IMAGE( IMG_TYPE_XY );
+    return Image( SchResId( IMG_TYPE_XY ));
 }
 const tTemplateServiceChartTypeParameterMap& XYChartDialogController::getTemplateMap() const
 {
@@ -819,24 +806,24 @@ const tTemplateServiceChartTypeParameterMap& XYChartDialogController::getTemplat
     ;
     return m_aTemplateMap;
 }
-void XYChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter )
+void XYChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter )
 {
     rSubTypeList.Clear();
 
     if( CurveStyle_LINES==rParameter.eCurveStyle )
     {
-        rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_POINTS_XVALUES ) );
-        rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_LINE_P_XVALUES ) );
-        rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_LINE_O_XVALUES ) );
-        rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_LINE3D_XVALUES ) );
+        rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_POINTS_XVALUES )));
+        rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_LINE_P_XVALUES )));
+        rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_LINE_O_XVALUES )));
+        rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_LINE3D_XVALUES )));
     }
     else //CurveStyle_LINES
     {
         //smooth lines
-        rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_POINTS_XVALUES ) );
-        rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_LINE_P_XVALUES_SMOOTH ) );
-        rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_LINE_O_XVALUES_SMOOTH ) );
-        rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_LINE3D_XVALUES_SMOOTH ) );
+        rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_POINTS_XVALUES )));
+        rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_LINE_P_XVALUES_SMOOTH )));
+        rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_LINE_O_XVALUES_SMOOTH )));
+        rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_LINE3D_XVALUES_SMOOTH )));
     }
 
     rSubTypeList.SetItemText( 1, String( SchResId( STR_POINTS_ONLY )) );
@@ -890,9 +877,9 @@ String AreaChartDialogController::getName()
 {
     return String( SchResId( STR_TYPE_AREA ));
 }
-Image AreaChartDialogController::getImage( bool bIsHighContrast )
+Image AreaChartDialogController::getImage()
 {
-    return SELECT_IMAGE( IMG_TYPE_AREA );
+    return Image( SchResId( IMG_TYPE_AREA ));
 }
 bool AreaChartDialogController::shouldShow_3DLookControl() const
 {
@@ -911,21 +898,21 @@ const tTemplateServiceChartTypeParameterMap& AreaChartDialogController::getTempl
     ;
     return m_aTemplateMap;
 }
-void AreaChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter )
+void AreaChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter )
 {
     rSubTypeList.Clear();
 
     if( rParameter.b3DLook )
     {
-        rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_AREAS_3D ) );
-        rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_AREAS_3D_1 ) );
-        rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_AREAS_3D_2 ) );
+        rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_AREAS_3D )));
+        rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_AREAS_3D_1 )));
+        rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_AREAS_3D_2 )));
     }
     else
     {
-        rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_AREAS_2D_1 ) );
-        rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_AREAS_2D ) );
-        rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_AREAS_2D_3 ) );
+        rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_AREAS_2D_1 )));
+        rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_AREAS_2D )));
+        rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_AREAS_2D_3 )));
     }
 
     rSubTypeList.SetItemText( 1, String( SchResId( rParameter.b3DLook ? STR_DEEP : STR_NORMAL )) );
@@ -973,9 +960,9 @@ String NetChartDialogController::getName()
 {
     return String( SchResId( STR_TYPE_NET ));
 }
-Image NetChartDialogController::getImage( bool bIsHighContrast )
+Image NetChartDialogController::getImage()
 {
-    return SELECT_IMAGE( IMG_TYPE_NET );
+    return Image( SchResId( IMG_TYPE_NET ));
 }
 bool NetChartDialogController::shouldShow_StackingControl() const
 {
@@ -1004,23 +991,23 @@ const tTemplateServiceChartTypeParameterMap& NetChartDialogController::getTempla
     ;
     return m_aTemplateMap;
 }
-void NetChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter )
+void NetChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter )
 {
     rSubTypeList.Clear();
 
     if( GlobalStackMode_NONE == rParameter.eStackMode )
     {
-        rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_NET_SYMB ) );
-        rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_NET_LINESYMB ) );
-        rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_NET ) );
-        rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_NET_FILL ) );
+        rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_NET_SYMB )));
+        rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_NET_LINESYMB )));
+        rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_NET )));
+        rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_NET_FILL )));
     }
     else
     {
-        rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_NET_SYMB_STACK ) );
-        rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_NET_LINESYMB_STACK ) );
-        rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_NET_STACK ) );
-        rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_NET_FILL_STACK ) );
+        rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_NET_SYMB_STACK )));
+        rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_NET_LINESYMB_STACK )));
+        rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_NET_STACK )));
+        rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_NET_FILL_STACK )));
     }
 
     rSubTypeList.SetItemText( 1, String( SchResId( STR_POINTS_ONLY )) );
@@ -1059,17 +1046,20 @@ StockChartDialogController::StockChartDialogController()
 {
     bSupports3D = false;
 }
+
 StockChartDialogController::~StockChartDialogController()
 {
 }
+
 String StockChartDialogController::getName()
 {
     return String( SchResId( STR_TYPE_STOCK ));
 }
-Image StockChartDialogController::getImage( bool bIsHighContrast )
+Image StockChartDialogController::getImage()
 {
-    return SELECT_IMAGE( IMG_TYPE_STOCK );
+    return Image( SchResId( IMG_TYPE_STOCK ));
 }
+
 const tTemplateServiceChartTypeParameterMap& StockChartDialogController::getTemplateMap() const
 {
     static tTemplateServiceChartTypeParameterMap m_aTemplateMap =
@@ -1081,13 +1071,13 @@ const tTemplateServiceChartTypeParameterMap& StockChartDialogController::getTemp
     ;
     return m_aTemplateMap;
 }
-void StockChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& /*rParameter*/ )
+void StockChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& /*rParameter*/ )
 {
     rSubTypeList.Clear();
-    rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_STOCK_1 ) );
-    rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_STOCK_2 ) );
-    rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_STOCK_3 ) );
-    rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_STOCK_4 ) );
+    rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_STOCK_1 )));
+    rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_STOCK_2 )));
+    rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_STOCK_3 )));
+    rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_STOCK_4 )));
 
     rSubTypeList.SetItemText( 1, String( SchResId( STR_STOCK_1 )) );
     rSubTypeList.SetItemText( 2, String( SchResId( STR_STOCK_2 )) );
@@ -1106,6 +1096,7 @@ CombiColumnLineChartDialogController::CombiColumnLineChartDialogController()
 {
     bSupports3D = false;
 }
+
 CombiColumnLineChartDialogController::~CombiColumnLineChartDialogController()
 {
     if(m_pFT_NumberOfLines)
@@ -1113,14 +1104,17 @@ CombiColumnLineChartDialogController::~CombiColumnLineChartDialogController()
     if(m_pMF_NumberOfLines)
         delete m_pMF_NumberOfLines;
 }
+
 String CombiColumnLineChartDialogController::getName()
 {
     return String( SchResId( STR_TYPE_COMBI_COLUMN_LINE ));
 }
-Image CombiColumnLineChartDialogController::getImage( bool bIsHighContrast )
+
+Image CombiColumnLineChartDialogController::getImage( )
 {
-    return SELECT_IMAGE( IMG_TYPE_COLUMN_LINE );
+    return Image( SchResId( IMG_TYPE_COLUMN_LINE ) );
 }
+
 const tTemplateServiceChartTypeParameterMap& CombiColumnLineChartDialogController::getTemplateMap() const
 {
     static tTemplateServiceChartTypeParameterMap m_aTemplateMap =
@@ -1130,11 +1124,11 @@ const tTemplateServiceChartTypeParameterMap& CombiColumnLineChartDialogControlle
     ;
     return m_aTemplateMap;
 }
-void CombiColumnLineChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& /*rParameter*/ )
+void CombiColumnLineChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& /*rParameter*/ )
 {
     rSubTypeList.Clear();
-    rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_COLUMN_LINE ) );
-    rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_COLUMN_LINE_STACKED ) );
+    rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_COLUMN_LINE )));
+    rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_COLUMN_LINE_STACKED )));
 
     rSubTypeList.SetItemText( 1, String( SchResId( STR_LINE_COLUMN )) );
     rSubTypeList.SetItemText( 2, String( SchResId( STR_LINE_STACKEDCOLUMN )) );
@@ -1259,9 +1253,9 @@ String BubbleChartDialogController::getName()
 {
     return String( SchResId( STR_TYPE_BUBBLE ));
 }
-Image BubbleChartDialogController::getImage( bool bIsHighContrast )
+Image BubbleChartDialogController::getImage()
 {
-    return SELECT_IMAGE( IMG_TYPE_BUBBLE );
+    return Image( SchResId( IMG_TYPE_BUBBLE ));
 }
 const tTemplateServiceChartTypeParameterMap& BubbleChartDialogController::getTemplateMap() const
 {
@@ -1270,10 +1264,10 @@ const tTemplateServiceChartTypeParameterMap& BubbleChartDialogController::getTem
         ( C2U( "com.sun.star.chart2.template.Bubble" ),          ChartTypeParameter(1,true) ) ;
     return m_aTemplateMap;
 }
-void BubbleChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& /*rParameter*/ )
+void BubbleChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& /*rParameter*/ )
 {
     rSubTypeList.Clear();
-    rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_BUBBLE_1 ) );
+    rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_BUBBLE_1 )));
 
     rSubTypeList.SetItemText( 1, String( SchResId( STR_BUBBLE_1 )) );
 }
@@ -1285,3 +1279,5 @@ void BubbleChartDialogController::adjustParameterToSubType( ChartTypeParameter&
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
index 56ffb93e4a60..787189149fb7 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -37,9 +38,7 @@
 #include <com/sun/star/chart2/XChartTypeTemplate.hpp>
 #include <svtools/valueset.hxx>
 // header for class CheckBox
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 // header for class FixedText
 #include <vcl/fixed.hxx>
 // header for class MetricField
@@ -104,9 +103,9 @@ public:
     virtual ~ChartTypeDialogController();
 
     virtual String  getName()=0;
-    virtual Image   getImage( bool bIsHighContrast );
+    virtual Image   getImage();
     virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const = 0;
-    virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter );
+    virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
 
     virtual bool    shouldShow_XAxisTypeControl() const;
     virtual bool    shouldShow_3DLookControl() const;
@@ -160,9 +159,9 @@ public:
     virtual ~ColumnChartDialogController();
 
     virtual String  getName();
-    virtual Image   getImage( bool bIsHighContrast );
+    virtual Image   getImage();
     virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
-    virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter );
+    virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
 };
 
 class BarChartDialogController : public ColumnOrBarChartDialogController_Base
@@ -172,9 +171,9 @@ public:
     virtual ~BarChartDialogController();
 
     virtual String  getName();
-    virtual Image   getImage( bool bIsHighContrast );
+    virtual Image   getImage();
     virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
-    virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter );
+    virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
 };
 
 class PieChartDialogController : public ChartTypeDialogController
@@ -184,9 +183,9 @@ public:
     virtual ~PieChartDialogController();
 
     virtual String  getName();
-    virtual Image   getImage( bool bIsHighContrast );
+    virtual Image   getImage();
     virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
-    virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter );
+    virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
     virtual void adjustParameterToSubType( ChartTypeParameter& rParameter );
 
     virtual bool    shouldShow_3DLookControl() const;
@@ -199,9 +198,9 @@ public:
     virtual ~LineChartDialogController();
 
     virtual String  getName();
-    virtual Image   getImage( bool bIsHighContrast );
+    virtual Image   getImage();
     virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
-    virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter );
+    virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
     virtual void adjustParameterToSubType( ChartTypeParameter& rParameter );
     virtual void adjustParameterToMainType( ChartTypeParameter& rParameter );
 
@@ -217,9 +216,9 @@ public:
     virtual ~XYChartDialogController();
 
     virtual String  getName();
-    virtual Image   getImage( bool bIsHighContrast );
+    virtual Image   getImage();
     virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
-    virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter );
+    virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
     virtual void adjustParameterToSubType( ChartTypeParameter& rParameter );
 
     virtual bool    shouldShow_SplineControl() const;
@@ -233,9 +232,9 @@ public:
     virtual ~AreaChartDialogController();
 
     virtual String  getName();
-    virtual Image   getImage( bool bIsHighContrast );
+    virtual Image   getImage();
     virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
-    virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter );
+    virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
     virtual void adjustParameterToSubType( ChartTypeParameter& rParameter );
     virtual void adjustParameterToMainType( ChartTypeParameter& rParameter );
 
@@ -249,9 +248,9 @@ public:
     virtual ~NetChartDialogController();
 
     virtual String  getName();
-    virtual Image   getImage( bool bIsHighContrast );
+    virtual Image   getImage();
     virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
-    virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter );
+    virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
     virtual void adjustParameterToSubType( ChartTypeParameter& rParameter );
 
     virtual bool    shouldShow_StackingControl() const;
@@ -264,9 +263,9 @@ public:
     virtual ~StockChartDialogController();
 
     virtual String  getName();
-    virtual Image   getImage( bool bIsHighContrast );
+    virtual Image   getImage();
     virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
-    virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter );
+    virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
     virtual void adjustParameterToSubType( ChartTypeParameter& rParameter );
 };
 
@@ -277,9 +276,9 @@ public:
     virtual ~CombiColumnLineChartDialogController();
 
     virtual String  getName();
-    virtual Image   getImage( bool bIsHighContrast );
+    virtual Image   getImage();
     virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
-    virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter );
+    virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
     virtual void adjustParameterToSubType( ChartTypeParameter& rParameter );
 
     virtual void    showExtraControls( Window* pParent, const Point& rPosition, const Size& rSize );
@@ -305,9 +304,9 @@ public:
     virtual ~BubbleChartDialogController();
 
     virtual String  getName();
-    virtual Image   getImage( bool bIsHighContrast );
+    virtual Image   getImage();
     virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
-    virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter );
+    virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
     virtual void adjustParameterToSubType( ChartTypeParameter& rParameter );
 };
 
@@ -315,3 +314,5 @@ public:
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/ChartTypeTemplateProvider.hxx b/chart2/source/controller/dialogs/ChartTypeTemplateProvider.hxx
index b2790a1678bb..90509c3ee3f9 100644
--- a/chart2/source/controller/dialogs/ChartTypeTemplateProvider.hxx
+++ b/chart2/source/controller/dialogs/ChartTypeTemplateProvider.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -51,3 +52,5 @@ public:
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index e92e32a57958..9fd1256ab747 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -51,7 +52,6 @@
 #include "servicenames_charttypes.hxx"
 #include "ResId.hxx"
 #include "Bitmaps.hrc"
-#include "Bitmaps_HC.hrc"
 #include "HelpIds.hrc"
 
 #include <vcl/fixed.hxx>
@@ -69,8 +69,6 @@
 #include <algorithm>
 #include <functional>
 
-#define SELECT_IMAGE(name,hc) Image( SchResId( hc ? name ## _HC : name ))
-
 /*  BROWSER_COLUMNSELECTION :  single cells may be selected rather than only
                                entire rows
     BROWSER_(H|V)LINES :       show horizontal or vertical grid-lines
@@ -91,7 +89,6 @@
 // with shift up/down, and entering non-editable cells would be problematic,
 // e.g.  the first cell, or when being in read-only mode
 
-
 using namespace ::com::sun::star;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Reference;
@@ -143,6 +140,7 @@ SeriesHeaderEdit::SeriesHeaderEdit( Window * pParent ) :
         m_nStartColumn( 0 ),
         m_bShowWarningBox( false )
 {}
+
 SeriesHeaderEdit::~SeriesHeaderEdit()
 {}
 
@@ -179,8 +177,7 @@ public:
     void SetPos( const Point & rPos );
     void SetWidth( sal_Int32 nWidth );
     void SetChartType( const Reference< chart2::XChartType > & xChartType,
-                       bool bSwapXAndYAxis,
-                       bool bIsHighContrast );
+                       bool bSwapXAndYAxis );
     void SetSeriesName( const String & rName );
     void SetRange( sal_Int32 nStartCol, sal_Int32 nEndCol );
 
@@ -216,11 +213,10 @@ private:
     DECL_LINK( SeriesNameChanged, void * );
     DECL_LINK( SeriesNameEdited, void * );
 
-    /// @param bHC </sal_True> for hight-contrast image
     static Image GetChartTypeImage(
         const Reference< chart2::XChartType > & xChartType,
-        bool bSwapXAndYAxis,
-        bool bHC );
+        bool bSwapXAndYAxis
+        );
 
     sal_Int32 m_nStartCol, m_nEndCol;
     sal_Int32 m_nWidth;
@@ -311,7 +307,6 @@ void SeriesHeader::SetWidth( sal_Int32 nWidth )
     SetPos( m_aPos );
 }
 
-
 void SeriesHeader::SetPixelPosX( sal_Int32 nPos )
 {
     Point aPos( m_pDevice->LogicToPixel( m_aPos, MAP_APPFONT ));
@@ -326,10 +321,10 @@ void SeriesHeader::SetPixelWidth( sal_Int32 nWidth )
 
 void SeriesHeader::SetChartType(
     const Reference< chart2::XChartType > & xChartType,
-    bool bSwapXAndYAxis,
-    bool bIsHighContrast )
+    bool bSwapXAndYAxis
+)
 {
-    m_spSymbol->SetImage( GetChartTypeImage( xChartType, bSwapXAndYAxis, bIsHighContrast ));
+    m_spSymbol->SetImage( GetChartTypeImage( xChartType, bSwapXAndYAxis ) );
 }
 
 void SeriesHeader::SetSeriesName( const String & rName )
@@ -390,8 +385,8 @@ bool SeriesHeader::HasFocus() const
 
 Image SeriesHeader::GetChartTypeImage(
     const Reference< chart2::XChartType > & xChartType,
-    bool bSwapXAndYAxis,
-    bool bHC )
+    bool bSwapXAndYAxis
+)
 {
     Image aResult;
     if( !xChartType.is())
@@ -400,40 +395,40 @@ Image SeriesHeader::GetChartTypeImage(
 
     if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_AREA ))
     {
-        aResult = SELECT_IMAGE( IMG_TYPE_AREA, bHC );
+        aResult = Image( SchResId( IMG_TYPE_AREA ) );
     }
     else if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_COLUMN ))
     {
         if( bSwapXAndYAxis )
-            aResult = SELECT_IMAGE( IMG_TYPE_BAR, bHC );
+            aResult = Image( SchResId( IMG_TYPE_BAR ) );
         else
-            aResult = SELECT_IMAGE( IMG_TYPE_COLUMN, bHC );
+            aResult = Image( SchResId( IMG_TYPE_COLUMN ) );
     }
     else if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_LINE ))
     {
-        aResult = SELECT_IMAGE( IMG_TYPE_LINE, bHC );
+        aResult = Image( SchResId( IMG_TYPE_LINE ) );
     }
     else if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_SCATTER ))
     {
-        aResult = SELECT_IMAGE( IMG_TYPE_XY, bHC );
+        aResult = Image( SchResId( IMG_TYPE_XY ) );
     }
     else if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_PIE ))
     {
-        aResult = SELECT_IMAGE( IMG_TYPE_PIE, bHC );
+        aResult = Image( SchResId( IMG_TYPE_PIE ) );
     }
     else if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_NET )
           || aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET ) )
     {
-        aResult = SELECT_IMAGE( IMG_TYPE_NET, bHC );
+        aResult = Image( SchResId( IMG_TYPE_NET ) );
     }
     else if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK ))
     {
         // @todo: correct image for candle-stick type
-        aResult = SELECT_IMAGE( IMG_TYPE_STOCK, bHC );
+        aResult = Image( SchResId( IMG_TYPE_STOCK ) );
     }
     else if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE ))
     {
-        aResult = SELECT_IMAGE( IMG_TYPE_BUBBLE, bHC );
+        aResult = Image( SchResId( IMG_TYPE_BUBBLE ) );
     }
 
     return aResult;
@@ -626,7 +621,6 @@ void DataBrowser::RenewTable()
     const DataBrowserModel::tDataHeaderVector& aHeaders( m_apDataBrowserModel->getDataHeaders());
     Link aFocusLink( LINK( this, DataBrowser, SeriesHeaderGotFocus ));
     Link aSeriesHeaderChangedLink( LINK( this, DataBrowser, SeriesHeaderChanged ));
-    bool bIsHighContrast = pWin ? (pWin->GetSettings().GetStyleSettings().GetHighContrastMode()) : false;
 
     for( DataBrowserModel::tDataHeaderVector::const_iterator aIt( aHeaders.begin());
          aIt != aHeaders.end(); ++aIt )
@@ -638,7 +632,7 @@ void DataBrowser::RenewTable()
         if( xSeriesProp.is() &&
             ( xSeriesProp->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("Color"))) >>= nColor ))
             spHeader->SetColor( Color( nColor ));
-        spHeader->SetChartType( aIt->m_xChartType, aIt->m_bSwapXAndYAxis, bIsHighContrast );
+        spHeader->SetChartType( aIt->m_xChartType, aIt->m_bSwapXAndYAxis );
         spHeader->SetSeriesName(
             String( DataSeriesHelper::getDataSeriesLabel(
                         aIt->m_xDataSeries,
@@ -1039,19 +1033,6 @@ void DataBrowser::PaintCell(
     if( ! bEnabled )
         rDev.SetTextColor( GetSettings().GetStyleSettings().GetDisableColor() );
 
-    // TEST
-//     if( nColumnId == 1 )
-//         // categories
-//         rDev.SetFillColor( Color( 0xff, 0xff, 0xff ));
-//     else if( nColumnId == 2 )
-//         // x-values
-//         rDev.SetFillColor( Color( 0xf0, 0xf0, 0xff ));
-//     else
-//         // y-values
-//         rDev.SetFillColor( Color( 0xff, 0xff, 0xf0 ));
-
-//     rDev.DrawRect( rRect );
-
     // draw the text
     rDev.DrawText( aPos, aText );
 
@@ -1136,7 +1117,7 @@ void DataBrowser::InitController(
     }
     else
     {
-        DBG_ERROR( "Invalid Controller" );
+        OSL_FAIL( "Invalid Controller" );
     }
 }
 
@@ -1181,7 +1162,7 @@ sal_Bool DataBrowser::SaveModified()
     const sal_Int32 nRow = lcl_getRowInData( GetCurRow());
     const sal_Int32 nCol = lcl_getColumnInData( GetCurColumnId());
 
-    DBG_ASSERT( nRow >= 0 || nCol >= 0, "This cell should not be modified!" );
+    OSL_ENSURE( nRow >= 0 || nCol >= 0, "This cell should not be modified!" );
 
     SvNumberFormatter* pSvNumberFormatter = m_spNumberFormatterWrapper.get() ? m_spNumberFormatterWrapper->getSvNumberFormatter() : 0;
     switch( m_apDataBrowserModel->getCellType( nCol, nRow ))
@@ -1266,8 +1247,6 @@ void DataBrowser::ColumnResized( sal_uInt16 nColId )
     SetUpdateMode( bLastUpdateMode );
 }
 
-//  virtual void    MouseMove( const MouseEvent& rEvt );
-
 void DataBrowser::EndScroll()
 {
     sal_Bool bLastUpdateMode = GetUpdateMode();
@@ -1289,7 +1268,6 @@ void DataBrowser::RenewSeriesHeaders()
     DataBrowserModel::tDataHeaderVector aHeaders( m_apDataBrowserModel->getDataHeaders());
     Link aFocusLink( LINK( this, DataBrowser, SeriesHeaderGotFocus ));
     Link aSeriesHeaderChangedLink( LINK( this, DataBrowser, SeriesHeaderChanged ));
-    bool bIsHighContrast = pWin ? (pWin->GetSettings().GetStyleSettings().GetHighContrastMode()) : false;
 
     for( DataBrowserModel::tDataHeaderVector::const_iterator aIt( aHeaders.begin());
          aIt != aHeaders.end(); ++aIt )
@@ -1300,7 +1278,7 @@ void DataBrowser::RenewSeriesHeaders()
         if( xSeriesProp.is() &&
             ( xSeriesProp->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("Color"))) >>= nColor ))
             spHeader->SetColor( Color( nColor ));
-        spHeader->SetChartType( aIt->m_xChartType, aIt->m_bSwapXAndYAxis, bIsHighContrast );
+        spHeader->SetChartType( aIt->m_xChartType, aIt->m_bSwapXAndYAxis );
         spHeader->SetSeriesName(
             String( DataSeriesHelper::getDataSeriesLabel(
                         aIt->m_xDataSeries,
@@ -1361,7 +1339,6 @@ IMPL_LINK( DataBrowser, SeriesHeaderGotFocus, impl::SeriesHeaderEdit*, pEdit )
             GoToCell( 0, 0 );
         else
         {
-            //DeactivateCell();
             MakeFieldVisible( GetCurRow(), static_cast< sal_uInt16 >( pEdit->getStartColumn()), true /* bComplete */ );
             ActivateCell();
             m_aCursorMovedHdlLink.Call( this );
@@ -1407,3 +1384,5 @@ sal_Int32 DataBrowser::GetTotalWidth() const
 }
 
 } // namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx b/chart2/source/controller/dialogs/DataBrowser.hxx
index 251c4d29fbe3..4f63138cd619 100644
--- a/chart2/source/controller/dialogs/DataBrowser.hxx
+++ b/chart2/source/controller/dialogs/DataBrowser.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -110,8 +111,6 @@ public:
                            const ::com::sun::star::uno::Reference<
                                ::com::sun::star::uno::XComponentContext > & xContext );
 
-//     void setNumberFormatter();
-
     // predicates to determine what actions are possible at the current cursor
     // position.  This depends on the implementation of the according mutators
     // below.  (They are used for enabling toolbar icons)
@@ -204,3 +203,5 @@ private:
 } // namespace chart
 
 #endif  // CHART_DATA_BROWSER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx
index 23fda0f472af..2ee7f3f580c7 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.cxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -228,7 +229,6 @@ bool lcl_ShowCategories( const Reference< chart2::XDiagram > & /* xDiagram */ )
 {
     // show categories for all charts
     return true;
-//     return DiagramHelper::isCategoryDiagram( xDiagram );
 }
 
 bool lcl_ShowCategoriesAsDataLabel( const Reference< chart2::XDiagram > & xDiagram )
@@ -442,7 +442,7 @@ void DataBrowserModel::insertComplexCategoryLevel( sal_Int32 nAfterColumnIndex )
 
         if(nAfterColumnIndex<0)
         {
-            OSL_ENSURE( false, "wrong index for category level insertion" );
+            OSL_FAIL( "wrong index for category level insertion" );
             return;
         }
 
@@ -1019,3 +1019,5 @@ void DataBrowserModel::addErrorBarRanges(
 }
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/DataBrowserModel.hxx b/chart2/source/controller/dialogs/DataBrowserModel.hxx
index 94af7fbead13..ee48fa0d8065 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.hxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -181,3 +182,5 @@ private:
 
 // CHART2_DATABROWSERMODEL_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx
index 6e145dc1dfbf..8dd2e0ff2602 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -58,6 +59,7 @@
 #include <iterator>
 #include <functional>
 #include <numeric>
+#include <o3tl/compat_functional.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
@@ -121,10 +123,10 @@ OUString lcl_ConvertRole( const OUString & rRoleString, bool bFromInternalToUI )
     {
         tTranslationMap::const_iterator aIt(
             ::std::find_if( aTranslationMap.begin(), aTranslationMap.end(),
-                            ::std::compose1( ::std::bind2nd(
+                            ::o3tl::compose1( ::std::bind2nd(
                                                  ::std::equal_to< tTranslationMap::mapped_type >(),
                                                  rRoleString ),
-                                             ::std::select2nd< tTranslationMap::value_type >())));
+                                             ::o3tl::select2nd< tTranslationMap::value_type >())));
 
         if( aIt != aTranslationMap.end())
             aResult = (*aIt).first;
@@ -686,7 +688,7 @@ bool DialogModel::setData(
     if( ! xDataProvider.is() ||
         ! m_xTemplate.is() )
     {
-        OSL_ENSURE( false, "Model objects missing" );
+        OSL_FAIL( "Model objects missing" );
         return false;
     }
 
@@ -828,3 +830,5 @@ sal_Int32 DialogModel::countSeries() const
 }
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/DialogModel.hxx b/chart2/source/controller/dialogs/DialogModel.hxx
index b7f882611e47..8b113311e927 100644
--- a/chart2/source/controller/dialogs/DialogModel.hxx
+++ b/chart2/source/controller/dialogs/DialogModel.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -191,3 +192,5 @@ private:
 
 // CHART2_DIALOGMODEL_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index 483424d04497..34838abaeee3 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -309,7 +310,6 @@ rtl::OUString ObjectNameProvider::getName( ObjectType eObjectType, bool bPlural
             }
                 break;
         case OBJECTTYPE_DATA_STOCK_RANGE:
-                //aRet=String(SchResId());
                 break;
         case OBJECTTYPE_DATA_STOCK_LOSS:
                 aRet=String(SchResId(STR_OBJECT_STOCK_LOSS));
@@ -394,7 +394,7 @@ OUString ObjectNameProvider::getTitleNameByType( TitleHelper::eTitleType eType )
             aRet=String(SchResId(STR_OBJECT_TITLE_SECONDARY_Y_AXIS));
             break;
         default:
-            DBG_ERROR("unknown title type");
+            OSL_FAIL("unknown title type");
             break;
     }
 
@@ -567,13 +567,6 @@ rtl::OUString ObjectNameProvider::getHelpText( const rtl::OUString& rObjectCID,
                 aRet = aRet.replaceAt( nIndex, aWildcard.getLength(), lcl_getDataSeriesName( rObjectCID, xChartModel ) );
         }
     }
-    /*
-    else if( OBJECTTYPE_DIAGRAM == eObjectType )
-    {
-        //todo different names for different diagram types ???
-        //or different names for series of diferent charttypes
-    }
-    */
     else if( OBJECTTYPE_DATA_CURVE == eObjectType )
     {
         if( bVerbose )
@@ -604,12 +597,6 @@ rtl::OUString ObjectNameProvider::getHelpText( const rtl::OUString& rObjectCID,
                         if( nIndex != -1 )
                         {
                             sal_Unicode aDecimalSep( '.' );
-                            //@todo: enable this code when a localized decimal
-                            //separator is also available for the formula
-//                             SvtSysLocale aSysLocale;
-//                             OUString aSep( aSysLocale.GetLocaleData().getNumDecimalSep());
-//                             if( aSep.getLength() == 1 )
-//                                 aDecimalSep = aSep.toChar();
                             double fR( xCalculator->getCorrelationCoefficient());
                             aRet = aRet.replaceAt(
                                 nIndex, aWildcard.getLength(),
@@ -648,11 +635,6 @@ rtl::OUString ObjectNameProvider::getHelpText( const rtl::OUString& rObjectCID,
                         RegressionCurveHelper::initializeCurveCalculator( xCalculator, xSeries, xChartModel );
 
                         sal_Unicode aDecimalSep( '.' );
-                        // replace average value
-//                             SvtSysLocale aSysLocale;
-//                             OUString aSep( aSysLocale.GetLocaleData().getNumDecimalSep());
-//                             if( aSep.getLength() == 1 )
-//                                 aDecimalSep = aSep.toChar();
 
                         sal_Int32 nIndex = -1;
                         OUString aWildcard( C2U("%AVERAGE_VALUE") );
@@ -751,6 +733,7 @@ rtl::OUString ObjectNameProvider::getSelectedObjectText( const rtl::OUString & r
     return aRet;
 }
 
+
 rtl::OUString ObjectNameProvider::getNameForCID(
     const rtl::OUString& rObjectCID,
     const uno::Reference< chart2::XChartDocument >& xChartDocument )
@@ -769,7 +752,6 @@ rtl::OUString ObjectNameProvider::getNameForCID(
             return getGridName( rObjectCID, xModel );
         case OBJECTTYPE_DATA_SERIES:
             return lcl_getFullSeriesName( rObjectCID, xModel );
-        //case OBJECTTYPE_LEGEND_ENTRY:
         case OBJECTTYPE_DATA_POINT:
         case OBJECTTYPE_DATA_LABELS:
         case OBJECTTYPE_DATA_LABEL:
@@ -835,3 +817,5 @@ rtl::OUString ObjectNameProvider::getName_ObjectForAllSeries( ObjectType eObject
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/RangeEdit.cxx b/chart2/source/controller/dialogs/RangeEdit.cxx
index 55888156b1b1..f01456b89ee3 100644
--- a/chart2/source/controller/dialogs/RangeEdit.cxx
+++ b/chart2/source/controller/dialogs/RangeEdit.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -68,3 +69,5 @@ void RangeEdit::KeyInput( const KeyEvent& rKEvt )
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/RangeSelectionButton.cxx b/chart2/source/controller/dialogs/RangeSelectionButton.cxx
index 9b94d7e1752b..cea3192bacab 100644
--- a/chart2/source/controller/dialogs/RangeSelectionButton.cxx
+++ b/chart2/source/controller/dialogs/RangeSelectionButton.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,7 +31,6 @@
 
 #include "RangeSelectionButton.hxx"
 #include "Bitmaps.hrc"
-#include "Bitmaps_HC.hrc"
 #include "Strings.hrc"
 #include "ResId.hxx"
 
@@ -42,8 +42,7 @@ namespace chart
 RangeSelectionButton::RangeSelectionButton( Window *pParent, const ResId& rResId ) :
     ImageButton( pParent, rResId )
 {
-    SetModeImage( Image( SchResId(IMG_SELECTRANGE)    ), BMP_COLOR_NORMAL );
-    SetModeImage( Image( SchResId(IMG_SELECTRANGE_HC) ), BMP_COLOR_HIGHCONTRAST );
+    SetModeImage( Image( SchResId( IMG_SELECTRANGE) ) );
     this->SetQuickHelpText(SchResId(STR_TIP_SELECT_RANGE));
 }
 
@@ -54,3 +53,5 @@ RangeSelectionButton::~RangeSelectionButton()
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/RangeSelectionHelper.cxx b/chart2/source/controller/dialogs/RangeSelectionHelper.cxx
index ccb4979420d1..7f41675a901c 100644
--- a/chart2/source/controller/dialogs/RangeSelectionHelper.cxx
+++ b/chart2/source/controller/dialogs/RangeSelectionHelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -196,3 +197,5 @@ bool RangeSelectionHelper::verifyArguments( const Sequence< beans::PropertyValue
 }
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/RangeSelectionListener.cxx b/chart2/source/controller/dialogs/RangeSelectionListener.cxx
index a2bb0b7602d6..a6285f0970a4 100644
--- a/chart2/source/controller/dialogs/RangeSelectionListener.cxx
+++ b/chart2/source/controller/dialogs/RangeSelectionListener.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -73,3 +74,5 @@ void SAL_CALL RangeSelectionListener::disposing( const lang::EventObject& /*Sour
 }
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/ResourceIds.hrc b/chart2/source/controller/dialogs/ResourceIds.hrc
index 2ab544c77ab1..b2f79fc09148 100644
--- a/chart2/source/controller/dialogs/ResourceIds.hrc
+++ b/chart2/source/controller/dialogs/ResourceIds.hrc
@@ -30,10 +30,7 @@
 
 //-----------------------------------------------------------------------------
 //for strings see Strings.hrc
-
-//-----------------------------------------------------------------------------
-//for Bimaps see Bimaps.hrc and Bimaps_HC.hrc
-
+//for Bimaps see Bimaps.hrc
 //-----------------------------------------------------------------------------
 //Dialog Ids:
 #define DLG_DIAGRAM_TYPE    743
@@ -56,7 +53,6 @@
 #define TP_LEGEND_POS   900
 #define TP_DATA_DESCR   901
 #define TP_ALIGNMENT    902
-//#define TP_SYMBOL     906
 #define TP_LAYOUT       907
 #define TP_OPTIONS      908
 #define TP_POLAROPTIONS 909
diff --git a/chart2/source/controller/dialogs/Strings.src b/chart2/source/controller/dialogs/Strings.src
index bb2538a97cad..67967140ae71 100644
--- a/chart2/source/controller/dialogs/Strings.src
+++ b/chart2/source/controller/dialogs/Strings.src
@@ -130,11 +130,6 @@ String STR_PAGE_POSITIONING
     Text [ en-US ] = "Positioning" ;
 };
 
-// String STR_PAGE_STATISTICS
-// {
-//  Text [ en-US ] = "Statistics" ;
-// };
-
 String STR_PAGE_TRENDLINE_TYPE
 {
     Text[ en-US ] = "Type";
diff --git a/chart2/source/controller/dialogs/TabPages.hrc b/chart2/source/controller/dialogs/TabPages.hrc
index dbc166e4f2cd..c43ef24cd003 100644
--- a/chart2/source/controller/dialogs/TabPages.hrc
+++ b/chart2/source/controller/dialogs/TabPages.hrc
@@ -31,21 +31,11 @@
 
 //see attrib.hrc in old chart
 
-//#define TP_LEGEND_POS 900
 #define GRP_LEGEND                  1
 #define FL_LEGEND_TEXTORIENT        2
 #define FT_LEGEND_TEXTDIR           3
 #define LB_LEGEND_TEXTDIR           4
 
-//#define TP_DATA_DESCR 901
-
-//#define TP_ALIGNMENT 902
-////#define FL_ORDER 2
-////#define RBT_SIDEBYSIDE 1
-////#define RBT_UPDOWN 2
-////#define RBT_DOWNUP 3
-////#define RBT_AUTOORDER 4
-
 #define FL_TEXTBREAK                3
 #define CBX_TEXTBREAK               2
 #define CBX_TEXTOVERLAP             4
@@ -62,32 +52,10 @@
 #define FT_TEXTDIR              6038
 #define LB_TEXTDIR              6039
 
-/*
-//Symbol-Tabpage (zum Teil sehr Aehnlich der SVX_AREA_TABPAGE) (obsolete)
-//#define TP_SYMBOL                 906
-#define RBT_COLOR                   1
-#define RBT_GRADIENT                2
-#define RBT_HATCHING                3
-#define RBT_BITMAP                  4
-#define RBT_INVISIBLE               5
-#define LB_COLOR                    1
-#define LB_GRADIENT                 2
-#define LB_HATCHING                 3
-#define LB_BITMAP                   4
-
-#define GRP_FILL                    1
-#define CTL_BITMAP_PREVIEW          6
-*/
-
 //------------
 //from old chart tplabel.hrc
 
-//#define TP_AXIS_LABEL                 920
-
 #define CB_AXIS_LABEL_SCHOW_DESCR       1
-
-//#define FL_AXIS_LABEL_FORMATTING      2
-
 #define FL_AXIS_LABEL_ORIENTATION       3
 #define CT_AXIS_LABEL_DIAL              4
 #define PB_AXIS_LABEL_TEXTSTACKED       5
@@ -107,7 +75,6 @@
 #define RB_AXIS_LABEL_AUTOORDER         17
 
 #define FL_SEPARATOR                    18
-
 #define FT_AXIS_TEXTDIR                 19
 #define LB_AXIS_TEXTDIR                 20
 
diff --git a/chart2/source/controller/dialogs/TextDirectionListBox.cxx b/chart2/source/controller/dialogs/TextDirectionListBox.cxx
index 23a1b4e806bd..cd11b6e7c3d2 100644
--- a/chart2/source/controller/dialogs/TextDirectionListBox.cxx
+++ b/chart2/source/controller/dialogs/TextDirectionListBox.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -58,3 +59,4 @@ TextDirectionListBox::~TextDirectionListBox()
 
 } //namespace chart
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx b/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx
index f1af209697cc..2147a7c0033b 100644
--- a/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx
+++ b/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -68,3 +69,5 @@ IMPL_LINK( TimerTriggeredControllerLock, TimerTimeout, void*, EMPTYARG )
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/TitleDialogData.cxx b/chart2/source/controller/dialogs/TitleDialogData.cxx
index 8846b310cde4..a6e4213c955f 100644
--- a/chart2/source/controller/dialogs/TitleDialogData.cxx
+++ b/chart2/source/controller/dialogs/TitleDialogData.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -122,3 +123,5 @@ bool TitleDialogData::writeDifferenceToModel(
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/dlg_ChartType.cxx b/chart2/source/controller/dialogs/dlg_ChartType.cxx
index f446c52ac0de..304aa1db7baf 100644
--- a/chart2/source/controller/dialogs/dlg_ChartType.cxx
+++ b/chart2/source/controller/dialogs/dlg_ChartType.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -76,3 +77,5 @@ ChartTypeDialog::~ChartTypeDialog()
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
index aa9db2cdbbe4..420b20a4a7e0 100644
--- a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -137,3 +138,5 @@ uno::Reference<beans::XPropertySetInfo>  SAL_CALL ChartTypeUnoDlg::getPropertySe
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
index fe035acb09e4..d4e7147ac23a 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -38,8 +39,6 @@
 #include "tp_ChartType.hxx"
 #include "tp_RangeChooser.hxx"
 #include "tp_Wizard_TitlesAndObjects.hxx"
-#include "tp_Location.hxx"
-
 #include "tp_DataSource.hxx"
 #include "ChartTypeTemplateProvider.hxx"
 #include "DialogModel.hxx"
@@ -50,8 +49,6 @@ namespace chart
 //.............................................................................
 using namespace ::com::sun::star;
 
-//#define LOCATION_PAGE 1
-
 #define PATH_FULL   1
 #define STATE_FIRST        0
 #define STATE_CHARTTYPE    STATE_FIRST
@@ -59,20 +56,11 @@ using namespace ::com::sun::star;
 #define STATE_DATA_SERIES  2
 #define STATE_OBJECTS      3
 #define STATE_LOCATION     4
-
-#ifdef LOCATION_PAGE
-#define STATE_LAST         STATE_LOCATION
-#else
 #define STATE_LAST         STATE_OBJECTS
-#endif
 
 namespace
 {
-#ifdef LOCATION_PAGE
-    const sal_Int32 nPageCount = 5;
-#else
     const sal_Int32 nPageCount = 4;
-#endif
 }
 
 CreationWizard::CreationWizard( Window* pParent, const uno::Reference< frame::XModel >& xChartModel
@@ -112,9 +100,6 @@ CreationWizard::CreationWizard( Window* pParent, const uno::Reference< frame::XM
         , STATE_SIMPLE_RANGE
         , STATE_DATA_SERIES
         , STATE_OBJECTS
-#ifdef LOCATION_PAGE
-        , STATE_LOCATION
-#endif
         , WZS_INVALID_STATE
     );
     this->SetRoadmapHelpId( HID_SCH_WIZARD_ROADMAP );
@@ -177,14 +162,6 @@ svt::OWizardPage* CreationWizard::createPage(WizardState nState)
         m_aTimerTriggeredControllerLock.startTimer();
         }
         break;
-#ifdef LOCATION_PAGE
-    case STATE_LOCATION:
-        {
-        m_aTimerTriggeredControllerLock.startTimer();
-        pRet  = new LocationTabPage(this,m_xChartModel,m_xCC);
-        }
-        break;
-#endif
     default:
         break;
     }
@@ -251,11 +228,6 @@ String CreationWizard::getStateDisplayName( WizardState nState ) const
     case STATE_OBJECTS:
         nResId = STR_PAGE_CHART_ELEMENTS;
         break;
-#ifdef LOCATION_PAGE
-    case STATE_LOCATION:
-        nResId = STR_PAGE_CHART_LOCATION;
-        break;
-#endif
     default:
         break;
     }
@@ -265,3 +237,5 @@ String CreationWizard::getStateDisplayName( WizardState nState ) const
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
index f9c25f94f7f3..f08922bb0bc1 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -35,7 +36,7 @@
 #include "ContainerHelper.hxx"
 #include "TimerTriggeredControllerLock.hxx"
 #include <osl/mutex.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 // header for class Application
 #include <vcl/svapp.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
@@ -43,6 +44,7 @@
 #include <vcl/msgbox.hxx>
 // header for class OImplementationId
 #include <cppuhelper/typeprovider.hxx>
+#include <comphelper/servicehelper.hxx>
 #include <com/sun/star/awt/Point.hpp>
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
@@ -73,7 +75,7 @@ CreationWizardUnoDlg::CreationWizardUnoDlg( const uno::Reference< uno::XComponen
 }
 CreationWizardUnoDlg::~CreationWizardUnoDlg()
 {
-    ::vos::OGuard aSolarGuard( Application::GetSolarMutex());
+    SolarMutexGuard aSolarGuard;
     if( m_pDialog )
     {
         delete m_pDialog;
@@ -143,7 +145,6 @@ uno::Sequence< uno::Type > CreationWizardUnoDlg::getTypes() throw(uno::RuntimeEx
 {
     static uno::Sequence< uno::Type > aTypeList;
 
-    // /--
     ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
     if( !aTypeList.getLength() )
     {
@@ -161,17 +162,16 @@ uno::Sequence< uno::Type > CreationWizardUnoDlg::getTypes() throw(uno::RuntimeEx
     }
 
     return aTypeList;
-    // \--
 }
+
+namespace
+{
+    class theCreationWizardUnoDlgImplementationId : public rtl::Static< UnoTunnelIdInit, theCreationWizardUnoDlgImplementationId > {};
+}
+
 uno::Sequence< sal_Int8 > SAL_CALL CreationWizardUnoDlg::getImplementationId( void ) throw( uno::RuntimeException )
 {
-    static uno::Sequence< sal_Int8 > aId;
-    if( aId.getLength() == 0 )
-    {
-        aId.realloc( 16 );
-        rtl_createUuid( (sal_uInt8 *)aId.getArray(), 0, sal_True );
-    }
-    return aId;
+    return theCreationWizardUnoDlgImplementationId::get().getSeq();
 }
 
 //-------------------------------------------------------------------------
@@ -179,7 +179,7 @@ uno::Sequence< sal_Int8 > SAL_CALL CreationWizardUnoDlg::getImplementationId( vo
 // XTerminateListener
 void SAL_CALL CreationWizardUnoDlg::queryTermination( const lang::EventObject& /*Event*/ ) throw( frame::TerminationVetoException, uno::RuntimeException)
 {
-    ::vos::OGuard aSolarGuard( Application::GetSolarMutex());
+    SolarMutexGuard aSolarGuard;
 
     // we will never give a veto here
     if( m_pDialog && !m_pDialog->isClosable() )
@@ -209,7 +209,7 @@ void SAL_CALL CreationWizardUnoDlg::setTitle( const ::rtl::OUString& /*rTitle*/
 //-------------------------------------------------------------------------
 void CreationWizardUnoDlg::createDialogOnDemand()
 {
-    ::vos::OGuard aSolarGuard( Application::GetSolarMutex());
+    SolarMutexGuard aSolarGuard;
     if( !m_pDialog )
     {
         Window* pParent = NULL;
@@ -252,7 +252,7 @@ sal_Int16 SAL_CALL CreationWizardUnoDlg::execute(  ) throw(uno::RuntimeException
 {
     sal_Int16 nRet = RET_CANCEL;
     {
-        ::vos::OGuard aSolarGuard( Application::GetSolarMutex());
+        SolarMutexGuard aSolarGuard;
         createDialogOnDemand();
         if( !m_pDialog )
             return nRet;
@@ -293,8 +293,7 @@ void SAL_CALL CreationWizardUnoDlg::disposing()
     m_xChartModel.clear();
     m_xParentWindow.clear();
 
-    // /--
-    ::vos::OGuard aSolarGuard( Application::GetSolarMutex());
+    SolarMutexGuard aSolarGuard;
     if( m_pDialog )
     {
         delete m_pDialog;
@@ -316,14 +315,13 @@ void SAL_CALL CreationWizardUnoDlg::disposing()
     {
         ASSERT_EXCEPTION( ex );
     }
-    // \--
 }
 
 //XPropertySet
 uno::Reference< beans::XPropertySetInfo > SAL_CALL CreationWizardUnoDlg::getPropertySetInfo()
     throw (uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented");
+    OSL_FAIL("not implemented");
     return 0;
 }
 
@@ -340,7 +338,7 @@ void SAL_CALL CreationWizardUnoDlg::setPropertyValue( const ::rtl::OUString& rPr
 
         //set left upper outer corner relative to screen
         //pixels, screen position
-        ::vos::OGuard aSolarGuard( Application::GetSolarMutex());
+        SolarMutexGuard aSolarGuard;
         createDialogOnDemand();
         if( m_pDialog )
         {
@@ -372,7 +370,7 @@ uno::Any SAL_CALL CreationWizardUnoDlg::getPropertyValue( const ::rtl::OUString&
     {
         //get left upper outer corner relative to screen
         //pixels, screen position
-        ::vos::OGuard aSolarGuard( Application::GetSolarMutex());
+        SolarMutexGuard aSolarGuard;
         createDialogOnDemand();
         if( m_pDialog )
         {
@@ -385,7 +383,7 @@ uno::Any SAL_CALL CreationWizardUnoDlg::getPropertyValue( const ::rtl::OUString&
     {
         //get outer size inclusive decoration
         //pixels, screen position
-        ::vos::OGuard aSolarGuard( Application::GetSolarMutex());
+        SolarMutexGuard aSolarGuard;
         createDialogOnDemand();
         if( m_pDialog )
         {
@@ -407,27 +405,29 @@ void SAL_CALL CreationWizardUnoDlg::addPropertyChangeListener(
         const ::rtl::OUString& /* aPropertyName */, const uno::Reference< beans::XPropertyChangeListener >& /* xListener */ )
         throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented");
+    OSL_FAIL("not implemented");
 }
 void SAL_CALL CreationWizardUnoDlg::removePropertyChangeListener(
     const ::rtl::OUString& /* aPropertyName */, const uno::Reference< beans::XPropertyChangeListener >& /* aListener */ )
     throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented");
+    OSL_FAIL("not implemented");
 }
 
 void SAL_CALL CreationWizardUnoDlg::addVetoableChangeListener( const ::rtl::OUString& /* PropertyName */, const uno::Reference< beans::XVetoableChangeListener >& /* aListener */ )
     throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented");
+    OSL_FAIL("not implemented");
 }
 
 void SAL_CALL CreationWizardUnoDlg::removeVetoableChangeListener( const ::rtl::OUString& /* PropertyName */, const uno::Reference< beans::XVetoableChangeListener >& /* aListener */ )
     throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented");
+    OSL_FAIL("not implemented");
 }
 
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
index fc8e5a040321..574b464b5dac 100644
--- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -50,9 +51,6 @@
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/chart2/XChartDocument.hpp>
 
-// for storing/reading the position and size of the dialog
-// #include <svtools/viewoptions.hxx>
-
 using namespace ::com::sun::star;
 using ::com::sun::star::uno::Reference;
 using ::rtl::OUString;
@@ -71,8 +69,7 @@ DataEditor::DataEditor(
         m_aTbxData( this, SchResId( TBX_DATA )),
         m_xChartDoc( xChartDoc ),
         m_xContext( xContext ),
-        m_aToolboxImageList( SchResId( IL_DIAGRAM_DATA )),
-        m_aToolboxImageListHighContrast( SchResId( IL_HC_DIAGRAM_DATA ))
+        m_aToolboxImageList( SchResId( IL_DIAGRAM_DATA ))
 {
     FreeResource();
 
@@ -97,7 +94,7 @@ DataEditor::DataEditor(
         bReadOnly = xStor->isReadonly();
     SetReadOnly( bReadOnly );
 
-    // #101228# change buttons to flat-look if set so by user
+    // change buttons to flat-look if set so by user
     SvtMiscOptions aMiscOptions;
     const sal_Int16 nStyle( aMiscOptions.GetToolboxStyle() );
     // react on changes
@@ -118,8 +115,6 @@ DataEditor::DataEditor(
     SetOutputSizePixel( aWinSize );
     AdaptBrowseBoxSize();
 
-//     ImplAdjustHeaderControls( false /* bRefreshFromModel */ );
-
     // allow travelling to toolbar with F6
     notifySystemWindow( this, & m_aTbxData, ::comphelper::mem_fun( & TaskPaneList::AddWindow ));
 }
@@ -218,83 +213,11 @@ IMPL_LINK( DataEditor, CellModified, void*, EMPTYARG )
     return 0;
 }
 
-// IMPL_LINK( DataEditor, BrowserColumnResized, void*, EMPTYARG )
-// {
-//     ImplAdjustHeaderControls( false /* bRefreshFromModel */ );
-//     return 0;
-// }
-
-// IMPL_LINK( DataEditor, BrowserContentScrolled, void*, EMPTYARG )
-// {
-//     ImplAdjustHeaderControls( false /* bRefreshFromModel */ );
-//     return 0;
-// }
-
 void DataEditor::UpdateData()
 {
     m_apBrwData->SetDataFromModel( m_xChartDoc, m_xContext );
 }
 
-// react on the change of the underlying document by displaying the new data
-// void DataEditor::SFX_NOTIFY(
-//     SfxBroadcaster& rBC,
-//     const TypeId& rBCType,
-//     const SfxHint& rHint,
-//     const TypeId& rHintType )
-// {
-//     if( rHint.Type() == TYPE(SfxSimpleHint) )
-//     {
-//         // note: if dynamic_cast works this should be changed
-//         switch( static_cast< const SfxSimpleHint & >( rHint ).GetId())
-//         {
-//             case SFX_HINT_DOCCHANGED:
-//                 UpdateData();
-//                 break;
-
-//             case SFX_HINT_DYING:
-//                 break;
-//         }
-//     }
-// }
-
-// {
-//     sal_Bool bRet = sal_True;
-
-//     // confirm changes currently made and not saved
-//     m_apBrwData->EndEditing();
-
-//     if( m_apBrwData->IsDirty() )
-//     {
-//         QueryBox aSafetyQuery( this, WB_YES_NO_CANCEL | WB_DEF_YES,
-//                                String( SchResId( STR_DIAGRAM_DATA_SAFETY_QUERY )));
-//         long nQueryResult = aSafetyQuery.Execute();
-
-//         bRet = ( nQueryResult != RET_CANCEL );
-
-//         if( nQueryResult == RET_YES )
-//         {
-//             // save changes
-//             ApplyChangesToModel();
-//         }
-//     }
-
-//     if( bRet )
-//     {
-//         // close child window
-//         SfxBoolItem aItem( SID_DIAGRAM_DATA, sal_False );
-//         if( m_pBindings )
-//         {
-//             SfxDispatcher* pDisp = m_pBindings->GetDispatcher();
-//             if( pDisp )
-//                 pDisp->Execute( SID_DIAGRAM_DATA, SFX_CALLMODE_ASYNCHRON, &aItem, 0L);
-//             else
-//                 DBG_ERROR( "Couldn't dispatch command" );
-//         }
-//     }
-
-//     return ( bRet? SfxFloatingWindow::Close(): sal_False );
-// }
-
 void DataEditor::AdaptBrowseBoxSize()
 {
     Size aSize( PixelToLogic( GetResizeOutputSizePixel(), MAP_APPFONT ));
@@ -310,7 +233,6 @@ void DataEditor::Resize()
 {
     Dialog::Resize();
     AdaptBrowseBoxSize();
-//     ImplAdjustHeaderControls( false /* bRefreshFromModel */ );
 }
 
 sal_Bool DataEditor::Close()
@@ -329,13 +251,7 @@ bool DataEditor::ApplyChangesToModel()
 // sets the correct toolbar icons depending on the current mode (e.g. high contrast)
 void DataEditor::ApplyImageList()
 {
-    bool bIsHighContrast = ( true && GetSettings().GetStyleSettings().GetHighContrastMode() );
-
-    ImageList& rImgLst = bIsHighContrast
-        ? m_aToolboxImageListHighContrast
-        : m_aToolboxImageList;
-
-    m_aTbxData.SetImageList( rImgLst );
+    m_aTbxData.SetImageList( m_aToolboxImageList );
 }
 
 // add/remove a window (the toolbar) to/from the global list, so that F6
@@ -361,3 +277,5 @@ void DataEditor::notifySystemWindow(
 }
 
 } // namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.hrc b/chart2/source/controller/dialogs/dlg_DataEditor.hrc
index d2675c5bb29e..340fc814a439 100644
--- a/chart2/source/controller/dialogs/dlg_DataEditor.hrc
+++ b/chart2/source/controller/dialogs/dlg_DataEditor.hrc
@@ -42,6 +42,5 @@
 #define TBI_DATA_SWAP_ROW 6
 #define TBI_DATA_INSERT_TEXT_COL 7
 
-// image lists (normal and high-contrast) for toolbox
+// image lists for toolbox
 #define IL_DIAGRAM_DATA     1
-#define IL_HC_DIAGRAM_DATA  2
diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.src b/chart2/source/controller/dialogs/dlg_DataEditor.src
index 02ccc98b7a82..1bee31dd21fe 100644
--- a/chart2/source/controller/dialogs/dlg_DataEditor.src
+++ b/chart2/source/controller/dialogs/dlg_DataEditor.src
@@ -31,8 +31,6 @@
 
 // Mask Color for standard images
 #define IMAGE_BUTTON_STD_MASK_COLOR Color { Red = 0xff00; Green = 0x0000; Blue = 0xff00; }
-// Mask Color for high-contrast images
-#define IMAGE_BUTTON_HC_MASK_COLOR  IMAGE_BUTTON_STD_MASK_COLOR
 
 #define ADDITIONAL_SPACE_ABOVE_TABLE 17
 
@@ -138,11 +136,4 @@ ModalDialog DLG_DIAGRAM_DATA
         MaskColor = IMAGE_BUTTON_STD_MASK_COLOR;
         IMAGE_ID_LIST;
     };
-
-    ImageList IL_HC_DIAGRAM_DATA
-    {
-        Prefix = "dataeditor_icon_h";
-        MaskColor = IMAGE_BUTTON_HC_MASK_COLOR;
-        IMAGE_ID_LIST;
-    };
 };
diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx
index 694a165cd411..b90f9a569665 100644
--- a/chart2/source/controller/dialogs/dlg_DataSource.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -250,3 +251,5 @@ void DataSourceDialog::setValidPage( TabPage * pTabPage )
 
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
index 66ffb011690f..7e0bc698f436 100644
--- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -112,7 +113,6 @@ SchAxisDlg::SchAxisDlg( Window* pWindow
             aCbSecondaryZ.Hide();
 
             Size aSize( GetSizePixel() );
-            //aSize.Height() -= aCbSecondaryZ.GetSizePixel().Height();
             aSize.Height() -= ( aCbSecondaryZ.GetPosPixel().Y() - aCbSecondaryY.GetPosPixel().Y() );
             SetSizePixel(aSize);
         }
@@ -162,3 +162,4 @@ SchGridDlg::~SchGridDlg()
 
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src
index 0ee3f219c12c..03faaa4ede45 100644
--- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src
+++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src
@@ -36,7 +36,6 @@ ModalDialog DLG_AXIS_OR_GRID
     HelpID = HID_INSERT_AXIS ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
-    //Size = MAP_APPFONT ( 160 , 99 ) ;
     Size = MAP_APPFONT ( 160 , 113 ) ;
     Moveable = TRUE ;
 
diff --git a/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx b/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx
index 2105b0bb2c87..4b5d27e40dc0 100644
--- a/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -72,3 +73,4 @@ void DataLabelsDialog::FillItemSet(SfxItemSet& rOutAttrs)
 } //namespace chart
 //.............................................................................
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
index 9c0d8f1e1b10..d804d19e3cf8 100644
--- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -131,3 +132,5 @@ double InsertErrorBarsDialog::getAxisMinorStepWidthForErrorBarDecimals(
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
index e722ede09c5a..7fdec77c4fcb 100644
--- a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -76,3 +77,5 @@ bool SchLegendDlg::writeToModel( const uno::Reference< frame::XModel >& xChartMo
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/dlg_InsertTitle.cxx b/chart2/source/controller/dialogs/dlg_InsertTitle.cxx
index bd98774c57a8..e292c2cd9ba9 100644
--- a/chart2/source/controller/dialogs/dlg_InsertTitle.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertTitle.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -65,3 +66,4 @@ void SchTitleDlg::getResult( TitleDialogData& rOutput )
 } //namespace chart
 //.............................................................................
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/dlg_InsertTrendline.cxx b/chart2/source/controller/dialogs/dlg_InsertTrendline.cxx
index 58b29b4bdfe3..05ca9b7fbf0d 100644
--- a/chart2/source/controller/dialogs/dlg_InsertTrendline.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertTrendline.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -112,3 +113,5 @@ void InsertTrendlineDialog::DataChanged( const DataChangedEvent& rDCEvt )
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/dlg_InsertTrendline.src b/chart2/source/controller/dialogs/dlg_InsertTrendline.src
index e7abd803fd87..3a866501ef92 100644
--- a/chart2/source/controller/dialogs/dlg_InsertTrendline.src
+++ b/chart2/source/controller/dialogs/dlg_InsertTrendline.src
@@ -45,4 +45,3 @@ ModalDialog DLG_DATA_TRENDLINE
     BUTTONS_OK_CANCEL_HELP_STACKED( DLG_DATA_TRENDLINE_RES_WIDTH + DLG_DATA_TRENDLINE_ADD_TO_RES )
     RESOURCE_TRENDLINE( DLG_DATA_TRENDLINE_RES_WIDTH, 22 )
 };
-
diff --git a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
index 51df0eb21dc4..b50398309700 100644
--- a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
+++ b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -83,3 +84,5 @@ SfxItemSet NumberFormatDialog::CreateEmptyItemSetForNumberFormatDialog( SfxItemP
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/dlg_NumberFormat.hxx b/chart2/source/controller/dialogs/dlg_NumberFormat.hxx
index 96cfb23c1f95..2df36bd4ffc8 100644
--- a/chart2/source/controller/dialogs/dlg_NumberFormat.hxx
+++ b/chart2/source/controller/dialogs/dlg_NumberFormat.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -52,3 +53,4 @@ public:
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index 0102a970e0c5..54e0a606cd3d 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -336,7 +337,6 @@ bool ObjectPropertiesDialogParameter::IsComplexCategoriesAxis() const
     return m_bComplexCategoriesAxis;
 }
 
-//const sal_uInt16 nNoArrowDlg          = 1100;
 const sal_uInt16 nNoArrowNoShadowDlg    = 1101;
 
 //-------------------------------------------------------------------
@@ -541,7 +541,6 @@ void SchAttribTabDlg::PageCreated(sal_uInt16 nId, SfxTabPage &rPage)
                     aSet.Put(SvxGraphicItem(SID_GRAPHIC,*m_pAutoSymbolGraphic));
             }
             rPage.PageCreated(aSet);
-            //rPage.ActivatePage(*GetInputSetImpl()); //what for?
             break;
 
         case RID_SVXPAGE_AREA:
@@ -552,7 +551,6 @@ void SchAttribTabDlg::PageCreated(sal_uInt16 nId, SfxTabPage &rPage)
             aSet.Put(SfxUInt16Item(SID_PAGE_TYPE,nPageType));
             aSet.Put(SfxUInt16Item(SID_DLG_TYPE,nDlgType));
             rPage.PageCreated(aSet);
-            //rPage.ActivatePage(*GetInputSetImpl()); //what for?
             break;
 
         case RID_SVXPAGE_TRANSPARENCE:
@@ -563,15 +561,12 @@ void SchAttribTabDlg::PageCreated(sal_uInt16 nId, SfxTabPage &rPage)
 
         case RID_SVXPAGE_CHAR_NAME:
 
-            //CHINA001 ((SvxCharNamePage&)rPage).
-            //CHINA001     SetFontList(SvxFontListItem(m_pViewElementListProvider->getFontList()));
-            aSet.Put (SvxFontListItem(m_pViewElementListProvider->getFontList(), SID_ATTR_CHAR_FONTLIST)); //CHINA001
-            rPage.PageCreated(aSet); //CHINA001
+            aSet.Put (SvxFontListItem(m_pViewElementListProvider->getFontList(), SID_ATTR_CHAR_FONTLIST));
+            rPage.PageCreated(aSet);
             break;
 
         case RID_SVXPAGE_CHAR_EFFECTS:
-            //CHINA001 ((SvxCharEffectsPage&) rPage).DisableControls( DISABLE_CASEMAP );
-            aSet.Put (SfxUInt16Item(SID_DISABLE_CTL,DISABLE_CASEMAP)); //CHINA001
+            aSet.Put (SfxUInt16Item(SID_DISABLE_CTL,DISABLE_CASEMAP));
             rPage.PageCreated(aSet);
             break;
 
@@ -664,3 +659,5 @@ bool SchAttribTabDlg::DialogWasClosedWithOK() const
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/dlg_ShapeFont.cxx b/chart2/source/controller/dialogs/dlg_ShapeFont.cxx
index 0c9edc0e1553..5bf73b537b59 100644
--- a/chart2/source/controller/dialogs/dlg_ShapeFont.cxx
+++ b/chart2/source/controller/dialogs/dlg_ShapeFont.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -90,3 +91,5 @@ void ShapeFontDialog::PageCreated( sal_uInt16 nId, SfxTabPage& rPage )
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx b/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx
index 38373df5e9a8..b53851f20779 100644
--- a/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx
+++ b/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -91,3 +92,5 @@ void ShapeParagraphDialog::PageCreated( sal_uInt16 nId, SfxTabPage& rPage )
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx b/chart2/source/controller/dialogs/dlg_View3D.cxx
index e77d180e87b3..b852d561764d 100644
--- a/chart2/source/controller/dialogs/dlg_View3D.cxx
+++ b/chart2/source/controller/dialogs/dlg_View3D.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -115,3 +116,5 @@ short View3DDialog::Execute()
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/dlg_View3D.src b/chart2/source/controller/dialogs/dlg_View3D.src
index 7be2dd60b324..02818733b2a9 100644
--- a/chart2/source/controller/dialogs/dlg_View3D.src
+++ b/chart2/source/controller/dialogs/dlg_View3D.src
@@ -46,4 +46,3 @@ TabDialog DLG_3D_VIEW
     };
     BUTTONS_OK_CANCEL_HELP_STACKED(VIEW3D_PAGE_HEIGHT+3)
 };
-
diff --git a/chart2/source/controller/dialogs/makefile.mk b/chart2/source/controller/dialogs/makefile.mk
deleted file mode 100644
index d22f5c83b081..000000000000
--- a/chart2/source/controller/dialogs/makefile.mk
+++ /dev/null
@@ -1,205 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=				..$/..$/..
-PRJINC=				$(PRJ)$/source
-PRJNAME=			chart2
-TARGET=				chcdialogs
-
-ENABLE_EXCEPTIONS=	TRUE
-VISIBILITY_HIDDEN=TRUE
-GEN_HID_OTHER=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE: settings.mk
-
-# i26518 the gcc-3.0.4 requires to enhance the template-depth
-# this seems to be a compiler issue, so we recommend not to use 3.0.x anymore
-.IF "$(COM)"=="GCC" 
-    CFLAGS+=-ftemplate-depth-128
-.ENDIF
-
-# --- export library -------------------------------------------------
-
-#object files to build and link together to lib $(SLB)$/$(TARGET).lib
-SLOFILES=   	\
-                $(SLO)$/ObjectNameProvider.obj \
-                $(SLO)$/TimerTriggeredControllerLock.obj \
-                $(SLO)$/ChangingResource.obj \
-                $(SLO)$/DataBrowser.obj \
-                $(SLO)$/DataBrowserModel.obj \
-                $(SLO)$/DialogModel.obj \
-                $(SLO)$/TitleDialogData.obj \
-                $(SLO)$/res_Titles.obj \
-                $(SLO)$/res_TextSeparator.obj \
-                $(SLO)$/res_ErrorBar.obj \
-                $(SLO)$/res_Trendline.obj \
-                $(SLO)$/res_BarGeometry.obj \
-                $(SLO)$/res_LegendPosition.obj \
-                $(SLO)$/res_DataLabel.obj \
-                $(SLO)$/ChartTypeDialogController.obj \
-                $(SLO)$/tp_ChartType.obj \
-                $(SLO)$/tp_RangeChooser.obj \
-                $(SLO)$/tp_Wizard_TitlesAndObjects.obj \
-                $(SLO)$/tp_Location.obj \
-                $(SLO)$/tp_AxisLabel.obj \
-                $(SLO)$/tp_AxisPositions.obj \
-                $(SLO)$/tp_DataLabel.obj \
-                $(SLO)$/tp_DataSource.obj \
-                $(SLO)$/tp_DataSourceControls.obj \
-                $(SLO)$/tp_LegendPosition.obj \
-                $(SLO)$/tp_PointGeometry.obj \
-                $(SLO)$/tp_Scale.obj \
-                $(SLO)$/tp_Trendline.obj \
-                $(SLO)$/tp_ErrorBars.obj \
-                $(SLO)$/tp_SeriesToAxis.obj \
-                $(SLO)$/tp_TitleRotation.obj \
-                $(SLO)$/tp_3D_SceneGeometry.obj \
-                $(SLO)$/tp_3D_SceneAppearance.obj \
-                $(SLO)$/tp_3D_SceneIllumination.obj \
-                $(SLO)$/tp_PolarOptions.obj \
-                $(SLO)$/dlg_ObjectProperties.obj \
-                $(SLO)$/dlg_DataEditor.obj \
-                $(SLO)$/dlg_DataSource.obj \
-                $(SLO)$/dlg_View3D.obj \
-                $(SLO)$/dlg_InsertAxis_Grid.obj \
-                $(SLO)$/dlg_InsertDataLabel.obj \
-                $(SLO)$/dlg_InsertLegend.obj \
-                $(SLO)$/dlg_InsertTrendline.obj \
-                $(SLO)$/dlg_InsertErrorBars.obj \
-                $(SLO)$/dlg_InsertTitle.obj \
-                $(SLO)$/dlg_CreationWizard.obj \
-                $(SLO)$/dlg_CreationWizard_UNO.obj \
-                $(SLO)$/dlg_ChartType_UNO.obj \
-                $(SLO)$/dlg_ChartType.obj \
-                $(SLO)$/dlg_NumberFormat.obj \
-                $(SLO)$/dlg_ShapeFont.obj \
-                $(SLO)$/dlg_ShapeParagraph.obj \
-                $(SLO)$/RangeSelectionButton.obj \
-                $(SLO)$/RangeSelectionHelper.obj \
-                $(SLO)$/RangeSelectionListener.obj \
-                $(SLO)$/RangeEdit.obj \
-                $(SLO)$/TextDirectionListBox.obj
-
-# --- Resources ---------------------------------------------------------------
-
-#               Bitmaps.src
-#               Bitmaps_HC.src
-
-
-SRC1FILES=		\
-                res_TextSeparator.src \
-                res_BarGeometry.src \
-                tp_ChartType.src \
-                tp_RangeChooser.src \
-                tp_Wizard_TitlesAndObjects.src \
-                tp_Location.src \
-                tp_AxisLabel.src \
-                tp_AxisPositions.src \
-                tp_DataLabel.src \
-                tp_DataSource.src \
-                tp_LegendPosition.src \
-                tp_PointGeometry.src \
-                tp_Scale.src \
-                tp_Trendline.src \
-                tp_ErrorBars.src \
-                tp_SeriesToAxis.src \
-                tp_TitleRotation.src \
-                tp_3D_SceneGeometry.src \
-                tp_3D_SceneAppearance.src \
-                tp_3D_SceneIllumination.src \
-                tp_PolarOptions.src \
-                dlg_ObjectProperties.src \
-                Strings_Statistic.src \
-                Strings_Scale.src \
-                Strings_ChartTypes.src \
-                Strings_AdditionalControls.src \
-                Strings.src \
-                Bitmaps.src \
-                Bitmaps_HC.src \
-                dlg_DataEditor.src \
-                dlg_DataSource.src \
-                dlg_View3D.src \
-                dlg_InsertAxis_Grid.src \
-                dlg_InsertDataLabel.src \
-                dlg_InsertLegend.src \
-                dlg_InsertTrendline.src \
-                dlg_InsertErrorBars.src \
-                dlg_InsertTitle.src \
-                dlg_ChartType.src \
-                dlg_CreationWizard.src \
-                dlg_ShapeFont.src \
-                dlg_ShapeParagraph.src
-
-SRS1NAME=$(TARGET)
-
-# --- Targets -----------------------------------------------------------------
-LOCALIZE_ME=res_DataLabel_tmpl.hrc res_LegendPosition_tmpl.hrc res_Trendline_tmpl.hrc res_ErrorBar_tmpl.hrc res_Titlesx_tmpl.hrc res_SecondaryAxisCheckBoxes_tmpl.hrc 
-.INCLUDE: target.mk
-$(SRS)$/chcdialogs.srs: $(INCCOM)$/res_DataLabel.hrc
-$(SRS)$/chcdialogs.srs: $(INCCOM)$/res_LegendPosition.hrc
-$(SRS)$/chcdialogs.srs: $(INCCOM)$/res_Trendline.hrc
-$(SRS)$/chcdialogs.srs: $(INCCOM)$/res_ErrorBar.hrc
-$(SRS)$/chcdialogs.srs: $(INCCOM)$/res_Titlesx.hrc
-$(SRS)$/chcdialogs.srs: $(INCCOM)$/res_SecondaryAxisCheckBoxes.hrc
-
-#dependencies:
-
-$(SRS)$/chcdialogs.srs: \
-        Bitmaps.hrc \
-        Bitmaps_HC.hrc \
-        CommonResources.hrc \
-        ResourceIds.hrc \
-        ..$/..$/inc$/Strings.hrc \
-        TabPages.hrc \
-        dlg_CreationWizard.hrc \
-        dlg_DataSource.hrc \
-        dlg_InsertAxis_Grid.hrc \
-        dlg_InsertDataLabel.hrc \
-        dlg_InsertLegend.hrc \
-        dlg_InsertTrendline.hrc \
-        dlg_InsertErrorBars.hrc \
-        dlg_InsertTitle.hrc \
-        dlg_View3D.hrc \
-        res_Titles.hrc \
-        tp_3D_SceneAppearance.hrc \
-        tp_3D_SceneGeometry.hrc \
-        tp_3D_SceneIllumination.hrc \
-        tp_PolarOptions.hrc \
-        tp_ChartType.hrc \
-        tp_DataSource.hrc \
-        tp_Location.hrc \
-        tp_RangeChooser.hrc \
-        tp_Wizard_TitlesAndObjects.hrc
-
-#        res_DataLabel.hrc \
-#        res_LegendPosition.hrc \
-#        res_Statistic.hrc \
-
-#$(SRS)$/chcdialogs.srs: $(SOLARINCDIR)$/svx$/globlmn.hrc
-
diff --git a/chart2/source/controller/dialogs/res_BarGeometry.cxx b/chart2/source/controller/dialogs/res_BarGeometry.cxx
index 59beaf35a152..45465066db7e 100644
--- a/chart2/source/controller/dialogs/res_BarGeometry.cxx
+++ b/chart2/source/controller/dialogs/res_BarGeometry.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,9 +34,7 @@
 #include "Strings.hrc"
 #include "ResId.hxx"
 
-#ifndef _SVT_CONTROLDIMS_HRC_
 #include <svtools/controldims.hrc>
-#endif
 
 //.............................................................................
 namespace chart
@@ -112,3 +111,4 @@ void BarGeometryResources::SelectEntryPos( sal_uInt16 nPos )
 } //namespace chart
 //.............................................................................
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/res_BarGeometry.hxx b/chart2/source/controller/dialogs/res_BarGeometry.hxx
index 4d91f74179eb..07d853d74dca 100644
--- a/chart2/source/controller/dialogs/res_BarGeometry.hxx
+++ b/chart2/source/controller/dialogs/res_BarGeometry.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -65,3 +66,5 @@ private:
 //.............................................................................
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx
index e466163bd0a3..e7d3ed750f54 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -235,7 +236,7 @@ IMPL_LINK( DataLabelResources, NumberFormatDialogHdl, PushButton *, pButton )
 {
     if( !m_pPool || !m_pNumberFormatter )
     {
-        DBG_ERROR("Missing item pool or number formatter");
+        OSL_FAIL("Missing item pool or number formatter");
         return 1;
     }
 
@@ -417,3 +418,5 @@ void DataLabelResources::Reset(const SfxItemSet& rInAttrs)
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/res_DataLabel.hxx b/chart2/source/controller/dialogs/res_DataLabel.hxx
index 37e14e7077e0..f8b56fb9e855 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.hxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -102,3 +103,5 @@ private:
 //.............................................................................
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index 46b4d30865d7..f4e76f28edd9 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,7 +34,6 @@
 #include "ResId.hxx"
 #include "Strings.hrc"
 #include "Bitmaps.hrc"
-#include "Bitmaps_HC.hrc"
 #include "RangeSelectionHelper.hxx"
 // for RANGE_SELECTION_INVALID_RANGE_BACKGROUND_COLOR
 #include "TabPageNotifiable.hxx"
@@ -91,10 +91,6 @@ namespace chart
 {
 //.............................................................................
 
-// macro for selecting a normal or high contrast bitmap the stack variable
-// bIsHighContrast must exist and reflect the correct state
-#define SELECT_IMAGE(name) Image( SchResId( bIsHighContrast ? name ## _HC : name ))
-
 enum StatIndicator
 {
     INDICATE_BOTH,
@@ -399,7 +395,7 @@ IMPL_LINK( ErrorBarResources, CategoryChosen, void *,  )
     }
     else
     {
-        OSL_ENSURE( false, "Unknown category chosen" );
+        OSL_FAIL( "Unknown category chosen" );
         m_bErrorKindUnique = false;
     }
 
@@ -573,10 +569,9 @@ void ErrorBarResources::Reset(const SfxItemSet& rInAttrs)
 
     aState = rInAttrs.GetItemState( SCHATTR_STAT_CONSTMINUS, sal_True, &pPoolItem );
     m_bMinusUnique = ( aState != SFX_ITEM_DONTCARE );
-    double fMinusValue = 0.0;
     if( aState == SFX_ITEM_SET )
     {
-        fMinusValue = ((const SvxDoubleItem*) pPoolItem)->GetValue();
+        double fMinusValue = ((const SvxDoubleItem*) pPoolItem)->GetValue();
         sal_Int32 nMinusValue = static_cast< sal_Int32 >( fMinusValue * pow(10.0,m_aMfNegative.GetDecimalDigits()) );
         m_aMfNegative.SetValue( nMinusValue );
 
@@ -696,24 +691,17 @@ sal_Bool ErrorBarResources::FillItemSet(SfxItemSet& rOutAttrs) const
 
 void ErrorBarResources::FillValueSets()
 {
-    bool bIsHighContrast = ( true && m_aRbConst.GetSettings().GetStyleSettings().GetHighContrastMode() );
-
-    // do not scale images, show then centered
-//     m_aFiPositive.SetStyle( (m_aFiPositive.GetStyle() & (~WB_SCALE)) | WB_CENTER );
-//     m_aFiNegative.SetStyle( (m_aFiNegative.GetStyle() & (~WB_SCALE)) | WB_CENTER );
-//     m_aFiBoth.SetStyle( (m_aFiBoth.GetStyle() & (~WB_SCALE)) | WB_CENTER );
-
     if( m_eErrorBarType == ERROR_BAR_Y )
     {
-        m_aFiNegative.SetImage( SELECT_IMAGE( BMP_INDICATE_DOWN ));
-        m_aFiPositive.SetImage( SELECT_IMAGE( BMP_INDICATE_UP ));
-        m_aFiBoth.SetImage( SELECT_IMAGE( BMP_INDICATE_BOTH_VERTI ));
+        m_aFiNegative.SetImage( Image( SchResId( BMP_INDICATE_DOWN       ) ) );
+        m_aFiPositive.SetImage( Image( SchResId( BMP_INDICATE_UP         ) ) );
+        m_aFiBoth.SetImage(     Image( SchResId( BMP_INDICATE_BOTH_VERTI ) ) );
     }
     else if( m_eErrorBarType == ERROR_BAR_X )
     {
-        m_aFiNegative.SetImage( SELECT_IMAGE( BMP_INDICATE_LEFT ));
-        m_aFiPositive.SetImage( SELECT_IMAGE( BMP_INDICATE_RIGHT ));
-        m_aFiBoth.SetImage( SELECT_IMAGE( BMP_INDICATE_BOTH_HORI ));
+        m_aFiNegative.SetImage( Image( SchResId( BMP_INDICATE_LEFT      ) ) );
+        m_aFiPositive.SetImage( Image( SchResId( BMP_INDICATE_RIGHT     ) ) );
+        m_aFiBoth.SetImage(     Image( SchResId( BMP_INDICATE_BOTH_HORI ) ) );
     }
 }
 
@@ -727,8 +715,6 @@ void ErrorBarResources::listeningFinished(
     // rNewRange becomes invalid after removing the listener
     ::rtl::OUString aRange( rNewRange );
 
-//     m_rDialogModel.startControllerLockTimer();
-
     // stop listening
     m_apRangeSelectionHelper->stopRangeListening();
 
@@ -785,3 +771,5 @@ bool ErrorBarResources::isRangeFieldContentValid( Edit & rEdit )
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx b/chart2/source/controller/dialogs/res_LegendPosition.cxx
index 4093cf34894f..6d99a2fbea3c 100644
--- a/chart2/source/controller/dialogs/res_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -37,9 +38,7 @@
 #include "macros.hxx"
 #include "LegendHelper.hxx"
 
-#ifndef _SVT_CONTROLDIMS_HRC_
 #include <svtools/controldims.hrc>
-#endif
 #include <com/sun/star/chart2/LegendPosition.hpp>
 #include <com/sun/star/chart/ChartLegendExpansion.hpp>
 
@@ -274,3 +273,4 @@ void LegendPositionResources::SetAccessibleRelationMemberOf(Window* pMemberOf)
 } //namespace chart
 //.............................................................................
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/res_LegendPosition.hxx b/chart2/source/controller/dialogs/res_LegendPosition.hxx
index a4809df97239..bee192ff8b03 100644
--- a/chart2/source/controller/dialogs/res_LegendPosition.hxx
+++ b/chart2/source/controller/dialogs/res_LegendPosition.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,9 +29,7 @@
 #define _CHART2_RES_LEGENPOSITION_HXX
 
 // header for class CheckBox
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 #include <vcl/fixed.hxx>
 // header for class SfxItemSet
 #include <svl/itemset.hxx>
@@ -91,3 +90,5 @@ private:
 //.............................................................................
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/res_TextSeparator.cxx b/chart2/source/controller/dialogs/res_TextSeparator.cxx
index 9cca483b711d..7bf1cc0c8221 100644
--- a/chart2/source/controller/dialogs/res_TextSeparator.cxx
+++ b/chart2/source/controller/dialogs/res_TextSeparator.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,9 +35,7 @@
 #include "ResId.hxx"
 #include "macros.hxx"
 
-#ifndef _SVT_CONTROLDIMS_HRC_
 #include <svtools/controldims.hrc>
-#endif
 
 //.............................................................................
 namespace chart
@@ -156,3 +155,4 @@ rtl::OUString TextSeparatorResources::GetValue() const
 } //namespace chart
 //.............................................................................
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/res_TextSeparator.hxx b/chart2/source/controller/dialogs/res_TextSeparator.hxx
index e7effee4e88a..9113c6bdcfa5 100644
--- a/chart2/source/controller/dialogs/res_TextSeparator.hxx
+++ b/chart2/source/controller/dialogs/res_TextSeparator.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -73,3 +74,5 @@ private:
 //.............................................................................
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/res_Titles.cxx b/chart2/source/controller/dialogs/res_Titles.cxx
index 8620b81de4ab..b24dc911ab94 100644
--- a/chart2/source/controller/dialogs/res_Titles.cxx
+++ b/chart2/source/controller/dialogs/res_Titles.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -222,3 +223,4 @@ void TitleResources::readFromResources( TitleDialogData& rOutput )
 } //namespace chart
 //.............................................................................
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/res_Titles.hxx b/chart2/source/controller/dialogs/res_Titles.hxx
index c79550dd7be1..f501d4a8e446 100644
--- a/chart2/source/controller/dialogs/res_Titles.hxx
+++ b/chart2/source/controller/dialogs/res_Titles.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -75,3 +76,5 @@ private:
 //.............................................................................
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx b/chart2/source/controller/dialogs/res_Trendline.cxx
index ed5ed2686aba..dcd376530a90 100644
--- a/chart2/source/controller/dialogs/res_Trendline.cxx
+++ b/chart2/source/controller/dialogs/res_Trendline.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,16 +35,11 @@
 #include "ResId.hxx"
 #include "Strings.hrc"
 #include "Bitmaps.hrc"
-#include "Bitmaps_HC.hrc"
 #include "chartview/ChartSfxItemIds.hxx"
 
 #include <vector>
 #include <algorithm>
 
-// macro for selecting a normal or high contrast bitmap the stack variable
-// bIsHighContrast must exist and reflect the correct state
-#define SELECT_IMAGE(name) Image( SchResId( bIsHighContrast ? name ## _HC : name ))
-
 namespace
 {
 template< class T >
@@ -85,21 +81,22 @@ enum StatTrendLine
 TrendlineResources::TrendlineResources( Window * pParent, const SfxItemSet& rInAttrs, bool bNoneAvailable ) :
         m_aFLType( pParent, SchResId( FL_TYPE )),
 
-        m_aRBNone( pParent, SchResId( RB_NONE )),
-        m_aRBLinear( pParent, SchResId( RB_LINEAR )),
+        m_aRBNone(        pParent, SchResId( RB_NONE        )),
+        m_aRBLinear(      pParent, SchResId( RB_LINEAR      )),
         m_aRBLogarithmic( pParent, SchResId( RB_LOGARITHMIC )),
         m_aRBExponential( pParent, SchResId( RB_EXPONENTIAL )),
-        m_aRBPower( pParent, SchResId( RB_POWER )),
+        m_aRBPower(       pParent, SchResId( RB_POWER       )),
 
-        m_aFINone( pParent, SchResId( FI_NONE )),
-        m_aFILinear( pParent, SchResId( FI_LINEAR )),
+        m_aFINone(        pParent, SchResId( FI_NONE        )),
+        m_aFILinear(      pParent, SchResId( FI_LINEAR      )),
         m_aFILogarithmic( pParent, SchResId( FI_LOGARITHMIC )),
         m_aFIExponential( pParent, SchResId( FI_EXPONENTIAL )),
-        m_aFIPower( pParent, SchResId( FI_POWER )),
+        m_aFIPower(       pParent, SchResId( FI_POWER       )),
 
-        m_aFLEquation( pParent, SchResId( FL_EQUATION )),
-        m_aCBShowEquation( pParent, SchResId( CB_SHOW_EQUATION )),
+        m_aFLEquation(             pParent, SchResId( FL_EQUATION               )),
+        m_aCBShowEquation(         pParent, SchResId( CB_SHOW_EQUATION          )),
         m_aCBShowCorrelationCoeff( pParent, SchResId( CB_SHOW_CORRELATION_COEFF )),
+
         m_eTrendLineType( CHREGRESS_NONE ),
         m_bNoneAvailable( bNoneAvailable ),
         m_bTrendLineUnique( true )
@@ -259,14 +256,12 @@ sal_Bool TrendlineResources::FillItemSet(SfxItemSet& rOutAttrs) const
 
 void TrendlineResources::FillValueSets()
 {
-    bool bIsHighContrast = ( true && m_aFLType.GetSettings().GetStyleSettings().GetHighContrastMode() );
-
     if( m_bNoneAvailable )
-        m_aFINone.SetImage( SELECT_IMAGE( BMP_REGRESSION_NONE ));
-    m_aFILinear.SetImage( SELECT_IMAGE( BMP_REGRESSION_LINEAR ));
-    m_aFILogarithmic.SetImage( SELECT_IMAGE( BMP_REGRESSION_LOG ));
-    m_aFIExponential.SetImage( SELECT_IMAGE( BMP_REGRESSION_EXP ));
-    m_aFIPower.SetImage( SELECT_IMAGE( BMP_REGRESSION_POWER ));
+        m_aFINone.SetImage(    Image( SchResId( BMP_REGRESSION_NONE   ) ) );
+    m_aFILinear.SetImage(      Image( SchResId( BMP_REGRESSION_LINEAR ) ) );
+    m_aFILogarithmic.SetImage( Image( SchResId( BMP_REGRESSION_LOG    ) ) );
+    m_aFIExponential.SetImage( Image( SchResId( BMP_REGRESSION_EXP    ) ) );
+    m_aFIPower.SetImage(       Image( SchResId( BMP_REGRESSION_POWER  ) ) );
 }
 
 void TrendlineResources::UpdateControlStates()
@@ -280,3 +275,5 @@ void TrendlineResources::UpdateControlStates()
 }
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/res_Trendline.hxx b/chart2/source/controller/dialogs/res_Trendline.hxx
index f9c1160677b4..6e290f850328 100644
--- a/chart2/source/controller/dialogs/res_Trendline.hxx
+++ b/chart2/source/controller/dialogs/res_Trendline.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -81,3 +82,5 @@ private:
 
 // CHART2_RES_TRENDLINE_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
index be6500b54e93..15006901c577 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -181,11 +182,10 @@ void ThreeD_SceneAppearance_TabPage::applyRoundedEdgeAndObjectLinesToModel()
             break;
     }
 
-    // /-- locked controllers
+    // locked controllers
     ControllerLockHelperGuard aGuard( m_rControllerLockHelper );
     ThreeDHelper::setRoundedEdgesAndObjectLines(
         ::chart::ChartModelHelper::findDiagram( m_xChartModel ), nCurrentRoundedEdges, nObjectLines );
-    // \-- locked controllers
 }
 
 void ThreeD_SceneAppearance_TabPage::applyShadeModeToModel()
@@ -306,7 +306,7 @@ IMPL_LINK( ThreeD_SceneAppearance_TabPage, SelectSchemeHdl, void*, EMPTYARG )
         return 0;
 
     {
-        // /-- locked controllers
+        // locked controllers
         ControllerLockHelperGuard aGuard( m_rControllerLockHelper );
 
         uno::Reference< chart2::XDiagram > xDiagram( ::chart::ChartModelHelper::findDiagram( m_xChartModel ) );
@@ -317,9 +317,8 @@ IMPL_LINK( ThreeD_SceneAppearance_TabPage, SelectSchemeHdl, void*, EMPTYARG )
             ThreeDHelper::setScheme( xDiagram, ThreeDLookScheme_Simple );
         else
         {
-            OSL_ENSURE( false, "Invalid Entry selected" );
+            OSL_FAIL( "Invalid Entry selected" );
         }
-        // \-- locked controllers
     }
 
     // update other controls
@@ -361,3 +360,5 @@ IMPL_LINK( ThreeD_SceneAppearance_TabPage, SelectRoundedEdgeOrObjectLines, Check
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx
index 0e119d959c66..7ec53947dd52 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,9 +35,7 @@
 // header for class MetricField
 #include <vcl/field.hxx>
 // header for class CheckBox
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 // header for class ListBox
 #include <vcl/lstbox.hxx>
 #include <com/sun/star/drawing/ShadeMode.hpp>
@@ -97,3 +96,5 @@ private:
 //.............................................................................
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.src b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.src
index 47e43e8c45b3..5f193db7e252 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.src
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.src
@@ -99,4 +99,3 @@ TabPage TP_3D_SCENEAPPEARANCE
         Text [ en-US ] = "~Rounded edges" ;
     };
 };
-
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
index 0d3914460e78..8156c85522c4 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -47,7 +48,6 @@ namespace chart
 //.............................................................................
 
 using namespace ::com::sun::star;
-//using namespace ::com::sun::star::chart2;
 
 namespace
 {
@@ -100,7 +100,7 @@ ThreeD_SceneGeometry_TabPage::ThreeD_SceneGeometry_TabPage( Window* pWindow
     fYAngle = BaseGFXHelper::Rad2Deg( fYAngle );
     fZAngle = BaseGFXHelper::Rad2Deg( fZAngle );
 
-    DBG_ASSERT( fZAngle>=-90 && fZAngle<=90, "z angle is out of valid range" );
+    OSL_ENSURE( fZAngle>=-90 && fZAngle<=90, "z angle is out of valid range" );
 
     lcl_SetMetricFieldLimits( m_aMFZRotation, 90 );
 
@@ -296,3 +296,5 @@ IMPL_LINK( ThreeD_SceneGeometry_TabPage, RightAngledAxesToggled, void*, EMPTYARG
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx
index 95aeb7f6a02a..57e96cd02cdc 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -37,9 +38,7 @@
 // header for class MetricField
 #include <vcl/field.hxx>
 // header for class OKButton
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 
 #include "ControllerLockGuard.hxx"
 
@@ -110,3 +109,5 @@ private:
 //.............................................................................
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src
index 733212e6652a..ac277d34c4f9 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src
+++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src
@@ -151,4 +151,3 @@ TabPage TP_3D_SCENEGEOMETRY
         CustomUnitText = "%" ;
     };
 };
-
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index 1c75fcab7a0f..e6548b58d112 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,13 +34,10 @@
 #include "ResId.hxx"
 #include "Strings.hrc"
 #include "Bitmaps.hrc"
-#include "Bitmaps_HC.hrc"
 #include "CommonConverters.hxx"
 #include "NoWarningThisInCTOR.hxx"
 
-#ifndef _SVX_DIALOGS_HRC
 #include "svx/dialogs.hrc"
-#endif
 // header for define SVX_RES
 #include <svx/dialmgr.hxx>
 #include <rtl/math.hxx>
@@ -65,8 +63,7 @@ LightButton::LightButton( Window* pParent, const ResId& rResId, sal_Int32 nLight
             : ImageButton( pParent, rResId )
             , m_bLightOn(false)
 {
-    SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_OFF)   ), BMP_COLOR_NORMAL );
-    SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_OFF_H) ), BMP_COLOR_HIGHCONTRAST );
+    SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_OFF)   ) );
 
     String aTipHelpStr( SchResId(STR_TIP_LIGHTSOURCE_X) );
     rtl::OUString aTipHelp( aTipHelpStr  );
@@ -79,9 +76,11 @@ LightButton::LightButton( Window* pParent, const ResId& rResId, sal_Int32 nLight
     }
     this->SetQuickHelpText( String( aTipHelp ) );
 }
+
 LightButton::~LightButton()
 {
 }
+
 void LightButton::switchLightOn(bool bOn)
 {
     if( m_bLightOn==bOn )
@@ -89,15 +88,14 @@ void LightButton::switchLightOn(bool bOn)
     m_bLightOn = bOn;
     if(m_bLightOn)
     {
-        SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_ON)   ), BMP_COLOR_NORMAL );
-        SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_ON_H) ), BMP_COLOR_HIGHCONTRAST );
+        SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_ON) ) );
     }
     else
     {
-        SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_OFF)   ), BMP_COLOR_NORMAL );
-        SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_OFF_H) ), BMP_COLOR_HIGHCONTRAST );
+        SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_OFF) ) );
     }
 }
+
 bool LightButton::isLightOn() const
 {
     return m_bLightOn;
@@ -108,11 +106,10 @@ bool LightButton::isLightOn() const
 ColorButton::ColorButton( Window* pParent, const ResId& rResId )
             : ImageButton( pParent, rResId )
 {
-    SetModeImage( Image( SVX_RES(RID_SVXIMAGE_COLORDLG)   ), BMP_COLOR_NORMAL );
-    SetModeImage( Image( SVX_RES(RID_SVXIMAGE_COLORDLG_H) ), BMP_COLOR_HIGHCONTRAST );
-
+    SetModeImage( Image( SVX_RES(RID_SVXIMAGE_COLORDLG) ) );
     this->SetQuickHelpText( String( SchResId(STR_TIP_CHOOSECOLOR) ) );
 }
+
 ColorButton::~ColorButton()
 {
 }
@@ -149,12 +146,14 @@ LightSourceInfo::LightSourceInfo()
     aLightSource.aDirection = drawing::Direction3D(1,1,1);
     aLightSource.bIsEnabled = sal_False;
 }
+
 void LightSourceInfo::initButtonFromSource()
 {
     if(!pButton)
         return;
-    pButton->SetModeImage( Image( SVX_RES( aLightSource.bIsEnabled ? RID_SVXIMAGE_LIGHT_ON : RID_SVXIMAGE_LIGHT_OFF )   ), BMP_COLOR_NORMAL );
-    pButton->SetModeImage( Image( SVX_RES( aLightSource.bIsEnabled ? RID_SVXIMAGE_LIGHT_ON_H : RID_SVXIMAGE_LIGHT_OFF_H ) ), BMP_COLOR_HIGHCONTRAST );
+    pButton->SetModeImage( Image( SVX_RES(
+        aLightSource.bIsEnabled ? RID_SVXIMAGE_LIGHT_ON : RID_SVXIMAGE_LIGHT_OFF
+    ) ) );
 }
 
 //-----------------------------------------------------------------------------
@@ -205,7 +204,7 @@ namespace
             catch( const uno::Exception & ex )
             {
                 (void)(ex); // no warning in non-debug builds
-                OSL_ENSURE( false, ::rtl::OUStringToOString(
+                OSL_FAIL( ::rtl::OUStringToOString(
                                 ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Property Exception caught. Message: " )) +
                                 ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr());
             }
@@ -237,7 +236,7 @@ namespace
             catch( const uno::Exception & ex )
             {
                 (void)(ex); // no warning in non-debug builds
-                OSL_ENSURE( false, ::rtl::OUStringToOString(
+                OSL_FAIL( ::rtl::OUStringToOString(
                                 ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Property Exception caught. Message: " )) +
                                 ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr());
             }
@@ -256,7 +255,7 @@ namespace
         catch( const uno::Exception & ex )
         {
             (void)(ex); // no warning in non-debug builds
-            OSL_ENSURE( false, ::rtl::OUStringToOString(
+            OSL_FAIL( ::rtl::OUStringToOString(
                             ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Property Exception caught. Message: " )) +
                             ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr());
         }
@@ -276,7 +275,7 @@ namespace
         catch( const uno::Exception & ex )
         {
             (void)(ex); // no warning in non-debug builds
-            OSL_ENSURE( false, ::rtl::OUStringToOString(
+            OSL_FAIL( ::rtl::OUStringToOString(
                             ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Property Exception caught. Message: " )) +
                             ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr());
         }
@@ -354,8 +353,6 @@ ThreeD_SceneIllumination_TabPage::ThreeD_SceneIllumination_TabPage( Window* pWin
 
     ClickLightSourceButtonHdl(&m_aBtn_Light2);
 
-    //m_aDelyedModelChangeTimer.SetTimeout( 4*EDIT_UPDATEDATA_TIMEOUT );
-
     m_aModelChangeListener.startListening( uno::Reference< util::XModifyBroadcaster >(m_xSceneProperties, uno::UNO_QUERY) );
     m_aBtn_Light1.SetAccessibleRelationLabeledBy(&m_aFT_LightSource);
     m_aBtn_Light2.SetAccessibleRelationLabeledBy(&m_aFT_LightSource);
@@ -657,3 +654,5 @@ void ThreeD_SceneIllumination_TabPage::updatePreview()
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
index 8c104187797e..71c16c683bdf 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,9 +31,6 @@
 #include "ModifyListenerCallBack.hxx"
 #include "TimerTriggeredControllerLock.hxx"
 
-// #ifndef _COM_SUN_STAR_CHART2_SCENEDESCRIPTOR_HPP_
-// #include <com/sun/star/chart2/SceneDescriptor.hpp>
-// #endif
 #include <com/sun/star/beans/XPropertySet.hpp>
 
 // header for class TabPage
@@ -40,9 +38,7 @@
 // header for class FixedText
 #include <vcl/fixed.hxx>
 // header for class CheckBox
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 // header for class ColorLB
 #include <svx/dlgctrl.hxx>
 // header for class SvxLightCtl3D
@@ -143,3 +139,5 @@ private:
 //.............................................................................
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index e04857adbca2..4da8cd64b08c 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -327,3 +328,5 @@ IMPL_LINK ( SchAxisLabelTabPage, ToggleShowLabel, void *, EMPTYARG )
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.hxx b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
index 7da7e9a7471d..e56ed843fad6 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.hxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -99,3 +100,4 @@ public:
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
index 508bec302bf2..61cde8fabf56 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -36,9 +37,7 @@
 #include "NoWarningThisInCTOR.hxx"
 #include "AxisHelper.hxx"
 
-#ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
-#endif
 #include <rtl/math.hxx>
 // header for class SvxDoubleItem
 #include <svx/chrtitem.hxx>
@@ -500,3 +499,5 @@ IMPL_LINK ( AxisPositionsTabPage, PlaceLabelsSelectHdl, void *, EMPTYARG )
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.hxx b/chart2/source/controller/dialogs/tp_AxisPositions.hxx
index ba23268e6c38..5bfc694b8939 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.hxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,7 +35,6 @@
 #include <vcl/button.hxx>
 #include <vcl/field.hxx>
 #include <vcl/lstbox.hxx>
-//class SvNumberFormatter;
 
 //.............................................................................
 namespace chart
@@ -110,3 +110,5 @@ private: //member:
 //.............................................................................
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 7919820b2100..f2eba3d58fe8 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,9 +40,7 @@
 #include "ControllerLockGuard.hxx"
 #include "macros.hxx"
 
-#ifndef _SVT_CONTROLDIMS_HRC_
 #include <svtools/controldims.hrc>
-#endif
 
 // header for define RET_OK
 #include <vcl/msgbox.hxx>
@@ -57,15 +56,6 @@ namespace chart
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
 
-// macro for selecting a normal or high contrast bitmap the stack variable
-// bIsHighContrast must exist and reflect the correct state
-#define SELECT_BITMAP(name) Bitmap( SchResId( bIsHighContrast ? name ## _HC : name ))
-#define SELECT_IMAGE(name) Image( SchResId( bIsHighContrast ? name ## _HC : name ))
-
-//--------------------------------------------------------------------------
-//--------------------------------------------------------------------------
-//--------------------------------------------------------------------------
-
 namespace
 {
     long lcl_getDistance()
@@ -856,8 +846,6 @@ ChartTypeTabPage::ChartTypeTabPage( Window* pParent
     m_aSubTypeList.SetColCount(4);
     m_aSubTypeList.SetLineCount(1);
 
-    bool bIsHighContrast = ( true && GetSettings().GetStyleSettings().GetHighContrastMode() );
-
     bool bDisableComplexChartTypes = false;
     uno::Reference< beans::XPropertySet > xProps( m_xChartModel, uno::UNO_QUERY );
     if ( xProps.is() )
@@ -891,9 +879,9 @@ ChartTypeTabPage::ChartTypeTabPage( Window* pParent
 
     ::std::vector< ChartTypeDialogController* >::const_iterator       aIter = m_aChartTypeDialogControllerList.begin();
     const ::std::vector< ChartTypeDialogController* >::const_iterator aEnd  = m_aChartTypeDialogControllerList.end();
-    for( ; aIter != aEnd; aIter++ )
+    for( ; aIter != aEnd; ++aIter )
     {
-        m_aMainTypeList.InsertEntry( (*aIter)->getName(), (*aIter)->getImage( bIsHighContrast ) );
+        m_aMainTypeList.InsertEntry( (*aIter)->getName(), (*aIter)->getImage() );
         (*aIter)->setChangeListener( this );
     }
 
@@ -912,7 +900,7 @@ ChartTypeTabPage::~ChartTypeTabPage()
     //delete all dialog controller
     ::std::vector< ChartTypeDialogController* >::const_iterator       aIter = m_aChartTypeDialogControllerList.begin();
     const ::std::vector< ChartTypeDialogController* >::const_iterator aEnd  = m_aChartTypeDialogControllerList.end();
-    for( ; aIter != aEnd; aIter++ )
+    for( ; aIter != aEnd; ++aIter )
     {
         delete *aIter;
     }
@@ -1092,8 +1080,7 @@ void ChartTypeTabPage::fillAllControls( const ChartTypeParameter& rParameter, bo
     m_nChangingCalls++;
     if( m_pCurrentMainType && bAlsoResetSubTypeList )
     {
-        bool bIsHighContrast = ( true && GetSettings().GetStyleSettings().GetHighContrastMode() );
-        m_pCurrentMainType->fillSubTypeList( m_aSubTypeList, bIsHighContrast, rParameter );
+        m_pCurrentMainType->fillSubTypeList( m_aSubTypeList, rParameter );
     }
     m_aSubTypeList.SelectItem( static_cast<sal_uInt16>( rParameter.nSubTypeIndex) );
     m_pAxisTypeResourceGroup->fillControls( rParameter );
@@ -1120,7 +1107,7 @@ void ChartTypeTabPage::initializePage()
 
     ::std::vector< ChartTypeDialogController* >::iterator             aIter = m_aChartTypeDialogControllerList.begin();
     const ::std::vector< ChartTypeDialogController* >::const_iterator aEnd  = m_aChartTypeDialogControllerList.end();
-    for( sal_uInt16 nM=0; aIter != aEnd; aIter++, nM++ )
+    for( sal_uInt16 nM=0; aIter != aEnd; ++aIter, ++nM )
     {
         if( (*aIter)->isSubType(aServiceName) )
         {
@@ -1186,3 +1173,5 @@ uno::Reference< XChartTypeTemplate > ChartTypeTabPage::getCurrentTemplate() cons
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/tp_ChartType.hxx b/chart2/source/controller/dialogs/tp_ChartType.hxx
index b40cbb1956db..ecf0a2344484 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.hxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -123,3 +124,5 @@ protected:
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/tp_DataLabel.cxx b/chart2/source/controller/dialogs/tp_DataLabel.cxx
index 9b94ae18b7a6..78b730cfb9ed 100644
--- a/chart2/source/controller/dialogs/tp_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_DataLabel.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -72,3 +73,5 @@ void DataLabelsTabPage::SetNumberFormatter( SvNumberFormatter* pFormatter )
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/tp_DataLabel.hxx b/chart2/source/controller/dialogs/tp_DataLabel.hxx
index 9a3ac3cbd7c8..5c40ec6872f4 100644
--- a/chart2/source/controller/dialogs/tp_DataLabel.hxx
+++ b/chart2/source/controller/dialogs/tp_DataLabel.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -62,3 +63,5 @@ private:
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 2eaf97767fa5..d18fe55d2951 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -1038,11 +1039,6 @@ bool DataSourceTabPage::updateModelFromControl( Edit * pField )
                                 xLabeledSeq->setValues( xNewSeq );
                             }
                         }
-                        else if( xLabeledSeq.is())
-                        {
-                            // values cannot be deleted. This would also delete the Role (for labels)
-//                             xLabeledSeq->setValues( Reference< data::XDataSequence >());
-                        }
                     }
                 }
 
@@ -1076,3 +1072,5 @@ bool DataSourceTabPage::updateModelFromControl( Edit * pField )
 }
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/tp_DataSource.hxx b/chart2/source/controller/dialogs/tp_DataSource.hxx
index f7826ef744e5..f606e9899e66 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.hxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -37,9 +38,7 @@
 // header for class ListBox
 #include <vcl/lstbox.hxx>
 // header for class PushButton, OKButton, CancelButton, HelpButton
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 // header for class FixedText, FixedLine
 #include <vcl/fixed.hxx>
 // header for class SvTabListBox
@@ -177,3 +176,5 @@ private:
 
 // CHART2_DATASOURCETABPAGE_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/tp_DataSourceControls.cxx b/chart2/source/controller/dialogs/tp_DataSourceControls.cxx
index b6f7ad680591..72aa5cfb25c6 100644
--- a/chart2/source/controller/dialogs/tp_DataSourceControls.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSourceControls.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -55,3 +56,5 @@ SvLBoxEntry* SeriesListBox::CreateEntry() const
 }
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/tp_DataSourceControls.hxx b/chart2/source/controller/dialogs/tp_DataSourceControls.hxx
index c1ebf512911c..2e38adc262c3 100644
--- a/chart2/source/controller/dialogs/tp_DataSourceControls.hxx
+++ b/chart2/source/controller/dialogs/tp_DataSourceControls.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -68,3 +69,5 @@ public:
 
 // CHART2_TP_DATASOURCECONTROLS_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.cxx b/chart2/source/controller/dialogs/tp_ErrorBars.cxx
index 71c843dfb313..0c945846af44 100644
--- a/chart2/source/controller/dialogs/tp_ErrorBars.cxx
+++ b/chart2/source/controller/dialogs/tp_ErrorBars.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -98,3 +99,5 @@ void ErrorBarsTabPage::SetChartDocumentForRangeChoosing(
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.hxx b/chart2/source/controller/dialogs/tp_ErrorBars.hxx
index ec33c66108a9..1d7c291f4fb3 100644
--- a/chart2/source/controller/dialogs/tp_ErrorBars.hxx
+++ b/chart2/source/controller/dialogs/tp_ErrorBars.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -63,3 +64,5 @@ private:
 //.............................................................................
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.cxx b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
index 049b78d9b6f5..8cbdc35b1d44 100644
--- a/chart2/source/controller/dialogs/tp_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -87,3 +88,5 @@ void SchLegendPosTabPage::Reset(const SfxItemSet& rInAttrs)
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.hxx b/chart2/source/controller/dialogs/tp_LegendPosition.hxx
index 479a3993aa19..6140e7395623 100644
--- a/chart2/source/controller/dialogs/tp_LegendPosition.hxx
+++ b/chart2/source/controller/dialogs/tp_LegendPosition.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -67,3 +68,4 @@ public:
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.src b/chart2/source/controller/dialogs/tp_LegendPosition.src
index 1ac64330108a..2b0f93892fa9 100644
--- a/chart2/source/controller/dialogs/tp_LegendPosition.src
+++ b/chart2/source/controller/dialogs/tp_LegendPosition.src
@@ -34,12 +34,14 @@ TabPage TP_LEGEND_POS
     HelpID = HID_SCH_LEGEND_POS ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 260 , 185 ) ;
+
     FixedLine GRP_LEGEND
     {
         Pos = MAP_APPFONT ( 6 , 3  ) ;
         Size = MAP_APPFONT ( 248 , 8 ) ;
         Text [ en-US ] = "Position" ;
     };
+
     RESOURCE_LEGENDPOSITION( 12, 14 )
 
     FixedLine FL_LEGEND_TEXTORIENT
@@ -48,12 +50,14 @@ TabPage TP_LEGEND_POS
         Size = MAP_APPFONT ( 248 , 8 ) ;
         Text [ en-US ] = "Text orientation" ;
     };
+
     FixedText FT_LEGEND_TEXTDIR
     {
         Pos = MAP_APPFONT ( 12 , 14 + RESOURCE_LEGENDPOSITION_HEIGHT + 19 ) ;
         Size = MAP_APPFONT ( 64 , 8 ) ;
         Text [ en-US ] = "Te~xt direction" ;
     };
+
     ListBox LB_LEGEND_TEXTDIR
     {
         HelpID = "chart2:ListBox:TP_LEGEND_POS:LB_LEGEND_TEXTDIR";
diff --git a/chart2/source/controller/dialogs/tp_Location.cxx b/chart2/source/controller/dialogs/tp_Location.cxx
deleted file mode 100644
index a8a4d1317be8..000000000000
--- a/chart2/source/controller/dialogs/tp_Location.cxx
+++ /dev/null
@@ -1,71 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
-
-#include "tp_Location.hxx"
-#include "tp_Location.hrc"
-#include "ResId.hxx"
-#include "Strings.hrc"
-#include "NoWarningThisInCTOR.hxx"
-
-//.............................................................................
-namespace chart
-{
-//.............................................................................
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::chart2;
-
-#ifdef LOCATION_PAGE
-
-LocationTabPage::LocationTabPage( svt::OWizardMachine* pParent
-        , const uno::Reference< XChartDocument >& xChartModel
-        , const uno::Reference< uno::XComponentContext >& xContext )
-        : OWizardPage( pParent, SchResId(TP_LOCATION) )
-        , m_aFL_Table( this, SchResId( FL_TABLE ) )
-        , m_aFT_Table( this, SchResId( FT_TABLE ) )
-        , m_aLB_Table( this, SchResId( LB_TABLE ) )
-        , m_xChartModel( xChartModel )
-        , m_xCC( xContext )
-{
-    FreeResource();
-    this->SetText( String( SchResId( STR_PAGE_CHART_LOCATION ) ) );
-}
-
-LocationTabPage::~LocationTabPage()
-{
-}
-
-bool LocationTabPage::canAdvance() const
-{
-    return false;
-}
-#endif
-//.............................................................................
-} //namespace chart
-//.............................................................................
diff --git a/chart2/source/controller/dialogs/tp_Location.hrc b/chart2/source/controller/dialogs/tp_Location.hrc
deleted file mode 100644
index 419daa68721f..000000000000
--- a/chart2/source/controller/dialogs/tp_Location.hrc
+++ /dev/null
@@ -1,32 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "ResourceIds.hrc"
-
-#define FL_TABLE    1
-#define FT_TABLE    1
-#define LB_TABLE    1
diff --git a/chart2/source/controller/dialogs/tp_Location.hxx b/chart2/source/controller/dialogs/tp_Location.hxx
deleted file mode 100644
index 4b5b2c24727d..000000000000
--- a/chart2/source/controller/dialogs/tp_Location.hxx
+++ /dev/null
@@ -1,76 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _CHART2_TP_LOCATION_HXX
-#define _CHART2_TP_LOCATION_HXX
-
-#include <com/sun/star/chart2/XChartDocument.hpp>
-#include <svtools/wizardmachine.hxx>
-
-// header for class FixedText, FixedLine
-#include <vcl/fixed.hxx>
-// header for class ListBox
-#include <vcl/lstbox.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
-
-//.............................................................................
-namespace chart
-{
-//.............................................................................
-
-//-----------------------------------------------------------------------------
-/**
-*/
-#ifdef LOCATION_PAGE
-class LocationTabPage : public svt::OWizardPage
-{
-public:
-    LocationTabPage( svt::OWizardMachine* pParent
-                , const ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::XChartDocument >& xChartModel
-                , const ::com::sun::star::uno::Reference<
-                ::com::sun::star::uno::XComponentContext >& xContext );
-    virtual ~LocationTabPage();
-
-    virtual bool        canAdvance() const;
-
-protected:
-    FixedLine     m_aFL_Table;
-    FixedText     m_aFT_Table;
-    ListBox       m_aLB_Table;
-
-    ::com::sun::star::uno::Reference<
-                       ::com::sun::star::chart2::XChartDocument >   m_xChartModel;
-    ::com::sun::star::uno::Reference<
-                       ::com::sun::star::uno::XComponentContext>    m_xCC;
-};
-#endif
-
-//.............................................................................
-} //namespace chart
-//.............................................................................
-#endif
diff --git a/chart2/source/controller/dialogs/tp_Location.src b/chart2/source/controller/dialogs/tp_Location.src
deleted file mode 100644
index be0033d436dd..000000000000
--- a/chart2/source/controller/dialogs/tp_Location.src
+++ /dev/null
@@ -1,75 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#include "HelpIds.hrc"
-#include "tp_Location.hrc"
-#include "dlg_CreationWizard.hrc"
-
-#ifndef _SVT_CONTROLDIMS_HRC_
-#include <svtools/controldims.hrc>
-#endif
-
-#define MASKCOLOR MaskColor = Color { Red = 0xC000 ; Green = 0xC000 ; Blue = 0xC000 ; }
-#define WIZ_POSX1 6
-#define WIZ_POSY1 6
-#define WIZ_POSX2 (6+4)
-#define WIZ_POSY2 (WIZ_POSY1+RSC_CD_FIXEDTEXT_HEIGHT+4)
-#define TEXT_WIDTH 50
-#define WIZ_POSX3 (WIZ_POSX2+TEXT_WIDTH+6)
-#define WIZ_FIXEDLINE_WIDTH (CHART_WIZARD_PAGEWIDTH-WIZ_POSX1-6)
-#define WIZ_LISTBOX_WIDTH (CHART_WIZARD_PAGEWIDTH-WIZ_POSX2-TEXT_WIDTH-6-6)
-
-
-TabPage TP_LOCATION
-{
-    HelpID = "chart2:TabPage:TP_LOCATION";
-    Hide = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( CHART_WIZARD_PAGEWIDTH , CHART_WIZARD_PAGEHEIGHT ) ;
-
-    FixedLine FL_TABLE
-    {
-        Pos = MAP_APPFONT ( WIZ_POSX1 , WIZ_POSY1 ) ;
-        Size = MAP_APPFONT ( WIZ_FIXEDLINE_WIDTH , RSC_CD_FIXEDTEXT_HEIGHT ) ;
-
-        Text [ en-US ] = "Place chart" ;
-    };
-    FixedText FT_TABLE
-    {
-        Pos = MAP_APPFONT ( WIZ_POSX2 , WIZ_POSY2 ) ;
-        Size = MAP_APPFONT ( TEXT_WIDTH , RSC_CD_FIXEDTEXT_HEIGHT ) ;
-
-        Text [ en-US ] = "~Insert in sheet" ;
-    };
-    ListBox LB_TABLE
-    {
-        HelpID = "chart2:ListBox:TP_LOCATION:LB_TABLE";
-        Border = TRUE ;
-        DropDown = TRUE ;
-        Pos = MAP_APPFONT ( WIZ_POSX3 , WIZ_POSY2 ) ;
-        Size = MAP_APPFONT ( WIZ_LISTBOX_WIDTH , RSC_CD_FIXEDTEXT_HEIGHT ) ;
-    };
-};
diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.cxx b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
index 298ae43ef8d6..1dd218a71d30 100644
--- a/chart2/source/controller/dialogs/tp_PointGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -102,3 +103,5 @@ void SchLayoutTabPage::Reset(const SfxItemSet& rInAttrs)
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.hxx b/chart2/source/controller/dialogs/tp_PointGeometry.hxx
index a18c3a945254..8a868158cf09 100644
--- a/chart2/source/controller/dialogs/tp_PointGeometry.hxx
+++ b/chart2/source/controller/dialogs/tp_PointGeometry.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -56,3 +57,4 @@ private:
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.cxx b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
index b682cd304762..a915a6e2604f 100644
--- a/chart2/source/controller/dialogs/tp_PolarOptions.cxx
+++ b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -86,11 +87,9 @@ void PolarOptionsTabPage::Reset(const SfxItemSet& rInAttrs)
 {
     const SfxPoolItem *pPoolItem = NULL;
 
-    long nTmp;
     if (rInAttrs.GetItemState(SCHATTR_STARTING_ANGLE, sal_True, &pPoolItem) == SFX_ITEM_SET)
     {
-        nTmp = (long)((const SfxInt32Item*)pPoolItem)->GetValue();
-
+        long nTmp = (long)((const SfxInt32Item*)pPoolItem)->GetValue();
         m_aAngleDial.SetRotation( nTmp*100 );
     }
     else
@@ -124,3 +123,5 @@ void PolarOptionsTabPage::Reset(const SfxItemSet& rInAttrs)
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.hxx b/chart2/source/controller/dialogs/tp_PolarOptions.hxx
index 3ac1c70c2736..51a0e5c9ec3c 100644
--- a/chart2/source/controller/dialogs/tp_PolarOptions.hxx
+++ b/chart2/source/controller/dialogs/tp_PolarOptions.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -65,3 +66,5 @@ private:
 //.............................................................................
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index a59f5949c0bb..9ae9ab4579fd 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -185,9 +186,7 @@ void RangeChooserTabPage::initControlsFromModel()
     m_nChangingControlCalls++;
 
     if(m_pTemplateProvider)
-    {
         m_xCurrentChartTypeTemplate = m_pTemplateProvider->getCurrentTemplate();
-    }
 
     bool bUseColumns = ! m_aRB_Rows.IsChecked();
     bool bFirstCellAsLabel = bUseColumns ? m_aCB_FirstRowAsLabel.IsChecked() : m_aCB_FirstColumnAsLabel.IsChecked();
@@ -247,7 +246,7 @@ void RangeChooserTabPage::changeDialogModelAccordingToControls()
             m_xCurrentChartTypeTemplate.set( m_pTemplateProvider->getCurrentTemplate());
         if( !m_xCurrentChartTypeTemplate.is())
         {
-            OSL_ENSURE( false, "Need a template to change data source" );
+            OSL_FAIL( "Need a template to change data source" );
             return;
         }
     }
@@ -412,3 +411,5 @@ void RangeChooserTabPage::setDirty()
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.hxx b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
index 4d985669195c..32db55b345a2 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.hxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -122,3 +123,5 @@ protected: //member
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx
index 62f2aee5e076..26e304390724 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -36,9 +37,7 @@
 #include "NoWarningThisInCTOR.hxx"
 #include "AxisHelper.hxx"
 
-#ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
-#endif
 #include <rtl/math.hxx>
 // header for class SvxDoubleItem
 #include <svx/chrtitem.hxx>
@@ -184,6 +183,8 @@ ScaleTabPage::ScaleTabPage(Window* pWindow,const SfxItemSet& rInAttrs) :
     aFmtFldMax.SetModifyHdl(LINK(this, ScaleTabPage, FmtFieldModifiedHdl));
     aFmtFldStepMain.SetModifyHdl(LINK(this, ScaleTabPage, FmtFieldModifiedHdl));
     aFmtFldOrigin.SetModifyHdl(LINK(this, ScaleTabPage, FmtFieldModifiedHdl));
+
+    HideAllControls();
 }
 
 IMPL_LINK( ScaleTabPage, FmtFieldModifiedHdl, FormattedField*, pFmtFied )
@@ -418,7 +419,7 @@ SfxTabPage* ScaleTabPage::Create(Window* pWindow,const SfxItemSet& rOutAttrs)
 
 sal_Bool ScaleTabPage::FillItemSet(SfxItemSet& rOutAttrs)
 {
-    DBG_ASSERT( pNumFormatter, "No NumberFormatter available" );
+    OSL_PRECOND( pNumFormatter, "No NumberFormatter available" );
 
     rOutAttrs.Put(SfxInt32Item(SCHATTR_AXISTYPE, m_nAxisType));
     if(m_bAllowDateAxis)
@@ -453,7 +454,7 @@ sal_Bool ScaleTabPage::FillItemSet(SfxItemSet& rOutAttrs)
 
 void ScaleTabPage::Reset(const SfxItemSet& rInAttrs)
 {
-    DBG_ASSERT( pNumFormatter, "No NumberFormatter available" );
+    OSL_PRECOND( pNumFormatter, "No NumberFormatter available" );
     if(!pNumFormatter)
         return;
 
@@ -568,7 +569,7 @@ int ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet)
 {
     if( !pNumFormatter )
     {
-        DBG_ERROR( "No NumberFormatter available" );
+        OSL_FAIL( "No NumberFormatter available" );
         return LEAVE_PAGE;
     }
 
@@ -580,7 +581,7 @@ int ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet)
         nIndex = static_cast< sal_uInt32 >( static_cast< const SfxInt32Item* >(pPoolItem)->GetValue());
     else
     {
-        OSL_ENSURE( false, "Using Standard Language" );
+        OSL_FAIL( "Using Standard Language" );
     }
 
     Control* pControl = NULL;
@@ -698,7 +699,7 @@ void ScaleTabPage::SetNumFormatter( SvNumberFormatter* pFormatter )
     aFmtFldStepMain.SetFormatter( pNumFormatter );
     aFmtFldOrigin.SetFormatter( pNumFormatter );
 
-    // #101318#, #i6278# allow more decimal places than the output format.  As
+    // #i6278# allow more decimal places than the output format.  As
     // the numbers shown in the edit fields are used for input, it makes more
     // sense to display the values in the input format rather than the output
     // format.
@@ -785,6 +786,51 @@ bool ScaleTabPage::ShowWarning( sal_uInt16 nResIdMessage, Control* pControl /* =
     return true;
 }
 
+void ScaleTabPage::HideAllControls()
+{
+    // We need to set these controls invisible when the class is instantiated
+    // since some code in EnableControls() depends on that logic. The real
+    // visibility of these controls depend on axis data type, and are
+    // set in EnableControls().
+
+    m_aTxt_AxisType.Hide();
+    m_aLB_AxisType.Hide();
+
+    aCbxLogarithm.Hide();
+    aTxtMin.Hide();
+    aFmtFldMin.Hide();
+    aCbxAutoMin.Hide();
+    aTxtMax.Hide();
+    aFmtFldMax.Hide();
+    aCbxAutoMax.Hide();
+    aTxtMain.Hide();
+    aFmtFldStepMain.Hide();
+    aCbxAutoStepMain.Hide();
+    aTxtHelp.Hide();
+    aTxtHelpCount.Hide();
+    aMtStepHelp.Hide();
+    aCbxAutoStepHelp.Hide();
+
+    aTxtOrigin.Hide();
+    aFmtFldOrigin.Hide();
+    aCbxAutoOrigin.Hide();
+
+    aTxtHelpCount.Hide();
+    aTxtHelp.Hide();
+
+    m_aTxt_TimeResolution.Hide();
+    m_aLB_TimeResolution.Hide();
+    m_aCbx_AutoTimeResolution.Hide();
+
+    aFmtFldStepMain.Hide();
+    m_aMt_MainDateStep.Hide();
+
+    m_aLB_MainTimeUnit.Hide();
+    m_aLB_HelpTimeUnit.Hide();
+}
+
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/tp_Scale.hrc b/chart2/source/controller/dialogs/tp_Scale.hrc
index bde6c21c7924..4e40ca586fcc 100644
--- a/chart2/source/controller/dialogs/tp_Scale.hrc
+++ b/chart2/source/controller/dialogs/tp_Scale.hrc
@@ -60,4 +60,3 @@
 #define LB_HELP_TIME_UNIT   3
 #define LB_TIME_RESOLUTION  4
 
-#define STR_LIST_TIME_UNIT  1
diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx
index a6892656ad7b..0a56b4f7a0bd 100644
--- a/chart2/source/controller/dialogs/tp_Scale.hxx
+++ b/chart2/source/controller/dialogs/tp_Scale.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -137,6 +138,8 @@ private:
         @return false, if nResIdMessage was 0, true otherwise
      */
     bool ShowWarning( sal_uInt16 nResIdMessage, Control* pControl = NULL );
+
+    void HideAllControls();
 };
 
 //.............................................................................
@@ -145,3 +148,4 @@ private:
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/tp_Scale.src b/chart2/source/controller/dialogs/tp_Scale.src
index 0b0e7efcdb9c..eb27b586f24b 100755..100644
--- a/chart2/source/controller/dialogs/tp_Scale.src
+++ b/chart2/source/controller/dialogs/tp_Scale.src
@@ -67,7 +67,7 @@ TabPage TP_SCALE
         Size = MAP_APPFONT ( 248 , 8 ) ;
         Text [ en-US ] = "Scale" ;
     };
-    //---------------------------
+
     CheckBox CBX_REVERSE
     {
         HelpID = "chart2:CheckBox:TP_SCALE:CBX_REVERSE:ValueAxis";
@@ -118,6 +118,7 @@ TabPage TP_SCALE
         Size = MAP_APPFONT ( LABELWIDTH , 8 ) ;
         Text [ en-US ] = "~Minimum" ;
     };
+
     SpinField EDT_MIN
     {
         HelpID = "chart2:SpinField:TP_SCALE:EDT_MIN";
@@ -127,6 +128,7 @@ TabPage TP_SCALE
         Size = MAP_APPFONT ( EDITWIDTH , 12 ) ;
         TabStop = TRUE ;
     };
+
     CheckBox CBX_AUTO_MIN
     {
         HelpID = "chart2:CheckBox:TP_SCALE:CBX_AUTO_MIN";
@@ -135,13 +137,14 @@ TabPage TP_SCALE
         TabStop = TRUE ;
         Text [ en-US ] = "~Automatic" ;
     };
-    //---------------------------
+
     FixedText TXT_MAX
     {
         Pos = MAP_APPFONT ( X2 , Y4  ) ;
         Size = MAP_APPFONT ( LABELWIDTH , 8 ) ;
         Text [ en-US ] = "Ma~ximum" ;
     };
+
     SpinField EDT_MAX
     {
         HelpID = "chart2:SpinField:TP_SCALE:EDT_MAX";
@@ -151,6 +154,7 @@ TabPage TP_SCALE
         Size = MAP_APPFONT ( EDITWIDTH , 12 ) ;
         TabStop = TRUE ;
     };
+
     CheckBox CBX_AUTO_MAX
     {
         HelpID = "chart2:CheckBox:TP_SCALE:CBX_AUTO_MAX";
@@ -195,6 +199,7 @@ TabPage TP_SCALE
         Size = MAP_APPFONT ( LABELWIDTH , 8 ) ;
         Text [ en-US ] = "Ma~jor interval" ;
     };
+
     SpinField EDT_STEP_MAIN
     {
         HelpID = "chart2:SpinField:TP_SCALE:EDT_STEP_MAIN";
@@ -257,6 +262,7 @@ TabPage TP_SCALE
         Size = MAP_APPFONT ( LABELWIDTH , 8 ) ;
         Text [ en-US ] = "Minor inter~val" ;
     };
+
     MetricField MT_STEPHELP
     {
         HelpID = "chart2:MetricField:TP_SCALE:MT_STEPHELP";
@@ -296,13 +302,14 @@ TabPage TP_SCALE
         TabStop = TRUE ;
         Text [ en-US ] = "Aut~omatic" ;
     };
-    //---------------------------
+
     FixedText TXT_ORIGIN
     {
         Pos = MAP_APPFONT ( X2 , Y7  ) ;
         Size = MAP_APPFONT ( LABELWIDTH , 8 ) ;
         Text [ en-US ] = "Re~ference value" ;
     };
+
     SpinField EDT_ORIGIN
     {
         HelpID = "chart2:SpinField:TP_SCALE:EDT_ORIGIN";
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
index aec48d5e6ce7..c3f00f1c2ace 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -311,3 +312,5 @@ void SchOptionTabPage::AdaptControlPositionsAndVisibility()
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
index 86a5280a00aa..f09b24814511 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,9 +33,7 @@
 // header for FixedText
 #include <vcl/fixed.hxx>
 // header for CheckBox
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 // header for MetricField
 #include <vcl/field.hxx>
 
@@ -93,3 +92,5 @@ private: //member
 //.............................................................................
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.src b/chart2/source/controller/dialogs/tp_SeriesToAxis.src
index 844c81bd2e64..f307d4750062 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.src
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.src
@@ -33,12 +33,14 @@ TabPage TP_OPTIONS
     Hide = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 260 , 185 ) ;
+
     FixedLine 1
     {
         Pos = MAP_APPFONT ( 6 , 6  ) ;
         Size = MAP_APPFONT ( 248 , 8 ) ;
         Text [ en-US ] = "Align data series to";
     };
+
     RadioButton RBT_OPT_AXIS_1
     {
         HelpID = "chart2:RadioButton:TP_OPTIONS:RBT_OPT_AXIS_1";
@@ -47,6 +49,7 @@ TabPage TP_OPTIONS
         TabStop = TRUE ;
         Text [ en-US ] = "Primary Y axis";
     };
+
     RadioButton RBT_OPT_AXIS_2
     {
         HelpID = "chart2:RadioButton:TP_OPTIONS:RBT_OPT_AXIS_2";
@@ -62,6 +65,7 @@ TabPage TP_OPTIONS
         Size = MAP_APPFONT ( 248 , 8 ) ;
         Text [ en-US ] = "Settings";
     };
+
     FixedText FT_OVERLAP
     {
         Pos = MAP_APPFONT ( 12 , 80 ) ;
@@ -82,7 +86,7 @@ TabPage TP_OPTIONS
         Maximum = 100 ;
         StrictFormat = TRUE ;
         Unit = FUNIT_CUSTOM ;
-        CustomUnitText  = " %" ;
+        CustomUnitText  = "%" ;
         First = 1 ;
         Last = 100 ;
         SpinSize = 1 ;
@@ -109,7 +113,7 @@ TabPage TP_OPTIONS
         Maximum = 600 ;
         StrictFormat = TRUE ;
         Unit = FUNIT_CUSTOM ;
-        CustomUnitText  = " %" ;
+        CustomUnitText  = "%" ;
         First = 1 ;
         Last = 100 ;
         SpinSize = 1 ;
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
index 9d87f4979ebc..8e9e66e30f03 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -90,7 +91,7 @@ SfxTabPage* SchAlignmentTabPage::CreateWithoutRotation(Window* pParent,
 
 sal_Bool SchAlignmentTabPage::FillItemSet(SfxItemSet& rOutAttrs)
 {
-    //Seit 4/1998 koennen Texte frei gedreht werden: SCHATTR_TEXT_DEGREES
+    //Since 04/1998 text can be rotated by an arbitrary angle: SCHATTR_TEXT_DEGREES
     bool bStacked = aOrientHlp.GetStackedState() == STATE_CHECK;
     rOutAttrs.Put( SfxBoolItem( SCHATTR_TEXT_STACKED, bStacked ) );
 
@@ -124,3 +125,4 @@ void SchAlignmentTabPage::Reset(const SfxItemSet& rInAttrs)
 //.............................................................................
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.hxx b/chart2/source/controller/dialogs/tp_TitleRotation.hxx
index ae782a792864..87c3e43a914a 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.hxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -67,3 +68,5 @@ public:
 //.............................................................................
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.src b/chart2/source/controller/dialogs/tp_TitleRotation.src
index 2ac0355d39af..c77d915fa583 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.src
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.src
@@ -24,6 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+
 #include "HelpIds.hrc"
 #include "TabPages.hrc"
 
@@ -90,4 +91,3 @@ TabPage TP_ALIGNMENT
         DropDown = TRUE;
     };
 };
-
diff --git a/chart2/source/controller/dialogs/tp_Trendline.cxx b/chart2/source/controller/dialogs/tp_Trendline.cxx
index f336a620c8a4..f64e40f8f5a9 100644
--- a/chart2/source/controller/dialogs/tp_Trendline.cxx
+++ b/chart2/source/controller/dialogs/tp_Trendline.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -75,3 +76,5 @@ void TrendlineTabPage::DataChanged( const DataChangedEvent& rDCEvt )
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/tp_Trendline.hxx b/chart2/source/controller/dialogs/tp_Trendline.hxx
index bd7f97a3c8e8..f2a1ac94b395 100644
--- a/chart2/source/controller/dialogs/tp_Trendline.hxx
+++ b/chart2/source/controller/dialogs/tp_Trendline.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -57,3 +58,5 @@ private:
 //.............................................................................
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
index 03988116854e..6802f501ba85 100644
--- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
+++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -134,8 +135,6 @@ sal_Bool TitlesAndObjectsTabPage::commitPage( ::svt::WizardTypes::CommitPageReas
 
 void TitlesAndObjectsTabPage::commitToModel()
 {
-    bool bChanged = false;
-
     m_aTimerTriggeredControllerLock.startTimer();
     uno::Reference< frame::XModel >  xModel( m_xChartModel, uno::UNO_QUERY);
 
@@ -145,13 +144,12 @@ void TitlesAndObjectsTabPage::commitToModel()
     {
         TitleDialogData aTitleOutput;
         m_apTitleResources->readFromResources( aTitleOutput );
-        bChanged = bChanged || aTitleOutput.writeDifferenceToModel( xModel, m_xCC );
+        aTitleOutput.writeDifferenceToModel( xModel, m_xCC );
         m_apTitleResources->ClearModifyFlag();
     }
 
     //commit legend changes to model
     {
-        bChanged = true;
         m_apLegendPositionResources->writeToModel( xModel );
     }
 
@@ -185,3 +183,5 @@ bool TitlesAndObjectsTabPage::canAdvance() const
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hrc b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hrc
index 44c340139782..c7802d403aef 100644
--- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hrc
+++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hrc
@@ -27,19 +27,6 @@
 
 #include "ResourceIds.hrc"
 
-/*
-#define ED_MAINTITLE    1
-#define ED_SUBTITLE     2
-#define ED_X_AXIS       3
-#define ED_Y_AXIS       4
-#define ED_Z_AXIS       5
-#define FT_MAINTITLE    1
-#define FT_SUBTITLE     2
-#define FT_TITLE_X_AXIS 3
-#define FT_TITLE_Y_AXIS 4
-#define FT_TITLE_Z_AXIS 5
-*/
-
 #define FT_TITLEDESCRIPTION 30
 
 #define FL_VERTICAL 3
diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
index 1cd9c6162a46..11daa6bffcf0 100644
--- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
+++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -91,3 +92,5 @@ protected:
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
index 102393dd59f8..56ee37614ba4 100644
--- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
+++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -48,9 +49,7 @@
 // header for class SvxForbiddenCharactersTable
 #include <editeng/forbiddencharacterstable.hxx>
 
-#ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
-#endif
 
 // header for class SvxShape
 #include <svx/unoshape.hxx>
@@ -119,48 +118,12 @@ OutputDevice * lcl_GetParentRefDevice( const uno::Reference< frame::XModel > & x
 
 }
 
-    /*
-void lcl_initOutliner( SdrOutliner* pTargetOutliner, SdrOutliner* pSourceOutliner )
-{
-    //just an unsuccessful try to initialize the text edit outliner correctly
-    //if( bInit )
-    {
-        pTargetOutliner->EraseVirtualDevice();
-        pTargetOutliner->SetUpdateMode(sal_False);
-        pTargetOutliner->SetEditTextObjectPool( pSourceOutliner->GetEditTextObjectPool() );
-        pTargetOutliner->SetDefTab( pSourceOutliner->GetDefTab() );
-    }
-
-    pTargetOutliner->SetRefDevice( pSourceOutliner->GetRefDevice() );
-    pTargetOutliner->SetForbiddenCharsTable( pSourceOutliner->GetForbiddenCharsTable() );
-    pTargetOutliner->SetAsianCompressionMode( pSourceOutliner->GetAsianCompressionMode() );
-    pTargetOutliner->SetKernAsianPunctuation( pSourceOutliner->IsKernAsianPunctuation() );
-    pTargetOutliner->SetStyleSheetPool( pSourceOutliner->GetStyleSheetPool() );
-    pTargetOutliner->SetRefMapMode( pSourceOutliner->GetRefMapMode() );
-    pTargetOutliner->SetDefaultLanguage( pSourceOutliner->GetDefaultLanguage() );
-    pTargetOutliner->SetHyphenator( pSourceOutliner->GetHyphenator() );
-
-    sal_uInt16 nX, nY;
-    pSourceOutliner->GetGlobalCharStretching( nX, nY );
-    pTargetOutliner->SetGlobalCharStretching( nX, nY );
-
-    *//*
-    if ( !GetRefDevice() )
-    {
-        MapMode aMapMode(eObjUnit, Point(0,0), aObjUnit, aObjUnit);
-        pTargetOutliner->SetRefMapMode(aMapMode);
-    }
-    *//*
-}
-*/
-
 DrawViewWrapper::DrawViewWrapper( SdrModel* pSdrModel, OutputDevice* pOut, bool bPaintPageForEditMode)
             : E3dView(pSdrModel, pOut)
             , m_pMarkHandleProvider(NULL)
             , m_apOutliner( SdrMakeOutliner( OUTLINERMODE_TEXTOBJECT, pSdrModel ) )
             , m_bRestoreMapMode( false )
 {
-    // #114898#
     SetBufferedOutputAllowed(true);
     SetBufferedOverlayAllowed(true);
 
@@ -201,7 +164,6 @@ void DrawViewWrapper::ReInit()
     bHlplVisible = false;
 
     this->SetNoDragXorPolys(true);//for interactive 3D resize-dragging: paint only a single rectangle (not a simulated 3D object)
-    //this->SetResizeAtCenter(true);//for interactive resize-dragging: keep the object center fix
 
     //a correct work area is at least necessary for correct values in the position and  size dialog
     Rectangle aRect(Point(0,0), aOutputSize);
@@ -222,7 +184,6 @@ SdrPageView* DrawViewWrapper::GetPageView() const
     return pSdrPageView;
 };
 
-//virtual
 void DrawViewWrapper::SetMarkHandles()
 {
     if( m_pMarkHandleProvider && m_pMarkHandleProvider->getMarkHandles( aHdl ) )
@@ -234,7 +195,6 @@ void DrawViewWrapper::SetMarkHandles()
 SdrObject* DrawViewWrapper::getHitObject( const Point& rPnt ) const
 {
     SdrObject* pRet = NULL;
-    //sal_uLong nOptions =SDRSEARCH_DEEP|SDRSEARCH_PASS2BOUND|SDRSEARCH_PASS3NEAREST;
     sal_uLong nOptions = SDRSEARCH_DEEP | SDRSEARCH_TESTMARKABLE;
 
     SdrPageView* pSdrPageView = this->GetPageView();
@@ -334,7 +294,6 @@ void DrawViewWrapper::attachParentReferenceDevice( const uno::Reference< frame::
 
 SdrOutliner* DrawViewWrapper::getOutliner() const
 {
-//    lcl_initOutliner( m_apOutliner.get(), &GetModel()->GetDrawOutliner() );
     return m_apOutliner.get();
 }
 
@@ -442,3 +401,5 @@ SdrObject* DrawViewWrapper::getSdrObject( const uno::Reference<
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
index eb2168e07d8f..bf1096a26e25 100644
--- a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
+++ b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -221,54 +222,15 @@ FontList* ViewElementListProvider::getFontList() const
     if(!m_pFontList)
     {
         OutputDevice* pRefDev    = m_pDrawModelWrapper ? m_pDrawModelWrapper->getReferenceDevice() : NULL;
-        OutputDevice* pDefaultOut = Application::GetDefaultDevice();    // #67730#
+        OutputDevice* pDefaultOut = Application::GetDefaultDevice();
         m_pFontList = new FontList( pRefDev ? pRefDev    : pDefaultOut
                                 , pRefDev ? pDefaultOut : NULL
                                 , sal_False );
     }
     return m_pFontList;
 }
-
-/*
-SfxPrinter* ObjectPropertiesDialogParameter::getPrinter()
-{
-    //was old chart:
-    //SfxPrinter* SchChartDocShell::GetPrinter()
-
-    // OLE-Objekt: kein Printer anlegen ??? see old chart: :UpdateTablePointers
-    //@todo get printer from calc or other container
-    //return NULL;
-
-    SfxPrinter* pPrinter = NULL;
-    bool bOwnPrinter = true;
-    if (!pPrinter)
-    {
-        SfxBoolItem aItem(SID_PRINTER_NOTFOUND_WARN, sal_True);
-        // ItemSet mit speziellem Poolbereich anlegen
-        SfxItemSet* pSet = new SfxItemSet(GetPool(),
-                                          SID_PRINTER_NOTFOUND_WARN,
-                                          SID_PRINTER_NOTFOUND_WARN, 0);
-        pSet->Put(aItem);
-        pPrinter = new SfxPrinter(pSet); //@todo ->need to remember and delete
-        bOwnPrinter = sal_True;
-
-        MapMode aMapMode = pPrinter->GetMapMode();
-        aMapMode.SetMapUnit(MAP_100TH_MM);
-        pPrinter->SetMapMode(aMapMode);
-
-        if (pChDoc)
-        {
-            if (pPrinter != pChDoc->GetRefDevice())
-                pChDoc->SetRefDevice(pPrinter);
-
-            if (pPrinter != pChDoc->GetOutliner()->GetRefDevice())
-                pChDoc->GetOutliner()->SetRefDevice(pPrinter);
-        }
-    }
-    return pPrinter;
-}
-*/
-
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/drawinglayer/makefile.mk b/chart2/source/controller/drawinglayer/makefile.mk
deleted file mode 100644
index ab0645e61b10..000000000000
--- a/chart2/source/controller/drawinglayer/makefile.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=				..$/..$/..
-PRJINC=				$(PRJ)$/source
-PRJNAME=			chart2
-TARGET=				chcdrawinglayer
-
-ENABLE_EXCEPTIONS=	TRUE
-VISIBILITY_HIDDEN=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE: settings.mk
-
-# --- export library -------------------------------------------------
-
-#object files to build and link together to lib $(SLB)$/$(TARGET).lib
-SLOFILES=   	$(SLO)$/DrawViewWrapper.obj \
-                $(SLO)$/ViewElementListProvider.obj
-
-# --- Targets -----------------------------------------------------------------
-
-.INCLUDE: target.mk
-
diff --git a/chart2/source/controller/inc/AccessibleBase.hxx b/chart2/source/controller/inc/AccessibleBase.hxx
index ea52a29c614b..17e4433f5341 100644
--- a/chart2/source/controller/inc/AccessibleBase.hxx
+++ b/chart2/source/controller/inc/AccessibleBase.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -90,7 +91,7 @@ struct AccessibleElementInfo
 
 namespace impl
 {
-typedef ::cppu::WeakComponentImplHelper6<
+typedef ::cppu::PartialWeakComponentImplHelper6<
         ::com::sun::star::accessibility::XAccessible,
         ::com::sun::star::accessibility::XAccessibleContext,
         ::com::sun::star::accessibility::XAccessibleComponent,
@@ -232,6 +233,15 @@ protected:
     void SetInfo( const AccessibleElementInfo & rNewInfo );
     AccessibleUniqueId GetId() const;
 
+    // ________ XComponent ________
+    virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException)
+        { WeakComponentImplHelperBase::dispose(); }
+    virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException)
+        { WeakComponentImplHelperBase::addEventListener(xListener); }
+    virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException)
+        { WeakComponentImplHelperBase::removeEventListener(xListener); }
+
+
     // ________ WeakComponentImplHelper (XComponent::dispose) ________
     virtual void SAL_CALL disposing();
 
@@ -307,9 +317,6 @@ protected:
         const ::com::sun::star::lang::EventObject& Source )
         throw (::com::sun::star::uno::RuntimeException);
 
-    using ::cppu::WeakComponentImplHelperBase::addEventListener;
-    using ::cppu::WeakComponentImplHelperBase::removeEventListener;
-
     // ________ XAccessibleEventBroadcaster ________
     virtual void SAL_CALL addEventListener(
         const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener )
@@ -377,3 +384,5 @@ private:
 }  // namespace chart
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/AccessibleChartView.hxx b/chart2/source/controller/inc/AccessibleChartView.hxx
index 2cc46825a5aa..87d3330fbb16 100644
--- a/chart2/source/controller/inc/AccessibleChartView.hxx
+++ b/chart2/source/controller/inc/AccessibleChartView.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -153,3 +154,5 @@ private: // members
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/AccessibleTextHelper.hxx b/chart2/source/controller/inc/AccessibleTextHelper.hxx
index 66ef9338dc09..1394c615e3b8 100644
--- a/chart2/source/controller/inc/AccessibleTextHelper.hxx
+++ b/chart2/source/controller/inc/AccessibleTextHelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -111,3 +112,5 @@ private:
 
 // CHART2_ACCESSIBLETEXTHELPER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/AxisItemConverter.hxx b/chart2/source/controller/inc/AxisItemConverter.hxx
index 1d861f695b7d..eb43cb984f76 100644
--- a/chart2/source/controller/inc/AxisItemConverter.hxx
+++ b/chart2/source/controller/inc/AxisItemConverter.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -89,3 +90,5 @@ private:
 
 // CHART_AXISITEMCONVERTER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx b/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx
index e77323831b3d..51b91c0dd3dd 100644
--- a/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx
+++ b/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -82,3 +83,5 @@ private:
 
 // CHART_CHARACTERPROPERTYITEMCONVERTER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/ChartDocumentWrapper.hxx b/chart2/source/controller/inc/ChartDocumentWrapper.hxx
index f06c502dfd6c..803811376a4c 100644
--- a/chart2/source/controller/inc/ChartDocumentWrapper.hxx
+++ b/chart2/source/controller/inc/ChartDocumentWrapper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,6 @@
 #define CHART_CHARTDOCUMENTWRAPPER_HXX
 
 #include "WrappedPropertySet.hxx"
-//#include "OPropertySet.hxx"
 #include "ServiceMacros.hxx"
 #include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/chart/XChartDocument.hpp>
@@ -233,3 +233,5 @@ private: //member
 
 // CHART_CHARTDOCUMENT_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/ChartRenderer.hxx b/chart2/source/controller/inc/ChartRenderer.hxx
index c602a6ec6630..02913d2654f1 100644
--- a/chart2/source/controller/inc/ChartRenderer.hxx
+++ b/chart2/source/controller/inc/ChartRenderer.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -74,3 +75,5 @@ private:
 //.............................................................................
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/ConfigurationAccess.hxx b/chart2/source/controller/inc/ConfigurationAccess.hxx
index 4b5196e7f902..2964e9f889ea 100644
--- a/chart2/source/controller/inc/ConfigurationAccess.hxx
+++ b/chart2/source/controller/inc/ConfigurationAccess.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -57,3 +58,5 @@ namespace ConfigurationAccess
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/DataPointItemConverter.hxx b/chart2/source/controller/inc/DataPointItemConverter.hxx
index 323d3a3890ea..9f9d6174289d 100644
--- a/chart2/source/controller/inc/DataPointItemConverter.hxx
+++ b/chart2/source/controller/inc/DataPointItemConverter.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -108,3 +109,5 @@ private:
 
 // CHART_DATAPOINTITEMCONVERTER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/DrawViewWrapper.hxx b/chart2/source/controller/inc/DrawViewWrapper.hxx
index 4251dbef077e..fda4898f274c 100644
--- a/chart2/source/controller/inc/DrawViewWrapper.hxx
+++ b/chart2/source/controller/inc/DrawViewWrapper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -110,3 +111,4 @@ private:
 //.............................................................................
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/ErrorBarItemConverter.hxx b/chart2/source/controller/inc/ErrorBarItemConverter.hxx
index 1d6fa0492573..8251e1e73ba7 100755..100644
--- a/chart2/source/controller/inc/ErrorBarItemConverter.hxx
+++ b/chart2/source/controller/inc/ErrorBarItemConverter.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -82,3 +83,5 @@ private:
 
 // CHART_STATISTICSITEMCONVERTER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx b/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx
index 8e01ceaa28b0..1d8ab0b96901 100644
--- a/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx
+++ b/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -83,3 +84,5 @@ private:
 
 // CHART_GRAPHICPROPERTYITEMCONVERTER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/ItemConverter.hxx b/chart2/source/controller/inc/ItemConverter.hxx
index f803934c7f1a..25c5ef5a817c 100644
--- a/chart2/source/controller/inc/ItemConverter.hxx
+++ b/chart2/source/controller/inc/ItemConverter.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -213,3 +214,5 @@ private:
 
 // CHART_ITEMCONVERTER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/ItemPropertyMap.hxx b/chart2/source/controller/inc/ItemPropertyMap.hxx
index 809df66156e2..445c7b531dc2 100644
--- a/chart2/source/controller/inc/ItemPropertyMap.hxx
+++ b/chart2/source/controller/inc/ItemPropertyMap.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -88,3 +89,5 @@ struct DeleteItemConverterPtr : public ::std::unary_function< ItemConverter *, v
 
 // CHART_ITEMPROPERTYMAP_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/LegendItemConverter.hxx b/chart2/source/controller/inc/LegendItemConverter.hxx
index 897cf1c691da..9ec794aed482 100644
--- a/chart2/source/controller/inc/LegendItemConverter.hxx
+++ b/chart2/source/controller/inc/LegendItemConverter.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -77,3 +78,5 @@ private:
 
 // CHART_LEGENDITEMCONVERTER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/MenuResIds.hrc b/chart2/source/controller/inc/MenuResIds.hrc
index 38a09ad35ded..5910606d1cb1 100644
--- a/chart2/source/controller/inc/MenuResIds.hrc
+++ b/chart2/source/controller/inc/MenuResIds.hrc
@@ -37,5 +37,4 @@
 #define RID_CONTEXTMENU_SHAPE       (RID_APP_START + 1)
 #define RID_CONTEXTMENU_SHAPEEDIT   (RID_APP_START + 2)
 
-// CHART_MENURESIDS_HRC
 #endif
diff --git a/chart2/source/controller/inc/MultipleChartConverters.hxx b/chart2/source/controller/inc/MultipleChartConverters.hxx
index 1535f8af4405..a4f08c697525 100644
--- a/chart2/source/controller/inc/MultipleChartConverters.hxx
+++ b/chart2/source/controller/inc/MultipleChartConverters.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -128,3 +129,5 @@ protected:
 
 // CHART2_MULTIPLECHARTCONVERTERS_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/MultipleItemConverter.hxx b/chart2/source/controller/inc/MultipleItemConverter.hxx
index e7c0f3ce31bd..7ac432bd1c7d 100644
--- a/chart2/source/controller/inc/MultipleItemConverter.hxx
+++ b/chart2/source/controller/inc/MultipleItemConverter.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -58,3 +59,5 @@ protected:
 } //  namespace comphelper
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/ObjectHierarchy.hxx b/chart2/source/controller/inc/ObjectHierarchy.hxx
index 857b576fe6ef..8d8696a4be98 100644
--- a/chart2/source/controller/inc/ObjectHierarchy.hxx
+++ b/chart2/source/controller/inc/ObjectHierarchy.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -118,3 +119,5 @@ private:
 
 // CHART2_OBJECTHIERARCHY_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/ObjectNameProvider.hxx b/chart2/source/controller/inc/ObjectNameProvider.hxx
index 02ecc8f229c8..ebc6077bd451 100644
--- a/chart2/source/controller/inc/ObjectNameProvider.hxx
+++ b/chart2/source/controller/inc/ObjectNameProvider.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -85,3 +86,5 @@ public:
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/PositionAndSizeHelper.hxx b/chart2/source/controller/inc/PositionAndSizeHelper.hxx
index 312c92997055..802d0f63deb8 100644
--- a/chart2/source/controller/inc/PositionAndSizeHelper.hxx
+++ b/chart2/source/controller/inc/PositionAndSizeHelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -58,3 +59,5 @@ public:
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/RangeEdit.hxx b/chart2/source/controller/inc/RangeEdit.hxx
index cacba52decb5..67642664508b 100755..100644
--- a/chart2/source/controller/inc/RangeEdit.hxx
+++ b/chart2/source/controller/inc/RangeEdit.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -54,3 +55,5 @@ private:
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/RangeSelectionButton.hxx b/chart2/source/controller/inc/RangeSelectionButton.hxx
index 4aedf9012489..aa4f72c6869d 100644
--- a/chart2/source/controller/inc/RangeSelectionButton.hxx
+++ b/chart2/source/controller/inc/RangeSelectionButton.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,9 +30,7 @@
 #define _CHART2_RANGESELECTIONBUTTON_HXX
 
 // header for Class ImageButton
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 
 //.............................................................................
 namespace chart
@@ -53,3 +52,5 @@ public:
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/RangeSelectionHelper.hxx b/chart2/source/controller/inc/RangeSelectionHelper.hxx
index cb9e067bd8e2..244b562327ee 100755..100644
--- a/chart2/source/controller/inc/RangeSelectionHelper.hxx
+++ b/chart2/source/controller/inc/RangeSelectionHelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -85,3 +86,5 @@ private:
 
 // CHART2_RANGESELECTIONHELPER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/RangeSelectionListener.hxx b/chart2/source/controller/inc/RangeSelectionListener.hxx
index 3e470c0116f0..d0a4f97bfbad 100644
--- a/chart2/source/controller/inc/RangeSelectionListener.hxx
+++ b/chart2/source/controller/inc/RangeSelectionListener.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -77,3 +78,5 @@ private:
 
 // CHART2_RANGESELECTIONLISTENER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/RegressionCurveItemConverter.hxx b/chart2/source/controller/inc/RegressionCurveItemConverter.hxx
index fa5c0b6b41c5..a02a0d956515 100644
--- a/chart2/source/controller/inc/RegressionCurveItemConverter.hxx
+++ b/chart2/source/controller/inc/RegressionCurveItemConverter.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -80,3 +81,5 @@ private:
 
 // CHART_REGRESSIONCURVE_ITEMCONVERTER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/RegressionEquationItemConverter.hxx b/chart2/source/controller/inc/RegressionEquationItemConverter.hxx
index 29b092788bf0..799189ff1017 100644
--- a/chart2/source/controller/inc/RegressionEquationItemConverter.hxx
+++ b/chart2/source/controller/inc/RegressionEquationItemConverter.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -81,3 +82,5 @@ private:
 
 // CHART_REGRESSIONEQUATION_ITEMCONVERTER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/SchSlotIds.hxx b/chart2/source/controller/inc/SchSlotIds.hxx
index 601e64100bbf..8bd2fdd6e318 100644
--- a/chart2/source/controller/inc/SchSlotIds.hxx
+++ b/chart2/source/controller/inc/SchSlotIds.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -232,3 +233,5 @@
 
 #endif
 // SCH_SLOTIDS_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx
index 051c581bfdd4..1029accb3f3a 100644
--- a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx
+++ b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -100,3 +101,5 @@ private:
 
 // CHART_SERIESOPTIONSITEMCONVERTER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/ShapeController.hrc b/chart2/source/controller/inc/ShapeController.hrc
index 6c7b43526d22..d230c32058da 100644
--- a/chart2/source/controller/inc/ShapeController.hrc
+++ b/chart2/source/controller/inc/ShapeController.hrc
@@ -46,5 +46,4 @@
 #define COMMAND_ID_FONT_DIALOG                 15
 #define COMMAND_ID_PARAGRAPH_DIALOG            16
 
-// CHART_SHAPECONTROLLER_HRC
 #endif
diff --git a/chart2/source/controller/inc/StatisticsItemConverter.hxx b/chart2/source/controller/inc/StatisticsItemConverter.hxx
index 0c6c45e1e0f4..44e157039a89 100644
--- a/chart2/source/controller/inc/StatisticsItemConverter.hxx
+++ b/chart2/source/controller/inc/StatisticsItemConverter.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -73,3 +74,5 @@ private:
 
 // CHART_STATISTICSITEMCONVERTER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/TabPageNotifiable.hxx b/chart2/source/controller/inc/TabPageNotifiable.hxx
index 41e41dbde308..e34de6eee76a 100644
--- a/chart2/source/controller/inc/TabPageNotifiable.hxx
+++ b/chart2/source/controller/inc/TabPageNotifiable.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -49,3 +50,5 @@ public:
 
 // CHART2_TABPAGENOTIFIABLE_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/TextDirectionListBox.hxx b/chart2/source/controller/inc/TextDirectionListBox.hxx
index 626724289187..0f2f3609bd30 100644
--- a/chart2/source/controller/inc/TextDirectionListBox.hxx
+++ b/chart2/source/controller/inc/TextDirectionListBox.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -47,3 +48,4 @@ public:
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx b/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx
index 768cca0fe8c6..c0bb9e031cd1 100644
--- a/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx
+++ b/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -61,3 +62,5 @@ private:
 //.............................................................................
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/TitleDialogData.hxx b/chart2/source/controller/inc/TitleDialogData.hxx
index fadcdad4aab3..6e29af8243b8 100644
--- a/chart2/source/controller/inc/TitleDialogData.hxx
+++ b/chart2/source/controller/inc/TitleDialogData.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -65,3 +66,5 @@ struct TitleDialogData
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/TitleItemConverter.hxx b/chart2/source/controller/inc/TitleItemConverter.hxx
index 2f382a9483ce..cb149ffdd43f 100644
--- a/chart2/source/controller/inc/TitleItemConverter.hxx
+++ b/chart2/source/controller/inc/TitleItemConverter.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -78,3 +79,5 @@ private:
 
 // CHART_TITLEITEMCONVERTER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/ViewElementListProvider.hxx b/chart2/source/controller/inc/ViewElementListProvider.hxx
index 61a68d6f8b4c..b6e2b79f93b3 100644
--- a/chart2/source/controller/inc/ViewElementListProvider.hxx
+++ b/chart2/source/controller/inc/ViewElementListProvider.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -68,3 +69,5 @@ private:
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/dlg_ChartType.hxx b/chart2/source/controller/inc/dlg_ChartType.hxx
index 4144531ed77e..5ccb482310d9 100644
--- a/chart2/source/controller/inc/dlg_ChartType.hxx
+++ b/chart2/source/controller/inc/dlg_ChartType.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,9 +33,7 @@
 // header for class FixedLine
 #include <vcl/fixed.hxx>
 // header for class OKButton
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
@@ -74,3 +73,4 @@ private:
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx
index c8abda3cb19a..1b0e498561fb 100644
--- a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx
+++ b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -84,3 +85,5 @@ private:
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/dlg_CreationWizard.hxx b/chart2/source/controller/inc/dlg_CreationWizard.hxx
index e70976ad1a4c..ac45b985aad1 100644
--- a/chart2/source/controller/inc/dlg_CreationWizard.hxx
+++ b/chart2/source/controller/inc/dlg_CreationWizard.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -103,3 +104,5 @@ private:
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx
index 9f546f1a72d6..9f66c7c7d0bb 100644
--- a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx
+++ b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -127,3 +128,5 @@ private:
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/dlg_DataEditor.hxx b/chart2/source/controller/inc/dlg_DataEditor.hxx
index 5f985d8f55d1..74ef15aa9fce 100644
--- a/chart2/source/controller/inc/dlg_DataEditor.hxx
+++ b/chart2/source/controller/inc/dlg_DataEditor.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -76,7 +77,6 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
         m_xContext;
     ImageList       m_aToolboxImageList;
-    ImageList       m_aToolboxImageListHighContrast;
 
     /// handles actions of the toolbox
     DECL_LINK( ToolboxHdl, void* );
@@ -119,3 +119,5 @@ private:
 } // namespace chart
 
 #endif  // _SCH_DGRDATA_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/dlg_DataSource.hxx b/chart2/source/controller/inc/dlg_DataSource.hxx
index 732b1532ad64..140066f5b5c1 100644
--- a/chart2/source/controller/inc/dlg_DataSource.hxx
+++ b/chart2/source/controller/inc/dlg_DataSource.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,9 +33,7 @@
 // header for class TabControl
 #include <vcl/tabctrl.hxx>
 // header for class OKButton
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 
 #include "TabPageNotifiable.hxx"
 #include <com/sun/star/uno/XComponentContext.hpp>
@@ -98,3 +97,5 @@ private:
 
 // CHART2_DATASOURCEDIALOG_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx b/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx
index 5d084d7d68b3..62d9c0cf578b 100644
--- a/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx
+++ b/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,9 +33,7 @@
 // header for class FixedLine
 #include <vcl/fixed.hxx>
 // header for class CheckBox
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 #include <com/sun/star/uno/Sequence.hxx>
 
 //.............................................................................
@@ -99,3 +98,5 @@ public:
 //.............................................................................
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx
index a22333b5bdc8..d4452bf3aff8 100644
--- a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx
+++ b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,9 +31,7 @@
 // header for class ModalDialog
 #include <vcl/dialog.hxx>
 // header for class CheckBox
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 // header for class SfxItemSet
 #include <svl/itemset.hxx>
 //for auto_ptr
@@ -70,3 +69,5 @@ public:
 //.............................................................................
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx
index 3554337d9deb..99f74961db6e 100644
--- a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx
+++ b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -76,3 +77,5 @@ private:
 //.............................................................................
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/dlg_InsertLegend.hxx b/chart2/source/controller/inc/dlg_InsertLegend.hxx
index 8ab7f285b5a9..c54b18ce857a 100644
--- a/chart2/source/controller/inc/dlg_InsertLegend.hxx
+++ b/chart2/source/controller/inc/dlg_InsertLegend.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,9 +31,7 @@
 // header for class ModalDialog
 #include <vcl/dialog.hxx>
 // header for class CheckBox
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 //for auto_ptr
 #include <memory>
 #include <com/sun/star/frame/XModel.hpp>
@@ -70,3 +69,4 @@ public:
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/dlg_InsertTitle.hxx b/chart2/source/controller/inc/dlg_InsertTitle.hxx
index 41eeac7a1055..04ba0113a462 100644
--- a/chart2/source/controller/inc/dlg_InsertTitle.hxx
+++ b/chart2/source/controller/inc/dlg_InsertTitle.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,9 +30,7 @@
 
 #include "TitleDialogData.hxx"
 #include <vcl/dialog.hxx>
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 //for auto_ptr
 #include <memory>
 
@@ -62,3 +61,4 @@ public:
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/dlg_InsertTrendline.hxx b/chart2/source/controller/inc/dlg_InsertTrendline.hxx
index 34819f6e0e16..5ea321681e30 100644
--- a/chart2/source/controller/inc/dlg_InsertTrendline.hxx
+++ b/chart2/source/controller/inc/dlg_InsertTrendline.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -66,3 +67,5 @@ private:
 //.............................................................................
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/dlg_ObjectProperties.hxx b/chart2/source/controller/inc/dlg_ObjectProperties.hxx
index 250c3107138c..2f40c7dcc20c 100644
--- a/chart2/source/controller/inc/dlg_ObjectProperties.hxx
+++ b/chart2/source/controller/inc/dlg_ObjectProperties.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -157,3 +158,4 @@ public:
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/dlg_ShapeFont.hxx b/chart2/source/controller/inc/dlg_ShapeFont.hxx
index a84dac07ec43..6fdab7a1eca3 100644
--- a/chart2/source/controller/inc/dlg_ShapeFont.hxx
+++ b/chart2/source/controller/inc/dlg_ShapeFont.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -57,3 +58,5 @@ private:
 
 // CHART2_DLG_SHAPEFONT_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/dlg_ShapeParagraph.hxx b/chart2/source/controller/inc/dlg_ShapeParagraph.hxx
index cb1c250694eb..404bb6e0081a 100644
--- a/chart2/source/controller/inc/dlg_ShapeParagraph.hxx
+++ b/chart2/source/controller/inc/dlg_ShapeParagraph.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -52,3 +53,5 @@ private:
 
 // CHART2_DLG_SHAPEPARAGRAPH_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/dlg_View3D.hxx b/chart2/source/controller/inc/dlg_View3D.hxx
index 0cc5024683ff..d9e82e93000c 100644
--- a/chart2/source/controller/inc/dlg_View3D.hxx
+++ b/chart2/source/controller/inc/dlg_View3D.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -35,9 +36,7 @@
 // header for class TabControl
 #include <vcl/tabctrl.hxx>
 // header for class OKButton
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 // header for class XColorTable
 #include <svx/xtable.hxx>
 
@@ -82,3 +81,5 @@ private:
 //.............................................................................
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/inc/res_ErrorBar.hxx b/chart2/source/controller/inc/res_ErrorBar.hxx
index e428c9c9b581..74ee6de625fe 100644
--- a/chart2/source/controller/inc/res_ErrorBar.hxx
+++ b/chart2/source/controller/inc/res_ErrorBar.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -153,3 +154,5 @@ private:
 //.............................................................................
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
index bce22df7eb58..f2ad9b27939b 100644
--- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -1003,3 +1004,5 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
 
 } //  namespace wrapper
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
index 8104516c7177..4597499f7032 100644
--- a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -57,9 +58,6 @@ namespace
         IPM_MAP_ENTRY( EE_CHAR_LANGUAGE, "CharLocale", MID_LANG_LOCALE )
         IPM_MAP_ENTRY( EE_CHAR_LANGUAGE_CJK, "CharLocaleAsian", MID_LANG_LOCALE )
         IPM_MAP_ENTRY( EE_CHAR_LANGUAGE_CTL, "CharLocaleComplex", MID_LANG_LOCALE )
-//         IPM_MAP_ENTRY( EE_CHAR_FONTHEIGHT, "CharHeight", 0 )
-//         IPM_MAP_ENTRY( EE_CHAR_ITALIC, "CharPosture", 0 )
-//         IPM_MAP_ENTRY( EE_CHAR_WEIGHT, "CharWeight", 0 )
 
         IPM_MAP_ENTRY( EE_CHAR_STRIKEOUT, "CharStrikeout", MID_CROSS_OUT )
         IPM_MAP_ENTRY( EE_CHAR_WLM, "CharWordMode", 0 )
@@ -70,12 +68,6 @@ namespace
 
         IPM_MAP_ENTRY( EE_PARA_WRITINGDIR, "WritingMode", 0 )
 
-//         IPM_MAP_ENTRY( EE_CHAR_FONTHEIGHT_CJK, "CharHeightAsian", 0 )
-//         IPM_MAP_ENTRY( EE_CHAR_FONTHEIGHT_CTL, "CharHeightComplex", 0 )
-//         IPM_MAP_ENTRY( EE_CHAR_WEIGHT_CJK, "CharWeightAsian", 0 )
-//         IPM_MAP_ENTRY( EE_CHAR_WEIGHT_CTL, "CharWeightComplex", 0 )
-//         IPM_MAP_ENTRY( EE_CHAR_ITALIC_CJK, "CharPostureAsian", 0 )
-//         IPM_MAP_ENTRY( EE_CHAR_ITALIC_CTL, "CharPostureComplex", 0 )
         IPM_MAP_ENTRY( EE_PARA_ASIANCJKSPACING, "ParaIsCharacterDistance", 0 )
         );
 
@@ -583,3 +575,5 @@ uno::Reference< beans::XPropertySet >
 
 } //  namespace wrapper
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
index 01b71c87d5fd..e399e4ba82b1 100644
--- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -74,7 +75,6 @@ namespace
 {
     static ::comphelper::ItemPropertyMapType aDataPointPropertyMap(
         ::comphelper::MakeItemPropertyMap
-//        IPM_MAP_ENTRY( CHATTR_PIE_SEGMENT_OFFSET, "Offset", 0 )
         IPM_MAP_ENTRY( SCHATTR_STYLE_SHAPE, "Geometry3D", 0 )
         );
 
@@ -698,3 +698,5 @@ void DataPointItemConverter::FillSpecialItem(
 
 } //  namespace wrapper
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
index 8718c76c95b7..3304f36f9e42 100755..100644
--- a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -204,7 +205,7 @@ bool ErrorBarItemConverter::ApplySpecialItem(
         case SCHATTR_STAT_PERCENT:
         case SCHATTR_STAT_BIGERROR:
         {
-            OSL_ENSURE( false, "Deprectaed item" );
+            OSL_FAIL( "Deprectaed item" );
             uno::Reference< beans::XPropertySet > xErrorBarProp( GetPropertySet());
 
             double fValue =
@@ -454,3 +455,5 @@ void ErrorBarItemConverter::FillSpecialItem(
 
 } //  namespace wrapper
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
index ce7b2577767e..05b8af1c4ba6 100644
--- a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -65,14 +66,9 @@ namespace
         ::comphelper::MakeItemPropertyMap
         IPM_MAP_ENTRY( XATTR_FILLSTYLE, "FillStyle", 0 )
         IPM_MAP_ENTRY( XATTR_FILLCOLOR, "Color", 0 )
-//         IPM_MAP_ENTRY( XATTR_FILLTRANSPARENCE, "Transparency", 0 )
-//         IPM_MAP_ENTRY( XATTR_FILLGRADIENT, "Gradient", 0 )
-//         IPM_MAP_ENTRY( XATTR_FILLHATCH, "Hatch", 0 )
         IPM_MAP_ENTRY( XATTR_LINECOLOR, "BorderColor", 0 )
         IPM_MAP_ENTRY( XATTR_LINESTYLE, "BorderStyle", 0 )
         IPM_MAP_ENTRY( XATTR_LINEWIDTH, "BorderWidth", 0 )
-//         IPM_MAP_ENTRY( XATTR_LINEDASH, "BorderDash", 0 )
-//         IPM_MAP_ENTRY( XATTR_LINETRANSPARENCE, "BorderTransparency", 0 )
         IPM_MAP_ENTRY( XATTR_FILLBACKGROUND, "FillBackground", 0 )
         IPM_MAP_ENTRY( XATTR_FILLBMP_POS, "FillBitmapRectanglePoint", 0 )
         IPM_MAP_ENTRY( XATTR_FILLBMP_SIZEX, "FillBitmapSizeX", 0 )
@@ -91,10 +87,8 @@ namespace
     static ::comphelper::ItemPropertyMapType aDataPointPropertyLineMap(
         ::comphelper::MakeItemPropertyMap
         IPM_MAP_ENTRY( XATTR_LINECOLOR, "Color", 0 )
-//         IPM_MAP_ENTRY( XATTR_LINETRANSPARENCE, "Transparency", 0 )
         IPM_MAP_ENTRY( XATTR_LINESTYLE, "LineStyle", 0 )
         IPM_MAP_ENTRY( XATTR_LINEWIDTH, "LineWidth", 0 )
-//         IPM_MAP_ENTRY( XATTR_LINEDASH, "LineDash", 0 )
         );
 
     return aDataPointPropertyLineMap;
@@ -105,9 +99,7 @@ namespace
         ::comphelper::MakeItemPropertyMap
         IPM_MAP_ENTRY( XATTR_LINESTYLE, "LineStyle", 0 )
         IPM_MAP_ENTRY( XATTR_LINEWIDTH, "LineWidth", 0 )
-//         IPM_MAP_ENTRY( XATTR_LINEDASH, "LineDash", 0 )
         IPM_MAP_ENTRY( XATTR_LINECOLOR, "LineColor", 0 )
-//         IPM_MAP_ENTRY( XATTR_LINETRANSPARENCE, "LineTransparence", 0 )
         IPM_MAP_ENTRY( XATTR_LINEJOINT, "LineJoint", 0 )
         );
 
@@ -119,10 +111,6 @@ namespace
         ::comphelper::MakeItemPropertyMap
         IPM_MAP_ENTRY( XATTR_FILLSTYLE, "FillStyle", 0 )
         IPM_MAP_ENTRY( XATTR_FILLCOLOR, "FillColor", 0 )
-//         IPM_MAP_ENTRY( XATTR_FILLTRANSPARENCE, "FillTransparence", 0 )
-//         IPM_MAP_ENTRY( XATTR_FILLBITMAP, "FillBitmapName", MID_NAME )
-//         IPM_MAP_ENTRY( XATTR_FILLGRADIENT, "FillGradient", 0 )
-//         IPM_MAP_ENTRY( XATTR_FILLHATCH, "FillHatch", 0 )
         IPM_MAP_ENTRY( XATTR_FILLBACKGROUND, "FillBackground", 0 )
         IPM_MAP_ENTRY( XATTR_FILLBMP_POS, "FillBitmapRectanglePoint", 0 )
         IPM_MAP_ENTRY( XATTR_FILLBMP_SIZEX, "FillBitmapSizeX", 0 )
@@ -266,10 +254,6 @@ void GraphicPropertyItemConverter::FillSpecialItem(
     sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
     throw( uno::Exception )
 {
-//     if( m_eGraphicObjectType == LINE_DATA_POINT ||
-//         m_eGraphicObjectType == LINE_PROPERTIES )
-//         return;
-
     switch( nWhichId )
     {
         // bitmap property
@@ -316,7 +300,7 @@ void GraphicPropertyItemConverter::FillSpecialItem(
                     }
                 }
             }
-            catch( beans::UnknownPropertyException ex )
+            catch( beans::UnknownPropertyException &ex )
             {
                 ASSERT_EXCEPTION( ex );
             }
@@ -330,11 +314,10 @@ void GraphicPropertyItemConverter::FillSpecialItem(
                     ? C2U( "GradientStepCount" )
                     : C2U( "FillGradientStepCount" );
 
-                sal_Int16 nStepCount = 0;
                 uno::Any aValue( GetPropertySet()->getPropertyValue( aPropName ) );
                 if( hasLongOrShortValue(aValue) )
                 {
-                    nStepCount = getShortForLongAlso(aValue);
+                    sal_Int16 nStepCount = getShortForLongAlso(aValue);
                     rOutItemSet.Put( XGradientStepCountItem( nStepCount ));
                 }
             }
@@ -561,7 +544,7 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
                     }
                 }
             }
-            catch( beans::UnknownPropertyException ex )
+            catch( beans::UnknownPropertyException &ex )
             {
                 ASSERT_EXCEPTION( ex );
             }
@@ -750,7 +733,7 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
                     }
                     else
                     {
-                        OSL_ENSURE( false, "Wrong type in Transparency Any" );
+                        OSL_FAIL( "Wrong type in Transparency Any" );
                     }
                 }
             }
@@ -795,7 +778,7 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
                     }
                     else
                     {
-                        OSL_ENSURE( false, "Wrong type in Transparency Any" );
+                        OSL_FAIL( "Wrong type in Transparency Any" );
                     }
                 }
             }
@@ -807,3 +790,5 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
 
 } //  namespace wrapper
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
index f1a6f90f3bfe..a121a774615c 100644
--- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -139,17 +140,17 @@ void ItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const
                             delete pItem;
                         }
                     }
-                    catch( beans::UnknownPropertyException ex )
+                    catch( beans::UnknownPropertyException &ex )
                     {
                         delete pItem;
-                        OSL_ENSURE( false,
+                        OSL_FAIL(
                                     ::rtl::OUStringToOString(
                                         ex.Message +
                                         ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
                                                              " - unknown Property: " )) + aProperty.first,
                                         RTL_TEXTENCODING_ASCII_US ).getStr());
                     }
-                    catch( uno::Exception ex )
+                    catch( uno::Exception &ex )
                     {
                         ASSERT_EXCEPTION( ex );
                     }
@@ -161,7 +162,7 @@ void ItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const
                 {
                     FillSpecialItem( nWhich, rOutItemSet );
                 }
-                catch( uno::Exception ex )
+                catch( uno::Exception &ex )
                 {
                     ASSERT_EXCEPTION( ex );
                 }
@@ -174,14 +175,14 @@ void ItemConverter::FillSpecialItem(
     sal_uInt16 /*nWhichId*/, SfxItemSet & /*rOutItemSet*/ ) const
     throw( uno::Exception )
 {
-    OSL_ENSURE( false, "ItemConverter: Unhandled special item found!" );
+    OSL_FAIL( "ItemConverter: Unhandled special item found!" );
 }
 
 bool ItemConverter::ApplySpecialItem(
     sal_uInt16 /*nWhichId*/, const SfxItemSet & /*rItemSet*/ )
     throw( uno::Exception )
 {
-    OSL_ENSURE( false, "ItemConverter: Unhandled special item found!" );
+    OSL_FAIL( "ItemConverter: Unhandled special item found!" );
     return false;
 }
 
@@ -211,18 +212,18 @@ bool ItemConverter::ApplyItemSet( const SfxItemSet & rItemSet )
                         bItemsChanged = true;
                     }
                 }
-                catch( beans::UnknownPropertyException ex )
+                catch( beans::UnknownPropertyException &ex )
                 {
-                    OSL_ENSURE( false,
+                    OSL_FAIL(
                                 ::rtl::OUStringToOString(
                                     ex.Message +
                                     ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
                                                          " - unknown Property: " )) + aProperty.first,
                                     RTL_TEXTENCODING_ASCII_US).getStr());
                 }
-                catch( uno::Exception ex )
+                catch( uno::Exception &ex )
                 {
-                    OSL_ENSURE( false, ::rtl::OUStringToOString(
+                    OSL_FAIL( ::rtl::OUStringToOString(
                                     ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr());
                 }
             }
@@ -238,7 +239,6 @@ bool ItemConverter::ApplyItemSet( const SfxItemSet & rItemSet )
 }
 
 // --------------------------------------------------------------------------------
-
 void ItemConverter::InvalidateUnequalItems( SfxItemSet  &rDestSet, const SfxItemSet &rSourceSet )
 {
     SfxWhichIter      aIter (rSourceSet);
@@ -266,3 +266,5 @@ void ItemConverter::InvalidateUnequalItems( SfxItemSet  &rDestSet, const SfxItem
 }
 
 } //  namespace comphelper
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
index 6fdf16bb73af..75f2254c2218 100644
--- a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -201,3 +202,5 @@ void LegendItemConverter::FillSpecialItem(
 
 } //  namespace wrapper
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
index 75965a2426fd..46d5269793de 100644
--- a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
+++ b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -231,3 +232,5 @@ const sal_uInt16 * AllSeriesStatisticsConverter::GetWhichPairs() const
 
 } //  namespace wrapper
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx b/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx
index e24be80bb429..07fbb16de082 100644
--- a/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -54,9 +55,9 @@ void MultipleItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const
     if( aIter != aEnd )
     {
         (*aIter)->FillItemSet( rOutItemSet );
-        aIter++;
+        ++aIter;
     }
-    for( ; aIter != aEnd; aIter++ )
+    for( ; aIter != aEnd; ++aIter )
     {
         SfxItemSet aSet = this->CreateEmptyItemSet();
         (*aIter)->FillItemSet( aSet );
@@ -82,3 +83,5 @@ bool MultipleItemConverter::GetItemProperty( tWhichIdType /*nWhichId*/, tPropert
 }
 
 } //  namespace comphelper
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
index 7cfd879ba85d..e517fdd82702 100644
--- a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -274,3 +275,5 @@ void RegressionCurveItemConverter::FillSpecialItem(
 
 } //  namespace wrapper
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
index c8bdff5f24b8..0244bc6cba92 100644
--- a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -76,18 +77,6 @@ RegressionEquationItemConverter::RegressionEquationItemConverter(
     m_aConverters.push_back( new CharacterPropertyItemConverter(
                                  rPropertySet, rItemPool, pRefSize, C2U("ReferencePageSize")));
 
-//     // CharacterProperties are not at the title but at its contained XFormattedString objects
-//     // take the first formatted string in the sequence
-//     uno::Reference< chart2::XTitle > xTitle( rPropertySet, uno::UNO_QUERY );
-//     if( xTitle.is())
-//     {
-//         uno::Sequence< uno::Reference< chart2::XFormattedString > > aStringSeq( xTitle->getText());
-//         if( aStringSeq.getLength() > 0 )
-//         {
-//             m_aConverters.push_back(
-//                 new FormattedStringsConverter( aStringSeq, rItemPool, pRefSize, rPropertySet ));
-//         }
-//     }
 }
 
 RegressionEquationItemConverter::~RegressionEquationItemConverter()
@@ -144,12 +133,6 @@ bool RegressionEquationItemConverter::ApplySpecialItem(
     {
         case SID_ATTR_NUMBERFORMAT_VALUE:
         {
-//             bool bUseSourceFormat =
-//                 (static_cast< const SfxBoolItem & >(
-//                     rItemSet.Get( SID_ATTR_NUMBERFORMAT_SOURCE )).GetValue() );
-
-//             if( ! bUseSourceFormat )
-//             {
             uno::Any aValue( static_cast< sal_Int32 >(
                 static_cast< const SfxUInt32Item & >(
                     rItemSet.Get( nWhichId )).GetValue()));
@@ -185,3 +168,5 @@ void RegressionEquationItemConverter::FillSpecialItem(
 
 } //  namespace wrapper
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx b/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx
index ca8665209e44..7a842dfe2174 100644
--- a/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx
+++ b/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,9 +28,7 @@
 #ifndef CHART_SCHWHICHPAIRS_HXX
 #define CHART_SCHWHICHPAIRS_HXX
 
-#ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
-#endif
 #include <svx/xdef.hxx>
 #include <svx/svddef.hxx>
 #include <editeng/eeitem.hxx>
@@ -238,3 +237,5 @@ const sal_uInt16 nRegEquationWhichPairs[] =
 
 // CHART_SCHWHICHPAIRS_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
index db7aa21c7a1a..1782d9513caa 100644
--- a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -176,7 +177,7 @@ SeriesOptionsItemConverter::SeriesOptionsItemConverter(
             }
         }
     }
-    catch( uno::Exception ex )
+    catch( uno::Exception &ex )
     {
         ASSERT_EXCEPTION( ex );
     }
@@ -451,3 +452,5 @@ void SeriesOptionsItemConverter::FillSpecialItem(
 
 } //  namespace wrapper
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
index 8d35d5c6b2fe..60b5141c3a9c 100644
--- a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -303,7 +304,7 @@ bool StatisticsItemConverter::ApplySpecialItem(
         case SCHATTR_STAT_PERCENT:
         case SCHATTR_STAT_BIGERROR:
         {
-            OSL_ENSURE( false, "Deprectaed item" );
+            OSL_FAIL( "Deprectaed item" );
             uno::Reference< beans::XPropertySet > xErrorBarProp(
                 lcl_GetYErrorBar( GetPropertySet()));
             bool bOldHasErrorBar = xErrorBarProp.is();
@@ -695,3 +696,5 @@ void StatisticsItemConverter::FillSpecialItem(
 
 } //  namespace wrapper
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
index 7db0c06822ea..2dd9d8730055 100644
--- a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -243,3 +244,5 @@ void TitleItemConverter::FillSpecialItem(
 
 } //  namespace wrapper
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/itemsetwrapper/makefile.mk b/chart2/source/controller/itemsetwrapper/makefile.mk
deleted file mode 100644
index 8f12443c13f6..000000000000
--- a/chart2/source/controller/itemsetwrapper/makefile.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=				..$/..$/..
-PRJINC=				$(PRJ)$/source
-PRJNAME=			chart2
-TARGET=				chcitemsetwrapper
-
-ENABLE_EXCEPTIONS=	TRUE
-VISIBILITY_HIDDEN=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE: settings.mk
-
-# --- export library -------------------------------------------------
-
-#object files to build and link together to lib $(SLB)$/$(TARGET).lib
-SLOFILES=   	$(SLO)$/ItemConverter.obj \
-                $(SLO)$/AxisItemConverter.obj \
-                $(SLO)$/MultipleItemConverter.obj \
-                $(SLO)$/MultipleChartConverters.obj \
-                $(SLO)$/CharacterPropertyItemConverter.obj \
-                $(SLO)$/SeriesOptionsItemConverter.obj \
-                $(SLO)$/DataPointItemConverter.obj \
-                $(SLO)$/GraphicPropertyItemConverter.obj \
-                $(SLO)$/LegendItemConverter.obj \
-                $(SLO)$/StatisticsItemConverter.obj \
-                $(SLO)$/TitleItemConverter.obj \
-                $(SLO)$/RegressionCurveItemConverter.obj \
-                $(SLO)$/RegressionEquationItemConverter.obj \
-                $(SLO)$/ErrorBarItemConverter.obj
-
-# --- Targets -----------------------------------------------------------------
-
-.INCLUDE: target.mk
-
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index ac3ef57a1bd9..e95d50d0614a 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -77,7 +78,7 @@
 #include <toolkit/awt/vclxwindow.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 //-------
 #include <com/sun/star/frame/XLayoutManager.hpp>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
@@ -92,10 +93,6 @@
 // react on this by rebuilding the view
 #define TEST_ENABLE_MODIFY_LISTENER
 
-/*
-#include <vcl/svapp.hxx>
-*/
-
 //.............................................................................
 namespace chart
 {
@@ -242,7 +239,7 @@ void ChartController::TheModel::tryTermination()
                 //since we have indicated to give up the ownership with paramter true in close call
                 //the one who has thrown the CloseVetoException is the new owner
 
-#if OSL_DEBUG_LEVEL > 2
+#if OSL_DEBUG_LEVEL > 1
                 OSL_ENSURE( !m_bOwnership,
                     "INFO: a well known owner has catched a CloseVetoException after calling close(true)" );
 #endif
@@ -263,7 +260,7 @@ void ChartController::TheModel::tryTermination()
     catch( uno::Exception& ex)
     {
         (void)(ex); // no warning in non-debug builds
-        OSL_ENSURE( sal_False, ( rtl::OString("Termination of model failed: ")
+        OSL_FAIL( ( rtl::OString("Termination of model failed: ")
             + rtl::OUStringToOString( ex.Message, RTL_TEXTENCODING_ASCII_US ) ).getStr() );
     }
 }
@@ -334,7 +331,7 @@ sal_Bool ChartController::TheModelRef::is() const
 
     if( m_bSuspended )
     {
-        OSL_ENSURE( sal_False, "This Controller is suspended" );
+        OSL_FAIL( "This Controller is suspended" );
         return sal_True;
     }
     return sal_False;
@@ -351,7 +348,7 @@ APPHELPER_XSERVICEINFO_IMPL(ChartController,CHART_CONTROLLER_SERVICE_IMPLEMENTAT
 {
     uno::Sequence< rtl::OUString > aSNS( 2 );
     aSNS.getArray()[ 0 ] = CHART_CONTROLLER_SERVICE_NAME;
-    aSNS.getArray()[ 1 ] = ::rtl::OUString::createFromAscii("com.sun.star.frame.Controller");
+    aSNS.getArray()[ 1 ] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Controller" ) );
     //// @todo : add additional services if you support any further
     return aSNS;
 }
@@ -364,7 +361,7 @@ APPHELPER_XSERVICEINFO_IMPL(ChartController,CHART_CONTROLLER_SERVICE_IMPLEMENTAT
 ::attachFrame( const uno::Reference<frame::XFrame>& xFrame )
         throw(uno::RuntimeException)
 {
-    ::vos::OGuard aGuard( Application::GetSolarMutex());
+    SolarMutexGuard aGuard;
 
     if( impl_isDisposedOrSuspended() ) //@todo? allow attaching the frame while suspended?
         return; //behave passive if already disposed or suspended
@@ -372,7 +369,7 @@ APPHELPER_XSERVICEINFO_IMPL(ChartController,CHART_CONTROLLER_SERVICE_IMPLEMENTAT
     if(m_xFrame.is()) //what happens, if we do have a Frame already??
     {
         //@todo? throw exception?
-        OSL_ENSURE( sal_False, "there is already a frame attached to the controller" );
+        OSL_FAIL( "there is already a frame attached to the controller" );
         return;
     }
 
@@ -413,7 +410,7 @@ APPHELPER_XSERVICEINFO_IMPL(ChartController,CHART_CONTROLLER_SERVICE_IMPLEMENTAT
         awt::Size aPageSize( ChartModelHelper::getPageSize(getModel()) );
 
         // calls to VCL
-        ::vos::OGuard aSolarGuard( Application::GetSolarMutex());
+        SolarMutexGuard aSolarGuard;
         m_pChartWindow = new ChartWindow(this,pParent,pParent?pParent->GetStyle():0);
         m_pChartWindow->SetBackground();//no Background
         m_xViewWindow = uno::Reference< awt::XWindow >( m_pChartWindow->GetComponentInterface(), uno::UNO_QUERY );
@@ -475,7 +472,7 @@ void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent
     if( rEvent.NewMode.equals(C2U("dirty")) )
     {
         //the view has become dirty, we should repaint it if we have a window
-        ::vos::OGuard aGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aGuard;
         if( m_pChartWindow )
             m_pChartWindow->ForceInvalidate();
     }
@@ -483,13 +480,12 @@ void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent
     {
         //the view is about to become invalid so end all actions on it
         impl_invalidateAccessible();
-        ::vos::OGuard aGuard( Application::GetSolarMutex());
+        SolarMutexGuard aGuard;
         if( m_pDrawViewWrapper && m_pDrawViewWrapper->IsTextEdit() )
             this->EndTextEdit();
         if( m_pDrawViewWrapper )
         {
             m_pDrawViewWrapper->UnmarkAll();
-            //m_pDrawViewWrapper->hideMarkHandles(); todo??
             m_pDrawViewWrapper->HideSdrPage();
         }
     }
@@ -506,7 +502,7 @@ void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent
                 if(m_pDrawModelWrapper)
                 {
                     {
-                        ::vos::OGuard aGuard( Application::GetSolarMutex());
+                        SolarMutexGuard aGuard;
                         if( m_pDrawViewWrapper )
                             m_pDrawViewWrapper->ReInit();
                     }
@@ -520,7 +516,7 @@ void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent
                     impl_initializeAccessible();
 
                     {
-                        ::vos::OGuard aGuard( Application::GetSolarMutex() );
+                        SolarMutexGuard aGuard;
                         if( m_pChartWindow )
                             m_pChartWindow->Invalidate();
                     }
@@ -532,8 +528,7 @@ void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent
     }
 }
 
-        sal_Bool SAL_CALL ChartController
-::attachModel( const uno::Reference< frame::XModel > & xModel )
+sal_Bool SAL_CALL ChartController::attachModel( const uno::Reference< frame::XModel > & xModel )
         throw(uno::RuntimeException)
 {
     impl_invalidateAccessible();
@@ -541,12 +536,11 @@ void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent
     //is called to attach the controller to a new model.
     //return true if attach was successfully, false otherwise (e.g. if you do not work with a model)
 
-    ::vos::OClearableGuard aClearableGuard( Application::GetSolarMutex());
+    SolarMutexClearableGuard aClearableGuard;
     if( impl_isDisposedOrSuspended() ) //@todo? allow attaching a new model while suspended?
         return sal_False; //behave passive if already disposed or suspended
     aClearableGuard.clear();
 
-
     TheModelRef aNewModelRef( new TheModel( xModel), m_aModelMutex);
     TheModelRef aOldModelRef(m_aModel,m_aModelMutex);
     m_aModel = aNewModelRef;
@@ -560,9 +554,7 @@ void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent
         m_pDrawModelWrapper.reset();
 
         aOldModelRef->removeListener( this );
-        //@todo?? termination correct?
-//      aOldModelRef->tryTermination();
-#ifdef TEST_ENABLE_MODIFY_LISTENER
+ #ifdef TEST_ENABLE_MODIFY_LISTENER
         uno::Reference< util::XModifyBroadcaster > xMBroadcaster( aOldModelRef->getModel(),uno::UNO_QUERY );
         if( xMBroadcaster.is())
             xMBroadcaster->removeModifyListener( this );
@@ -617,7 +609,7 @@ void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent
 
     //the frameloader is responsible to call xModel->connectController
     {
-        ::vos::OGuard aGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aGuard;
         if( m_pChartWindow )
             m_pChartWindow->Invalidate();
     }
@@ -658,7 +650,7 @@ void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent
     //set of data that can be used to restore the current view status at later time
     //  by using XController::restoreViewData()
 
-    ::vos::OGuard aGuard( Application::GetSolarMutex());
+    SolarMutexGuard aGuard;
     if( impl_isDisposedOrSuspended() )
         return uno::Any(); //behave passive if already disposed or suspended //@todo? or throw an exception??
 
@@ -675,7 +667,7 @@ void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent
 {
     //restores the view status using the data gotten from a previous call to XController::getViewData()
 
-    ::vos::OGuard aGuard( Application::GetSolarMutex());
+    SolarMutexGuard aGuard;
     if( impl_isDisposedOrSuspended() )
         return; //behave passive if already disposed or suspended //@todo? or throw an exception??
 
@@ -693,49 +685,33 @@ void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent
 
     //we may show dialogs here to ask the user for saving changes ... @todo?
 
-    ::vos::OGuard aGuard( Application::GetSolarMutex());
+    SolarMutexGuard aGuard;
     if( m_aLifeTimeManager.impl_isDisposed() )
         return sal_False; //behave passive if already disposed, return false because request was not accepted //@todo? correct
 
     if(bSuspend==m_bSuspended)
     {
-        OSL_ENSURE( sal_False, "new suspend mode equals old suspend mode" );
+        OSL_FAIL( "new suspend mode equals old suspend mode" );
         return sal_True;
     }
 
     //change suspend mode
     if(bSuspend)
     {
-        //aGuard.clear();
-        //@todo ???  try to stop all what may prevent me from becoming disposed
-        //aGuard.reset();
-
         m_bSuspended = bSuspend;
         return sal_True;
     }
     else
     {
-        //aGuard.clear();
-        //@todo ??? redo what was made in section bSuspend==true
-        //aGuard.reset();
-
         m_bSuspended = bSuspend;
     }
     return sal_True;
-
-
-    /*
-    if ( bSuspend )
-        getFrame()->removeFrameActionListener( pImp );
-    else
-        getFrame()->addFrameActionListener( pImp );
-        */
 }
 
 
 void ChartController::impl_createDrawViewController()
 {
-    ::vos::OGuard aGuard( Application::GetSolarMutex());
+    SolarMutexGuard aGuard;
     if(!m_pDrawViewWrapper)
     {
         if( m_pDrawModelWrapper )
@@ -749,7 +725,7 @@ void ChartController::impl_deleteDrawViewController()
 {
     if( m_pDrawViewWrapper )
     {
-        ::vos::OGuard aGuard( Application::GetSolarMutex());
+        SolarMutexGuard aGuard;
         if( m_pDrawViewWrapper->IsTextEdit() )
             this->EndTextEdit();
         DELETEZ( m_pDrawViewWrapper );
@@ -789,7 +765,6 @@ void ChartController::impl_deleteDrawViewController()
             {
                 uno::Reference< frame::XController > xController( this );
                 uno::Reference< lang::XComponent > xComp( xController, uno::UNO_QUERY );
-                //lang::EventObject aEvent( static_cast< lang::XComponent* >( this ) );
                 lang::EventObject aEvent( xComp );
                 xSelectionChangeListener->disposing( aEvent );
             }
@@ -800,9 +775,9 @@ void ChartController::impl_deleteDrawViewController()
             uno::Reference< util::XModeChangeBroadcaster > xViewBroadcaster( m_xChartView, uno::UNO_QUERY );
             if( xViewBroadcaster.is() )
                 xViewBroadcaster->removeModeChangeListener(this);
-            // /--
+
             impl_invalidateAccessible();
-            ::vos::OGuard aSolarGuard( Application::GetSolarMutex());
+            SolarMutexGuard aSolarGuard;
             impl_deleteDrawViewController();
             m_pDrawModelWrapper.reset();
 
@@ -813,7 +788,6 @@ void ChartController::impl_deleteDrawViewController()
             m_pChartWindow = NULL;//m_pChartWindow is deleted via UNO due to dispose of m_xViewWindow (trigerred by Framework (Controller pretends to be XWindow also))
             m_xViewWindow->dispose();
             m_xChartView.clear();
-            // \--
         }
 
         // remove as listener to layout manager events
@@ -866,7 +840,7 @@ void ChartController::impl_deleteDrawViewController()
 ::addEventListener( const uno::Reference<lang::XEventListener>& xListener )
         throw(uno::RuntimeException)
 {
-    ::vos::OGuard aGuard( Application::GetSolarMutex());
+    SolarMutexGuard aGuard;
     if( impl_isDisposedOrSuspended() )//@todo? allow adding of listeners in suspend mode?
         return; //behave passive if already disposed or suspended
 
@@ -879,7 +853,7 @@ void ChartController::impl_deleteDrawViewController()
         lang::XEventListener>& xListener )
         throw(uno::RuntimeException)
 {
-    ::vos::OGuard aGuard( Application::GetSolarMutex());
+    SolarMutexGuard aGuard;
     if( m_aLifeTimeManager.impl_isDisposed(false) )
         return; //behave passive if already disposed or suspended
 
@@ -904,7 +878,7 @@ void ChartController::impl_deleteDrawViewController()
 
     if( !(aModelRef->getModel() == rSource.Source) )
     {
-        OSL_ENSURE( sal_False, "queryClosing was called on a controller from an unknown source" );
+        OSL_FAIL( "queryClosing was called on a controller from an unknown source" );
         return;
     }
 
@@ -1097,7 +1071,7 @@ bool lcl_isFormatObjectCommand( const rtl::OString& aCommand )
             , const uno::Sequence< beans::PropertyValue >& rArgs )
             throw (uno::RuntimeException)
 {
-    //@todo avoid OString (see Mathias mail on bug #104387#)
+    //@todo avoid OString
     rtl::OString aCommand( rtl::OUStringToOString( rURL.Path, RTL_TEXTENCODING_ASCII_US ) );
 
     if(aCommand.equals("Paste"))
@@ -1112,7 +1086,7 @@ bool lcl_isFormatObjectCommand( const rtl::OString& aCommand )
     else if(aCommand.equals("Update")) //Update Chart
     {
         ChartViewHelper::setViewToDirtyState( getModel() );
-        ::vos::OGuard aGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aGuard;
         if( m_pChartWindow )
             m_pChartWindow->Invalidate();
     }
@@ -1208,8 +1182,6 @@ bool lcl_isFormatObjectCommand( const rtl::OString& aCommand )
     else if( lcl_isFormatObjectCommand(aCommand) )
         this->executeDispatch_FormatObject(rURL.Path);
     //more format
-//MENUCHANGE    else if(aCommand.equals("SelectSourceRanges"))
-//MENUCHANGE        this->executeDispatch_SourceData();
     else if( aCommand.equals("DiagramType"))
         this->executeDispatch_ChartType();
     else if( aCommand.equals("View3D"))
@@ -1269,11 +1241,6 @@ bool lcl_isFormatObjectCommand( const rtl::OString& aCommand )
             }
         }
     }
-
-    /*
-    case SID_TEXTEDIT:
-        this->executeDispatch_EditText();
-    */
 }
 
     void SAL_CALL ChartController
@@ -1281,13 +1248,7 @@ bool lcl_isFormatObjectCommand( const rtl::OString& aCommand )
             , const util::URL& /* aURL */ )
             throw (uno::RuntimeException)
 {
-//     // TODO: add listener by URL !
-//  ::vos::OGuard aGuard( Application::GetSolarMutex());
-//  if( impl_isDisposedOrSuspended() )//@todo? allow adding of listeners in suspend mode?
-//      return; //behave passive if already disposed or suspended
-
-//  //--add listener
-//      m_aLifeTimeManager.m_aListenerContainer.addInterface( ::getCppuType( & xControl ), xControl );
+    //@todo
 }
 
     void SAL_CALL ChartController
@@ -1295,13 +1256,7 @@ bool lcl_isFormatObjectCommand( const rtl::OString& aCommand )
             , const util::URL& /* aURL */ )
             throw (uno::RuntimeException)
 {
-//     // TODO: remove listener by URL !
-//  ::vos::OGuard aGuard( Application::GetSolarMutex());
-//     if( m_aLifeTimeManager.impl_isDisposed() )
-//      return; //behave passive if already disposed or suspended
-
-//  //--remove listener
-//  m_aLifeTimeManager.m_aListenerContainer.removeInterface( ::getCppuType( & xControl ), xControl );
+    //@todo
 }
 
 //-----------------------------------------------------------------
@@ -1336,8 +1291,7 @@ void SAL_CALL ChartController::executeDispatch_ChartType()
     UndoLiveUpdateGuard aUndoGuard = UndoLiveUpdateGuard(
         String( SchResId( STR_ACTION_EDIT_CHARTTYPE )), m_xUndoManager );
 
-    // /--
-    ::vos::OGuard aSolarGuard( Application::GetSolarMutex());
+    SolarMutexGuard aSolarGuard;
     //prepare and open dialog
     ChartTypeDialog aDlg( m_pChartWindow, getModel(), m_xCC );
     if( aDlg.Execute() == RET_OK )
@@ -1345,7 +1299,6 @@ void SAL_CALL ChartController::executeDispatch_ChartType()
         impl_adaptDataSeriesAutoResize();
         aUndoGuard.commit();
     }
-    // \--
 }
 
 void SAL_CALL ChartController::executeDispatch_SourceData()
@@ -1353,7 +1306,7 @@ void SAL_CALL ChartController::executeDispatch_SourceData()
     //-------------------------------------------------------------
     //convert properties to ItemSet
     uno::Reference< XChartDocument >   xChartDoc( getModel(), uno::UNO_QUERY );
-    DBG_ASSERT( xChartDoc.is(), "Invalid XChartDocument" );
+    OSL_ENSURE( xChartDoc.is(), "Invalid XChartDocument" );
     if( !xChartDoc.is())
         return;
 
@@ -1362,15 +1315,13 @@ void SAL_CALL ChartController::executeDispatch_SourceData()
         String( SchResId( STR_ACTION_EDIT_DATA_RANGES )), m_xUndoManager );
     if( xChartDoc.is())
     {
-        // /--
-        ::vos::OGuard aSolarGuard( Application::GetSolarMutex());
+        SolarMutexGuard aSolarGuard;
         ::chart::DataSourceDialog aDlg( m_pChartWindow, xChartDoc, m_xCC );
         if( aDlg.Execute() == RET_OK )
         {
             impl_adaptDataSeriesAutoResize();
             aUndoGuard.commit();
         }
-        // \--
     }
 }
 
@@ -1424,14 +1375,8 @@ uno::Sequence< ::rtl::OUString > SAL_CALL
     ChartController::getAvailableServiceNames()
     throw (uno::RuntimeException)
 {
-    static uno::Sequence< ::rtl::OUString > aServiceNames;
-
-    if( aServiceNames.getLength() == 0 )
-    {
-        aServiceNames.realloc(1);
-        aServiceNames[0] = CHART_ACCESSIBLE_TEXT_SERVICE_NAME;
-    }
-
+    uno::Sequence< ::rtl::OUString > aServiceNames(1);
+    aServiceNames[0] = CHART_ACCESSIBLE_TEXT_SERVICE_NAME;
     return aServiceNames;
 }
 
@@ -1441,15 +1386,10 @@ void SAL_CALL ChartController::modified( const lang::EventObject& /* aEvent */ )
 {
     // the source can also be a subobject of the ChartModel
     // @todo: change the source in ChartModel to always be the model itself ?
-//     if( getModel() == aEvent.Source )
-
-
     //todo? update menu states ?
 }
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 
 IMPL_LINK( ChartController, NotifyUndoActionHdl, SdrUndoAction*, pUndoAction )
 {
@@ -1506,7 +1446,7 @@ uno::Reference< XAccessible > ChartController::CreateAccessible()
 
 void ChartController::impl_invalidateAccessible()
 {
-    ::vos::OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
     if( m_pChartWindow )
     {
         Reference< lang::XInitialization > xInit( m_pChartWindow->GetAccessible(false), uno::UNO_QUERY );
@@ -1519,7 +1459,7 @@ void ChartController::impl_invalidateAccessible()
 }
 void ChartController::impl_initializeAccessible()
 {
-    ::vos::OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
     if( m_pChartWindow )
         this->impl_initializeAccessible( Reference< lang::XInitialization >( m_pChartWindow->GetAccessible(false), uno::UNO_QUERY ) );
 }
@@ -1535,7 +1475,7 @@ void ChartController::impl_initializeAccessible( const uno::Reference< lang::XIn
         aArguments[2]=uno::makeAny(m_xChartView);
         uno::Reference< XAccessible > xParent;
         {
-            ::vos::OGuard aGuard( Application::GetSolarMutex() );
+            SolarMutexGuard aGuard;
             if( m_pChartWindow )
             {
                 Window* pParentWin( m_pChartWindow->GetAccessibleParentWindow());
@@ -1577,7 +1517,6 @@ void ChartController::impl_initializeAccessible( const uno::Reference< lang::XIn
         ( C2U("DeleteYErrorBars") )
         ( C2U("DeleteDataLabels") )   ( C2U("DeleteDataLabel") )
         //format objects
-//MENUCHANGE            ( C2U("SelectSourceRanges") )
         ( C2U("FormatSelection") )     ( C2U("TransformDialog") )
         ( C2U("DiagramType") )        ( C2U("View3D") )
         ( C2U("Forward") )            ( C2U("Backward") )
@@ -1621,3 +1560,5 @@ void ChartController::impl_initializeAccessible( const uno::Reference< lang::XIn
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/ChartController.hxx b/chart2/source/controller/main/ChartController.hxx
index f61dd48682e5..72e13fac33ad 100644
--- a/chart2/source/controller/main/ChartController.hxx
+++ b/chart2/source/controller/main/ChartController.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -520,7 +521,7 @@ private:
             void        removeListener(  ChartController* pController );
             void        tryTermination();
             ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
-                        getModel() { return m_xModel;}
+                        getModel() const { return m_xModel;}
 
         private:
             ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >     m_xModel;
@@ -546,7 +547,7 @@ private:
                 TheModel* operator->() const { return m_pTheModel; }
         private:
             TheModel*               m_pTheModel;
-            mutable ::osl::Mutex&   m_rModelMutex;
+            ::osl::Mutex&   m_rModelMutex;
     };
 
 private:
@@ -681,7 +682,6 @@ private:
     void impl_ShapeControllerDispatch( const ::com::sun::star::util::URL& rURL,
         const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs );
 
-    //
     DECL_LINK( DoubleClickWaitingHdl, void* );
     void execute_DoubleClick( const Point* pMousePixel = NULL );
     void startDoubleClickWaiting();
@@ -738,3 +738,4 @@ private:
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/ChartController_EditData.cxx b/chart2/source/controller/main/ChartController_EditData.cxx
index 7c9bfe0c3986..666ef87eb881 100644
--- a/chart2/source/controller/main/ChartController_EditData.cxx
+++ b/chart2/source/controller/main/ChartController_EditData.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -41,7 +42,7 @@
 // for RET_OK
 #include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <com/sun/star/chart2/XChartDocument.hpp>
 
 using namespace ::com::sun::star;
@@ -62,8 +63,7 @@ void ChartController::executeDispatch_EditData()
         Reference< ::com::sun::star::chart2::data::XDataProvider > xDataProvider( xChartDoc->getDataProvider());
 
         {
-            // /--
-            ::vos::OGuard aSolarGuard( Application::GetSolarMutex());
+            SolarMutexGuard aSolarGuard;
             // using assignment for broken gcc 3.3
             UndoLiveUpdateGuardWithData aUndoGuard = UndoLiveUpdateGuardWithData(
                 String( SchResId( STR_ACTION_EDIT_CHART_DATA )),
@@ -72,9 +72,10 @@ void ChartController::executeDispatch_EditData()
             // the dialog has no OK/Cancel
             aDataEditorDialog.Execute();
             aUndoGuard.commit();
-            // \--
         }
     }
 }
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx
index b6928ac99284..238009d9a8d3 100644
--- a/chart2/source/controller/main/ChartController_Insert.cxx
+++ b/chart2/source/controller/main/ChartController_Insert.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -75,7 +76,7 @@
 // header for class Application
 #include <vcl/svapp.hxx>
 // header for class ::vos::OGuard
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 
 
 using namespace ::com::sun::star;
@@ -131,7 +132,7 @@ void ChartController::executeDispatch_InsertAxes()
         AxisHelper::getAxisOrGridExcistence( aDialogInput.aExistenceList, xDiagram, sal_True );
         AxisHelper::getAxisOrGridPossibilities( aDialogInput.aPossibilityList, xDiagram, sal_True );
 
-        ::vos::OGuard aGuard( Application::GetSolarMutex());
+        SolarMutexGuard aGuard;
         SchAxisDlg aDlg( m_pChartWindow, aDialogInput );
         if( aDlg.Execute() == RET_OK )
         {
@@ -169,7 +170,7 @@ void ChartController::executeDispatch_InsertGrid()
         AxisHelper::getAxisOrGridExcistence( aDialogInput.aExistenceList, xDiagram, sal_False );
         AxisHelper::getAxisOrGridPossibilities( aDialogInput.aPossibilityList, xDiagram, sal_False );
 
-        ::vos::OGuard aGuard( Application::GetSolarMutex());
+        SolarMutexGuard aGuard;
         SchGridDlg aDlg( m_pChartWindow, aDialogInput );//aItemSet, b3D, bNet, bSecondaryX, bSecondaryY );
         if( aDlg.Execute() == RET_OK )
         {
@@ -204,7 +205,7 @@ void ChartController::executeDispatch_InsertTitles()
         TitleDialogData aDialogInput;
         aDialogInput.readFromModel( getModel() );
 
-        ::vos::OGuard aGuard( Application::GetSolarMutex());
+        SolarMutexGuard aGuard;
         SchTitleDlg aDlg( m_pChartWindow, aDialogInput );
         if( aDlg.Execute() == RET_OK )
         {
@@ -255,7 +256,7 @@ void ChartController::executeDispatch_OpenLegendDialog()
     try
     {
         //prepare and open dialog
-        ::vos::OGuard aGuard( Application::GetSolarMutex());
+        SolarMutexGuard aGuard;
         SchLegendDlg aDlg( m_pChartWindow, m_xCC );
         aDlg.init( getModel() );
         if( aDlg.Execute() == RET_OK )
@@ -313,7 +314,7 @@ void ChartController::executeDispatch_InsertMenu_DataLabels()
         aItemConverter.FillItemSet( aItemSet );
 
         //prepare and open dialog
-        ::vos::OGuard aGuard( Application::GetSolarMutex());
+        SolarMutexGuard aGuard;
 
         //get number formatter
         uno::Reference< util::XNumberFormatsSupplier > xNumberFormatsSupplier( getModel(), uno::UNO_QUERY );
@@ -364,7 +365,7 @@ void ChartController::executeDispatch_InsertMenu_YErrorBars()
         aItemConverter.FillItemSet( aItemSet );
 
         //prepare and open dialog
-        ::vos::OGuard aGuard( Application::GetSolarMutex());
+        SolarMutexGuard aGuard;
         InsertErrorBarsDialog aDlg(
             m_pChartWindow, aItemSet,
             uno::Reference< chart2::XChartDocument >( getModel(), uno::UNO_QUERY ));
@@ -447,7 +448,7 @@ void ChartController::executeDispatch_InsertMenu_Trendlines()
         aItemConverter.FillItemSet( aItemSet );
 
         //prepare and open dialog
-        ::vos::OGuard aGuard( Application::GetSolarMutex());
+        SolarMutexGuard aGuard;
         InsertTrendlineDialog aDlg( m_pChartWindow, aItemSet );
         aDlg.adjustSize();
 
@@ -504,7 +505,7 @@ void ChartController::executeDispatch_InsertTrendline()
                 RegressionCurveHelper::getRegressionCurveIndex( xRegCurveCnt, xCurve ), false ));
         aDialogParameter.init( getModel() );
         ViewElementListProvider aViewElementListProvider( m_pDrawModelWrapper.get());
-        ::vos::OGuard aGuard( Application::GetSolarMutex());
+        SolarMutexGuard aGuard;
         SchAttribTabDlg aDlg( m_pChartWindow, &aItemSet, &aDialogParameter, &aViewElementListProvider,
                               uno::Reference< util::XNumberFormatsSupplier >( getModel(), uno::UNO_QUERY ));
 
@@ -552,7 +553,7 @@ void ChartController::executeDispatch_InsertYErrorBars()
                 OBJECTTYPE_DATA_ERRORS, ::rtl::OUString(), m_aSelection.getSelectedCID()));
         aDialogParameter.init( getModel() );
         ViewElementListProvider aViewElementListProvider( m_pDrawModelWrapper.get());
-        ::vos::OGuard aGuard( Application::GetSolarMutex());
+        SolarMutexGuard aGuard;
         SchAttribTabDlg aDlg( m_pChartWindow, &aItemSet, &aDialogParameter, &aViewElementListProvider,
                               uno::Reference< util::XNumberFormatsSupplier >( getModel(), uno::UNO_QUERY ));
         aDlg.SetAxisMinorStepWidthForErrorBarDecimals(
@@ -789,15 +790,6 @@ void ChartController::executeDispatch_InsertAxisTitle()
             xTitle = TitleHelper::createTitle( eTitleType, ObjectNameProvider::getTitleNameByType(eTitleType), getModel(), m_xCC, apRefSizeProvider.get() );
             aUndoGuard.commit();
         }
-
-        /*
-        if( xTitle.is() )
-        {
-            OUString aTitleCID = ObjectIdentifier::createClassifiedIdentifierForObject( xTitle, getModel() );
-            select( uno::makeAny(aTitleCID) );
-            executeDispatch_EditText();
-        }
-        */
     }
     catch( uno::RuntimeException& e)
     {
@@ -944,3 +936,5 @@ void ChartController::executeDispatch_DeleteMinorGrid()
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/ChartController_Position.cxx b/chart2/source/controller/main/ChartController_Position.cxx
index d42d3112f67c..d5d5fcc6ded8 100644
--- a/chart2/source/controller/main/ChartController_Position.cxx
+++ b/chart2/source/controller/main/ChartController_Position.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -50,7 +51,7 @@
 #include <svx/svxdlg.hxx>
 #include <svx/dialogs.hrc>
 #include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 
 //.............................................................................
 namespace chart
@@ -153,12 +154,12 @@ void SAL_CALL ChartController::executeDispatch_PositionAndSize()
         SdrView* pSdrView = m_pDrawViewWrapper;
         bool bResizePossible = m_aSelection.isResizeableObjectSelected();
 
-        ::vos::OGuard aGuard( Application::GetSolarMutex());
+        SolarMutexGuard aGuard;
         SvxAbstractDialogFactory * pFact = SvxAbstractDialogFactory::Create();
-        DBG_ASSERT( pFact, "No dialog factory" );
+        OSL_ENSURE( pFact, "No dialog factory" );
         pDlg = pFact->CreateSchTransformTabDialog(
             m_pChartWindow, &aItemSet, pSdrView, RID_SCH_TransformTabDLG_SVXPAGE_ANGLE, bResizePossible );
-        DBG_ASSERT( pDlg, "Couldn't create SchTransformTabDialog" );
+        OSL_ENSURE( pDlg, "Couldn't create SchTransformTabDialog" );
 
 
         if( pDlg->Execute() == RET_OK )
@@ -194,3 +195,5 @@ void SAL_CALL ChartController::executeDispatch_PositionAndSize()
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx
index 29f1bfa9f389..a84dccbaa2ef 100644
--- a/chart2/source/controller/main/ChartController_Properties.cxx
+++ b/chart2/source/controller/main/ChartController_Properties.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -69,7 +70,7 @@
 #include <vcl/msgbox.hxx>
 // for SolarMutex
 #include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <svx/ActionDescriptionProvider.hxx>
 
 //.............................................................................
@@ -102,10 +103,10 @@ namespace
     ObjectType eObjectType = ObjectIdentifier::getObjectType( aObjectCID );
     if( OBJECTTYPE_UNKNOWN==eObjectType )
     {
-        DBG_ERROR("unknown ObjectType");
+        OSL_FAIL("unknown ObjectType");
         return NULL;
     }
-    //--
+
     rtl::OUString aParticleID = ObjectIdentifier::getParticleID( aObjectCID );
     bool bAffectsMultipleObjects = aParticleID.equals(C2U("ALLELEMENTS"));
     //-------------------------------------------------------------
@@ -208,13 +209,7 @@ namespace
                 sal_Int32 nDimensionCount = DiagramHelper::getDimension( xDiagram );
                 if( !ChartTypeHelper::isSupportingAreaProperties( xChartType, nDimensionCount ) )
                     eMapTo = wrapper::GraphicPropertyItemConverter::LINE_DATA_POINT;
-                /*
-                FILLED_DATA_POINT,
-                LINE_DATA_POINT,
-                LINE_PROPERTIES,
-                FILL_PROPERTIES,
-                LINE_AND_FILL_PROPERTIES
-                */
+
                 bool bDataSeries = ( eObjectType == OBJECTTYPE_DATA_SERIES || eObjectType == OBJECTTYPE_DATA_LABELS );
 
                 //special color for pie chart:
@@ -733,8 +728,7 @@ bool ChartController::executeDlg_ObjectProperties_withoutUndoGuard( const ::rtl:
     bool bRet = false;
     if( !rObjectCID.getLength() )
     {
-        //DBG_ERROR("empty ObjectID");
-        return bRet;
+       return bRet;
     }
     try
     {
@@ -745,7 +739,6 @@ bool ChartController::executeDlg_ObjectProperties_withoutUndoGuard( const ::rtl:
         ObjectType eObjectType = ObjectIdentifier::getObjectType( rObjectCID );
         if( OBJECTTYPE_UNKNOWN==eObjectType )
         {
-            //DBG_ERROR("unknown ObjectType");
             return bRet;
         }
         if( OBJECTTYPE_DIAGRAM_WALL==eObjectType || OBJECTTYPE_DIAGRAM_FLOOR==eObjectType )
@@ -779,7 +772,7 @@ bool ChartController::executeDlg_ObjectProperties_withoutUndoGuard( const ::rtl:
         aDialogParameter.init( getModel() );
         ViewElementListProvider aViewElementListProvider( m_pDrawModelWrapper.get() );
 
-        ::vos::OGuard aGuard( Application::GetSolarMutex());
+        SolarMutexGuard aGuard;
         SchAttribTabDlg aDlg( m_pChartWindow, &aItemSet, &aDialogParameter, &aViewElementListProvider
             , uno::Reference< util::XNumberFormatsSupplier >( getModel(), uno::UNO_QUERY ) );
 
@@ -841,13 +834,11 @@ void SAL_CALL ChartController::executeDispatch_View3D()
             String( SchResId( STR_ACTION_EDIT_3D_VIEW )),
             m_xUndoManager );
 
-        // /--
         //open dialog
-        ::vos::OGuard aSolarGuard( Application::GetSolarMutex());
+        SolarMutexGuard aSolarGuard;
         View3DDialog aDlg( m_pChartWindow, getModel(), m_pDrawModelWrapper->GetColorTable() );
         if( aDlg.Execute() == RET_OK )
             aUndoGuard.commit();
-        // \--
     }
     catch( uno::RuntimeException& e)
     {
@@ -858,3 +849,5 @@ void SAL_CALL ChartController::executeDispatch_View3D()
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx
index 910dcb962731..891285c9eb39 100644
--- a/chart2/source/controller/main/ChartController_TextEdit.cxx
+++ b/chart2/source/controller/main/ChartController_TextEdit.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -48,11 +49,9 @@
 // header for class SdrOutliner
 #include <svx/svdoutl.hxx>
 #include <svx/svxdlg.hxx>
-#ifndef _SVX_DIALOGS_HRC
 #include <svx/dialogs.hrc>
-#endif
 #include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <svl/stritem.hxx>
 #include <editeng/fontitem.hxx>
@@ -62,7 +61,6 @@ namespace chart
 {
 //.............................................................................
 using namespace ::com::sun::star;
-//using namespace ::com::sun::star::chart2;
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
@@ -79,7 +77,7 @@ void ChartController::StartTextEdit( const Point* pMousePixel )
 {
     //the first marked object will be edited
 
-    ::vos::OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
     SdrObject* pTextObj = m_pDrawViewWrapper->getTextEditObject();
     if(!pTextObj)
         return;
@@ -88,10 +86,6 @@ void ChartController::StartTextEdit( const Point* pMousePixel )
     m_pTextActionUndoGuard.reset( new UndoGuard(
         String( SchResId( STR_ACTION_EDIT_TEXT ) ), m_xUndoManager ) );
     SdrOutliner* pOutliner = m_pDrawViewWrapper->getOutliner();
-    //pOutliner->SetRefDevice(m_pChartWindow);
-    //pOutliner->SetStyleSheetPool((SfxStyleSheetPool*)pStyleSheetPool);
-    //pOutliner->SetDefaultLanguage( eLang );
-    //pOutliner->SetHyphenator( xHyphenator );
 
     //#i77362 change notification for changes on additional shapes are missing
     uno::Reference< beans::XPropertySet > xChartViewProps( m_xChartView, uno::UNO_QUERY );
@@ -109,12 +103,6 @@ void ChartController::StartTextEdit( const Point* pMousePixel )
                     );
     if(bEdit)
     {
-        // set undo manager at topmost shell ( SdDrawTextObjectBar )
-        /*
-        if( pViewSh )
-            pViewSh->GetViewFrame()->GetDispatcher()->GetShell( 0 )->
-                SetUndoManager(&pOutliner->GetUndoManager());
-        */
         m_pDrawViewWrapper->SetEditMode();
 
         // #i12587# support for shapes in chart
@@ -184,13 +172,13 @@ bool ChartController::EndTextEdit()
 
 void SAL_CALL ChartController::executeDispatch_InsertSpecialCharacter()
 {
-    ::vos::OGuard aGuard( Application::GetSolarMutex());
+    SolarMutexGuard aGuard;
 
     if( m_pDrawViewWrapper && !m_pDrawViewWrapper->IsTextEdit() )
         this->StartTextEdit();
 
     SvxAbstractDialogFactory * pFact = SvxAbstractDialogFactory::Create();
-    DBG_ASSERT( pFact, "No dialog factory" );
+    OSL_ENSURE( pFact, "No dialog factory" );
 
     SfxAllItemSet aSet( m_pDrawModelWrapper->GetItemPool() );
     aSet.Put( SfxBoolItem( FN_PARAM_1, sal_False ) );
@@ -202,7 +190,7 @@ void SAL_CALL ChartController::executeDispatch_InsertSpecialCharacter()
     aSet.Put( SvxFontItem( aCurFont.GetFamily(), aCurFont.GetName(), aCurFont.GetStyleName(), aCurFont.GetPitch(), aCurFont.GetCharSet(), SID_ATTR_CHAR_FONT ) );
 
     SfxAbstractDialog * pDlg = pFact->CreateSfxDialog( m_pChartWindow, aSet, getFrame(), RID_SVXDLG_CHARMAP );
-    DBG_ASSERT( pDlg, "Couldn't create SvxCharacterMap dialog" );
+    OSL_ENSURE( pDlg, "Couldn't create SvxCharacterMap dialog" );
     if( pDlg->Execute() == RET_OK )
     {
         const SfxItemSet* pSet = pDlg->GetOutputItemSet();
@@ -228,17 +216,13 @@ void SAL_CALL ChartController::executeDispatch_InsertSpecialCharacter()
         // attributes become unique (sel. has to be erased anyway)
         pOutlinerView->InsertText(String());
 
-        //SfxUndoManager& rUndoMgr =  pOutliner->GetUndoManager();
-        //rUndoMgr.EnterListAction( String( SchResId( STR_UNDO_INSERT_SPECCHAR )), String( SchResId( STR_UNDO_INSERT_SPECCHAR )));
-        pOutlinerView->InsertText(aString, sal_True);
+        pOutlinerView->InsertText(aString, true);
 
         ESelection aSel = pOutlinerView->GetSelection();
         aSel.nStartPara = aSel.nEndPara;
         aSel.nStartPos = aSel.nEndPos;
         pOutlinerView->SetSelection(aSel);
 
-        //rUndoMgr.LeaveListAction();
-
         // show changes
         pOutliner->SetUpdateMode(sal_True);
         pOutlinerView->ShowCursor();
@@ -260,3 +244,5 @@ uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx
index 0282abcefdf7..22418d3bce86 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -77,7 +78,7 @@
 #include <unotools/streamwrap.hxx>
 // for SolarMutex
 #include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
 // for OutlinerView
@@ -154,51 +155,6 @@ bool lcl_deleteDataCurve(
     return bResult;
 }
 
-// void lcl_CopyPageContentToPage(
-//     const Reference< drawing::XDrawPage > & xSourcePage,
-//     const Reference< drawing::XDrawPage > & xDestPage )
-// {
-//     try
-//     {
-//         Reference< container::XIndexAccess > xSourceIA( xSourcePage, uno::UNO_QUERY_THROW );
-//         sal_Int32 nCount( xSourceIA->getCount());
-//         for( sal_Int32 i=0; i<nCount; ++i )
-//         {
-//             Reference< drawing::XShape > xShape;
-//             if( xSourceIA->getByIndex( i ) >>= xShape )
-//                 xDestPage->add( xShape );
-//         }
-//     }
-//     catch( const uno::Exception & ex )
-//     {
-//         ASSERT_EXCEPTION( ex );
-//     }
-// }
-
-// // copies all shapes on all pages of xSource to the only page of xDestination
-// void lcl_CopyShapesToChart(
-//     const Reference< frame::XModel > & xSource, const Reference< frame::XModel > & xDestination )
-// {
-//     try
-//     {
-//         Reference< drawing::XDrawPageSupplier > xDestPGSupp( xDestination, uno::UNO_QUERY_THROW );
-//         Reference< drawing::XDrawPage > xDestPage( xDestPGSupp->getDrawPage());
-//         Reference< drawing::XDrawPagesSupplier > xSourcePGsSupp( xSource, uno::UNO_QUERY_THROW );
-//         Reference< drawing::XDrawPages > xSourcePages( xSourcePGsSupp->getDrawPages());
-
-//         sal_Int32 nCount( xSourcePages->getCount());
-//         for( sal_Int32 i=0; i<nCount; ++i )
-//         {
-//             Reference< drawing::XDrawPage > xSourcePage( xSourcePages->getByIndex( i ), uno::UNO_QUERY_THROW );
-//             lcl_CopyPageContentToPage( xSourcePage, xDestPage );
-//         }
-//     }
-//     catch( const uno::Exception & ex )
-//     {
-//         ASSERT_EXCEPTION( ex );
-//     }
-// }
-
 } // anonymous namespace
 
 
@@ -286,7 +242,7 @@ void ChartController::executeDispatch_NewArrangement()
 
 void ChartController::executeDispatch_ScaleText()
 {
-    ::vos::OGuard aSolarGuard( Application::GetSolarMutex());
+    SolarMutexGuard aSolarGuard;
     // using assignment for broken gcc 3.3
     UndoGuard aUndoGuard = UndoGuard(
         String( SchResId( STR_ACTION_SCALE_TEXT )),
@@ -301,7 +257,7 @@ void ChartController::executeDispatch_ScaleText()
 
 void ChartController::executeDispatch_Paste()
 {
-    ::vos::OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
     if( m_pChartWindow )
     {
         Graphic aGraphic;
@@ -548,7 +504,7 @@ void ChartController::executeDispatch_Copy()
         {
             Reference< datatransfer::XTransferable > xTransferable;
             {
-                ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+                SolarMutexGuard aSolarGuard;
                 SdrObject* pSelectedObj = 0;
                 if ( m_pDrawModelWrapper )
                 {
@@ -639,7 +595,6 @@ bool ChartController::executeDispatch_Delete()
     bool bReturn = false;
 
     // remove the selected object
-    //
     rtl::OUString aCID( m_aSelection.getSelectedCID() );
     if( aCID.getLength() )
     {
@@ -838,7 +793,7 @@ bool ChartController::executeDispatch_Delete()
         //remove additional shape
         impl_ClearSelection();
         {
-            ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+            SolarMutexGuard aSolarGuard;
             if ( m_pDrawViewWrapper )
             {
                 m_pDrawViewWrapper->DeleteMarked();
@@ -926,3 +881,5 @@ void ChartController::impl_switchDiagramPositioningToExcludingPositioning()
 }
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index ed855296427b..f8a3e1d21a12 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -80,7 +81,7 @@
 // header for class SdrDragMethod
 #include <svx/svddrgmt.hxx>
 #include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 
 // for InfoBox
 #include <vcl/msgbox.hxx>
@@ -243,7 +244,7 @@ const short HITPIX=2; //hit-tolerance in pixel
             , sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags )
             throw (uno::RuntimeException)
 {
-    ::vos::OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
     uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
 
     if(xWindow.is() && m_pChartWindow)
@@ -508,7 +509,7 @@ void ChartController::execute_Paint( const Rectangle& rRect )
     try
     {
         uno::Reference< frame::XModel > xModel( getModel() );
-        //DBG_ASSERT( xModel.is(), "ChartController::execute_Paint: have no model to paint");
+        //OSL_ENSURE( xModel.is(), "ChartController::execute_Paint: have no model to paint");
         if( !xModel.is() )
             return;
 
@@ -518,7 +519,7 @@ void ChartController::execute_Paint( const Rectangle& rRect )
         {
             awt::Size aResolution(1000,1000);
             {
-                ::vos::OGuard aGuard( Application::GetSolarMutex());
+                SolarMutexGuard aGuard;
                 if( m_pChartWindow )
                 {
                     aResolution.Width = m_pChartWindow->GetSizePixel().Width();
@@ -534,7 +535,7 @@ void ChartController::execute_Paint( const Rectangle& rRect )
             xUpdatable->update();
 
         {
-            ::vos::OGuard aGuard( Application::GetSolarMutex());
+            SolarMutexGuard aGuard;
             DrawViewWrapper* pDrawViewWrapper = m_pDrawViewWrapper;
             if(pDrawViewWrapper)
                 pDrawViewWrapper->CompleteRedraw(m_pChartWindow, Region(rRect) );
@@ -561,7 +562,7 @@ bool isDoubleClick( const MouseEvent& rMEvt )
 
 void ChartController::startDoubleClickWaiting()
 {
-    ::vos::OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
 
     m_bWaitingForDoubleClick = true;
 
@@ -588,7 +589,7 @@ IMPL_LINK( ChartController, DoubleClickWaitingHdl, void*, EMPTYARG )
     if( !m_bWaitingForMouseUp && m_aSelection.maybeSwitchSelectionAfterSingleClickWasEnsured() )
     {
         this->impl_selectObjectAndNotiy();
-        ::vos::OGuard aGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aGuard;
         if( m_pChartWindow )
         {
             Window::PointerState aPointerState( m_pChartWindow->GetPointerState() );
@@ -606,7 +607,7 @@ IMPL_LINK( ChartController, DoubleClickWaitingHdl, void*, EMPTYARG )
 
 void ChartController::execute_MouseButtonDown( const MouseEvent& rMEvt )
 {
-    ::vos::OGuard aGuard( Application::GetSolarMutex());
+    SolarMutexGuard aGuard;
 
     m_bWaitingForMouseUp = true;
 
@@ -749,7 +750,7 @@ void ChartController::execute_MouseButtonDown( const MouseEvent& rMEvt )
 
 void ChartController::execute_MouseMove( const MouseEvent& rMEvt )
 {
-    ::vos::OGuard aGuard( Application::GetSolarMutex());
+    SolarMutexGuard aGuard;
 
     DrawViewWrapper* pDrawViewWrapper = m_pDrawViewWrapper;
     if(!m_pChartWindow || !pDrawViewWrapper)
@@ -766,8 +767,6 @@ void ChartController::execute_MouseMove( const MouseEvent& rMEvt )
         pDrawViewWrapper->MovAction( m_pChartWindow->PixelToLogic( rMEvt.GetPosPixel() ) );
     }
 
-    //??    pDrawViewWrapper->GetPageView()->DragPoly();
-
     impl_SetMousePointer( rMEvt );
 }
 void ChartController::execute_Tracking( const TrackingEvent& /* rTEvt */ )
@@ -783,7 +782,7 @@ void ChartController::execute_MouseButtonUp( const MouseEvent& rMEvt )
     m_bWaitingForMouseUp = false;
     bool bNotifySelectionChange = false;
     {
-        ::vos::OGuard aGuard( Application::GetSolarMutex());
+        SolarMutexGuard aGuard;
 
         DrawViewWrapper* pDrawViewWrapper = m_pDrawViewWrapper;
         if(!m_pChartWindow || !pDrawViewWrapper)
@@ -978,7 +977,7 @@ void ChartController::execute_DoubleClick( const Point* pMousePixel )
 
 void ChartController::execute_Resize()
 {
-    ::vos::OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
     if(m_pChartWindow)
         m_pChartWindow->Invalidate();
 }
@@ -1005,7 +1004,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
 {
     bool bIsAction = false;
     {
-        ::vos::OGuard aGuard( Application::GetSolarMutex());
+        SolarMutexGuard aGuard;
         DrawViewWrapper* pDrawViewWrapper = m_pDrawViewWrapper;
         if(!m_pChartWindow || !pDrawViewWrapper)
             return;
@@ -1016,7 +1015,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
     if(rCEvt.GetCommand() == COMMAND_CONTEXTMENU && !bIsAction)
     {
         {
-            ::vos::OGuard aGuard( Application::GetSolarMutex() );
+            SolarMutexGuard aGuard;
             if(m_pChartWindow)
                 m_pChartWindow->ReleaseMouse();
         }
@@ -1033,7 +1032,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
             Point aPos( rCEvt.GetMousePosPixel() );
             if( !rCEvt.IsMouseEvent() )
             {
-                ::vos::OGuard aGuard( Application::GetSolarMutex() );
+                SolarMutexGuard aGuard;
                 if(m_pChartWindow)
                     aPos = m_pChartWindow->GetPointerState().maPos;
             }
@@ -1101,7 +1100,6 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
                         }
                     }
 
-                    //const sal_Int32 nIdBeforeFormat = nUniqueId;
                     if( bIsPoint )
                     {
                         if( bHasDataLabelAtPoint )
@@ -1153,10 +1151,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
                     if( bHasYErrorBars )
                         lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatYErrorBars") );
 
-                    //if( nIdBeforeFormat != nUniqueId )
-                        xPopupMenu->insertSeparator( -1 );
-
-                    //const sal_Int32 nIdBeforeInsert = nUniqueId;
+                    xPopupMenu->insertSeparator( -1 );
 
                     if( !bHasDataLabelsAtSeries )
                         lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertDataLabels") );
@@ -1169,10 +1164,6 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
                     if( !bHasYErrorBars )
                         lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertYErrorBars") );
 
-                    //if( nIdBeforeInsert != nUniqueId )
-                    //    xPopupMenu->insertSeparator( -1 );
-
-                    //const sal_Int32 nIdBeforeDelete = nUniqueId;
 
                     if( bHasDataLabelsAtSeries || ( bHasDataLabelsAtPoints && bHasFormattedDataPointsOtherThanSelected ) )
                         lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteDataLabels") );
@@ -1188,8 +1179,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
                     if( bHasFormattedDataPointsOtherThanSelected )
                         lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:ResetAllDataPoints"));
 
-                    //if( nIdBeforeDelete != nUniqueId )
-                        xPopupMenu->insertSeparator( -1 );
+                    xPopupMenu->insertSeparator( -1 );
 
                     lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId, C2U(".uno:ArrangeRow"));
                     uno::Reference< awt::XPopupMenu > xArrangePopupMenu(
@@ -1306,7 +1296,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
                 Point aPos( rCEvt.GetMousePosPixel() );
                 if( !rCEvt.IsMouseEvent() )
                 {
-                    ::vos::OGuard aGuard( Application::GetSolarMutex() );
+                    SolarMutexGuard aGuard;
                     if(m_pChartWindow)
                         aPos = m_pChartWindow->GetPointerState().maPos;
                 }
@@ -1320,7 +1310,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
              ( rCEvt.GetCommand() == COMMAND_INPUTCONTEXTCHANGE ) )
     {
         //#i84417# enable editing with IME
-        ::vos::OGuard aGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aGuard;
         if( m_pDrawViewWrapper )
             m_pDrawViewWrapper->Command( rCEvt, m_pChartWindow );
     }
@@ -1346,7 +1336,6 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt )
 
     KeyCode aKeyCode( rKEvt.GetKeyCode());
     sal_uInt16 nCode = aKeyCode.GetCode();
-//     bool bShift = aKeyCode.IsShift();
     bool bAlternate = aKeyCode.IsMod2();
 
     if( m_apAccelExecute.get() )
@@ -1355,7 +1344,7 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt )
         return bReturn;
 
     {
-        ::vos::OGuard aGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aGuard;
         if( pDrawViewWrapper->IsTextEdit() )
         {
             if( pDrawViewWrapper->KeyInput(rKEvt,m_pChartWindow) )
@@ -1369,8 +1358,6 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt )
         }
     }
 
-    //if( m_pDrawViewWrapper->IsAction() );
-
     // keyboard accessibility
     ObjectType eObjectType = ObjectIdentifier::getObjectType( m_aSelection.getSelectedCID() );
     if( ! bReturn )
@@ -1459,7 +1446,7 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt )
                     if( bAlternate && m_pChartWindow )
                     {
                         // together with Alt-key: 1 px in each direction
-                        ::vos::OGuard aGuard( Application::GetSolarMutex() );
+                        SolarMutexGuard aGuard;
                         if( m_pChartWindow )
                         {
                             Size aPixelSize = m_pChartWindow->PixelToLogic( Size( 2, 2 ));
@@ -1490,7 +1477,7 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt )
                     if( bAlternate && m_pChartWindow )
                     {
                         // together with Alt-key: 1 px
-                        ::vos::OGuard aGuard( Application::GetSolarMutex() );
+                        SolarMutexGuard aGuard;
                         if(m_pChartWindow)
                         {
                             Size aPixelSize = m_pChartWindow->PixelToLogic( Size( 1, 1 ));
@@ -1587,26 +1574,11 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt )
         bReturn = executeDispatch_Delete();
         if( ! bReturn )
         {
-            ::vos::OGuard aGuard( Application::GetSolarMutex() );
+            SolarMutexGuard aGuard;
             InfoBox( m_pChartWindow, String(SchResId( STR_ACTION_NOTPOSSIBLE ))).Execute();
         }
     }
 
-    /* old chart:
-    // Ctrl-Shift-R: Repaint
-    if (!bReturn && GetWindow())
-    {
-        KeyCode aKeyCode = rKEvt.GetKeyCode();
-
-        if (aKeyCode.IsMod1() && aKeyCode.IsShift()
-            && aKeyCode.GetCode() == KEY_R)
-        {
-                // 3D-Kontext wieder zerstoeren
-            GetWindow()->Invalidate();
-            bReturn = sal_True;
-        }
-    }
-    */
     return bReturn;
 }
 
@@ -1686,7 +1658,7 @@ bool ChartController::requestQuickHelp(
 
     if ( bSuccess )
     {
-        ::vos::OGuard aGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aGuard;
         if ( m_pDrawViewWrapper && m_pDrawViewWrapper->IsTextEdit() )
         {
             this->EndTextEdit();
@@ -1727,7 +1699,7 @@ bool ChartController::requestQuickHelp(
         view::XSelectionChangeListener > & xListener )
         throw(uno::RuntimeException)
 {
-    ::vos::OGuard aGuard( Application::GetSolarMutex());
+    SolarMutexGuard aGuard;
     if( impl_isDisposedOrSuspended() )//@todo? allow adding of listeners in suspend mode?
         return; //behave passive if already disposed or suspended
 
@@ -1740,7 +1712,7 @@ bool ChartController::requestQuickHelp(
         view::XSelectionChangeListener > & xListener )
         throw(uno::RuntimeException)
 {
-    ::vos::OGuard aGuard( Application::GetSolarMutex());
+    SolarMutexGuard aGuard;
     if( impl_isDisposedOrSuspended() ) //@todo? allow removing of listeners in suspend mode?
         return; //behave passive if already disposed or suspended
 
@@ -1770,7 +1742,7 @@ bool ChartController::requestQuickHelp(
 void ChartController::impl_selectObjectAndNotiy()
 {
     {
-        ::vos::OGuard aGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aGuard;
         DrawViewWrapper* pDrawViewWrapper = m_pDrawViewWrapper;
         if( pDrawViewWrapper )
         {
@@ -1904,7 +1876,7 @@ bool ChartController::impl_DragDataPoint( const ::rtl::OUString & rCID, double f
 
 void ChartController::impl_SetMousePointer( const MouseEvent & rEvent )
 {
-    ::vos::OGuard aGuard( Application::GetSolarMutex());
+    SolarMutexGuard aGuard;
     if( m_pDrawViewWrapper && m_pChartWindow )
     {
         Point aMousePos( m_pChartWindow->PixelToLogic( rEvent.GetPosPixel()));
@@ -2069,3 +2041,5 @@ void ChartController::impl_SetMousePointer( const MouseEvent & rEvent )
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/ChartDropTargetHelper.cxx b/chart2/source/controller/main/ChartDropTargetHelper.cxx
index fd7dc3ad1744..7975aa12c90c 100644
--- a/chart2/source/controller/main/ChartDropTargetHelper.cxx
+++ b/chart2/source/controller/main/ChartDropTargetHelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -191,3 +192,5 @@ sal_Int8 ChartDropTargetHelper::ExecuteDrop( const ExecuteDropEvent& rEvt )
 }
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/ChartDropTargetHelper.hxx b/chart2/source/controller/main/ChartDropTargetHelper.hxx
index 2de9c0c72663..db80aa99015f 100644
--- a/chart2/source/controller/main/ChartDropTargetHelper.hxx
+++ b/chart2/source/controller/main/ChartDropTargetHelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -67,3 +68,5 @@ private:
 
 // CHART2_CHARTDROPTARGETHELPER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/ChartFrameloader.cxx b/chart2/source/controller/main/ChartFrameloader.cxx
index cab3816d5033..0650318ab9e9 100644
--- a/chart2/source/controller/main/ChartFrameloader.cxx
+++ b/chart2/source/controller/main/ChartFrameloader.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -206,3 +207,5 @@ APPHELPER_XSERVICEINFO_IMPL(ChartFrameLoader,CHART_FRAMELOADER_SERVICE_IMPLEMENT
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/ChartFrameloader.hxx b/chart2/source/controller/main/ChartFrameloader.hxx
index 8b6e1e0a3225..3cda73f75135 100644
--- a/chart2/source/controller/main/ChartFrameloader.hxx
+++ b/chart2/source/controller/main/ChartFrameloader.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -89,3 +90,5 @@ public:
 //.............................................................................
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/ChartModelClone.cxx b/chart2/source/controller/main/ChartModelClone.cxx
index 69991eb081df..69991eb081df 100755..100644
--- a/chart2/source/controller/main/ChartModelClone.cxx
+++ b/chart2/source/controller/main/ChartModelClone.cxx
diff --git a/chart2/source/controller/main/ChartModelClone.hxx b/chart2/source/controller/main/ChartModelClone.hxx
index d5653b8e1ccc..d5653b8e1ccc 100755..100644
--- a/chart2/source/controller/main/ChartModelClone.hxx
+++ b/chart2/source/controller/main/ChartModelClone.hxx
diff --git a/chart2/source/controller/main/ChartRenderer.cxx b/chart2/source/controller/main/ChartRenderer.cxx
index 3419f7a53bec..5eed1da516a5 100644
--- a/chart2/source/controller/main/ChartRenderer.cxx
+++ b/chart2/source/controller/main/ChartRenderer.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -37,7 +38,7 @@
 #include "macros.hxx"
 #include "ChartModelHelper.hxx"
 #include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 
 #include <com/sun/star/util/XUpdatable.hpp>
 
@@ -81,7 +82,7 @@ bool ChartRenderer::DoPaint(OutputDevice* pOutDev, const Rectangle& rLogicObject
             if( aContainerChartSize.Width != aChartSize.Width
                 || aContainerChartSize.Height != aChartSize.Height )
             {
-                DBG_ERROR("chart size does not equal size assumed by the container");
+                OSL_FAIL("chart size does not equal size assumed by the container");
                 //correct the state here on the fly -> let the container size win
                 ChartModelHelper::setPageSize( aContainerChartSize, xModel );
             }
@@ -99,7 +100,7 @@ bool ChartRenderer::DoPaint(OutputDevice* pOutDev, const Rectangle& rLogicObject
         {
             awt::Size aResolution(1000,1000);
             {
-                ::vos::OGuard aGuard( Application::GetSolarMutex());
+                SolarMutexGuard aGuard;
                 Rectangle aPixelRect( pOutDev->LogicToPixel( rLogicObjectRect ) );
                 aResolution.Width = aPixelRect.GetWidth();
                 aResolution.Height = aPixelRect.GetHeight();
@@ -112,7 +113,7 @@ bool ChartRenderer::DoPaint(OutputDevice* pOutDev, const Rectangle& rLogicObject
         if( xUpdatable.is() )
             xUpdatable->update();
 
-        ::vos::OGuard aGuard( Application::GetSolarMutex());
+        SolarMutexGuard aGuard;
         ExplicitValueProvider* pProvider = ExplicitValueProvider::getExplicitValueProvider( xChartView );
         if( !pProvider )
             return false;
@@ -176,3 +177,5 @@ Sequence< OUString > ChartRenderer::getSupportedServiceNames_Static()
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/ChartTransferable.cxx b/chart2/source/controller/main/ChartTransferable.cxx
index f0c4ca80f9f2..35819ef2a648 100644
--- a/chart2/source/controller/main/ChartTransferable.cxx
+++ b/chart2/source/controller/main/ChartTransferable.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -127,7 +128,6 @@ sal_Bool ChartTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pUse
                 {
                     rxOStm->SetBufferSize( 0xff00 );
 
-                    // #108584#
                     // for the changed pool defaults from drawing layer pool set those
                     // attributes as hard attributes to preserve them for saving
                     const SfxItemPool& rItemPool = pMarkedObjModel->GetItemPool();
@@ -162,7 +162,7 @@ sal_Bool ChartTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pUse
             break;
         default:
             {
-                DBG_ERROR( "ChartTransferable::WriteObject: unknown object id" );
+                OSL_FAIL( "ChartTransferable::WriteObject: unknown object id" );
             }
             break;
     }
@@ -170,3 +170,5 @@ sal_Bool ChartTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pUse
 }
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/ChartTransferable.hxx b/chart2/source/controller/main/ChartTransferable.hxx
index 401f43c6d1ae..3e0f311e493d 100644
--- a/chart2/source/controller/main/ChartTransferable.hxx
+++ b/chart2/source/controller/main/ChartTransferable.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -65,3 +66,5 @@ private:
 
 // CHART2_CHARTTRANSFERABLE_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx
index 9d7f16faff68..c1dc9924f291 100644
--- a/chart2/source/controller/main/ChartWindow.cxx
+++ b/chart2/source/controller/main/ChartWindow.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -269,3 +270,5 @@ void ChartWindow::Invalidate( const Region& rRegion, sal_uInt16 nFlags )
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/ChartWindow.hxx b/chart2/source/controller/main/ChartWindow.hxx
index 2085214f0b81..99737e469c90 100644
--- a/chart2/source/controller/main/ChartWindow.hxx
+++ b/chart2/source/controller/main/ChartWindow.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -86,3 +87,5 @@ private:
 //.............................................................................
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/CommandDispatch.cxx b/chart2/source/controller/main/CommandDispatch.cxx
index bd040fce8fff..0a1b02e5dd33 100644
--- a/chart2/source/controller/main/CommandDispatch.cxx
+++ b/chart2/source/controller/main/CommandDispatch.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -182,8 +183,6 @@ void CommandDispatch::fireStatusEventForURL(
         tListenerMap::iterator aIt( m_aListeners.find( aURL.Complete ));
         if( aIt != m_aListeners.end())
         {
-//             ::cppu::OInterfaceContainerHelper * pCntHlp = rBHelper.getContainer(
-//                 ::getCppuType( reinterpret_cast< Reference< frame::XStatusListener > * >(0)));
             if( aIt->second )
             {
                 ::cppu::OInterfaceIteratorHelper aIntfIt( *((*aIt).second) );
@@ -209,3 +208,5 @@ void CommandDispatch::fireStatusEventForURL(
 
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/CommandDispatch.hxx b/chart2/source/controller/main/CommandDispatch.hxx
index 08140786ac4e..4eda320afd79 100644
--- a/chart2/source/controller/main/CommandDispatch.hxx
+++ b/chart2/source/controller/main/CommandDispatch.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -149,3 +150,5 @@ private:
 
 // CHART2_COMMANDDISPATCH_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/CommandDispatchContainer.cxx b/chart2/source/controller/main/CommandDispatchContainer.cxx
index c0847a490ea1..8ee5f4ad712a 100644
--- a/chart2/source/controller/main/CommandDispatchContainer.cxx
+++ b/chart2/source/controller/main/CommandDispatchContainer.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -208,3 +209,5 @@ void CommandDispatchContainer::setShapeController( ShapeController* pController
 }
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/CommandDispatchContainer.hxx b/chart2/source/controller/main/CommandDispatchContainer.hxx
index a5995253e059..7c9f0dc2122c 100644
--- a/chart2/source/controller/main/CommandDispatchContainer.hxx
+++ b/chart2/source/controller/main/CommandDispatchContainer.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -153,3 +154,5 @@ private:
 
 // CHART2_COMMANDDISPATCHCONTAINER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/ConfigurationAccess.cxx b/chart2/source/controller/main/ConfigurationAccess.cxx
index bf0bc6e14eec..3c4ea5d6d742 100644
--- a/chart2/source/controller/main/ConfigurationAccess.cxx
+++ b/chart2/source/controller/main/ConfigurationAccess.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -118,3 +119,5 @@ namespace ConfigurationAccess
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx
index a01b80bfa22b..eaf4b77a8746 100644
--- a/chart2/source/controller/main/ControllerCommandDispatch.cxx
+++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -689,7 +690,7 @@ bool ControllerCommandDispatch::commandAvailable( const OUString & rCommand )
     ::std::map< OUString, bool >::const_iterator aIt( m_aCommandAvailability.find( rCommand ));
     if( aIt != m_aCommandAvailability.end())
         return aIt->second;
-    OSL_ENSURE( false, "commandAvailable: command not in availability map" );
+    OSL_FAIL( "commandAvailable: command not in availability map" );
     return false;
 }
 
@@ -803,3 +804,5 @@ void SAL_CALL ControllerCommandDispatch::selectionChanged( const lang::EventObje
 }
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/ControllerCommandDispatch.hxx b/chart2/source/controller/main/ControllerCommandDispatch.hxx
index 08d57a0d6cbf..0e842850a43f 100644
--- a/chart2/source/controller/main/ControllerCommandDispatch.hxx
+++ b/chart2/source/controller/main/ControllerCommandDispatch.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -134,3 +135,5 @@ private:
 
 // CHART2_CONTROLLERCOMMANDDISPATCH_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/DragMethod_Base.cxx b/chart2/source/controller/main/DragMethod_Base.cxx
index 11ba7b7b8016..23eada69efd9 100644
--- a/chart2/source/controller/main/DragMethod_Base.cxx
+++ b/chart2/source/controller/main/DragMethod_Base.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -91,3 +92,5 @@ Pointer DragMethod_Base::GetSdrDragPointer() const
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/DragMethod_Base.hxx b/chart2/source/controller/main/DragMethod_Base.hxx
index dfd5cfa20255..4b4b0390d813 100644
--- a/chart2/source/controller/main/DragMethod_Base.hxx
+++ b/chart2/source/controller/main/DragMethod_Base.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -67,3 +68,5 @@ private:
 
 // CHART2_DRAGMETHOD_BASE_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/DragMethod_PieSegment.cxx b/chart2/source/controller/main/DragMethod_PieSegment.cxx
index 5074147fa9e2..2746471dd36d 100644
--- a/chart2/source/controller/main/DragMethod_PieSegment.cxx
+++ b/chart2/source/controller/main/DragMethod_PieSegment.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -161,3 +162,5 @@ void DragMethod_PieSegment::createSdrDragEntries()
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/DragMethod_PieSegment.hxx b/chart2/source/controller/main/DragMethod_PieSegment.hxx
index f63af9be3cc4..e0f9daf1d204 100644
--- a/chart2/source/controller/main/DragMethod_PieSegment.hxx
+++ b/chart2/source/controller/main/DragMethod_PieSegment.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -62,3 +63,5 @@ private:
 
 // CHART2_DRAGMETHOD_PIESEGMENT_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
index 944b44dd25bf..8b0d8a4bffa6 100644
--- a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
+++ b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -84,7 +85,6 @@ DragMethod_RotateDiagram::DragMethod_RotateDiagram( DrawViewWrapper& rDrawViewWr
     if(pObj && m_pScene)
     {
         m_aReferenceRect = pObj->GetLogicRect();
-        Rectangle aTemp = m_pScene->GetLogicRect();
 
         m_aWireframePolyPolygon = m_pScene->CreateWireframe();
 
@@ -235,3 +235,5 @@ void DragMethod_RotateDiagram::CreateOverlayGeometry(sdr::overlay::OverlayManage
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.hxx b/chart2/source/controller/main/DragMethod_RotateDiagram.hxx
index b16e12fe5359..0ef6a111d00a 100644
--- a/chart2/source/controller/main/DragMethod_RotateDiagram.hxx
+++ b/chart2/source/controller/main/DragMethod_RotateDiagram.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -90,3 +91,5 @@ private:
 
 // CHART2_DRAGMETHOD_ROTATEDIAGRAM_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx
index f5380846dbbe..b4d25161f467 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.cxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -35,7 +36,7 @@
 #include "chartview/DrawModelWrapper.hxx"
 #include "macros.hxx"
 
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <svl/itempool.hxx>
 #include <editeng/adjitem.hxx>
@@ -384,7 +385,7 @@ void DrawCommandDispatch::execute( const ::rtl::OUString& rCommand, const Sequen
             DrawViewWrapper* pDrawViewWrapper = m_pChartController->GetDrawViewWrapper();
             if ( pDrawViewWrapper )
             {
-                ::vos::OGuard aGuard( Application::GetSolarMutex() );
+                SolarMutexGuard aGuard;
                 m_pChartController->setDrawMode( eDrawMode );
                 setInsertObj( sal::static_int_cast< sal_uInt16 >( eKind ) );
                 if ( bCreate )
@@ -464,7 +465,7 @@ SdrObject* DrawCommandDispatch::createDefaultObject( const sal_uInt16 nID )
         SdrPage* pPage = GetSdrPageFromXDrawPage( xDrawPage );
         if ( pPage )
         {
-            ::vos::OGuard aGuard( Application::GetSolarMutex() );
+            SolarMutexGuard aGuard;
             pObj = SdrObjFactory::MakeNewObject( pDrawViewWrapper->GetCurrentObjInventor(),
                 pDrawViewWrapper->GetCurrentObjIdentifier(), pPage );
             if ( pObj )
@@ -672,3 +673,5 @@ bool DrawCommandDispatch::parseCommandURL( const ::rtl::OUString& rCommandURL, s
 //.............................................................................
 } //  namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/DrawCommandDispatch.hrc b/chart2/source/controller/main/DrawCommandDispatch.hrc
index 4e31fafaaf63..2995d6ca70c7 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.hrc
+++ b/chart2/source/controller/main/DrawCommandDispatch.hrc
@@ -46,5 +46,4 @@
 #define COMMAND_ID_DRAWTBX_CS_CALLOUT          15
 #define COMMAND_ID_DRAWTBX_CS_STAR             16
 
-// CHART_DRAWCOMMANDDISPATCH_HRC
 #endif
diff --git a/chart2/source/controller/main/DrawCommandDispatch.hxx b/chart2/source/controller/main/DrawCommandDispatch.hxx
index 63ddd1b7c75c..6ac74e052c10 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.hxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -91,3 +92,5 @@ private:
 
 // CHART2_DRAWCOMMANDDISPATCH_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx
index e0c4162e785a..49d13eca7112 100644
--- a/chart2/source/controller/main/ElementSelector.cxx
+++ b/chart2/source/controller/main/ElementSelector.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,7 +40,7 @@
 #include "Strings.hrc"
 
 #include <toolkit/helper/vclunohelper.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 
 #include <com/sun/star/chart2/XChartDocument.hpp>
@@ -307,8 +308,8 @@ void SAL_CALL ElementSelectorToolbarController::statusChanged( const frame::Feat
 {
     if( m_apSelectorListBox.get() )
     {
-        vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
-        if( rEvent.FeatureURL.Path.equalsAscii( "ChartElementSelector" ) )
+        SolarMutexGuard aSolarMutexGuard;
+        if( rEvent.FeatureURL.Path.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ChartElementSelector" ) ) )
         {
             Reference< frame::XController > xChartController;
             rEvent.State >>= xChartController;
@@ -342,3 +343,5 @@ uno::Reference< awt::XWindow > SAL_CALL ElementSelectorToolbarController::create
 //..........................................................................
 } // chart2
 //..........................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/ElementSelector.hxx b/chart2/source/controller/main/ElementSelector.hxx
index d85415d614e2..53a16e30ffe3 100644
--- a/chart2/source/controller/main/ElementSelector.hxx
+++ b/chart2/source/controller/main/ElementSelector.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -121,3 +122,5 @@ private:
 //.............................................................................
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/FeatureCommandDispatchBase.cxx b/chart2/source/controller/main/FeatureCommandDispatchBase.cxx
index 39b4e1d4a171..09be57fa1d86 100644
--- a/chart2/source/controller/main/FeatureCommandDispatchBase.cxx
+++ b/chart2/source/controller/main/FeatureCommandDispatchBase.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -112,3 +113,5 @@ void FeatureCommandDispatchBase::fillSupportedFeatures()
 }
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/FeatureCommandDispatchBase.hxx b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx
index b3e2a568d3b9..f9ff2f050e79 100644
--- a/chart2/source/controller/main/FeatureCommandDispatchBase.hxx
+++ b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -113,3 +114,5 @@ private:
 
 // CHART2_FEATURECOMMANDDISPATCHBASE_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx b/chart2/source/controller/main/ObjectHierarchy.cxx
index 19577eb4900e..76c81e62ef57 100644
--- a/chart2/source/controller/main/ObjectHierarchy.cxx
+++ b/chart2/source/controller/main/ObjectHierarchy.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -858,3 +859,5 @@ bool ObjectKeyNavigation::veryLast()
 }
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/PositionAndSizeHelper.cxx b/chart2/source/controller/main/PositionAndSizeHelper.cxx
index bdee4a14f66b..a392e3c8c1fc 100644
--- a/chart2/source/controller/main/PositionAndSizeHelper.cxx
+++ b/chart2/source/controller/main/PositionAndSizeHelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -162,3 +163,5 @@ bool PositionAndSizeHelper::moveObject( const rtl::OUString& rObjectCID
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx
index d5dadcf1d800..8e54505ab342 100644
--- a/chart2/source/controller/main/SelectionHelper.cxx
+++ b/chart2/source/controller/main/SelectionHelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -41,7 +42,7 @@
 // header for class SdrPathObj
 #include <svx/svdopath.hxx>
 #include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <basegfx/point/b2dpoint.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 
@@ -50,7 +51,6 @@ namespace chart
 {
 //.............................................................................
 using namespace ::com::sun::star;
-//using namespace ::com::sun::star::chart2;
 
 namespace
 {
@@ -64,7 +64,7 @@ rtl::OUString lcl_getObjectName( SdrObject* pObj )
 
 void impl_selectObject( SdrObject* pObjectToSelect, DrawViewWrapper& rDrawViewWrapper )
 {
-    ::vos::OGuard aSolarGuard( Application::GetSolarMutex());
+    SolarMutexGuard aSolarGuard;
 
     if(pObjectToSelect)
     {
@@ -151,7 +151,7 @@ void Selection::remindSelectionBeforeMouseDown()
     m_aSelectedOID_beforeMouseDown = m_aSelectedOID;
 }
 
-bool Selection::isSelectionDifferentFromBeforeMouseDown()
+bool Selection::isSelectionDifferentFromBeforeMouseDown() const
 {
     return ( m_aSelectedOID != m_aSelectedOID_beforeMouseDown );
 }
@@ -161,7 +161,7 @@ void Selection::applySelection( DrawViewWrapper* pDrawViewWrapper )
     if( pDrawViewWrapper )
     {
         {
-            ::vos::OGuard aSolarGuard( Application::GetSolarMutex());
+            SolarMutexGuard aSolarGuard;
             pDrawViewWrapper->UnmarkAll();
         }
         SdrObject* pObjectToSelect = 0;
@@ -188,7 +188,7 @@ void Selection::adaptSelectionToNewPos( const Point& rMousePos, DrawViewWrapper*
 
         ObjectIdentifier aLastSelectedObject( m_aSelectedOID );
 
-        ::vos::OGuard aSolarGuard( Application::GetSolarMutex());
+        SolarMutexGuard aSolarGuard;
 
         //bAllowMultiClickSelectionChange==true -> a second click on the same object can lead to a changed selection (e.g. series -> single data point)
 
@@ -251,7 +251,7 @@ void Selection::adaptSelectionToNewPos( const Point& rMousePos, DrawViewWrapper*
                     }
                 }
 
-                DBG_ASSERT( pNewObj && m_aSelectedOID.isValid(), "somehow lost selected object" );
+                OSL_ENSURE( pNewObj && m_aSelectedOID.isValid(), "somehow lost selected object" );
             }
             else
             {
@@ -350,12 +350,11 @@ bool Selection::isAdditionalShapeSelected() const
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-
 bool SelectionHelper::findNamedParent( SdrObject*& pInOutObject
                                       , rtl::OUString& rOutName
                                       , bool bGivenObjectMayBeResult )
 {
-    ::vos::OGuard aSolarGuard( Application::GetSolarMutex());
+    SolarMutexGuard aSolarGuard;
     //find the deepest named group
     SdrObject* pObj = pInOutObject;
     rtl::OUString aName;
@@ -405,7 +404,7 @@ bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos
         return false;
     if( !ObjectIdentifier::isDragableObject(rNameOfSelectedObject) )
         return false;
-    ::vos::OGuard aSolarGuard( Application::GetSolarMutex());
+    SolarMutexGuard aSolarGuard;
     SdrObject* pObj = rDrawViewWrapper.getNamedSdrObject( rNameOfSelectedObject );
     if( !rDrawViewWrapper.IsObjectHit( pObj, rMPos ) )
         return false;
@@ -418,7 +417,7 @@ bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos
     bool bGetDiagramInsteadOf_Wall )
 {
     // //- solar mutex
-    ::vos::OGuard aSolarGuard( Application::GetSolarMutex());
+    SolarMutexGuard aSolarGuard;
     rtl::OUString aRet;
 
     SdrObject* pNewObj = rDrawViewWrapper.getHitObject(rMPos);
@@ -491,7 +490,7 @@ bool SelectionHelper::isRotateableObject( const ::rtl::OUString& rCID
 }
 
 SelectionHelper::SelectionHelper( SdrObject* pSelectedObj )
-                      : m_pSelectedObj( pSelectedObj )
+                      : m_pSelectedObj( pSelectedObj ), m_pMarkObj(NULL)
 {
 
 }
@@ -499,7 +498,6 @@ SelectionHelper::~SelectionHelper()
 {
 }
 
-//virtual
 bool SelectionHelper::getFrameDragSingles()
 {
     bool bFrameDragSingles = true;//true == green == surrounding handles
@@ -519,7 +517,7 @@ SdrObject* SelectionHelper::getMarkHandlesObject( SdrObject* pObj )
         return 0;
 
     //search for a child with name "MarkHandles" or "HandlesOnly"
-    ::vos::OGuard aSolarGuard( Application::GetSolarMutex());
+    SolarMutexGuard aSolarGuard;
     SdrObjList* pSubList = pObj->GetSubList();
     if(pSubList)
     {
@@ -544,7 +542,7 @@ SdrObject* SelectionHelper::getObjectToMark()
     //search for a child with name "MarkHandles" or "HandlesOnly"
     if(pObj)
     {
-        ::vos::OGuard aSolarGuard( Application::GetSolarMutex());
+        SolarMutexGuard aSolarGuard;
         SdrObjList* pSubList = pObj->GetSubList();
         if(pSubList)
         {
@@ -575,7 +573,7 @@ E3dScene* SelectionHelper::getSceneToRotate( SdrObject* pObj )
         pRotateable = dynamic_cast<E3dObject*>(pObj);
         if( !pRotateable )
         {
-            ::vos::OGuard aSolarGuard( Application::GetSolarMutex());
+            SolarMutexGuard aSolarGuard;
             SdrObjList* pSubList = pObj->GetSubList();
             if(pSubList)
             {
@@ -592,17 +590,16 @@ E3dScene* SelectionHelper::getSceneToRotate( SdrObject* pObj )
     E3dScene* pScene = 0;
     if(pRotateable)
     {
-        ::vos::OGuard aSolarGuard( Application::GetSolarMutex());
+        SolarMutexGuard aSolarGuard;
         pScene = pRotateable->GetScene();
     }
     return pScene;
 
 }
 
-//virtual
 bool SelectionHelper::getMarkHandles( SdrHdlList& rHdlList )
 {
-    ::vos::OGuard aSolarGuard( Application::GetSolarMutex());
+    SolarMutexGuard aSolarGuard;
 
     //@todo -> more flexible handle creation
     //2 scenarios possible:
@@ -692,3 +689,5 @@ bool SelectionHelper::getMarkHandles( SdrHdlList& rHdlList )
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/SelectionHelper.hxx b/chart2/source/controller/main/SelectionHelper.hxx
index b3516e2326a4..0eaba382d9f7 100644
--- a/chart2/source/controller/main/SelectionHelper.hxx
+++ b/chart2/source/controller/main/SelectionHelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -43,8 +44,7 @@ namespace chart
 class ObjectIdentifier;
 
 //-----------------------------------------------------------------------------
-/**
-*/
+
 class Selection
 {
 public: //methods
@@ -74,7 +74,7 @@ public: //methods
     void resetPossibleSelectionAfterSingleClickWasEnsured();
 
     void remindSelectionBeforeMouseDown();
-    bool isSelectionDifferentFromBeforeMouseDown();
+    bool isSelectionDifferentFromBeforeMouseDown() const;
 
     void adaptSelectionToNewPos( const Point& rMousePos, DrawViewWrapper* pDrawViewWrapper
                                        , bool bIsRightMouse, bool bWaitingForDoubleClick );
@@ -137,3 +137,5 @@ private:
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx
index 983d7cd83980..f633c990a16c 100644
--- a/chart2/source/controller/main/ShapeController.cxx
+++ b/chart2/source/controller/main/ShapeController.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,7 +41,7 @@
 
 #include <com/sun/star/frame/XStorable.hpp>
 
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>
 #include <editeng/brkitem.hxx>
@@ -262,7 +263,7 @@ IMPL_LINK( ShapeController, CheckNameHdl, AbstractSvxNameDialog*, pDialog )
 
 void ShapeController::executeDispatch_FormatLine()
 {
-    ::vos::OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
     if ( m_pChartController )
     {
         Window* pParent = dynamic_cast< Window* >( m_pChartController->m_pChartWindow );
@@ -302,7 +303,7 @@ void ShapeController::executeDispatch_FormatLine()
 
 void ShapeController::executeDispatch_FormatArea()
 {
-    ::vos::OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
     if ( m_pChartController )
     {
         Window* pParent = dynamic_cast< Window* >( m_pChartController->m_pChartWindow );
@@ -327,7 +328,7 @@ void ShapeController::executeDispatch_FormatArea()
                     SfxItemPool& rItemPool = pDrawViewWrapper->GetModel()->GetItemPool();
                     SfxItemSet aSet( rItemPool, rItemPool.GetFirstWhich(), rItemPool.GetLastWhich() );
                     const SvxColorTableItem* pColorItem = static_cast< const SvxColorTableItem* >( aSet.GetItem( SID_COLOR_TABLE ) );
-                    if ( pColorItem && pColorItem->GetColorTable() == XColorTable::GetStdColorTable() )
+                    if ( pColorItem && pColorItem->GetColorTable() == &XColorTable::GetStdColorTable() )
                     {
                         pDlg->DontDeleteColorTable();
                     }
@@ -351,7 +352,7 @@ void ShapeController::executeDispatch_FormatArea()
 
 void ShapeController::executeDispatch_TextAttributes()
 {
-    ::vos::OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
     if ( m_pChartController )
     {
         Window* pParent = dynamic_cast< Window* >( m_pChartController->m_pChartWindow );
@@ -388,7 +389,7 @@ void ShapeController::executeDispatch_TextAttributes()
 
 void ShapeController::executeDispatch_TransformDialog()
 {
-    ::vos::OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
     if ( m_pChartController )
     {
         Window* pParent = dynamic_cast< Window* >( m_pChartController->m_pChartWindow );
@@ -445,7 +446,7 @@ void ShapeController::executeDispatch_TransformDialog()
 
 void ShapeController::executeDispatch_ObjectTitleDescription()
 {
-    ::vos::OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
     if ( m_pChartController )
     {
         DrawViewWrapper* pDrawViewWrapper = m_pChartController->GetDrawViewWrapper();
@@ -476,7 +477,7 @@ void ShapeController::executeDispatch_ObjectTitleDescription()
 
 void ShapeController::executeDispatch_RenameObject()
 {
-    ::vos::OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
     if ( m_pChartController )
     {
         DrawViewWrapper* pDrawViewWrapper = m_pChartController->GetDrawViewWrapper();
@@ -508,7 +509,7 @@ void ShapeController::executeDispatch_RenameObject()
 
 void ShapeController::executeDispatch_ChangeZOrder( sal_uInt16 nId )
 {
-    ::vos::OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
     DrawViewWrapper* pDrawViewWrapper = ( m_pChartController ? m_pChartController->GetDrawViewWrapper() : NULL );
     if ( pDrawViewWrapper )
     {
@@ -557,7 +558,7 @@ void ShapeController::executeDispatch_ChangeZOrder( sal_uInt16 nId )
 
 void ShapeController::executeDispatch_FontDialog()
 {
-    ::vos::OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
     if ( m_pChartController )
     {
         Window* pParent = dynamic_cast< Window* >( m_pChartController->m_pChartWindow );
@@ -580,7 +581,7 @@ void ShapeController::executeDispatch_FontDialog()
 
 void ShapeController::executeDispatch_ParagraphDialog()
 {
-    ::vos::OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
     if ( m_pChartController )
     {
         Window* pParent = dynamic_cast< Window* >( m_pChartController->m_pChartWindow );
@@ -700,7 +701,7 @@ bool ShapeController::isBackwardPossible()
 {
     if ( m_pChartController && m_pChartController->m_aSelection.isAdditionalShapeSelected() )
     {
-        ::vos::OGuard aGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aGuard;
         DrawViewWrapper* pDrawViewWrapper = m_pChartController->GetDrawViewWrapper();
         if ( pDrawViewWrapper )
         {
@@ -719,7 +720,7 @@ bool ShapeController::isForwardPossible()
 {
     if ( m_pChartController && m_pChartController->m_aSelection.isAdditionalShapeSelected() )
     {
-        ::vos::OGuard aGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aGuard;
         DrawViewWrapper* pDrawViewWrapper = m_pChartController->GetDrawViewWrapper();
         if ( pDrawViewWrapper )
         {
@@ -737,3 +738,5 @@ bool ShapeController::isForwardPossible()
 //.............................................................................
 } //  namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/ShapeController.hxx b/chart2/source/controller/main/ShapeController.hxx
index aea01d6c478d..676621602965 100644
--- a/chart2/source/controller/main/ShapeController.hxx
+++ b/chart2/source/controller/main/ShapeController.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -98,3 +99,5 @@ private:
 
 // CHART2_SHAPECONTROLLER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/ShapeToolbarController.cxx b/chart2/source/controller/main/ShapeToolbarController.cxx
index f9cfc202e2ad..4e2cda70bbf6 100644
--- a/chart2/source/controller/main/ShapeToolbarController.cxx
+++ b/chart2/source/controller/main/ShapeToolbarController.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,7 +31,7 @@
 
 #include "ShapeToolbarController.hxx"
 
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <comphelper/sequence.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/toolbox.hxx>
@@ -120,7 +121,7 @@ void ShapeToolbarController::release() throw ()
 void ShapeToolbarController::initialize( const Sequence< uno::Any >& rArguments ) throw (uno::Exception, uno::RuntimeException)
 {
     ToolboxController::initialize( rArguments );
-    ::vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
     ::osl::MutexGuard aGuard( m_aMutex );
 
     ToolBox* pToolBox = static_cast< ToolBox* >( VCLUnoHelper::GetWindow( getParent() ) );
@@ -136,37 +137,37 @@ void ShapeToolbarController::initialize( const Sequence< uno::Any >& rArguments
                 break;
             }
         }
-        if ( m_aCommandURL.equalsAscii( ".uno:BasicShapes" ) )
+        if ( m_aCommandURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:BasicShapes" ) ) )
         {
             m_aStates.insert( TCommandState::value_type( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:BasicShapes" ) ), sal_True ) );
             m_nSlotId = SID_DRAWTBX_CS_BASIC;
             m_pToolbarController = TToolbarHelper::createFromQuery( new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox ) );
         }
-        else if ( m_aCommandURL.equalsAscii( ".uno:SymbolShapes" ) )
+        else if ( m_aCommandURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:SymbolShapes" ) ) )
         {
             m_aStates.insert( TCommandState::value_type( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:SymbolShapes" ) ), sal_True ) );
             m_nSlotId = SID_DRAWTBX_CS_SYMBOL;
             m_pToolbarController = TToolbarHelper::createFromQuery( new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox ) );
         }
-        else if ( m_aCommandURL.equalsAscii( ".uno:ArrowShapes" ) )
+        else if ( m_aCommandURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:ArrowShapes" ) ) )
         {
             m_aStates.insert( TCommandState::value_type( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ArrowShapes" ) ), sal_True ) );
             m_nSlotId = SID_DRAWTBX_CS_ARROW;
             m_pToolbarController = TToolbarHelper::createFromQuery( new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox) );
         }
-        else if ( m_aCommandURL.equalsAscii( ".uno:FlowChartShapes" ) )
+        else if ( m_aCommandURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:FlowChartShapes" ) ) )
         {
             m_aStates.insert( TCommandState::value_type( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FlowChartShapes" ) ), sal_True ) );
             m_nSlotId = SID_DRAWTBX_CS_FLOWCHART;
             m_pToolbarController = TToolbarHelper::createFromQuery( new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox ) );
         }
-        else if ( m_aCommandURL.equalsAscii( ".uno:CalloutShapes" ) )
+        else if ( m_aCommandURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:CalloutShapes" ) ) )
         {
             m_aStates.insert( TCommandState::value_type( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CalloutShapes" ) ), sal_True ) );
             m_nSlotId = SID_DRAWTBX_CS_CALLOUT;
             m_pToolbarController = TToolbarHelper::createFromQuery( new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox ) );
         }
-        else if ( m_aCommandURL.equalsAscii( ".uno:StarShapes" ) )
+        else if ( m_aCommandURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:StarShapes" ) ) )
         {
             m_aStates.insert( TCommandState::value_type( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:StarShapes" ) ), sal_True ) );
             m_nSlotId = SID_DRAWTBX_CS_STAR;
@@ -233,7 +234,7 @@ void ShapeToolbarController::statusChanged( const frame::FeatureStateEvent& Even
 // ::com::sun::star::frame::XToolbarController
 Reference< awt::XWindow > ShapeToolbarController::createPopupWindow() throw (uno::RuntimeException)
 {
-    ::vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
     ::osl::MutexGuard aGuard( m_aMutex );
 
     Reference< awt::XWindow > xRet;
@@ -258,7 +259,7 @@ Reference< awt::XWindow > ShapeToolbarController::createPopupWindow() throw (uno
 
 ::rtl::OUString ShapeToolbarController::getSubToolbarName() throw (uno::RuntimeException)
 {
-    ::vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
     ::osl::MutexGuard aGuard(m_aMutex);
     uno::Reference< frame::XSubToolbarController > xSub( m_pToolbarController.getRef(), uno::UNO_QUERY );
     if ( xSub.is() )
@@ -270,7 +271,7 @@ Reference< awt::XWindow > ShapeToolbarController::createPopupWindow() throw (uno
 
 void ShapeToolbarController::functionSelected( const ::rtl::OUString& rCommand ) throw (uno::RuntimeException)
 {
-    ::vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
     ::osl::MutexGuard aGuard( m_aMutex );
 
     uno::Reference< frame::XSubToolbarController > xSub( m_pToolbarController.getRef(), uno::UNO_QUERY );
@@ -283,7 +284,7 @@ void ShapeToolbarController::functionSelected( const ::rtl::OUString& rCommand )
 
 void ShapeToolbarController::updateImage() throw (uno::RuntimeException)
 {
-    ::vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aSolarMutexGuard;
     ::osl::MutexGuard aGuard( m_aMutex );
 
     uno::Reference< frame::XSubToolbarController > xSub( m_pToolbarController.getRef(), uno::UNO_QUERY );
@@ -296,3 +297,5 @@ void ShapeToolbarController::updateImage() throw (uno::RuntimeException)
 //.............................................................................
 } //  namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/ShapeToolbarController.hxx b/chart2/source/controller/main/ShapeToolbarController.hxx
index 544cac7f9831..e0ddc8c6373a 100644
--- a/chart2/source/controller/main/ShapeToolbarController.hxx
+++ b/chart2/source/controller/main/ShapeToolbarController.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -101,3 +102,4 @@ public:
 
 #endif //CHART2_SHAPETOOLBARCONTROLLER_HXX
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.cxx b/chart2/source/controller/main/StatusBarCommandDispatch.cxx
index 68c56f2d988b..bd3d547dfe77 100644
--- a/chart2/source/controller/main/StatusBarCommandDispatch.cxx
+++ b/chart2/source/controller/main/StatusBarCommandDispatch.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,13 +34,6 @@
 #include "macros.hxx"
 #include <com/sun/star/util/XModifyBroadcaster.hpp>
 
-// #ifndef _VOS_MUTEX_HXX_
-// #include <vos/mutex.hxx>
-// #endif
-// #ifndef _SV_SVAPP_HXX
-// #include <vcl/svapp.hxx>
-// #endif
-
 #include "ResId.hxx"
 
 using namespace ::com::sun::star;
@@ -151,3 +145,5 @@ void SAL_CALL StatusBarCommandDispatch::selectionChanged( const lang::EventObjec
 }
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.hxx b/chart2/source/controller/main/StatusBarCommandDispatch.hxx
index c84f81f83258..94ee41e0e44d 100644
--- a/chart2/source/controller/main/StatusBarCommandDispatch.hxx
+++ b/chart2/source/controller/main/StatusBarCommandDispatch.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -108,3 +109,5 @@ private:
 
 // CHART2_STATUSBARCOMMANDDISPATCH_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx b/chart2/source/controller/main/UndoCommandDispatch.cxx
index 487def377d5c..fcc396025cfa 100644
--- a/chart2/source/controller/main/UndoCommandDispatch.cxx
+++ b/chart2/source/controller/main/UndoCommandDispatch.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -35,7 +36,7 @@
 #include <com/sun/star/util/XModifyBroadcaster.hpp>
 #include <com/sun/star/document/XUndoManagerSupplier.hpp>
 
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/diagnose_ex.h>
 
@@ -109,8 +110,7 @@ void SAL_CALL UndoCommandDispatch::dispatch(
     if( m_xUndoManager.is() )
     {
         // why is it necessary to lock the solar mutex here?
-        // /--
-        ::vos::OGuard aSolarGuard( Application::GetSolarMutex());
+        SolarMutexGuard aSolarGuard;
         try
         {
             if( URL.Path.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Undo" )))
@@ -154,3 +154,5 @@ void SAL_CALL UndoCommandDispatch::disposing( const lang::EventObject& /* Source
 }
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/UndoCommandDispatch.hxx b/chart2/source/controller/main/UndoCommandDispatch.hxx
index 891ab8b019e5..d64f66f63102 100644
--- a/chart2/source/controller/main/UndoCommandDispatch.hxx
+++ b/chart2/source/controller/main/UndoCommandDispatch.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -81,3 +82,5 @@ private:
 
 // CHART2_UNDOCOMMANDDISPATCH_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/UndoGuard.cxx b/chart2/source/controller/main/UndoGuard.cxx
index 52ea27aa8d49..26b13cd0a265 100644
--- a/chart2/source/controller/main/UndoGuard.cxx
+++ b/chart2/source/controller/main/UndoGuard.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -196,3 +197,5 @@ HiddenUndoContext::~HiddenUndoContext()
 }
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/_serviceregistration_controller.cxx b/chart2/source/controller/main/_serviceregistration_controller.cxx
index 0371f50f9996..40be8ac313fa 100644
--- a/chart2/source/controller/main/_serviceregistration_controller.cxx
+++ b/chart2/source/controller/main/_serviceregistration_controller.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -116,3 +117,5 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
 }
 }
 //=========================================================================
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/makefile.mk b/chart2/source/controller/main/makefile.mk
deleted file mode 100644
index 557d6cf6216f..000000000000
--- a/chart2/source/controller/main/makefile.mk
+++ /dev/null
@@ -1,81 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=				..$/..$/..
-PRJINC=				$(PRJ)$/source
-PRJNAME=			chart2
-TARGET=				chcontroller
-
-ENABLE_EXCEPTIONS=	TRUE
-VISIBILITY_HIDDEN=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE: settings.mk
-
-# --- export library -------------------------------------------------
-
-#object files to build and link together to lib $(SLB)$/$(TARGET).lib
-SLOFILES =  \
-            $(SLO)$/ConfigurationAccess.obj	\
-            $(SLO)$/ElementSelector.obj	\
-            $(SLO)$/SelectionHelper.obj	\
-            $(SLO)$/PositionAndSizeHelper.obj	\
-            $(SLO)$/ChartWindow.obj	\
-            $(SLO)$/ChartController.obj	\
-            $(SLO)$/ChartController_EditData.obj	\
-            $(SLO)$/ChartController_Window.obj	\
-            $(SLO)$/ChartController_Properties.obj	\
-            $(SLO)$/ChartController_Insert.obj	\
-            $(SLO)$/ChartController_TextEdit.obj \
-            $(SLO)$/ChartController_Position.obj \
-            $(SLO)$/ChartController_Tools.obj \
-            $(SLO)$/ChartFrameloader.obj \
-            $(SLO)$/ChartRenderer.obj \
-            $(SLO)$/CommandDispatchContainer.obj \
-            $(SLO)$/CommandDispatch.obj \
-            $(SLO)$/ControllerCommandDispatch.obj \
-            $(SLO)$/UndoCommandDispatch.obj \
-            $(SLO)$/DragMethod_Base.obj \
-            $(SLO)$/DragMethod_RotateDiagram.obj \
-            $(SLO)$/DragMethod_PieSegment.obj \
-            $(SLO)$/ObjectHierarchy.obj \
-            $(SLO)$/_serviceregistration_controller.obj \
-            $(SLO)$/ChartDropTargetHelper.obj \
-            $(SLO)$/StatusBarCommandDispatch.obj \
-            $(SLO)$/ChartTransferable.obj \
-            $(SLO)$/FeatureCommandDispatchBase.obj \
-            $(SLO)$/DrawCommandDispatch.obj \
-            $(SLO)$/ShapeController.obj \
-            $(SLO)$/ShapeToolbarController.obj \
-            $(SLO)$/UndoActions.obj \
-            $(SLO)$/UndoGuard.obj \
-            $(SLO)$/ChartModelClone.obj \
-
-# --- Targets -----------------------------------------------------------------
-
-.INCLUDE: target.mk
diff --git a/chart2/source/controller/makefile.mk b/chart2/source/controller/makefile.mk
deleted file mode 100644
index 41d7df24acaa..000000000000
--- a/chart2/source/controller/makefile.mk
+++ /dev/null
@@ -1,135 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=				..$/..
-PRJNAME=			chart2
-TARGET=				chartcontroller
-
-USE_DEFFILE=		TRUE
-ENABLE_EXCEPTIONS=	TRUE
-VISIBILITY_HIDDEN=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- export library -------------------------------------------------
-
-#You can use several library macros of this form to build libraries that
-#do not consist of all object files in a directory or to merge different libraries.
-LIB1TARGET=		$(SLB)$/$(TARGET).lib
-
-LIB1FILES=		\
-                $(SLB)$/chcontroller.lib \
-                $(SLB)$/chcdrawinglayer.lib \
-                $(SLB)$/chcitemsetwrapper.lib \
-                $(SLB)$/chcdialogs.lib \
-                $(SLB)$/chchartapiwrapper.lib \
-                $(SLB)$/chcaccessibility.lib
-
-#--------
-
-#Indicates the filename of the shared library.
-SHL1TARGET=		$(TARGET)$(DLLPOSTFIX)
-
-#indicates dependencies:
-.IF "$(COM)" == "MSC"
-SHL1DEPN = \
-        $(LB)$/icharttools.lib \
-        $(LB)$/ichartview.lib
-.ELSE
-SHL1DEPN =
-.ENDIF
-
-#Specifies an import library to create. For Win32 only.
-SHL1IMPLIB=		i$(TARGET)
-
-#Specifies libraries from the same module to put into the shared library.
-#was created above
-SHL1LIBS= 		$(LIB1TARGET)
-
-#Links import libraries.
-
-SHL1STDLIBS=	$(CHARTTOOLS)		\
-                $(CHARTVIEW)		\
-                $(EDITENGLIB)			\
-                $(CPPULIB)			\
-                $(CPPUHELPERLIB)	\
-                $(COMPHELPERLIB)	\
-                $(BASEGFXLIB)		\
-                $(DRAWINGLAYERLIB)	\
-                $(BASEGFXLIB) 		\
-                $(SALLIB)			\
-                $(SVLLIB)			\
-                $(SVTOOLLIB)		\
-                $(SVXCORELIB)			\
-                $(SVXLIB)			\
-                $(TKLIB)			\
-                $(TOOLSLIB) 		\
-                $(VCLLIB)           \
-                $(SFXLIB)			\
-                $(UNOTOOLSLIB)		\
-                $(SOTLIB)
-
-#--------exports
-
-#specifies the exported symbols for Windows only:
-SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
-
-SHL1VERSIONMAP = $(SOLARENV)/src/component.map
-
-#--------definition file
-
-#name of the definition file:
-DEF1NAME=		$(SHL1TARGET)
-
-# --- Resources ---------------------------------------------------------------
-
-RESLIB1LIST=\
-    $(SRS)$/chcdialogs.srs \
-    $(SRS)$/chcmenus.srs \
-
-
-RESLIB1NAME=	$(TARGET)
-RESLIB1IMAGES=$(PRJ)$/res
-RESLIB1SRSFILES=$(RESLIB1LIST)
-RESLIB1DEPN=$(RESLIB1LIST)
-
-#RESLIB1SRSFILES=$(SRS)$/$(TARGET).srs
-#RESLIB1DEPN=	SRCFILES
-
-# --- Targets -----------------------------------------------------------------
-
-.INCLUDE: target.mk
-
-ALLTAR : $(MISC)/chartcontroller.component
-
-$(MISC)/chartcontroller.component .ERRREMOVE : \
-        $(SOLARENV)/bin/createcomponent.xslt chartcontroller.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt chartcontroller.component
diff --git a/chart2/source/controller/menus/makefile.mk b/chart2/source/controller/menus/makefile.mk
deleted file mode 100644
index f97548963e38..000000000000
--- a/chart2/source/controller/menus/makefile.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=				..$/..$/..
-PRJINC=				$(PRJ)$/source
-PRJNAME=			chart2
-TARGET=				chcmenus
-
-ENABLE_EXCEPTIONS=	TRUE
-VISIBILITY_HIDDEN=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE: settings.mk
-
-# i26518 the gcc-3.0.4 requires to enhance the template-depth
-# this seems to be a compiler issue, so we recommend not to use 3.0.x anymore
-.IF "$(COM)"=="GCC" 
-    CFLAGS+=-ftemplate-depth-128
-.ENDIF
-
-# --- Resources ---------------------------------------------------------------
-
-SRC1FILES=		\
-                ShapeContextMenu.src \
-                ShapeEditContextMenu.src
-
-SRS1NAME=$(TARGET)
-
-# --- Targets -----------------------------------------------------------------
-
-.INCLUDE: target.mk
-
-#dependencies:
-
-$(SRS)$/chcmenus.srs: \
-        ..$/inc$/MenuResIds.hrc
-
-#$(SRS)$/$(TARGET).srs: $(SOLARINCDIR)$/svx$/globlmn.hrc
diff --git a/chart2/source/inc/AxisHelper.hxx b/chart2/source/inc/AxisHelper.hxx
index 839b9276d480..203806ec1bd0 100644
--- a/chart2/source/inc/AxisHelper.hxx
+++ b/chart2/source/inc/AxisHelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -256,3 +257,5 @@ public:
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/AxisIndexDefines.hxx b/chart2/source/inc/AxisIndexDefines.hxx
index d994f8a85ea4..da26370ce2c8 100644
--- a/chart2/source/inc/AxisIndexDefines.hxx
+++ b/chart2/source/inc/AxisIndexDefines.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -36,3 +37,5 @@ const sal_Int32 SECONDARY_AXIS_INDEX = 1;
 } //  namespace chart
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/BaseGFXHelper.hxx b/chart2/source/inc/BaseGFXHelper.hxx
index 384841261073..f95ea46cb5f8 100644
--- a/chart2/source/inc/BaseGFXHelper.hxx
+++ b/chart2/source/inc/BaseGFXHelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -100,3 +101,5 @@ OOO_DLLPUBLIC_CHARTTOOLS double Rad2Deg( double fRadians );
 
 // CHART2_BASEGFXHELPER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/CachedDataSequence.hxx b/chart2/source/inc/CachedDataSequence.hxx
index 2ad418939945..a20411115bfc 100644
--- a/chart2/source/inc/CachedDataSequence.hxx
+++ b/chart2/source/inc/CachedDataSequence.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -190,3 +191,5 @@ private:
 
 // _CHART_CACHEDDATASEQUENCE_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/CharacterProperties.hxx b/chart2/source/inc/CharacterProperties.hxx
index 676618d0bc5c..2a9dae5bd0ca 100644
--- a/chart2/source/inc/CharacterProperties.hxx
+++ b/chart2/source/inc/CharacterProperties.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -148,3 +149,5 @@ private:
 
 // CHART_CHARACTERPROPERTIES_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/ChartDebugTrace.hxx b/chart2/source/inc/ChartDebugTrace.hxx
index d31267f9cfc4..b2dc81277506 100644
--- a/chart2/source/inc/ChartDebugTrace.hxx
+++ b/chart2/source/inc/ChartDebugTrace.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -67,3 +68,5 @@ OOO_DLLPUBLIC_CHARTTOOLS void ChartDebugTraceDiagram(
 
 // CHART2_CHARTDEBUGTRACE_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/ChartModelHelper.hxx b/chart2/source/inc/ChartModelHelper.hxx
index 7dbf0459d870..4d0c800cef81 100644
--- a/chart2/source/inc/ChartModelHelper.hxx
+++ b/chart2/source/inc/ChartModelHelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -112,3 +113,5 @@ public:
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/ChartTypeHelper.hxx b/chart2/source/inc/ChartTypeHelper.hxx
index 67df6027d2d7..94c1ebf62600 100644
--- a/chart2/source/inc/ChartTypeHelper.hxx
+++ b/chart2/source/inc/ChartTypeHelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -103,3 +104,5 @@ public:
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/ChartViewHelper.hxx b/chart2/source/inc/ChartViewHelper.hxx
index 772841418e45..b5a25c972834 100644
--- a/chart2/source/inc/ChartViewHelper.hxx
+++ b/chart2/source/inc/ChartViewHelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -49,3 +50,5 @@ public:
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/CloneHelper.hxx b/chart2/source/inc/CloneHelper.hxx
index 6747bd614d84..8480e6a4cb22 100644
--- a/chart2/source/inc/CloneHelper.hxx
+++ b/chart2/source/inc/CloneHelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -122,3 +123,5 @@ template< class Interface >
 
 // CHART2_CLONEHELPER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/ColorPerPointHelper.hxx b/chart2/source/inc/ColorPerPointHelper.hxx
index af49918a1154..60fd06eecc4e 100644
--- a/chart2/source/inc/ColorPerPointHelper.hxx
+++ b/chart2/source/inc/ColorPerPointHelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -63,3 +64,5 @@ public:
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/CommonConverters.hxx b/chart2/source/inc/CommonConverters.hxx
index 1ce032b3af69..883e3ff2f00e 100644
--- a/chart2/source/inc/CommonConverters.hxx
+++ b/chart2/source/inc/CommonConverters.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -277,3 +278,5 @@ bool replaceParamterInString( rtl::OUString & rInOutResourceString,
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/CommonFunctors.hxx b/chart2/source/inc/CommonFunctors.hxx
index eec5b59dd582..e7686ae6dac1 100644
--- a/chart2/source/inc/CommonFunctors.hxx
+++ b/chart2/source/inc/CommonFunctors.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,6 +30,7 @@
 
 #include <algorithm>
 #include <functional>
+#include <o3tl/compat_functional.hxx>
 #include <rtl/math.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <rtl/ustring.hxx>
@@ -194,10 +196,10 @@ template< class MapType >
     findValueInMap( const MapType & rMap, const typename MapType::mapped_type & rData )
 {
     return ::std::find_if( rMap.begin(), rMap.end(),
-                           ::std::compose1( ::std::bind2nd(
+                           ::o3tl::compose1( ::std::bind2nd(
                                                 ::std::equal_to< typename MapType::mapped_type >(),
                                                 rData ),
-                                            ::std::select2nd< typename MapType::value_type >()));
+                                            ::o3tl::select2nd< typename MapType::value_type >()));
 }
 
 /** Functor that deletes the object behind the given pointer by calling the
@@ -215,3 +217,5 @@ template< typename T >
 
 // CHART2_COMMONFUNCTORS_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/ConfigColorScheme.hxx b/chart2/source/inc/ConfigColorScheme.hxx
index 56d13f8971c1..28d1bf2c4056 100644
--- a/chart2/source/inc/ConfigColorScheme.hxx
+++ b/chart2/source/inc/ConfigColorScheme.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -92,3 +93,5 @@ private:
 
 // CHART2_CONFIG_COLOR_SCHEME_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/ConfigItemListener.hxx b/chart2/source/inc/ConfigItemListener.hxx
index 9ddde49908c2..82a23bbcb7cb 100644
--- a/chart2/source/inc/ConfigItemListener.hxx
+++ b/chart2/source/inc/ConfigItemListener.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -43,3 +44,5 @@ public:
 
 // CHART2_CONFIGITEMLISTENER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/ContainerHelper.hxx b/chart2/source/inc/ContainerHelper.hxx
index 4c6d10d6b1f0..8358cf09562e 100644
--- a/chart2/source/inc/ContainerHelper.hxx
+++ b/chart2/source/inc/ContainerHelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,6 +34,7 @@
 
 #include <algorithm>
 #include <functional>
+#include <o3tl/compat_functional.hxx>
 
 namespace chart
 {
@@ -153,7 +155,7 @@ template< class Map >
 {
     ::com::sun::star::uno::Sequence< typename Map::key_type > aResult( rCont.size());
     ::std::transform( rCont.begin(), rCont.end(), aResult.getArray(),
-                      ::std::select1st< typename Map::value_type >());
+                      ::o3tl::select1st< typename Map::value_type >());
     return aResult;
 }
 
@@ -170,7 +172,7 @@ template< class Map >
 {
     ::com::sun::star::uno::Sequence< typename Map::mapped_type > aResult( rCont.size());
     ::std::transform( rCont.begin(), rCont.end(), aResult.getArray(),
-                      ::std::select2nd< typename Map::value_type >());
+                      ::o3tl::select2nd< typename Map::value_type >());
     return aResult;
 }
 
@@ -179,3 +181,5 @@ template< class Map >
 
 // CHART2_CONTAINERHELPER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/ControllerLockGuard.hxx b/chart2/source/inc/ControllerLockGuard.hxx
index 69044d4a2b3f..75bdc628fda7 100644
--- a/chart2/source/inc/ControllerLockGuard.hxx
+++ b/chart2/source/inc/ControllerLockGuard.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -91,3 +92,5 @@ private:
 
 // CHART2_CONTROLLERLOCKGUARD_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/DataSeriesHelper.hxx b/chart2/source/inc/DataSeriesHelper.hxx
index 640d5cd70dec..a7ad7820c3a6 100644
--- a/chart2/source/inc/DataSeriesHelper.hxx
+++ b/chart2/source/inc/DataSeriesHelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,7 +40,7 @@
 
 #include <vector>
 #include <functional>
-#include <hash_set>
+#include <boost/unordered_map.hpp>
 
 namespace chart
 {
@@ -211,3 +212,5 @@ OOO_DLLPUBLIC_CHARTTOOLS void deleteDataLabelsFromPoint( const ::com::sun::star:
 
 // CHART2_DATASERIESHELPER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/DataSource.hxx b/chart2/source/inc/DataSource.hxx
index 3dd6ff72d330..6cc4e65119c9 100644
--- a/chart2/source/inc/DataSource.hxx
+++ b/chart2/source/inc/DataSource.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -81,3 +82,5 @@ private:
 
 // CHART2_DATASOURCE_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/DataSourceHelper.hxx b/chart2/source/inc/DataSourceHelper.hxx
index 06888fe858d6..019205592a6d 100644
--- a/chart2/source/inc/DataSourceHelper.hxx
+++ b/chart2/source/inc/DataSourceHelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -162,3 +163,5 @@ public:
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/DiagramHelper.hxx b/chart2/source/inc/DiagramHelper.hxx
index 7f4821bab248..df6a8cf082cc 100644
--- a/chart2/source/inc/DiagramHelper.hxx
+++ b/chart2/source/inc/DiagramHelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -160,7 +161,7 @@ public:
             ::com::sun::star::chart2::XDiagram > & xDiagram,
         sal_Int32 nNewDimensionCount );
 
-    /** Replaces all occurences of xCooSysToReplace in the tree with
+    /** Replaces all occurrences of xCooSysToReplace in the tree with
         xReplacement in the diagram's tree
      */
     SAL_DLLPRIVATE static void replaceCoordinateSystem(
@@ -365,3 +366,5 @@ private:
 
 // CHART2_DIAGRAMHELPER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/DisposeHelper.hxx b/chart2/source/inc/DisposeHelper.hxx
index 7e8932f17581..cddaa83849c6 100644
--- a/chart2/source/inc/DisposeHelper.hxx
+++ b/chart2/source/inc/DisposeHelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -99,3 +100,5 @@ template< class Map >
 
 // CHART2_DISPOSEHELPER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/ErrorBar.hxx b/chart2/source/inc/ErrorBar.hxx
index f4d2b457acc4..275bf0878dba 100644
--- a/chart2/source/inc/ErrorBar.hxx
+++ b/chart2/source/inc/ErrorBar.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -158,3 +159,5 @@ private:
 
 // CHART2_ERRORBAR_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/EventListenerHelper.hxx b/chart2/source/inc/EventListenerHelper.hxx
index 79840a2bd2e4..1f9e6bcfc5f9 100644
--- a/chart2/source/inc/EventListenerHelper.hxx
+++ b/chart2/source/inc/EventListenerHelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -220,3 +221,5 @@ void removeListenerFromAllSequenceElements(
 
 // CHART2_EVENTLISTENERHELPER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/ExplicitCategoriesProvider.hxx b/chart2/source/inc/ExplicitCategoriesProvider.hxx
index f8d17c277036..59020869b2d0 100644
--- a/chart2/source/inc/ExplicitCategoriesProvider.hxx
+++ b/chart2/source/inc/ExplicitCategoriesProvider.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -141,3 +142,5 @@ private: //member
 
 // CHART2_VIEW_EXPLICITCATEGORIESPROVIDER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx b/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx
index acecde281001..27a16e2b2664 100644
--- a/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx
+++ b/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -73,3 +74,5 @@ private:
 
 // CHART2_EXPONENTIALREGRESSIONCURVECALCULATOR_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/FastPropertyIdRanges.hxx b/chart2/source/inc/FastPropertyIdRanges.hxx
index d0651d60f923..a7b4568a33e9 100644
--- a/chart2/source/inc/FastPropertyIdRanges.hxx
+++ b/chart2/source/inc/FastPropertyIdRanges.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -55,3 +56,5 @@ enum FastPropertyIdRanges
 
 // CHART_FASTPROPERTYIDRANGES_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/FillProperties.hxx b/chart2/source/inc/FillProperties.hxx
index f9fa970828a2..6e52e134e25c 100644
--- a/chart2/source/inc/FillProperties.hxx
+++ b/chart2/source/inc/FillProperties.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -89,3 +90,5 @@ private:
 
 // CHART_FILLPROPERTIES_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/FormattedStringHelper.hxx b/chart2/source/inc/FormattedStringHelper.hxx
index a0e69011f77d..355ac6e1a5cd 100644
--- a/chart2/source/inc/FormattedStringHelper.hxx
+++ b/chart2/source/inc/FormattedStringHelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -55,3 +56,5 @@ public:
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/InternalData.hxx b/chart2/source/inc/InternalData.hxx
index 033d2f741f39..d98fda8a54c1 100755..100644
--- a/chart2/source/inc/InternalData.hxx
+++ b/chart2/source/inc/InternalData.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -41,6 +42,8 @@ public:
     InternalData();
 
     void createDefaultData();
+    bool isDefaultData();
+    void clearDefaultData();
 
     void setData( const ::com::sun::star::uno::Sequence<
         ::com::sun::star::uno::Sequence< double > > & rDataInRows );
@@ -83,7 +86,7 @@ public:
     void setComplexColumnLabels( const tVecVecAny& rNewColumnLabels );
     tVecVecAny getComplexColumnLabels() const;
 
-#if OSL_DEBUG_LEVEL > 2
+#if OSL_DEBUG_LEVEL > 1
     void traceData() const;
 #endif
 
@@ -107,3 +110,5 @@ private:
 #endif
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/InternalDataProvider.hxx b/chart2/source/inc/InternalDataProvider.hxx
index e467a9746df4..adffd61b4263 100644
--- a/chart2/source/inc/InternalDataProvider.hxx
+++ b/chart2/source/inc/InternalDataProvider.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -264,3 +265,5 @@ private:
 
 // CHART2_INTERNALDATAPROVIDER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/LabeledDataSequence.hxx b/chart2/source/inc/LabeledDataSequence.hxx
index a5ec1d99307d..071144803c12 100644
--- a/chart2/source/inc/LabeledDataSequence.hxx
+++ b/chart2/source/inc/LabeledDataSequence.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,9 +32,7 @@
 #include <comphelper/uno3.hxx>
 #include <cppuhelper/implbase4.hxx>
 
-#ifndef _COM_SUN_STAR_CHART2_XLABELEDDATASEQUENCE_HPP_
 #include <com/sun/star/chart2/data/XLabeledDataSequence.hpp>
-#endif
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/util/XCloneable.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
@@ -113,3 +112,5 @@ private:
 
 // CHART2_LABELEDDATASEQUENCE_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/LegendHelper.hxx b/chart2/source/inc/LegendHelper.hxx
index 5f8279286b72..37927af0c953 100644
--- a/chart2/source/inc/LegendHelper.hxx
+++ b/chart2/source/inc/LegendHelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -76,3 +77,5 @@ public:
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/LifeTime.hxx b/chart2/source/inc/LifeTime.hxx
index 8e278168259f..bb154c8e215c 100644
--- a/chart2/source/inc/LifeTime.hxx
+++ b/chart2/source/inc/LifeTime.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,9 +30,7 @@
 
 #include <osl/mutex.hxx>
 #include <osl/conditn.hxx>
-#ifndef _COM_SUN_STAR_UNO_EXCEPTION_HDL_
 #include <com/sun/star/uno/Exception.hdl>
-#endif
 #include <cppuhelper/interfacecontainer.hxx>
 #include <com/sun/star/util/XCloseListener.hpp>
 #include <com/sun/star/util/XCloseable.hpp>
@@ -76,7 +75,6 @@ protected:
     sal_Bool volatile       m_bDisposed;
     sal_Bool volatile       m_bInDispose;
 
-    //
     sal_Bool                m_bLongLastingCallsCancelable;
     ::osl::Condition        m_aNoLongLastingCallCountCondition;
     sal_Int32 volatile      m_nLongLastingCallCount;
@@ -253,3 +251,5 @@ public:
 
 }//end namespace apphelper
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/LineProperties.hxx b/chart2/source/inc/LineProperties.hxx
index 15cd08654a46..f4f30761024b 100644
--- a/chart2/source/inc/LineProperties.hxx
+++ b/chart2/source/inc/LineProperties.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -75,3 +76,5 @@ private:
 
 // CHART_LINEPROPERTIES_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/LinearRegressionCurveCalculator.hxx b/chart2/source/inc/LinearRegressionCurveCalculator.hxx
index faef7bdbe0c8..b5d744d2faef 100644
--- a/chart2/source/inc/LinearRegressionCurveCalculator.hxx
+++ b/chart2/source/inc/LinearRegressionCurveCalculator.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -72,3 +73,5 @@ private:
 
 // CHART2_LINEARREGRESSIONCURVECALCULATOR_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx b/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx
index 4b3a6fa8d0b0..a4267cf2d98a 100644
--- a/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx
+++ b/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -72,3 +73,5 @@ private:
 
 // CHART2_LOGARITHMICREGRESSIONCURVECALCULATOR_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx b/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx
index 3fc2c6f1c354..9250c78119b5 100644
--- a/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx
+++ b/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -71,3 +72,5 @@ private:
 
 // CHART2_MEANVALUEREGRESSIONCURVECALCULATOR_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/MediaDescriptorHelper.hxx b/chart2/source/inc/MediaDescriptorHelper.hxx
index a41ad1f8c751..93f5b2ee7f63 100644
--- a/chart2/source/inc/MediaDescriptorHelper.hxx
+++ b/chart2/source/inc/MediaDescriptorHelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -89,26 +90,26 @@ public:
     //@todo define this for debug only, except URL
     sal_Bool            AsTemplate; //document is a template.
     sal_Bool            ISSET_AsTemplate;
-    ::rtl::OUString     Author; //
+    ::rtl::OUString     Author;
     sal_Bool            ISSET_Author;
     ::rtl::OUString     CharacterSet; //identifier of used character set.
     sal_Bool            ISSET_CharacterSet;
-    ::rtl::OUString     Comment;//
+    ::rtl::OUString     Comment;
     sal_Bool            ISSET_Comment;
 
     ::com::sun::star::uno::Any
-                        ComponentData;//
+                        ComponentData;
     sal_Bool            ISSET_ComponentData;
     ::rtl::OUString     FileName; //deprecated, same as url
     sal_Bool            ISSET_FileName;
     ::com::sun::star::uno::Any
-                        FilterData;//
+                        FilterData;
     sal_Bool            ISSET_FilterData;
     ::rtl::OUString     FilterName; //internal filter name.
     sal_Bool            ISSET_FilterName;
     ::rtl::OUString     FilterFlags;//deprecated,
     sal_Bool            ISSET_FilterFlags;
-    ::rtl::OUString     FilterOptions;//
+    ::rtl::OUString     FilterOptions;
     sal_Bool            ISSET_FilterOptions;
             //not documented ... @todo remove?
     ::rtl::OUString     FrameName; //name of target frame.
@@ -127,7 +128,7 @@ public:
                         InputStream; //content of document.
     sal_Bool            ISSET_InputStream;
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
-                        InteractionHandler; //  //::com::sun::star::task::XInteractionHandler
+                        InteractionHandler; //::com::sun::star::task::XInteractionHandler
     sal_Bool            ISSET_InteractionHandler;
 
     ::rtl::OUString     JumpMark;   //specifies the name of a mark within the document where the first view is to position itself.
@@ -140,7 +141,7 @@ public:
     sal_Bool            ISSET_OpenNewView;
     sal_Bool            Overwrite; //opens a new view for an already loaded document.
     sal_Bool            ISSET_Overwrite;
-    ::rtl::OUString     Password; //
+    ::rtl::OUString     Password;
     sal_Bool            ISSET_Password;
 
         //not documented ... @todo remove?
@@ -161,7 +162,7 @@ public:
     sal_Bool            ISSET_Referer;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
-                        StatusIndicator; //  //::com::sun::star::task::XStatusIndicator
+                        StatusIndicator; //::com::sun::star::task::XStatusIndicator
     sal_Bool            ISSET_StatusIndicator;
         //not documented ... @todo remove?
     sal_Bool            Silent; //prevents dialogs to query for more information.
@@ -178,7 +179,7 @@ public:
     sal_Bool            ISSET_Version;
 
     ::com::sun::star::uno::Any
-                        ViewData;//
+                        ViewData;
     sal_Bool            ISSET_ViewData;
     sal_Int16           ViewId; //id of the initial view.
     sal_Bool            ISSET_ViewId;
@@ -205,3 +206,5 @@ SAL_DLLPRIVATE void impl_init();
 }
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/ModifyListenerCallBack.hxx b/chart2/source/inc/ModifyListenerCallBack.hxx
index 3833806d185e..74adba7b111a 100644
--- a/chart2/source/inc/ModifyListenerCallBack.hxx
+++ b/chart2/source/inc/ModifyListenerCallBack.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -66,3 +67,4 @@ private: //member
 
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/ModifyListenerHelper.hxx b/chart2/source/inc/ModifyListenerHelper.hxx
index 262d2078deea..d46eba5cb44a 100644
--- a/chart2/source/inc/ModifyListenerHelper.hxx
+++ b/chart2/source/inc/ModifyListenerHelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -305,3 +306,5 @@ void removeListenerFromAllSequenceElements(
 
 // CHART2_MODIFYLISTENERHELPER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/MutexContainer.hxx b/chart2/source/inc/MutexContainer.hxx
index 026c53634b12..0f00eec2af90 100644
--- a/chart2/source/inc/MutexContainer.hxx
+++ b/chart2/source/inc/MutexContainer.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -48,3 +49,5 @@ protected:
 
 // CHART_MUTEXCONTAINER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/NameContainer.hxx b/chart2/source/inc/NameContainer.hxx
index f44d3cea490a..9526fe5a895b 100644
--- a/chart2/source/inc/NameContainer.hxx
+++ b/chart2/source/inc/NameContainer.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -102,3 +103,5 @@ private: //member
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/NamedFillProperties.hxx b/chart2/source/inc/NamedFillProperties.hxx
deleted file mode 100644
index 325f8960f7fd..000000000000
--- a/chart2/source/inc/NamedFillProperties.hxx
+++ /dev/null
@@ -1,75 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef CHART_NAMEDFILLPROPERTIES_HXX
-#define CHART_NAMEDFILLPROPERTIES_HXX
-
-#error "Deprecated, do not include this file"
-
-#include "PropertyHelper.hxx"
-#include "FastPropertyIdRanges.hxx"
-#include <com/sun/star/beans/Property.hpp>
-
-#include <vector>
-
-namespace chart
-{
-
-// CHANGED! : these are the UNnamed properties!
-// @deprecated
-class NamedFillProperties
-{
-public:
-    // FastProperty Ids for properties
-    enum
-    {
-        // com.sun.star.drawing.FillProperties (only named properties)
-        //optional properties:
-        PROP_FILL_TRANSPARENCE_GRADIENT,
-        PROP_FILL_GRADIENT,
-        PROP_FILL_HATCH,
-        PROP_FILL_BITMAP,
-
-        FAST_PROPERTY_ID_END_NAMED_FILL_PROP
-    };
-
-    static void AddPropertiesToVector(
-        ::std::vector< ::com::sun::star::beans::Property > & rOutProperties );
-
-    static void AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap );
-
-    //will return e.g. "FillGradientName" for nHandle == PROP_FILL_GRADIENT_NAME
-    static ::rtl::OUString GetPropertyNameForHandle( sal_Int32 nHandle );
-
-private:
-    // not implemented
-    NamedFillProperties();
-};
-
-} //  namespace chart
-
-// CHART_NAMEDFILLPROPERTIES_HXX
-#endif
diff --git a/chart2/source/inc/NamedLineProperties.hxx b/chart2/source/inc/NamedLineProperties.hxx
deleted file mode 100644
index 8f16cd970932..000000000000
--- a/chart2/source/inc/NamedLineProperties.hxx
+++ /dev/null
@@ -1,75 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef CHART_NAMEDLINEPROPERTIES_HXX
-#define CHART_NAMEDLINEPROPERTIES_HXX
-
-#error "Deprecated, do not include this file"
-
-#include "PropertyHelper.hxx"
-#include "FastPropertyIdRanges.hxx"
-#include <com/sun/star/beans/Property.hpp>
-
-#include <vector>
-
-namespace chart
-{
-
-
-// @depreated !!
-class NamedLineProperties
-{
-public:
-    // FastProperty Ids for properties
-    enum
-    {
-        // com.sun.star.drawing.LineProperties (only named properties)
-        PROP_LINE_DASH_NAME = FAST_PROPERTY_ID_START_NAMED_LINE_PROP,
-        PROP_LINE_END_NAME,
-        PROP_LINE_START_NAME,
-
-        FAST_PROPERTY_ID_END_NAMED_LINE_PROP
-    };
-
-    static void AddPropertiesToVector(
-        ::std::vector< ::com::sun::star::beans::Property > & rOutProperties,
-        bool bIncludeLineEnds = false );
-
-    static void AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap,
-                                  bool bIncludeLineEnds = false );
-
-    //will return e.g. "LineDashName" for PROP_LINE_DASH_NAME
-    static ::rtl::OUString GetPropertyNameForHandle( sal_Int32 nHandle );
-
-private:
-    // not implemented
-    NamedLineProperties();
-};
-
-} //  namespace chart
-
-// CHART_NAMEDLINEPROPERTIES_HXX
-#endif
diff --git a/chart2/source/inc/NamedProperties.hxx b/chart2/source/inc/NamedProperties.hxx
deleted file mode 100644
index 5f9f5eb94823..000000000000
--- a/chart2/source/inc/NamedProperties.hxx
+++ /dev/null
@@ -1,62 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef CHART_NAMEDPROPERTIES_HXX
-#define CHART_NAMEDPROPERTIES_HXX
-
-#include "NamedLineProperties.hxx"
-#include "NamedFillProperties.hxx"
-
-#include "PropertyHelper.hxx"
-#include <com/sun/star/beans/Property.hpp>
-
-#include <vector>
-
-namespace chart
-{
-
-class NamedProperties
-{
-    /** this class combines the classes NamedFillAttributes and NamedLineAttributes
-    thus you can handle all named properties with one call if you like
-    */
-public:
-
-    static void AddPropertiesToVector(
-        ::std::vector< ::com::sun::star::beans::Property > & rOutProperties );
-
-    //will return e.g. "FillGradientName" for nHandle == PROP_FILL_GRADIENT_NAME
-    static ::rtl::OUString GetPropertyNameForHandle( sal_Int32 nHandle );
-
-private:
-    // not implemented
-    NamedProperties();
-};
-
-} //  namespace chart
-
-// CHART_NAMEDPROPERTIES_HXX
-#endif
diff --git a/chart2/source/inc/NoWarningThisInCTOR.hxx b/chart2/source/inc/NoWarningThisInCTOR.hxx
index 00167d07636b..bc0981b045f6 100644
--- a/chart2/source/inc/NoWarningThisInCTOR.hxx
+++ b/chart2/source/inc/NoWarningThisInCTOR.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -44,3 +45,5 @@
 
 // CHART2_NOWARNINGTHISINCTOR_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/NumberFormatterWrapper.hxx b/chart2/source/inc/NumberFormatterWrapper.hxx
index 77e2423a266f..77e2423a266f 100755..100644
--- a/chart2/source/inc/NumberFormatterWrapper.hxx
+++ b/chart2/source/inc/NumberFormatterWrapper.hxx
diff --git a/chart2/source/inc/OPropertySet.hxx b/chart2/source/inc/OPropertySet.hxx
index 85a7e4d88fe5..703543a1124b 100644
--- a/chart2/source/inc/OPropertySet.hxx
+++ b/chart2/source/inc/OPropertySet.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,17 +34,11 @@
 #include <cppuhelper/weak.hxx>
 
 // interfaces and types
-// #ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_
-// #include <com/sun/star/lang/XServiceInfo.hpp>
-// #endif
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/beans/XMultiPropertyStates.hpp>
 #include <com/sun/star/beans/Property.hpp>
 #include <com/sun/star/style/XStyleSupplier.hpp>
-// #ifndef _COM_SUN_STAR_BEANS_XFASTPROPERTYSTATE_HPP_
-// #include <com/sun/star/beans/XFastPropertyState.hpp>
-// #endif
 #include <osl/mutex.hxx>
 #include "charttoolsdllapi.hxx"
 
@@ -61,14 +56,11 @@ class OOO_DLLPUBLIC_CHARTTOOLS OPropertySet :
     // includes beans::XPropertySet, XMultiPropertySet and XFastPropertySet
     public ::cppu::OPropertySetHelper,
     // includes uno::XWeak (and XInterface, esp. ref-counting)
-//     public virtual ::cppu::OWeakObject,
 
-//     public virtual ::com::sun::star::lang::XServiceInfo,
     public ::com::sun::star::lang::XTypeProvider,
     public ::com::sun::star::beans::XPropertyState,
     public ::com::sun::star::beans::XMultiPropertyStates,
     public ::com::sun::star::style::XStyleSupplier
-//     public ::com::sun::star::beans::XFastPropertyState
 {
 public:
     OPropertySet( ::osl::Mutex & rMutex );
@@ -178,20 +170,6 @@ protected:
     // ____ XInterface ____
     virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType )
         throw (::com::sun::star::uno::RuntimeException);
-//     virtual void SAL_CALL acquire() throw ();
-//     virtual void SAL_CALL release() throw ();
-
-
-    // ____ XServiceInfo ____
-//     virtual ::rtl::OUString SAL_CALL
-//         getImplementationName()
-//         throw (::com::sun::star::uno::RuntimeException);
-//     virtual sal_Bool SAL_CALL
-//         supportsService( const ::rtl::OUString& ServiceName )
-//         throw (::com::sun::star::uno::RuntimeException);
-//     virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
-//         getSupportedServiceNames()
-//         throw (::com::sun::star::uno::RuntimeException);
 
     // ____ XTypeProvider ____
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL
@@ -243,21 +221,6 @@ protected:
         throw (::com::sun::star::lang::IllegalArgumentException,
                ::com::sun::star::uno::RuntimeException);
 
-    // ____ XFastPropertyState ____
-//     virtual ::com::sun::star::beans::PropertyState SAL_CALL getFastPropertyState( sal_Int32 nHandle )
-//         throw (::com::sun::star::beans::UnknownPropertyException,
-//                ::com::sun::star::uno::RuntimeException);
-//     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getFastPropertyStates( const ::com::sun::star::uno::Sequence< sal_Int32 >& aHandles )
-//         throw (::com::sun::star::beans::UnknownPropertyException,
-//                ::com::sun::star::uno::RuntimeException);
-//     virtual void SAL_CALL setFastPropertyToDefault( sal_Int32 nHandle )
-//         throw (::com::sun::star::beans::UnknownPropertyException,
-//                ::com::sun::star::uno::RuntimeException);
-//     virtual ::com::sun::star::uno::Any SAL_CALL getFastPropertyDefault( sal_Int32 nHandle )
-//         throw (::com::sun::star::beans::UnknownPropertyException,
-//                ::com::sun::star::lang::WrappedTargetException,
-//                ::com::sun::star::uno::RuntimeException);
-
     // ____ XMultiPropertySet ____
     virtual void SAL_CALL setPropertyValues(
         const ::com::sun::star::uno::Sequence< ::rtl::OUString >& PropertyNames,
@@ -284,3 +247,5 @@ private:
 
 // CHART_OPROPERTYSET_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/ObjectIdentifier.hxx b/chart2/source/inc/ObjectIdentifier.hxx
index 0765c9acf94a..0c71e23e9d24 100644
--- a/chart2/source/inc/ObjectIdentifier.hxx
+++ b/chart2/source/inc/ObjectIdentifier.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -276,3 +277,5 @@ private:
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/PotentialRegressionCurveCalculator.hxx b/chart2/source/inc/PotentialRegressionCurveCalculator.hxx
index 5548cf81be87..ccdc997513a1 100644
--- a/chart2/source/inc/PotentialRegressionCurveCalculator.hxx
+++ b/chart2/source/inc/PotentialRegressionCurveCalculator.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -74,3 +75,5 @@ private:
 
 // CHART2_POTENTIALREGRESSIONCURVECALCULATOR_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/PropertyHelper.hxx b/chart2/source/inc/PropertyHelper.hxx
index eb4fce0360cc..3b505cd47bc9 100644
--- a/chart2/source/inc/PropertyHelper.hxx
+++ b/chart2/source/inc/PropertyHelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -195,3 +196,5 @@ private:
 
 // CHART_PROPERTYHELPER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/RangeHighlighter.hxx b/chart2/source/inc/RangeHighlighter.hxx
index 48719ec2eeda..c7f20d2c214d 100644
--- a/chart2/source/inc/RangeHighlighter.hxx
+++ b/chart2/source/inc/RangeHighlighter.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -114,3 +115,5 @@ private:
 
 // CHART2_RANGEHIGHLIGHTER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/ReferenceSizeProvider.hxx b/chart2/source/inc/ReferenceSizeProvider.hxx
index e5c98d900379..3ef1426cd252 100644
--- a/chart2/source/inc/ReferenceSizeProvider.hxx
+++ b/chart2/source/inc/ReferenceSizeProvider.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -143,3 +144,5 @@ private:
 
 // CHART2_REFERENCESIZEPROVIDER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/RegressionCurveCalculator.hxx b/chart2/source/inc/RegressionCurveCalculator.hxx
index 25fda5080409..e484a64ce336 100644
--- a/chart2/source/inc/RegressionCurveCalculator.hxx
+++ b/chart2/source/inc/RegressionCurveCalculator.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -91,3 +92,5 @@ protected:
 
 // CHART2_REGRESSIONCURVECALCULATOR_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/RegressionCurveHelper.hxx b/chart2/source/inc/RegressionCurveHelper.hxx
index 0a8fd0315bb5..802d85553d72 100644
--- a/chart2/source/inc/RegressionCurveHelper.hxx
+++ b/chart2/source/inc/RegressionCurveHelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -239,3 +240,5 @@ private:
 
 // CHART2_REGRESSIONCURVEHELPER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/RelativePositionHelper.hxx b/chart2/source/inc/RelativePositionHelper.hxx
index eb67de9d1f16..4934d042f794 100644
--- a/chart2/source/inc/RelativePositionHelper.hxx
+++ b/chart2/source/inc/RelativePositionHelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -118,3 +119,5 @@ public:
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/RelativeSizeHelper.hxx b/chart2/source/inc/RelativeSizeHelper.hxx
index a5585d9901bc..ecc47c2f6372 100644
--- a/chart2/source/inc/RelativeSizeHelper.hxx
+++ b/chart2/source/inc/RelativeSizeHelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -57,3 +58,5 @@ private:
 
 // CHART2_RELATIVESIZEHELPER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/ResId.hxx b/chart2/source/inc/ResId.hxx
index 551f5f0da40d..2e11182cff85 100644
--- a/chart2/source/inc/ResId.hxx
+++ b/chart2/source/inc/ResId.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -46,3 +47,5 @@ public:
 
 // CHART2_RESID_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/RessourceManager.hxx b/chart2/source/inc/RessourceManager.hxx
index 9204fa106580..cd55197e2b9c 100644
--- a/chart2/source/inc/RessourceManager.hxx
+++ b/chart2/source/inc/RessourceManager.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -51,3 +52,5 @@ private:
 
 // CHART2_RESSOURCEMANAGER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/Scaling.hxx b/chart2/source/inc/Scaling.hxx
index 29fd8e2fb2e0..3fdbfa29dacd 100644
--- a/chart2/source/inc/Scaling.hxx
+++ b/chart2/source/inc/Scaling.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -208,3 +209,4 @@ private:
 //.............................................................................
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/SceneProperties.hxx b/chart2/source/inc/SceneProperties.hxx
index bceef6712106..69d8761df30e 100644
--- a/chart2/source/inc/SceneProperties.hxx
+++ b/chart2/source/inc/SceneProperties.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -94,3 +95,5 @@ private:
 
 // CHART_FILLPROPERTIES_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/ServiceMacros.hxx b/chart2/source/inc/ServiceMacros.hxx
index 03913fa22842..411e22a7ae09 100644
--- a/chart2/source/inc/ServiceMacros.hxx
+++ b/chart2/source/inc/ServiceMacros.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -118,29 +119,7 @@ static ::com::sun::star::uno::Reference<                                    \
     return (::cppu::OWeakObject *)new Class( xContext );                    \
 }
 
-/** This macro contains the default implementation for getImplementationId().
-    Note, that you have to include the header necessary for rtl_createUuid.
-    Insert the following into your file:
-
-    <code>
-#include <rtl/uuid.h>
-    </code>
-
-    @param Class the Class-Name for which getImplementationId() should be
-    implemented
- */
-#define APPHELPER_GETIMPLEMENTATIONID_IMPL(Class) \
-::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL Class::getImplementationId() \
-    throw (::com::sun::star::uno::RuntimeException) \
-{ \
-    static ::com::sun::star::uno::Sequence< sal_Int8 > aId; \
-    if( aId.getLength() == 0 ) \
-    { \
-        aId.realloc( 16 ); \
-        rtl_createUuid( (sal_uInt8 *)aId.getArray(), 0, sal_True ); \
-    } \
-    return aId; \
-}
-
 }//end namespace apphelper
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/StackMode.hxx b/chart2/source/inc/StackMode.hxx
index e341205522d4..66d00c6faf62 100644
--- a/chart2/source/inc/StackMode.hxx
+++ b/chart2/source/inc/StackMode.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -45,3 +46,5 @@ enum StackMode
 
 // CHART2_STACKMODE_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/StatisticsHelper.hxx b/chart2/source/inc/StatisticsHelper.hxx
index af05d5f3f0e8..a986c01b7b67 100644
--- a/chart2/source/inc/StatisticsHelper.hxx
+++ b/chart2/source/inc/StatisticsHelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -131,3 +132,5 @@ private:
 
 // CHART2_STATISTICSHELPER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/Strings.hrc b/chart2/source/inc/Strings.hrc
index c5b03392cd8d..de3c56a914f8 100644
--- a/chart2/source/inc/Strings.hrc
+++ b/chart2/source/inc/Strings.hrc
@@ -33,62 +33,6 @@
 //next free is 293
 //single free: 139
 
-//#define RID_APP_START 30000
-////#define STR_NULL                            (RID_APP_START +  1)
-////#define STR_BASIC_IDE                       (RID_APP_START +  2)
-//#define STR_LINES                           (RID_APP_START +  3)
-//#define STR_COLUMNS                       (RID_APP_START +  4)
-//#define STR_BARS                            (RID_APP_START +  5)
-//#define STR_AREAS                           (RID_APP_START +  6)
-//#define STR_CIRCLES                       (RID_APP_START +  7)
-//#define STR_DONUT2                        (RID_APP_START +  9)
-//#define STR_OFS                             (RID_APP_START + 14)
-//#define STR_XY                            (RID_APP_START + 16)
-//#define STR_XYZ                           (RID_APP_START + 17)
-//#define STR_ONLY_SYMBOLS                    (RID_APP_START + 115)
-//#define STR_LINESYMB                      (RID_APP_START + 15)
-//#define STR_LINE_SYMBOLS                    (RID_APP_START + 117)
-//#define STR_SYMBOL                          (RID_APP_START + 53)
-//#define STR_SYMBOL_STACK                    (RID_APP_START + 54)
-//#define STR_SYMBOL_PERCENT                  (RID_APP_START + 55)
-//#define STR_SPLINE_CUBIC                    (RID_APP_START + 56)
-//#define STR_SPLINE_CUBIC_SYMBOL             (RID_APP_START + 57)
-//#define STR_SPLINE_B                        (RID_APP_START + 58)
-//#define STR_SPLINE_B_SYMBOL                 (RID_APP_START + 59)
-//#define STR_STOCKCHART                    (RID_APP_START + 142)
-//#define STR_SAEULE_3D_1                       (RID_APP_START + 149)
-//#define STR_SAEULE_3D_2                       (RID_APP_START + 150)
-//#define STR_SAEULE_3D_3                       (RID_APP_START + 151)
-//#define STR_SAEULE_3D_4                       (RID_APP_START + 152)
-//#define STR_ROEHRE_3D_1                       (RID_APP_START + 153)
-//#define STR_ROEHRE_3D_2                       (RID_APP_START + 154)
-//#define STR_ROEHRE_3D_3                       (RID_APP_START + 155)
-//#define STR_ROEHRE_3D_4                       (RID_APP_START + 156)
-//#define STR_PYRAMID_3D_1                  (RID_APP_START + 157)
-//#define STR_PYRAMID_3D_2                  (RID_APP_START + 158)
-//#define STR_PYRAMID_3D_3                  (RID_APP_START + 159)
-//#define STR_PYRAMID_3D_4                  (RID_APP_START + 160)
-//#define STR_PYRAMIDQ_3D_1                 (RID_APP_START + 161)
-//#define STR_PYRAMIDQ_3D_2                 (RID_APP_START + 162)
-//#define STR_PYRAMIDQ_3D_3                 (RID_APP_START + 163)
-//#define STR_PYRAMIDQ_3D_4                 (RID_APP_START + 164)
-//#define STR_KEGEL_3D_1                        (RID_APP_START + 165)
-//#define STR_KEGEL_3D_2                        (RID_APP_START + 166)
-//#define STR_KEGEL_3D_3                        (RID_APP_START + 167)
-//#define STR_KEGEL_3D_4                        (RID_APP_START + 168)
-//#define STR_KEGELQ_3D_1                   (RID_APP_START + 169)
-//#define STR_KEGELQ_3D_2                   (RID_APP_START + 170)
-//#define STR_KEGELQ_3D_3                       (RID_APP_START + 171)
-//#define STR_KEGELQ_3D_4                       (RID_APP_START + 172)
-////#define STR_NORMAL_LINES                    (RID_APP_START + 18)
-////#define STR_SURFACE                         (RID_APP_START + 19)
-// #define STR_STEPMAIN_LT_MAXVALUE            (RID_APP_START + 103)
-// #define STR_STEPHELP_LT_STEPMAIN            (RID_APP_START + 104)
-// #define STR_WRONG_ORIGIN                    (RID_APP_START + 112)
-////#define STR_AREA                        (RID_APP_START + 122)
-////#define STR_LINE                        (RID_APP_START + 123)
-////#define STR_OBJECT_SOURCE_DATA              (RID_APP_START + 129)
-
 //-----------------------------------------------------------------------------
 //chart types
 //see Strings_ChartTypes.src
@@ -347,65 +291,6 @@
 #define STR_BUTTON_DOWN                     (RID_APP_START + 501)
 //-----IAccessibility2 Implementation 2009
 //-----------------------------------------------------------------------------
-/*
-////#define STR_DIAGRAM_X_AXIS                  (RID_APP_START + 34)
-////#define STR_DIAGRAM_Y_AXIS                  (RID_APP_START + 35)
-////#define STR_DIAGRAM_Z_AXIS                  (RID_APP_START + 36)
-////#define STR_ACTION_DIAGRAM_DATA              (RID_APP_START + 63)
-////#define STR_UNDO_AUTOFORMAT                 (RID_APP_START + 79)
-////#define STR_DIAGRAM_DESCR_ROW               (RID_APP_START + 46)
-////#define STR_DIAGRAM_DESCR_COL               (RID_APP_START + 47)
-////#define STR_LEGEND_SYMBOL_COL               (RID_APP_START + 50)
-////#define STR_BAD_PASSWORD_OR_FILE_CORRUPTED  (RID_APP_START + 110)
-////#define STR_QUERY_SORT                      (RID_APP_START + 113)
-////#define STR_CFG_DEFAULT_COLORS              (RID_APP_START + 177)
-////#define STR_DIAGRAM_DATA_SAFETY_QUERY       (RID_APP_START + 181)
-////#define STR_UNDO_CUT                        (RID_APP_START + 60)
-////#define STR_UNDO_DELETE                     (RID_APP_START + 61)
-////#define STR_UNDO_DRAGDROP                   (RID_APP_START + 62)
-////#define STR_UNDO_INSERT_TITLE               (RID_APP_START + 65)
-////#define STR_UNDO_INSERT_LEGEND              (RID_APP_START + 66)
-////#define STR_UNDO_INSERT_DESCR               (RID_APP_START + 67)
-////#define STR_UNDO_INSERT_AXIS                (RID_APP_START + 68)
-////#define STR_UNDO_DATA_ROW                   (RID_APP_START + 69)
-////#define STR_UNDO_DATA_POINT                 (RID_APP_START + 70)
-////#define STR_UNDO_TITLE                      (RID_APP_START + 71)
-////#define STR_UNDO_LEGEND                     (RID_APP_START + 72)
-////#define STR_UNDO_DIAGRAM_AXIS               (RID_APP_START + 73)
-////#define STR_UNDO_DIAGRAM_GRID               (RID_APP_START + 74)
-////#define STR_UNDO_DIAGRAM_WALL               (RID_APP_START + 75)
-////#define STR_UNDO_DIAGRAM_FLOOR              (RID_APP_START + 76)
-////#define STR_UNDO_DIAGRAM_AREA               (RID_APP_START + 77)
-////#define STR_UNDO_LIGHTING                   (RID_APP_START + 81)
-////#define STR_UNDO_TOGGLE_TITLE               (RID_APP_START + 82)
-////#define STR_UNDO_TOGGLE_AXIS_TITLE          (RID_APP_START + 84)
-////#define STR_UNDO_TOGGLE_AXIS_DESCR          (RID_APP_START + 85)
-////#define STR_DEFAULTVIEW                     (RID_APP_START + 90)
-////#define STR_UNDO_STATISTICS                 (RID_APP_START + 91)
-////#define STR_UNDO_DIAGRAM_LINE               (RID_APP_START + 92)
-////#define STR_UNDO_REMOVEPOINTATTRS           (RID_APP_START + 94)
-////#define STR_UNDO_MOREFRONT                  (RID_APP_START + 95)
-////#define STR_UNDO_MOREBACK                   (RID_APP_START + 96)
-////#define STR_UNDO_INSERT_SPECCHAR            (RID_APP_START + 173)
-////#define STR_UNDO_INSERT_GRID                (RID_APP_START + 178)
-////#define STR_UNDO_TRANSFORM                  (RID_APP_START + 183)
-////#define STR_UNDO_MOVE                       (RID_APP_START + 184)
-////#define STR_UNDO_RESIZE                     (RID_APP_START + 185)
-////#define STR_UNDO_ROTATE                     (RID_APP_START + 186)
-////#define STR_UNDO_DIAGRAM_STOCK_LOSS         (RID_APP_START + 147)
-////#define STR_UNDO_DIAGRAM_STOCK_PLUS         (RID_APP_START + 148)
-////#define STR_OPEN_DOCUMENT                   (RID_APP_START + 105) use SID_DOC_LOADING instead
-////#define STR_SAVE_DOCUMENT                   (RID_APP_START + 106) use SID_SAVEDOC instead
-////#define STR_GRAPHIC                         (RID_APP_START + 108)
-////#define STR_CHART_DOCUMENT                  (RID_APP_START + 109)
-////#define STR_CHART_DOCUMENT_FULLTYPE_40      (RID_APP_START + 114)
-////#define STR_CHART_DOCUMENT_FULLTYPE_31      (RID_APP_START + 118)
-////#define STR_CHART_DOCUMENT_FULLTYPE_50      (RID_APP_START + 119)
-////#define STR_CHART_DOCUMENT_FULLTYPE_60      (RID_APP_START + 182)
-////#define STR_INVISIBLE                       (RID_APP_START + 120)
-////#define STR_SOLID                           (RID_APP_START + 121)
-////#define STR_APPNAME                         (RID_APP_START + 139)
-*/
 
 // ids must not exceed RID_APP_START + 499
 // ids >= RID_APP_START + 500 are defined in glob.hrc
diff --git a/chart2/source/inc/ThreeDHelper.hxx b/chart2/source/inc/ThreeDHelper.hxx
index d3d31bd38c5d..77f403c4d9f1 100644
--- a/chart2/source/inc/ThreeDHelper.hxx
+++ b/chart2/source/inc/ThreeDHelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -157,3 +158,5 @@ public:
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/TitleHelper.hxx b/chart2/source/inc/TitleHelper.hxx
index 2de0c16266db..a46c7a83f931 100644
--- a/chart2/source/inc/TitleHelper.hxx
+++ b/chart2/source/inc/TitleHelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -99,3 +100,5 @@ public:
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/TrueGuard.hxx b/chart2/source/inc/TrueGuard.hxx
index 6a3c639df26e..9a2296e0ee55 100644
--- a/chart2/source/inc/TrueGuard.hxx
+++ b/chart2/source/inc/TrueGuard.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -46,3 +47,5 @@ private:
 }
 // CHART2_TRUEGUARD_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/UncachedDataSequence.hxx b/chart2/source/inc/UncachedDataSequence.hxx
index 0b601b06f721..63dd375b9e3a 100644
--- a/chart2/source/inc/UncachedDataSequence.hxx
+++ b/chart2/source/inc/UncachedDataSequence.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -204,3 +205,5 @@ private:
 
 // _CHART_UNCACHEDDATASEQUENCE_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/UserDefinedProperties.hxx b/chart2/source/inc/UserDefinedProperties.hxx
index af616a6f6c22..c6b4ffefe239 100644
--- a/chart2/source/inc/UserDefinedProperties.hxx
+++ b/chart2/source/inc/UserDefinedProperties.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -67,3 +68,5 @@ private:
 
 // CHART_USERDEFINEDPROPERTIES_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/WeakListenerAdapter.hxx b/chart2/source/inc/WeakListenerAdapter.hxx
index 55f283a94600..b4c25eb37170 100644
--- a/chart2/source/inc/WeakListenerAdapter.hxx
+++ b/chart2/source/inc/WeakListenerAdapter.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -125,3 +126,5 @@ protected:
 
 // CHART2_WEAKLISTENERADAPTER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/WrappedDefaultProperty.hxx b/chart2/source/inc/WrappedDefaultProperty.hxx
index 78a263c70cdc..3bbcc60331e0 100644
--- a/chart2/source/inc/WrappedDefaultProperty.hxx
+++ b/chart2/source/inc/WrappedDefaultProperty.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -64,3 +65,5 @@ private:
 
 // CHART2_WRAPPEDPROPERTYNEWDEFAULT_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/WrappedDirectStateProperty.hxx b/chart2/source/inc/WrappedDirectStateProperty.hxx
index 1dd5889f0d55..019d41e8f082 100644
--- a/chart2/source/inc/WrappedDirectStateProperty.hxx
+++ b/chart2/source/inc/WrappedDirectStateProperty.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -51,3 +52,5 @@ public:
 
 // CHART2_WRAPPEDPROPERTYNEWDEFAULT_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/WrappedIgnoreProperty.hxx b/chart2/source/inc/WrappedIgnoreProperty.hxx
index 1e76bf91ea95..1a1905c8a375 100644
--- a/chart2/source/inc/WrappedIgnoreProperty.hxx
+++ b/chart2/source/inc/WrappedIgnoreProperty.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -79,3 +80,5 @@ public:
 
 // CHART_WRAPPED_IGNORE_PROPERTY_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/WrappedProperty.hxx b/chart2/source/inc/WrappedProperty.hxx
index 91a4b40fd2c9..2b4781e4d657 100644
--- a/chart2/source/inc/WrappedProperty.hxx
+++ b/chart2/source/inc/WrappedProperty.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -84,3 +85,5 @@ typedef ::std::map< sal_Int32, const WrappedProperty* > tWrappedPropertyMap;
 
 // CHART_WRAPPEDPROPERTY_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/WrappedPropertySet.hxx b/chart2/source/inc/WrappedPropertySet.hxx
index 03cfea84f502..74bbd140197e 100644
--- a/chart2/source/inc/WrappedPropertySet.hxx
+++ b/chart2/source/inc/WrappedPropertySet.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -143,3 +144,5 @@ protected: //member
 
 // CHART_WRAPPEDPROPERTYSET_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/XMLRangeHelper.hxx b/chart2/source/inc/XMLRangeHelper.hxx
index addc8a351c29..0b62b43809b8 100644
--- a/chart2/source/inc/XMLRangeHelper.hxx
+++ b/chart2/source/inc/XMLRangeHelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -72,3 +73,5 @@ CellRange getCellRangeFromXMLString( const ::rtl::OUString & rXMLString );
 
 // CHART2_XMLRANGEHELPER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/charttoolsdllapi.hxx b/chart2/source/inc/charttoolsdllapi.hxx
index 5534f2ca737c..9c5d063fd11b 100644
--- a/chart2/source/inc/charttoolsdllapi.hxx
+++ b/chart2/source/inc/charttoolsdllapi.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,3 +40,5 @@
 #endif
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/chartview/ChartSfxItemIds.hxx b/chart2/source/inc/chartview/ChartSfxItemIds.hxx
index e3846a1d0462..48b638ea929b 100644
--- a/chart2/source/inc/chartview/ChartSfxItemIds.hxx
+++ b/chart2/source/inc/chartview/ChartSfxItemIds.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,6 +32,7 @@
 // SCHATTR
 // ============================================================
 
+// can't this be changed to 0?
 #define SCHATTR_START                       1
 
 #define SCHATTR_DATADESCR_START             SCHATTR_START
@@ -97,7 +99,7 @@
 // --------------------------------------------------------------------------
 
 #define SCHATTR_AXIS                    (SCHATTR_STYLE_END + 1)// see chtmodel.hxx defines CHART_AXIS_PRIMARY_X, etc.
-//Ummappen:
+//Re-mapped:
 #define SCHATTR_AXIS_START              (SCHATTR_AXIS + 1)
 //axis scale
 #define SCHATTR_AXISTYPE                 SCHATTR_AXIS_START
@@ -195,8 +197,8 @@
 #define CHART_AXIS_DATE         4
 
 // values for SCHATTR_STYLE_SHAPE items
-#define CHART_SHAPE3D_IGNORE  -2 //intern! (GetChartShapeStyle()!)
-#define CHART_SHAPE3D_ANY     -1 //undefinierter Typ (GetChartShapeStyle()!)
+#define CHART_SHAPE3D_IGNORE  -2 //internal! (GetChartShapeStyle()!)
+#define CHART_SHAPE3D_ANY     -1 //undefined type (GetChartShapeStyle()!)
 #define CHART_SHAPE3D_SQUARE   0
 #define CHART_SHAPE3D_CYLINDER 1
 #define CHART_SHAPE3D_CONE     2
@@ -214,3 +216,5 @@
 // ============================================================
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx b/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx
index 4d07791a884f..f710880a8a64 100644
--- a/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx
+++ b/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -57,3 +58,5 @@ public:
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/chartview/DrawModelWrapper.hxx b/chart2/source/inc/chartview/DrawModelWrapper.hxx
index 5bcf67a8592b..8a39c3dd9519 100644
--- a/chart2/source/inc/chartview/DrawModelWrapper.hxx
+++ b/chart2/source/inc/chartview/DrawModelWrapper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -112,3 +113,5 @@ public:
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/chartview/ExplicitValueProvider.hxx b/chart2/source/inc/chartview/ExplicitValueProvider.hxx
index 6e2fef8feb36..8d944192b2e9 100644
--- a/chart2/source/inc/chartview/ExplicitValueProvider.hxx
+++ b/chart2/source/inc/chartview/ExplicitValueProvider.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -114,3 +115,5 @@ public:
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/chartview/chartviewdllapi.hxx b/chart2/source/inc/chartview/chartviewdllapi.hxx
index 39c553a15fe6..a1de6ade6f1a 100644
--- a/chart2/source/inc/chartview/chartviewdllapi.hxx
+++ b/chart2/source/inc/chartview/chartviewdllapi.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,3 +40,5 @@
 #endif
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/chartview/servicenames_charttypes.hxx b/chart2/source/inc/chartview/servicenames_charttypes.hxx
index bd52c33f51ec..9ed1cb284662 100644
--- a/chart2/source/inc/chartview/servicenames_charttypes.hxx
+++ b/chart2/source/inc/chartview/servicenames_charttypes.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,16 +33,18 @@ namespace chart
 {
 //.............................................................................
 
-#define CHART2_VIEW_BARCHART_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.view.BarChart_Impl")
-#define CHART2_VIEW_BARCHART_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.view.BarChart")
+#define CHART2_VIEW_BARCHART_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.view.BarChart_Impl" ))
+#define CHART2_VIEW_BARCHART_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.view.BarChart" ))
 
-#define CHART2_VIEW_PIECHART_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.view.PieChart_Impl")
-#define CHART2_VIEW_PIECHART_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.view.PieChart")
+#define CHART2_VIEW_PIECHART_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.view.PieChart_Impl" ))
+#define CHART2_VIEW_PIECHART_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.view.PieChart" ))
 
-#define CHART2_VIEW_AREACHART_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.view.AreaChart_Impl")
-#define CHART2_VIEW_AREACHART_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.view.AreaChart")
+#define CHART2_VIEW_AREACHART_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.view.AreaChart_Impl" ))
+#define CHART2_VIEW_AREACHART_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.view.AreaChart" ))
 
 //.............................................................................
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/macros.hxx b/chart2/source/inc/macros.hxx
index ac64e879e9ec..ffa5290483c6 100644
--- a/chart2/source/inc/macros.hxx
+++ b/chart2/source/inc/macros.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -37,7 +38,7 @@
 */
 #if OSL_DEBUG_LEVEL > 0
 #define ASSERT_EXCEPTION(ex)                   \
-  OSL_ENSURE( false, ::rtl::OUStringToOString( \
+  OSL_FAIL( ::rtl::OUStringToOString( \
     ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Exception caught. Type: " )) +\
     ::rtl::OUString::createFromAscii( typeid( ex ).name()) +\
     ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ", Message: " )) +\
@@ -51,3 +52,5 @@
 
 // CHART_MACROS_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/servicenames.hxx b/chart2/source/inc/servicenames.hxx
index 43de8c3485d8..59836046f40b 100644
--- a/chart2/source/inc/servicenames.hxx
+++ b/chart2/source/inc/servicenames.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,38 +33,40 @@ namespace chart
 {
 //.............................................................................
 
-#define CHART_MODEL_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString::createFromAscii("com.sun.star.comp.chart2.ChartModel")
-#define CHART_MODEL_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.ChartDocument")
+#define CHART_MODEL_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.ChartModel" ))
+#define CHART_MODEL_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.ChartDocument" ))
 //@todo create your own service containing the service com.sun.star.document.OfficeDocument
 
-#define CHART_CONTROLLER_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString::createFromAscii("com.sun.star.comp.chart2.ChartController")
-#define CHART_CONTROLLER_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.ChartController")
+#define CHART_CONTROLLER_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.ChartController" ))
+#define CHART_CONTROLLER_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.ChartController" ))
 //@todo create your own service containing the service com.sun.star.frame.Controller
 
-#define CHART_VIEW_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString::createFromAscii("com.sun.star.comp.chart2.ChartView")
-#define CHART_VIEW_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.ChartView")
+#define CHART_VIEW_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.ChartView" ))
+#define CHART_VIEW_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.ChartView" ))
 
-#define CHART_FRAMELOADER_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString::createFromAscii("com.sun.star.comp.chart2.ChartFrameLoader")
-#define CHART_FRAMELOADER_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.frame.SynchronousFrameLoader")
+#define CHART_FRAMELOADER_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.ChartFrameLoader" ))
+#define CHART_FRAMELOADER_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.SynchronousFrameLoader" ))
 
-#define CHART_WIZARD_DIALOG_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString::createFromAscii("com.sun.star.comp.chart2.WizardDialog")
-#define CHART_WIZARD_DIALOG_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.WizardDialog")
+#define CHART_WIZARD_DIALOG_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.WizardDialog" ))
+#define CHART_WIZARD_DIALOG_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.WizardDialog" ))
 
-#define CHART_TYPE_DIALOG_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString::createFromAscii("com.sun.star.comp.chart2.ChartTypeDialog")
-#define CHART_TYPE_DIALOG_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.ChartTypeDialog")
+#define CHART_TYPE_DIALOG_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.ChartTypeDialog" ))
+#define CHART_TYPE_DIALOG_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.ChartTypeDialog" ))
 
 // wrapper for old UNO API (com.sun.star.chart)
-#define CHART_CHARTAPIWRAPPER_IMPLEMENTATION_NAME ::rtl::OUString::createFromAscii("com.sun.star.comp.chart2.ChartDocumentWrapper")
-#define CHART_CHARTAPIWRAPPER_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.ChartDocumentWrapper")
+#define CHART_CHARTAPIWRAPPER_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.ChartDocumentWrapper" ))
+#define CHART_CHARTAPIWRAPPER_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.ChartDocumentWrapper" ))
 
 // accessibility
-#define CHART_ACCESSIBLE_TEXT_IMPLEMENTATION_NAME ::rtl::OUString::createFromAscii("com.sun.star.comp.chart2.AccessibleTextComponent")
-#define CHART_ACCESSIBLE_TEXT_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.accessibility.AccessibleTextComponent")
+#define CHART_ACCESSIBLE_TEXT_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.AccessibleTextComponent" ))
+#define CHART_ACCESSIBLE_TEXT_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.accessibility.AccessibleTextComponent" ))
 
-#define CHART_RENDERER_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString::createFromAscii("com.sun.star.comp.chart2.ChartRenderer")
+#define CHART_RENDERER_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.ChartRenderer" ))
 
 //.............................................................................
 } //namespace chart
 //.............................................................................
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/servicenames_charttypes.hxx b/chart2/source/inc/servicenames_charttypes.hxx
index 60e39bccf09a..9984af30973c 100644
--- a/chart2/source/inc/servicenames_charttypes.hxx
+++ b/chart2/source/inc/servicenames_charttypes.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,18 +33,20 @@ namespace chart
 {
 //.............................................................................
 
-#define CHART2_SERVICE_NAME_CHARTTYPE_AREA ::rtl::OUString::createFromAscii("com.sun.star.chart2.AreaChartType")
-#define CHART2_SERVICE_NAME_CHARTTYPE_BAR ::rtl::OUString::createFromAscii("com.sun.star.chart2.BarChartType")
-#define CHART2_SERVICE_NAME_CHARTTYPE_COLUMN ::rtl::OUString::createFromAscii("com.sun.star.chart2.ColumnChartType")
-#define CHART2_SERVICE_NAME_CHARTTYPE_LINE ::rtl::OUString::createFromAscii("com.sun.star.chart2.LineChartType")
-#define CHART2_SERVICE_NAME_CHARTTYPE_SCATTER ::rtl::OUString::createFromAscii("com.sun.star.chart2.ScatterChartType")
-#define CHART2_SERVICE_NAME_CHARTTYPE_PIE ::rtl::OUString::createFromAscii("com.sun.star.chart2.PieChartType")
-#define CHART2_SERVICE_NAME_CHARTTYPE_NET ::rtl::OUString::createFromAscii("com.sun.star.chart2.NetChartType")
-#define CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET ::rtl::OUString::createFromAscii("com.sun.star.chart2.FilledNetChartType")
-#define CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK ::rtl::OUString::createFromAscii("com.sun.star.chart2.CandleStickChartType")
-#define CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE ::rtl::OUString::createFromAscii("com.sun.star.chart2.BubbleChartType")
+#define CHART2_SERVICE_NAME_CHARTTYPE_AREA ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.AreaChartType" ))
+#define CHART2_SERVICE_NAME_CHARTTYPE_BAR ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.BarChartType" ))
+#define CHART2_SERVICE_NAME_CHARTTYPE_COLUMN ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.ColumnChartType" ))
+#define CHART2_SERVICE_NAME_CHARTTYPE_LINE ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.LineChartType" ))
+#define CHART2_SERVICE_NAME_CHARTTYPE_SCATTER ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.ScatterChartType" ))
+#define CHART2_SERVICE_NAME_CHARTTYPE_PIE ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.PieChartType" ))
+#define CHART2_SERVICE_NAME_CHARTTYPE_NET ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.NetChartType" ))
+#define CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.FilledNetChartType" ))
+#define CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.CandleStickChartType" ))
+#define CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.BubbleChartType" ))
 
 //.............................................................................
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/servicenames_coosystems.hxx b/chart2/source/inc/servicenames_coosystems.hxx
index 002f75c7ece6..1a8de66e27be 100644
--- a/chart2/source/inc/servicenames_coosystems.hxx
+++ b/chart2/source/inc/servicenames_coosystems.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,12 +33,14 @@ namespace chart
 {
 //.............................................................................
 
-#define CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.CoordinateSystems.Cartesian")
-#define CHART2_COOSYSTEM_CARTESIAN_VIEW_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.CoordinateSystems.CartesianView")
-#define CHART2_COOSYSTEM_POLAR_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.CoordinateSystems.Polar")
-#define CHART2_COOSYSTEM_POLAR_VIEW_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.CoordinateSystems.PolarView")
+#define CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.CoordinateSystems.Cartesian" ))
+#define CHART2_COOSYSTEM_CARTESIAN_VIEW_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.CoordinateSystems.CartesianView" ))
+#define CHART2_COOSYSTEM_POLAR_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.CoordinateSystems.Polar" ))
+#define CHART2_COOSYSTEM_POLAR_VIEW_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.CoordinateSystems.PolarView" ))
 
 //.............................................................................
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/servicenames_dlwrapper.hxx b/chart2/source/inc/servicenames_dlwrapper.hxx
index 0b78a8c8227f..ba082328b43b 100644
--- a/chart2/source/inc/servicenames_dlwrapper.hxx
+++ b/chart2/source/inc/servicenames_dlwrapper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,10 +33,12 @@ namespace chart
 {
 //.............................................................................
 
-#define CHART2_VIEW_DLWRAPPER_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.DrawModelWrapper")
-#define CHART2_VIEW_DLWRAPPER_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.DrawModelWrapper")
+#define CHART2_VIEW_DLWRAPPER_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.DrawModelWrapper" ))
+#define CHART2_VIEW_DLWRAPPER_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.DrawModelWrapper" ))
 
 //.............................................................................
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx
index b66c4bc46102..66ba3d77f8ec 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -71,7 +72,7 @@ using ::osl::MutexGuard;
 // ----------------------------------------
 namespace
 {
-#define LOCAL_CONST_STR(i, x) sal_Char __READONLY_DATA i[sizeof(x)] = x
+#define LOCAL_CONST_STR(i, x) sal_Char const i[sizeof(x)] = x
 #define MAP_LEN(x) x, sizeof(x) - 1
 
 LOCAL_CONST_STR( sXML_metaStreamName,       "meta.xml");
@@ -80,11 +81,9 @@ LOCAL_CONST_STR( sXML_contentStreamName,    "content.xml" );
 LOCAL_CONST_STR( sXML_oldContentStreamName, "Content.xml" );
 
 // soffice 6/7
-// LOCAL_CONST_STR( sXML_export_chart_meta_service,            "com.sun.star.comp.Chart.XMLMetaExporter" );
 LOCAL_CONST_STR( sXML_export_chart_styles_service,          "com.sun.star.comp.Chart.XMLStylesExporter" );
 LOCAL_CONST_STR( sXML_export_chart_content_service,         "com.sun.star.comp.Chart.XMLContentExporter" );
 
-// LOCAL_CONST_STR( sXML_import_chart_meta_service,            "com.sun.star.comp.Chart.XMLMetaImporter" );
 LOCAL_CONST_STR( sXML_import_chart_styles_service,          "com.sun.star.comp.Chart.XMLStylesImporter" );
 LOCAL_CONST_STR( sXML_import_chart_content_service,         "com.sun.star.comp.Chart.XMLContentImporter" );
 LOCAL_CONST_STR( sXML_import_chart_old_content_service,     "com.sun.star.office.sax.importer.Chart" );
@@ -129,10 +128,6 @@ uno::Reference< embed::XStorage > lcl_getWriteStorage(
                         RTL_CONSTASCII_STRINGPARAM( "Password" ))
                     || rMediaDescriptor[i].Name.equalsAsciiL(
                         RTL_CONSTASCII_STRINGPARAM( "RepairPackage" ))
-    //                  || rMediaDescriptor[i].Name.equalsAsciiL(
-    //                      RTL_CONSTASCII_STRINGPARAM( "StatusIndicator" ))
-    //                  || rMediaDescriptor[i].Name.equalsAsciiL(
-    //                      RTL_CONSTASCII_STRINGPARAM( "Unpacked" ))
                     )
                 {
                     aPropertiesForStorage.push_back( rMediaDescriptor[i] );
@@ -206,10 +201,6 @@ uno::Reference< embed::XStorage > lcl_getReadStorage(
                          RTL_CONSTASCII_STRINGPARAM( "Password" ))
                      || rMediaDescriptor[i].Name.equalsAsciiL(
                          RTL_CONSTASCII_STRINGPARAM( "RepairPackage" ))
-//                  || rMediaDescriptor[i].Name.equalsAsciiL(
-//                      RTL_CONSTASCII_STRINGPARAM( "StatusIndicator" ))
-//                  || rMediaDescriptor[i].Name.equalsAsciiL(
-//                      RTL_CONSTASCII_STRINGPARAM( "Unpacked" ))
                     )
                 {
                     aPropertiesForStorage.push_back( rMediaDescriptor[i] );
@@ -294,7 +285,7 @@ sal_Bool SAL_CALL XMLFilter::filter(
     }
     else
     {
-        OSL_ENSURE( false, "filter() called with no document set" );
+        OSL_FAIL( "filter() called with no document set" );
     }
 
     return bResult;
@@ -355,7 +346,7 @@ sal_Int32 XMLFilter::impl_Import(
         Reference< lang::XServiceInfo > xServInfo( xDocumentComp, uno::UNO_QUERY_THROW );
         if( ! xServInfo->supportsService( C2U( "com.sun.star.chart2.ChartDocument" )))
         {
-            OSL_ENSURE( false, "Import: No ChartDocument" );
+            OSL_FAIL( "Import: No ChartDocument" );
             return ERRCODE_SFX_GENERAL;
         }
 
@@ -375,8 +366,6 @@ sal_Int32 XMLFilter::impl_Import(
         if( ! xStorage.is())
             return ERRCODE_SFX_GENERAL;
 
-//         bool bOasis = (SotStorage::GetVersion( xStorage ) > SOFFICE_FILEFORMAT_60);
-
         Reference< document::XGraphicObjectResolver > xGraphicObjectResolver;
         uno::Reference< lang::XMultiServiceFactory > xServiceFactory( xFactory, uno::UNO_QUERY);
         if( xServiceFactory.is())
@@ -392,7 +381,7 @@ sal_Int32 XMLFilter::impl_Import(
         /** property map for import info set */
         comphelper::PropertyMapEntry aImportInfoMap[] =
         {
-            // #80365# necessary properties for XML progress bar at load time
+            // necessary properties for XML progress bar at load time
             { MAP_LEN( "ProgressRange" ),   0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
             { MAP_LEN( "ProgressMax" ),     0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
             { MAP_LEN( "ProgressCurrent" ), 0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
@@ -523,8 +512,6 @@ sal_Int32 XMLFilter::impl_ImportStream(
             if( aParserInput.aInputStream.is())
             {
                 sal_Int32 nArgs = 0;
-                //if( m_xStatusIndicator.is())
-                //    nArgs++;
                 if( xGraphicObjectResolver.is())
                     nArgs++;
                 if( xImportInfo.is())
@@ -533,8 +520,6 @@ sal_Int32 XMLFilter::impl_ImportStream(
                 uno::Sequence< uno::Any > aFilterCompArgs( nArgs );
 
                 nArgs = 0;
-                //if( m_xStatusIndicator.is())
-                //    aFilterCompArgs[ nArgs++ ] <<= m_xStatusIndicator;
                 if( xGraphicObjectResolver.is())
                     aFilterCompArgs[nArgs++] <<= xGraphicObjectResolver;
                 if( xImportInfo.is())
@@ -566,7 +551,7 @@ sal_Int32 XMLFilter::impl_ImportStream(
                     }
                     catch(uno::Exception&)
                     {
-                        OSL_ENSURE(0,"Exception caught!");
+                        OSL_FAIL("Exception caught!");
                     }
                 }
                 xParser->setDocumentHandler( xDocHandler );
@@ -619,7 +604,7 @@ sal_Int32 XMLFilter::impl_Export(
         Reference< lang::XServiceInfo > xServInfo( xDocumentComp, uno::UNO_QUERY_THROW );
         if( ! xServInfo->supportsService( C2U( "com.sun.star.chart2.ChartDocument" )))
         {
-            OSL_ENSURE( false, "Export: No ChartDocument" );
+            OSL_FAIL( "Export: No ChartDocument" );
             return ERRCODE_SFX_GENERAL;
         }
 
@@ -664,7 +649,7 @@ sal_Int32 XMLFilter::impl_Export(
             }
             catch(uno::Exception&)
             {
-                OSL_ENSURE(0,"Exception caught!");
+                OSL_FAIL("Exception caught!");
             }
         }
 
@@ -710,8 +695,6 @@ sal_Int32 XMLFilter::impl_Export(
                 aFilterProperties[ nArgs++ ] <<= xGraphicObjectResolver;
         }
 
-//         bool bOasis = (SotStorage::GetVersion( xStorage ) > SOFFICE_FILEFORMAT_60);
-
         // export meta information
         if( bOasis )
             nWarning |= impl_ExportStream(
@@ -871,3 +854,5 @@ void XMLReportFilterHelper::isOasisFormat(const Sequence< beans::PropertyValue >
 }
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/filter/makefile.mk b/chart2/source/model/filter/makefile.mk
deleted file mode 100644
index fc9f7ebb9973..000000000000
--- a/chart2/source/model/filter/makefile.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=				..$/..$/..
-PRJNAME=			chart2
-TARGET=				chmodelfilter
-
-PRJINC=				$(PRJ)$/source
-
-ENABLE_EXCEPTIONS=	TRUE
-VISIBILITY_HIDDEN=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE: settings.mk
-
-# --- export library -------------------------------------------------
-
-#Specifies object files to bind into linked libraries.
-SLOFILES=	\
-    $(SLO)$/XMLFilter.obj
-
-# --- Targets -----------------------------------------------------------------
-
-.INCLUDE: target.mk
diff --git a/chart2/source/model/inc/BaseCoordinateSystem.hxx b/chart2/source/model/inc/BaseCoordinateSystem.hxx
index 22346e917453..3ea440fa5b7f 100644
--- a/chart2/source/model/inc/BaseCoordinateSystem.hxx
+++ b/chart2/source/model/inc/BaseCoordinateSystem.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -91,12 +92,6 @@ protected:
     // ____ XCoordinateSystem ____
     virtual ::sal_Int32 SAL_CALL getDimension()
         throw (::com::sun::star::uno::RuntimeException);
-    // not implemented
-//     virtual ::rtl::OUString SAL_CALL getCoordinateSystemType()
-//         throw (::com::sun::star::uno::RuntimeException);
-    // not implemented
-//     virtual ::rtl::OUString SAL_CALL getViewServiceName()
-//         throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setAxisByDimension(
         ::sal_Int32 nDimension,
         const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis,
@@ -127,22 +122,6 @@ protected:
         throw (::com::sun::star::lang::IllegalArgumentException,
                ::com::sun::star::uno::RuntimeException);
 
-    // ____ XCloneable ____
-    // not implemented
-//     virtual ::com::sun::star::uno::Reference<
-//         ::com::sun::star::util::XCloneable > SAL_CALL createClone()
-//         throw (::com::sun::star::uno::RuntimeException);
-
-    // ____ XServiceInfo ____
-    // not implemented
-//     virtual ::rtl::OUString SAL_CALL getImplementationName()
-//         throw (::com::sun::star::uno::RuntimeException);
-//     virtual ::sal_Bool SAL_CALL supportsService(
-//         const ::rtl::OUString& ServiceName )
-//         throw (::com::sun::star::uno::RuntimeException);
-//     virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
-//         throw (::com::sun::star::uno::RuntimeException);
-
     // ____ XModifyBroadcaster ____
     virtual void SAL_CALL addModifyListener(
         const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener )
@@ -188,3 +167,5 @@ private:
 
 // CHART_COORDINATESYSTEM_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/inc/CartesianCoordinateSystem.hxx b/chart2/source/model/inc/CartesianCoordinateSystem.hxx
index 7c9fd075d787..8e3bb89654c8 100644
--- a/chart2/source/model/inc/CartesianCoordinateSystem.hxx
+++ b/chart2/source/model/inc/CartesianCoordinateSystem.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -91,3 +92,5 @@ public:
 
 // _CHART_CARTESIANCOORDINATESYSTEM_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/inc/ChartTypeManager.hxx b/chart2/source/model/inc/ChartTypeManager.hxx
index de721be48142..4c01ca1d97a3 100644
--- a/chart2/source/model/inc/ChartTypeManager.hxx
+++ b/chart2/source/model/inc/ChartTypeManager.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,21 +35,15 @@
 #include "ServiceMacros.hxx"
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-// #ifndef _COM_SUN_STAR_LANG_XMULTICOMPONENTFACTORY_HPP_
-// #include <com/sun/star/lang/XMultiComponentFactory.hpp>
-// #endif
 
 #include <com/sun/star/chart2/XChartTypeManager.hpp>
 
-// #include <map>
-
 namespace chart
 {
 
 class ChartTypeManager :
         public ::cppu::WeakImplHelper2<
         ::com::sun::star::lang::XMultiServiceFactory,
-//     ::com::sun::star::lang::XMultiComponentFactory,
         ::com::sun::star::chart2::XChartTypeManager >
 {
 public:
@@ -90,3 +85,5 @@ private:
 
 // CHART_CHARTTYPEMANAGER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/inc/DataSeries.hxx b/chart2/source/model/inc/DataSeries.hxx
index c557e537da70..2bb82f47a6e7 100644
--- a/chart2/source/model/inc/DataSeries.hxx
+++ b/chart2/source/model/inc/DataSeries.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -224,3 +225,5 @@ private:
 
 // _CHART_DATASERIES_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/inc/DataSeriesTree.hxx b/chart2/source/model/inc/DataSeriesTree.hxx
index 5c6734dde845..977fdb83ad02 100644
--- a/chart2/source/model/inc/DataSeriesTree.hxx
+++ b/chart2/source/model/inc/DataSeriesTree.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -89,3 +90,5 @@ private:
 
 // CHART_DATASERIESTREE_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/inc/Diagram.hxx b/chart2/source/model/inc/Diagram.hxx
index 658cfb2b4d6e..1396249bcfd9 100644
--- a/chart2/source/model/inc/Diagram.hxx
+++ b/chart2/source/model/inc/Diagram.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -111,13 +112,6 @@ protected:
     virtual void SAL_CALL getFastPropertyValue(
         ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const;
 
-//  virtual sal_Bool SAL_CALL convertFastPropertyValue
-//         ( ::com::sun::star::uno::Any & rConvertedValue,
-//           ::com::sun::star::uno::Any & rOldValue,
-//           sal_Int32 nHandle,
-//           const ::com::sun::star::uno::Any& rValue )
-//      throw (::com::sun::star::lang::IllegalArgumentException);
-
     // ____ XDiagram ____
     virtual ::com::sun::star::uno::Reference<
         ::com::sun::star::beans::XPropertySet > SAL_CALL getWall()
@@ -242,3 +236,5 @@ private:
 
 // CHART_DIAGRAM_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/inc/PolarCoordinateSystem.hxx b/chart2/source/model/inc/PolarCoordinateSystem.hxx
index cf82e1cb0871..7860d6f5b51f 100644
--- a/chart2/source/model/inc/PolarCoordinateSystem.hxx
+++ b/chart2/source/model/inc/PolarCoordinateSystem.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -91,3 +92,5 @@ public:
 
 // _CHART_POLARCOORDINATESYSTEM_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/inc/StockBar.hxx b/chart2/source/model/inc/StockBar.hxx
index 7fa98b79964b..9f712b0dbd53 100644
--- a/chart2/source/model/inc/StockBar.hxx
+++ b/chart2/source/model/inc/StockBar.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -117,3 +118,5 @@ private:
 
 // CHART_STOCKBAR_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/inc/XMLFilter.hxx b/chart2/source/model/inc/XMLFilter.hxx
index 69b008bbcb75..9babb138270c 100644
--- a/chart2/source/model/inc/XMLFilter.hxx
+++ b/chart2/source/model/inc/XMLFilter.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -221,3 +222,5 @@ protected:
 
 // CHART2_XMLFILTER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/inc/_serviceregistration_charttypes.hxx b/chart2/source/model/inc/_serviceregistration_charttypes.hxx
index 481a7064f311..05611abd0dd7 100644
--- a/chart2/source/model/inc/_serviceregistration_charttypes.hxx
+++ b/chart2/source/model/inc/_serviceregistration_charttypes.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -38,3 +39,5 @@ public:
 
 // CHART2__SERVICEREGISTRATION_CHARTTYPES_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx
index 165ebe0f0717..babef7fd466c 100755..100644
--- a/chart2/source/model/main/Axis.cxx
+++ b/chart2/source/model/main/Axis.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -466,33 +467,27 @@ void SAL_CALL Axis::setScaleData( const chart2::ScaleData& rScaleData )
 chart2::ScaleData SAL_CALL Axis::getScaleData()
     throw (uno::RuntimeException)
 {
-    // /--
     MutexGuard aGuard( m_aMutex );
     return m_aScaleData;
-    // \--
 }
 
 Reference< beans::XPropertySet > SAL_CALL Axis::getGridProperties()
     throw (uno::RuntimeException)
 {
-    // /--
     MutexGuard aGuard( m_aMutex );
     return m_xGrid;
-    // \--
 }
 Sequence< Reference< beans::XPropertySet > > SAL_CALL Axis::getSubGridProperties()
     throw (uno::RuntimeException)
 {
-    // /--
     MutexGuard aGuard( m_aMutex );
     return m_aSubGridProperties;
-    // \--
 }
 
 Sequence< Reference< beans::XPropertySet > > SAL_CALL Axis::getSubTickProperties()
     throw (uno::RuntimeException)
 {
-    OSL_ENSURE( false, "Not implemented yet" );
+    OSL_FAIL( "Not implemented yet" );
     return Sequence< Reference< beans::XPropertySet > >();
 }
 
@@ -501,10 +496,8 @@ Sequence< Reference< beans::XPropertySet > > SAL_CALL Axis::getSubTickProperties
 Reference< chart2::XTitle > SAL_CALL Axis::getTitleObject()
     throw (uno::RuntimeException)
 {
-    // /--
     MutexGuard aGuard( GetMutex() );
     return m_xTitle;
-    // \--
 }
 
 void SAL_CALL Axis::setTitleObject( const Reference< chart2::XTitle >& xNewTitle )
@@ -638,3 +631,5 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( Axis, Axis_Base, ::property::OPropertySet )
 APPHELPER_XSERVICEINFO_IMPL( Axis, lcl_aServiceName );
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/Axis.hxx b/chart2/source/model/main/Axis.hxx
index 7f72e08b8b69..63ca5f192660 100644
--- a/chart2/source/model/main/Axis.hxx
+++ b/chart2/source/model/main/Axis.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -95,13 +96,6 @@ protected:
         getPropertySetInfo()
         throw (::com::sun::star::uno::RuntimeException);
 
-//  virtual sal_Bool SAL_CALL convertFastPropertyValue
-//         ( ::com::sun::star::uno::Any & rConvertedValue,
-//           ::com::sun::star::uno::Any & rOldValue,
-//           sal_Int32 nHandle,
-//           const ::com::sun::star::uno::Any& rValue )
-//      throw (::com::sun::star::lang::IllegalArgumentException);
-
     // ____ XAxis ____
     virtual void SAL_CALL setScaleData( const ::com::sun::star::chart2::ScaleData& rScaleData )
         throw (::com::sun::star::uno::RuntimeException);
@@ -182,3 +176,5 @@ private: //member
 
 // CHART_AXIS_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx
index 80fa0b51575f..05711b1bc3b7 100755..100644
--- a/chart2/source/model/main/BaseCoordinateSystem.cxx
+++ b/chart2/source/model/main/BaseCoordinateSystem.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -408,3 +409,5 @@ IMPLEMENT_FORWARD_XINTERFACE2( BaseCoordinateSystem, BaseCoordinateSystem_Base,
 IMPLEMENT_FORWARD_XTYPEPROVIDER2( BaseCoordinateSystem, BaseCoordinateSystem_Base, ::property::OPropertySet )
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/CartesianCoordinateSystem.cxx b/chart2/source/model/main/CartesianCoordinateSystem.cxx
index fdaa333b1cb8..eeb19be0cf8c 100644
--- a/chart2/source/model/main/CartesianCoordinateSystem.cxx
+++ b/chart2/source/model/main/CartesianCoordinateSystem.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -153,3 +154,5 @@ Sequence< OUString > CartesianCoordinateSystem3d::getSupportedServiceNames_Stati
 APPHELPER_XSERVICEINFO_IMPL( CartesianCoordinateSystem3d, lcl_aImplementationNameCartesian3d )
 
 }  // namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index 0d3b45367019..9d88b849220b 100755..100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -520,9 +521,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartModel::getCurrentSelection() thr
             uno::Any aSel = xSelectionSupl->getSelection();
             rtl::OUString aObjectCID;
             if( aSel >>= aObjectCID )
-            {
                 xReturn.set( ObjectIdentifier::getObjectPropertySet( aObjectCID, Reference< XChartDocument >(this)));
-            }
         }
     }
     return xReturn;
@@ -573,6 +572,10 @@ void SAL_CALL ChartModel::dispose() throw(uno::RuntimeException)
     m_xCurrentController.clear();
 
     DisposeHelper::DisposeAndClear( m_xRangeHighlighter );
+
+    if( m_xOldModelAgg.is())
+        m_xOldModelAgg->setDelegator( NULL );
+
     OSL_TRACE( "ChartModel: dispose() called" );
 }
 
@@ -771,16 +774,16 @@ Reference< chart2::data::XDataSource > ChartModel::impl_createDefaultData()
             //create data
             uno::Sequence< beans::PropertyValue > aArgs( 4 );
             aArgs[0] = beans::PropertyValue(
-                ::rtl::OUString::createFromAscii("CellRangeRepresentation"), -1,
+                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CellRangeRepresentation" )), -1,
                 uno::makeAny( C2U("all") ), beans::PropertyState_DIRECT_VALUE );
             aArgs[1] = beans::PropertyValue(
-                ::rtl::OUString::createFromAscii("HasCategories"), -1,
+                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HasCategories" )), -1,
                 uno::makeAny( true ), beans::PropertyState_DIRECT_VALUE );
             aArgs[2] = beans::PropertyValue(
-                ::rtl::OUString::createFromAscii("FirstCellAsLabel"), -1,
+                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FirstCellAsLabel" )), -1,
                 uno::makeAny( true ), beans::PropertyState_DIRECT_VALUE );
             aArgs[3] = beans::PropertyValue(
-                ::rtl::OUString::createFromAscii("DataRowSource"), -1,
+                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DataRowSource" )), -1,
                 uno::makeAny( ::com::sun::star::chart::ChartDataRowSource_COLUMNS ), beans::PropertyState_DIRECT_VALUE );
             xDataSource = m_xInternalDataProvider->createDataSource( aArgs );
         }
@@ -815,10 +818,8 @@ sal_Bool SAL_CALL ChartModel::hasInternalDataProvider()
 uno::Reference< chart2::data::XDataProvider > SAL_CALL ChartModel::getDataProvider()
             throw (uno::RuntimeException)
 {
-    // /--
     MutexGuard aGuard( m_aModelMutex );
     return m_xDataProvider;
-    // \--
 }
 
 // ____ XDataReceiver ____
@@ -827,7 +828,6 @@ void SAL_CALL ChartModel::attachDataProvider( const uno::Reference< chart2::data
             throw (uno::RuntimeException)
 {
     {
-        // /--
         MutexGuard aGuard( m_aModelMutex );
         uno::Reference< beans::XPropertySet > xProp( xDataProvider, uno::UNO_QUERY );
         if( xProp.is() )
@@ -846,7 +846,6 @@ void SAL_CALL ChartModel::attachDataProvider( const uno::Reference< chart2::data
         m_xInternalDataProvider.clear();
 
         //the numberformatter is kept independent of the data provider!
-        // \--
     }
     setModified( sal_True );
 }
@@ -855,7 +854,6 @@ void SAL_CALL ChartModel::attachNumberFormatsSupplier( const uno::Reference< uti
             throw (uno::RuntimeException)
 {
     {
-        // /--
         MutexGuard aGuard( m_aModelMutex );
         if( xNewSupplier==m_xNumberFormatsSupplier )
             return;
@@ -878,7 +876,6 @@ void SAL_CALL ChartModel::attachNumberFormatsSupplier( const uno::Reference< uti
 
         m_xNumberFormatsSupplier.set( xNewSupplier );
         m_xOwnNumberFormatsSupplier.clear();
-        // \--
     }
     setModified( sal_True );
 }
@@ -888,7 +885,6 @@ void SAL_CALL ChartModel::setArguments( const Sequence< beans::PropertyValue >&
                    uno::RuntimeException)
 {
     {
-        // /--
         MutexGuard aGuard( m_aModelMutex );
         if( !m_xDataProvider.is() )
             return;
@@ -919,7 +915,6 @@ void SAL_CALL ChartModel::setArguments( const Sequence< beans::PropertyValue >&
             ASSERT_EXCEPTION( ex );
         }
         unlockControllers();
-        // \--
     }
     setModified( sal_True );
 }
@@ -961,10 +956,8 @@ void SAL_CALL ChartModel::setChartTypeManager( const uno::Reference< chart2::XCh
             throw (uno::RuntimeException)
 {
     {
-        // /--
         MutexGuard aGuard( m_aModelMutex );
         m_xChartTypeManager = xNewManager;
-        // \--
     }
     setModified( sal_True );
 }
@@ -972,42 +965,34 @@ void SAL_CALL ChartModel::setChartTypeManager( const uno::Reference< chart2::XCh
 uno::Reference< chart2::XChartTypeManager > SAL_CALL ChartModel::getChartTypeManager()
             throw (uno::RuntimeException)
 {
-    // /--
     MutexGuard aGuard( m_aModelMutex );
     return m_xChartTypeManager;
-    // \--
 }
 
 uno::Reference< beans::XPropertySet > SAL_CALL ChartModel::getPageBackground()
     throw (uno::RuntimeException)
 {
-    // /--
     MutexGuard aGuard( m_aModelMutex );
     return m_xPageBackground;
-    // \--
 }
 
 // ____ XTitled ____
 uno::Reference< chart2::XTitle > SAL_CALL ChartModel::getTitleObject()
     throw (uno::RuntimeException)
 {
-    // /--
     MutexGuard aGuard( m_aModelMutex );
     return m_xTitle;
-    // \--
 }
 
 void SAL_CALL ChartModel::setTitleObject( const uno::Reference< chart2::XTitle >& xTitle )
     throw (uno::RuntimeException)
 {
     {
-        // /--
         MutexGuard aGuard( m_aModelMutex );
         if( m_xTitle.is() )
             ModifyListenerHelper::removeListener( m_xTitle, this );
         m_xTitle = xTitle;
         ModifyListenerHelper::addListener( m_xTitle, this );
-        // \--
     }
     setModified( sal_True );
 }
@@ -1068,7 +1053,7 @@ void SAL_CALL ChartModel::setVisualAreaSize( ::sal_Int64 nAspect, const awt::Siz
     }
     else
     {
-        OSL_ENSURE( false, "setVisualAreaSize: Aspect not implemented yet.");
+        OSL_FAIL( "setVisualAreaSize: Aspect not implemented yet.");
     }
 }
 
@@ -1177,9 +1162,6 @@ Sequence< datatransfer::DataFlavor > SAL_CALL ChartModel::getTransferDataFlavors
 {
     uno::Sequence< datatransfer::DataFlavor > aRet(1);
 
-//     aRet[0] = datatransfer::DataFlavor( lcl_aGDIMetaFileMIMEType,
-//         C2U( "GDIMetaFile" ),
-//      ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) );
     aRet[0] = datatransfer::DataFlavor( lcl_aGDIMetaFileMIMETypeHighContrast,
         C2U( "GDIMetaFile" ),
         ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) );
@@ -1190,8 +1172,6 @@ Sequence< datatransfer::DataFlavor > SAL_CALL ChartModel::getTransferDataFlavors
 ::sal_Bool SAL_CALL ChartModel::isDataFlavorSupported( const datatransfer::DataFlavor& aFlavor )
     throw (uno::RuntimeException)
 {
-//     return ( aFlavor.MimeType.equals(lcl_aGDIMetaFileMIMEType) ||
-//              aFlavor.MimeType.equals(lcl_aGDIMetaFileMIMETypeHighContrast) );
     return aFlavor.MimeType.equals(lcl_aGDIMetaFileMIMETypeHighContrast);
 }
 
@@ -1377,3 +1357,5 @@ uno::Sequence< Reference< chart2::data::XLabeledDataSequence > > SAL_CALL ChartM
 }
 
 }  // namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/ChartModel.hxx b/chart2/source/model/main/ChartModel.hxx
index 2cec0ec9f73c..9d08d283187c 100755..100644
--- a/chart2/source/model/main/ChartModel.hxx
+++ b/chart2/source/model/main/ChartModel.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -91,11 +92,7 @@ typedef ::comphelper::WeakImplHelper21<
 //       ::com::sun::star::frame::XModel        //comprehends XComponent (required interface), base of XChartDocument
          ::com::sun::star::util::XCloseable     //comprehends XCloseBroadcaster
         ,::com::sun::star::frame::XStorable2    //(extension of XStorable)
-//      ,::com::sun::star::frame::XStorable     //(required interface) base of XStorable2
         ,::com::sun::star::util::XModifiable    //comprehends XModifyBroadcaster (required interface)
-    //  ,::com::sun::star::uno::XWeak           // implemented by WeakImplHelper(optional interface)
-    //  ,::com::sun::star::uno::XInterface      // implemented by WeakImplHelper(optional interface)
-    //  ,::com::sun::star::lang::XTypeProvider  // implemented by WeakImplHelper
         ,::com::sun::star::lang::XServiceInfo
         ,::com::sun::star::lang::XInitialization
         ,::com::sun::star::chart2::XChartDocument  // derived from XModel
@@ -141,8 +138,6 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >    m_xCurrentController;
     sal_uInt16                                                                  m_nControllerLockCount;
 
-//  ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >   m_aPrinterOptions;
-
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation >      m_xOldModelAgg;
 
@@ -617,3 +612,5 @@ public:
 }  // namespace chart
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx
index 1868c38e094f..b1cbbd0d3db8 100644
--- a/chart2/source/model/main/ChartModel_Persistence.cxx
+++ b/chart2/source/model/main/ChartModel_Persistence.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -53,9 +54,7 @@
 #include <com/sun/star/io/XSeekable.hpp>
 
 #include <ucbhelper/content.hxx>
-#ifndef _UNOTOOLS_UCBSTREAMHELPER_HXX
 #include <unotools/ucbstreamhelper.hxx>
-#endif
 #include <vcl/cvtgrf.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <vcl/svapp.hxx>
@@ -161,7 +160,7 @@ Reference< document::XFilter > ChartModel::impl_createFilter(
 
     // find FilterName in MediaDescriptor
     OUString aFilterName(
-        lcl_getProperty< OUString >( rMediaDescriptor, OUString::createFromAscii("FilterName")));
+        lcl_getProperty< OUString >( rMediaDescriptor, OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterName" ))));
 
     // if FilterName was found, get Filter from factory
     if( aFilterName.getLength() > 0 )
@@ -179,7 +178,7 @@ Reference< document::XFilter > ChartModel::impl_createFilter(
                 (aFilterProps >>= aProps))
             {
                 OUString aFilterServiceName(
-                    lcl_getProperty< OUString >( aProps, OUString::createFromAscii("FilterService")));
+                    lcl_getProperty< OUString >( aProps, OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterService" ))));
 
                 if( aFilterServiceName.getLength())
                 {
@@ -375,7 +374,7 @@ void ChartModel::impl_store(
     }
     else
     {
-        OSL_ENSURE( false, "No filter" );
+        OSL_FAIL( "No filter" );
     }
 
     setModified( sal_False );
@@ -390,7 +389,7 @@ void ChartModel::impl_store(
         apphelper::MediaDescriptorHelper aMDHelper(rMediaDescriptor);
         try
         {
-            xPropSet->setPropertyValue( OUString::createFromAscii("SavedObject"),
+            xPropSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "SavedObject" )),
                 uno::makeAny( aMDHelper.HierarchicalDocumentName ) );
         }
         catch ( uno::Exception& )
@@ -606,7 +605,7 @@ void ChartModel::impl_load(
     }
     else
     {
-        OSL_ENSURE( false, "loadFromStorage cannot create filter" );
+        OSL_FAIL( "loadFromStorage cannot create filter" );
     }
 
     if( xStorage.is() )
@@ -858,3 +857,5 @@ void SAL_CALL ChartModel::removeStorageChangeListener( const Reference< document
 }
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/DataPoint.cxx b/chart2/source/model/main/DataPoint.cxx
index e658000cc9dd..f337ba1c3972 100755..100644
--- a/chart2/source/model/main/DataPoint.cxx
+++ b/chart2/source/model/main/DataPoint.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -314,3 +315,5 @@ IMPLEMENT_FORWARD_XINTERFACE2( DataPoint, DataPoint_Base, ::property::OPropertyS
 APPHELPER_XSERVICEINFO_IMPL( DataPoint, C2U( "com.sun.star.comp.chart.DataPoint" ));
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/DataPoint.hxx b/chart2/source/model/main/DataPoint.hxx
index 974899f42e24..41eeb165bab3 100755..100644
--- a/chart2/source/model/main/DataPoint.hxx
+++ b/chart2/source/model/main/DataPoint.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -138,3 +139,5 @@ private:
 
 // CHART_DATAPOINT_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/DataPointProperties.cxx b/chart2/source/model/main/DataPointProperties.cxx
index 964f61b128ed..f7b49295da04 100644
--- a/chart2/source/model/main/DataPointProperties.cxx
+++ b/chart2/source/model/main/DataPointProperties.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,24 +33,15 @@
 #include "LineProperties.hxx"
 #include "FillProperties.hxx"
 
-// #ifndef _COM_SUN_STAR_AWT_GRADIENT_HPP_
-// #include <com/sun/star/awt/Gradient.hpp>
-// #endif
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/drawing/FillStyle.hpp>
 #include <com/sun/star/drawing/LineStyle.hpp>
 #include <com/sun/star/drawing/LineDash.hpp>
 #include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp>
-// #ifndef _COM_SUN_STAR_DRAWING_HATCH_HPP_
-// #include <com/sun/star/drawing/Hatch.hpp>
-// #endif
 #include <com/sun/star/style/XStyle.hpp>
 #include <com/sun/star/drawing/BitmapMode.hpp>
 #include <com/sun/star/drawing/RectanglePoint.hpp>
 
-// #ifndef _COM_SUN_STAR_CHART2_FILLBITMAP_HPP_
-// #include <com/sun/star/chart2/FillBitmap.hpp>
-// #endif
 #include <com/sun/star/chart2/DataPointGeometry3D.hpp>
 #include <com/sun/star/chart2/DataPointLabel.hpp>
 #include <com/sun/star/chart2/Symbol.hpp>
@@ -436,3 +428,5 @@ void DataPointProperties::AddDefaultsToMap(
 }
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/DataPointProperties.hxx b/chart2/source/model/main/DataPointProperties.hxx
index 5d4d02af36ef..2632f983959d 100644
--- a/chart2/source/model/main/DataPointProperties.hxx
+++ b/chart2/source/model/main/DataPointProperties.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -49,7 +50,6 @@ public:
 
         // fill
         PROP_DATAPOINT_FILL_STYLE,
-//         PROP_DATAPOINT_TRANSPARENCY_STYLE,
         PROP_DATAPOINT_TRANSPARENCY_GRADIENT_NAME,
         PROP_DATAPOINT_GRADIENT_NAME,
         PROP_DATAPOINT_GRADIENT_STEPCOUNT,
@@ -99,3 +99,5 @@ private:
 
 // CHART_DATAPOINTPROPERTIES_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx
index 55ab9c9e5a59..97c7c27abd0c 100755..100644
--- a/chart2/source/model/main/DataSeries.cxx
+++ b/chart2/source/model/main/DataSeries.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -629,3 +630,5 @@ APPHELPER_XSERVICEINFO_IMPL( DataSeries,
                              C2U( "com.sun.star.comp.chart.DataSeries" ));
 
 }  // namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/DataSeriesProperties.cxx b/chart2/source/model/main/DataSeriesProperties.cxx
index 29a41bd38e14..6e0e96c51922 100644
--- a/chart2/source/model/main/DataSeriesProperties.cxx
+++ b/chart2/source/model/main/DataSeriesProperties.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -96,3 +97,5 @@ void DataSeriesProperties::AddDefaultsToMap(
 }
 
 }  // namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/DataSeriesProperties.hxx b/chart2/source/model/main/DataSeriesProperties.hxx
index 6805b80c975b..4736b207855b 100644
--- a/chart2/source/model/main/DataSeriesProperties.hxx
+++ b/chart2/source/model/main/DataSeriesProperties.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -61,3 +62,5 @@ private:
 
 // CHART_DATASERIESPROPERTIES_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx
index c6b9a0f2e112..e8d2b1cdc4b9 100644
--- a/chart2/source/model/main/Diagram.cxx
+++ b/chart2/source/model/main/Diagram.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -504,7 +505,7 @@ void SAL_CALL Diagram::addCoordinateSystem(
 
         if( m_aCoordSystems.size()>=1 )
         {
-            OSL_ENSURE( false, "more than one coordinatesystem is not supported yet by the fileformat" );
+            OSL_FAIL( "more than one coordinatesystem is not supported yet by the fileformat" );
             return;
         }
         m_aCoordSystems.push_back( aCoordSys );
@@ -729,3 +730,5 @@ APPHELPER_XSERVICEINFO_IMPL( Diagram,
                              C2U( "com.sun.star.comp.chart2.Diagram" ));
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/FormattedString.cxx b/chart2/source/model/main/FormattedString.cxx
index 2d1f937d3e57..047c0bc6faa7 100755..100644
--- a/chart2/source/model/main/FormattedString.cxx
+++ b/chart2/source/model/main/FormattedString.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -140,10 +141,8 @@ uno::Reference< util::XCloneable > SAL_CALL FormattedString::createClone()
 ::rtl::OUString SAL_CALL FormattedString::getString()
     throw (uno::RuntimeException)
 {
-    // /--
     MutexGuard aGuard( GetMutex());
     return m_aString;
-    // \--
 }
 
 void SAL_CALL FormattedString::setString( const ::rtl::OUString& String )
@@ -263,3 +262,5 @@ APPHELPER_XSERVICEINFO_IMPL( FormattedString,
                              C2U( "com.sun.star.comp.chart.FormattedString" ));
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/FormattedString.hxx b/chart2/source/model/main/FormattedString.hxx
index 9293d73afa5b..0bf825454f92 100644
--- a/chart2/source/model/main/FormattedString.hxx
+++ b/chart2/source/model/main/FormattedString.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -93,13 +94,6 @@ protected:
         getPropertySetInfo()
         throw (::com::sun::star::uno::RuntimeException);
 
-//  virtual sal_Bool SAL_CALL convertFastPropertyValue
-//         ( ::com::sun::star::uno::Any & rConvertedValue,
-//           ::com::sun::star::uno::Any & rOldValue,
-//           sal_Int32 nHandle,
-//           const ::com::sun::star::uno::Any& rValue )
-//      throw (::com::sun::star::lang::IllegalArgumentException);
-
     // ____ XCloneable ____
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone()
         throw (::com::sun::star::uno::RuntimeException);
@@ -138,3 +132,5 @@ private:
 
 // CHART_FORMATTEDSTRING_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/GridProperties.cxx b/chart2/source/model/main/GridProperties.cxx
index 4739b96bb4b7..17f647003250 100755..100644
--- a/chart2/source/model/main/GridProperties.cxx
+++ b/chart2/source/model/main/GridProperties.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -272,3 +273,5 @@ IMPLEMENT_FORWARD_XINTERFACE2( GridProperties, GridProperties_Base, ::property::
 IMPLEMENT_FORWARD_XTYPEPROVIDER2( GridProperties, GridProperties_Base, ::property::OPropertySet )
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/GridProperties.hxx b/chart2/source/model/main/GridProperties.hxx
index 1c0ae0ed849a..e16952be8208 100644
--- a/chart2/source/model/main/GridProperties.hxx
+++ b/chart2/source/model/main/GridProperties.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -126,3 +127,5 @@ private:
 
 // CHART_GRIDPROPERTIES_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/LayoutContainer.cxx b/chart2/source/model/main/LayoutContainer.cxx
deleted file mode 100644
index d962113f78c7..000000000000
--- a/chart2/source/model/main/LayoutContainer.cxx
+++ /dev/null
@@ -1,138 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
-#include "LayoutContainer.hxx"
-#include "macros.hxx"
-#include "ContainerHelper.hxx"
-
-#include <algorithm>
-
-using namespace ::com::sun::star;
-
-namespace
-{
-
-static const ::rtl::OUString lcl_aServiceName(
-    RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.layout.LayoutContainer" ));
-} // anonymous namespace
-
-namespace chart
-{
-
-LayoutContainer::LayoutContainer()
-{}
-
-LayoutContainer::~LayoutContainer()
-{}
-
-// ____ XLayoutContainer ____
-void SAL_CALL LayoutContainer::addConstrainedElementByIdentifier(
-    const ::rtl::OUString& aIdentifier,
-    const layout::Constraint& Constraint )
-    throw (layout::IllegalConstraintException,
-           lang::IllegalArgumentException,
-           uno::RuntimeException)
-{
-    addElementByIdentifier( aIdentifier );
-    m_aConstraints[ aIdentifier ] = Constraint;
-}
-
-void SAL_CALL LayoutContainer::addElementByIdentifier( const ::rtl::OUString& aIdentifier )
-    throw (lang::IllegalArgumentException,
-           uno::RuntimeException)
-{
-    if( ::std::find( m_aLayoutElements.begin(),
-                     m_aLayoutElements.end(),
-                     aIdentifier ) != m_aLayoutElements.end())
-        throw lang::IllegalArgumentException();
-
-    m_aLayoutElements.push_back( aIdentifier );
-}
-
-void SAL_CALL LayoutContainer::removeElementByIdentifier( const ::rtl::OUString& aIdentifier )
-    throw (container::NoSuchElementException,
-           uno::RuntimeException)
-{
-    tLayoutElements::iterator aIt(
-        ::std::find( m_aLayoutElements.begin(),
-                     m_aLayoutElements.end(),
-                     aIdentifier ));
-
-    if( aIt == m_aLayoutElements.end())
-        throw container::NoSuchElementException();
-
-    m_aLayoutElements.erase( aIt );
-    m_aConstraints.erase( aIdentifier );
-}
-
-void SAL_CALL LayoutContainer::setConstraintByIdentifier(
-    const ::rtl::OUString& aIdentifier,
-    const layout::Constraint& Constraint )
-    throw (container::NoSuchElementException,
-           uno::RuntimeException)
-{
-    if( ::std::find( m_aLayoutElements.begin(),
-                     m_aLayoutElements.end(),
-                     aIdentifier ) == m_aLayoutElements.end())
-        throw container::NoSuchElementException();
-
-    m_aConstraints[ aIdentifier ] = Constraint;
-}
-
-layout::Constraint SAL_CALL LayoutContainer::getConstraintByIdentifier( const ::rtl::OUString& aIdentifier )
-    throw (container::NoSuchElementException,
-           uno::RuntimeException)
-{
-    tConstraintsMap::const_iterator aIt( m_aConstraints.find( aIdentifier ));
-    if( aIt == m_aConstraints.end())
-        throw container::NoSuchElementException();
-
-    return (*aIt).second;
-}
-
-uno::Sequence< ::rtl::OUString > SAL_CALL LayoutContainer::getElementIdentifiers()
-    throw (uno::RuntimeException)
-{
-    return ContainerHelper::ContainerToSequence( m_aLayoutElements );
-}
-
-uno::Sequence< ::rtl::OUString > LayoutContainer::getSupportedServiceNames_Static()
-{
-    uno::Sequence< ::rtl::OUString > aServices( 1 );
-
-    aServices[ 0 ] = C2U( "com.sun.star.layout.LayoutContainer" );
-    return aServices;
-}
-
-// --------------------------------------------------------------------------------
-
-// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( LayoutContainer, lcl_aServiceName );
-
-} //  namespace chart
diff --git a/chart2/source/model/main/LayoutContainer.hxx b/chart2/source/model/main/LayoutContainer.hxx
deleted file mode 100644
index ea645dcff536..000000000000
--- a/chart2/source/model/main/LayoutContainer.hxx
+++ /dev/null
@@ -1,90 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef CHART_LAYOUTCONTAINER_HXX
-#define CHART_LAYOUTCONTAINER_HXX
-
-#include <cppuhelper/implbase2.hxx>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/layout/XLayoutContainer.hpp>
-
-#include "ServiceMacros.hxx"
-
-#include <vector>
-#include <map>
-
-namespace chart
-{
-
-class LayoutContainer : public
-    ::cppu::WeakImplHelper2<
-        ::com::sun::star::lang::XServiceInfo,
-        ::com::sun::star::layout::XLayoutContainer >
-{
-public:
-    LayoutContainer();
-    virtual ~LayoutContainer();
-
-    /// XServiceInfo declarations
-    APPHELPER_XSERVICEINFO_DECL()
-
-protected:
-    // ____ XLayoutContainer ____
-    virtual void SAL_CALL addConstrainedElementByIdentifier( const ::rtl::OUString& aIdentifier, const ::com::sun::star::layout::Constraint& Constraint )
-        throw (::com::sun::star::layout::IllegalConstraintException,
-               ::com::sun::star::lang::IllegalArgumentException,
-               ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL addElementByIdentifier( const ::rtl::OUString& aIdentifier )
-        throw (::com::sun::star::lang::IllegalArgumentException,
-               ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeElementByIdentifier( const ::rtl::OUString& aIdentifier )
-        throw (::com::sun::star::container::NoSuchElementException,
-               ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setConstraintByIdentifier( const ::rtl::OUString& aIdentifier, const ::com::sun::star::layout::Constraint& Constraint )
-        throw (::com::sun::star::container::NoSuchElementException,
-               ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::layout::Constraint SAL_CALL getConstraintByIdentifier( const ::rtl::OUString& aIdentifier )
-        throw (::com::sun::star::container::NoSuchElementException,
-               ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence<
-        ::rtl::OUString > SAL_CALL getElementIdentifiers()
-        throw (::com::sun::star::uno::RuntimeException);
-
-private:
-    typedef ::std::vector< ::rtl::OUString > tLayoutElements;
-
-    typedef ::std::map<
-        ::rtl::OUString,
-        ::com::sun::star::layout::Constraint > tConstraintsMap;
-
-    tLayoutElements           m_aLayoutElements;
-    tConstraintsMap           m_aConstraints;
-};
-
-} //  namespace chart
-
-// CHART_LAYOUTCONTAINER_HXX
-#endif
diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx
index a7c2ab86f5c1..7db3e498a098 100755..100644
--- a/chart2/source/model/main/Legend.cxx
+++ b/chart2/source/model/main/Legend.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -324,3 +325,5 @@ IMPLEMENT_FORWARD_XINTERFACE2( Legend, Legend_Base, ::property::OPropertySet )
 IMPLEMENT_FORWARD_XTYPEPROVIDER2( Legend, Legend_Base, ::property::OPropertySet )
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/Legend.hxx b/chart2/source/model/main/Legend.hxx
index 56c41db2e38a..accbb408ca29 100755..100644
--- a/chart2/source/model/main/Legend.hxx
+++ b/chart2/source/model/main/Legend.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -90,13 +91,6 @@ protected:
         getPropertySetInfo()
         throw (::com::sun::star::uno::RuntimeException);
 
-//  virtual sal_Bool SAL_CALL convertFastPropertyValue
-//         ( ::com::sun::star::uno::Any & rConvertedValue,
-//           ::com::sun::star::uno::Any & rOldValue,
-//           sal_Int32 nHandle,
-//           const ::com::sun::star::uno::Any& rValue )
-//      throw (::com::sun::star::lang::IllegalArgumentException);
-
     // ____ XCloneable ____
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone()
         throw (::com::sun::star::uno::RuntimeException);
@@ -133,3 +127,5 @@ private:
 
 // CHART_LEGEND_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/PageBackground.cxx b/chart2/source/model/main/PageBackground.cxx
index 5f237b21ae7a..8aa631f724e5 100755..100644
--- a/chart2/source/model/main/PageBackground.cxx
+++ b/chart2/source/model/main/PageBackground.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -247,3 +248,5 @@ using impl::PageBackground_Base;
 IMPLEMENT_FORWARD_XINTERFACE2( PageBackground, PageBackground_Base, ::property::OPropertySet )
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/PageBackground.hxx b/chart2/source/model/main/PageBackground.hxx
index 9875a76eae2b..4d9f34d5faf6 100644
--- a/chart2/source/model/main/PageBackground.hxx
+++ b/chart2/source/model/main/PageBackground.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -83,13 +84,6 @@ protected:
         getPropertySetInfo()
         throw (::com::sun::star::uno::RuntimeException);
 
-//  virtual sal_Bool SAL_CALL convertFastPropertyValue
-//         ( ::com::sun::star::uno::Any & rConvertedValue,
-//           ::com::sun::star::uno::Any & rOldValue,
-//           sal_Int32 nHandle,
-//           const ::com::sun::star::uno::Any& rValue )
-//      throw (::com::sun::star::lang::IllegalArgumentException);
-
     // ____ XCloneable ____
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone()
         throw (::com::sun::star::uno::RuntimeException);
@@ -130,3 +124,5 @@ private:
 
 // CHART_PAGEBACKGROUND_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/PolarCoordinateSystem.cxx b/chart2/source/model/main/PolarCoordinateSystem.cxx
index 9022a5e17901..218bc3b462a0 100644
--- a/chart2/source/model/main/PolarCoordinateSystem.cxx
+++ b/chart2/source/model/main/PolarCoordinateSystem.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -153,3 +154,5 @@ Sequence< OUString > PolarCoordinateSystem3d::getSupportedServiceNames_Static()
 APPHELPER_XSERVICEINFO_IMPL( PolarCoordinateSystem3d, lcl_aImplementationNamePolar3d )
 
 }  // namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/StockBar.cxx b/chart2/source/model/main/StockBar.cxx
index e812ba3c39dd..bbd3e9f2205c 100755..100644
--- a/chart2/source/model/main/StockBar.cxx
+++ b/chart2/source/model/main/StockBar.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -259,3 +260,5 @@ using impl::StockBar_Base;
 IMPLEMENT_FORWARD_XINTERFACE2( StockBar, StockBar_Base, ::property::OPropertySet )
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx
index 7483c02ffa93..abb845282797 100755..100644
--- a/chart2/source/model/main/Title.cxx
+++ b/chart2/source/model/main/Title.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -404,3 +405,5 @@ IMPLEMENT_FORWARD_XINTERFACE2( Title, Title_Base, ::property::OPropertySet )
 IMPLEMENT_FORWARD_XTYPEPROVIDER2( Title, Title_Base, ::property::OPropertySet )
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/Title.hxx b/chart2/source/model/main/Title.hxx
index 5889910018b7..e344bd9b4410 100644
--- a/chart2/source/model/main/Title.hxx
+++ b/chart2/source/model/main/Title.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -88,13 +89,6 @@ protected:
         getPropertySetInfo()
         throw (::com::sun::star::uno::RuntimeException);
 
-//  virtual sal_Bool SAL_CALL convertFastPropertyValue
-//         ( ::com::sun::star::uno::Any & rConvertedValue,
-//           ::com::sun::star::uno::Any & rOldValue,
-//           sal_Int32 nHandle,
-//           const ::com::sun::star::uno::Any& rValue )
-//      throw (::com::sun::star::lang::IllegalArgumentException);
-
     // ____ XTitle ____
     virtual ::com::sun::star::uno::Sequence<
         ::com::sun::star::uno::Reference<
@@ -145,3 +139,5 @@ private:
 
 // CHART_TITLE_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/UndoManager.cxx b/chart2/source/model/main/UndoManager.cxx
index 4efe57e17090..4efe57e17090 100755..100644
--- a/chart2/source/model/main/UndoManager.cxx
+++ b/chart2/source/model/main/UndoManager.cxx
diff --git a/chart2/source/model/main/UndoManager.hxx b/chart2/source/model/main/UndoManager.hxx
index 07091207ebd0..07091207ebd0 100755..100644
--- a/chart2/source/model/main/UndoManager.hxx
+++ b/chart2/source/model/main/UndoManager.hxx
diff --git a/chart2/source/model/main/Wall.cxx b/chart2/source/model/main/Wall.cxx
index 404a5e6ff97f..1f7a6f8c7215 100755..100644
--- a/chart2/source/model/main/Wall.cxx
+++ b/chart2/source/model/main/Wall.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -250,3 +251,5 @@ using impl::Wall_Base;
 IMPLEMENT_FORWARD_XINTERFACE2( Wall, Wall_Base, ::property::OPropertySet )
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/Wall.hxx b/chart2/source/model/main/Wall.hxx
index 8c796b4da432..fab1da850a0a 100644
--- a/chart2/source/model/main/Wall.hxx
+++ b/chart2/source/model/main/Wall.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -81,13 +82,6 @@ protected:
         getPropertySetInfo()
         throw (::com::sun::star::uno::RuntimeException);
 
-//  virtual sal_Bool SAL_CALL convertFastPropertyValue
-//         ( ::com::sun::star::uno::Any & rConvertedValue,
-//           ::com::sun::star::uno::Any & rOldValue,
-//           sal_Int32 nHandle,
-//           const ::com::sun::star::uno::Any& rValue )
-//      throw (::com::sun::star::lang::IllegalArgumentException);
-
     // ____ XCloneable ____
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone()
         throw (::com::sun::star::uno::RuntimeException);
@@ -125,3 +119,5 @@ private:
 
 // CHART_WALL_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/_serviceregistration_model.cxx b/chart2/source/model/main/_serviceregistration_model.cxx
index a8b214aaf124..49a0ee73e53c 100644
--- a/chart2/source/model/main/_serviceregistration_model.cxx
+++ b/chart2/source/model/main/_serviceregistration_model.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,9 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_chart2.hxx"
 #include <cppuhelper/implementationentry.hxx>
-#ifndef _CHARTMODEL_HXX
 #include "ChartModel.hxx"
-#endif
 
 #include "Diagram.hxx"
 #include "Legend.hxx"
@@ -208,3 +207,5 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
 }
 }
 //=========================================================================
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/makefile.mk b/chart2/source/model/main/makefile.mk
deleted file mode 100644
index 5ca78bbdea25..000000000000
--- a/chart2/source/model/main/makefile.mk
+++ /dev/null
@@ -1,68 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=				..$/..$/..
-PRJNAME=			chart2
-TARGET=				chmodelmain
-
-PRJINC=				$(PRJ)$/source
-
-ENABLE_EXCEPTIONS=	TRUE
-VISIBILITY_HIDDEN=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE: settings.mk
-
-# --- export library -------------------------------------------------
-
-#Specifies object files to bind into linked libraries.
-SLOFILES=	\
-    $(SLO)$/Axis.obj \
-    $(SLO)$/GridProperties.obj \
-    $(SLO)$/BaseCoordinateSystem.obj \
-    $(SLO)$/CartesianCoordinateSystem.obj \
-    $(SLO)$/ChartModel.obj		\
-    $(SLO)$/ChartModel_Persistence.obj		\
-    $(SLO)$/DataPoint.obj \
-    $(SLO)$/DataPointProperties.obj \
-    $(SLO)$/DataSeries.obj \
-    $(SLO)$/Diagram.obj \
-    $(SLO)$/DataSeriesProperties.obj \
-    $(SLO)$/FormattedString.obj \
-    $(SLO)$/Legend.obj \
-    $(SLO)$/PageBackground.obj \
-    $(SLO)$/PolarCoordinateSystem.obj \
-    $(SLO)$/StockBar.obj \
-    $(SLO)$/Title.obj \
-    $(SLO)$/Wall.obj \
-    $(SLO)$/UndoManager.obj \
-    $(SLO)$/_serviceregistration_model.obj
-
-# --- Targets -----------------------------------------------------------------
-
-.INCLUDE: target.mk
diff --git a/chart2/source/model/makefile.mk b/chart2/source/model/makefile.mk
deleted file mode 100644
index 25d4b1b2949a..000000000000
--- a/chart2/source/model/makefile.mk
+++ /dev/null
@@ -1,109 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=				..$/..
-PRJNAME=			chart2
-TARGET=				chartmodel
-
-USE_DEFFILE=		TRUE
-ENABLE_EXCEPTIONS=	TRUE
-VISIBILITY_HIDDEN=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- export library -------------------------------------------------
-
-#You can use several library macros of this form to build libraries that
-#do not consist of all object files in a directory or to merge different libraries.
-LIB1TARGET=		$(SLB)$/_$(TARGET).lib
-
-LIB1FILES=		\
-                $(SLB)$/chmodelmain.lib \
-                $(SLB)$/chmodeltemplate.lib \
-                $(SLB)$/chmodelfilter.lib
-
-#--------
-
-#Indicates the filename of the shared library.
-SHL1TARGET=		$(TARGET)$(DLLPOSTFIX)
-
-#indicates dependencies:
-.IF "$(COM)" == "MSC"
-SHL1DEPN = \
-        $(LB)$/icharttools.lib
-.ELSE
-SHL1DEPN =
-.ENDIF
-
-#Specifies an import library to create. For Win32 only.
-SHL1IMPLIB=		i$(TARGET)
-
-#Specifies libraries from the same module to put into the shared library.
-#was created above
-SHL1LIBS= 		$(LIB1TARGET)
-
-#Links import libraries.
-
-SHL1STDLIBS=	$(CHARTTOOLS) 		\
-                $(CPPULIB)			\
-                $(CPPUHELPERLIB)	\
-                $(COMPHELPERLIB)	\
-                $(UNOTOOLSLIB)		\
-                $(VCLLIB)			\
-                $(SVLLIB)			\
-                $(SVTOOLLIB)		\
-                $(SALLIB)			\
-                $(UCBHELPERLIB)     \
-                $(FWELIB)           \
-
-#--------exports
-
-#specifies the exported symbols for Windows only:
-SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
-
-SHL1VERSIONMAP = $(SOLARENV)/src/component.map
-
-#--------definition file
-
-#name of the definition file:
-DEF1NAME=		$(SHL1TARGET)
-
-# --- Resources ---------------------------------------------------------------
-
-# --- Targets -----------------------------------------------------------------
-
-.INCLUDE: target.mk
-
-ALLTAR : $(MISC)/chartmodel.component
-
-$(MISC)/chartmodel.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        chartmodel.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt chartmodel.component
diff --git a/chart2/source/model/template/AreaChartType.cxx b/chart2/source/model/template/AreaChartType.cxx
index 003220c87dfb..5c9c9388ce25 100644
--- a/chart2/source/model/template/AreaChartType.cxx
+++ b/chart2/source/model/template/AreaChartType.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -75,3 +76,5 @@ APPHELPER_XSERVICEINFO_IMPL( AreaChartType,
                              C2U( "com.sun.star.comp.chart.AreaChartType" ));
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/AreaChartType.hxx b/chart2/source/model/template/AreaChartType.hxx
index 9955d5eb537e..420a65855e5c 100644
--- a/chart2/source/model/template/AreaChartType.hxx
+++ b/chart2/source/model/template/AreaChartType.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -62,3 +63,5 @@ protected:
 
 // CHART_AREACHARTTYPE_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/AreaChartTypeTemplate.cxx b/chart2/source/model/template/AreaChartTypeTemplate.cxx
index ea8b7a89c778..00e2fcffff5c 100755..100644
--- a/chart2/source/model/template/AreaChartTypeTemplate.cxx
+++ b/chart2/source/model/template/AreaChartTypeTemplate.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -274,3 +275,5 @@ IMPLEMENT_FORWARD_XINTERFACE2( AreaChartTypeTemplate, ChartTypeTemplate, OProper
 IMPLEMENT_FORWARD_XTYPEPROVIDER2( AreaChartTypeTemplate, ChartTypeTemplate, OPropertySet )
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/AreaChartTypeTemplate.hxx b/chart2/source/model/template/AreaChartTypeTemplate.hxx
index a84a4b645c2a..ce9d250679da 100644
--- a/chart2/source/model/template/AreaChartTypeTemplate.hxx
+++ b/chart2/source/model/template/AreaChartTypeTemplate.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -101,3 +102,5 @@ private:
 
 // CHART_AREACHARTTYPETEMPLATE_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/BarChartType.cxx b/chart2/source/model/template/BarChartType.cxx
index e877a34007de..f955d7aac413 100644
--- a/chart2/source/model/template/BarChartType.cxx
+++ b/chart2/source/model/template/BarChartType.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -76,3 +77,5 @@ APPHELPER_XSERVICEINFO_IMPL( BarChartType,
                              C2U( "com.sun.star.comp.chart.BarChartType" ));
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/BarChartType.hxx b/chart2/source/model/template/BarChartType.hxx
index 884a52e3a228..5a88b1a3c1e0 100644
--- a/chart2/source/model/template/BarChartType.hxx
+++ b/chart2/source/model/template/BarChartType.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -62,3 +63,5 @@ protected:
 
 // CHART_BARCHARTTYPE_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx b/chart2/source/model/template/BarChartTypeTemplate.cxx
index 77cd240c3fd0..7ba04435a5ca 100755..100644
--- a/chart2/source/model/template/BarChartTypeTemplate.cxx
+++ b/chart2/source/model/template/BarChartTypeTemplate.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -346,3 +347,5 @@ IMPLEMENT_FORWARD_XINTERFACE2( BarChartTypeTemplate, ChartTypeTemplate, OPropert
 IMPLEMENT_FORWARD_XTYPEPROVIDER2( BarChartTypeTemplate, ChartTypeTemplate, OPropertySet )
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/BarChartTypeTemplate.hxx b/chart2/source/model/template/BarChartTypeTemplate.hxx
index fabf7a59826c..5123cd78b664 100644
--- a/chart2/source/model/template/BarChartTypeTemplate.hxx
+++ b/chart2/source/model/template/BarChartTypeTemplate.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -119,3 +120,5 @@ private:
 
 // CHART_BARCHARTTYPETEMPLATE_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/BubbleChartType.cxx b/chart2/source/model/template/BubbleChartType.cxx
index f82936241232..9be27dd11f0e 100755..100644
--- a/chart2/source/model/template/BubbleChartType.cxx
+++ b/chart2/source/model/template/BubbleChartType.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -61,13 +62,8 @@ struct StaticBubbleChartTypeDefaults_Initializer
     ::chart::tPropertyValueMap* operator()()
     {
         static ::chart::tPropertyValueMap aStaticDefaults;
-        lcl_AddDefaultsToMap( aStaticDefaults );
         return &aStaticDefaults;
     }
-private:
-    void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & /*rOutMap*/ )
-    {
-    }
 };
 
 struct StaticBubbleChartTypeDefaults : public rtl::StaticAggregate< ::chart::tPropertyValueMap, StaticBubbleChartTypeDefaults_Initializer >
@@ -154,7 +150,7 @@ Reference< chart2::XCoordinateSystem > SAL_CALL
         Reference< chart2::XAxis > xAxis( xResult->getAxisByDimension( i, MAIN_AXIS_INDEX ) );
         if( !xAxis.is() )
         {
-            OSL_ENSURE(false,"a created coordinate system should have an axis for each dimension");
+            OSL_FAIL("a created coordinate system should have an axis for each dimension");
             continue;
         }
 
@@ -182,17 +178,12 @@ Reference< chart2::XCoordinateSystem > SAL_CALL
 uno::Sequence< ::rtl::OUString > SAL_CALL BubbleChartType::getSupportedMandatoryRoles()
     throw (uno::RuntimeException)
 {
-    static uno::Sequence< ::rtl::OUString > aMandRolesSeq;
-
-    if( aMandRolesSeq.getLength() == 0 )
-    {
-        aMandRolesSeq.realloc( 4 );
-        aMandRolesSeq[0] = C2U( "label" );
-        aMandRolesSeq[1] = C2U( "values-x" );
-        aMandRolesSeq[2] = C2U( "values-y" );
-        aMandRolesSeq[3] = C2U( "values-size" );
-    }
-
+    uno::Sequence< ::rtl::OUString > aMandRolesSeq(4);
+    aMandRolesSeq.realloc( 4 );
+    aMandRolesSeq[0] = C2U( "label" );
+    aMandRolesSeq[1] = C2U( "values-x" );
+    aMandRolesSeq[2] = C2U( "values-y" );
+    aMandRolesSeq[3] = C2U( "values-size" );
     return aMandRolesSeq;
 }
 
@@ -240,3 +231,5 @@ APPHELPER_XSERVICEINFO_IMPL( BubbleChartType,
                              C2U( "com.sun.star.comp.chart.BubbleChartType" ));
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/BubbleChartType.hxx b/chart2/source/model/template/BubbleChartType.hxx
index eea8a0e7a6ee..21d6b85cc45d 100644
--- a/chart2/source/model/template/BubbleChartType.hxx
+++ b/chart2/source/model/template/BubbleChartType.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -84,3 +85,5 @@ protected:
 
 // CHART_BUBBLECHARTTYPE_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.cxx b/chart2/source/model/template/BubbleChartTypeTemplate.cxx
index bb7e4ab68d98..c71a910bc991 100755..100644
--- a/chart2/source/model/template/BubbleChartTypeTemplate.cxx
+++ b/chart2/source/model/template/BubbleChartTypeTemplate.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -68,13 +69,8 @@ struct StaticBubbleChartTypeTemplateDefaults_Initializer
     ::chart::tPropertyValueMap* operator()()
     {
         static ::chart::tPropertyValueMap aStaticDefaults;
-        lcl_AddDefaultsToMap( aStaticDefaults );
         return &aStaticDefaults;
     }
-private:
-    void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & /*rOutMap*/ )
-    {
-    }
 };
 
 struct StaticBubbleChartTypeTemplateDefaults : public rtl::StaticAggregate< ::chart::tPropertyValueMap, StaticBubbleChartTypeTemplateDefaults_Initializer >
@@ -305,3 +301,5 @@ IMPLEMENT_FORWARD_XINTERFACE2( BubbleChartTypeTemplate, ChartTypeTemplate, OProp
 IMPLEMENT_FORWARD_XTYPEPROVIDER2( BubbleChartTypeTemplate, ChartTypeTemplate, OPropertySet )
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.hxx b/chart2/source/model/template/BubbleChartTypeTemplate.hxx
index 24d35c6acbb7..ebe59de686bd 100644
--- a/chart2/source/model/template/BubbleChartTypeTemplate.hxx
+++ b/chart2/source/model/template/BubbleChartTypeTemplate.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -99,3 +100,5 @@ protected:
 
 // CHART_BUBBLECHARTTYPETEMPLATE_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/BubbleDataInterpreter.cxx b/chart2/source/model/template/BubbleDataInterpreter.cxx
index 27fee7d35aff..678c99ea6806 100755..100644
--- a/chart2/source/model/template/BubbleDataInterpreter.cxx
+++ b/chart2/source/model/template/BubbleDataInterpreter.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -307,3 +308,5 @@ sal_Bool SAL_CALL BubbleDataInterpreter::isDataCompatible(
 }
 
 } // namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/BubbleDataInterpreter.hxx b/chart2/source/model/template/BubbleDataInterpreter.hxx
index 3eb6ebaedbf0..a34f9398cfce 100644
--- a/chart2/source/model/template/BubbleDataInterpreter.hxx
+++ b/chart2/source/model/template/BubbleDataInterpreter.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -59,3 +60,5 @@ protected:
 
 // CHART_BUBBLEDATAINTERPRETER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx
index 499ee238650e..84e37e7e72ba 100755..100644
--- a/chart2/source/model/template/CandleStickChartType.cxx
+++ b/chart2/source/model/template/CandleStickChartType.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -352,3 +353,5 @@ APPHELPER_XSERVICEINFO_IMPL( CandleStickChartType,
                              C2U( "com.sun.star.comp.chart.CandleStickChartType" ));
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/CandleStickChartType.hxx b/chart2/source/model/template/CandleStickChartType.hxx
index d32c4c455d74..dd8843e4bbba 100644
--- a/chart2/source/model/template/CandleStickChartType.hxx
+++ b/chart2/source/model/template/CandleStickChartType.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -88,3 +89,5 @@ protected:
 
 // CHART_CANDLESTICKCHARTTYPE_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/ChartType.cxx b/chart2/source/model/template/ChartType.cxx
index 146c06934a46..53114fc9439a 100755..100644
--- a/chart2/source/model/template/ChartType.cxx
+++ b/chart2/source/model/template/ChartType.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -97,7 +98,7 @@ Reference< chart2::XCoordinateSystem > SAL_CALL
         Reference< chart2::XAxis > xAxis( xResult->getAxisByDimension( i, MAIN_AXIS_INDEX ) );
         if( !xAxis.is() )
         {
-            OSL_ENSURE(false,"a created coordinate system should have an axis for each dimension");
+            OSL_FAIL("a created coordinate system should have an axis for each dimension");
             continue;
         }
 
@@ -121,30 +122,16 @@ Reference< chart2::XCoordinateSystem > SAL_CALL
 Sequence< OUString > SAL_CALL ChartType::getSupportedMandatoryRoles()
     throw (uno::RuntimeException)
 {
-    static Sequence< OUString > aDefaultSeq;
-
-    if( aDefaultSeq.getLength() == 0 )
-    {
-        aDefaultSeq.realloc( 2 );
-        aDefaultSeq[0] = C2U( "label" );
-        aDefaultSeq[1] = C2U( "values-y" );
-    }
-
+    Sequence< OUString > aDefaultSeq(2);
+    aDefaultSeq[0] = C2U( "label" );
+    aDefaultSeq[1] = C2U( "values-y" );
     return aDefaultSeq;
 }
 
 Sequence< OUString > SAL_CALL ChartType::getSupportedOptionalRoles()
     throw (uno::RuntimeException)
 {
-    static Sequence< OUString > aDefaultOptRolesSeq;
-
-//     if( aDefaultOptRolesSeq.getLength() == 0 )
-//     {
-//         aDefaultOptRolesSeq.realloc( 1 );
-//         aDefaultOptRolesSeq[0] = C2U( "error-bars-y" );
-//     }
-
-    return aDefaultOptRolesSeq;
+    return Sequence< OUString >();
 }
 
 OUString SAL_CALL ChartType::getRoleOfSequenceForSeriesLabel()
@@ -340,3 +327,5 @@ IMPLEMENT_FORWARD_XINTERFACE2( ChartType, ChartType_Base, ::property::OPropertyS
 IMPLEMENT_FORWARD_XTYPEPROVIDER2( ChartType, ChartType_Base, ::property::OPropertySet )
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/ChartType.hxx b/chart2/source/model/template/ChartType.hxx
index 07e72ea2890b..a2fd1c75f1b9 100644
--- a/chart2/source/model/template/ChartType.hxx
+++ b/chart2/source/model/template/ChartType.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -138,23 +139,11 @@ protected:
         getPropertySetInfo()
         throw (::com::sun::star::uno::RuntimeException);
 
-//  virtual sal_Bool SAL_CALL convertFastPropertyValue
-//         ( ::com::sun::star::uno::Any & rConvertedValue,
-//           ::com::sun::star::uno::Any & rOldValue,
-//           sal_Int32 nHandle,
-//           const ::com::sun::star::uno::Any& rValue )
-//      throw (::com::sun::star::lang::IllegalArgumentException);
-
     /// merge XInterface implementations
      DECLARE_XINTERFACE()
     /// merge XTypeProvider implementations
      DECLARE_XTYPEPROVIDER()
 
-    // not implemented
-// ____ XCloneable ____
-//    virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone()
-//         throw (::com::sun::star::uno::RuntimeException);
-
 protected:
     ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > m_xModifyEventForwarder;
 
@@ -181,3 +170,5 @@ private:
 
 // CHART_CHARTTYPE_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx
index d34617ffce1f..ba1fd1cbb13c 100644
--- a/chart2/source/model/template/ChartTypeManager.cxx
+++ b/chart2/source/model/template/ChartTypeManager.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -53,6 +54,7 @@
 #include <algorithm>
 #include <iterator>
 #include <functional>
+#include <o3tl/compat_functional.hxx>
 
 using namespace ::com::sun::star;
 
@@ -561,7 +563,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartTypeManager::createInstanceWithA
     throw (uno::Exception,
            uno::RuntimeException)
 {
-    OSL_ENSURE( false, "createInstanceWithArguments: No arguments supported" );
+    OSL_FAIL( "createInstanceWithArguments: No arguments supported" );
     return createInstance( ServiceSpecifier );
 }
 
@@ -574,7 +576,7 @@ uno::Sequence< OUString > SAL_CALL ChartTypeManager::getAvailableServiceNames()
 
     // get own default templates
     ::std::transform( rMap.begin(), rMap.end(), ::std::back_inserter( aServices ),
-                      ::std::select1st< tTemplateMapType::value_type >());
+                      ::o3tl::select1st< tTemplateMapType::value_type >());
 
     // add components that were registered in the context's factory
     uno::Reference< container::XContentEnumerationAccess > xEnumAcc(
@@ -617,3 +619,5 @@ Sequence< OUString > ChartTypeManager::getSupportedServiceNames_Static()
 APPHELPER_XSERVICEINFO_IMPL( ChartTypeManager,
                              C2U( "com.sun.star.comp.chart.ChartTypeManager" ));
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx
index d089a88bb30b..9fee9b342534 100755..100644
--- a/chart2/source/model/template/ChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ChartTypeTemplate.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -943,3 +944,5 @@ Reference< uno::XComponentContext > ChartTypeTemplate::GetComponentContext() con
 APPHELPER_XSERVICEINFO_IMPL( ChartTypeTemplate,
                              C2U( "com.sun.star.comp.chart.ChartTypeTemplate" ));
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/ChartTypeTemplate.hxx b/chart2/source/model/template/ChartTypeTemplate.hxx
index 3f43e0ca6038..5a5e5d002da6 100644
--- a/chart2/source/model/template/ChartTypeTemplate.hxx
+++ b/chart2/source/model/template/ChartTypeTemplate.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -129,7 +130,6 @@ protected:
         const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram )
         throw (::com::sun::star::uno::RuntimeException);
 
-    //
     virtual void SAL_CALL applyStyles(
         const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram )
         throw (::com::sun::star::uno::RuntimeException);
@@ -297,3 +297,5 @@ private:
 
 // CHART_CHARTTYPETEMPLATE_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/ColumnChartType.cxx b/chart2/source/model/template/ColumnChartType.cxx
index 90dcf7c80ee2..41168ea97ce9 100755..100644
--- a/chart2/source/model/template/ColumnChartType.cxx
+++ b/chart2/source/model/template/ColumnChartType.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -187,7 +188,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL ColumnChartType::getPropertyS
     return *StaticColumnChartTypeInfo::get();
 }
 
-//
 
 uno::Sequence< ::rtl::OUString > ColumnChartType::getSupportedServiceNames_Static()
 {
@@ -202,3 +202,5 @@ APPHELPER_XSERVICEINFO_IMPL( ColumnChartType,
                              C2U( "com.sun.star.comp.chart.ColumnChartType" ));
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/ColumnChartType.hxx b/chart2/source/model/template/ColumnChartType.hxx
index 3386b6a1cd40..5306982c0e8c 100644
--- a/chart2/source/model/template/ColumnChartType.hxx
+++ b/chart2/source/model/template/ColumnChartType.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -72,3 +73,5 @@ protected:
 
 // CHART_COLUMNCHARTTYPE_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
index 35a29f78e6ee..cf01b9efea4a 100755..100644
--- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -422,7 +423,7 @@ Reference< XDataInterpreter > SAL_CALL ColumnLineChartTypeTemplate::getDataInter
     else
     {
         //todo...
-        OSL_ENSURE( false, "number of lines may not be valid anymore in the datainterpreter" );
+        OSL_FAIL( "number of lines may not be valid anymore in the datainterpreter" );
 
     }
 
@@ -446,3 +447,5 @@ IMPLEMENT_FORWARD_XINTERFACE2( ColumnLineChartTypeTemplate, ChartTypeTemplate, O
 IMPLEMENT_FORWARD_XTYPEPROVIDER2( ColumnLineChartTypeTemplate, ChartTypeTemplate, OPropertySet )
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx
index ce86188e2bb6..ad5fc430d1b7 100644
--- a/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx
+++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -117,3 +118,5 @@ private:
 
 // CHART_COLUMNLINECHARTTYPETEMPLATE_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/ColumnLineDataInterpreter.cxx b/chart2/source/model/template/ColumnLineDataInterpreter.cxx
index 18e22f78e86e..d98ce6500c42 100644
--- a/chart2/source/model/template/ColumnLineDataInterpreter.cxx
+++ b/chart2/source/model/template/ColumnLineDataInterpreter.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -36,8 +37,6 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/chart2/data/XDataSink.hpp>
 
-// #include <deque>
-
 #include <vector>
 #include <algorithm>
 #include <iterator>
@@ -99,3 +98,5 @@ InterpretedData SAL_CALL ColumnLineDataInterpreter::interpretDataSource(
 }
 
 } // namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/ColumnLineDataInterpreter.hxx b/chart2/source/model/template/ColumnLineDataInterpreter.hxx
index b9b8a62a4097..69f79cdaece9 100644
--- a/chart2/source/model/template/ColumnLineDataInterpreter.hxx
+++ b/chart2/source/model/template/ColumnLineDataInterpreter.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -57,3 +58,5 @@ private:
 
 // CHART_COLUMNLINEDATAINTERPRETER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/DataInterpreter.cxx b/chart2/source/model/template/DataInterpreter.cxx
index 686b02536d31..ec7bc390c700 100755..100644
--- a/chart2/source/model/template/DataInterpreter.cxx
+++ b/chart2/source/model/template/DataInterpreter.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -84,7 +85,7 @@ InterpretedData SAL_CALL DataInterpreter::interpretDataSource(
     if( ! xSource.is())
         return InterpretedData();
 
-#if OSL_DEBUG_LEVEL > 2
+#if OSL_DEBUG_LEVEL > 1
     lcl_ShowDataSource( xSource );
 #endif
 
@@ -235,7 +236,7 @@ sal_Bool SAL_CALL DataInterpreter::isDataCompatible(
 namespace
 {
 
-struct lcl_LabeledSequenceEquals : public unary_function< Reference< data::XLabeledDataSequence >, bool >
+struct lcl_LabeledSequenceEquals : public std::unary_function< Reference< data::XLabeledDataSequence >, bool >
 {
     lcl_LabeledSequenceEquals( const Reference< data::XLabeledDataSequence > & xLSeqToCmp ) :
             m_bHasLabels ( false ),
@@ -463,3 +464,5 @@ void lcl_ShowDataSource( const Reference< data::XDataSource > & xSource )
 
 }
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/DataInterpreter.hxx b/chart2/source/model/template/DataInterpreter.hxx
index d0f2ee922059..cd5cf113b709 100755..100644
--- a/chart2/source/model/template/DataInterpreter.hxx
+++ b/chart2/source/model/template/DataInterpreter.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -102,3 +103,5 @@ protected:
 
 // CHART_DATAINTERPRETER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/FilledNetChartType.cxx b/chart2/source/model/template/FilledNetChartType.cxx
index d90dc8b9f7c7..ec9e6d6d945a 100644
--- a/chart2/source/model/template/FilledNetChartType.cxx
+++ b/chart2/source/model/template/FilledNetChartType.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -92,3 +93,5 @@ APPHELPER_XSERVICEINFO_IMPL( FilledNetChartType,
                              C2U( "com.sun.star.comp.chart.FilledNetChartType" ));
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/FilledNetChartType.hxx b/chart2/source/model/template/FilledNetChartType.hxx
index 14beee021b34..8faf481dfd5d 100644
--- a/chart2/source/model/template/FilledNetChartType.hxx
+++ b/chart2/source/model/template/FilledNetChartType.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -61,3 +62,5 @@ protected:
 
 // CHART_FILLEDNETCHARTTYPE_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/LineChartType.cxx b/chart2/source/model/template/LineChartType.cxx
index e249f7508908..3211c8a37f26 100755..100644
--- a/chart2/source/model/template/LineChartType.cxx
+++ b/chart2/source/model/template/LineChartType.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -213,3 +214,5 @@ APPHELPER_XSERVICEINFO_IMPL( LineChartType,
                              C2U( "com.sun.star.comp.chart.LineChartType" ));
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/LineChartType.hxx b/chart2/source/model/template/LineChartType.hxx
index 1821333a4cdc..e553538ce324 100644
--- a/chart2/source/model/template/LineChartType.hxx
+++ b/chart2/source/model/template/LineChartType.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -73,3 +74,5 @@ protected:
 
 // CHART_LINECHARTTYPE_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/LineChartTypeTemplate.cxx b/chart2/source/model/template/LineChartTypeTemplate.cxx
index cc9bbc804288..a6a9bb5a5e40 100755..100644
--- a/chart2/source/model/template/LineChartTypeTemplate.cxx
+++ b/chart2/source/model/template/LineChartTypeTemplate.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -405,3 +406,5 @@ IMPLEMENT_FORWARD_XINTERFACE2( LineChartTypeTemplate, ChartTypeTemplate, OProper
 IMPLEMENT_FORWARD_XTYPEPROVIDER2( LineChartTypeTemplate, ChartTypeTemplate, OPropertySet )
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/LineChartTypeTemplate.hxx b/chart2/source/model/template/LineChartTypeTemplate.hxx
index faee9715720a..496bac77b3e5 100644
--- a/chart2/source/model/template/LineChartTypeTemplate.hxx
+++ b/chart2/source/model/template/LineChartTypeTemplate.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -107,3 +108,5 @@ private:
 
 // CHART_LINECHARTTYPETEMPLATE_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/NetChartType.cxx b/chart2/source/model/template/NetChartType.cxx
index bba666bb006c..858d5dc388f1 100755..100644
--- a/chart2/source/model/template/NetChartType.cxx
+++ b/chart2/source/model/template/NetChartType.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -198,3 +199,5 @@ APPHELPER_XSERVICEINFO_IMPL( NetChartType,
                              C2U( "com.sun.star.comp.chart.NetChartType" ));
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/NetChartType.hxx b/chart2/source/model/template/NetChartType.hxx
index ba5dc48b6881..7a28ebdc9c99 100644
--- a/chart2/source/model/template/NetChartType.hxx
+++ b/chart2/source/model/template/NetChartType.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -91,3 +92,5 @@ protected:
 
 // CHART_NETCHARTTYPE_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/NetChartTypeTemplate.cxx b/chart2/source/model/template/NetChartTypeTemplate.cxx
index b67817e73997..25efd6877a7c 100644
--- a/chart2/source/model/template/NetChartTypeTemplate.cxx
+++ b/chart2/source/model/template/NetChartTypeTemplate.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -227,3 +228,5 @@ Sequence< OUString > NetChartTypeTemplate::getSupportedServiceNames_Static()
 APPHELPER_XSERVICEINFO_IMPL( NetChartTypeTemplate, lcl_aServiceName );
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/NetChartTypeTemplate.hxx b/chart2/source/model/template/NetChartTypeTemplate.hxx
index f66355a3576e..c3e390d59b66 100644
--- a/chart2/source/model/template/NetChartTypeTemplate.hxx
+++ b/chart2/source/model/template/NetChartTypeTemplate.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -85,3 +86,5 @@ private:
 
 // CHART_NETCHARTTYPETEMPLATE_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/PieChartType.cxx b/chart2/source/model/template/PieChartType.cxx
index 2c9bd4792cbf..fb68229d1fe4 100755..100644
--- a/chart2/source/model/template/PieChartType.cxx
+++ b/chart2/source/model/template/PieChartType.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -176,7 +177,7 @@ Reference< chart2::XCoordinateSystem > SAL_CALL
         Reference< chart2::XAxis > xAxis( xResult->getAxisByDimension( i, MAIN_AXIS_INDEX ) );
         if( !xAxis.is() )
         {
-            OSL_ENSURE(false,"a created coordinate system should have an axis for each dimension");
+            OSL_FAIL("a created coordinate system should have an axis for each dimension");
             continue;
         }
 
@@ -238,3 +239,5 @@ APPHELPER_XSERVICEINFO_IMPL( PieChartType,
                              C2U( "com.sun.star.comp.chart.PieChartType" ));
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/PieChartType.hxx b/chart2/source/model/template/PieChartType.hxx
index fccd4e9ee25c..676d51ebb34e 100644
--- a/chart2/source/model/template/PieChartType.hxx
+++ b/chart2/source/model/template/PieChartType.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -79,3 +80,5 @@ protected:
 
 // CHART_PIECHARTTYPE_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx
index 439e4946378d..0273d3b38246 100755..100644
--- a/chart2/source/model/template/PieChartTypeTemplate.cxx
+++ b/chart2/source/model/template/PieChartTypeTemplate.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -231,11 +232,6 @@ sal_Int32 PieChartTypeTemplate::getAxisCountByDimension( sal_Int32 /*nDimension*
     return 0;
 }
 
-// void PieChartTypeTemplate::createAxes(
-//     const Sequence< Reference< chart2::XCoordinateSystem > > & rCoordSys )
-// {
-// }
-
 void PieChartTypeTemplate::adaptAxes(
     const uno::Sequence< uno::Reference< chart2::XCoordinateSystem > > & /*rCoordSys*/ )
 {
@@ -267,8 +263,6 @@ void PieChartTypeTemplate::adaptScales(
                 xAxis->setScaleData( aScaleData );
             }
 
-            //------
-
             xAxis = AxisHelper::getAxis( 0 /*nDimensionIndex*/,0 /*nAxisIndex*/
                     , aCooSysSeq[nCooSysIdx] );
             if( xAxis.is() )
@@ -653,3 +647,5 @@ IMPLEMENT_FORWARD_XINTERFACE2( PieChartTypeTemplate, ChartTypeTemplate, OPropert
 IMPLEMENT_FORWARD_XTYPEPROVIDER2( PieChartTypeTemplate, ChartTypeTemplate, OPropertySet )
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/PieChartTypeTemplate.hxx b/chart2/source/model/template/PieChartTypeTemplate.hxx
index 1634e643611f..6ae289bbaed7 100644
--- a/chart2/source/model/template/PieChartTypeTemplate.hxx
+++ b/chart2/source/model/template/PieChartTypeTemplate.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -100,10 +101,6 @@ protected:
             ::com::sun::star::chart2::XDiagram > & xDiagram );
 
     virtual sal_Int32 getAxisCountByDimension( sal_Int32 nDimension );
-//     virtual void createAxes(
-//         const ::com::sun::star::uno::Sequence<
-//             ::com::sun::star::uno::Reference<
-//                 ::com::sun::star::chart2::XCoordinateSystem > > & rCoordSys );
 
     virtual void adaptAxes(
         const ::com::sun::star::uno::Sequence<
@@ -138,3 +135,5 @@ protected:
 
 // CHART_PIECHARTTYPETEMPLATE_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/ScatterChartType.cxx b/chart2/source/model/template/ScatterChartType.cxx
index 7952e69497b5..d8b50e94ba5f 100755..100644
--- a/chart2/source/model/template/ScatterChartType.cxx
+++ b/chart2/source/model/template/ScatterChartType.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -185,7 +186,6 @@ uno::Reference< util::XCloneable > SAL_CALL ScatterChartType::createClone()
 }
 
 // ____ XChartType ____
-// ____ XChartType ____
 Reference< chart2::XCoordinateSystem > SAL_CALL
     ScatterChartType::createCoordinateSystem( ::sal_Int32 DimensionCount )
     throw (lang::IllegalArgumentException,
@@ -200,7 +200,7 @@ Reference< chart2::XCoordinateSystem > SAL_CALL
         Reference< chart2::XAxis > xAxis( xResult->getAxisByDimension( i, MAIN_AXIS_INDEX ) );
         if( !xAxis.is() )
         {
-            OSL_ENSURE(false,"a created coordinate system should have an axis for each dimension");
+            OSL_FAIL("a created coordinate system should have an axis for each dimension");
             continue;
         }
 
@@ -228,32 +228,17 @@ Reference< chart2::XCoordinateSystem > SAL_CALL
 uno::Sequence< ::rtl::OUString > SAL_CALL ScatterChartType::getSupportedMandatoryRoles()
     throw (uno::RuntimeException)
 {
-    static uno::Sequence< ::rtl::OUString > aMandRolesSeq;
-
-    if( aMandRolesSeq.getLength() == 0 )
-    {
-        aMandRolesSeq.realloc( 3 );
-        aMandRolesSeq[0] = C2U( "label" );
-        aMandRolesSeq[1] = C2U( "values-x" );
-        aMandRolesSeq[2] = C2U( "values-y" );
-    }
-
+    uno::Sequence< ::rtl::OUString > aMandRolesSeq(3);
+    aMandRolesSeq[0] = C2U( "label" );
+    aMandRolesSeq[1] = C2U( "values-x" );
+    aMandRolesSeq[2] = C2U( "values-y" );
     return aMandRolesSeq;
 }
 
 uno::Sequence< ::rtl::OUString > SAL_CALL ScatterChartType::getSupportedOptionalRoles()
     throw (uno::RuntimeException)
 {
-    static uno::Sequence< ::rtl::OUString > aOptRolesSeq;
-
-//     if( aOptRolesSeq.getLength() == 0 )
-//     {
-//         aOptRolesSeq.realloc( 2 );
-//         aOptRolesSeq[0] = C2U( "error-bars-x" );
-//         aOptRolesSeq[1] = C2U( "error-bars-y" );
-//     }
-
-    return aOptRolesSeq;
+    return uno::Sequence< ::rtl::OUString >();
 }
 
 
@@ -295,3 +280,5 @@ APPHELPER_XSERVICEINFO_IMPL( ScatterChartType,
                              C2U( "com.sun.star.comp.chart.ScatterChartType" ));
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/ScatterChartType.hxx b/chart2/source/model/template/ScatterChartType.hxx
index aed0cce2a97f..725d92e91351 100644
--- a/chart2/source/model/template/ScatterChartType.hxx
+++ b/chart2/source/model/template/ScatterChartType.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -89,3 +90,5 @@ protected:
 
 // CHART_SCATTERCHARTTYPE_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.cxx b/chart2/source/model/template/ScatterChartTypeTemplate.cxx
index eaec10fe7c21..3c9d61c4babf 100755..100644
--- a/chart2/source/model/template/ScatterChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ScatterChartTypeTemplate.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -425,3 +426,5 @@ IMPLEMENT_FORWARD_XINTERFACE2( ScatterChartTypeTemplate, ChartTypeTemplate, OPro
 IMPLEMENT_FORWARD_XTYPEPROVIDER2( ScatterChartTypeTemplate, ChartTypeTemplate, OPropertySet )
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.hxx b/chart2/source/model/template/ScatterChartTypeTemplate.hxx
index 048cca73a92c..24ee0c15d1ad 100644
--- a/chart2/source/model/template/ScatterChartTypeTemplate.hxx
+++ b/chart2/source/model/template/ScatterChartTypeTemplate.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -108,3 +109,5 @@ private:
 
 // CHART_SCATTERCHARTTYPETEMPLATE_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/StockChartTypeTemplate.cxx b/chart2/source/model/template/StockChartTypeTemplate.cxx
index 3f82f5b7bf68..9c93feda749f 100755..100644
--- a/chart2/source/model/template/StockChartTypeTemplate.cxx
+++ b/chart2/source/model/template/StockChartTypeTemplate.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -551,3 +552,5 @@ IMPLEMENT_FORWARD_XINTERFACE2( StockChartTypeTemplate, ChartTypeTemplate, OPrope
 IMPLEMENT_FORWARD_XTYPEPROVIDER2( StockChartTypeTemplate, ChartTypeTemplate, OPropertySet )
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/StockChartTypeTemplate.hxx b/chart2/source/model/template/StockChartTypeTemplate.hxx
index c9347ff4e070..65a8424342cb 100644
--- a/chart2/source/model/template/StockChartTypeTemplate.hxx
+++ b/chart2/source/model/template/StockChartTypeTemplate.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -136,3 +137,5 @@ private:
 
 // CHART_STOCKCHARTTYPETEMPLATE_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/StockDataInterpreter.cxx b/chart2/source/model/template/StockDataInterpreter.cxx
index 0d134516a1bb..4842bdb02d81 100644
--- a/chart2/source/model/template/StockDataInterpreter.cxx
+++ b/chart2/source/model/template/StockDataInterpreter.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -37,8 +38,6 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/chart2/data/XDataSink.hpp>
 
-// #include <deque>
-
 #include <vector>
 #include <algorithm>
 #include <iterator>
@@ -342,3 +341,5 @@ InterpretedData SAL_CALL StockDataInterpreter::reinterpretDataSeries(
 }
 
 } // namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/StockDataInterpreter.hxx b/chart2/source/model/template/StockDataInterpreter.hxx
index bb9edf48c169..d2ad20800f37 100644
--- a/chart2/source/model/template/StockDataInterpreter.hxx
+++ b/chart2/source/model/template/StockDataInterpreter.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -67,3 +68,5 @@ private:
 
 // CHART_STOCKDATAINTERPRETER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/XYDataInterpreter.cxx b/chart2/source/model/template/XYDataInterpreter.cxx
index 965e3a058f58..10cb2d7b9c8b 100755..100644
--- a/chart2/source/model/template/XYDataInterpreter.cxx
+++ b/chart2/source/model/template/XYDataInterpreter.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -268,3 +269,5 @@ sal_Bool SAL_CALL XYDataInterpreter::isDataCompatible(
 }
 
 } // namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/XYDataInterpreter.hxx b/chart2/source/model/template/XYDataInterpreter.hxx
index c8ecb4d17778..74ebb28d0a40 100644
--- a/chart2/source/model/template/XYDataInterpreter.hxx
+++ b/chart2/source/model/template/XYDataInterpreter.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -59,3 +60,5 @@ protected:
 
 // CHART_XYDATAINTERPRETER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/_serviceregistration_charttypes.cxx b/chart2/source/model/template/_serviceregistration_charttypes.cxx
index 9a62a97582e0..5888be8b42c8 100755..100644
--- a/chart2/source/model/template/_serviceregistration_charttypes.cxx
+++ b/chart2/source/model/template/_serviceregistration_charttypes.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -135,3 +136,5 @@ struct ::cppu::ImplementationEntry *
 {
     return g_entries_chart2_charttypes;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/makefile.mk b/chart2/source/model/template/makefile.mk
deleted file mode 100644
index 5599aed50256..000000000000
--- a/chart2/source/model/template/makefile.mk
+++ /dev/null
@@ -1,82 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=				..$/..$/..
-PRJNAME=			chart2
-TARGET=				chmodeltemplate
-
-PRJINC=				$(PRJ)$/source
-
-ENABLE_EXCEPTIONS=	TRUE
-VISIBILITY_HIDDEN=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE: settings.mk
-
-# i26518 the gcc-3.0.4 requires to enhance the template-depth
-# this seems to be a compiler issue, so we recommend not to use 3.0.x anymore
-.IF "$(COM)"=="GCC" 
-    CFLAGS+=-ftemplate-depth-128
-.ENDIF
-
-# --- export library -------------------------------------------------
-
-#Specifies object files to bind into linked libraries.
-SLOFILES=	\
-    $(SLO)$/AreaChartType.obj \
-    $(SLO)$/AreaChartTypeTemplate.obj \
-    $(SLO)$/BarChartType.obj \
-    $(SLO)$/BarChartTypeTemplate.obj \
-    $(SLO)$/CandleStickChartType.obj \
-    $(SLO)$/ChartType.obj		\
-    $(SLO)$/ChartTypeManager.obj		\
-    $(SLO)$/ChartTypeTemplate.obj		\
-    $(SLO)$/ColumnChartType.obj \
-    $(SLO)$/ColumnLineChartTypeTemplate.obj \
-    $(SLO)$/DataInterpreter.obj \
-    $(SLO)$/FilledNetChartType.obj \
-    $(SLO)$/LineChartType.obj \
-    $(SLO)$/LineChartTypeTemplate.obj \
-    $(SLO)$/NetChartType.obj \
-    $(SLO)$/NetChartTypeTemplate.obj \
-    $(SLO)$/PieChartType.obj \
-    $(SLO)$/PieChartTypeTemplate.obj \
-    $(SLO)$/ScatterChartType.obj \
-    $(SLO)$/ScatterChartTypeTemplate.obj \
-    $(SLO)$/BubbleChartType.obj \
-    $(SLO)$/BubbleChartTypeTemplate.obj \
-    $(SLO)$/BubbleDataInterpreter.obj \
-    $(SLO)$/StockChartTypeTemplate.obj \
-    $(SLO)$/StockDataInterpreter.obj \
-    $(SLO)$/XYDataInterpreter.obj \
-    $(SLO)$/ColumnLineDataInterpreter.obj \
-    $(SLO)$/_serviceregistration_charttypes.obj
-
-# --- Targets -----------------------------------------------------------------
-
-.INCLUDE: target.mk
diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx
index 4fd21e2c3b8b..5a7fa43e874c 100755..100644
--- a/chart2/source/tools/AxisHelper.cxx
+++ b/chart2/source/tools/AxisHelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -41,7 +42,6 @@
 #include "ChartModelHelper.hxx"
 #include "DataSourceHelper.hxx"
 
-#include <tools/debug.hxx>
 #include <unotools/saveopt.hxx>
 
 #include <com/sun/star/chart/ChartAxisPosition.hpp>
@@ -112,7 +112,7 @@ bool AxisHelper::isLogarithmic( const Reference< XScaling >& xScaling )
 
 chart2::ScaleData AxisHelper::getDateCheckedScale( const Reference< chart2::XAxis >& xAxis, const Reference< frame::XModel >& xChartModel )
 {
-    DBG_ASSERT(xChartModel.is(),"missing chart model");
+    OSL_ENSURE(xChartModel.is(),"missing chart model");
     ScaleData aScale = xAxis->getScaleData();
     Reference< chart2::XCoordinateSystem > xCooSys( ChartModelHelper::getFirstCoordinateSystem( xChartModel ) );
     if( aScale.AutoDateAxis && aScale.AxisType == AxisType::CATEGORY )
@@ -805,11 +805,11 @@ std::vector< Reference< XAxis > > AxisHelper::getAllAxesOfCoordinateSystem(
 
     if(xCooSys.is())
     {
-        sal_Int32 nDimensionIndex = 0;
         sal_Int32 nMaxDimensionIndex = xCooSys->getDimension() -1;
         if( nMaxDimensionIndex>=0 )
         {
-            for(nDimensionIndex=0; nDimensionIndex<=nMaxDimensionIndex; ++nDimensionIndex)
+            sal_Int32 nDimensionIndex = 0;
+            for(; nDimensionIndex<=nMaxDimensionIndex; ++nDimensionIndex)
             {
                 const sal_Int32 nMaximumAxisIndex = xCooSys->getMaximumAxisIndexByDimension(nDimensionIndex);
                 for(sal_Int32 nAxisIndex=0; nAxisIndex<=nMaximumAxisIndex; ++nAxisIndex)
@@ -1148,7 +1148,7 @@ Reference< XChartType > AxisHelper::getFirstChartTypeWithSeriesAttachedToAxisInd
     Reference< XChartType > xChartType;
     ::std::vector< Reference< XDataSeries > > aSeriesVector( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
     ::std::vector< Reference< XDataSeries > >::const_iterator aIter = aSeriesVector.begin();
-    for( ; aIter != aSeriesVector.end(); aIter++ )
+    for( ; aIter != aSeriesVector.end(); ++aIter )
     {
         sal_Int32 nCurrentIndex = DataSeriesHelper::getAttachedAxisIndex( *aIter );
         if( nAttachedAxisIndex == nCurrentIndex )
@@ -1170,3 +1170,5 @@ bool AxisHelper::isAxisPositioningEnabled()
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/BaseGFXHelper.cxx b/chart2/source/tools/BaseGFXHelper.cxx
index 0ec7df9b7d71..71c2c973bec1 100644
--- a/chart2/source/tools/BaseGFXHelper.cxx
+++ b/chart2/source/tools/BaseGFXHelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -220,3 +221,5 @@ double Rad2Deg( double fRadians )
 
 } //  namespace BaseGFXHelper
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/CachedDataSequence.cxx b/chart2/source/tools/CachedDataSequence.cxx
index 678cd8ba8314..ea3f24395161 100644
--- a/chart2/source/tools/CachedDataSequence.cxx
+++ b/chart2/source/tools/CachedDataSequence.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -287,47 +288,32 @@ APPHELPER_XSERVICEINFO_IMPL( CachedDataSequence, lcl_aServiceName )
 Sequence< double > SAL_CALL CachedDataSequence::getNumericalData()
     throw (uno::RuntimeException)
 {
-    // /--
     MutexGuard aGuard( GetMutex() );
 
     if( m_eCurrentDataType == NUMERICAL )
         return m_aNumericalSequence;
     else
         return Impl_getNumericalData();
-    // \--
 }
 
 // ________ XTextualDataSequence ________
 Sequence< OUString > SAL_CALL CachedDataSequence::getTextualData()
     throw (uno::RuntimeException)
 {
-    // /--
     MutexGuard aGuard( GetMutex() );
 
     if( m_eCurrentDataType == TEXTUAL )
         return m_aTextualSequence;
     else
         return Impl_getTextualData();
-    // \--
 }
 
-// void SAL_CALL CachedDataSequence::setTextualData( const Sequence< OUString >& aData )
-//     throw (uno::RuntimeException)
-// {
-//     // /--
-//     MutexGuard aGuard( GetMutex() );
-//     Impl_setTextualData( aData );
-//     // \--
-// }
-
 // ________ XDataSequence  ________
 Sequence< Any > SAL_CALL CachedDataSequence::getData()
     throw (uno::RuntimeException)
 {
-    // /--
     MutexGuard aGuard( GetMutex() );
     return Impl_getMixedData();
-    // \--
 }
 
 OUString SAL_CALL CachedDataSequence::getSourceRangeRepresentation()
@@ -407,3 +393,5 @@ void SAL_CALL CachedDataSequence::initialize(const uno::Sequence< uno::Any > & _
     }
 }
 }  // namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/CharacterProperties.cxx b/chart2/source/tools/CharacterProperties.cxx
index f0c37a47c96c..a0d519862829 100644
--- a/chart2/source/tools/CharacterProperties.cxx
+++ b/chart2/source/tools/CharacterProperties.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -54,15 +55,9 @@
 
 
 // header for struct SvtLinguConfig
-#ifndef _SVTOOLS_LINGUCFG_HXX_
 #include <unotools/lingucfg.hxx>
-#endif
-#ifndef INCLUDED_I18NPOOL_MSLANGID_HXX
 #include <i18npool/mslangid.hxx>
-#endif
-#ifndef _SV_OUTDEV_HXX
 #include <vcl/outdev.hxx>
-#endif
 
 using namespace ::com::sun::star;
 
@@ -118,13 +113,6 @@ void CharacterProperties::AddPropertiesToVector(
                   ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
-    // CharBackColor
-//     rOutProperties.push_back(
-//         Property( C2U( "CharBackColor" ),
-//                   PROP_CHAR_BACKGROUND_COLOR,
-//                   ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
-//                   beans::PropertyAttribute::BOUND
-//                   | beans::PropertyAttribute::MAYBEDEFAULT));
     // CharEscapement
     rOutProperties.push_back(
         Property( C2U( "CharEscapement" ),
@@ -211,30 +199,6 @@ void CharacterProperties::AddPropertiesToVector(
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT
                   | beans::PropertyAttribute::MAYBEVOID ));
-    // CharCaseMap (see style.CaseMap)
-//     rOutProperties.push_back(
-//         Property( C2U( "CharCaseMap" ),
-//                   PROP_CHAR_CASE_MAPPING,
-//                   ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)),
-//                   beans::PropertyAttribute::BOUND
-//                   | beans::PropertyAttribute::MAYBEDEFAULT ));
-
-
-    // CharRotation
-//     rOutProperties.push_back(
-//         Property( C2U( "CharRotation" ),
-//                   PROP_CHAR_ROTATION,
-//                   ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)),
-//                   beans::PropertyAttribute::BOUND
-//                   | beans::PropertyAttribute::MAYBEDEFAULT ));
-
-//     // CharScaleWidth
-//     rOutProperties.push_back(
-//         Property( C2U( "CharScaleWidth" ),
-//                   PROP_CHAR_SCALE_WIDTH,
-//                   ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)),
-//                   beans::PropertyAttribute::BOUND
-//                   | beans::PropertyAttribute::MAYBEDEFAULT ));
     // CharEscapementHeight
     rOutProperties.push_back(
         Property( C2U( "CharEscapementHeight" ),
@@ -242,14 +206,6 @@ void CharacterProperties::AddPropertiesToVector(
                   ::getCppuType( reinterpret_cast< const sal_Int8 * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEVOID ));
-
-    // CharCrossedOut
-//     rOutProperties.push_back(
-//         Property( C2U( "CharCrossedOut" ),
-//                   PROP_CHAR_CROSSED_OUT,
-//                   ::getBooleanCppuType(),
-//                   beans::PropertyAttribute::BOUND
-//                   | beans::PropertyAttribute::MAYBEDEFAULT ));
     // CharStrikeout (see awt.FontStrikeout)
     rOutProperties.push_back(
         Property( C2U( "CharStrikeout" ),
@@ -264,13 +220,6 @@ void CharacterProperties::AddPropertiesToVector(
                   ::getBooleanCppuType(),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
-    // CharFlash
-//     rOutProperties.push_back(
-//         Property( C2U( "CharFlash" ),
-//                   PROP_CHAR_FLASH,
-//                   ::getBooleanCppuType(),
-//                   beans::PropertyAttribute::BOUND
-//                   | beans::PropertyAttribute::MAYBEDEFAULT ));
     // CharLocale
     rOutProperties.push_back(
         Property( C2U( "CharLocale" ),
@@ -307,42 +256,6 @@ void CharacterProperties::AddPropertiesToVector(
                   ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
-//     // RubyText
-//     rOutProperties.push_back(
-//         Property( C2U( "RubyText" ),
-//                   PROP_CHAR_RUBY_TEXT,
-//                   ::getCppuType( reinterpret_cast< const OUString * >(0)),
-//                   beans::PropertyAttribute::BOUND
-//                   | beans::PropertyAttribute::MAYBEDEFAULT ));
-//     // RubyAdjust (see text.RubyAdjust)
-//     rOutProperties.push_back(
-//         Property( C2U( "RubyAdjust" ),
-//                   PROP_CHAR_RUBY_ADJUST,
-//                   ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)),
-//                   beans::PropertyAttribute::BOUND
-//                   | beans::PropertyAttribute::MAYBEDEFAULT ));
-//     // RubyCharStyleName
-//     rOutProperties.push_back(
-//         Property( C2U( "RubyStyleName" ),
-//                   PROP_CHAR_RUBY_STYLE_NAME,
-//                   ::getCppuType( reinterpret_cast< const OUString * >(0)),
-//                   beans::PropertyAttribute::BOUND
-//                   | beans::PropertyAttribute::MAYBEDEFAULT ));
-//     // RubyIsAbove
-//     rOutProperties.push_back(
-//         Property( C2U( "RubyIsAbove" ),
-//                   PROP_CHAR_RUBY_IS_ABOVE,
-//                   ::getBooleanCppuType(),
-//                   beans::PropertyAttribute::BOUND
-//                   | beans::PropertyAttribute::MAYBEDEFAULT ));
-//     // CharNoHyphenation
-//     rOutProperties.push_back(
-//         Property( C2U( "InhibitHyphenation" ),
-//                   PROP_CHAR_INHIBIT_HYPHENATION,
-//                   ::getBooleanCppuType(),
-//                   beans::PropertyAttribute::BOUND
-//                   | beans::PropertyAttribute::MAYBEDEFAULT ));
-
     // CharacterPropertiesAsian
     // =====
     // CharFontNameAsian
@@ -532,28 +445,14 @@ void CharacterProperties::AddDefaultsToMap(
     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_POSTURE, awt::FontSlant_NONE );
     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_AUTO_KERNING, true );
     ::chart::PropertyHelper::setPropertyValueDefault< sal_Int16 >( rOutMap, PROP_CHAR_KERNING, 0 );
-
-//     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_CASE_MAPPING, style::CaseMap::NONE );
-//     ::chart::PropertyHelper::setPropertyValueDefault< sal_Int16 >( rOutMap, PROP_CHAR_ROTATION, 0 );
-//     ::chart::PropertyHelper::setPropertyValueDefault< sal_Int16 >( rOutMap, PROP_CHAR_SCALE_WIDTH, 71 );
-
-//     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_CROSSED_OUT, false );
     ::chart::PropertyHelper::setPropertyValueDefault< sal_Int16 >( rOutMap, PROP_CHAR_STRIKE_OUT, awt::FontStrikeout::NONE );
     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_WORD_MODE, false );
-//     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_FLASH, false );
-
     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_LOCALE, aDefaultLocale );
     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_SHADOWED, false );
     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_CONTOURED, false );
     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_RELIEF, text::FontRelief::NONE );
-
     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_EMPHASIS, text::FontEmphasis::NONE );
 
-//     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_RUBY_ADJUST, text::RubyAdjust_INDENT_BLOCK );
-//     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_RUBY_STYLE_NAME, ?? );
-//     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_RUBY_IS_ABOVE, true );
-//     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_INHIBIT_HYPHENATION, false );
-
     // Asian (com.sun.star.style.CharacterPropertiesAsian)
     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_ASIAN_CHAR_HEIGHT, fDefaultFontHeight );
     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_ASIAN_WEIGHT, awt::FontWeight::NORMAL );
@@ -630,3 +529,5 @@ awt::FontDescriptor CharacterProperties::createFontDescriptorFromPropertySet(
 }
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/ChartDebugTrace.cxx b/chart2/source/tools/ChartDebugTrace.cxx
index 9629138cb2be..5581ba745537 100644
--- a/chart2/source/tools/ChartDebugTrace.cxx
+++ b/chart2/source/tools/ChartDebugTrace.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -49,266 +50,7 @@ using ::rtl::OUString;
 
 namespace
 {
-/*
-const char lcl_aSpace=' ';
 
-void lcl_IndentedTrace( int nIndent, char* pStr )
-{
-    if( nIndent > 0 )
-    {
-        OSL_TRACE( "%*c%s", nIndent, lcl_aSpace, pStr );
-    }
-    else
-    {
-        OSL_TRACE( pStr );
-    }
-}
-
-void lcl_TraceException( const uno::Exception & aEx )
-{
-    OSL_TRACE(
-        U2C( C2U( "*** Exception caught during trace. Type: " ) +
-             OUString::createFromAscii( typeid( aEx ).name()) +
-             C2U( ", Message: " ) +
-             aEx.Message ));
-}
-
-void lcl_TraceCategories( const Reference< data::XLabeledDataSequence > & xCat, int nIndent )
-{
-    if( ! xCat.is())
-        return;
-    try
-    {
-        Reference< data::XDataSequence > xValues( xCat->getValues());
-        if( xValues.is())
-        {
-            OSL_TRACE( "%*ccategories: source: %s", nIndent, lcl_aSpace,
-                       U2C( xValues->getSourceRangeRepresentation()));
-        }
-        Reference< data::XDataSequence > xLabel( xCat->getLabel());
-        if( xLabel.is())
-        {
-            OSL_TRACE( "%*ccategories' label: source: %s", nIndent, lcl_aSpace,
-                       U2C( xLabel->getSourceRangeRepresentation()));
-        }
-    }
-    catch( uno::Exception & ex )
-    {
-        lcl_TraceException( ex );
-    }
-}
-
-void lcl_TraceDataSeriesSeq( const Sequence< Reference< XDataSeries > > & aSeries, int nIndent )
-{
-    for( sal_Int32 j = 0; j < aSeries.getLength(); ++j )
-    {
-        Reference< beans::XPropertySet > xProp( aSeries[j], uno::UNO_QUERY );
-        OUString aId;
-
-        OSL_TRACE( "%*cindex %ld", nIndent, lcl_aSpace, j );
-
-        StackingDirection aStDir;
-        if( xProp.is() &&
-            ( xProp->getPropertyValue( C2U( "StackingDirection" )) >>= aStDir ) &&
-            aStDir != StackingDirection_NO_STACKING )
-        {
-            OSL_TRACE( "%*cstacking in %s", nIndent + 2, lcl_aSpace,
-                       (aStDir == StackingDirection_Y_STACKING)
-                       ? "y-direction" : "z-direction" );
-        }
-
-        Reference< data::XDataSource > xSource( aSeries[j], uno::UNO_QUERY );
-        if( xSource.is())
-        {
-            Sequence< Reference< data::XLabeledDataSequence > > aSequences( xSource->getDataSequences());
-            const sal_Int32 nMax = aSequences.getLength();
-            for( sal_Int32 k = 0; k < nMax; ++k )
-            {
-                if( aSequences[k].is())
-                {
-                    OUString aSourceId(C2U("<none>"));
-                    if( aSequences[k]->getValues().is())
-                        aSourceId = aSequences[k]->getValues()->getSourceRangeRepresentation();
-                    xProp.set( aSequences[k]->getValues(), uno::UNO_QUERY );
-                    if( xProp.is() &&
-                        ( xProp->getPropertyValue( C2U( "Role" )) >>= aId ))
-                    {
-                        OSL_TRACE( "%*cdata sequence %d: role: %s, source: %s",
-                                   nIndent + 2, lcl_aSpace, k, U2C( aId ), U2C( aSourceId ));
-                    }
-                    else
-                    {
-                        OSL_TRACE( "%*cdata sequence %d, unknown role, source: %s",
-                                   nIndent + 2, lcl_aSpace, k, U2C( aSourceId ) );
-                    }
-
-                    aSourceId = C2U("<none>");
-                    if( aSequences[k]->getLabel().is())
-                        aSourceId = OUString( aSequences[k]->getLabel()->getSourceRangeRepresentation());
-                    xProp.set( aSequences[k]->getLabel(), uno::UNO_QUERY );
-                    if( xProp.is() &&
-                        ( xProp->getPropertyValue( C2U( "Role" )) >>= aId ))
-                    {
-                        OSL_TRACE( "%*cdata sequence label %d: role: %s, source: %s",
-                                   nIndent + 2, lcl_aSpace, k, U2C( aId ), U2C( aSourceId ));
-                    }
-                    else
-                    {
-                        OSL_TRACE( "%*cdata sequence label %d: unknown role, source: %s",
-                                   nIndent + 2, lcl_aSpace, k, U2C( aSourceId ) );
-                    }
-                }
-            }
-        }
-    }
-}
-
-void lcl_TraceChartType( const Reference< XChartType > & xChartType, int nIndent )
-{
-    if( xChartType.is())
-    {
-        OSL_TRACE( "%*c* type: %s", nIndent, lcl_aSpace, U2C( xChartType->getChartType()) );
-
-        lcl_IndentedTrace( nIndent + 2, "Supported Roles" );
-        sal_Int32 i=0;
-        Sequence< OUString > aMandRoles( xChartType->getSupportedMandatoryRoles());
-        if( aMandRoles.getLength() > 0 )
-        {
-            lcl_IndentedTrace( nIndent + 4, "mandatory" );
-            for( i=0; i<aMandRoles.getLength(); ++i )
-            {
-                OSL_TRACE( "%*c%s", nIndent + 6, lcl_aSpace, U2C( aMandRoles[i] ));
-            }
-        }
-        Sequence< OUString > aOptRoles( xChartType->getSupportedOptionalRoles());
-        if( aOptRoles.getLength() > 0 )
-        {
-            lcl_IndentedTrace( nIndent + 4, "optional" );
-            for( i=0; i<aOptRoles.getLength(); ++i )
-            {
-                OSL_TRACE( "%*c%s", nIndent + 6, lcl_aSpace, U2C( aOptRoles[i] ));
-            }
-        }
-        OSL_TRACE( "%*crole of sequence for label: %s", nIndent + 2, lcl_aSpace,
-                   U2C( xChartType->getRoleOfSequenceForSeriesLabel()));
-
-        Reference< XDataSeriesContainer > xDSCnt( xChartType, uno::UNO_QUERY );
-        if( xDSCnt.is())
-        {
-            lcl_IndentedTrace( nIndent + 2, "Data Series" );
-            lcl_TraceDataSeriesSeq( xDSCnt->getDataSeries(), nIndent + 4 );
-        }
-    }
-}
-
-void lcl_TraceCoordinateSystem( const Reference< XCoordinateSystem > & xCooSys, int nIndent )
-{
-    if( xCooSys.is()) try
-    {
-        sal_Int32 nDim = xCooSys->getDimension();
-        OSL_TRACE( "%*c* dim: %ld, type: %s", nIndent, lcl_aSpace,
-                   nDim, U2C( xCooSys->getCoordinateSystemType() ));
-        nIndent += 2;
-        OSL_TRACE( "%*cview service-name: %s", nIndent, lcl_aSpace,
-                   U2C( xCooSys->getViewServiceName() ));
-
-        Reference< beans::XPropertySet > xProp( xCooSys, uno::UNO_QUERY );
-        if( xProp.is())
-        {
-            Reference< beans::XPropertySetInfo > xInfo( xProp->getPropertySetInfo(), uno::UNO_QUERY );
-            sal_Bool bSwap;
-            if( xInfo.is() &&
-                xInfo->hasPropertyByName( C2U("SwapXAndYAxis")) &&
-                (xProp->getPropertyValue( C2U("SwapXAndYAxis")) >>= bSwap) &&
-                bSwap )
-            {
-                lcl_IndentedTrace( nIndent, "swap x-axis and y-axis" );
-            }
-        }
-
-        if( nDim >= 2 )
-        {
-            const sal_Int32 nMaxIndex = xCooSys->getMaximumAxisIndexByDimension(1);
-            for(sal_Int32 nI=0; nI<=nMaxIndex; ++nI)
-            {
-                Reference< XScale > xScale( xCooSys->getAxisByDimension( 1, nI ));
-                if( xScale.is())
-                {
-                    ScaleData aData( xScale->getScaleData());
-                    if( aData.AxisType==AxisType::PERCENT )
-                        lcl_IndentedTrace( nIndent, "percent stacking at y-scale" );
-                }
-            }
-        }
-
-        Sequence< uno::Any > aOrigin( xCooSys->getOrigin());
-        double x, y, z;
-        ::rtl::math::setNan( &x ), ::rtl::math::setNan( &y ), ::rtl::math::setNan( &z );
-        if( aOrigin.getLength() > 0 &&
-            aOrigin[0].hasValue() )
-            aOrigin[0] >>= x;
-        if( aOrigin.getLength() > 1 &&
-            aOrigin[1].hasValue() )
-            aOrigin[1] >>= y;
-        if( aOrigin.getLength() > 2 &&
-            aOrigin[2].hasValue() )
-            aOrigin[2] >>= z;
-        OSL_TRACE( "%*corigin: (%f, %f, %f)", nIndent, lcl_aSpace, x, y, z );
-
-        Reference< XChartTypeContainer > xCTCnt( xCooSys, uno::UNO_QUERY );
-        if( xCTCnt.is())
-        {
-            Sequence< Reference< XChartType > > aChartTypes( xCTCnt->getChartTypes());
-            if( aChartTypes.getLength() > 0 )
-            {
-                lcl_IndentedTrace( nIndent, "Chart Types" );
-                for( sal_Int32 i=0; i<aChartTypes.getLength(); ++i )
-                {
-                    lcl_TraceChartType( aChartTypes[i], nIndent + 2 );
-                }
-            }
-        }
-    }
-    catch( uno::Exception & ex )
-    {
-        lcl_TraceException( ex );
-    }
-}
-
-void lcl_TraceMeter(
-    const Reference< XMeter > & xMeter,
-    const Sequence< Reference< XCoordinateSystem > > & aCooSys,
-    bool bWithCategories,
-    int nIndent )
-{
-    try
-    {
-        Reference< XCoordinateSystem > xCooSys( xMeter->getCoordinateSystem());
-        for( sal_Int32 i=0; i<aCooSys.getLength(); ++i )
-            if( aCooSys[i] == xCooSys )
-            {
-                OSL_TRACE( "%*cbelongs to Coordinate System %ld.", nIndent + 2, lcl_aSpace, i );
-            }
-        OSL_TRACE( "%*crepresents  Dimension %ld.", nIndent + 2, lcl_aSpace, xMeter->getRepresentedDimension());
-        if( bWithCategories )
-        {
-            Reference< XScale > xScale( xCooSys->getAxisByDimension( xMeter->getRepresentedDimension(), xMeter->getIndex() ));
-            if( xScale.is())
-            {
-                ScaleData aData = xScale->getScaleData();
-                if( aData.Categories.is())
-                {
-                    lcl_TraceCategories( aData.Categories, nIndent + 2 );
-                }
-            }
-        }
-    }
-    catch( uno::Exception & ex )
-    {
-        lcl_TraceException( ex );
-    }
-}
-*/
 } // anonymous namespace
 #endif
 
@@ -324,94 +66,18 @@ void ChartDebugTraceDocument(
     const Reference< XChartDocument > & /*xDoc*/,
     int /*nIndent*/ )
 {
-    /*
-#if OSL_DEBUG_LEVEL >= CHART_TRACE_OSL_DEBUG_LEVEL
-    try
-    {
-        OSL_TRACE( "%*cas %sternal data", nIndent, 'h',
-                   xDoc->hasInternalDataProvider() ? "in": "ex" );
 
-        Reference< lang::XMultiServiceFactory > xCTManager( xDoc->getChartTypeManager(), uno::UNO_QUERY );
-        if( xCTManager.is())
-        {
-            Sequence< OUString > aServiceNames( xCTManager->getAvailableServiceNames());
-            OSL_TRACE( "%*c ChartTypeManager has %ld entries", nIndent, '*', aServiceNames.getLength());
-# if OSL_DEBUG_LEVEL >= (CHART_TRACE_OSL_DEBUG_LEVEL + 1)
-            for( sal_Int32 i=0; i<aServiceNames.getLength(); ++i )
-            {
-                OSL_TRACE( "%*c%s", nIndent + 2, lcl_aSpace, U2C( aServiceNames[i] ));
-            }
-# endif
-        }
-        Reference< XDiagram > xDiagram( xDoc->getFirstDiagram());
-        lcl_IndentedTrace( nIndent, "* Diagram" );
-        ChartDebugTraceDiagram( xDiagram, nIndent + 2 );
-    }
-    catch( uno::Exception & ex )
-    {
-        lcl_TraceException( ex );
-    }
-#endif
-    */
 }
 
 void ChartDebugTraceDiagram(
     const Reference< XDiagram > & /*xDiagram*/,
     int /*nIndent*/ )
 {
-    /*
-#if OSL_DEBUG_LEVEL >= CHART_TRACE_OSL_DEBUG_LEVEL
-    try
-    {
-        Reference< XCoordinateSystemContainer > xCooSysCnt( xDiagram, uno::UNO_QUERY_THROW );
-        Sequence< Reference< XCoordinateSystem > > aCooSys( xCooSysCnt->getCoordinateSystems() );
-        if( aCooSys.getLength() > 0 )
-        {
-            lcl_IndentedTrace( nIndent, "CoordinateSystems" );
-            for( sal_Int32 i=0; i<aCooSys.getLength(); ++i )
-                lcl_TraceCoordinateSystem( aCooSys[i], nIndent + 2 );
-        }
-        else
-        {
-            lcl_IndentedTrace( nIndent, "<No Coordinate Systems>" );
-        }
-
-        Reference< XAxisContainer > xAxisCnt( xDiagram, uno::UNO_QUERY_THROW );
-        Sequence< Reference< XAxis > > aAxes( xAxisCnt->getAxes() );
-        if( aAxes.getLength() > 0 )
-        {
-            lcl_IndentedTrace( nIndent, "Axes" );
-            for( sal_Int32 i=0; i<aAxes.getLength(); ++i )
-                lcl_TraceMeter( Reference< XMeter >( aAxes[i], uno::UNO_QUERY ), aCooSys, true, nIndent + 2 );
-        }
-        else
-        {
-            lcl_IndentedTrace( nIndent, "<No Axes>" );
-        }
 
-        Reference< XGridContainer > xGridCnt( xDiagram, uno::UNO_QUERY_THROW );
-        Sequence< Reference< XGrid > > aGrids( xGridCnt->getGrids() );
-        if( aGrids.getLength() > 0 )
-        {
-            lcl_IndentedTrace( nIndent, "Grids" );
-            for( sal_Int32 i=0; i<aGrids.getLength(); ++i )
-                lcl_TraceMeter( Reference< XMeter >( aGrids[i], uno::UNO_QUERY ), aCooSys, false, nIndent + 2 );
-        }
-        else
-        {
-            lcl_IndentedTrace( nIndent, "<No Grids>" );
-        }
-    }
-    catch( uno::Exception & ex )
-    {
-        lcl_TraceException( ex );
-    }
-
-#endif
-
-*/
 }
 #endif
 
 } // namespace debug
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/ChartModelHelper.cxx b/chart2/source/tools/ChartModelHelper.cxx
index e5e21eac8a7f..bc7235167afc 100755..100644
--- a/chart2/source/tools/ChartModelHelper.cxx
+++ b/chart2/source/tools/ChartModelHelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -44,9 +45,6 @@
 #include <com/sun/star/embed/XVisualObject.hpp>
 #include <com/sun/star/view/XSelectionChangeListener.hpp>
 
-// header for define DBG_ASSERT
-#include <tools/debug.hxx>
-
 //.............................................................................
 namespace chart
 {
@@ -136,7 +134,7 @@ awt::Size ChartModelHelper::getPageSize( const uno::Reference< frame::XModel >&
 {
     awt::Size aPageSize( ChartModelHelper::getDefaultPageSize() );
     uno::Reference< embed::XVisualObject > xVisualObject(xModel,uno::UNO_QUERY);
-    DBG_ASSERT(xVisualObject.is(),"need xVisualObject for page size");
+    OSL_ENSURE(xVisualObject.is(),"need xVisualObject for page size");
     if( xVisualObject.is() )
         aPageSize = xVisualObject->getVisualAreaSize( embed::Aspects::MSOLE_CONTENT );
     return aPageSize;
@@ -145,7 +143,7 @@ awt::Size ChartModelHelper::getPageSize( const uno::Reference< frame::XModel >&
 void ChartModelHelper::setPageSize( const awt::Size& rSize, const uno::Reference< frame::XModel >& xModel )
 {
     uno::Reference< embed::XVisualObject > xVisualObject(xModel,uno::UNO_QUERY);
-    DBG_ASSERT(xVisualObject.is(),"need xVisualObject for page size");
+    OSL_ENSURE(xVisualObject.is(),"need xVisualObject for page size");
     if( xVisualObject.is() )
         xVisualObject->setVisualAreaSize( embed::Aspects::MSOLE_CONTENT, rSize );
 }
@@ -258,3 +256,5 @@ bool ChartModelHelper::setIncludeHiddenCells( bool bIncludeHiddenCells, const un
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/ChartTypeHelper.cxx b/chart2/source/tools/ChartTypeHelper.cxx
index 83ab4a26315b..1ba13e6093c0 100755..100644
--- a/chart2/source/tools/ChartTypeHelper.cxx
+++ b/chart2/source/tools/ChartTypeHelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -359,7 +360,7 @@ uno::Sequence < sal_Int32 > ChartTypeHelper::getSupportedLabelPlacements( const
     }
     else
     {
-        OSL_ENSURE( false, "unknown charttype" );
+        OSL_FAIL( "unknown charttype" );
     }
 
     return aRet;
@@ -634,7 +635,7 @@ uno::Sequence < sal_Int32 > ChartTypeHelper::getSupportedMissingValueTreatments(
     }
     else
     {
-        OSL_ENSURE( false, "unknown charttype" );
+        OSL_FAIL( "unknown charttype" );
     }
 
     return aRet;
@@ -702,3 +703,5 @@ bool ChartTypeHelper::isSupportingOnlyDeepStackingFor3D( const uno::Reference< X
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/ChartViewHelper.cxx b/chart2/source/tools/ChartViewHelper.cxx
index c6f712787559..eacdc25dc7ae 100755..100644
--- a/chart2/source/tools/ChartViewHelper.cxx
+++ b/chart2/source/tools/ChartViewHelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,8 +33,6 @@
 #include "macros.hxx"
 #include "servicenames.hxx"
 
-// header for define DBG_ASSERT
-#include <tools/debug.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/util/XModifyListener.hpp>
@@ -69,3 +68,5 @@ void ChartViewHelper::setViewToDirtyState( const uno::Reference< frame::XModel >
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/ColorPerPointHelper.cxx b/chart2/source/tools/ColorPerPointHelper.cxx
index b0b1e3f03130..422475e9e53e 100755..100644
--- a/chart2/source/tools/ColorPerPointHelper.cxx
+++ b/chart2/source/tools/ColorPerPointHelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -93,3 +94,5 @@ bool ColorPerPointHelper::hasPointOwnProperties(
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/CommonConverters.cxx b/chart2/source/tools/CommonConverters.cxx
index 6b70ac4c1500..c95e78f9bdb7 100755..100644
--- a/chart2/source/tools/CommonConverters.cxx
+++ b/chart2/source/tools/CommonConverters.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -165,7 +166,7 @@ void AddPointToPoly( drawing::PolyPolygonShape3D& rPoly, const drawing::Position
 {
     if(nPolygonIndex<0)
     {
-        OSL_ENSURE( false, "The polygon index needs to be > 0");
+        OSL_FAIL( "The polygon index needs to be > 0");
         nPolygonIndex=0;
     }
 
@@ -210,12 +211,12 @@ drawing::Position3D getPointFromPoly( const drawing::PolyPolygonShape3D& rPolygo
         }
         else
         {
-            ;DBG_ERROR("polygon was accessed with a wrong index");
+            OSL_FAIL("polygon was accessed with a wrong index");
         }
     }
     else
     {
-        ;DBG_ERROR("polygon was accessed with a wrong index");
+        OSL_FAIL("polygon was accessed with a wrong index");
     }
     return aRet;
 }
@@ -280,7 +281,6 @@ drawing::PolyPolygonShape3D BezierToPoly(
     const drawing::PolyPolygonBezierCoords& rBezier )
 {
     const drawing::PointSequenceSequence& rPointSequence = rBezier.Coordinates;
-//     const drawing::FlagSequenceSequence& rFlags = rBezier.Flags;
 
     drawing::PolyPolygonShape3D aRet;
     aRet.SequenceX.realloc( rPointSequence.getLength() );
@@ -546,3 +546,5 @@ bool replaceParamterInString( rtl::OUString & rInOutResourceString,
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/ConfigColorScheme.cxx b/chart2/source/tools/ConfigColorScheme.cxx
index fb7106d87096..23fcd4fa9e72 100644
--- a/chart2/source/tools/ConfigColorScheme.cxx
+++ b/chart2/source/tools/ConfigColorScheme.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,6 +34,7 @@
 #include "macros.hxx"
 
 #include <unotools/configitem.hxx>
+#include <sal/macros.h>
 
 #include <set>
 
@@ -174,7 +176,7 @@ void ConfigColorScheme::retrieveConfigColors()
         0xff00ff, 0x00ffff, 0xffff00
     };
 
-    static const sal_Int32 nMaxDefaultColors = sizeof( nDefaultColors ) / sizeof( sal_Int32 );
+    static const sal_Int32 nMaxDefaultColors = SAL_N_ELEMENTS( nDefaultColors );
     return nDefaultColors[ nIndex % nMaxDefaultColors ];
 }
 
@@ -200,3 +202,5 @@ APPHELPER_XSERVICEINFO_IMPL( ConfigColorScheme,
 // ================================================================================
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/ControllerLockGuard.cxx b/chart2/source/tools/ControllerLockGuard.cxx
index 4ef430c5e483..7d17853257a5 100644
--- a/chart2/source/tools/ControllerLockGuard.cxx
+++ b/chart2/source/tools/ControllerLockGuard.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -87,3 +88,5 @@ ControllerLockHelperGuard::~ControllerLockHelperGuard()
 }
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/DataSeriesHelper.cxx b/chart2/source/tools/DataSeriesHelper.cxx
index acff332d4229..842086b0435e 100644
--- a/chart2/source/tools/DataSeriesHelper.cxx
+++ b/chart2/source/tools/DataSeriesHelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -738,7 +739,7 @@ bool hasUnhiddenData( const uno::Reference< chart2::XDataSeries >& xSeries )
 
 struct lcl_LessIndex
 {
-    inline bool operator() ( const sal_Int32& first, const sal_Int32& second )
+    inline bool operator() ( const sal_Int32& first, const sal_Int32& second ) const
     {
         return ( first < second );
     }
@@ -916,3 +917,5 @@ void deleteDataLabelsFromPoint( const Reference< beans::XPropertySet >& xPointPr
 
 } //  namespace DataSeriesHelper
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/DataSource.cxx b/chart2/source/tools/DataSource.cxx
index edbf4dfacfeb..55f1439ef6f7 100644
--- a/chart2/source/tools/DataSource.cxx
+++ b/chart2/source/tools/DataSource.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -89,3 +90,5 @@ Sequence< OUString > DataSource::getSupportedServiceNames_Static()
 APPHELPER_XSERVICEINFO_IMPL( DataSource, lcl_aServiceName );
 
 } // namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/DataSourceHelper.cxx b/chart2/source/tools/DataSourceHelper.cxx
index 21fc16156397..04785deba33b 100755..100644
--- a/chart2/source/tools/DataSourceHelper.cxx
+++ b/chart2/source/tools/DataSourceHelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -370,9 +371,7 @@ bool DataSourceHelper::allArgumentsForRectRangeDetected(
 {
     bool bHasDataRowSource = false;
     bool bHasFirstCellAsLabel = false;
-//     bool bHasHasCategories = false;
     bool bHasCellRangeRepresentation = false;
-//     bool bHasSequenceMapping = false;
 
     uno::Reference< data::XDataProvider > xDataProvider( xChartDocument->getDataProvider() );
     if( !xDataProvider.is() )
@@ -398,24 +397,12 @@ bool DataSourceHelper::allArgumentsForRectRangeDetected(
                 bHasFirstCellAsLabel =
                     (aProperty.Value.hasValue() && aProperty.Value.isExtractableTo(::getBooleanCppuType()));
             }
-//             else if( aProperty.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "HasCategories" ) ))
-//             {
-//                 bHasHasCategories =
-//                     (aProperty.Value.hasValue() && aProperty.Value.isExtractableTo(::getBooleanCppuType()));
-//             }
             else if( aProperty.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CellRangeRepresentation" ) ))
             {
                 ::rtl::OUString aRange;
                 bHasCellRangeRepresentation =
                     (aProperty.Value.hasValue() && (aProperty.Value >>= aRange) && aRange.getLength() > 0);
             }
-//         else if( aProperty.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "SequenceMapping" ) ))
-//         {
-//             bHasSequenceMapping =
-//                 (aProperty.Value.hasValue() && aProperty.Value.isExtractableTo(
-//                     ::getCppuType( reinterpret_cast<
-//                                    const uno::Sequence< sal_Int32 > * >(0))));
-//         }
         }
     }
     catch( const uno::Exception & ex )
@@ -533,3 +520,5 @@ Sequence< OUString > DataSourceHelper::getRangesFromDataSource( const Reference<
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx
index d442797d8ce1..c50f87468e3f 100755..100644
--- a/chart2/source/tools/DiagramHelper.cxx
+++ b/chart2/source/tools/DiagramHelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -1735,3 +1736,5 @@ bool DiagramHelper::switchDiagramPositioningToExcludingPositioning(
 }
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx
index c8aa400d1be5..4c30cd1d169d 100755..100644
--- a/chart2/source/tools/ErrorBar.cxx
+++ b/chart2/source/tools/ErrorBar.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -357,3 +358,5 @@ IMPLEMENT_FORWARD_XINTERFACE2( ErrorBar, ErrorBar_Base, OPropertySet )
 IMPLEMENT_FORWARD_XTYPEPROVIDER2( ErrorBar, ErrorBar_Base, OPropertySet )
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx b/chart2/source/tools/ExplicitCategoriesProvider.cxx
index a0376aa95d46..3dd034ca8e0d 100755..100644
--- a/chart2/source/tools/ExplicitCategoriesProvider.cxx
+++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -419,7 +420,7 @@ Sequence< OUString > ExplicitCategoriesProvider::getExplicitSimpleCategories(
 struct DatePlusIndexComparator
 {
     inline bool operator() ( const DatePlusIndex& aFirst,
-                             const DatePlusIndex& aSecond )
+                             const DatePlusIndex& aSecond ) const
     {
         return ( aFirst.fValue < aSecond.fValue );
     }
@@ -602,3 +603,5 @@ const std::vector< DatePlusIndex >&  ExplicitCategoriesProvider::getDateCategori
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx
index 495be222b6f4..3bb08f27b1bd 100644
--- a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -196,3 +197,5 @@ OUString ExponentialRegressionCurveCalculator::ImplGetRepresentation(
 }
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/FillProperties.cxx b/chart2/source/tools/FillProperties.cxx
index f95bbfd166e0..5cc2fbc01580 100755..100644
--- a/chart2/source/tools/FillProperties.cxx
+++ b/chart2/source/tools/FillProperties.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -76,15 +77,6 @@ void lcl_AddPropertiesToVector_without_BitmapProperties( ::std::vector< ::com::s
                   | beans::PropertyAttribute::MAYBEVOID
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
-    //optional
-//    rOutProperties.push_back(
-//        Property( C2U( "FillTransparenceGradient" ),
-//                  FillProperties::PROP_FILL_TRANSPARENCE_GRADIENT,
-//                  ::getCppuType( reinterpret_cast< const awt::Gradient * >(0)),
-//                  beans::PropertyAttribute::BOUND
-//                  | beans::PropertyAttribute::MAYBEDEFAULT
-//                  | beans::PropertyAttribute::MAYBEVOID ));
-
     rOutProperties.push_back(
         Property( C2U( "FillGradientName" ),
                   FillProperties::PROP_FILL_GRADIENT_NAME,
@@ -100,15 +92,6 @@ void lcl_AddPropertiesToVector_without_BitmapProperties( ::std::vector< ::com::s
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEVOID ));
 
-    //optional
-//    rOutProperties.push_back(
-//        Property( C2U( "FillGradient" ),
-//                  FillProperties::PROP_FILL_GRADIENT,
-//                  ::getCppuType( reinterpret_cast< const awt::Gradient * >(0)),
-//                  beans::PropertyAttribute::BOUND
-//                  | beans::PropertyAttribute::MAYBEDEFAULT
-//                  | beans::PropertyAttribute::MAYBEVOID ));
-
     rOutProperties.push_back(
         Property( C2U( "FillHatchName" ),
                   FillProperties::PROP_FILL_HATCH_NAME,
@@ -117,15 +100,6 @@ void lcl_AddPropertiesToVector_without_BitmapProperties( ::std::vector< ::com::s
                   | beans::PropertyAttribute::MAYBEVOID
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
-    //optional
-//    rOutProperties.push_back(
-//        Property( C2U( "FillHatch" ),
-//                  FillProperties::PROP_FILL_HATCH,
-//                  ::getCppuType( reinterpret_cast< const drawing::Hatch * >(0)),
-//                  beans::PropertyAttribute::BOUND
-//                  | beans::PropertyAttribute::MAYBEDEFAULT
-//                  | beans::PropertyAttribute::MAYBEVOID ));
-
     //bitmap properties see lcl_AddPropertiesToVector_only_BitmapProperties()
 
     rOutProperties.push_back(
@@ -146,22 +120,6 @@ void lcl_AddPropertiesToVector_only_BitmapProperties( ::std::vector< ::com::sun:
                   | beans::PropertyAttribute::MAYBEVOID
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
-    //optional
-//    rOutProperties.push_back(
-//        Property( C2U( "FillBitmap" ),
-//                  FillProperties::PROP_FILL_BITMAP,
-//                  ::getCppuType( reinterpret_cast< const uno::Reference< awt::XBitmap > * >(0)),
-//                  beans::PropertyAttribute::BOUND
-//                  | beans::PropertyAttribute::MAYBEDEFAULT ));
-
-    //optional
-//    rOutProperties.push_back(
-//        Property( C2U( "FillBitmapURL" ),
-//                  FillProperties::PROP_FILL_BITMAP_URL,
-//                  ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)),
-//                  beans::PropertyAttribute::BOUND
-//                  | beans::PropertyAttribute::MAYBEDEFAULT ));
-
     rOutProperties.push_back(
         Property( C2U( "FillBitmapOffsetX" ),
                   FillProperties::PROP_FILL_BITMAP_OFFSETX,
@@ -274,3 +232,5 @@ void FillProperties::AddDefaultsToMap(
 }
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/FormattedStringHelper.cxx b/chart2/source/tools/FormattedStringHelper.cxx
index c13c87d45931..c31000aed1a0 100644
--- a/chart2/source/tools/FormattedStringHelper.cxx
+++ b/chart2/source/tools/FormattedStringHelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -78,3 +79,4 @@ Sequence< Reference< chart2::XFormattedString > >
 } //namespace chart
 //.............................................................................
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/ImplOPropertySet.cxx b/chart2/source/tools/ImplOPropertySet.cxx
index faf1defd20ac..cb1fc996f5a1 100644
--- a/chart2/source/tools/ImplOPropertySet.cxx
+++ b/chart2/source/tools/ImplOPropertySet.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -205,3 +206,5 @@ void ImplOPropertySet::cloneInterfaceProperties()
 
 } //  namespace impl
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/ImplOPropertySet.hxx b/chart2/source/tools/ImplOPropertySet.hxx
index 505ab598d7da..3062e8427d74 100644
--- a/chart2/source/tools/ImplOPropertySet.hxx
+++ b/chart2/source/tools/ImplOPropertySet.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -94,3 +95,5 @@ private:
 
 // CHART_IMPLOPROPERTYSET_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/InternalData.cxx b/chart2/source/tools/InternalData.cxx
index e9b0cf689768..a272cee7bdd4 100755..100644
--- a/chart2/source/tools/InternalData.cxx
+++ b/chart2/source/tools/InternalData.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,6 +35,7 @@
 #include "macros.hxx"
 
 #include <rtl/math.hxx>
+#include <algorithm>
 
 using ::com::sun::star::uno::Sequence;
 using ::rtl::OUString;
@@ -89,6 +91,13 @@ InternalData::InternalData()
     , m_aColumnLabels( 0 )
 {}
 
+static const double fDefaultData[] = {
+    9.10, 3.20, 4.54,
+    2.40, 8.80, 9.65,
+    3.10, 1.50, 3.70,
+    4.30, 9.02, 6.20
+};
+
 void InternalData::createDefaultData()
 {
     const sal_Int32 nRowCount = 4;
@@ -101,12 +110,6 @@ void InternalData::createDefaultData()
     const OUString aRowName( ::chart::SchResId::getResString( STR_ROW_LABEL ));
     const OUString aColName( ::chart::SchResId::getResString( STR_COLUMN_LABEL ));
 
-    const double fDefaultData[ nSize ] =
-        { 9.10, 3.20, 4.54,
-          2.40, 8.80, 9.65,
-          3.10, 1.50, 3.70,
-          4.30, 9.02, 6.20 };
-
     m_aData.resize( nSize );
     for( sal_Int32 i=0; i<nSize; ++i )
         m_aData[i] = fDefaultData[i];
@@ -122,6 +125,31 @@ void InternalData::createDefaultData()
         lcl_NumberedStringGenerator( aColName, C2U("%COLUMNNUMBER") ));
 }
 
+bool InternalData::isDefaultData()
+{
+
+    if( m_nRowCount == 4 && m_nColumnCount == 3 )
+    {
+        for( sal_Int32 i=0; i<(4*3); ++i )
+            if( m_aData[i] != fDefaultData[i] )
+                return false;
+
+        return true;
+    }
+    return false;
+}
+
+void InternalData::clearDefaultData()
+{
+    if( isDefaultData() )
+    {
+        m_nRowCount = m_nColumnCount = 1;
+        m_aData.resize( 1 );
+        m_aRowLabels.clear();
+        m_aColumnLabels.clear();
+    }
+}
+
 void InternalData::setData( const Sequence< Sequence< double > >& rDataInRows )
 {
     m_nRowCount = rDataInRows.getLength();
@@ -338,7 +366,7 @@ void InternalData::insertColumn( sal_Int32 nAfterIndex )
     if( nAfterIndex < static_cast< sal_Int32 >( m_aColumnLabels.size()))
         m_aColumnLabels.insert( m_aColumnLabels.begin() + (nAfterIndex + 1), vector< uno::Any >(1) );
 
-#if OSL_DEBUG_LEVEL > 2
+#if OSL_DEBUG_LEVEL > 1
     traceData();
 #endif
 }
@@ -390,7 +418,7 @@ void InternalData::insertRow( sal_Int32 nAfterIndex )
     if( nAfterIndex < static_cast< sal_Int32 >( m_aRowLabels.size()))
         m_aRowLabels.insert( m_aRowLabels.begin() + nIndex, vector< uno::Any > (1));
 
-#if OSL_DEBUG_LEVEL > 2
+#if OSL_DEBUG_LEVEL > 1
     traceData();
 #endif
 }
@@ -426,7 +454,7 @@ void InternalData::deleteColumn( sal_Int32 nAtIndex )
     if( nAtIndex < static_cast< sal_Int32 >( m_aColumnLabels.size()))
         m_aColumnLabels.erase( m_aColumnLabels.begin() + nAtIndex );
 
-#if OSL_DEBUG_LEVEL > 2
+#if OSL_DEBUG_LEVEL > 1
     traceData();
 #endif
 }
@@ -466,7 +494,7 @@ void InternalData::deleteRow( sal_Int32 nAtIndex )
     if( nAtIndex < static_cast< sal_Int32 >( m_aRowLabels.size()))
         m_aRowLabels.erase( m_aRowLabels.begin() + nAtIndex );
 
-#if OSL_DEBUG_LEVEL > 2
+#if OSL_DEBUG_LEVEL > 1
     traceData();
 #endif
 }
@@ -511,7 +539,7 @@ vector< vector< uno::Any > > InternalData::getComplexColumnLabels() const
     return m_aColumnLabels;
 }
 
-#if OSL_DEBUG_LEVEL > 2
+#if OSL_DEBUG_LEVEL > 1
 void InternalData::traceData() const
 {
     OSL_TRACE( "InternalData: Data in rows\n" );
@@ -528,3 +556,5 @@ void InternalData::traceData() const
 #endif
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx
index 2d51bd0f7acd..37b06d98c060 100755..100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -297,7 +298,7 @@ public:
             rVector.resize( m_nLevel );
 
         vector< uno::Any >::iterator aIt( rVector.begin() );
-        for( sal_Int32 nN=0; aIt<rVector.end(); aIt++, nN++)
+        for( sal_Int32 nN=0; aIt<rVector.end(); ++aIt, ++nN)
         {
             if( nN==m_nLevel )
                 break;
@@ -319,7 +320,7 @@ public:
     void operator() ( vector< uno::Any >& rVector )
     {
         vector< uno::Any >::iterator aIt( rVector.begin() );
-        for( sal_Int32 nN=0; aIt<rVector.end(); aIt++, nN++)
+        for( sal_Int32 nN=0; aIt<rVector.end(); ++aIt, ++nN)
         {
             if( nN==m_nLevel )
             {
@@ -511,9 +512,79 @@ void InternalDataProvider::lcl_decreaseMapReferences(
 Reference< chart2::data::XDataSequence > InternalDataProvider::lcl_createDataSequenceAndAddToMap(
     const OUString & rRangeRepresentation )
 {
+    OUString aRangeRepresentation = rRangeRepresentation;
+    if( aRangeRepresentation.indexOf('{') >= 0 )
+    {
+        ::std::vector< double > aNewData;
+        ::std::vector< uno::Any > aNewLabels;
+        OUString    aToken;
+        sal_Int32   nCategories     = 0;
+        sal_Int32   nIndex          = 0;
+        bool        bValues         = true;
+        bool        bLabelSet       = false;
+        OUString str = aRangeRepresentation.replace('{',' ').replace('}',' ');
+
+        m_aInternalData.clearDefaultData();
+        sal_Int32 n = m_aInternalData.getColumnCount();
+        if( n )
+            n = n - 1;
+
+        do
+        {
+            // TODO: This will be problematic if ';' is used in label names
+            // '"' character also needs to be considered in such cases
+            aToken = str.getToken(0,';',nIndex);
+            if( !aToken.getLength() )
+                break;
+            if( aToken.indexOf('"') < 0 )
+            {
+                aNewData.push_back( aToken.toDouble() );
+            }
+            else
+            {
+                aNewLabels.push_back( uno::makeAny(aToken.replace('"', ' ').trim()) );
+                if( !nCategories &&
+                   ( !m_aInternalData.getComplexColumnLabel(n).size() ||
+                     !m_aInternalData.getComplexColumnLabel(n).front().hasValue() ) )
+                {
+                    m_aInternalData.setComplexColumnLabel( n,  aNewLabels );
+                    bLabelSet = true;
+                }
+                else
+                {
+                    m_aInternalData.setComplexRowLabel(nCategories, aNewLabels);
+                    if(nCategories==1 && bLabelSet)
+                    {
+                        ::std::vector< uno::Any > aLabels;
+                        m_aInternalData.setComplexRowLabel( 0, m_aInternalData.getComplexColumnLabel( n ) );
+                        m_aInternalData.setComplexColumnLabel( n, aLabels );
+                    }
+                }
+                aNewLabels.pop_back();
+                nCategories++;
+                bValues = false;
+            }
+        } while( nIndex >= 0 );
+
+        if( bValues )
+        {
+            m_aInternalData.insertColumn( n );
+            m_aInternalData.setColumnValues( n, aNewData );
+            aRangeRepresentation = OUString::valueOf( n );
+        }
+        else if( nCategories > 1 )
+        {
+            aRangeRepresentation = lcl_aCategoriesRangeName;
+        }
+        else
+        {
+            aRangeRepresentation = lcl_aLabelRangePrefix+OUString::valueOf( n );
+        }
+    }
+
     Reference< chart2::data::XDataSequence > xSeq(
-        new UncachedDataSequence( this, rRangeRepresentation ));
-    lcl_addDataSequenceToMap( rRangeRepresentation, xSeq );
+        new UncachedDataSequence( this, aRangeRepresentation ));
+    lcl_addDataSequenceToMap( aRangeRepresentation, xSeq );
     return xSeq;
 }
 
@@ -708,8 +779,7 @@ Reference< chart2::data::XDataSequence > SAL_CALL InternalDataProvider::createDa
     else if( aRangeRepresentation.getLength())
     {
         // data
-        sal_Int32 nIndex = aRangeRepresentation.toInt32();
-        return lcl_createDataSequenceAndAddToMap( OUString::valueOf( nIndex ));
+        return lcl_createDataSequenceAndAddToMap( aRangeRepresentation );
     }
 
     return Reference< chart2::data::XDataSequence >();
@@ -1425,3 +1495,5 @@ Sequence< OUString > InternalDataProvider::getSupportedServiceNames_Static()
 APPHELPER_XSERVICEINFO_IMPL( InternalDataProvider, lcl_aServiceName );
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/LabeledDataSequence.cxx b/chart2/source/tools/LabeledDataSequence.cxx
index 21ade3aefadc..971e281cc81b 100644
--- a/chart2/source/tools/LabeledDataSequence.cxx
+++ b/chart2/source/tools/LabeledDataSequence.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -177,3 +178,5 @@ APPHELPER_XSERVICEINFO_IMPL( LabeledDataSequence,
 // ================================================================================
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/LegendHelper.cxx b/chart2/source/tools/LegendHelper.cxx
index aceb033b7919..886572dca58e 100755..100644
--- a/chart2/source/tools/LegendHelper.cxx
+++ b/chart2/source/tools/LegendHelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -112,7 +113,7 @@ uno::Reference< chart2::XLegend > LegendHelper::getLegend(
             }
             else if(bCreate)
             {
-                DBG_ERROR("need diagram for creation of legend");
+                OSL_FAIL("need diagram for creation of legend");
             }
         }
         catch( uno::Exception & ex )
@@ -141,3 +142,4 @@ bool LegendHelper::hasLegend( const uno::Reference< chart2::XDiagram > & xDiagra
 } //namespace chart
 //.............................................................................
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/LifeTime.cxx b/chart2/source/tools/LifeTime.cxx
index 444e894a101d..ca24a6558edb 100644
--- a/chart2/source/tools/LifeTime.cxx
+++ b/chart2/source/tools/LifeTime.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -68,7 +69,7 @@ bool LifeTimeManager::impl_isDisposed( bool bAssert )
     {
         if( bAssert )
         {
-            OSL_ENSURE( sal_False, "This component is already disposed " );
+            OSL_FAIL( "This component is already disposed " );
             (void)(bAssert);
         }
         return sal_True;
@@ -197,7 +198,7 @@ bool CloseableLifeTimeManager::impl_isDisposedOrClosed( bool bAssert )
     {
         if( bAssert )
         {
-            OSL_ENSURE( sal_False, "This object is already closed" );
+            OSL_FAIL( "This object is already closed" );
             (void)(bAssert);//avoid warnings
         }
         return sal_True;
@@ -246,7 +247,6 @@ bool CloseableLifeTimeManager::impl_isDisposedOrClosed( bool bAssert )
                         ::getCppuType((const uno::Reference< util::XCloseListener >*)0) );;
             if( pIC )
             {
-                //lang::EventObject aEvent( static_cast< util::XCloseable*>(xCloseable) );
                 lang::EventObject aEvent( xCloseable );
                 ::cppu::OInterfaceIteratorHelper aIt( *pIC );
                 while( aIt.hasMoreElements() )
@@ -375,7 +375,6 @@ bool CloseableLifeTimeManager::impl_isDisposedOrClosed( bool bAssert )
                         ::getCppuType((const uno::Reference< util::XCloseListener >*)0) );;
             if( pIC )
             {
-                //lang::EventObject aEvent( static_cast< util::XCloseable*>(xCloseable) );
                 lang::EventObject aEvent( xCloseable );
                 ::cppu::OInterfaceIteratorHelper aIt( *pIC );
                 while( aIt.hasMoreElements() )
@@ -491,56 +490,6 @@ LifeTimeGuard::~LifeTimeGuard()
     }
 }
 
-/*
-the XCloseable::close method has to be implemented in the following way:
-::close
-{
-    //hold no mutex
-
-    if( !m_aLifeTimeManager.g_close_startTryClose( bDeliverOwnership ) )
-        return;
-    //no mutex is acquired
-
-    // At the end of this method may we must dispose ourself ...
-    // and may nobody from outside hold a reference to us ...
-    // then it's a good idea to do that by ourself.
-    uno::Reference< uno::XInterface > xSelfHold( static_cast< ::cppu::OWeakObject* >(this) );
-
-    //the listeners have had no veto
-    //check wether we self can close
-    {
-        util::CloseVetoException aVetoException = util::CloseVetoException(
-                        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
-                        "the model itself could not be closed" ) )
-                        , static_cast< ::cppu::OWeakObject* >(this));
-
-        if( m_aLifeTimeManager.g_close_isNeedToCancelLongLastingCalls( bDeliverOwnership, aVetoException ) )
-        {
-            ////you can empty this block, if you never start longlasting calls or
-            ////if your longlasting calls are per default not cancelable (check how you have constructed your LifeTimeManager)
-
-            sal_Bool bLongLastingCallsAreCanceled = sal_False;
-            try
-            {
-                //try to cancel running longlasting calls
-                //// @todo
-            }
-            catch( uno::Exception& ex )
-            {
-                //// @todo
-                //do not throw anything here!! (without endTryClose)
-            }
-            //if not successful canceled
-            if(!bLongLastingCallsAreCanceled)
-            {
-                m_aLifeTimeManager.g_close_endTryClose( bDeliverOwnership, sal_True );
-                throw aVetoException;
-            }
-        }
-
-    }
-    m_aLifeTimeManager.g_close_endTryClose_doClose();
-}
-*/
-
 }//end namespace apphelper
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/LineProperties.cxx b/chart2/source/tools/LineProperties.cxx
index 889efb029103..136f6e684e0d 100755..100644
--- a/chart2/source/tools/LineProperties.cxx
+++ b/chart2/source/tools/LineProperties.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -180,3 +181,5 @@ void LineProperties::SetLineInvisible( const ::com::sun::star::uno::Reference<
 }
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/LinearRegressionCurveCalculator.cxx b/chart2/source/tools/LinearRegressionCurveCalculator.cxx
index 7a372cff4f51..892d55892d0e 100644
--- a/chart2/source/tools/LinearRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/LinearRegressionCurveCalculator.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -177,3 +178,5 @@ OUString LinearRegressionCurveCalculator::ImplGetRepresentation(
 }
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx
index c7c2db60431c..01259515159b 100644
--- a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -189,3 +190,5 @@ OUString LogarithmicRegressionCurveCalculator::ImplGetRepresentation(
 }
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx
index 8277a5830b0a..7c541397e4be 100644
--- a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -141,3 +142,5 @@ OUString MeanValueRegressionCurveCalculator::ImplGetRepresentation(
 }
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/MediaDescriptorHelper.cxx b/chart2/source/tools/MediaDescriptorHelper.cxx
index 687bc203a84f..16d769105852 100644
--- a/chart2/source/tools/MediaDescriptorHelper.cxx
+++ b/chart2/source/tools/MediaDescriptorHelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,7 +40,7 @@ const short FLAG_DEPRECATED =1;
 const short FLAG_MODEL      =2;
 
 #define WRITE_PROPERTY( MediaName, nFlags )             \
-if(rProp.Name.equals(::rtl::OUString::createFromAscii(#MediaName))) \
+if(rProp.Name.equals(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(#MediaName)))) \
 {                                                       \
     if( rProp.Value >>= MediaName )                     \
         ISSET_##MediaName = sal_True;                   \
@@ -219,3 +220,5 @@ MediaDescriptorHelper::~MediaDescriptorHelper()
     return m_aModelProperties;
 }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/ModifyListenerCallBack.cxx b/chart2/source/tools/ModifyListenerCallBack.cxx
index ae13b65c39c2..df3c81ce36e7 100644
--- a/chart2/source/tools/ModifyListenerCallBack.cxx
+++ b/chart2/source/tools/ModifyListenerCallBack.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -132,3 +133,4 @@ void ModifyListenerCallBack::stopListening()
 
 } // namespace chart
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/ModifyListenerHelper.cxx b/chart2/source/tools/ModifyListenerHelper.cxx
index 7ac5a2786cef..350731d338ea 100644
--- a/chart2/source/tools/ModifyListenerHelper.cxx
+++ b/chart2/source/tools/ModifyListenerHelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -211,3 +212,5 @@ void SAL_CALL ModifyEventForwarder::disposing()
 
 } //  namespace ModifyListenerHelper
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/MutexContainer.cxx b/chart2/source/tools/MutexContainer.cxx
index 4fbb14674cdb..a042cf97aef5 100644
--- a/chart2/source/tools/MutexContainer.cxx
+++ b/chart2/source/tools/MutexContainer.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -41,3 +42,5 @@ MutexContainer::~MutexContainer()
 }
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/NameContainer.cxx b/chart2/source/tools/NameContainer.cxx
index 05169c4608f9..44df1fd64c18 100644
--- a/chart2/source/tools/NameContainer.cxx
+++ b/chart2/source/tools/NameContainer.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -153,7 +154,7 @@ Sequence< OUString > SAL_CALL NameContainer::getElementNames()
     sal_Int32 nCount = m_aMap.size();
     Sequence< OUString > aSeq(nCount);
     sal_Int32 nN = 0;
-    for( tContentMap::iterator aIter = m_aMap.begin(); aIter != m_aMap.end(), nN < nCount; aIter++, nN++ )
+    for( tContentMap::iterator aIter = m_aMap.begin(); aIter != m_aMap.end(), nN < nCount; ++aIter, ++nN )
         aSeq[nN]=aIter->first;
     return aSeq;
 }
@@ -187,3 +188,5 @@ uno::Reference< util::XCloneable > SAL_CALL NameContainer::createClone()
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/NamedFillProperties.cxx b/chart2/source/tools/NamedFillProperties.cxx
deleted file mode 100755
index de9cffde7897..000000000000
--- a/chart2/source/tools/NamedFillProperties.cxx
+++ /dev/null
@@ -1,113 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
-
-#include "NamedFillProperties.hxx"
-#include "macros.hxx"
-#include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/awt/Gradient.hpp>
-#include <com/sun/star/drawing/Hatch.hpp>
-#include <com/sun/star/chart2/FillBitmap.hpp>
-
-using namespace ::com::sun::star;
-
-using ::com::sun::star::beans::Property;
-using ::rtl::OUString;
-
-namespace chart
-{
-
-void NamedFillProperties::AddPropertiesToVector(
-    ::std::vector< Property > & rOutProperties )
-{
-    const uno::Type tCppuTypeString = ::getCppuType( reinterpret_cast< const OUString * >(0));
-
-    // Fill Properties
-    // ---------------
-
-    //optional property:
-    rOutProperties.push_back(
-        Property( C2U( "FillTransparenceGradient" ),
-                  PROP_FILL_TRANSPARENCE_GRADIENT,
-                  ::getCppuType( reinterpret_cast< const awt::Gradient * >(0)),
-                  beans::PropertyAttribute::BOUND
-                  | beans::PropertyAttribute::MAYBEDEFAULT
-                  | beans::PropertyAttribute::MAYBEVOID ));
-
-    //optional property:
-    rOutProperties.push_back(
-        Property( C2U( "FillGradient" ),
-                  PROP_FILL_GRADIENT,
-                  ::getCppuType( reinterpret_cast< const awt::Gradient * >(0)),
-                  beans::PropertyAttribute::BOUND
-                  | beans::PropertyAttribute::MAYBEDEFAULT
-                  | beans::PropertyAttribute::MAYBEVOID ));
-
-    //optional property:
-    rOutProperties.push_back(
-        Property( C2U( "FillHatch" ),
-                  PROP_FILL_HATCH,
-                  ::getCppuType( reinterpret_cast< const drawing::Hatch * >(0)),
-                  beans::PropertyAttribute::BOUND
-                  | beans::PropertyAttribute::MAYBEDEFAULT
-                  | beans::PropertyAttribute::MAYBEVOID ));
-
-    //optional property:
-    rOutProperties.push_back(
-        Property( C2U( "FillBitmapURL" ),
-                  PROP_FILL_BITMAP,
-                  ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)),
-                  beans::PropertyAttribute::BOUND
-                  | beans::PropertyAttribute::MAYBEDEFAULT
-                  | beans::PropertyAttribute::MAYBEVOID ));
-}
-
-void NamedFillProperties::AddDefaultsToMap(
-    ::chart::tPropertyValueMap & rOutMap )
-{
-}
-
-OUString NamedFillProperties::GetPropertyNameForHandle( sal_Int32 nHandle )
-{
-    //will return e.g. "FillGradientName" for PROP_FILL_GRADIENT_NAME
-    switch( nHandle )
-    {
-        case PROP_FILL_GRADIENT_NAME:
-            return C2U( "FillGradientName" );
-        case PROP_FILL_HATCH_NAME:
-            return C2U( "FillHatchName" );
-        case PROP_FILL_BITMAP_NAME:
-            return C2U( "FillBitmapName" );
-        case PROP_FILL_TRANSPARENCY_GRADIENT_NAME:
-            return C2U( "FillTransparenceGradientName" );
-    }
-    return OUString();
-}
-
-} //  namespace chart
diff --git a/chart2/source/tools/NamedLineProperties.cxx b/chart2/source/tools/NamedLineProperties.cxx
deleted file mode 100755
index 3379b3804e52..000000000000
--- a/chart2/source/tools/NamedLineProperties.cxx
+++ /dev/null
@@ -1,98 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
-
-#include "NamedLineProperties.hxx"
-#include "macros.hxx"
-#include <com/sun/star/beans/PropertyAttribute.hpp>
-
-using namespace ::com::sun::star;
-
-using ::com::sun::star::beans::Property;
-using ::rtl::OUString;
-
-namespace chart
-{
-
-// @deprecated !!
-void NamedLineProperties::AddPropertiesToVector(
-    ::std::vector< Property > & rOutProperties )
-{
-    const uno::Type tCppuTypeString = ::getCppuType( reinterpret_cast< const OUString * >(0));
-
-    // Line Properties
-    // ---------------
-    rOutProperties.push_back(
-        Property( C2U( "LineDash" ),
-                  PROP_LINE_DASH,
-                  ::getCppuType( reinterpret_cast< const drawing::LineDash * >(0)),
-                  beans::PropertyAttribute::BOUND
-                  | beans::PropertyAttribute::MAYBEVOID ));
-
-    if( bIncludeLineEnds )
-    {
-        rOutProperties.push_back(
-            Property( C2U( "LineStartName" ),
-                      PROP_LINE_START_NAME,
-                      tCppuTypeString,
-                      beans::PropertyAttribute::BOUND
-                      | beans::PropertyAttribute::MAYBEDEFAULT
-                      | beans::PropertyAttribute::MAYBEVOID ));
-
-        rOutProperties.push_back(
-            Property( C2U( "LineEndName" ),
-                      PROP_LINE_END_NAME,
-                      tCppuTypeString,
-                      beans::PropertyAttribute::BOUND
-                      | beans::PropertyAttribute::MAYBEDEFAULT
-                      | beans::PropertyAttribute::MAYBEVOID ));
-    }
-}
-
-void NamedLineProperties::AddDefaultsToMap(
-    ::chart::tPropertyValueMap & rOutMap,
-    bool bIncludeLineEnds /* = false */ )
-{
-}
-
-OUString NamedLineProperties::GetPropertyNameForHandle( sal_Int32 nHandle )
-{
-    //will return e.g. "LineDashName" for PROP_LINE_DASH_NAME
-    switch( nHandle )
-    {
-        case PROP_LINE_DASH_NAME:
-            return C2U( "LineDashName" );
-        case PROP_LINE_START_NAME:
-        case PROP_LINE_END_NAME:
-            break;
-    }
-    return OUString();
-}
-
-} //  namespace chart
diff --git a/chart2/source/tools/NamedProperties.cxx b/chart2/source/tools/NamedProperties.cxx
deleted file mode 100755
index 5a4e0b2d16da..000000000000
--- a/chart2/source/tools/NamedProperties.cxx
+++ /dev/null
@@ -1,58 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
-
-#include "NamedProperties.hxx"
-#include "macros.hxx"
-#include <com/sun/star/beans/PropertyAttribute.hpp>
-
-using namespace ::com::sun::star;
-
-using ::com::sun::star::beans::Property;
-using ::rtl::OUString;
-
-namespace chart
-{
-
-void NamedProperties::AddPropertiesToVector(
-    ::std::vector< Property > & rOutProperties )
-{
-    NamedFillProperties::AddPropertiesToVector( rOutProperties );
-    NamedLineProperties::AddPropertiesToVector( rOutProperties );
-}
-
-OUString NamedProperties::GetPropertyNameForHandle( sal_Int32 nHandle )
-{
-    OUString aName = NamedFillProperties::GetPropertyNameForHandle( nHandle );
-    if( !aName.getLength() )
-        aName = NamedLineProperties::GetPropertyNameForHandle( nHandle );
-    return aName;
-}
-
-} //  namespace chart
diff --git a/chart2/source/tools/NumberFormatterWrapper.cxx b/chart2/source/tools/NumberFormatterWrapper.cxx
index c4711a4da8be..f408f943bbce 100755..100644
--- a/chart2/source/tools/NumberFormatterWrapper.cxx
+++ b/chart2/source/tools/NumberFormatterWrapper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -36,7 +37,6 @@
 #include <svl/zformat.hxx>
 #include <tools/color.hxx>
 #include <i18npool/mslangid.hxx>
-#include <tools/debug.hxx>
 #include <com/sun/star/util/DateTime.hpp>
 
 //.............................................................................
@@ -57,15 +57,6 @@ FixedNumberFormatter::~FixedNumberFormatter()
 {
 }
 
-/*
-sal_Int32 FixedNumberFormatter::getTextAndColor( double fUnscaledValueForText, rtl::OUString& rLabel ) const
-{
-    sal_Int32 nLabelColor = Color(COL_BLUE).GetColor(); //@todo get this from somewheres
-    rLabel = getFormattedString( fUnscaledValueForText, nLabelColor );
-    return nLabelColor;
-}
-*/
-
 rtl::OUString FixedNumberFormatter::getFormattedString( double fValue, sal_Int32& rLabelColor, bool& rbColorChanged ) const
 {
     return m_aNumberFormatterWrapper.getFormattedString(
@@ -88,7 +79,7 @@ NumberFormatterWrapper::NumberFormatterWrapper( const uno::Reference< util::XNum
     SvNumberFormatsSupplierObj* pSupplierObj = SvNumberFormatsSupplierObj::getImplementation( xSupplier );
     if( pSupplierObj )
         m_pNumberFormatter = pSupplierObj->GetNumberFormatter();
-    DBG_ASSERT(m_pNumberFormatter,"need a numberformatter");
+    OSL_POSTCOND(m_pNumberFormatter,"need a numberformatter");
 }
 
 NumberFormatterWrapper::~NumberFormatterWrapper()
@@ -126,7 +117,7 @@ rtl::OUString NumberFormatterWrapper::getFormattedString(
     Color* pTextColor = NULL;
     if( !m_pNumberFormatter )
     {
-        DBG_ERROR("Need a NumberFormatter");
+        OSL_FAIL("Need a NumberFormatter");
         return aText;
     }
     // i99104 handle null date correctly
@@ -163,26 +154,8 @@ rtl::OUString NumberFormatterWrapper::getFormattedString(
     return aRet;
 }
 
-// to get the language type use MsLangId::convertLocaleToLanguage( rNumberFormat.aLocale )
-
-/*
-    uno::Reference< i18n::XNumberFormatCode > xNumberFormatCode(
-        m_xCC->getServiceManager()->createInstanceWithContext( C2U(
-        "com.sun.star.i18n.NumberFormatMapper" ), m_xCC ), uno::UNO_QUERY );
-
-    i18n::NumberFormatCode aNumberFormatCode = xNumberFormatCode->getDefault (
-        i18n::KNumberFormatType::MEDIUM,
-        i18n::KNumberFormatUsage::SCIENTIFIC_NUMBER,
-        aLocale );
-
-    uno::Sequence< i18n::NumberFormatCode > aListOfNumberFormatCode = xNumberFormatCode->getAllFormatCode(
-        i18n::KNumberFormatUsage::SCIENTIFIC_NUMBER,
-        aLocale );
-
-    i18n::NumberFormatCode aNumberFormatCode0 = aListOfNumberFormatCode[0];
-    i18n::NumberFormatCode aNumberFormatCode1 = aListOfNumberFormatCode[1];
-*/
-
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/OPropertySet.cxx b/chart2/source/tools/OPropertySet.cxx
index a1caac803dd7..a3db3d0b45e1 100644
--- a/chart2/source/tools/OPropertySet.cxx
+++ b/chart2/source/tools/OPropertySet.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,8 +31,8 @@
 #include "OPropertySet.hxx"
 #include "ImplOPropertySet.hxx"
 #include "ContainerHelper.hxx"
-#include <rtl/uuid.h>
 #include <cppuhelper/queryinterface.hxx>
+#include <comphelper/servicehelper.hxx>
 
 #include <vector>
 #include <algorithm>
@@ -39,7 +40,6 @@
 using namespace ::com::sun::star;
 
 using ::com::sun::star::style::XStyleSupplier;
-// using ::com::sun::star::beans::XFastPropertyState;
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
@@ -72,11 +72,9 @@ OPropertySet::OPropertySet( const OPropertySet & rOther, ::osl::Mutex & par_rMut
         m_rMutex( par_rMutex ),
         m_bSetNewValuesExplicitlyEvenIfTheyEqualDefault(false)
 {
-    // /--
     MutexGuard aGuard( m_rMutex );
     if( rOther.m_pImplProperties.get())
         m_pImplProperties.reset( new impl::ImplOPropertySet( * rOther.m_pImplProperties.get()));
-    // \--
 }
 
 void OPropertySet::SetNewValuesExplicitlyEvenIfTheyEqualDefault()
@@ -97,10 +95,6 @@ Any SAL_CALL OPropertySet::queryInterface( const uno::Type& aType )
 {
     return ::cppu::queryInterface(
         aType,
-//         static_cast< uno::XInterface * >(
-//             static_cast< uno::XWeak * >( this )),
-//         static_cast< uno::XWeak * >( this ),
-//         static_cast< lang::XServiceInfo * >( this ),
         static_cast< lang::XTypeProvider * >( this ),
         static_cast< beans::XPropertySet * >( this ),
         static_cast< beans::XMultiPropertySet * >( this ),
@@ -108,45 +102,8 @@ Any SAL_CALL OPropertySet::queryInterface( const uno::Type& aType )
         static_cast< beans::XPropertyState * >( this ),
         static_cast< beans::XMultiPropertyStates * >( this ),
         static_cast< XStyleSupplier * >( this ) );
-//         static_cast< XFastPropertyState * >( this ) );
 }
 
-// void SAL_CALL OPropertySet::acquire() throw ()
-// {
-//     OWeakObject::acquire();
-// }
-
-// void SAL_CALL OPropertySet::release() throw ()
-// {
-//     OWeakObject::release();
-// }
-
-
-// ____ XServiceInfo ____
-// OUString SAL_CALL
-//     OPropertySet::getImplementationName()
-//     throw (uno::RuntimeException)
-// {
-//     return OUString( RTL_CONSTASCII_USTRINGPARAM( "property::OPropertySet" ));
-// }
-
-// sal_Bool SAL_CALL
-//     OPropertySet::supportsService( const OUString& ServiceName )
-//     throw (uno::RuntimeException)
-// {
-//     return ( 0 == ServiceName.reverseCompareToAsciiL(
-//                  RTL_CONSTASCII_STRINGPARAM( "com.sun.star.beans.PropertySet" )));
-// }
-
-// Sequence< OUString > SAL_CALL
-//     OPropertySet::getSupportedServiceNames()
-//     throw (uno::RuntimeException)
-// {
-//     Sequence< OUString > aServiceNames( 1 );
-//     aServiceNames[ 0 ] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.beans.PropertySet" ));
-//     return aServiceNames;
-// }
-
 #define LCL_PROP_CPPUTYPE(t) (::getCppuType( reinterpret_cast< const Reference<t> *>(0)))
 
 // // ____ XTypeProvider ____
@@ -156,15 +113,12 @@ Sequence< uno::Type > SAL_CALL
 {
     static Sequence< uno::Type > aTypeList;
 
-    // /--
     MutexGuard aGuard( m_rMutex );
 
     if( aTypeList.getLength() == 0 )
     {
         ::std::vector< uno::Type > aTypes;
 
-//         aTypes.push_back( LCL_PROP_CPPUTYPE( uno::XWeak ));
-//         aTypes.push_back( LCL_PROP_CPPUTYPE( lang::XServiceInfo ));
         aTypes.push_back( LCL_PROP_CPPUTYPE( lang::XTypeProvider ));
         aTypes.push_back( LCL_PROP_CPPUTYPE( beans::XPropertySet ));
         aTypes.push_back( LCL_PROP_CPPUTYPE( beans::XMultiPropertySet ));
@@ -172,29 +126,25 @@ Sequence< uno::Type > SAL_CALL
         aTypes.push_back( LCL_PROP_CPPUTYPE( beans::XPropertyState ));
         aTypes.push_back( LCL_PROP_CPPUTYPE( beans::XMultiPropertyStates ));
         aTypes.push_back( LCL_PROP_CPPUTYPE( XStyleSupplier ));
-//         aTypes.push_back( LCL_PROP_CPPUTYPE( XFastPropertyState ));
 
         aTypeList = ::chart::ContainerHelper::ContainerToSequence( aTypes );
     }
 
     return aTypeList;
-    // \--
+}
+
+namespace
+{
+    class theOPropertySetImplementationId : public rtl::Static< UnoTunnelIdInit, theOPropertySetImplementationId > {};
 }
 
 Sequence< sal_Int8 > SAL_CALL
     OPropertySet::getImplementationId()
     throw (uno::RuntimeException)
 {
-    static uno::Sequence< sal_Int8 > aId;
-    if( aId.getLength() == 0 )
-    {
-        aId.realloc( 16 );
-        rtl_createUuid( (sal_uInt8 *)aId.getArray(), 0, sal_True );
-    }
-    return aId;
+    return theOPropertySetImplementationId::get().getSeq();
 }
 
-
 // ____ XPropertyState ____
 beans::PropertyState SAL_CALL
     OPropertySet::getPropertyState( const OUString& PropertyName )
@@ -352,7 +302,7 @@ void SAL_CALL OPropertySet::setFastPropertyValue_NoBroadcast
     {
         aDefault = GetDefaultValue( nHandle );
     }
-    catch( beans::UnknownPropertyException ex )
+    catch( beans::UnknownPropertyException& )
     {
         aDefault.clear();
     }
@@ -369,7 +319,6 @@ void SAL_CALL OPropertySet::getFastPropertyValue
 {
     if( ! m_pImplProperties->GetPropertyValueByHandle( rValue, nHandle ))
     {
-//         OSL_TRACE( "OPropertySet: asking style for property" );
         // property was not set -> try style
         uno::Reference< beans::XFastPropertySet > xStylePropSet( m_pImplProperties->GetStyle(), uno::UNO_QUERY );
         if( xStylePropSet.is() )
@@ -414,28 +363,27 @@ void SAL_CALL OPropertySet::getFastPropertyValue
                         }
                         else
                         {
-                            OSL_ENSURE( false,  "HandleCheck: Handle not found in Style" );
+                            OSL_FAIL(  "HandleCheck: Handle not found in Style" );
                         }
                     }
                     else
-                        OSL_ENSURE( false, "HandleCheck: Invalid XPropertySetInfo returned" );
+                        OSL_FAIL( "HandleCheck: Invalid XPropertySetInfo returned" );
                 }
                 else
-                    OSL_ENSURE( false, "HandleCheck: XPropertySet not supported" );
+                    OSL_FAIL( "HandleCheck: XPropertySet not supported" );
             }
 #endif
             rValue = xStylePropSet->getFastPropertyValue( nHandle );
         }
         else
         {
-//             OSL_TRACE( "OPropertySet: no style => getting default for property" );
             // there is no style (or the style does not support XFastPropertySet)
             // => take the default value
             try
             {
                 rValue = GetDefaultValue( nHandle );
             }
-            catch( beans::UnknownPropertyException ex )
+            catch( beans::UnknownPropertyException& )
             {
                 rValue.clear();
             }
@@ -466,41 +414,6 @@ void SAL_CALL OPropertySet::setStyle( const Reference< style::XStyle >& xStyle )
             0 );
 }
 
-// ____ XFastPropertyState ____
-// beans::PropertyState OPropertySet::SAL_CALL getFastPropertyState( sal_Int32 nHandle )
-//     throw (beans::UnknownPropertyException,
-//            uno::RuntimeException)
-// {
-//     return m_pImplProperties->GetPropertyStateByHandle( nHandle );
-// }
-
-// uno::Sequence< beans::PropertyState > OPropertySet::SAL_CALL getFastPropertyStates(
-//     const uno::Sequence< sal_Int32 >& aHandles )
-//     throw (beans::UnknownPropertyException,
-//            uno::RuntimeException)
-// {
-//     ::std::vector< sal_Int32 > aHandleVec(
-//         aHandles.getConstArray(),
-//         aHandles.getConstArray() + aHandles.getLength() );
-
-//     return m_pImplProperties->GetPropertyStatesByHandle( aHandleVec );
-// }
-
-// void OPropertySet::SAL_CALL setFastPropertyToDefault( sal_Int32 nHandle )
-//     throw (beans::UnknownPropertyException,
-//            uno::RuntimeException)
-// {
-//     m_pImplProperties->SetPropertyToDefault( nHandle );
-// }
-
-// uno::Any OPropertySet::SAL_CALL getFastPropertyDefault( sal_Int32 nHandle )
-//     throw (beans::UnknownPropertyException,
-//            lang::WrappedTargetException,
-//            uno::RuntimeException)
-// {
-//     return GetDefaultValue( nHandle );
-// }
-
 // ____ XMultiPropertySet ____
 void SAL_CALL OPropertySet::setPropertyValues(
     const Sequence< OUString >& PropertyNames, const Sequence< Any >& Values )
@@ -528,3 +441,5 @@ void SAL_CALL OPropertySet::setFastPropertyValue( sal_Int32 nHandle, const Any&
 
 
 } //  namespace property
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx
index accbdd27bfa8..3e8c2baa9659 100755..100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -417,7 +418,7 @@ OUString ObjectIdentifier::createClassifiedIdentifierForObject(
     }
     else
     {
-        DBG_ASSERT(false,"give object could not be identifed in createClassifiedIdentifierForObject");
+        OSL_FAIL("give object could not be identifed in createClassifiedIdentifierForObject");
     }
 
     return aRet;
@@ -1450,3 +1451,5 @@ Any ObjectIdentifier::getAny() const
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx
index b1d10424b9a1..f6a814f2c400 100644
--- a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -175,3 +176,5 @@ OUString PotentialRegressionCurveCalculator::ImplGetRepresentation(
 }
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/PropertyHelper.cxx b/chart2/source/tools/PropertyHelper.cxx
index dd0a1ad6cf2f..863fca8bcbc3 100644
--- a/chart2/source/tools/PropertyHelper.cxx
+++ b/chart2/source/tools/PropertyHelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -312,3 +313,5 @@ void setEmptyPropertyValueDefault( tPropertyValueMap & rOutMap, tPropertyValueMa
 } // namespace PropertyHelper
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/RangeHighlighter.cxx b/chart2/source/tools/RangeHighlighter.cxx
index 1565344923b1..4e0a2e7404e2 100644
--- a/chart2/source/tools/RangeHighlighter.cxx
+++ b/chart2/source/tools/RangeHighlighter.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -215,12 +216,14 @@ void RangeHighlighter::fillRangesForDiagram( const Reference< chart2::XDiagram >
 
 void RangeHighlighter::fillRangesForDataSeries( const uno::Reference< chart2::XDataSeries > & xSeries )
 {
-    sal_Int32 nPreferredColor = PREFERED_DEFAULT_COLOR;
     Reference< chart2::data::XDataSource > xSource( xSeries, uno::UNO_QUERY );
     if( xSource.is())
+    {
+        sal_Int32 nPreferredColor = PREFERED_DEFAULT_COLOR;
         lcl_fillRanges( m_aSelectedRanges,
                         ::chart::DataSourceHelper::getRangesFromDataSource( xSource ),
                         nPreferredColor );
+    }
 }
 
 void RangeHighlighter::fillRangesForErrorBars(
@@ -244,12 +247,14 @@ void RangeHighlighter::fillRangesForErrorBars(
 
     if( bUsesRangesAsErrorBars )
     {
-        sal_Int32 nPreferredColor = PREFERED_DEFAULT_COLOR;
         Reference< chart2::data::XDataSource > xSource( xErrorBar, uno::UNO_QUERY );
         if( xSource.is())
+        {
+            sal_Int32 nPreferredColor = PREFERED_DEFAULT_COLOR;
             lcl_fillRanges( m_aSelectedRanges,
                             ::chart::DataSourceHelper::getRangesFromDataSource( xSource ),
                             nPreferredColor );
+        }
     }
     else
     {
@@ -268,12 +273,12 @@ void RangeHighlighter::fillRangesForCategories( const Reference< chart2::XAxis >
 
 void RangeHighlighter::fillRangesForDataPoint( const Reference< uno::XInterface > & xDataSeries, sal_Int32 nIndex )
 {
-    sal_Int32 nPreferredColor = PREFERED_DEFAULT_COLOR;
     if( xDataSeries.is())
     {
         Reference< chart2::data::XDataSource > xSource( xDataSeries, uno::UNO_QUERY );
         if( xSource.is() )
         {
+            sal_Int32 nPreferredColor = PREFERED_DEFAULT_COLOR;
             ::std::vector< chart2::data::HighlightedRange > aHilightedRanges;
             Sequence< Reference< chart2::data::XLabeledDataSequence > > aLSeqSeq( xSource->getDataSequences());
             for( sal_Int32 i=0; i<aLSeqSeq.getLength(); ++i )
@@ -404,3 +409,5 @@ void SAL_CALL RangeHighlighter::disposing()
 }
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/ReferenceSizeProvider.cxx b/chart2/source/tools/ReferenceSizeProvider.cxx
index 5a37f4980323..909eaf61942c 100644
--- a/chart2/source/tools/ReferenceSizeProvider.cxx
+++ b/chart2/source/tools/ReferenceSizeProvider.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -376,3 +377,5 @@ void ReferenceSizeProvider::setAutoResizeState( ReferenceSizeProvider::AutoResiz
 }
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/RegressionCalculationHelper.hxx b/chart2/source/tools/RegressionCalculationHelper.hxx
index df407482b34d..ab634dec0297 100644
--- a/chart2/source/tools/RegressionCalculationHelper.hxx
+++ b/chart2/source/tools/RegressionCalculationHelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -129,3 +130,5 @@ public:
 
 // CHART2_REGRESSIONCALCULATIONHELPER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/RegressionCurveCalculator.cxx b/chart2/source/tools/RegressionCurveCalculator.cxx
index a3d43d2a3d03..b8814fcb2fe1 100755..100644
--- a/chart2/source/tools/RegressionCurveCalculator.cxx
+++ b/chart2/source/tools/RegressionCurveCalculator.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -164,3 +165,5 @@ OUString SAL_CALL RegressionCurveCalculator::getFormattedRepresentation(
 
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/RegressionCurveHelper.cxx b/chart2/source/tools/RegressionCurveHelper.cxx
index 0d5ceb36199a..38d124af11ca 100755..100644
--- a/chart2/source/tools/RegressionCurveHelper.cxx
+++ b/chart2/source/tools/RegressionCurveHelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -75,7 +76,7 @@ OUString lcl_getServiceNameForType( ::chart::RegressionCurveHelper::tRegressionT
             aServiceName = C2U( "com.sun.star.chart2.PotentialRegressionCurve" );
             break;
         default:
-            OSL_ENSURE(false,"unknown regression curve type - use linear instead");
+            OSL_FAIL("unknown regression curve type - use linear instead");
             aServiceName = C2U( "com.sun.star.chart2.LinearRegressionCurve" );
             break;
     }
@@ -371,7 +372,7 @@ void RegressionCurveHelper::addRegressionCurve(
 
     if( eType == REGRESSION_TYPE_NONE )
     {
-        OSL_ENSURE(false,"don't create a regression curve of type none");
+        OSL_FAIL("don't create a regression curve of type none");
         return;
     }
 
@@ -716,3 +717,5 @@ bool RegressionCurveHelper::hasEquation( const Reference< chart2::XRegressionCur
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx
index 06e38dbd0f16..908aa5eb1ae4 100755..100644
--- a/chart2/source/tools/RegressionCurveModel.cxx
+++ b/chart2/source/tools/RegressionCurveModel.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -439,3 +440,5 @@ uno::Reference< util::XCloneable > SAL_CALL PotentialRegressionCurve::createClon
 
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/RegressionCurveModel.hxx b/chart2/source/tools/RegressionCurveModel.hxx
index 82098a76e45a..75a1e8a4bf64 100644
--- a/chart2/source/tools/RegressionCurveModel.hxx
+++ b/chart2/source/tools/RegressionCurveModel.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -257,3 +258,5 @@ public:
 
 // CHART2_REGRESSIONCURVEMODEL_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx
index cc9156569a8f..ae41c9247b7c 100755..100644
--- a/chart2/source/tools/RegressionEquation.cxx
+++ b/chart2/source/tools/RegressionEquation.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -66,7 +67,6 @@ enum
 {
     PROP_EQUATION_SHOW,
     PROP_EQUATION_SHOW_CORRELATION_COEFF,
-//     PROP_EQUATION_SEPARATOR,
     PROP_EQUATION_REF_PAGE_SIZE,
     PROP_EQUATION_REL_POS,
     PROP_EQUATION_NUMBER_FORMAT
@@ -89,13 +89,6 @@ void lcl_AddPropertiesToVector(
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
-//     rOutProperties.push_back(
-//         Property( C2U( "Separator" ),
-//                   PROP_EQUATION_SEPARATOR,
-//                   ::getCppuType( reinterpret_cast< ::rtl::OUString * >(0)),
-//                   beans::PropertyAttribute::BOUND
-//                   | beans::PropertyAttribute::MAYBEDEFAULT ));
-
     rOutProperties.push_back(
         Property( C2U( "ReferencePageSize" ),
                   PROP_EQUATION_REF_PAGE_SIZE,
@@ -213,7 +206,8 @@ RegressionEquation::RegressionEquation( const RegressionEquation & rOther ) :
         MutexContainer(),
         impl::RegressionEquation_Base(),
         ::property::OPropertySet( rOther, m_aMutex ),
-    m_xModifyEventForwarder( new ModifyListenerHelper::ModifyEventForwarder())
+    m_xModifyEventForwarder( new ModifyListenerHelper::ModifyEventForwarder()),
+    m_xContext( NULL )
 {}
 
 RegressionEquation::~RegressionEquation()
@@ -310,16 +304,13 @@ void RegressionEquation::fireModifyEvent()
 uno::Sequence< uno::Reference< chart2::XFormattedString > > SAL_CALL RegressionEquation::getText()
     throw (uno::RuntimeException)
 {
-    // /--
     MutexGuard aGuard( GetMutex() );
     return m_aStrings;
-    // \--
 }
 
 void SAL_CALL RegressionEquation::setText( const uno::Sequence< uno::Reference< chart2::XFormattedString > >& Strings )
     throw (uno::RuntimeException)
 {
-    // /--
     MutexGuard aGuard( GetMutex() );
     ModifyListenerHelper::removeListenerFromAllElements(
         ContainerHelper::SequenceToVector( m_aStrings ), m_xModifyEventForwarder );
@@ -327,7 +318,6 @@ void SAL_CALL RegressionEquation::setText( const uno::Sequence< uno::Reference<
     ModifyListenerHelper::addListenerToAllElements(
         ContainerHelper::SequenceToVector( m_aStrings ), m_xModifyEventForwarder );
     fireModifyEvent();
-    // \--
 }
 
 // ================================================================================
@@ -354,3 +344,5 @@ using impl::RegressionEquation_Base;
 IMPLEMENT_FORWARD_XINTERFACE2( RegressionEquation, RegressionEquation_Base, ::property::OPropertySet )
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/RegressionEquation.hxx b/chart2/source/tools/RegressionEquation.hxx
index 35dbd828370d..c190ff3f1554 100644
--- a/chart2/source/tools/RegressionEquation.hxx
+++ b/chart2/source/tools/RegressionEquation.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -141,3 +142,5 @@ private:
 
 // CHART2_REGRESSIONEQUATION_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/RelativePositionHelper.cxx b/chart2/source/tools/RelativePositionHelper.cxx
index 45018b755f3b..2487b58ee427 100755..100644
--- a/chart2/source/tools/RelativePositionHelper.cxx
+++ b/chart2/source/tools/RelativePositionHelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -394,3 +395,5 @@ bool RelativePositionHelper::moveObject(
 }
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/RelativeSizeHelper.cxx b/chart2/source/tools/RelativeSizeHelper.cxx
index 3d1949da1732..2c656b04f47a 100755..100644
--- a/chart2/source/tools/RelativeSizeHelper.cxx
+++ b/chart2/source/tools/RelativeSizeHelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -96,3 +97,5 @@ void RelativeSizeHelper::adaptFontSizes(
 }
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/ResId.cxx b/chart2/source/tools/ResId.cxx
index b7d4c725d367..56fe184b3d1d 100755..100644
--- a/chart2/source/tools/ResId.cxx
+++ b/chart2/source/tools/ResId.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -45,3 +46,5 @@ SchResId::SchResId( sal_Int16 nId )
 }
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/RessourceManager.cxx b/chart2/source/tools/RessourceManager.cxx
index a2d43b309019..ffcd62a721a2 100644
--- a/chart2/source/tools/RessourceManager.cxx
+++ b/chart2/source/tools/RessourceManager.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -47,3 +48,5 @@ ResMgr & RessourceManager::getRessourceManager()
 }
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/Scaling.cxx b/chart2/source/tools/Scaling.cxx
index e106f1dcc5e2..1dd5b9fb17e7 100644
--- a/chart2/source/tools/Scaling.cxx
+++ b/chart2/source/tools/Scaling.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -269,3 +270,5 @@ APPHELPER_XSERVICEINFO_IMPL( PowerScaling, lcl_aServiceName_Power )
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/SceneProperties.cxx b/chart2/source/tools/SceneProperties.cxx
index 21a95d99be7d..7f66b14ff6db 100644
--- a/chart2/source/tools/SceneProperties.cxx
+++ b/chart2/source/tools/SceneProperties.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -380,3 +381,5 @@ void SceneProperties::AddDefaultsToMap(
 }
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/StatisticsHelper.cxx b/chart2/source/tools/StatisticsHelper.cxx
index 8cec1321c579..629919530adc 100755..100644
--- a/chart2/source/tools/StatisticsHelper.cxx
+++ b/chart2/source/tools/StatisticsHelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -389,3 +390,5 @@ bool StatisticsHelper::usesErrorBarRanges(
 }
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/ThreeDHelper.cxx b/chart2/source/tools/ThreeDHelper.cxx
index e6be4a7ce4e0..43d6e364fd23 100755..100644
--- a/chart2/source/tools/ThreeDHelper.cxx
+++ b/chart2/source/tools/ThreeDHelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -554,7 +555,7 @@ void ThreeDHelper::convertElevationRotationDegToXYZAngleRad(
         z = atan(tan(R) * sin(E));
         if(cos(z)==0.0)
         {
-            DBG_ERROR("calculation error in ThreeDHelper::convertElevationRotationDegToXYZAngleRad");
+            OSL_FAIL("calculation error in ThreeDHelper::convertElevationRotationDegToXYZAngleRad");
             return;
         }
         double cy = cos(R)/cos(z);
@@ -565,7 +566,7 @@ void ThreeDHelper::convertElevationRotationDegToXYZAngleRad(
         double fDenominator = cos(z)*(1.0-pow(sin(y),2));
         if(fDenominator==0.0)
         {
-            DBG_ERROR("calculation error in ThreeDHelper::convertElevationRotationDegToXYZAngleRad");
+            OSL_FAIL("calculation error in ThreeDHelper::convertElevationRotationDegToXYZAngleRad");
             return;
         }
         double sx = cos(R)*sin(E)/fDenominator;
@@ -1433,6 +1434,7 @@ void ThreeDHelper::getRoundedEdgesAndObjectLines(
         ASSERT_EXCEPTION( e );
     }
 }
+
 void ThreeDHelper::setRoundedEdgesAndObjectLines(
             const uno::Reference< XDiagram > & xDiagram
             , sal_Int32 nRoundedEdges, sal_Int32 nObjectLines )
@@ -1513,3 +1515,5 @@ CuboidPlanePosition ThreeDHelper::getAutomaticCuboidPlanePositionForStandardBott
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/TitleHelper.cxx b/chart2/source/tools/TitleHelper.cxx
index 828a523245ff..78809c1ca45a 100644
--- a/chart2/source/tools/TitleHelper.cxx
+++ b/chart2/source/tools/TitleHelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -92,7 +93,7 @@ uno::Reference< XTitled > lcl_getTitleParentFromDiagram(
 
         case TitleHelper::MAIN_TITLE:
         default:
-            OSL_ENSURE( false, "Unsupported Title-Type requested" );
+            OSL_FAIL( "Unsupported Title-Type requested" );
             break;
     }
 
@@ -124,7 +125,7 @@ uno::Reference< XTitled > lcl_getTitleParent( TitleHelper::eTitleType nTitleInde
             xResult.set( lcl_getTitleParentFromDiagram( nTitleIndex, xDiagram ));
             break;
         default:
-            OSL_ENSURE( false, "Unsupported Title-Type requested" );
+            OSL_FAIL( "Unsupported Title-Type requested" );
             break;
     }
 
@@ -228,12 +229,14 @@ uno::Reference< XTitle > TitleHelper::createTitle(
                     Reference< beans::XPropertySet > xTitleProps( xTitle, uno::UNO_QUERY );
                     if( xTitleProps.is() )
                     {
-                        double fNewAngleDegree = 90.0;
                         if( (!bIsVertical && eTitleType == TitleHelper::Y_AXIS_TITLE)
                             || (bIsVertical && eTitleType == TitleHelper::X_AXIS_TITLE)
                             || (!bIsVertical && eTitleType == TitleHelper::SECONDARY_Y_AXIS_TITLE)
                             || (bIsVertical && eTitleType == TitleHelper::SECONDARY_X_AXIS_TITLE) )
+                        {
+                            double fNewAngleDegree = 90.0;
                             xTitleProps->setPropertyValue( C2U( "TextRotation" ), uno::makeAny( fNewAngleDegree ));
+                        }
                     }
                 }
                 catch( uno::Exception & ex )
@@ -376,3 +379,4 @@ bool TitleHelper::getTitleType( eTitleType& rType
 } //namespace chart
 //.............................................................................
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/TrueGuard.cxx b/chart2/source/tools/TrueGuard.cxx
index 6992552367ed..1fec6904c8b3 100644
--- a/chart2/source/tools/TrueGuard.cxx
+++ b/chart2/source/tools/TrueGuard.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -45,3 +46,5 @@ TrueGuard::~TrueGuard()
 }
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/UncachedDataSequence.cxx b/chart2/source/tools/UncachedDataSequence.cxx
index 52cc6b9c03b6..384fdb413449 100644
--- a/chart2/source/tools/UncachedDataSequence.cxx
+++ b/chart2/source/tools/UncachedDataSequence.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -57,7 +58,6 @@ static const OUString lcl_aServiceName(
 
 enum
 {
-//     PROP_SOURCE_IDENTIFIER,
     PROP_NUMBERFORMAT_KEY,
     PROP_PROPOSED_ROLE,
     PROP_XML_RANGE
@@ -185,7 +185,6 @@ Sequence< double > SAL_CALL UncachedDataSequence::getNumericalData()
     throw (uno::RuntimeException)
 {
     Sequence< double > aResult;
-    // /--
     MutexGuard aGuard( GetMutex() );
     if( m_xDataProvider.is())
     {
@@ -195,7 +194,6 @@ Sequence< double > SAL_CALL UncachedDataSequence::getNumericalData()
                           aResult.getArray(), CommonFunctors::AnyToDouble());
     }
     return aResult;
-    // \--
 }
 
 // ________ XTextualDataSequence ________
@@ -203,7 +201,6 @@ Sequence< OUString > SAL_CALL UncachedDataSequence::getTextualData()
     throw (uno::RuntimeException)
 {
     Sequence< OUString > aResult;
-    // /--
     MutexGuard aGuard( GetMutex() );
     if( m_xDataProvider.is())
     {
@@ -213,19 +210,16 @@ Sequence< OUString > SAL_CALL UncachedDataSequence::getTextualData()
                           aResult.getArray(), CommonFunctors::AnyToString());
     }
     return aResult;
-    // \--
 }
 
 // ________ XDataSequence  ________
 Sequence< Any > SAL_CALL UncachedDataSequence::getData()
     throw (uno::RuntimeException)
 {
-    // /--
     MutexGuard aGuard( GetMutex() );
     if( m_xDataProvider.is())
         return m_xDataProvider->getDataByRangeRepresentation( m_aSourceRepresentation );
     return Sequence< Any >();
-    // \--
 }
 
 OUString SAL_CALL UncachedDataSequence::getSourceRangeRepresentation()
@@ -239,8 +233,7 @@ Sequence< OUString > SAL_CALL UncachedDataSequence::generateLabel( chart2::data:
     throw (uno::RuntimeException)
 {
     // auto-generated label is an empty string
-    static const Sequence< OUString > aOneEmptyString( 1 );
-    return aOneEmptyString;
+    return Sequence< OUString >(1);
 }
 
 ::sal_Int32 SAL_CALL UncachedDataSequence::getNumberFormatKeyByIndex( ::sal_Int32 )
@@ -257,7 +250,6 @@ void SAL_CALL UncachedDataSequence::replaceByIndex( ::sal_Int32 Index, const uno
            lang::WrappedTargetException,
            uno::RuntimeException)
 {
-    // /--
     MutexGuard aGuard( GetMutex() );
     Sequence< Any > aData( getData());
     if( Index < aData.getLength() &&
@@ -273,7 +265,7 @@ void SAL_CALL UncachedDataSequence::replaceByIndex( ::sal_Int32 Index, const uno
 ::sal_Int32 SAL_CALL UncachedDataSequence::getCount()
     throw (uno::RuntimeException)
 {
-    OSL_ENSURE( false, "Implement!" );
+    OSL_FAIL( "Implement!" );
     return 0;
 }
 
@@ -282,7 +274,7 @@ uno::Any SAL_CALL UncachedDataSequence::getByIndex( ::sal_Int32 )
            lang::WrappedTargetException,
            uno::RuntimeException)
 {
-    OSL_ENSURE( false, "Implement!" );
+    OSL_FAIL( "Implement!" );
     return uno::Any();
 }
 
@@ -377,3 +369,5 @@ void UncachedDataSequence::fireModifyEvent()
 }
 
 }  // namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/UserDefinedProperties.cxx b/chart2/source/tools/UserDefinedProperties.cxx
index 707c48c1a6cc..f758d376add5 100644
--- a/chart2/source/tools/UserDefinedProperties.cxx
+++ b/chart2/source/tools/UserDefinedProperties.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -71,3 +72,5 @@ void UserDefinedProperties::AddPropertiesToVector(
 }
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/WeakListenerAdapter.cxx b/chart2/source/tools/WeakListenerAdapter.cxx
index bbb54e20bdce..91a91f66b52e 100644
--- a/chart2/source/tools/WeakListenerAdapter.cxx
+++ b/chart2/source/tools/WeakListenerAdapter.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -74,3 +75,5 @@ void SAL_CALL WeakSelectionChangeListenerAdapter::selectionChanged( const lang::
 }
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/WrappedDefaultProperty.cxx b/chart2/source/tools/WrappedDefaultProperty.cxx
index 03178d204ef7..084eceb4ce46 100644
--- a/chart2/source/tools/WrappedDefaultProperty.cxx
+++ b/chart2/source/tools/WrappedDefaultProperty.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -90,3 +91,5 @@ beans::PropertyState WrappedDefaultProperty::getPropertyState(
 }
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/WrappedDirectStateProperty.cxx b/chart2/source/tools/WrappedDirectStateProperty.cxx
index 601b6e199d59..6fc4e324fb63 100644
--- a/chart2/source/tools/WrappedDirectStateProperty.cxx
+++ b/chart2/source/tools/WrappedDirectStateProperty.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -57,3 +58,5 @@ beans::PropertyState WrappedDirectStateProperty::getPropertyState(
 }
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/WrappedIgnoreProperty.cxx b/chart2/source/tools/WrappedIgnoreProperty.cxx
index c98b80582616..ddddd215c218 100755..100644
--- a/chart2/source/tools/WrappedIgnoreProperty.cxx
+++ b/chart2/source/tools/WrappedIgnoreProperty.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -95,7 +96,6 @@ beans::PropertyState WrappedIgnoreProperty::getPropertyState( const Reference< b
 void WrappedIgnoreProperties::addIgnoreLineProperties( std::vector< WrappedProperty* >& rList )
 {
     rList.push_back( new WrappedIgnoreProperty( C2U( "LineStyle" ), uno::makeAny( drawing::LineStyle_SOLID ) ) );
-//     rList.push_back( new WrappedIgnoreProperty( C2U( "LineDash" ), uno::makeAny( drawing::LineDash() ) ) );
     rList.push_back( new WrappedIgnoreProperty( C2U( "LineDashName" ), uno::makeAny( rtl::OUString() ) ) );
     rList.push_back( new WrappedIgnoreProperty( C2U( "LineColor" ), uno::makeAny( sal_Int32(0) ) ) );
     rList.push_back( new WrappedIgnoreProperty( C2U( "LineTransparence" ), uno::makeAny( sal_Int16(0) ) ) );
@@ -142,3 +142,5 @@ void WrappedIgnoreProperties::addIgnoreFillProperties_only_BitmapProperties( ::s
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/WrappedProperty.cxx b/chart2/source/tools/WrappedProperty.cxx
index b41d8a331f11..d17eec02d383 100644
--- a/chart2/source/tools/WrappedProperty.cxx
+++ b/chart2/source/tools/WrappedProperty.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -57,7 +58,6 @@ const OUString& WrappedProperty::getOuterName() const
     return m_aOuterName;
 }
 
-//virtual
 ::rtl::OUString WrappedProperty::getInnerName() const
 {
     return m_aInnerName;
@@ -148,3 +148,5 @@ beans::PropertyState WrappedProperty::getPropertyState( const Reference< beans::
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/WrappedPropertySet.cxx b/chart2/source/tools/WrappedPropertySet.cxx
index 9b752634a264..d594686f15b8 100755..100644
--- a/chart2/source/tools/WrappedPropertySet.cxx
+++ b/chart2/source/tools/WrappedPropertySet.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -72,7 +73,7 @@ void WrappedPropertySet::clearWrappedPropertySet()
     if(m_pWrappedPropertyMap)
     {
         for( tWrappedPropertyMap::iterator aIt = m_pWrappedPropertyMap->begin()
-            ; aIt!= m_pWrappedPropertyMap->end(); aIt++ )
+            ; aIt!= m_pWrappedPropertyMap->end(); ++aIt )
         {
             const WrappedProperty* pWrappedProperty = (*aIt).second;
             DELETEZ(pWrappedProperty);
@@ -123,7 +124,7 @@ void SAL_CALL WrappedPropertySet::setPropertyValue( const OUString& rPropertyNam
         else
         {
 #if OSL_DEBUG_LEVEL > 1
-            DBG_ERROR("found no inner property set to map to");
+            OSL_FAIL("found no inner property set to map to");
 #endif
         }
     }
@@ -149,7 +150,7 @@ void SAL_CALL WrappedPropertySet::setPropertyValue( const OUString& rPropertyNam
     }
     catch( uno::Exception& ex )
     {
-        OSL_ENSURE(false,"invalid exception caught in WrappedPropertySet::setPropertyValue");
+        OSL_FAIL("invalid exception caught in WrappedPropertySet::setPropertyValue");
         lang::WrappedTargetException aWrappedException;
         aWrappedException.TargetException = uno::makeAny( ex );
         throw aWrappedException;
@@ -172,7 +173,7 @@ Any SAL_CALL WrappedPropertySet::getPropertyValue( const OUString& rPropertyName
         else
         {
 #if OSL_DEBUG_LEVEL > 1
-            DBG_ERROR("found no inner property set to map to");
+            OSL_FAIL("found no inner property set to map to");
 #endif
         }
     }
@@ -190,7 +191,7 @@ Any SAL_CALL WrappedPropertySet::getPropertyValue( const OUString& rPropertyName
     }
     catch( uno::Exception& ex )
     {
-        OSL_ENSURE(false,"invalid exception caught in WrappedPropertySet::setPropertyValue");
+        OSL_FAIL("invalid exception caught in WrappedPropertySet::setPropertyValue");
         lang::WrappedTargetException aWrappedException;
         aWrappedException.TargetException = uno::makeAny( ex );
         throw aWrappedException;
@@ -211,7 +212,6 @@ void SAL_CALL WrappedPropertySet::addPropertyChangeListener( const OUString& rPr
         else
             xInnerPropertySet->addPropertyChangeListener( rPropertyName, xListener );
     }
-//     m_aBoundListenerContainer.addInterface( (sal_Int32)nHandle, xListener );
 }
 void SAL_CALL WrappedPropertySet::removePropertyChangeListener( const OUString& rPropertyName, const Reference< beans::XPropertyChangeListener >& aListener )
                                     throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
@@ -273,6 +273,8 @@ void SAL_CALL WrappedPropertySet::setPropertyValues( const Sequence< OUString >&
         }
     }
     //todo: store unknown properties elsewhere
+    OSL_ENSURE(!bUnknownProperty,"unknown property");
+    (void)bUnknownProperty;
 //    if( bUnknownProperty )
 //        throw beans::UnknownPropertyException();
 }
@@ -305,19 +307,19 @@ Sequence< Any > SAL_CALL WrappedPropertySet::getPropertyValues( const Sequence<
 void SAL_CALL WrappedPropertySet::addPropertiesChangeListener( const Sequence< OUString >& /* rNameSeq */, const Reference< beans::XPropertiesChangeListener >& /* xListener */ )
                                     throw (uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented yet");
+    OSL_FAIL("not implemented yet");
     //todo
 }
 void SAL_CALL WrappedPropertySet::removePropertiesChangeListener( const Reference< beans::XPropertiesChangeListener >& /* xListener */ )
                                     throw (uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented yet");
+    OSL_FAIL("not implemented yet");
     //todo
 }
 void SAL_CALL WrappedPropertySet::firePropertiesChangeEvent( const Sequence< OUString >& /* rNameSeq */, const Reference< beans::XPropertiesChangeListener >& /* xListener */ )
                                     throw (uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented yet");
+    OSL_FAIL("not implemented yet");
     //todo
 }
 
@@ -481,13 +483,13 @@ tWrappedPropertyMap& WrappedPropertySet::getWrappedPropertyMap()
 
                     if( nHandle == -1 )
                     {
-                        OSL_ENSURE( false, "missing property in property list" );
+                        OSL_FAIL( "missing property in property list" );
                         delete pProperty;//we are owner or the created WrappedProperties
                     }
                     else if( p->find( nHandle ) != p->end() )
                     {
                         //duplicate Wrapped property
-                        OSL_ENSURE( false, "duplicate Wrapped property" );
+                        OSL_FAIL( "duplicate Wrapped property" );
                         delete pProperty;//we are owner or the created WrappedProperties
                     }
                     else
@@ -509,3 +511,5 @@ tWrappedPropertyMap& WrappedPropertySet::getWrappedPropertyMap()
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/XMLRangeHelper.cxx b/chart2/source/tools/XMLRangeHelper.cxx
index c5d345db0124..fa8fa9fe2ad3 100644
--- a/chart2/source/tools/XMLRangeHelper.cxx
+++ b/chart2/source/tools/XMLRangeHelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -357,7 +358,7 @@ CellRange getCellRangeFromXMLString( const OUString & rXMLString )
                 nStartPos, nEndPos - 1,
                 aResult ))
         {
-            // if an error occured, bail out
+            // if an error occurred, bail out
             return CellRange();
         }
     }
@@ -416,3 +417,5 @@ OUString getXMLStringFromCellRange( const CellRange & rRange )
 
 } //  namespace XMLRangeHelper
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/_serviceregistration_tools.cxx b/chart2/source/tools/_serviceregistration_tools.cxx
index 3b1271921ede..6fca1124e594 100644
--- a/chart2/source/tools/_serviceregistration_tools.cxx
+++ b/chart2/source/tools/_serviceregistration_tools.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -177,13 +178,13 @@ static struct ::cppu::ImplementationEntry g_entries_chart2_tools[] =
 extern "C"
 {
 //==================================================================================================
-OOO_DLLPUBLIC_CHARTTOOLS void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 //==================================================================================================
-OOO_DLLPUBLIC_CHARTTOOLS void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return ::cppu::component_getFactoryHelper(
@@ -191,3 +192,5 @@ OOO_DLLPUBLIC_CHARTTOOLS void * SAL_CALL component_getFactory(
 }
 }
 //=========================================================================
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/makefile.mk b/chart2/source/tools/makefile.mk
deleted file mode 100644
index 7554bd19cd38..000000000000
--- a/chart2/source/tools/makefile.mk
+++ /dev/null
@@ -1,198 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=				..$/..
-PRJNAME=			chart2
-TARGET=				charttools
-
-PRJINC=				$(PRJ)$/source
-
-USE_DEFFILE=		TRUE
-ENABLE_EXCEPTIONS=	TRUE
-VISIBILITY_HIDDEN=  TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-CDEFS += -DOOO_DLLIMPLEMENTATION_CHARTTOOLS
-
-# --- export library -------------------------------------------------
-
-#You can use several library macros of this form to build libraries that
-#do not consist of all object files in a directory or to merge different libraries.
-#LIB1TARGET=		$(SLB)$/_$(TARGET).lib
-
-#Specifies object files to bind into linked libraries.
-SLOFILES=	\
-    $(SLO)$/ErrorBar.obj \
-    $(SLO)$/TrueGuard.obj \
-    $(SLO)$/LifeTime.obj \
-    $(SLO)$/MediaDescriptorHelper.obj \
-    $(SLO)$/ConfigColorScheme.obj \
-    $(SLO)$/ColorPerPointHelper.obj \
-    $(SLO)$/ObjectIdentifier.obj \
-    $(SLO)$/CachedDataSequence.obj \
-    $(SLO)$/CommonConverters.obj \
-    $(SLO)$/DataSeriesHelper.obj \
-    $(SLO)$/DataSource.obj \
-    $(SLO)$/DataSourceHelper.obj \
-    $(SLO)$/DiagramHelper.obj \
-    $(SLO)$/ExponentialRegressionCurveCalculator.obj \
-    $(SLO)$/ImplOPropertySet.obj \
-    $(SLO)$/InternalData.obj \
-    $(SLO)$/InternalDataProvider.obj \
-    $(SLO)$/LabeledDataSequence.obj \
-    $(SLO)$/LinearRegressionCurveCalculator.obj \
-    $(SLO)$/LogarithmicRegressionCurveCalculator.obj \
-    $(SLO)$/MeanValueRegressionCurveCalculator.obj \
-    $(SLO)$/NumberFormatterWrapper.obj \
-    $(SLO)$/OPropertySet.obj \
-    $(SLO)$/WrappedPropertySet.obj \
-    $(SLO)$/WrappedProperty.obj \
-    $(SLO)$/WrappedIgnoreProperty.obj \
-    $(SLO)$/WrappedDefaultProperty.obj \
-    $(SLO)$/WrappedDirectStateProperty.obj \
-    $(SLO)$/PotentialRegressionCurveCalculator.obj \
-    $(SLO)$/RegressionCurveHelper.obj \
-    $(SLO)$/RegressionCurveModel.obj \
-    $(SLO)$/RelativeSizeHelper.obj \
-    $(SLO)$/RelativePositionHelper.obj \
-    $(SLO)$/Scaling.obj \
-    $(SLO)$/SceneProperties.obj \
-    $(SLO)$/ThreeDHelper.obj \
-    $(SLO)$/StatisticsHelper.obj \
-    $(SLO)$/ChartModelHelper.obj \
-    $(SLO)$/ChartViewHelper.obj \
-    $(SLO)$/ChartTypeHelper.obj \
-    $(SLO)$/AxisHelper.obj \
-    $(SLO)$/MutexContainer.obj \
-    $(SLO)$/PropertyHelper.obj \
-    $(SLO)$/FormattedStringHelper.obj \
-    $(SLO)$/TitleHelper.obj \
-    $(SLO)$/LegendHelper.obj \
-    $(SLO)$/CharacterProperties.obj \
-    $(SLO)$/LineProperties.obj \
-    $(SLO)$/FillProperties.obj \
-    $(SLO)$/UserDefinedProperties.obj \
-    $(SLO)$/NameContainer.obj \
-    $(SLO)$/ChartDebugTrace.obj \
-    $(SLO)$/_serviceregistration_tools.obj \
-    $(SLO)$/UncachedDataSequence.obj \
-    $(SLO)$/XMLRangeHelper.obj \
-    $(SLO)$/ModifyListenerHelper.obj \
-    $(SLO)$/ModifyListenerCallBack.obj \
-    $(SLO)$/BaseGFXHelper.obj \
-    $(SLO)$/ControllerLockGuard.obj \
-    $(SLO)$/WeakListenerAdapter.obj \
-    $(SLO)$/ResId.obj \
-    $(SLO)$/RessourceManager.obj \
-    $(SLO)$/RangeHighlighter.obj \
-    $(SLO)$/ReferenceSizeProvider.obj \
-    $(SLO)$/ExplicitCategoriesProvider.obj \
-    $(SLO)$/RegressionCurveCalculator.obj \
-    $(SLO)$/RegressionEquation.obj
-
-DISABLED_SLOFILES=	\
-    $(SLO)$/NamedFillProperties.obj \
-    $(SLO)$/NamedLineProperties.obj \
-    $(SLO)$/NamedProperties.obj
-
-#--------
-
-#Indicates the filename of the shared library.
-SHL1TARGET=		$(TARGET)$(DLLPOSTFIX)
-
-#indicates dependencies:
-SHL1DEPN=
-#Specifies an import library to create. For Win32 only.
-SHL1IMPLIB=		i$(TARGET)
-
-#Specifies libraries from the same module to put into the shared library.
-#was created above
-SHL1LIBS= 		$(SLB)$/$(TARGET).lib
-
-#Links import libraries.
-
-SHL1STDLIBS=    \
-                $(CPPULIB)			\
-                $(CPPUHELPERLIB)	\
-                $(COMPHELPERLIB)	\
-                $(SALLIB)			\
-                $(TOOLSLIB)			\
-                $(SVLLIB)		    \
-                $(VCLLIB)           \
-                $(I18NISOLANGLIB)   \
-                $(BASEGFXLIB) 		\
-                $(UNOTOOLSLIB)
-
-#				$(SVLIB)			\
-#				$(SVTOOLLIB)		\
-#				$(SVXLIB)			\
-#				$(TKLIB)			\
-#			    $(SFXLIB)
-
-#--------exports
-
-#specifies the exported symbols for Windows only:
-SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
-
-#Specifies the library name to parse for symbols. For Win32 only.
-DEFLIB1NAME=	$(TARGET)
-
-#A file of symbols to export.
-#DEF1EXPORTFILE=	$(PRJ)$/source$/inc$/exports.dxp
-
-#--------definition file
-
-#name of the definition file:
-DEF1NAME=		$(SHL1TARGET)
-
-# indicates definition file dependencies
-DEF1DEPN=		$(MISC)$/$(SHL1TARGET).flt
-
-#A comment on the definition file.
-DEF1DES=		Chart Tools
-
-# --- Targets -----------------------------------------------------------------
-
-.INCLUDE: target.mk
-
-# --- Filter -----------------------------------------------------------
-
-$(MISC)$/$(SHL1TARGET).flt: makefile.mk \
-                            exports.flt
-    $(TYPE) exports.flt > $@
-
-
-ALLTAR : $(MISC)/charttools.component
-
-$(MISC)/charttools.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        charttools.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt charttools.component
diff --git a/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx b/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx
index 97523d38758f..669c2f9c42b9 100644
--- a/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx
+++ b/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -220,3 +221,5 @@ void MergedMinimumAndMaximumSupplier::setTimeResolutionOnXAxis( long nTimeResolu
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/axes/ScaleAutomatism.cxx b/chart2/source/view/axes/ScaleAutomatism.cxx
index 8dc1ce875411..36258acd74e4 100644
--- a/chart2/source/view/axes/ScaleAutomatism.cxx
+++ b/chart2/source/view/axes/ScaleAutomatism.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -1026,3 +1027,5 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForLinear(
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/axes/TickmarkHelper.cxx b/chart2/source/view/axes/TickmarkHelper.cxx
deleted file mode 100644
index f4f717722bed..000000000000
--- a/chart2/source/view/axes/TickmarkHelper.cxx
+++ /dev/null
@@ -1,934 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
-#include "TickmarkHelper.hxx"
-#include "ViewDefines.hxx"
-#include <rtl/math.hxx>
-#include <tools/debug.hxx>
-#include <memory>
-
-//.............................................................................
-namespace chart
-{
-//.............................................................................
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::chart2;
-using namespace ::rtl::math;
-using ::basegfx::B2DVector;
-
-TickInfo::TickInfo()
-: fScaledTickValue( 0.0 )
-, fUnscaledTickValue( 0.0 )
-, aTickScreenPosition(0.0,0.0)
-, bPaintIt( true )
-, xTextShape( NULL )
-, nFactorForLimitedTextWidth(1)
-{
-}
-
-void TickInfo::updateUnscaledValue( const uno::Reference< XScaling >& xInverseScaling )
-{
-    if( xInverseScaling.is() )
-        this->fUnscaledTickValue = xInverseScaling->doScaling( this->fScaledTickValue );
-    else
-        this->fUnscaledTickValue = this->fScaledTickValue;
-}
-
-sal_Int32 TickInfo::getScreenDistanceBetweenTicks( const TickInfo& rOherTickInfo ) const
-{
-    //return the positive distance between the two first tickmarks in screen values
-
-    B2DVector aDistance = rOherTickInfo.aTickScreenPosition - aTickScreenPosition;
-    sal_Int32 nRet = static_cast<sal_Int32>(aDistance.getLength());
-    if(nRet<0)
-        nRet *= -1;
-    return nRet;
-}
-
-PureTickIter::PureTickIter( ::std::vector< TickInfo >& rTickInfoVector )
-            : m_rTickVector(rTickInfoVector)
-            , m_aTickIter(m_rTickVector.begin())
-{
-}
-PureTickIter::~PureTickIter()
-{
-}
-TickInfo* PureTickIter::firstInfo()
-{
-    m_aTickIter = m_rTickVector.begin();
-    if(m_aTickIter!=m_rTickVector.end())
-        return &*m_aTickIter;
-    return 0;
-}
-TickInfo* PureTickIter::nextInfo()
-{
-    m_aTickIter++;
-    if(m_aTickIter!=m_rTickVector.end())
-        return &*m_aTickIter;
-    return 0;
-}
-
-EquidistantTickIter::EquidistantTickIter( const uno::Sequence< uno::Sequence< double > >& rTicks
-                   , const ExplicitIncrementData& rIncrement
-                   , sal_Int32 nMinDepth, sal_Int32 nMaxDepth )
-                : m_pSimpleTicks(&rTicks)
-                , m_pInfoTicks(0)
-                , m_rIncrement(rIncrement)
-                , m_nMinDepth(0), m_nMaxDepth(0)
-                , m_nTickCount(0), m_pnPositions(NULL)
-                , m_pnPreParentCount(NULL), m_pbIntervalFinished(NULL)
-                , m_nCurrentDepth(-1), m_nCurrentPos(-1), m_fCurrentValue( 0.0 )
-{
-    initIter( nMinDepth, nMaxDepth );
-}
-
-EquidistantTickIter::EquidistantTickIter( ::std::vector< ::std::vector< TickInfo > >& rTicks
-                   , const ExplicitIncrementData& rIncrement
-                   , sal_Int32 nMinDepth, sal_Int32 nMaxDepth )
-                : m_pSimpleTicks(NULL)
-                , m_pInfoTicks(&rTicks)
-                , m_rIncrement(rIncrement)
-                , m_nMinDepth(0), m_nMaxDepth(0)
-                , m_nTickCount(0), m_pnPositions(NULL)
-                , m_pnPreParentCount(NULL), m_pbIntervalFinished(NULL)
-                , m_nCurrentDepth(-1), m_nCurrentPos(-1), m_fCurrentValue( 0.0 )
-{
-    initIter( nMinDepth, nMaxDepth );
-}
-
-void EquidistantTickIter::initIter( sal_Int32 /*nMinDepth*/, sal_Int32 nMaxDepth )
-{
-    m_nMaxDepth = nMaxDepth;
-    if(nMaxDepth<0 || m_nMaxDepth>getMaxDepth())
-        m_nMaxDepth=getMaxDepth();
-
-    sal_Int32 nDepth = 0;
-    for( nDepth = 0; nDepth<=m_nMaxDepth ;nDepth++ )
-        m_nTickCount += getTickCount(nDepth);
-
-    if(!m_nTickCount)
-        return;
-
-    m_pnPositions      = new sal_Int32[m_nMaxDepth+1];
-
-    m_pnPreParentCount = new sal_Int32[m_nMaxDepth+1];
-    m_pbIntervalFinished = new bool[m_nMaxDepth+1];
-    m_pnPreParentCount[0] = 0;
-    m_pbIntervalFinished[0] = false;
-    double fParentValue = getTickValue(0,0);
-    for( nDepth = 1; nDepth<=m_nMaxDepth ;nDepth++ )
-    {
-        m_pbIntervalFinished[nDepth] = false;
-
-        sal_Int32 nPreParentCount = 0;
-        sal_Int32 nCount = getTickCount(nDepth);
-        for(sal_Int32 nN = 0; nN<nCount; nN++)
-        {
-            if(getTickValue(nDepth,nN) < fParentValue)
-                nPreParentCount++;
-            else
-                break;
-        }
-        m_pnPreParentCount[nDepth] = nPreParentCount;
-        if(nCount)
-        {
-            double fNextParentValue = getTickValue(nDepth,0);
-            if( fNextParentValue < fParentValue )
-                fParentValue = fNextParentValue;
-        }
-    }
-}
-
-EquidistantTickIter::~EquidistantTickIter()
-{
-    delete[] m_pnPositions;
-    delete[] m_pnPreParentCount;
-    delete[] m_pbIntervalFinished;
-}
-
-sal_Int32 EquidistantTickIter::getStartDepth() const
-{
-    //find the depth of the first visible tickmark:
-    //it is the depth of the smallest value
-    sal_Int32 nReturnDepth=0;
-    double fMinValue = DBL_MAX;
-    for(sal_Int32 nDepth = 0; nDepth<=m_nMaxDepth ;nDepth++ )
-    {
-        sal_Int32 nCount = getTickCount(nDepth);
-        if( !nCount )
-            continue;
-        double fThisValue = getTickValue(nDepth,0);
-        if(fThisValue<fMinValue)
-        {
-            nReturnDepth = nDepth;
-            fMinValue = fThisValue;
-        }
-    }
-    return nReturnDepth;
-}
-
-double* EquidistantTickIter::firstValue()
-{
-    if( gotoFirst() )
-    {
-        m_fCurrentValue = getTickValue(m_nCurrentDepth, m_pnPositions[m_nCurrentDepth]);
-        return &m_fCurrentValue;
-    }
-    return NULL;
-}
-
-TickInfo* EquidistantTickIter::firstInfo()
-{
-    if( m_pInfoTicks && gotoFirst() )
-        return &(*m_pInfoTicks)[m_nCurrentDepth][m_pnPositions[m_nCurrentDepth]];
-    return NULL;
-}
-
-sal_Int32 EquidistantTickIter::getIntervalCount( sal_Int32 nDepth )
-{
-    if(nDepth>m_rIncrement.SubIncrements.getLength() || nDepth<0)
-        return 0;
-
-    if(!nDepth)
-        return m_nTickCount;
-
-    return m_rIncrement.SubIncrements[nDepth-1].IntervalCount;
-}
-
-bool EquidistantTickIter::isAtLastPartTick()
-{
-    if(!m_nCurrentDepth)
-        return false;
-    sal_Int32 nIntervalCount = getIntervalCount( m_nCurrentDepth );
-    if(!nIntervalCount || nIntervalCount == 1)
-        return true;
-    if( m_pbIntervalFinished[m_nCurrentDepth] )
-        return false;
-    sal_Int32 nPos = m_pnPositions[m_nCurrentDepth]+1;
-    if(m_pnPreParentCount[m_nCurrentDepth])
-        nPos += nIntervalCount-1 - m_pnPreParentCount[m_nCurrentDepth];
-    bool bRet = nPos && nPos % (nIntervalCount-1) == 0;
-    if(!nPos && !m_pnPreParentCount[m_nCurrentDepth]
-             && m_pnPositions[m_nCurrentDepth-1]==-1 )
-         bRet = true;
-    return bRet;
-}
-
-bool EquidistantTickIter::gotoFirst()
-{
-    if( m_nMaxDepth<0 )
-        return false;
-    if( !m_nTickCount )
-        return false;
-
-    for(sal_Int32 nDepth = 0; nDepth<=m_nMaxDepth ;nDepth++ )
-        m_pnPositions[nDepth] = -1;
-
-    m_nCurrentPos   = 0;
-    m_nCurrentDepth = getStartDepth();
-    m_pnPositions[m_nCurrentDepth] = 0;
-    return true;
-}
-
-bool EquidistantTickIter::gotoNext()
-{
-    if( m_nCurrentPos < 0 )
-        return false;
-    m_nCurrentPos++;
-
-    if( m_nCurrentPos >= m_nTickCount )
-        return false;
-
-    if( m_nCurrentDepth==m_nMaxDepth && isAtLastPartTick() )
-    {
-        do
-        {
-            m_pbIntervalFinished[m_nCurrentDepth] = true;
-            m_nCurrentDepth--;
-        }
-        while( m_nCurrentDepth && isAtLastPartTick() );
-    }
-    else if( m_nCurrentDepth<m_nMaxDepth )
-    {
-        do
-        {
-            m_nCurrentDepth++;
-        }
-        while( m_nCurrentDepth<m_nMaxDepth );
-    }
-    m_pbIntervalFinished[m_nCurrentDepth] = false;
-    m_pnPositions[m_nCurrentDepth] = m_pnPositions[m_nCurrentDepth]+1;
-    return true;
-}
-
-bool EquidistantTickIter::gotoIndex( sal_Int32 nTickIndex )
-{
-    if( nTickIndex < 0 )
-        return false;
-    if( nTickIndex >= m_nTickCount )
-        return false;
-
-    if( nTickIndex < m_nCurrentPos )
-        if( !gotoFirst() )
-            return false;
-
-    while( nTickIndex > m_nCurrentPos )
-        if( !gotoNext() )
-            return false;
-
-    return true;
-}
-
-sal_Int32 EquidistantTickIter::getCurrentIndex() const
-{
-    return m_nCurrentPos;
-}
-sal_Int32 EquidistantTickIter::getMaxIndex() const
-{
-    return m_nTickCount-1;
-}
-
-double* EquidistantTickIter::nextValue()
-{
-    if( gotoNext() )
-    {
-        m_fCurrentValue = getTickValue(m_nCurrentDepth, m_pnPositions[m_nCurrentDepth]);
-        return &m_fCurrentValue;
-    }
-    return NULL;
-}
-
-TickInfo* EquidistantTickIter::nextInfo()
-{
-    if( m_pInfoTicks && gotoNext() &&
-        static_cast< sal_Int32 >(
-            (*m_pInfoTicks)[m_nCurrentDepth].size()) > m_pnPositions[m_nCurrentDepth] )
-    {
-        return &(*m_pInfoTicks)[m_nCurrentDepth][m_pnPositions[m_nCurrentDepth]];
-    }
-    return NULL;
-}
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
-double TickmarkHelper::getMinimumAtIncrement( double fMin, const ExplicitIncrementData& rIncrement )
-{
-    //the returned value will be <= fMin and on a Major Tick given by rIncrement
-    if(rIncrement.Distance<=0.0)
-        return fMin;
-
-    double fRet = rIncrement.BaseValue +
-        floor( approxSub( fMin, rIncrement.BaseValue )
-                    / rIncrement.Distance)
-            *rIncrement.Distance;
-
-    if( fRet > fMin )
-    {
-        if( !approxEqual(fRet, fMin) )
-            fRet -= rIncrement.Distance;
-    }
-    return fRet;
-}
-double TickmarkHelper::getMaximumAtIncrement( double fMax, const ExplicitIncrementData& rIncrement )
-{
-    //the returned value will be >= fMax and on a Major Tick given by rIncrement
-    if(rIncrement.Distance<=0.0)
-        return fMax;
-
-    double fRet = rIncrement.BaseValue +
-        floor( approxSub( fMax, rIncrement.BaseValue )
-                    / rIncrement.Distance)
-            *rIncrement.Distance;
-
-    if( fRet < fMax )
-    {
-        if( !approxEqual(fRet, fMax) )
-            fRet += rIncrement.Distance;
-    }
-    return fRet;
-}
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
-TickmarkHelper::TickmarkHelper(
-          const ExplicitScaleData& rScale, const ExplicitIncrementData& rIncrement )
-            : m_rScale( rScale )
-            , m_rIncrement( rIncrement )
-            , m_xInverseScaling(NULL)
-            , m_pfCurrentValues(NULL)
-{
-    //@todo: make sure that the scale is valid for the scaling
-
-    m_pfCurrentValues = new double[getTickDepth()];
-
-    if( m_rScale.Scaling.is() )
-    {
-        m_xInverseScaling = m_rScale.Scaling->getInverseScaling();
-        DBG_ASSERT( m_xInverseScaling.is(), "each Scaling needs to return a inverse Scaling" );
-    }
-
-    double fMin = m_fScaledVisibleMin = m_rScale.Minimum;
-    if( m_xInverseScaling.is() )
-    {
-        m_fScaledVisibleMin = m_rScale.Scaling->doScaling(m_fScaledVisibleMin);
-        if(m_rIncrement.PostEquidistant )
-            fMin = m_fScaledVisibleMin;
-    }
-
-    double fMax = m_fScaledVisibleMax = m_rScale.Maximum;
-    if( m_xInverseScaling.is() )
-    {
-        m_fScaledVisibleMax = m_rScale.Scaling->doScaling(m_fScaledVisibleMax);
-        if(m_rIncrement.PostEquidistant )
-            fMax = m_fScaledVisibleMax;
-    }
-
-    //--
-    m_fOuterMajorTickBorderMin = TickmarkHelper::getMinimumAtIncrement( fMin, m_rIncrement );
-    m_fOuterMajorTickBorderMax = TickmarkHelper::getMaximumAtIncrement( fMax, m_rIncrement );
-    //--
-
-    m_fOuterMajorTickBorderMin_Scaled = m_fOuterMajorTickBorderMin;
-    m_fOuterMajorTickBorderMax_Scaled = m_fOuterMajorTickBorderMax;
-    if(!m_rIncrement.PostEquidistant && m_xInverseScaling.is() )
-    {
-        m_fOuterMajorTickBorderMin_Scaled = m_rScale.Scaling->doScaling(m_fOuterMajorTickBorderMin);
-        m_fOuterMajorTickBorderMax_Scaled = m_rScale.Scaling->doScaling(m_fOuterMajorTickBorderMax);
-
-        //check validity of new range: m_fOuterMajorTickBorderMin <-> m_fOuterMajorTickBorderMax
-        //it is assumed here, that the original range in the given Scale is valid
-        if( !rtl::math::isFinite(m_fOuterMajorTickBorderMin_Scaled) )
-        {
-            m_fOuterMajorTickBorderMin += m_rIncrement.Distance;
-            m_fOuterMajorTickBorderMin_Scaled = m_rScale.Scaling->doScaling(m_fOuterMajorTickBorderMin);
-        }
-        if( !rtl::math::isFinite(m_fOuterMajorTickBorderMax_Scaled) )
-        {
-            m_fOuterMajorTickBorderMax -= m_rIncrement.Distance;
-            m_fOuterMajorTickBorderMax_Scaled = m_rScale.Scaling->doScaling(m_fOuterMajorTickBorderMax);
-        }
-    }
-}
-
-TickmarkHelper* TickmarkHelper::createShiftedTickmarkHelper() const
-{
-    ExplicitIncrementData aShiftedIncrement( m_rIncrement );
-    aShiftedIncrement.BaseValue = m_rIncrement.BaseValue-m_rIncrement.Distance/2.0;
-    return new TickmarkHelper( m_rScale, aShiftedIncrement );
-}
-
-TickmarkHelper::~TickmarkHelper()
-{
-    delete[] m_pfCurrentValues;
-}
-
-sal_Int32 TickmarkHelper::getTickDepth() const
-{
-    return m_rIncrement.SubIncrements.getLength() + 1;
-}
-
-sal_Int32 TickmarkHelper::getMaxTickCount( sal_Int32 nDepth ) const
-{
-    //return the maximum amount of ticks
-    //possibly open intervals at the two ends of the region are handled as if they were completely visible
-    //(this is necessary for calculating the sub ticks at the borders correctly)
-
-    if( nDepth >= getTickDepth() )
-        return 0;
-    if( m_fOuterMajorTickBorderMax < m_fOuterMajorTickBorderMin )
-        return 0;
-    if( m_rIncrement.Distance<=0.0)
-        return 0;
-
-    double fSub;
-    if(m_rIncrement.PostEquidistant  )
-        fSub = approxSub( m_fScaledVisibleMax, m_fScaledVisibleMin );
-    else
-        fSub = approxSub( m_rScale.Maximum, m_rScale.Minimum );
-
-    if (!isFinite(fSub))
-        return 0;
-
-    sal_Int32 nIntervalCount = static_cast<sal_Int32>( fSub / m_rIncrement.Distance );
-
-    nIntervalCount+=3;
-    for(sal_Int32 nN=0; nN<nDepth-1; nN++)
-    {
-        if( m_rIncrement.SubIncrements[nN].IntervalCount>1 )
-            nIntervalCount *= m_rIncrement.SubIncrements[nN].IntervalCount;
-    }
-
-    sal_Int32 nTickCount = nIntervalCount;
-    if(nDepth>0 && m_rIncrement.SubIncrements[nDepth-1].IntervalCount>1)
-        nTickCount = nIntervalCount * (m_rIncrement.SubIncrements[nDepth-1].IntervalCount-1);
-
-    return nTickCount;
-}
-
-double* TickmarkHelper::getMajorTick( sal_Int32 nTick ) const
-{
-    m_pfCurrentValues[0] = m_fOuterMajorTickBorderMin + nTick*m_rIncrement.Distance;
-
-    if(m_pfCurrentValues[0]>m_fOuterMajorTickBorderMax)
-    {
-        if( !approxEqual(m_pfCurrentValues[0],m_fOuterMajorTickBorderMax) )
-            return NULL;
-    }
-    if(m_pfCurrentValues[0]<m_fOuterMajorTickBorderMin)
-    {
-        if( !approxEqual(m_pfCurrentValues[0],m_fOuterMajorTickBorderMin) )
-            return NULL;
-    }
-
-    //return always the value after scaling
-    if(!m_rIncrement.PostEquidistant && m_xInverseScaling.is() )
-        m_pfCurrentValues[0] = m_rScale.Scaling->doScaling( m_pfCurrentValues[0] );
-
-    return &m_pfCurrentValues[0];
-}
-
-double* TickmarkHelper::getMinorTick( sal_Int32 nTick, sal_Int32 nDepth
-                            , double fStartParentTick, double fNextParentTick ) const
-{
-    //check validity of arguments
-    {
-        //DBG_ASSERT( fStartParentTick < fNextParentTick, "fStartParentTick >= fNextParentTick");
-        if(fStartParentTick >= fNextParentTick)
-            return NULL;
-        if(nDepth>m_rIncrement.SubIncrements.getLength() || nDepth<=0)
-            return NULL;
-
-        //subticks are only calculated if they are laying between parent ticks:
-        if(nTick<=0)
-            return NULL;
-        if(nTick>=m_rIncrement.SubIncrements[nDepth-1].IntervalCount)
-            return NULL;
-    }
-
-    bool    bPostEquidistant = m_rIncrement.SubIncrements[nDepth-1].PostEquidistant;
-
-    double fAdaptedStartParent = fStartParentTick;
-    double fAdaptedNextParent  = fNextParentTick;
-
-    if( !bPostEquidistant && m_xInverseScaling.is() )
-    {
-        fAdaptedStartParent = m_xInverseScaling->doScaling(fStartParentTick);
-        fAdaptedNextParent  = m_xInverseScaling->doScaling(fNextParentTick);
-    }
-
-    double fDistance = (fAdaptedNextParent - fAdaptedStartParent)/m_rIncrement.SubIncrements[nDepth-1].IntervalCount;
-
-    m_pfCurrentValues[nDepth] = fAdaptedStartParent + nTick*fDistance;
-
-    //return always the value after scaling
-    if(!bPostEquidistant && m_xInverseScaling.is() )
-        m_pfCurrentValues[nDepth] = m_rScale.Scaling->doScaling( m_pfCurrentValues[nDepth] );
-
-    if( !isWithinOuterBorder( m_pfCurrentValues[nDepth] ) )
-        return NULL;
-
-    return &m_pfCurrentValues[nDepth];
-}
-
-bool TickmarkHelper::isWithinOuterBorder( double fScaledValue ) const
-{
-    if(fScaledValue>m_fOuterMajorTickBorderMax_Scaled)
-        return false;
-    if(fScaledValue<m_fOuterMajorTickBorderMin_Scaled)
-        return false;
-
-    return true;
-}
-
-
-bool TickmarkHelper::isVisible( double fScaledValue ) const
-{
-    if(fScaledValue>m_fScaledVisibleMax)
-    {
-        if( !approxEqual(fScaledValue,m_fScaledVisibleMax) )
-            return false;
-    }
-    if(fScaledValue<m_fScaledVisibleMin)
-    {
-        if( !approxEqual(fScaledValue,m_fScaledVisibleMin) )
-            return false;
-    }
-    return true;
-}
-
-void TickmarkHelper::getAllTicks( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const
-{
-    uno::Sequence< uno::Sequence< double > > aAllTicks;
-
-    //create point sequences for each tick depth
-    sal_Int32 nDepthCount = this->getTickDepth();
-    sal_Int32 nMaxMajorTickCount = this->getMaxTickCount( 0 );
-
-    aAllTicks.realloc(nDepthCount);
-    aAllTicks[0].realloc(nMaxMajorTickCount);
-
-    sal_Int32 nRealMajorTickCount = 0;
-    double* pValue = NULL;
-    for( sal_Int32 nMajorTick=0; nMajorTick<nMaxMajorTickCount; nMajorTick++ )
-    {
-        pValue = this->getMajorTick( nMajorTick );
-        if(!pValue)
-            continue;
-        aAllTicks[0][nRealMajorTickCount] = *pValue;
-        nRealMajorTickCount++;
-    }
-    if(!nRealMajorTickCount)
-        return;
-    aAllTicks[0].realloc(nRealMajorTickCount);
-
-    if(nDepthCount>0)
-        this->addSubTicks( 1, aAllTicks );
-
-    //so far we have added all ticks between the outer major tick marks
-    //this was necessary to create sub ticks correctly
-    //now we reduce all ticks to the visible ones that lie between the real borders
-    sal_Int32 nDepth = 0;
-    sal_Int32 nTick = 0;
-    for( nDepth = 0; nDepth < nDepthCount; nDepth++)
-    {
-        sal_Int32 nInvisibleAtLowerBorder = 0;
-        sal_Int32 nInvisibleAtUpperBorder = 0;
-        //we need only to check all ticks within the first major interval at each border
-        sal_Int32 nCheckCount = 1;
-        for(sal_Int32 nN=0; nN<nDepth; nN++)
-        {
-            if( m_rIncrement.SubIncrements[nN].IntervalCount>1 )
-                nCheckCount *= m_rIncrement.SubIncrements[nN].IntervalCount;
-        }
-        uno::Sequence< double >& rTicks = aAllTicks[nDepth];
-        sal_Int32 nCount = rTicks.getLength();
-        //check lower border
-        for( nTick=0; nTick<nCheckCount && nTick<nCount; nTick++)
-        {
-            if( !isVisible( rTicks[nTick] ) )
-                nInvisibleAtLowerBorder++;
-        }
-        //check upper border
-        for( nTick=nCount-1; nTick>nCount-1-nCheckCount && nTick>=0; nTick--)
-        {
-            if( !isVisible( rTicks[nTick] ) )
-                nInvisibleAtUpperBorder++;
-        }
-        //resize sequence
-        if( !nInvisibleAtLowerBorder && !nInvisibleAtUpperBorder)
-            continue;
-        if( !nInvisibleAtLowerBorder )
-            rTicks.realloc(nCount-nInvisibleAtUpperBorder);
-        else
-        {
-            sal_Int32 nNewCount = nCount-nInvisibleAtUpperBorder-nInvisibleAtLowerBorder;
-            if(nNewCount<0)
-                nNewCount=0;
-
-            uno::Sequence< double > aOldTicks(rTicks);
-            rTicks.realloc(nNewCount);
-            for(nTick = 0; nTick<nNewCount; nTick++)
-                rTicks[nTick] = aOldTicks[nInvisibleAtLowerBorder+nTick];
-        }
-    }
-
-    //fill return value
-    rAllTickInfos.resize(aAllTicks.getLength());
-    for( nDepth=0 ;nDepth<aAllTicks.getLength(); nDepth++ )
-    {
-        sal_Int32 nCount = aAllTicks[nDepth].getLength();
-        rAllTickInfos[nDepth].resize( nCount );
-        for(sal_Int32 nN = 0; nN<nCount; nN++)
-        {
-            rAllTickInfos[nDepth][nN].fScaledTickValue = aAllTicks[nDepth][nN];
-        }
-    }
-}
-
-void TickmarkHelper::getAllTicksShifted( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const
-{
-    std::auto_ptr< TickmarkHelper > apShiftedTickmarkHelper( createShiftedTickmarkHelper() );
-    apShiftedTickmarkHelper->getAllTicks( rAllTickInfos );
-}
-
-void TickmarkHelper::addSubTicks( sal_Int32 nDepth, uno::Sequence< uno::Sequence< double > >& rParentTicks ) const
-{
-    EquidistantTickIter aIter( rParentTicks, m_rIncrement, 0, nDepth-1 );
-    double* pfNextParentTick = aIter.firstValue();
-    if(!pfNextParentTick)
-        return;
-    double fLastParentTick = *pfNextParentTick;
-    pfNextParentTick = aIter.nextValue();
-    if(!pfNextParentTick)
-        return;
-
-    sal_Int32 nMaxSubTickCount = this->getMaxTickCount( nDepth );
-    if(!nMaxSubTickCount)
-        return;
-
-    uno::Sequence< double > aSubTicks(nMaxSubTickCount);
-    sal_Int32 nRealSubTickCount = 0;
-    sal_Int32 nIntervalCount = m_rIncrement.SubIncrements[nDepth-1].IntervalCount;
-
-    double* pValue = NULL;
-    for(; pfNextParentTick; fLastParentTick=*pfNextParentTick, pfNextParentTick = aIter.nextValue())
-    {
-        for( sal_Int32 nPartTick = 1; nPartTick<nIntervalCount; nPartTick++ )
-        {
-            pValue = this->getMinorTick( nPartTick, nDepth
-                        , fLastParentTick, *pfNextParentTick );
-            if(!pValue)
-                continue;
-
-            aSubTicks[nRealSubTickCount] = *pValue;
-            nRealSubTickCount++;
-        }
-    }
-
-    aSubTicks.realloc(nRealSubTickCount);
-    rParentTicks[nDepth] = aSubTicks;
-    if(m_rIncrement.SubIncrements.getLength()>nDepth)
-        addSubTicks( nDepth+1, rParentTicks );
-}
-
-//-----------------------------------------------------------------------------
-// ___TickmarkHelper_2D___
-//-----------------------------------------------------------------------------
-TickmarkHelper_2D::TickmarkHelper_2D(
-          const ExplicitScaleData& rScale, const ExplicitIncrementData& rIncrement
-          //, double fStrech_SceneToScreen, double fOffset_SceneToScreen )
-          , const B2DVector& rStartScreenPos, const B2DVector& rEndScreenPos
-          , const B2DVector& rAxisLineToLabelLineShift )
-          : TickmarkHelper( rScale, rIncrement )
-          , m_aAxisStartScreenPosition2D(rStartScreenPos)
-          , m_aAxisEndScreenPosition2D(rEndScreenPos)
-          , m_aAxisLineToLabelLineShift(rAxisLineToLabelLineShift)
-          , m_fStrech_LogicToScreen(1.0)
-          , m_fOffset_LogicToScreen(0.0)
-{
-    double fWidthY = m_fScaledVisibleMax - m_fScaledVisibleMin;
-    if( AxisOrientation_MATHEMATICAL==m_rScale.Orientation )
-    {
-        m_fStrech_LogicToScreen = 1.0/fWidthY;
-        m_fOffset_LogicToScreen = -m_fScaledVisibleMin;
-    }
-    else
-    {
-        B2DVector aSwap(m_aAxisStartScreenPosition2D);
-        m_aAxisStartScreenPosition2D = m_aAxisEndScreenPosition2D;
-        m_aAxisEndScreenPosition2D = aSwap;
-
-        m_fStrech_LogicToScreen = -1.0/fWidthY;
-        m_fOffset_LogicToScreen = -m_fScaledVisibleMax;
-    }
-}
-
-TickmarkHelper* TickmarkHelper_2D::createShiftedTickmarkHelper() const
-{
-    ExplicitIncrementData aShiftedIncrement( m_rIncrement );
-    aShiftedIncrement.BaseValue = m_rIncrement.BaseValue-m_rIncrement.Distance/2.0;
-
-    ::basegfx::B2DVector aStart( m_aAxisStartScreenPosition2D );
-    ::basegfx::B2DVector aEnd( m_aAxisEndScreenPosition2D );
-    if( AxisOrientation_MATHEMATICAL==m_rScale.Orientation )
-        std::swap( aStart, aEnd );
-
-    return new TickmarkHelper_2D( m_rScale, aShiftedIncrement, aStart, aEnd, m_aAxisLineToLabelLineShift );
-}
-
-TickmarkHelper_2D::~TickmarkHelper_2D()
-{
-}
-
-bool TickmarkHelper_2D::isHorizontalAxis() const
-{
-    return ( m_aAxisStartScreenPosition2D.getY() == m_aAxisEndScreenPosition2D.getY() );
-}
-bool TickmarkHelper_2D::isVerticalAxis() const
-{
-    return ( m_aAxisStartScreenPosition2D.getX() == m_aAxisEndScreenPosition2D.getX() );
-}
-
-sal_Int32 TickmarkHelper_2D::getTickScreenDistance( TickIter& rIter )
-{
-    //return the positive distance between the two first tickmarks in screen values
-    //if there are less than two tickmarks -1 is returned
-
-    const TickInfo* pFirstTickInfo = rIter.firstInfo();
-    const TickInfo* pSecondTickInfo = rIter.nextInfo();
-    if(!pSecondTickInfo  || !pFirstTickInfo)
-        return -1;
-
-    return pFirstTickInfo->getScreenDistanceBetweenTicks( *pSecondTickInfo );
-}
-
-B2DVector TickmarkHelper_2D::getTickScreenPosition2D( double fScaledLogicTickValue ) const
-{
-    B2DVector aRet(m_aAxisStartScreenPosition2D);
-    aRet += (m_aAxisEndScreenPosition2D-m_aAxisStartScreenPosition2D)
-                *((fScaledLogicTickValue+m_fOffset_LogicToScreen)*m_fStrech_LogicToScreen);
-    return aRet;
-}
-
-void TickmarkHelper_2D::addPointSequenceForTickLine( drawing::PointSequenceSequence& rPoints
-                                , sal_Int32 nSequenceIndex
-                                , double fScaledLogicTickValue, double fInnerDirectionSign
-                                , const TickmarkProperties& rTickmarkProperties
-                                , bool bPlaceAtLabels ) const
-{
-    if( fInnerDirectionSign==0.0 )
-        fInnerDirectionSign = 1.0;
-
-    B2DVector aTickScreenPosition = this->getTickScreenPosition2D(fScaledLogicTickValue);
-    if( bPlaceAtLabels )
-        aTickScreenPosition += m_aAxisLineToLabelLineShift;
-
-    B2DVector aMainDirection = m_aAxisEndScreenPosition2D-m_aAxisStartScreenPosition2D;
-    aMainDirection.normalize();
-    B2DVector aOrthoDirection(-aMainDirection.getY(),aMainDirection.getX());
-    aOrthoDirection *= fInnerDirectionSign;
-    aOrthoDirection.normalize();
-
-    B2DVector aStart = aTickScreenPosition + aOrthoDirection*rTickmarkProperties.RelativePos;
-    B2DVector aEnd = aStart - aOrthoDirection*rTickmarkProperties.Length;
-
-    rPoints[nSequenceIndex].realloc(2);
-    rPoints[nSequenceIndex][0].X = static_cast<sal_Int32>(aStart.getX());
-    rPoints[nSequenceIndex][0].Y = static_cast<sal_Int32>(aStart.getY());
-    rPoints[nSequenceIndex][1].X = static_cast<sal_Int32>(aEnd.getX());
-    rPoints[nSequenceIndex][1].Y = static_cast<sal_Int32>(aEnd.getY());
-}
-
-B2DVector TickmarkHelper_2D::getDistanceAxisTickToText( const AxisProperties& rAxisProperties, bool bIncludeFarAwayDistanceIfSo, bool bIncludeSpaceBetweenTickAndText ) const
-{
-    bool bFarAwayLabels = false;
-    if( ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_START == rAxisProperties.m_eLabelPos
-        || ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_END == rAxisProperties.m_eLabelPos )
-        bFarAwayLabels = true;
-
-    double fInnerDirectionSign = rAxisProperties.m_fInnerDirectionSign;
-    if( fInnerDirectionSign==0.0 )
-        fInnerDirectionSign = 1.0;
-
-    B2DVector aMainDirection = m_aAxisEndScreenPosition2D-m_aAxisStartScreenPosition2D;
-    aMainDirection.normalize();
-    B2DVector aOrthoDirection(-aMainDirection.getY(),aMainDirection.getX());
-    aOrthoDirection *= fInnerDirectionSign;
-    aOrthoDirection.normalize();
-
-    B2DVector aStart(0,0), aEnd(0,0);
-    if( bFarAwayLabels )
-    {
-        TickmarkProperties aProps( AxisProperties::getBiggestTickmarkProperties() );
-        aStart = aOrthoDirection*aProps.RelativePos;
-        aEnd = aStart - aOrthoDirection*aProps.Length;
-    }
-    else
-    {
-        for( sal_Int32 nN=rAxisProperties.m_aTickmarkPropertiesList.size();nN--;)
-        {
-            const TickmarkProperties& rProps = rAxisProperties.m_aTickmarkPropertiesList[nN];
-            B2DVector aNewStart = aOrthoDirection*rProps.RelativePos;
-            B2DVector aNewEnd = aNewStart - aOrthoDirection*rProps.Length;
-            if(aNewStart.getLength()>aStart.getLength())
-                aStart=aNewStart;
-            if(aNewEnd.getLength()>aEnd.getLength())
-                aEnd=aNewEnd;
-        }
-    }
-
-    B2DVector aLabelDirection(aStart);
-    if( rAxisProperties.m_fInnerDirectionSign != rAxisProperties.m_fLabelDirectionSign )
-        aLabelDirection = aEnd;
-
-    B2DVector aOrthoLabelDirection(aOrthoDirection);
-    if( rAxisProperties.m_fInnerDirectionSign != rAxisProperties.m_fLabelDirectionSign )
-        aOrthoLabelDirection*=-1.0;
-    aOrthoLabelDirection.normalize();
-    if( bIncludeSpaceBetweenTickAndText )
-        aLabelDirection += aOrthoLabelDirection*AXIS2D_TICKLABELSPACING;
-    if( bFarAwayLabels && bIncludeFarAwayDistanceIfSo )
-        aLabelDirection += m_aAxisLineToLabelLineShift;
-    return aLabelDirection;
-}
-
-void TickmarkHelper_2D::createPointSequenceForAxisMainLine( drawing::PointSequenceSequence& rPoints ) const
-{
-    rPoints[0].realloc(2);
-    rPoints[0][0].X = static_cast<sal_Int32>(m_aAxisStartScreenPosition2D.getX());
-    rPoints[0][0].Y = static_cast<sal_Int32>(m_aAxisStartScreenPosition2D.getY());
-    rPoints[0][1].X = static_cast<sal_Int32>(m_aAxisEndScreenPosition2D.getX());
-    rPoints[0][1].Y = static_cast<sal_Int32>(m_aAxisEndScreenPosition2D.getY());
-}
-
-void TickmarkHelper_2D::updateScreenValues( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const
-{
-    //get the transformed screen values for all tickmarks in rAllTickInfos
-    ::std::vector< ::std::vector< TickInfo > >::iterator aDepthIter       = rAllTickInfos.begin();
-    const ::std::vector< ::std::vector< TickInfo > >::const_iterator aDepthEnd  = rAllTickInfos.end();
-    for( ; aDepthIter != aDepthEnd; aDepthIter++ )
-    {
-        ::std::vector< TickInfo >::iterator       aTickIter = (*aDepthIter).begin();
-        const ::std::vector< TickInfo >::const_iterator aTickEnd  = (*aDepthIter).end();
-        for( ; aTickIter != aTickEnd; aTickIter++ )
-        {
-            TickInfo& rTickInfo = (*aTickIter);
-            rTickInfo.aTickScreenPosition =
-                this->getTickScreenPosition2D( rTickInfo.fScaledTickValue );
-        }
-    }
-}
-
-//-----------------------------------------------------------------------------
-// ___TickmarkHelper_3D___
-//-----------------------------------------------------------------------------
-TickmarkHelper_3D::TickmarkHelper_3D(
-          const ExplicitScaleData& rScale, const ExplicitIncrementData& rIncrement )
-          : TickmarkHelper( rScale, rIncrement )
-{
-}
-
-TickmarkHelper* TickmarkHelper_3D::createShiftedTickmarkHelper() const
-{
-    ExplicitIncrementData aShiftedIncrement( m_rIncrement );
-    aShiftedIncrement.BaseValue = m_rIncrement.BaseValue-m_rIncrement.Distance/2.0;
-    return new TickmarkHelper_3D( m_rScale, aShiftedIncrement );
-}
-
-TickmarkHelper_3D::~TickmarkHelper_3D()
-{
-}
-
-//.............................................................................
-} //namespace chart
-//.............................................................................
diff --git a/chart2/source/view/axes/TickmarkProperties.hxx b/chart2/source/view/axes/TickmarkProperties.hxx
index 09c0179d3698..cbb110908294 100644
--- a/chart2/source/view/axes/TickmarkProperties.hxx
+++ b/chart2/source/view/axes/TickmarkProperties.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -51,3 +52,5 @@ struct TickmarkProperties
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/axes/Tickmarks.cxx b/chart2/source/view/axes/Tickmarks.cxx
index 834fe66eb97b..6f6076ac3bf7 100644
--- a/chart2/source/view/axes/Tickmarks.cxx
+++ b/chart2/source/view/axes/Tickmarks.cxx
@@ -32,7 +32,6 @@
 #include "Tickmarks_Dates.hxx"
 #include "ViewDefines.hxx"
 #include <rtl/math.hxx>
-#include <tools/debug.hxx>
 #include <memory>
 
 //.............................................................................
@@ -93,7 +92,7 @@ TickInfo* PureTickIter::nextInfo()
 {
     if(m_aTickIter!=m_rTickVector.end())
     {
-        m_aTickIter++;
+        ++m_aTickIter;
         if(m_aTickIter!=m_rTickVector.end())
             return &*m_aTickIter;
     }
@@ -115,7 +114,7 @@ TickFactory::TickFactory(
     if( m_rScale.Scaling.is() )
     {
         m_xInverseScaling = m_rScale.Scaling->getInverseScaling();
-        DBG_ASSERT( m_xInverseScaling.is(), "each Scaling needs to return a inverse Scaling" );
+        OSL_ENSURE( m_xInverseScaling.is(), "each Scaling needs to return a inverse Scaling" );
     }
 
     m_fScaledVisibleMin = m_rScale.Minimum;
@@ -319,7 +318,7 @@ void TickFactory_2D::updateScreenValues( ::std::vector< ::std::vector< TickInfo
     {
         ::std::vector< TickInfo >::iterator       aTickIter = (*aDepthIter).begin();
         const ::std::vector< TickInfo >::const_iterator aTickEnd  = (*aDepthIter).end();
-        for( ; aTickIter != aTickEnd; aTickIter++ )
+        for( ; aTickIter != aTickEnd; ++aTickIter )
         {
             TickInfo& rTickInfo = (*aTickIter);
             rTickInfo.aTickScreenPosition =
diff --git a/chart2/source/view/axes/Tickmarks_Dates.cxx b/chart2/source/view/axes/Tickmarks_Dates.cxx
index fa466b755824..de5e43a24b05 100644
--- a/chart2/source/view/axes/Tickmarks_Dates.cxx
+++ b/chart2/source/view/axes/Tickmarks_Dates.cxx
@@ -30,7 +30,6 @@
 #include "Tickmarks_Dates.hxx"
 #include "DateScaling.hxx"
 #include <rtl/math.hxx>
-#include <tools/debug.hxx>
 #include "DateHelper.hxx"
 
 //.............................................................................
@@ -56,7 +55,7 @@ DateTickFactory::DateTickFactory(
     if( m_aScale.Scaling.is() )
     {
         m_xInverseScaling = m_aScale.Scaling->getInverseScaling();
-        DBG_ASSERT( m_xInverseScaling.is(), "each Scaling needs to return a inverse Scaling" );
+        OSL_ENSURE( m_xInverseScaling.is(), "each Scaling needs to return a inverse Scaling" );
     }
 
     m_fScaledVisibleMin = m_aScale.Minimum;
diff --git a/chart2/source/view/axes/Tickmarks_Equidistant.cxx b/chart2/source/view/axes/Tickmarks_Equidistant.cxx
index 9344af1ffac9..086011eece4f 100644
--- a/chart2/source/view/axes/Tickmarks_Equidistant.cxx
+++ b/chart2/source/view/axes/Tickmarks_Equidistant.cxx
@@ -30,7 +30,8 @@
 #include "Tickmarks_Equidistant.hxx"
 #include "ViewDefines.hxx"
 #include <rtl/math.hxx>
-#include <tools/debug.hxx>
+
+#include <limits>
 #include <memory>
 
 //.............................................................................
@@ -95,7 +96,7 @@ EquidistantTickFactory::EquidistantTickFactory(
     if( m_rScale.Scaling.is() )
     {
         m_xInverseScaling = m_rScale.Scaling->getInverseScaling();
-        DBG_ASSERT( m_xInverseScaling.is(), "each Scaling needs to return a inverse Scaling" );
+        OSL_ENSURE( m_xInverseScaling.is(), "each Scaling needs to return a inverse Scaling" );
     }
 
     double fMin = m_fScaledVisibleMin = m_rScale.Minimum;
@@ -214,7 +215,12 @@ sal_Int32 EquidistantTickFactory::getMaxTickCount( sal_Int32 nDepth ) const
     if (!isFinite(fSub))
         return 0;
 
-    sal_Int32 nIntervalCount = static_cast<sal_Int32>( fSub / m_rIncrement.Distance );
+    double fIntervalCount = fSub / m_rIncrement.Distance;
+    if (fIntervalCount > std::numeric_limits<sal_Int32>::max())
+        // Interval count too high!  Bail out.
+        return 0;
+
+    sal_Int32 nIntervalCount = static_cast<sal_Int32>(fIntervalCount);
 
     nIntervalCount+=3;
     for(sal_Int32 nN=0; nN<nDepth-1; nN++)
@@ -257,7 +263,7 @@ double* EquidistantTickFactory::getMinorTick( sal_Int32 nTick, sal_Int32 nDepth
 {
     //check validity of arguments
     {
-        //DBG_ASSERT( fStartParentTick < fNextParentTick, "fStartParentTick >= fNextParentTick");
+        //OSL_ENSURE( fStartParentTick < fNextParentTick, "fStartParentTick >= fNextParentTick");
         if(fStartParentTick >= fNextParentTick)
             return NULL;
         if(nDepth>static_cast<sal_Int32>(m_rIncrement.SubIncrements.size()) || nDepth<=0)
@@ -328,6 +334,9 @@ void EquidistantTickFactory::getAllTicks( ::std::vector< ::std::vector< TickInfo
     sal_Int32 nDepthCount = this->getTickDepth();
     sal_Int32 nMaxMajorTickCount = this->getMaxTickCount( 0 );
 
+    if (nDepthCount <= 0 || nMaxMajorTickCount <= 0)
+        return;
+
     aAllTicks.realloc(nDepthCount);
     aAllTicks[0].realloc(nMaxMajorTickCount);
 
diff --git a/chart2/source/view/axes/VAxisBase.cxx b/chart2/source/view/axes/VAxisBase.cxx
index fb193ec93a95..0012b8c863e5 100644
--- a/chart2/source/view/axes/VAxisBase.cxx
+++ b/chart2/source/view/axes/VAxisBase.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,9 +35,6 @@
 #include "Tickmarks.hxx"
 #include "macros.hxx"
 
-// header for define DBG_ASSERT
-#include <tools/debug.hxx>
-
 #include <memory>
 
 //.............................................................................
@@ -144,7 +142,7 @@ sal_Bool VAxisBase::isAnythingToDraw()
     if( !m_aAxisProperties.m_xAxisModel.is() )
         return false;
 
-    DBG_ASSERT(m_pShapeFactory&&m_xLogicTarget.is()&&m_xFinalTarget.is(),"Axis is not proper initialized");
+    OSL_ENSURE(m_pShapeFactory&&m_xLogicTarget.is()&&m_xFinalTarget.is(),"Axis is not proper initialized");
     if(!(m_pShapeFactory&&m_xLogicTarget.is()&&m_xFinalTarget.is()))
         return false;
 
@@ -234,7 +232,7 @@ void VAxisBase::removeTextShapesFromTicks()
         {
             ::std::vector< TickInfo >::iterator       aTickIter = (*aDepthIter).begin();
             const ::std::vector< TickInfo >::const_iterator aTickEnd  = (*aDepthIter).end();
-            for( ; aTickIter != aTickEnd; aTickIter++ )
+            for( ; aTickIter != aTickEnd; ++aTickIter )
             {
                 TickInfo& rTickInfo = (*aTickIter);
                 if(rTickInfo.xTextShape.is())
@@ -263,3 +261,5 @@ void VAxisBase::updateUnscaledValuesAtTicks( TickIter& rIter )
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/axes/VAxisBase.hxx b/chart2/source/view/axes/VAxisBase.hxx
index e51e2d8dbd9b..ecee96c8e339 100644
--- a/chart2/source/view/axes/VAxisBase.hxx
+++ b/chart2/source/view/axes/VAxisBase.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -108,3 +109,5 @@ protected: //member
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/axes/VAxisOrGridBase.cxx b/chart2/source/view/axes/VAxisOrGridBase.cxx
index 715da4972390..287ea2553144 100644
--- a/chart2/source/view/axes/VAxisOrGridBase.cxx
+++ b/chart2/source/view/axes/VAxisOrGridBase.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,9 +34,6 @@
 #include "CommonConverters.hxx"
 #include "Tickmarks.hxx"
 
-// header for define DBG_ASSERT
-#include <tools/debug.hxx>
-
 //.............................................................................
 namespace chart
 {
@@ -87,3 +85,5 @@ TickFactory* VAxisOrGridBase::createTickFactory()
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/axes/VAxisOrGridBase.hxx b/chart2/source/view/axes/VAxisOrGridBase.hxx
index 9091aabf0dc5..38a89b7b86f9 100644
--- a/chart2/source/view/axes/VAxisOrGridBase.hxx
+++ b/chart2/source/view/axes/VAxisOrGridBase.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -80,3 +81,5 @@ protected: //member
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx
index 9f710d926e0c..1063789d1db7 100644
--- a/chart2/source/view/axes/VAxisProperties.cxx
+++ b/chart2/source/view/axes/VAxisProperties.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -400,16 +401,7 @@ AxisLabelProperties::AxisLabelProperties()
                         , nRhythm( 1 )
                         , bRhythmIsFix(false)
 {
-    /*
-    aLocale.Language = C2U( "en" );
-    aLocale.Country  = C2U( "US" );
-
-    //aLocale.Language = C2U( "ar" );
-    //aLocale.Country  = C2U( "IR" );
 
-    //aLocale.Language = C2U( "ja" );
-    //aLocale.Country  = C2U( "JP" );
-    */
 }
 
 void AxisLabelProperties::init( const uno::Reference< XAxis >& xAxisModel )
@@ -450,28 +442,6 @@ void AxisLabelProperties::init( const uno::Reference< XAxis >& xAxisModel )
     }
 }
 
-/*
-sal_Int16 getSwappedWritingMode( sal_Int16 nWritingMode )
-{
-    //LR_TB == LT
-    //RL_TB == RT (Arabic, Hebrew)
-    //TB_RL == TR (Japanese, Chinese, Korean)
-    // ?? TL (Mongolian) see also text::WritingMode2
-
-    switch(nWritingMode)
-    {
-        case text::WritingMode2::RL_TB:
-            return  text::WritingMode2::TB_RL;
-        case text::WritingMode2::TB_RL:
-            return  text::WritingMode2::RL_TB;
-        case text::WritingMode2::LR_TB:
-            return  text::WritingMode2::TB_LR;
-        default:
-            return  text::WritingMode2::LR_TB;
-    }
-}
-*/
-
 sal_Bool AxisLabelProperties::getIsStaggered() const
 {
     if( STAGGER_ODD == eStaggering || STAGGER_EVEN == eStaggering )
@@ -482,3 +452,5 @@ sal_Bool AxisLabelProperties::getIsStaggered() const
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/axes/VAxisProperties.hxx b/chart2/source/view/axes/VAxisProperties.hxx
index 69e0edb82730..9e57ee4b5c65 100644
--- a/chart2/source/view/axes/VAxisProperties.hxx
+++ b/chart2/source/view/axes/VAxisProperties.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -165,3 +166,5 @@ protected:
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx
index 23c36a8c5ed7..111982dbf2d2 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -877,7 +878,7 @@ B2DVector VCartesianAxis::getScreenPosition( double fLogicX, double fLogicY, dou
             }
             else
             {
-                DBG_ERROR("cannot calculate scrren position in VCartesianAxis::getScreenPosition");
+                OSL_FAIL("cannot calculate scrren position in VCartesianAxis::getScreenPosition");
             }
         }
         else
@@ -1486,7 +1487,7 @@ void VCartesianAxis::updatePositions()
         {
             ::std::vector< TickInfo >::iterator aTickIter = aDepthIter->begin();
             const ::std::vector< TickInfo >::const_iterator aTickEnd  = aDepthIter->end();
-            for( ; aTickIter != aTickEnd; aTickIter++ )
+            for( ; aTickIter != aTickEnd; ++aTickIter )
             {
                 TickInfo& rTickInfo = (*aTickIter);
                 Reference< drawing::XShape > xShape2DText( rTickInfo.xTextShape );
@@ -1540,7 +1541,7 @@ void VCartesianAxis::createTickMarkLineShapes( ::std::vector< TickInfo >& rTickI
     ::std::vector< TickInfo >::const_iterator       aTickIter = rTickInfos.begin();
     const ::std::vector< TickInfo >::const_iterator aTickEnd  = rTickInfos.end();
     sal_Int32 nN = 0;
-    for( ; aTickIter != aTickEnd; aTickIter++ )
+    for( ; aTickIter != aTickEnd; ++aTickIter )
     {
         if( !(*aTickIter).bPaintIt )
             continue;
@@ -1670,3 +1671,5 @@ void VCartesianAxis::createShapes()
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/axes/VCartesianAxis.hxx b/chart2/source/view/axes/VCartesianAxis.hxx
index d199a112bab1..68c93bb2e101 100644
--- a/chart2/source/view/axes/VCartesianAxis.hxx
+++ b/chart2/source/view/axes/VCartesianAxis.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -135,3 +136,5 @@ protected: //methods
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
index ca83850a88ff..53c0da1c12fe 100644
--- a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -120,9 +121,6 @@ void VCartesianCoordinateSystem::createVAxisList(
 {
     m_aAxisMap.clear();
 
-    //if(!m_xLogicTargetForAxes.is() || !m_xFinalTarget.is() || !m_xCooSysModel.is() )
-    //    return;
-
     sal_Int32 nDimensionCount = m_xCooSysModel->getDimension();
     bool bSwapXAndY = this->getPropertySwapXAndYAxis();
 
@@ -165,7 +163,7 @@ void VCartesianCoordinateSystem::createVAxisList(
             aAxisProperties.init(true);
             if(aAxisProperties.m_bDisplayLabels)
                 aAxisProperties.m_nNumberFormatKey = this->getNumberFormatKeyForAxis( xAxis, xNumberFormatsSupplier );
-            //-------------------
+
             ::boost::shared_ptr< VAxisBase > apVAxis( new VCartesianAxis(aAxisProperties,xNumberFormatsSupplier,nDimensionIndex,nDimensionCount) );
             tFullAxisIndex aFullAxisIndex( nDimensionIndex, nAxisIndex );
             m_aAxisMap[aFullAxisIndex] = apVAxis;
@@ -231,3 +229,5 @@ void VCartesianCoordinateSystem::updateScalesAndIncrementsOnAxes()
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.hxx b/chart2/source/view/axes/VCartesianCoordinateSystem.hxx
index b28400c6f906..852ce48ff2c3 100644
--- a/chart2/source/view/axes/VCartesianCoordinateSystem.hxx
+++ b/chart2/source/view/axes/VCartesianCoordinateSystem.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -62,3 +63,5 @@ private:
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/axes/VCartesianGrid.cxx b/chart2/source/view/axes/VCartesianGrid.cxx
index ff93feefa228..bbd95df1a307 100644
--- a/chart2/source/view/axes/VCartesianGrid.cxx
+++ b/chart2/source/view/axes/VCartesianGrid.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -273,7 +274,7 @@ void VCartesianGrid::createShapes()
             ::std::vector< TickInfo >::const_iterator       aTickIter = (*aDepthIter).begin();
             const ::std::vector< TickInfo >::const_iterator aTickEnd  = (*aDepthIter).end();
             sal_Int32 nRealPointCount = 0;
-            for( ; aTickIter != aTickEnd; aTickIter++ )
+            for( ; aTickIter != aTickEnd; ++aTickIter )
             {
                 if( !(*aTickIter).bPaintIt )
                     continue;
@@ -313,7 +314,7 @@ void VCartesianGrid::createShapes()
             const ::std::vector< TickInfo >::const_iterator aTickEnd  = (*aDepthIter).end();
             sal_Int32 nRealPointCount = 0;
             sal_Int32 nPolyIndex = 0;
-            for( ; aTickIter != aTickEnd; aTickIter++, nPolyIndex++ )
+            for( ; aTickIter != aTickEnd; ++aTickIter, ++nPolyIndex )
             {
                 if( !(*aTickIter).bPaintIt )
                     continue;
@@ -333,3 +334,5 @@ void VCartesianGrid::createShapes()
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/axes/VCartesianGrid.hxx b/chart2/source/view/axes/VCartesianGrid.hxx
index 0a0f8b91716f..a2d7e1d1ddac 100644
--- a/chart2/source/view/axes/VCartesianGrid.hxx
+++ b/chart2/source/view/axes/VCartesianGrid.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -69,3 +70,5 @@ private:
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx
index 42e6042d7e70..ba8a9b6443f3 100644
--- a/chart2/source/view/axes/VCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCoordinateSystem.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -48,8 +49,6 @@
 #include <com/sun/star/chart2/XChartTypeContainer.hpp>
 #include <com/sun/star/chart2/XDataSeriesContainer.hpp>
 
-// header for define DBG_ASSERT
-#include <tools/debug.hxx>
 #include <rtl/math.hxx>
 
 //.............................................................................
@@ -112,7 +111,7 @@ void VCoordinateSystem::initPlottingTargets(  const Reference< drawing::XShapes
        , Reference< drawing::XShapes >& xLogicTargetForSeriesBehindAxis )
             throw (uno::RuntimeException)
 {
-    DBG_ASSERT(xLogicTarget.is()&&xFinalTarget.is()&&xShapeFactory.is(),"no proper initialization parameters");
+    OSL_PRECOND(xLogicTarget.is()&&xFinalTarget.is()&&xShapeFactory.is(),"no proper initialization parameters");
     //is only allowed to be called once
 
     sal_Int32 nDimensionCount = m_xCooSysModel->getDimension();
@@ -601,3 +600,5 @@ sal_Int32 VCoordinateSystem::getNumberFormatKeyForAxis(
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/axes/VPolarAngleAxis.cxx b/chart2/source/view/axes/VPolarAngleAxis.cxx
index c23d6b95629d..ae4535ca20f4 100644
--- a/chart2/source/view/axes/VPolarAngleAxis.cxx
+++ b/chart2/source/view/axes/VPolarAngleAxis.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -178,7 +179,6 @@ void VPolarAngleAxis::createLabels()
         return;
 
     double fLogicRadius = m_pPosHelper->getOuterLogicRadius();
-    double fLogicZ      = 1.0;//as defined
 
     if( m_aAxisProperties.m_bDisplayLabels )
     {
@@ -196,6 +196,7 @@ void VPolarAngleAxis::createLabels()
 
         AxisLabelProperties aAxisLabelProperties( m_aAxisLabelProperties );
         aAxisLabelProperties.bOverlapAllowed = true;
+        double fLogicZ      = 1.0;//as defined
         while( !createTextShapes_ForAngleAxis( m_xTextTarget, aTickIter
                         , aAxisLabelProperties
                         , fLogicRadius, fLogicZ
@@ -232,3 +233,5 @@ void VPolarAngleAxis::createShapes()
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/axes/VPolarAngleAxis.hxx b/chart2/source/view/axes/VPolarAngleAxis.hxx
index 011033faaefa..97cb7bf7463b 100644
--- a/chart2/source/view/axes/VPolarAngleAxis.hxx
+++ b/chart2/source/view/axes/VPolarAngleAxis.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -65,3 +66,5 @@ private: //methods
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/axes/VPolarAxis.cxx b/chart2/source/view/axes/VPolarAxis.cxx
index 5f818da6c959..687ac8fe8780 100644
--- a/chart2/source/view/axes/VPolarAxis.cxx
+++ b/chart2/source/view/axes/VPolarAxis.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -81,3 +82,5 @@ sal_Bool VPolarAxis::isAnythingToDraw()
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/axes/VPolarAxis.hxx b/chart2/source/view/axes/VPolarAxis.hxx
index a72b338416e2..5d4d667297e9 100644
--- a/chart2/source/view/axes/VPolarAxis.hxx
+++ b/chart2/source/view/axes/VPolarAxis.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -67,3 +68,5 @@ protected: //member
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/axes/VPolarCoordinateSystem.cxx b/chart2/source/view/axes/VPolarCoordinateSystem.cxx
index 5d13f5c46f66..7e13c26477cd 100644
--- a/chart2/source/view/axes/VPolarCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VPolarCoordinateSystem.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -80,13 +81,7 @@ void VPolarCoordinateSystem::createVAxisList(
             )
 {
     m_aAxisMap.clear();
-
-    //if(!m_xLogicTargetForAxes.is() || !m_xFinalTarget.is() || !m_xCooSysModel.is() )
-    //    return;
-
     sal_Int32 nDimensionCount = m_xCooSysModel->getDimension();
-//     bool bSwapXAndY = this->getPropertySwapXAndYAxis();
-
     sal_Int32 nDimensionIndex = 0;
 
     //create angle axis (dimension index 0)
@@ -102,7 +97,7 @@ void VPolarCoordinateSystem::createVAxisList(
             aAxisProperties.init();
             if(aAxisProperties.m_bDisplayLabels)
                 aAxisProperties.m_nNumberFormatKey = this->getNumberFormatKeyForAxis( xAxis, xNumberFormatsSupplier );
-            //-------------------
+
             ::boost::shared_ptr< VAxisBase > apVAxis( VPolarAxis::createAxis( aAxisProperties,xNumberFormatsSupplier,nDimensionIndex,nDimensionCount) );
             tFullAxisIndex aFullAxisIndex( nDimensionIndex, nAxisIndex );
             m_aAxisMap[aFullAxisIndex] = apVAxis;
@@ -200,3 +195,5 @@ void VPolarCoordinateSystem::createGridShapes()
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/axes/VPolarCoordinateSystem.hxx b/chart2/source/view/axes/VPolarCoordinateSystem.hxx
index f1ba84c5469e..c3d9faa0639a 100644
--- a/chart2/source/view/axes/VPolarCoordinateSystem.hxx
+++ b/chart2/source/view/axes/VPolarCoordinateSystem.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -66,3 +67,5 @@ private:
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/axes/VPolarGrid.cxx b/chart2/source/view/axes/VPolarGrid.cxx
index 30becdf4725d..1d9a3cbb712e 100644
--- a/chart2/source/view/axes/VPolarGrid.cxx
+++ b/chart2/source/view/axes/VPolarGrid.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -147,7 +148,7 @@ void VPolarGrid::create2DAngleGrid( const Reference< drawing::XShapes >& xLogicT
         drawing::PointSequenceSequence aAllPoints;
         ::std::vector< TickInfo >::iterator             aTickIter = (*aDepthIter).begin();
         const ::std::vector< TickInfo >::const_iterator aTickEnd  = (*aDepthIter).end();
-        for( ; aTickIter != aTickEnd; aTickIter++ )
+        for( ; aTickIter != aTickEnd; ++aTickIter )
         {
             TickInfo& rTickInfo = *aTickIter;
             if( !rTickInfo.bPaintIt )
@@ -214,7 +215,7 @@ void VPolarGrid::create2DRadiusGrid( const Reference< drawing::XShapes >& xLogic
         drawing::PointSequenceSequence aAllPoints;
         ::std::vector< TickInfo >::iterator             aTickIter = (*aDepthIter).begin();
         const ::std::vector< TickInfo >::const_iterator aTickEnd  = (*aDepthIter).end();
-        for( ; aTickIter != aTickEnd; aTickIter++ )
+        for( ; aTickIter != aTickEnd; ++aTickIter )
         {
             TickInfo& rTickInfo = *aTickIter;
             if( !rTickInfo.bPaintIt )
@@ -240,7 +241,7 @@ void VPolarGrid::create2DRadiusGrid( const Reference< drawing::XShapes >& xLogic
 
 void VPolarGrid::createShapes()
 {
-    DBG_ASSERT(m_pShapeFactory&&m_xLogicTarget.is()&&m_xFinalTarget.is(),"Axis is not proper initialized");
+    OSL_PRECOND(m_pShapeFactory&&m_xLogicTarget.is()&&m_xFinalTarget.is(),"Axis is not proper initialized");
     if(!(m_pShapeFactory&&m_xLogicTarget.is()&&m_xFinalTarget.is()))
         return;
     if(!m_aGridPropertiesList.getLength())
@@ -271,3 +272,5 @@ void VPolarGrid::createShapes()
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/axes/VPolarGrid.hxx b/chart2/source/view/axes/VPolarGrid.hxx
index 1ea3bccc1f90..29882792cabf 100644
--- a/chart2/source/view/axes/VPolarGrid.hxx
+++ b/chart2/source/view/axes/VPolarGrid.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -80,15 +81,11 @@ private: //member
                     , ::std::vector< ::std::vector< TickInfo > >& rRadiusTickInfos
                     , ::std::vector< ::std::vector< TickInfo > >& rAngleTickInfos
                     , const ::std::vector<VLineProperties>& rLinePropertiesList );
-#if NOTYET
-    void    create2DAngleGrid( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xLogicTarget
-                    , ::std::vector< ::std::vector< TickInfo > >& rRadiusTickInfos
-                    , ::std::vector< ::std::vector< TickInfo > >& rAngleTickInfos
-                    , const ::std::vector<VLineProperties>& rLinePropertiesList );
-#endif
 };
 
 //.............................................................................
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/axes/VPolarRadiusAxis.cxx b/chart2/source/view/axes/VPolarRadiusAxis.cxx
index bc56b3824e6e..92abb0af8bbe 100644
--- a/chart2/source/view/axes/VPolarRadiusAxis.cxx
+++ b/chart2/source/view/axes/VPolarRadiusAxis.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -183,3 +184,5 @@ void VPolarRadiusAxis::createShapes()
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/axes/VPolarRadiusAxis.hxx b/chart2/source/view/axes/VPolarRadiusAxis.hxx
index e1dbb8c1b1c0..70482b403283 100644
--- a/chart2/source/view/axes/VPolarRadiusAxis.hxx
+++ b/chart2/source/view/axes/VPolarRadiusAxis.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -92,3 +93,5 @@ private: //member
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/axes/makefile.mk b/chart2/source/view/axes/makefile.mk
deleted file mode 100644
index af88a61b6b37..000000000000
--- a/chart2/source/view/axes/makefile.mk
+++ /dev/null
@@ -1,70 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=				..$/..$/..
-PRJINC=				$(PRJ)$/source
-PRJNAME=			chart2
-TARGET=				chvaxes
-
-ENABLE_EXCEPTIONS=	TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE: settings.mk
-.INCLUDE: $(PRJ)$/chartview.pmk
-
-#.IF "$(GUI)" == "WNT"
-#CFLAGS+=-GR
-#.ENDIF
-
-# --- export library -------------------------------------------------
-
-#object files to build and link together to lib $(SLB)$/$(TARGET).lib
-SLOFILES = \
-    $(SLO)$/VAxisOrGridBase.obj \
-    $(SLO)$/VAxisBase.obj \
-    $(SLO)$/DateHelper.obj \
-    $(SLO)$/DateScaling.obj \
-    $(SLO)$/Tickmarks.obj \
-    $(SLO)$/Tickmarks_Equidistant.obj \
-    $(SLO)$/Tickmarks_Dates.obj \
-    $(SLO)$/MinimumAndMaximumSupplier.obj \
-    $(SLO)$/ScaleAutomatism.obj \
-    $(SLO)$/VAxisProperties.obj \
-    $(SLO)$/VCartesianAxis.obj \
-    $(SLO)$/VCartesianGrid.obj \
-    $(SLO)$/VCartesianCoordinateSystem.obj \
-    $(SLO)$/VPolarAxis.obj \
-    $(SLO)$/VPolarAngleAxis.obj \
-    $(SLO)$/VPolarRadiusAxis.obj \
-    $(SLO)$/VPolarGrid.obj \
-    $(SLO)$/VPolarCoordinateSystem.obj \
-    $(SLO)$/VCoordinateSystem.obj
-
-# --- Targets -----------------------------------------------------------------
-
-.INCLUDE: target.mk
diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx
index 41bec1f9c331..e151dc65ac38 100644
--- a/chart2/source/view/charttypes/AreaChart.cxx
+++ b/chart2/source/view/charttypes/AreaChart.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,7 +33,6 @@
 #include "AreaChart.hxx"
 #include "PlottingPositionHelper.hxx"
 #include "ShapeFactory.hxx"
-//#include "chartview/servicenames_charttypes.hxx"
 #include "CommonConverters.hxx"
 #include "macros.hxx"
 #include "ViewDefines.hxx"
@@ -49,7 +49,6 @@
 #include <com/sun/star/chart/DataLabelPlacement.hpp>
 #include <com/sun/star/chart/MissingValueTreatment.hpp>
 
-#include <tools/debug.hxx>
 #include <editeng/unoprnms.hxx>
 #include <rtl/math.hxx>
 
@@ -229,7 +228,7 @@ void AreaChart::addSeries( VDataSeries* pSeries, sal_Int32 zSlot, sal_Int32 xSlo
     if( m_nDimension == 3 && !m_bCategoryXAxis )
     {
         //3D xy always deep
-        DBG_ASSERT( zSlot==-1,"3D xy charts should be deep stacked in model also" );
+        OSL_ENSURE( zSlot==-1,"3D xy charts should be deep stacked in model also" );
         zSlot=-1;
         xSlot=0;
         ySlot=0;
@@ -498,13 +497,13 @@ void AreaChart::impl_createSeriesShapes()
     ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator            aZSlotIter = m_aZSlots.begin();
     const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
 //=============================================================================
-    for( sal_Int32 nZ=1; aZSlotIter != aZSlotEnd; aZSlotIter++, nZ++ )
+    for( sal_Int32 nZ=1; aZSlotIter != aZSlotEnd; ++aZSlotIter, ++nZ )
     {
         ::std::vector< VDataSeriesGroup >::iterator             aXSlotIter = aZSlotIter->begin();
         const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
 
     //=============================================================================
-        for( ; aXSlotIter != aXSlotEnd; aXSlotIter++ )
+        for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter )
         {
             ::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
 
@@ -516,7 +515,7 @@ void AreaChart::impl_createSeriesShapes()
             drawing::PolyPolygonShape3D* pSeriesPoly = NULL;
 
             //iterate through all series
-            for( ; aSeriesIter != aSeriesEnd; aSeriesIter++ )
+            for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter )
             {
                 sal_Int32 nAttachedAxisIndex = (*aSeriesIter)->getAttachedAxisIndex();
                 PlottingPositionHelper* pPosHelper = &(this->getPlottingPositionHelper( nAttachedAxisIndex ));
@@ -597,7 +596,7 @@ void AreaChart::createShapes()
     if( m_nDimension == 2 && ( m_bArea || !m_bCategoryXAxis ) )
         lcl_reorderSeries( m_aZSlots );
 
-    DBG_ASSERT(m_pShapeFactory&&m_xLogicTarget.is()&&m_xFinalTarget.is(),"AreaChart is not proper initialized");
+    OSL_ENSURE(m_pShapeFactory&&m_xLogicTarget.is()&&m_xFinalTarget.is(),"AreaChart is not proper initialized");
     if(!(m_pShapeFactory&&m_xLogicTarget.is()&&m_xFinalTarget.is()))
         return;
 
@@ -646,13 +645,13 @@ void AreaChart::createShapes()
             const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
 
             //iterate through all x slots in this category to get 100percent sum
-            for( ; aXSlotIter != aXSlotEnd; aXSlotIter++ )
+            for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter )
             {
                 ::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
                 ::std::vector< VDataSeries* >::const_iterator       aSeriesIter = pSeriesList->begin();
                 const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd  = pSeriesList->end();
 
-                for( ; aSeriesIter != aSeriesEnd; aSeriesIter++ )
+                for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter )
                 {
                     VDataSeries* pSeries( *aSeriesIter );
                     if(!pSeries)
@@ -684,7 +683,7 @@ void AreaChart::createShapes()
             //for the area chart there should be at most one x slot (no side by side stacking available)
             //attention different: xSlots are always interpreted as independent areas one behind the other: @todo this doesn't work why not???
             aXSlotIter = aZSlotIter->begin();
-            for( sal_Int32 nX=0; aXSlotIter != aXSlotEnd; aXSlotIter++, nX++ )
+            for( sal_Int32 nX=0; aXSlotIter != aXSlotEnd; ++aXSlotIter, ++nX )
             {
                 ::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
                 ::std::vector< VDataSeries* >::const_iterator       aSeriesIter = pSeriesList->begin();
@@ -693,7 +692,7 @@ void AreaChart::createShapes()
                 std::map< sal_Int32, double > aLogicYForNextSeriesMap;//one for each different nAttachedAxisIndex
     //=============================================================================
                 //iterate through all series
-                for( sal_Int32 nSeriesIndex = 0; aSeriesIter != aSeriesEnd; aSeriesIter++, nSeriesIndex++ )
+                for( sal_Int32 nSeriesIndex = 0; aSeriesIter != aSeriesEnd; ++aSeriesIter, ++nSeriesIndex )
                 {
                     VDataSeries* pSeries( *aSeriesIter );
                     if(!pSeries)
@@ -930,7 +929,7 @@ void AreaChart::createShapes()
                                 //todo implement this different for area charts
                                 break;
                             default:
-                                DBG_ERROR("this label alignment is not implemented yet");
+                                OSL_FAIL("this label alignment is not implemented yet");
                                 aScenePosition3D.PositionY -= (aSymbolSize.DirectionY/2+1);
                                 eAlignment = LABEL_ALIGN_TOP;
                                 break;
@@ -995,3 +994,5 @@ void AreaChart::createShapes()
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/charttypes/AreaChart.hxx b/chart2/source/view/charttypes/AreaChart.hxx
index 972d97fa75ac..abd887319bc1 100644
--- a/chart2/source/view/charttypes/AreaChart.hxx
+++ b/chart2/source/view/charttypes/AreaChart.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -121,3 +122,5 @@ private: //member
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx
index dbf01165bf79..f1513e32493f 100644
--- a/chart2/source/view/charttypes/BarChart.cxx
+++ b/chart2/source/view/charttypes/BarChart.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,8 +32,6 @@
 
 #include "BarChart.hxx"
 #include "ShapeFactory.hxx"
-//#include "chartview/servicenames_charttypes.hxx"
-//#include "servicenames_coosystems.hxx"
 #include "CommonConverters.hxx"
 #include "ObjectIdentifier.hxx"
 #include "LabelPositionHelper.hxx"
@@ -45,7 +44,6 @@
 #include <com/sun/star/chart/DataLabelPlacement.hpp>
 
 #include <com/sun/star/chart2/DataPointGeometry3D.hpp>
-#include <tools/debug.hxx>
 #include <rtl/math.hxx>
 
 //.............................................................................
@@ -56,10 +54,6 @@ using namespace ::com::sun::star;
 using namespace ::rtl::math;
 using namespace ::com::sun::star::chart2;
 
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
 BarChart::BarChart( const uno::Reference<XChartType>& xChartTypeModel
                     , sal_Int32 nDimensionCount )
         : VSeriesPlotter( xChartTypeModel, nDimensionCount )
@@ -174,7 +168,7 @@ awt::Point BarChart::getLabelScreenPositionAndAlignment(
             {
                 fY -= (fScaledUpperYValue-fScaledLowerYValue)/2.0;
                 rAlignment = LABEL_ALIGN_CENTER;
-                DBG_ERROR( "top label placement is not really supported by horizontal bar charts" );
+                OSL_FAIL( "top label placement is not really supported by horizontal bar charts" );
             }
         }
         break;
@@ -191,7 +185,7 @@ awt::Point BarChart::getLabelScreenPositionAndAlignment(
             {
                 fY -= (fScaledUpperYValue-fScaledLowerYValue)/2.0;
                 rAlignment = LABEL_ALIGN_CENTER;
-                DBG_ERROR( "bottom label placement is not supported by horizontal bar charts" );
+                OSL_FAIL( "bottom label placement is not supported by horizontal bar charts" );
             }
         }
         break;
@@ -208,7 +202,7 @@ awt::Point BarChart::getLabelScreenPositionAndAlignment(
             {
                 fY -= (fScaledUpperYValue-fScaledLowerYValue)/2.0;
                 rAlignment = LABEL_ALIGN_CENTER;
-                DBG_ERROR( "left label placement is not supported by column charts" );
+                OSL_FAIL( "left label placement is not supported by column charts" );
             }
         }
         break;
@@ -225,7 +219,7 @@ awt::Point BarChart::getLabelScreenPositionAndAlignment(
             {
                 fY -= (fScaledUpperYValue-fScaledLowerYValue)/2.0;
                 rAlignment = LABEL_ALIGN_CENTER;
-                DBG_ERROR( "right label placement is not supported by column charts" );
+                OSL_FAIL( "right label placement is not supported by column charts" );
             }
         }
         break;
@@ -269,7 +263,7 @@ awt::Point BarChart::getLabelScreenPositionAndAlignment(
             fDepth = fabs(fScaledUpperBarDepth-fScaledLowerBarDepth)/2.0;
         break;
     default:
-        DBG_ERROR("this label alignment is not implemented yet");
+        OSL_FAIL("this label alignment is not implemented yet");
 
         break;
     }
@@ -426,7 +420,7 @@ void BarChart::createShapes()
     if( m_aZSlots.begin() == m_aZSlots.end() ) //no series
         return;
 
-    DBG_ASSERT(m_pShapeFactory&&m_xLogicTarget.is()&&m_xFinalTarget.is(),"BarChart is not proper initialized");
+    OSL_ENSURE(m_pShapeFactory&&m_xLogicTarget.is()&&m_xFinalTarget.is(),"BarChart is not proper initialized");
     if(!(m_pShapeFactory&&m_xLogicTarget.is()&&m_xFinalTarget.is()))
         return;
 
@@ -481,7 +475,7 @@ void BarChart::createShapes()
             ::std::vector< VDataSeriesGroup >::iterator             aXSlotIter = aZSlotIter->begin();
             const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
 
-            for( aXSlotIter = aZSlotIter->begin(); aXSlotIter != aXSlotEnd; aXSlotIter++ )
+            for( aXSlotIter = aZSlotIter->begin(); aXSlotIter != aXSlotEnd; ++aXSlotIter )
             {
                 sal_Int32 nAttachedAxisIndex = aXSlotIter->getAttachedAxisIndexForFirstSeries();
                 if( aLogicYSumMap.find(nAttachedAxisIndex)==aLogicYSumMap.end() )
@@ -508,7 +502,7 @@ void BarChart::createShapes()
 //=============================================================================
             //iterate through all x slots in this category
             double fSlotX=0;
-            for( aXSlotIter = aZSlotIter->begin(); aXSlotIter != aXSlotEnd; aXSlotIter++, fSlotX+=1.0 )
+            for( aXSlotIter = aZSlotIter->begin(); aXSlotIter != aXSlotEnd; ++aXSlotIter, fSlotX+=1.0 )
             {
                 sal_Int32 nAttachedAxisIndex = 0;
                 BarPositionHelper* pPosHelper = m_pMainPosHelper;
@@ -575,7 +569,7 @@ void BarChart::createShapes()
                 aSeriesIter = pSeriesList->begin();
     //=============================================================================
                 //iterate through all series in this x slot
-                for( ; aSeriesIter != aSeriesEnd; aSeriesIter++ )
+                for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter )
                 {
                     VDataSeries* pSeries( *aSeriesIter );
                     if(!pSeries)
@@ -805,27 +799,6 @@ void BarChart::createShapes()
                             }
                             else //m_nDimension!=3
                             {
-                                //if( bCreateLineInsteadOfComplexGeometryDueToMissingSpace )
-                                //{
-                                //    drawing::PolyPolygonShape3D aPoly;
-                                //    drawing::Position3D aUpperPoint( fLogicX,fUpperYValue,fLogicZ );
-                                //    drawing::Position3D aLowerPoint( fLogicX,fLowerYValue,fLogicZ );
-
-                                //    AddPointToPoly( aPoly, aUpperPoint );
-                                //    AddPointToPoly( aPoly, aLowerPoint );
-
-                                //    VLineProperties aLineProperties;
-                                //    aLineProperties.initFromPropertySet( xDataPointProperties, true /*bUseSeriesPropertyNames*/ );
-                                //    if( !aLineProperties.isLineVisible() )
-                                //    {
-                                //        //todo
-                                //        //aLineProperties.Color =
-                                //    }
-
-                                //    xShape = m_pShapeFactory->createLine2D( xPointGroupShape_Shapes
-                                //                , PolyToPointSequence(aPoly), &aLineProperties );
-                                //}
-
                                 drawing::PolyPolygonShape3D aPoly;
                                 drawing::Position3D aLeftUpperPoint( fLogicX-fLogicBarWidth/2.0,fUpperYValue,fLogicZ );
                                 drawing::Position3D aRightUpperPoint( fLogicX+fLogicBarWidth/2.0,fUpperYValue,fLogicZ );
@@ -886,9 +859,6 @@ void BarChart::createShapes()
 
                     }//end iteration through partial points
 
-                    //remove PointGroupShape if empty
-    //                if(!xPointGroupShape_Shapes->getCount())
-    //                    xSeriesGroupShape_Shapes->remove(xPointGroupShape_Shape);
                 }//next series in x slot (next y slot)
             }//next x slot
         }//next z slot
@@ -919,7 +889,7 @@ void BarChart::createShapes()
 
 //=============================================================================
             //iterate through all x slots in this category
-            for( double fSlotX=0; aXSlotIter != aXSlotEnd; aXSlotIter++, fSlotX+=1.0 )
+            for( double fSlotX=0; aXSlotIter != aXSlotEnd; ++aXSlotIter, fSlotX+=1.0 )
             {
                 ::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
 
@@ -928,7 +898,7 @@ void BarChart::createShapes()
                 aSeriesIter = pSeriesList->begin();
 //=============================================================================
                 //iterate through all series in this x slot
-                for( ; aSeriesIter != aSeriesEnd; aSeriesIter++ )
+                for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter )
                 {
                     VDataSeries* pSeries( *aSeriesIter );
                     if(!pSeries)
@@ -958,21 +928,13 @@ void BarChart::createShapes()
     }
 
     /* @todo remove series shapes if empty
-    //remove and delete point-group-shape if empty
-    if(!xSeriesGroupShape_Shapes->getCount())
-    {
-        (*aSeriesIter)->m_xShape.set(NULL);
-        m_xLogicTarget->remove(xSeriesGroupShape_Shape);
-    }
     */
 
-    //remove and delete series-group-shape if empty
-
-    //... todo
-
     OSL_TRACE( "\nPPPPPPPPP<<<<<<<<<<<< bar chart :: createShapes():: skipped points: %d created points: %d", nSkippedPoints, nCreatedPoints );
 }
 
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/charttypes/BarChart.hxx b/chart2/source/view/charttypes/BarChart.hxx
index c20c85168b5d..93816beb33ae 100644
--- a/chart2/source/view/charttypes/BarChart.hxx
+++ b/chart2/source/view/charttypes/BarChart.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -92,3 +93,5 @@ private: //member
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/charttypes/BarPositionHelper.cxx b/chart2/source/view/charttypes/BarPositionHelper.cxx
index 45dab527da11..2cf585ba0097 100644
--- a/chart2/source/view/charttypes/BarPositionHelper.cxx
+++ b/chart2/source/view/charttypes/BarPositionHelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -89,3 +90,5 @@ void BarPositionHelper::setScaledCategoryWidth( double fScaledCategoryWidth )
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/charttypes/BarPositionHelper.hxx b/chart2/source/view/charttypes/BarPositionHelper.hxx
index 3a905877bcb9..515421957b31 100644
--- a/chart2/source/view/charttypes/BarPositionHelper.hxx
+++ b/chart2/source/view/charttypes/BarPositionHelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -59,3 +60,5 @@ public:
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx
index 3dbbc0eaf3e2..becf3296e53d 100644
--- a/chart2/source/view/charttypes/BubbleChart.cxx
+++ b/chart2/source/view/charttypes/BubbleChart.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -42,7 +43,6 @@
 
 #include <com/sun/star/chart2/Symbol.hpp>
 #include <com/sun/star/chart/DataLabelPlacement.hpp>
-#include <tools/debug.hxx>
 #include <editeng/unoprnms.hxx>
 #include <rtl/math.hxx>
 #include <com/sun/star/drawing/DoubleSequence.hpp>
@@ -95,12 +95,12 @@ void BubbleChart::calculateMaximumLogicBubbleSize()
         {
             ::std::vector< VDataSeriesGroup >::iterator             aXSlotIter = aZSlotIter->begin();
             const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
-            for( ; aXSlotIter != aXSlotEnd; aXSlotIter++ )
+            for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter )
             {
                 ::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
                 ::std::vector< VDataSeries* >::const_iterator       aSeriesIter = pSeriesList->begin();
                 const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd  = pSeriesList->end();
-                for( ; aSeriesIter != aSeriesEnd; aSeriesIter++ )
+                for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter )
                 {
                     VDataSeries* pSeries( *aSeriesIter );
                     if(!pSeries)
@@ -211,7 +211,7 @@ void BubbleChart::createShapes()
     if( m_aZSlots.begin() == m_aZSlots.end() ) //no series
         return;
 
-    DBG_ASSERT(m_pShapeFactory&&m_xLogicTarget.is()&&m_xFinalTarget.is(),"BubbleChart is not proper initialized");
+    OSL_ENSURE(m_pShapeFactory&&m_xLogicTarget.is()&&m_xFinalTarget.is(),"BubbleChart is not proper initialized");
     if(!(m_pShapeFactory&&m_xLogicTarget.is()&&m_xFinalTarget.is()))
         return;
 
@@ -256,7 +256,7 @@ void BubbleChart::createShapes()
             const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
 
             aXSlotIter = aZSlotIter->begin();
-            for( sal_Int32 nX=0; aXSlotIter != aXSlotEnd; aXSlotIter++, nX++ )
+            for( sal_Int32 nX=0; aXSlotIter != aXSlotEnd; ++aXSlotIter, ++nX )
             {
                 ::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
                 ::std::vector< VDataSeries* >::const_iterator       aSeriesIter = pSeriesList->begin();
@@ -264,7 +264,7 @@ void BubbleChart::createShapes()
 
     //=============================================================================
                 //iterate through all series
-                for( sal_Int32 nSeriesIndex = 0; aSeriesIter != aSeriesEnd; aSeriesIter++, nSeriesIndex++ )
+                for( sal_Int32 nSeriesIndex = 0; aSeriesIter != aSeriesEnd; ++aSeriesIter, ++nSeriesIndex )
                 {
                     VDataSeries* pSeries( *aSeriesIter );
                     if(!pSeries)
@@ -381,7 +381,7 @@ void BubbleChart::createShapes()
                                 eAlignment = LABEL_ALIGN_CENTER;
                                 break;
                             default:
-                                DBG_ERROR("this label alignment is not implemented yet");
+                                OSL_FAIL("this label alignment is not implemented yet");
                                 aScenePosition3D.PositionY -= (aSymbolSize.DirectionY/2+1);
                                 eAlignment = LABEL_ALIGN_TOP;
                                 break;
@@ -415,3 +415,5 @@ void BubbleChart::createShapes()
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/charttypes/BubbleChart.hxx b/chart2/source/view/charttypes/BubbleChart.hxx
index f94fe9e367e7..2698501182c2 100644
--- a/chart2/source/view/charttypes/BubbleChart.hxx
+++ b/chart2/source/view/charttypes/BubbleChart.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -88,3 +89,5 @@ private: //member
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/charttypes/CandleStickChart.cxx b/chart2/source/view/charttypes/CandleStickChart.cxx
index 57d5a70e4080..bea97a1e2dca 100644
--- a/chart2/source/view/charttypes/CandleStickChart.cxx
+++ b/chart2/source/view/charttypes/CandleStickChart.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,7 +40,6 @@
 #include "FormattedStringHelper.hxx"
 #include "DataSeriesHelper.hxx"
 #include "DateHelper.hxx"
-#include <tools/debug.hxx>
 #include <rtl/math.hxx>
 #include <editeng/unoprnms.hxx>
 
@@ -123,7 +123,7 @@ void CandleStickChart::createShapes()
     if( m_nDimension!=2 )
         return;
 
-    DBG_ASSERT(m_pShapeFactory&&m_xLogicTarget.is()&&m_xFinalTarget.is(),"CandleStickChart is not proper initialized");
+    OSL_ENSURE(m_pShapeFactory&&m_xLogicTarget.is()&&m_xFinalTarget.is(),"CandleStickChart is not proper initialized");
     if(!(m_pShapeFactory&&m_xLogicTarget.is()&&m_xFinalTarget.is()))
         return;
 
@@ -207,7 +207,7 @@ void CandleStickChart::createShapes()
             pPosHelper->updateSeriesCount( aZSlotIter->size() );
 //=============================================================================
             //iterate through all x slots in this category
-            for( double fSlotX=0; aXSlotIter != aXSlotEnd; aXSlotIter++, fSlotX+=1.0 )
+            for( double fSlotX=0; aXSlotIter != aXSlotEnd; ++aXSlotIter, fSlotX+=1.0 )
             {
                 ::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
 
@@ -216,7 +216,7 @@ void CandleStickChart::createShapes()
                 aSeriesIter = pSeriesList->begin();
     //=============================================================================
                 //iterate through all series in this x slot
-                for( ; aSeriesIter != aSeriesEnd; aSeriesIter++ )
+                for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter )
                 {
                     //collect data point information (logic coordinates, style ):
                     double fUnscaledX = (*aSeriesIter)->getXValue( nIndex );
@@ -388,3 +388,5 @@ void CandleStickChart::createShapes()
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/charttypes/CandleStickChart.hxx b/chart2/source/view/charttypes/CandleStickChart.hxx
index df9531ec71bf..c8ef4b9a8db0 100644
--- a/chart2/source/view/charttypes/CandleStickChart.hxx
+++ b/chart2/source/view/charttypes/CandleStickChart.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -76,3 +77,5 @@ private: //member
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/charttypes/CategoryPositionHelper.cxx b/chart2/source/view/charttypes/CategoryPositionHelper.cxx
index 76f07168bdf2..cc4f917d0515 100644
--- a/chart2/source/view/charttypes/CategoryPositionHelper.cxx
+++ b/chart2/source/view/charttypes/CategoryPositionHelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,8 +35,6 @@
 namespace chart
 {
 //.............................................................................
-//using namespace ::com::sun::star;
-//using namespace ::com::sun::star::chart2;
 
 CategoryPositionHelper::CategoryPositionHelper( double fSeriesCount, double fCategoryWidth )
     : m_fSeriesCount(fSeriesCount)
@@ -103,3 +102,5 @@ void CategoryPositionHelper::setCategoryWidth( double fCategoryWidth )
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/charttypes/CategoryPositionHelper.hxx b/chart2/source/view/charttypes/CategoryPositionHelper.hxx
index c12d17d40b03..63b3e6c56812 100644
--- a/chart2/source/view/charttypes/CategoryPositionHelper.hxx
+++ b/chart2/source/view/charttypes/CategoryPositionHelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -67,3 +68,5 @@ protected:
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx
index abb30c2a67a9..d7bdb5746e7f 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -42,10 +43,6 @@
 #include <com/sun/star/chart2/XColorScheme.hpp>
 
 #include <com/sun/star/container/XChild.hpp>
-
-//#include "chartview/servicenames_charttypes.hxx"
-//#include "servicenames_coosystems.hxx"
-#include <tools/debug.hxx>
 #include <rtl/math.hxx>
 
 //.............................................................................
@@ -161,7 +158,7 @@ PieChart::~PieChart()
 
 void PieChart::setScales( const std::vector< ExplicitScaleData >& rScales, bool /* bSwapXAndYAxis */ )
 {
-    DBG_ASSERT(m_nDimension<=static_cast<sal_Int32>(rScales.size()),"Dimension of Plotter does not fit two dimension of given scale sequence");
+    OSL_ENSURE(m_nDimension<=static_cast<sal_Int32>(rScales.size()),"Dimension of Plotter does not fit two dimension of given scale sequence");
     m_pPosHelper->setScales( rScales, true );
 }
 
@@ -186,21 +183,6 @@ bool PieChart::shouldSnapRectToUsedArea()
     return true;
 }
 
-//-----------------------------------------------------------------
-// lang::XServiceInfo
-//-----------------------------------------------------------------
-/*
-APPHELPER_XSERVICEINFO_IMPL(PieChart,CHART2_VIEW_PIECHART_SERVICE_IMPLEMENTATION_NAME)
-
-    uno::Sequence< rtl::OUString > PieChart
-::getSupportedServiceNames_Static()
-{
-    uno::Sequence< rtl::OUString > aSNS( 1 );
-    aSNS.getArray()[ 0 ] = CHART2_VIEW_PIECHART_SERVICE_NAME;
-    return aSNS;
-}
-*/
-
 uno::Reference< drawing::XShape > PieChart::createDataPoint(
           const uno::Reference< drawing::XShapes >& xTarget
         , const uno::Reference< beans::XPropertySet >& xObjectProperties
@@ -345,7 +327,7 @@ void PieChart::createShapes()
     if( m_aZSlots.begin() == m_aZSlots.end() ) //no series
         return;
 
-    DBG_ASSERT(m_pShapeFactory&&m_xLogicTarget.is()&&m_xFinalTarget.is(),"PieChart is not proper initialized");
+    OSL_ENSURE(m_pShapeFactory&&m_xLogicTarget.is()&&m_xFinalTarget.is(),"PieChart is not proper initialized");
     if(!(m_pShapeFactory&&m_xLogicTarget.is()&&m_xFinalTarget.is()))
         return;
 
@@ -371,7 +353,7 @@ void PieChart::createShapes()
     ::rtl::math::setNan(&m_fMaxOffset);
 
 //=============================================================================
-    for( double fSlotX=0; aXSlotIter != aXSlotEnd && (m_bUseRings||fSlotX<0.5 ); aXSlotIter++, fSlotX+=1.0 )
+    for( double fSlotX=0; aXSlotIter != aXSlotEnd && (m_bUseRings||fSlotX<0.5 ); ++aXSlotIter, fSlotX+=1.0 )
     {
         ::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
         if( pSeriesList->size()<=0 )//there should be only one series in each x slot
@@ -409,9 +391,7 @@ void PieChart::createShapes()
             if( !bIsVisible )
                 continue;
 
-            double fLogicZ = -1.0;//as defined
             double fDepth  = this->getTransformedDepth();
-//=============================================================================
 
             uno::Reference< drawing::XShapes > xSeriesGroupShape_Shapes = getSeriesGroupShape(pSeries, xSeriesTarget);
             //collect data point information (logic coordinates, style ):
@@ -462,6 +442,7 @@ void PieChart::createShapes()
                 }
 
                 //create data point
+                double fLogicZ = -0.5;//as defined
                 uno::Reference<drawing::XShape> xPointShape(
                     createDataPoint( xSeriesGroupShape_Shapes, xPointProperties
                                     , fUnitCircleStartAngleDegree, fUnitCircleWidthAngleDegree
@@ -893,3 +874,5 @@ void PieChart::rearrangeLabelToAvoidOverlapIfRequested( const awt::Size& rPageSi
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/charttypes/PieChart.hxx b/chart2/source/view/charttypes/PieChart.hxx
index c306e2db256f..ae08136b4031 100644
--- a/chart2/source/view/charttypes/PieChart.hxx
+++ b/chart2/source/view/charttypes/PieChart.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -129,3 +130,5 @@ private: //member
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/charttypes/Splines.cxx b/chart2/source/view/charttypes/Splines.cxx
index 67ecac93b64c..43d9b219d358 100644
--- a/chart2/source/view/charttypes/Splines.cxx
+++ b/chart2/source/view/charttypes/Splines.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -36,9 +37,6 @@
 #include <algorithm>
 #include <functional>
 
-// header for DBG_ASSERT
-#include <tools/debug.hxx>
-
 //.............................................................................
 namespace chart
 {
@@ -48,17 +46,6 @@ using namespace ::com::sun::star;
 namespace
 {
 
-template< typename T >
-struct lcl_EqualsFirstDoubleOfPair : ::std::binary_function< ::std::pair< double, T >, ::std::pair< double, T >, bool >
-{
-    inline bool operator() ( const ::std::pair< double, T > & rOne, const ::std::pair< double, T > & rOther )
-    {
-        return ( ::rtl::math::approxEqual( rOne.first, rOther.first ) );
-    }
-};
-
-//-----------------------------------------------------------------------------
-
 typedef ::std::pair< double, double >   tPointType;
 typedef ::std::vector< tPointType >     tPointVecType;
 typedef tPointVecType::size_type        lcl_tSizeType;
@@ -81,6 +68,16 @@ public:
                            double fY1FirstDerivation,
                            double fYnFirstDerivation );
 
+
+    /** @descr creates an object that calculates cublic splines on construction
+               for the special case of periodic cubic spline
+
+        @param rSortedPoints  the points for which splines shall be calculated,
+               they need to be sorted in x values. First and last y value must be equal
+     */
+    lcl_SplineCalculation( const tPointVecType & rSortedPoints);
+
+
     /** @descr this function corresponds to the function splint in [1].
 
         [1] Numerical Recipies in C, 2nd edition
@@ -100,8 +97,8 @@ private:
     double m_fYpN;
 
     // these values are cached for performance reasons
-    tPointVecType::size_type m_nKLow;
-    tPointVecType::size_type m_nKHigh;
+    lcl_tSizeType m_nKLow;
+    lcl_tSizeType m_nKHigh;
     double m_fLastInterpolatedValue;
 
     /** @descr this function corresponds to the function spline in [1].
@@ -111,6 +108,22 @@ private:
             Section 3.3, page 115
     */
     void Calculate();
+
+    /** @descr this function corresponds to the algoritm 4.76 in [2] and
+        theorem 5.3.7 in [3]
+
+        [2] Engeln-M�llges, Gisela: Numerik-Algorithmen: Verfahren, Beispiele, Anwendungen
+            Springer, Berlin; Auflage: 9., �berarb. und erw. A. (8. Dezember 2004)
+            Section 4.10.2, page 175
+
+        [3] Hanrath, Wilhelm: Mathematik III / Numerik, Vorlesungsskript zur
+            Veranstaltung im WS 2007/2008
+            Fachhochschule Aachen, 2009-09-19
+            Numerik_01.pdf, downloaded 2011-04-19 via
+            http://www.fh-aachen.de/index.php?id=11424&no_cache=1&file=5016&uid=44191
+            Section 5.3, page 129
+    */
+    void CalculatePeriodic();
 };
 
 //-----------------------------------------------------------------------------
@@ -126,21 +139,32 @@ lcl_SplineCalculation::lcl_SplineCalculation(
           m_nKHigh( rSortedPoints.size() - 1 )
 {
     ::rtl::math::setInf( &m_fLastInterpolatedValue, sal_False );
-
-    // #108301# remove points that have equal x-values
-    m_aPoints.erase( ::std::unique( m_aPoints.begin(), m_aPoints.end(),
-                             lcl_EqualsFirstDoubleOfPair< double >() ),
-                     m_aPoints.end() );
     Calculate();
 }
 
+//-----------------------------------------------------------------------------
+
+lcl_SplineCalculation::lcl_SplineCalculation(
+    const tPointVecType & rSortedPoints)
+        : m_aPoints( rSortedPoints ),
+          m_fYp1( 0.0 ),  /*dummy*/
+          m_fYpN( 0.0 ),  /*dummy*/
+          m_nKLow( 0 ),
+          m_nKHigh( rSortedPoints.size() - 1 )
+{
+    ::rtl::math::setInf( &m_fLastInterpolatedValue, sal_False );
+    CalculatePeriodic();
+}
+//-----------------------------------------------------------------------------
+
+
 void lcl_SplineCalculation::Calculate()
 {
     if( m_aPoints.size() <= 1 )
         return;
 
     // n is the last valid index to m_aPoints
-    const tPointVecType::size_type n = m_aPoints.size() - 1;
+    const lcl_tSizeType n = m_aPoints.size() - 1;
     ::std::vector< double > u( n );
     m_aSecDerivY.resize( n + 1, 0.0 );
 
@@ -158,9 +182,9 @@ void lcl_SplineCalculation::Calculate()
             ((( m_aPoints[ 1 ].second - m_aPoints[ 0 ].second ) / xDiff ) - m_fYp1 );
     }
 
-    for( tPointVecType::size_type i = 1; i < n; ++i )
+    for( lcl_tSizeType i = 1; i < n; ++i )
     {
-        ::std::pair< double, double >
+        tPointType
             p_i = m_aPoints[ i ],
             p_im1 = m_aPoints[ i - 1 ],
             p_ip1 = m_aPoints[ i + 1 ];
@@ -198,19 +222,164 @@ void lcl_SplineCalculation::Calculate()
     // note: the algorithm in [1] iterates from n-1 to 0, but as size_type
     // may be (usuall is) an unsigned type, we can not write k >= 0, as this
     // is always true.
-    for( tPointVecType::size_type k = n; k > 0; --k )
+    for( lcl_tSizeType k = n; k > 0; --k )
     {
         ( m_aSecDerivY[ k - 1 ] *= m_aSecDerivY[ k ] ) += u[ k - 1 ];
     }
 }
 
+void lcl_SplineCalculation::CalculatePeriodic()
+{
+    if( m_aPoints.size() <= 1 )
+        return;
+
+    // n is the last valid index to m_aPoints
+    const lcl_tSizeType n = m_aPoints.size() - 1;
+
+    // u is used for vector f in A*c=f in [3], vector a in  Ax=a in [2],
+    // vector z in Rtranspose z = a and Dr=z in [2]
+    ::std::vector< double > u( n + 1, 0.0 );
+
+    // used for vector c in A*c=f and vector x in Ax=a in [2]
+    m_aSecDerivY.resize( n + 1, 0.0 );
+
+    // diagonal of matrix A, used index 1 to n
+    ::std::vector< double > Adiag( n + 1, 0.0 );
+
+    // secondary diagonal of matrix A with index 1 to n-1 and upper right element in A[n]
+    ::std::vector< double > Aupper( n + 1, 0.0 );
+
+    // diagonal of matrix D in A=(R transpose)*D*R in [2], used index 1 to n
+    ::std::vector< double > Ddiag( n+1, 0.0 );
+
+    // right column of matrix R, used index 1 to n-2
+    ::std::vector< double > Rright( n-1, 0.0 );
+
+    // secondary diagonal of matrix R, used index 1 to n-1
+    ::std::vector< double > Rupper( n, 0.0 );
+
+    if (n<4)
+    {
+        if (n==3)
+        {   // special handling of three polynomials, that are four points
+            double xDiff0 = m_aPoints[ 1 ].first - m_aPoints[ 0 ].first ;
+            double xDiff1 = m_aPoints[ 2 ].first - m_aPoints[ 1 ].first ;
+            double xDiff2 = m_aPoints[ 3 ].first - m_aPoints[ 2 ].first ;
+            double xDiff2p1 = xDiff2 + xDiff1;
+            double xDiff0p2 = xDiff0 + xDiff2;
+            double xDiff1p0 = xDiff1 + xDiff0;
+            double fFaktor = 1.5 / (xDiff0*xDiff1 + xDiff1*xDiff2 + xDiff2*xDiff0);
+            double yDiff0 = (m_aPoints[ 1 ].second - m_aPoints[ 0 ].second) / xDiff0;
+            double yDiff1 = (m_aPoints[ 2 ].second - m_aPoints[ 1 ].second) / xDiff1;
+            double yDiff2 = (m_aPoints[ 0 ].second - m_aPoints[ 2 ].second) / xDiff2;
+            m_aSecDerivY[ 1 ] = fFaktor * (yDiff1*xDiff2p1 - yDiff0*xDiff0p2);
+            m_aSecDerivY[ 2 ] = fFaktor * (yDiff2*xDiff0p2 - yDiff1*xDiff1p0);
+            m_aSecDerivY[ 3 ] = fFaktor * (yDiff0*xDiff1p0 - yDiff2*xDiff2p1);
+            m_aSecDerivY[ 0 ] = m_aSecDerivY[ 3 ];
+        }
+        else if (n==2)
+        {
+        // special handling of two polynomials, that are three points
+            double xDiff0 = m_aPoints[ 1 ].first - m_aPoints[ 0 ].first;
+            double xDiff1 = m_aPoints[ 2 ].first - m_aPoints[ 1 ].first;
+            double fHelp = 3.0 * (m_aPoints[ 0 ].second - m_aPoints[ 1 ].second) / (xDiff0*xDiff1);
+            m_aSecDerivY[ 1 ] = fHelp ;
+            m_aSecDerivY[ 2 ] = -fHelp ;
+            m_aSecDerivY[ 0 ] = m_aSecDerivY[ 2 ] ;
+        }
+        else
+        {
+            // should be handled with natural spline, periodic not possible.
+        }
+    }
+    else
+    {
+        double xDiff_i =1.0; // values are dummy;
+        double xDiff_im1 =1.0;
+        double yDiff_i = 1.0;
+        double yDiff_im1 = 1.0;
+        // fill matrix A and fill right side vector u
+        for( lcl_tSizeType i=1; i<n; ++i )
+        {
+            xDiff_im1 = m_aPoints[ i ].first - m_aPoints[ i-1 ].first;
+            xDiff_i = m_aPoints[ i+1 ].first - m_aPoints[ i ].first;
+            yDiff_im1 = (m_aPoints[ i ].second - m_aPoints[ i-1 ].second) / xDiff_im1;
+            yDiff_i = (m_aPoints[ i+1 ].second - m_aPoints[ i ].second) / xDiff_i;
+            Adiag[ i ] = 2 * (xDiff_im1 + xDiff_i);
+            Aupper[ i ] = xDiff_i;
+            u [ i ] = 3 * (yDiff_i - yDiff_im1);
+        }
+        xDiff_im1 = m_aPoints[ n ].first - m_aPoints[ n-1 ].first;
+        xDiff_i = m_aPoints[ 1 ].first - m_aPoints[ 0 ].first;
+        yDiff_im1 = (m_aPoints[ n ].second - m_aPoints[ n-1 ].second) / xDiff_im1;
+        yDiff_i = (m_aPoints[ 1 ].second - m_aPoints[ 0 ].second) / xDiff_i;
+        Adiag[ n ] = 2 * (xDiff_im1 + xDiff_i);
+        Aupper[ n ] = xDiff_i;
+        u [ n ] = 3 * (yDiff_i - yDiff_im1);
+
+        // decomposite A=(R transpose)*D*R
+        Ddiag[1] = Adiag[1];
+        Rupper[1] = Aupper[1] / Ddiag[1];
+        Rright[1] = Aupper[n] / Ddiag[1];
+        for( lcl_tSizeType i=2; i<=n-2; ++i )
+        {
+            Ddiag[i] = Adiag[i] - Aupper[ i-1 ] * Rupper[ i-1 ];
+            Rupper[ i ] = Aupper[ i ] / Ddiag[ i ];
+            Rright[ i ] = - Rright[ i-1 ] * Aupper[ i-1 ] / Ddiag[ i ];
+        }
+        Ddiag[ n-1 ] = Adiag[ n-1 ] - Aupper[ n-2 ] * Rupper[ n-2 ];
+        Rupper[ n-1 ] = ( Aupper[ n-1 ] - Aupper[ n-2 ] * Rright[ n-2] ) / Ddiag[ n-1 ];
+        double fSum = 0.0;
+        for ( lcl_tSizeType i=1; i<=n-2; ++i )
+        {
+            fSum += Ddiag[ i ] * Rright[ i ] * Rright[ i ];
+        }
+        Ddiag[ n ] = Adiag[ n ] - fSum - Ddiag[ n-1 ] * Rupper[ n-1 ] * Rupper[ n-1 ]; // bug in [2]!
+
+        // solve forward (R transpose)*z=u, overwrite u with z
+        for ( lcl_tSizeType i=2; i<=n-1; ++i )
+        {
+            u[ i ] -= u[ i-1 ]* Rupper[ i-1 ];
+        }
+        fSum = 0.0;
+        for ( lcl_tSizeType i=1; i<=n-2; ++i )
+        {
+            fSum += Rright[ i ] * u[ i ];
+        }
+        u[ n ] = u[ n ] - fSum - Rupper[ n - 1] * u[ n-1 ];
+
+        // solve forward D*r=z, z is in u, overwrite u with r
+        for ( lcl_tSizeType i=1; i<=n; ++i )
+        {
+            u[ i ] = u[i] / Ddiag[ i ];
+        }
+
+        // solve backward R*x= r, r is in u
+        m_aSecDerivY[ n ] = u[ n ];
+        m_aSecDerivY[ n-1 ] = u[ n-1 ] - Rupper[ n-1 ] * m_aSecDerivY[ n ];
+        for ( lcl_tSizeType i=n-2; i>=1; --i)
+        {
+            m_aSecDerivY[ i ] = u[ i ] - Rupper[ i ] * m_aSecDerivY[ i+1 ] - Rright[ i ] * m_aSecDerivY[ n ];
+        }
+        // periodic
+        m_aSecDerivY[ 0 ] = m_aSecDerivY[ n ];
+    }
+
+    // adapt m_aSecDerivY for usage in GetInterpolatedValue()
+    for( lcl_tSizeType i = 0; i <= n ; ++i )
+    {
+        m_aSecDerivY[ i ] *= 2.0;
+    }
+
+}
+
 double lcl_SplineCalculation::GetInterpolatedValue( double x )
 {
-    DBG_ASSERT( ( m_aPoints[ 0 ].first <= x ) &&
+    OSL_PRECOND( ( m_aPoints[ 0 ].first <= x ) &&
                 ( x <= m_aPoints[ m_aPoints.size() - 1 ].first ),
                 "Trying to extrapolate" );
 
-    const tPointVecType::size_type n = m_aPoints.size() - 1;
+    const lcl_tSizeType n = m_aPoints.size() - 1;
     if( x < m_fLastInterpolatedValue )
     {
         m_nKLow = 0;
@@ -220,7 +389,7 @@ double lcl_SplineCalculation::GetInterpolatedValue( double x )
         // first initialization is done in CTOR
         while( m_nKHigh - m_nKLow > 1 )
         {
-            tPointVecType::size_type k = ( m_nKHigh + m_nKLow ) / 2;
+            lcl_tSizeType k = ( m_nKHigh + m_nKLow ) / 2;
             if( m_aPoints[ k ].first > x )
                 m_nKHigh = k;
             else
@@ -235,12 +404,12 @@ double lcl_SplineCalculation::GetInterpolatedValue( double x )
             ++m_nKHigh;
             ++m_nKLow;
         }
-        DBG_ASSERT( m_nKHigh <= n, "Out of Bounds" );
+        OSL_ENSURE( m_nKHigh <= n, "Out of Bounds" );
     }
     m_fLastInterpolatedValue = x;
 
     double h = m_aPoints[ m_nKHigh ].first - m_aPoints[ m_nKLow ].first;
-    DBG_ASSERT( h != 0, "Bad input to GetInterpolatedValue()" );
+    OSL_ENSURE( h != 0, "Bad input to GetInterpolatedValue()" );
 
     double a = ( m_aPoints[ m_nKHigh ].first - x ) / h;
     double b = ( x - m_aPoints[ m_nKLow ].first  ) / h;
@@ -254,73 +423,150 @@ double lcl_SplineCalculation::GetInterpolatedValue( double x )
 
 //-----------------------------------------------------------------------------
 
-//create knot vector for B-spline
-double* createTVector( sal_Int32 n, sal_Int32 k )
-{
-    double* t = new double [n + k + 1];
-    for (sal_Int32 i=0; i<=n+k; i++ )
-    {
-        if(i < k)
-            t[i] = 0;
-        else if(i <= n)
-            t[i] = i-k+1;
+// helper methods for B-spline
+
+// Create parameter t_0 to t_n using the centripetal method with a power of 0.5
+bool createParameterT(const tPointVecType aUniquePoints, double* t)
+{   // precondition: no adjacent identical points
+    // postcondition: 0 = t_0 < t_1 < ... < t_n = 1
+    bool bIsSuccessful = true;
+    const lcl_tSizeType n = aUniquePoints.size() - 1;
+    t[0]=0.0;
+    double dx = 0.0;
+    double dy = 0.0;
+    double fDiffMax = 1.0; //dummy values
+    double fDenominator = 0.0; // initialized for summing up
+    for (lcl_tSizeType i=1; i<=n ; ++i)
+    {   // 4th root(dx^2+dy^2)
+        dx = aUniquePoints[i].first - aUniquePoints[i-1].first;
+        dy = aUniquePoints[i].second - aUniquePoints[i-1].second;
+        // scaling to avoid underflow or overflow
+        fDiffMax = (fabs(dx)>fabs(dy)) ? fabs(dx) : fabs(dy);
+        if (fDiffMax == 0.0)
+        {
+            bIsSuccessful = false;
+            break;
+        }
         else
-            t[i] = n-k+2;
+        {
+            dx /= fDiffMax;
+            dy /= fDiffMax;
+            fDenominator += sqrt(sqrt(dx * dx + dy * dy)) * sqrt(fDiffMax);
+        }
     }
-    return t;
-}
+    if (fDenominator == 0.0)
+    {
+        bIsSuccessful = false;
+    }
+    if (bIsSuccessful)
+    {
+        for (lcl_tSizeType j=1; j<=n ; ++j)
+        {
+            double fNumerator = 0.0;
+            for (lcl_tSizeType i=1; i<=j ; ++i)
+            {
+                dx = aUniquePoints[i].first - aUniquePoints[i-1].first;
+                dy = aUniquePoints[i].second - aUniquePoints[i-1].second;
+                fDiffMax = (abs(dx)>abs(dy)) ? abs(dx) : abs(dy);
+                // same as above, so should not be zero
+                dx /= fDiffMax;
+                dy /= fDiffMax;
+                fNumerator += sqrt(sqrt(dx * dx + dy * dy)) * sqrt(fDiffMax);
+            }
+            t[j] = fNumerator / fDenominator;
 
-//calculate left knot vector
-double TLeft (double x, sal_Int32 i, sal_Int32 k, const double *t )
-{
-    double deltaT = t[i + k - 1] - t[i];
-    return (deltaT == 0.0)
-               ? 0.0
-               : (x - t[i]) / deltaT;
+        }
+        // postcondition check
+        t[n] = 1.0;
+        double fPrevious = 0.0;
+        for (lcl_tSizeType i=1; i <= n && bIsSuccessful ; ++i)
+        {
+            if (fPrevious >= t[i])
+            {
+                bIsSuccessful = false;
+            }
+            else
+            {
+                fPrevious = t[i];
+            }
+        }
+    }
+    return bIsSuccessful;
 }
 
-//calculate right knot vector
-double TRight(double x, sal_Int32 i, sal_Int32 k, const double *t )
-{
-    double deltaT = t[i + k] - t[i + 1];
-    return (deltaT == 0.0)
-               ? 0.0
-               : (t[i + k] - x) / deltaT;
+void createKnotVector(const lcl_tSizeType n, const sal_uInt32 p, double* t, double* u)
+{  // precondition: 0 = t_0 < t_1 < ... < t_n = 1
+        for (lcl_tSizeType j = 0; j <= p; ++j)
+        {
+            u[j] = 0.0;
+        }
+        double fSum = 0.0;
+        for (lcl_tSizeType j = 1; j <= n-p; ++j )
+        {
+            fSum = 0.0;
+            for (lcl_tSizeType i = j; i <= j+p-1; ++i)
+            {
+                fSum += t[i];
+            }
+            u[j+p] = fSum / p ;
+        }
+        for (lcl_tSizeType j = n+1; j <= n+1+p; ++j)
+        {
+            u[j] = 1.0;
+        }
 }
 
-//calculate weight vector
-void BVector(double x, sal_Int32 n, sal_Int32 k, double *b, const double *t)
+void applyNtoParameterT(const lcl_tSizeType i,const double tk,const sal_uInt32 p,const double* u, double* rowN)
 {
-    sal_Int32 i = 0;
-    for( i=0; i<=n+k; i++ )
-        b[i]=0;
+    // get N_p(t_k) recursively, only N_(i-p) till N_(i) are relevant, all other N_# are zero
+    double fRightFactor = 0.0;
+    double fLeftFactor = 0.0;
+
+    // initialize with indicator function degree 0
+    rowN[p] = 1.0; // all others are zero
+
+    // calculate up to degree p
+    for (sal_uInt32 s = 1; s <= p; ++s)
+    {
+        // first element
+        fRightFactor = ( u[i+1] - tk ) / ( u[i+1]- u[i-s+1] );
+        // i-s "true index" - (i-p)"shift" = p-s
+        rowN[p-s] = fRightFactor * rowN[p-s+1];
 
-    sal_Int32 i0 = (sal_Int32)floor(x) + k - 1;
-    b [i0] = 1;
+        // middle elements
+        for (sal_uInt32 j = s-1; j>=1 ; --j)
+        {
+            fLeftFactor = ( tk - u[i-j] ) / ( u[i-j+s] - u[i-j] ) ;
+            fRightFactor = ( u[i-j+s+1] - tk ) / ( u[i-j+s+1] - u[i-j+1] );
+            // i-j "true index" - (i-p)"shift" = p-j
+            rowN[p-j] = fLeftFactor * rowN[p-j] + fRightFactor *  rowN[p-j+1];
+        }
 
-    for( sal_Int32 j=2; j<=k; j++ )
-        for( i=0; i<=i0; i++ )
-            b[i] = TLeft(x, i, j, t) * b[i] + TRight(x, i, j, t) * b [i + 1];
+        // last element
+        fLeftFactor = ( tk - u[i] ) / ( u[i+s] - u[i] );
+        // i "true index" - (i-p)"shift" = p
+        rowN[p] = fLeftFactor * rowN[p];
+    }
 }
 
 } //  anonymous namespace
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 
+// Calculates uniform parametric splines with subinterval length 1,
+// according ODF1.2 part 1, chapter 'chart interpolation'.
 void SplineCalculater::CalculateCubicSplines(
     const drawing::PolyPolygonShape3D& rInput
     , drawing::PolyPolygonShape3D& rResult
-    , sal_Int32 nGranularity )
+    , sal_uInt32 nGranularity )
 {
-    DBG_ASSERT( nGranularity > 0, "Granularity is invalid" );
+    OSL_PRECOND( nGranularity > 0, "Granularity is invalid" );
 
     rResult.SequenceX.realloc(0);
     rResult.SequenceY.realloc(0);
     rResult.SequenceZ.realloc(0);
 
-    sal_Int32 nOuterCount = rInput.SequenceX.getLength();
+    sal_uInt32 nOuterCount = rInput.SequenceX.getLength();
     if( !nOuterCount )
         return;
 
@@ -328,35 +574,23 @@ void SplineCalculater::CalculateCubicSplines(
     rResult.SequenceY.realloc(nOuterCount);
     rResult.SequenceZ.realloc(nOuterCount);
 
-    for( sal_Int32 nOuter = 0; nOuter < nOuterCount; ++nOuter )
+    for( sal_uInt32 nOuter = 0; nOuter < nOuterCount; ++nOuter )
     {
         if( rInput.SequenceX[nOuter].getLength() <= 1 )
             continue; //we need at least two points
 
-        sal_Int32 nMaxIndexPoints = rInput.SequenceX[nOuter].getLength()-1; // is >=1
+        sal_uInt32 nMaxIndexPoints = rInput.SequenceX[nOuter].getLength()-1; // is >=1
         const double* pOldX = rInput.SequenceX[nOuter].getConstArray();
         const double* pOldY = rInput.SequenceY[nOuter].getConstArray();
         const double* pOldZ = rInput.SequenceZ[nOuter].getConstArray();
 
-        // #i13699# The curve gets a parameter and then for each coordinate a
-        // separate spline will be calculated using the parameter as first argument
-        // and the point coordinate as second argument. Therefore the points need
-        // not to be sorted in its x-coordinates. The parameter is sorted by
-        // construction.
-
         ::std::vector < double > aParameter(nMaxIndexPoints+1);
         aParameter[0]=0.0;
-        for( sal_Int32 nIndex=1; nIndex<=nMaxIndexPoints; nIndex++ )
+        for( sal_uInt32 nIndex=1; nIndex<=nMaxIndexPoints; nIndex++ )
         {
-            // The euclidian distance leads to curve loops for functions having single extreme points
-            //aParameter[nIndex]=aParameter[nIndex-1]+
-            //sqrt( (pOldX[nIndex]-pOldX[nIndex-1])*(pOldX[nIndex]-pOldX[nIndex-1])+
-            //(pOldY[nIndex]-pOldY[nIndex-1])*(pOldY[nIndex]-pOldY[nIndex-1])+
-            //(pOldZ[nIndex]-pOldZ[nIndex-1])*(pOldZ[nIndex]-pOldZ[nIndex-1]));
-
-            // use increment of 1 instead
             aParameter[nIndex]=aParameter[nIndex-1]+1;
         }
+
         // Split the calculation to X, Y and Z coordinate
         tPointVecType aInputX;
         aInputX.resize(nMaxIndexPoints+1);
@@ -364,7 +598,7 @@ void SplineCalculater::CalculateCubicSplines(
         aInputY.resize(nMaxIndexPoints+1);
         tPointVecType aInputZ;
         aInputZ.resize(nMaxIndexPoints+1);
-        for (sal_Int32 nN=0;nN<=nMaxIndexPoints; nN++ )
+        for (sal_uInt32 nN=0;nN<=nMaxIndexPoints; nN++ )
         {
           aInputX[ nN ].first=aParameter[nN];
           aInputX[ nN ].second=pOldX[ nN ];
@@ -378,17 +612,20 @@ void SplineCalculater::CalculateCubicSplines(
         // information to calculate each point of the curve
         double fXDerivation;
         double fYDerivation;
-        double fZDerivation;
+        lcl_SplineCalculation* aSplineX;
+        lcl_SplineCalculation* aSplineY;
+        // lcl_SplineCalculation* aSplineZ; the z-coordinates of all points in
+        // a data series are equal. No spline calculation needed, but copy
+        // coordinate to output
+
         if( pOldX[ 0 ] == pOldX[nMaxIndexPoints] &&
             pOldY[ 0 ] == pOldY[nMaxIndexPoints] &&
-            pOldZ[ 0 ] == pOldZ[nMaxIndexPoints] )
-        {
-            // #i101050# avoid a corner in closed lines, which are smoothed by spline
-            // This derivation are special for parameter of kind 0,1,2,3... If you
-            // change generating parameters (see above), then adapt derivations too.)
-            fXDerivation = 0.5 * (pOldX[1]-pOldX[nMaxIndexPoints-1]);
-            fYDerivation = 0.5 * (pOldY[1]-pOldY[nMaxIndexPoints-1]);
-            fZDerivation = 0.5 * (pOldZ[1]-pOldZ[nMaxIndexPoints-1]);
+            pOldZ[ 0 ] == pOldZ[nMaxIndexPoints] &&
+            nMaxIndexPoints >=2 )
+        {   // periodic spline
+            aSplineX = new lcl_SplineCalculation( aInputX) ;
+            aSplineY = new lcl_SplineCalculation( aInputY) ;
+            // aSplineZ = new lcl_SplineCalculation( aInputZ) ;
         }
         else // generate the kind "natural spline"
         {
@@ -396,11 +633,9 @@ void SplineCalculater::CalculateCubicSplines(
             ::rtl::math::setInf( &fInfty, sal_False );
             fXDerivation = fInfty;
             fYDerivation = fInfty;
-            fZDerivation = fInfty;
+            aSplineX = new lcl_SplineCalculation( aInputX, fXDerivation, fXDerivation );
+            aSplineY = new lcl_SplineCalculation( aInputY, fYDerivation, fYDerivation );
         }
-        lcl_SplineCalculation aSplineX( aInputX, fXDerivation, fXDerivation );
-        lcl_SplineCalculation aSplineY( aInputY, fYDerivation, fYDerivation );
-        lcl_SplineCalculation aSplineZ( aInputZ, fZDerivation, fZDerivation );
 
         // fill result polygon with calculated values
         rResult.SequenceX[nOuter].realloc( nMaxIndexPoints*nGranularity + 1);
@@ -411,13 +646,13 @@ void SplineCalculater::CalculateCubicSplines(
         double* pNewY = rResult.SequenceY[nOuter].getArray();
         double* pNewZ = rResult.SequenceZ[nOuter].getArray();
 
-        sal_Int32 nNewPointIndex = 0; // Index in result points
+        sal_uInt32 nNewPointIndex = 0; // Index in result points
         // needed for inner loop
         double    fInc;   // step for intermediate points
-        sal_Int32 nj;     // for loop
+        sal_uInt32 nj;     // for loop
         double    fParam; // a intermediate parameter value
 
-        for( sal_Int32 ni = 0; ni < nMaxIndexPoints; ni++ )
+        for( sal_uInt32 ni = 0; ni < nMaxIndexPoints; ni++ )
         {
             // given point is surely a curve point
             pNewX[nNewPointIndex] = pOldX[ni];
@@ -431,9 +666,10 @@ void SplineCalculater::CalculateCubicSplines(
             {
                 fParam = aParameter[ni] + ( fInc * static_cast< double >( nj ) );
 
-                pNewX[nNewPointIndex]=aSplineX.GetInterpolatedValue( fParam );
-                pNewY[nNewPointIndex]=aSplineY.GetInterpolatedValue( fParam );
-                pNewZ[nNewPointIndex]=aSplineZ.GetInterpolatedValue( fParam );
+                pNewX[nNewPointIndex]=aSplineX->GetInterpolatedValue( fParam );
+                pNewY[nNewPointIndex]=aSplineY->GetInterpolatedValue( fParam );
+                // pNewZ[nNewPointIndex]=aSplineZ->GetInterpolatedValue( fParam );
+                pNewZ[nNewPointIndex] = pOldZ[ni];
                 nNewPointIndex++;
             }
         }
@@ -441,18 +677,34 @@ void SplineCalculater::CalculateCubicSplines(
         pNewX[nNewPointIndex] = pOldX[nMaxIndexPoints];
         pNewY[nNewPointIndex] = pOldY[nMaxIndexPoints];
         pNewZ[nNewPointIndex] = pOldZ[nMaxIndexPoints];
+        delete aSplineX;
+        delete aSplineY;
+        // delete aSplineZ;
     }
 }
 
+
+// The implementation follows closely ODF1.2 spec, chapter chart:interpolation
+// using the same names as in spec as far as possible, without prefix.
+// More details can be found on
+// Dr. C.-K. Shene: CS3621 Introduction to Computing with Geometry Notes
+// Unit 9: Interpolation and Approximation/Curve Global Interpolation
+// Department of Computer Science, Michigan Technological University
+// http://www.cs.mtu.edu/~shene/COURSES/cs3621/NOTES/
+// [last called 2011-05-20]
 void SplineCalculater::CalculateBSplines(
             const ::com::sun::star::drawing::PolyPolygonShape3D& rInput
             , ::com::sun::star::drawing::PolyPolygonShape3D& rResult
-            , sal_Int32 nGranularity
-            , sal_Int32 nDegree )
+            , sal_uInt32 nResolution
+            , sal_uInt32 nDegree )
 {
-    // #issue 72216#
-    // k is the order of the BSpline, nDegree is the degree of its polynoms
-    sal_Int32 k = nDegree + 1;
+    // nResolution is ODF1.2 file format attribut chart:spline-resolution and
+    // ODF1.2 spec variable k. Causion, k is used as index in the spec in addition.
+    // nDegree is ODF1.2 file format attribut chart:spline-order and
+    // ODF1.2 spec variable p
+    OSL_ASSERT( nResolution > 1 );
+    OSL_ASSERT( nDegree >= 1 );
+    sal_uInt32 p = nDegree;
 
     rResult.SequenceX.realloc(0);
     rResult.SequenceY.realloc(0);
@@ -469,77 +721,261 @@ void SplineCalculater::CalculateBSplines(
     for( sal_Int32 nOuter = 0; nOuter < nOuterCount; ++nOuter )
     {
         if( rInput.SequenceX[nOuter].getLength() <= 1 )
-            continue; // need at least 2 control points
-
-        sal_Int32 n = rInput.SequenceX[nOuter].getLength()-1; // maximum index of control points
-
-        double fCurveparam =0.0; // parameter for the curve
-        // 0<= fCurveparam < fMaxCurveparam
-        double fMaxCurveparam = 2.0+ n - k;
-        if (fMaxCurveparam <= 0.0)
-            return; // not enough control points for desired spline order
-
-        if (nGranularity < 1)
-            return; //need at least 1 line for each part beween the control points
+            continue; // need at least 2 points, next piece of the series
 
+        // Copy input to vector of points and remove adjacent double points. The
+        // Z-coordinate is equal for all points in a series and holds the depth
+        // in 3D mode, simple copying is enough.
+        lcl_tSizeType nMaxIndexPoints = rInput.SequenceX[nOuter].getLength()-1; // is >=1
         const double* pOldX = rInput.SequenceX[nOuter].getConstArray();
         const double* pOldY = rInput.SequenceY[nOuter].getConstArray();
         const double* pOldZ = rInput.SequenceZ[nOuter].getConstArray();
+        double fZCoordinate = pOldZ[0];
+        tPointVecType aPointsIn;
+        aPointsIn.resize(nMaxIndexPoints+1);
+        for (lcl_tSizeType i = 0; i <= nMaxIndexPoints; ++i )
+        {
+          aPointsIn[ i ].first = pOldX[i];
+          aPointsIn[ i ].second = pOldY[i];
+        }
+        aPointsIn.erase( ::std::unique( aPointsIn.begin(), aPointsIn.end()),
+                     aPointsIn.end() );
+
+        // n is the last valid index to the reduced aPointsIn
+        // There are n+1 valid data points.
+        const lcl_tSizeType n = aPointsIn.size() - 1;
+        if (n < 1 || p > n)
+            continue; // need at least 2 points, degree p needs at least n+1 points
+                      // next piece of series
+
+        double* t = new double [n+1];
+        if (!createParameterT(aPointsIn, t))
+        {
+            delete[] t;
+            continue; // next piece of series
+        }
 
-        // keep this amount of steps to go well with old version
-        sal_Int32 nNewSectorCount = nGranularity * n;
-        double fCurveStep = fMaxCurveparam/static_cast< double >(nNewSectorCount);
-
-        double *b       = new double [n + k + 1]; // values of blending functions
-
-        const double* t = createTVector(n, k); // knot vector
-
-        rResult.SequenceX[nOuter].realloc(nNewSectorCount+1);
-        rResult.SequenceY[nOuter].realloc(nNewSectorCount+1);
-        rResult.SequenceZ[nOuter].realloc(nNewSectorCount+1);
-        double* pNewX = rResult.SequenceX[nOuter].getArray();
-        double* pNewY = rResult.SequenceY[nOuter].getArray();
-        double* pNewZ = rResult.SequenceZ[nOuter].getArray();
-
-        // variables needed inside loop, when calculating one point of output
-        sal_Int32 nPointIndex =0; //index of given contol points
-        double fX=0.0;
-        double fY=0.0;
-        double fZ=0.0; //coordinates of a new BSpline point
-
-        for(sal_Int32 nNewSector=0; nNewSector<nNewSectorCount; nNewSector++)
-        { // in first looping fCurveparam has value 0.0
-
-            // Calculate the values of the blending functions for actual curve parameter
-            BVector(fCurveparam, n, k, b, t);
-
-            // output point(fCurveparam) = sum over {input point * value of blending function}
-            fX = 0.0;
-            fY = 0.0;
-            fZ = 0.0;
-            for (nPointIndex=0;nPointIndex<=n;nPointIndex++)
+        lcl_tSizeType m = n + p + 1;
+        double* u = new double [m+1];
+        createKnotVector(n, p, t, u);
+
+        // The matrix N contains the B-spline basis functions applied to parameters.
+        // In each row only p+1 adjacent elements are non-zero. The starting
+        // column in a higher row is equal or greater than in the lower row.
+        // To store this matrix the non-zero elements are shifted to column 0
+        // and the amount of shifting is remembered in an array.
+        double** aMatN = new double*[n+1];
+        for (lcl_tSizeType row = 0; row <=n; ++row)
+        {
+            aMatN[row] = new double[p+1];
+            for (sal_uInt32 col = 0; col <= p; ++col)
+            aMatN[row][col] = 0.0;
+        }
+        lcl_tSizeType* aShift = new lcl_tSizeType[n+1];
+        aMatN[0][0] = 1.0; //all others are zero
+        aShift[0] = 0;
+        aMatN[n][0] = 1.0;
+        aShift[n] = n;
+        for (lcl_tSizeType k = 1; k<=n-1; ++k)
+        { // all basis functions are applied to t_k,
+            // results are elements in row k in matrix N
+
+            // find the one interval with u_i <= t_k < u_(i+1)
+            // remember u_0 = ... = u_p = 0.0 and u_(m-p) = ... u_m = 1.0 and 0<t_k<1
+            lcl_tSizeType i = p;
+            while (!(u[i] <= t[k] && t[k] < u[i+1]))
             {
-                fX +=pOldX[nPointIndex]*b[nPointIndex];
-                fY +=pOldY[nPointIndex]*b[nPointIndex];
-                fZ +=pOldZ[nPointIndex]*b[nPointIndex];
+                ++i;
             }
-            pNewX[nNewSector] = fX;
-            pNewY[nNewSector] = fY;
-            pNewZ[nNewSector] = fZ;
 
-            fCurveparam += fCurveStep; //for next looping
+            // index in reduced matrix aMatN = (index in full matrix N) - (i-p)
+            aShift[k] = i - p;
+
+            applyNtoParameterT(i, t[k], p, u, aMatN[k]);
+        } // next row k
+
+        // Get matrix C of control points from the matrix equation aMatN * C = aPointsIn
+        // aPointsIn is overwritten with C.
+        // Gaussian elimination is possible without pivoting, see reference
+        lcl_tSizeType r = 0; // true row index
+        lcl_tSizeType c = 0; // true column index
+        double fDivisor = 1.0; // used for diagonal element
+        double fEliminate = 1.0; // used for the element, that will become zero
+        double fHelp;
+        tPointType aHelp;
+        lcl_tSizeType nHelp; // used in triangle change
+        bool bIsSuccessful = true;
+        for (c = 0 ; c <= n && bIsSuccessful; ++c)
+        {
+            // search for first non-zero downwards
+            r = c;
+            while ( aMatN[r][c-aShift[r]] == 0 &&  r < n)
+            {
+                ++r;
+            }
+            if (aMatN[r][c-aShift[r]] == 0.0)
+            {
+                // Matrix N is singular, although this is mathematically impossible
+                bIsSuccessful = false;
+            }
+            else
+            {
+                // exchange total row r with total row c if necessary
+                if (r != c)
+                {
+                    for ( sal_uInt32 i = 0; i <= p ; ++i)
+                    {
+                        fHelp = aMatN[r][i];
+                        aMatN[r][i] = aMatN[c][i];
+                        aMatN[c][i] = fHelp;
+                    }
+                    aHelp = aPointsIn[r];
+                    aPointsIn[r] = aPointsIn[c];
+                    aPointsIn[c] = aHelp;
+                    nHelp = aShift[r];
+                    aShift[r] = aShift[c];
+                    aShift[c] = nHelp;
+                }
+
+                // divide row c, so that element(c,c) becomes 1
+                fDivisor = aMatN[c][c-aShift[c]]; // not zero, see above
+                for (sal_uInt32 i = 0; i <= p; ++i)
+                {
+                    aMatN[c][i] /= fDivisor;
+                }
+                aPointsIn[c].first /= fDivisor;
+                aPointsIn[c].second /= fDivisor;
+
+                // eliminate forward, examine row c+1 to n-1 (worst case)
+                // stop if first non-zero element in row has an higher column as c
+                // look at nShift for that, elements in nShift are equal or increasing
+                for ( r = c+1; aShift[r]<=c && r < n; ++r)
+                {
+                    fEliminate = aMatN[r][0];
+                    if (fEliminate != 0.0) // else accidentally zero, nothing to do
+                    {
+                        for (sal_uInt32 i = 1; i <= p; ++i)
+                        {
+                            aMatN[r][i-1] = aMatN[r][i] - fEliminate * aMatN[c][i];
+                        }
+                        aMatN[r][p]=0;
+                        aPointsIn[r].first -= fEliminate * aPointsIn[c].first;
+                        aPointsIn[r].second -= fEliminate * aPointsIn[c].second;
+                        ++aShift[r];
+                    }
+                }
+            }
+        }// upper triangle form is reached
+        if( bIsSuccessful)
+        {
+            // eliminate backwards, begin with last column
+            for (lcl_tSizeType cc = n; cc >= 1; --cc )
+            {
+                // In row cc the diagonal element(cc,cc) == 1 and all elements left from
+                // diagonal are zero and do not influence other rows.
+                // Full matrix N has semibandwidth < p, therefore element(r,c) is
+                // zero, if abs(r-cc)>=p.  abs(r-cc)=cc-r, because r<cc.
+                r = cc - 1;
+                while ( r !=0 && cc-r < p )
+                {
+                    fEliminate = aMatN[r][ cc - aShift[r] ];
+                    if ( fEliminate != 0.0) // else element is accidentically zero, no action needed
+                    {
+                        // row r -= fEliminate * row cc only relevant for right side
+                        aMatN[r][cc - aShift[r]] = 0.0;
+                        aPointsIn[r].first -= fEliminate * aPointsIn[cc].first;
+                        aPointsIn[r].second -= fEliminate * aPointsIn[cc].second;
+                    }
+                    --r;
+                }
+            }
+        }   // aPointsIn contains the control points now.
+        if (bIsSuccessful)
+        {
+            // calculate the intermediate points according given resolution
+            // using deBoor-Cox algorithm
+            lcl_tSizeType nNewSize = nResolution * n + 1;
+            rResult.SequenceX[nOuter].realloc(nNewSize);
+            rResult.SequenceY[nOuter].realloc(nNewSize);
+            rResult.SequenceZ[nOuter].realloc(nNewSize);
+            double* pNewX = rResult.SequenceX[nOuter].getArray();
+            double* pNewY = rResult.SequenceY[nOuter].getArray();
+            double* pNewZ = rResult.SequenceZ[nOuter].getArray();
+            pNewX[0] = aPointsIn[0].first;
+            pNewY[0] = aPointsIn[0].second;
+            pNewZ[0] = fZCoordinate; // Precondition: z-coordinates of all points of a series are equal
+            pNewX[nNewSize -1 ] = aPointsIn[n].first;
+            pNewY[nNewSize -1 ] = aPointsIn[n].second;
+            pNewZ[nNewSize -1 ] = fZCoordinate;
+            double* aP = new double[m+1];
+            lcl_tSizeType nLow = 0;
+            for ( lcl_tSizeType nTIndex = 0; nTIndex <= n-1; ++nTIndex)
+            {
+                for (sal_uInt32 nResolutionStep = 1;
+                     nResolutionStep <= nResolution && !( nTIndex == n-1 && nResolutionStep == nResolution);
+                     ++nResolutionStep)
+                {
+                    lcl_tSizeType nNewIndex = nTIndex * nResolution + nResolutionStep;
+                    double ux = t[nTIndex] + nResolutionStep * ( t[nTIndex+1] - t[nTIndex]) /nResolution;
+
+                    // get index nLow, so that u[nLow]<= ux < u[nLow +1]
+                    // continue from previous nLow
+                    while ( u[nLow] <= ux)
+                    {
+                        ++nLow;
+                    }
+                    --nLow;
+
+                    // x-coordinate
+                    for (lcl_tSizeType i = nLow-p; i <= nLow; ++i)
+                    {
+                        aP[i] = aPointsIn[i].first;
+                    }
+                    for (sal_uInt32 lcl_Degree = 1; lcl_Degree <= p; ++lcl_Degree)
+                    {
+                        double fFactor = 0.0;
+                        for (lcl_tSizeType i = nLow; i >= nLow + lcl_Degree - p; --i)
+                        {
+                            fFactor = ( ux - u[i] ) / ( u[i+p+1-lcl_Degree] - u[i]);
+                            aP[i] = (1 - fFactor)* aP[i-1] + fFactor * aP[i];
+                        }
+                    }
+                    pNewX[nNewIndex] = aP[nLow];
+
+                    // y-coordinate
+                    for (lcl_tSizeType i = nLow - p; i <= nLow; ++i)
+                    {
+                        aP[i] = aPointsIn[i].second;
+                    }
+                    for (sal_uInt32 lcl_Degree = 1; lcl_Degree <= p; ++lcl_Degree)
+                    {
+                        double fFactor = 0.0;
+                        for (lcl_tSizeType i = nLow; i >= nLow +lcl_Degree - p; --i)
+                        {
+                            fFactor = ( ux - u[i] ) / ( u[i+p+1-lcl_Degree] - u[i]);
+                            aP[i] = (1 - fFactor)* aP[i-1] + fFactor * aP[i];
+                        }
+                    }
+                    pNewY[nNewIndex] = aP[nLow];
+                    pNewZ[nNewIndex] = fZCoordinate;
+                }
+            }
+            delete[] aP;
         }
-        // add last control point to BSpline curve
-        pNewX[nNewSectorCount] = pOldX[n];
-        pNewY[nNewSectorCount] = pOldY[n];
-        pNewZ[nNewSectorCount] = pOldZ[n];
-
+        delete[] aShift;
+        for (lcl_tSizeType row = 0; row <=n; ++row)
+        {
+            delete[] aMatN[row];
+        }
+        delete[] aMatN;
+        delete[] u;
         delete[] t;
-        delete[] b;
-    }
+
+    } // next piece of the series
 }
 
 //.............................................................................
 } //namespace chart
 //.............................................................................
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/charttypes/Splines.hxx b/chart2/source/view/charttypes/Splines.hxx
index 642522f53ebe..4f4d10483f0d 100644
--- a/chart2/source/view/charttypes/Splines.hxx
+++ b/chart2/source/view/charttypes/Splines.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -45,13 +46,13 @@ public:
     static void CalculateCubicSplines(
             const ::com::sun::star::drawing::PolyPolygonShape3D& rPoints
             , ::com::sun::star::drawing::PolyPolygonShape3D& rResult
-            , sal_Int32 nGranularity );
+            , sal_uInt32 nGranularity );
 
     static void CalculateBSplines(
             const ::com::sun::star::drawing::PolyPolygonShape3D& rPoints
             , ::com::sun::star::drawing::PolyPolygonShape3D& rResult
-            , sal_Int32 nGranularity
-            , sal_Int32 nSplineDepth );
+            , sal_uInt32 nGranularity
+            , sal_uInt32 nSplineDepth );
 };
 
 
@@ -59,3 +60,5 @@ public:
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 906ccae3ccda..fb7cc32d9e8d 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -73,7 +74,6 @@
 // header for class OUStringBuffer
 #include <rtl/ustrbuf.hxx>
 #include <rtl/math.hxx>
-#include <tools/debug.hxx>
 #include <basegfx/vector/b2dvector.hxx>
 #include <com/sun/star/drawing/LineStyle.hpp>
 #include <com/sun/star/util/XCloneable.hpp>
@@ -93,8 +93,6 @@ using ::com::sun::star::uno::Sequence;
 using rtl::OUString;
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 
 VDataSeriesGroup::CachedYValues::CachedYValues()
         : m_bValuesDirty(true)
@@ -128,7 +126,7 @@ void VDataSeriesGroup::deleteSeries()
     //delete all data series help objects:
     ::std::vector< VDataSeries* >::const_iterator       aIter = m_aSeriesVector.begin();
     const ::std::vector< VDataSeries* >::const_iterator aEnd  = m_aSeriesVector.end();
-    for( ; aIter != aEnd; aIter++ )
+    for( ; aIter != aEnd; ++aIter )
     {
         delete *aIter;
     }
@@ -147,8 +145,6 @@ sal_Int32 VDataSeriesGroup::getSeriesCount() const
 }
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 
 VSeriesPlotter::VSeriesPlotter( const uno::Reference<XChartType>& xChartTypeModel
                                , sal_Int32 nDimensionCount, bool bCategoryXAxis )
@@ -164,7 +160,7 @@ VSeriesPlotter::VSeriesPlotter( const uno::Reference<XChartType>& xChartTypeMode
         , m_pExplicitCategoriesProvider(0)
         , m_bPointsWereSkipped(false)
 {
-    DBG_ASSERT(m_xChartTypeModel.is(),"no XChartType available in view, fallback to default values may be wrong");
+    OSL_POSTCOND(m_xChartTypeModel.is(),"no XChartType available in view, fallback to default values may be wrong");
 }
 
 VSeriesPlotter::~VSeriesPlotter()
@@ -176,7 +172,7 @@ VSeriesPlotter::~VSeriesPlotter()
     {
         ::std::vector< VDataSeriesGroup >::iterator             aXSlotIter = aZSlotIter->begin();
         const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
-        for( ; aXSlotIter != aXSlotEnd; aXSlotIter++ )
+        for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter )
         {
             aXSlotIter->deleteSeries();
         }
@@ -201,7 +197,7 @@ void VSeriesPlotter::addSeries( VDataSeries* pSeries, sal_Int32 zSlot, sal_Int32
 {
     //take ownership of pSeries
 
-    DBG_ASSERT( pSeries, "series to add is NULL" );
+    OSL_PRECOND( pSeries, "series to add is NULL" );
     if(!pSeries)
         return;
 
@@ -247,7 +243,7 @@ void VSeriesPlotter::addSeries( VDataSeries* pSeries, sal_Int32 zSlot, sal_Int32
             {
                 //move all existing series in the xSlot to next slot
                 //@todo
-                OSL_ENSURE( false, "Not implemented yet");
+                OSL_FAIL( "Not implemented yet");
             }
             else if( ySlot == -1 || ySlot >= nYSlotCount)
             {
@@ -260,7 +256,7 @@ void VSeriesPlotter::addSeries( VDataSeries* pSeries, sal_Int32 zSlot, sal_Int32
                 //insert at given y and x position
 
                 //@todo
-                OSL_ENSURE( false, "Not implemented yet");
+                OSL_FAIL( "Not implemented yet");
             }
         }
     }
@@ -291,7 +287,7 @@ void VSeriesPlotter::releaseShapes()
     {
         ::std::vector< VDataSeriesGroup >::iterator             aXSlotIter = aZSlotIter->begin();
         const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
-        for( ; aXSlotIter != aXSlotEnd; aXSlotIter++ )
+        for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter )
         {
             ::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
 
@@ -299,7 +295,7 @@ void VSeriesPlotter::releaseShapes()
             const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd  = pSeriesList->end();
 
             //iterate through all series in this x slot
-            for( ; aSeriesIter != aSeriesEnd; aSeriesIter++ )
+            for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter )
             {
                 VDataSeries* pSeries( *aSeriesIter );
                 pSeries->releaseShapes();
@@ -420,7 +416,7 @@ OUString VSeriesPlotter::getLabelTextForValue( VDataSeries& rDataSeries
     {
         sal_Unicode cDecSeparator = '.';//@todo get this locale dependent
         aNumber = ::rtl::math::doubleToUString( fValue, rtl_math_StringFormat_G /*rtl_math_StringFormat*/
-            , 3/*DecPlaces*/ , cDecSeparator /*,sal_Int32 const * pGroups*/ /*,sal_Unicode cGroupSeparator*/ ,false /*bEraseTrailingDecZeros*/ );
+            , 3/*DecPlaces*/ , cDecSeparator, false /*bEraseTrailingDecZeros*/ );
     }
     return aNumber;
 }
@@ -701,7 +697,7 @@ double lcl_getErrorBarLogicLength(
                 uno::Reference< chart2::data::XDataSource > xErrorBarData( xProp, uno::UNO_QUERY );
                 if( xErrorBarData.is())
                     fResult = StatisticsHelper::getErrorFromDataSource(
-                        xErrorBarData, nIndex, bPositive /*, true */ /* y-error */ );
+                        xErrorBarData, nIndex, bPositive);
             }
             break;
         }
@@ -789,7 +785,6 @@ drawing::Position3D lcl_transformMixedToScene( PlottingPositionHelper* pPosHelpe
 
 } // anonymous namespace
 
-// virtual
 void VSeriesPlotter::createErrorBar(
       const uno::Reference< drawing::XShapes >& xTarget
     , const drawing::Position3D& rUnscaledLogicPosition
@@ -926,7 +921,6 @@ void VSeriesPlotter::createErrorBar(
 
 }
 
-// virtual
 void VSeriesPlotter::createErrorBar_Y( const drawing::Position3D& rUnscaledLogicPosition
                             , VDataSeries& rVDataSeries, sal_Int32 nPointIndex
                             , const uno::Reference< drawing::XShapes >& xTarget
@@ -1090,7 +1084,6 @@ void VSeriesPlotter::createRegressionCurveEquationShapes(
 
             if( bShowCorrCoeff )
             {
-//                 xEquationProperties->getPropertyValue( C2U("Separator")) >>= aSep;
                 aFormula.append( aSep );
             }
         }
@@ -1141,15 +1134,6 @@ void VSeriesPlotter::createRegressionCurveEquationShapes(
                 xEquationTarget, aFormula.makeStringAndClear(),
                 aNames, aValues, ShapeFactory::makeTransformation( aScreenPosition2D ));
 
-//             // adapt font sizes
-//             awt::Size aOldRefSize;
-//             if( xTitleProperties->getPropertyValue( C2U("ReferencePageSize")) >>= aOldRefSize )
-//             {
-//                 uno::Reference< beans::XPropertySet > xShapeProp( xTextShape, uno::UNO_QUERY );
-//                 if( xShapeProp.is())
-//                     RelativeSizeHelper::adaptFontSizes( xShapeProp, aOldRefSize, m_aPageReferenceSize );
-//             }
-
             OSL_ASSERT( xTextShape.is());
             if( xTextShape.is())
             {
@@ -1373,7 +1357,7 @@ void VSeriesPlotter::getMinimumAndMaximiumX( double& rfMinimum, double& rfMaximu
     {
         ::std::vector< VDataSeriesGroup >::const_iterator      aXSlotIter = aZSlotIter->begin();
         const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
-        for( ; aXSlotIter != aXSlotEnd; aXSlotIter++ )
+        for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter )
         {
             double fLocalMinimum, fLocalMaximum;
             aXSlotIter->getMinimumAndMaximiumX( fLocalMinimum, fLocalMaximum );
@@ -1400,7 +1384,7 @@ void VSeriesPlotter::getMinimumAndMaximiumYInContinuousXRange( double& rfMinY, d
     {
         ::std::vector< VDataSeriesGroup >::const_iterator      aXSlotIter = aZSlotIter->begin();
         const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
-        for( ; aXSlotIter != aXSlotEnd; aXSlotIter++ )
+        for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter )
         {
             double fLocalMinimum, fLocalMaximum;
             aXSlotIter->getMinimumAndMaximiumYInContinuousXRange( fLocalMinimum, fLocalMaximum, fMinX, fMaxX, nAxisIndex );
@@ -1428,7 +1412,7 @@ sal_Int32 VSeriesPlotter::getPointCount() const
         ::std::vector< VDataSeriesGroup >::const_iterator       aXSlotIter = aZSlotIter->begin();
         const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
 
-        for( ; aXSlotIter != aXSlotEnd; aXSlotIter++ )
+        for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter )
         {
             sal_Int32 nPointCount = aXSlotIter->getPointCount();
             if( nPointCount>nRet )
@@ -1463,7 +1447,7 @@ sal_Int32 VDataSeriesGroup::getPointCount() const
     ::std::vector< VDataSeries* >::const_iterator       aSeriesIter = m_aSeriesVector.begin();
     const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = m_aSeriesVector.end();
 
-    for( ; aSeriesIter != aSeriesEnd; aSeriesIter++ )
+    for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter)
     {
         sal_Int32 nPointCount = (*aSeriesIter)->getTotalPointCount();
         if( nPointCount>nRet )
@@ -1498,7 +1482,7 @@ void VDataSeriesGroup::getMinimumAndMaximiumX( double& rfMinimum, double& rfMaxi
     ::rtl::math::setInf(&rfMinimum, false);
     ::rtl::math::setInf(&rfMaximum, true);
 
-    for( ; aSeriesIter != aSeriesEnd; aSeriesIter++ )
+    for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter )
     {
         sal_Int32 nPointCount = (*aSeriesIter)->getTotalPointCount();
         for(sal_Int32 nN=0;nN<nPointCount;nN++)
@@ -1527,7 +1511,7 @@ void VDataSeriesGroup::getMinimumAndMaximiumYInContinuousXRange( double& rfMinY,
     ::rtl::math::setInf(&rfMinY, false);
     ::rtl::math::setInf(&rfMaxY, true);
 
-    for( ; aSeriesIter != aSeriesEnd; aSeriesIter++ )
+    for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter )
     {
         sal_Int32 nPointCount = (*aSeriesIter)->getTotalPointCount();
         for(sal_Int32 nN=0;nN<nPointCount;nN++)
@@ -1849,11 +1833,11 @@ std::vector< ViewLegendEntry > VSeriesPlotter::createLegendEntries(
         bool bFirstSeries = true;
         ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator             aZSlotIter = m_aZSlots.begin();
         const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator  aZSlotEnd = m_aZSlots.end();
-        for( ; aZSlotIter!=aZSlotEnd && !bBreak; aZSlotIter++ )
+        for( ; aZSlotIter!=aZSlotEnd && !bBreak; ++aZSlotIter )
         {
             ::std::vector< VDataSeriesGroup >::iterator             aXSlotIter = aZSlotIter->begin();
             const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
-            for( ; aXSlotIter!=aXSlotEnd && !bBreak; aXSlotIter++ )
+            for( ; aXSlotIter!=aXSlotEnd && !bBreak; ++aXSlotIter )
             {
                 ::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
                 ::std::vector< VDataSeries* >::const_iterator       aSeriesIter = pSeriesList->begin();
@@ -1904,11 +1888,11 @@ std::vector< ViewLegendEntry > VSeriesPlotter::createLegendEntries(
     ::std::vector< VDataSeries* > aAllSeries;
     ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator            aZSlotIter = m_aZSlots.begin();
     const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
-    for( ; aZSlotIter != aZSlotEnd; aZSlotIter++ )
+    for( ; aZSlotIter != aZSlotEnd; ++aZSlotIter )
     {
         ::std::vector< VDataSeriesGroup >::iterator             aXSlotIter = aZSlotIter->begin();
         const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
-        for( ; aXSlotIter != aXSlotEnd; aXSlotIter++ )
+        for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter )
         {
             ::std::vector< VDataSeries* > aSeriesList = aXSlotIter->m_aSeriesVector;
             aAllSeries.insert( aAllSeries.end(), aSeriesList.begin(), aSeriesList.end() );
@@ -1972,7 +1956,7 @@ awt::Size VSeriesPlotter::getPreferredLegendKeyAspectRatio()
     ::std::vector< VDataSeries* >::const_iterator       aSeriesIter = aAllSeries.begin();
     const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd  = aAllSeries.end();
     //iterate through all series
-    for( ; aSeriesIter != aSeriesEnd; aSeriesIter++ )
+    for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter )
     {
         if( bSeriesAllowsLines )
         {
@@ -2267,3 +2251,5 @@ VSeriesPlotter* VSeriesPlotter::createSeriesPlotter(
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/charttypes/makefile.mk b/chart2/source/view/charttypes/makefile.mk
deleted file mode 100644
index b6cb14edbf14..000000000000
--- a/chart2/source/view/charttypes/makefile.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=				..$/..$/..
-PRJINC=			    $(PRJ)$/source
-PRJNAME=			chart2
-TARGET=				chvtypes
-
-ENABLE_EXCEPTIONS=	TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE: settings.mk
-.INCLUDE: $(PRJ)$/chartview.pmk
-
-# --- export library -------------------------------------------------
-
-#object files to build and link together to lib $(SLB)$/$(TARGET).lib
-SLOFILES =  $(SLO)$/Splines.obj \
-            $(SLO)$/CategoryPositionHelper.obj \
-            $(SLO)$/BarPositionHelper.obj \
-            $(SLO)$/VSeriesPlotter.obj \
-            $(SLO)$/BarChart.obj \
-            $(SLO)$/PieChart.obj \
-            $(SLO)$/AreaChart.obj \
-            $(SLO)$/CandleStickChart.obj \
-            $(SLO)$/BubbleChart.obj
-
-# --- Targets -----------------------------------------------------------------
-
-.INCLUDE: target.mk
diff --git a/chart2/source/view/diagram/VDiagram.cxx b/chart2/source/view/diagram/VDiagram.cxx
index 0aad597d2475..23109b11b3fb 100644
--- a/chart2/source/view/diagram/VDiagram.cxx
+++ b/chart2/source/view/diagram/VDiagram.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,7 +41,6 @@
 #include "ThreeDHelper.hxx"
 #include <editeng/unoprnms.hxx>
 #include <tools/color.hxx>
-#include <tools/debug.hxx>
 #include <com/sun/star/drawing/FillStyle.hpp>
 #include <com/sun/star/drawing/LineStyle.hpp>
 #include <com/sun/star/drawing/ProjectionMode.hpp>
@@ -109,7 +109,7 @@ void VDiagram::init(
               , const uno::Reference< drawing::XShapes >& xFinalTarget
               , const uno::Reference< lang::XMultiServiceFactory >& xFactory )
 {
-    DBG_ASSERT(xLogicTarget.is()&&xFinalTarget.is()&&xFactory.is(),"no proper initialization parameters");
+    OSL_PRECOND(xLogicTarget.is()&&xFinalTarget.is()&&xFactory.is(),"no proper initialization parameters");
 
     m_xLogicTarget  = xLogicTarget;
     m_xFinalTarget  = xFinalTarget;
@@ -170,7 +170,7 @@ void VDiagram::createShapes( const awt::Point& rPos, const awt::Size& rSize )
 
 void VDiagram::createShapes_2d()
 {
-    DBG_ASSERT(m_pShapeFactory&&m_xLogicTarget.is()&&m_xFinalTarget.is()&&m_xShapeFactory.is(),"is not proper initialized");
+    OSL_PRECOND(m_pShapeFactory&&m_xLogicTarget.is()&&m_xFinalTarget.is()&&m_xShapeFactory.is(),"is not proper initialized");
     if(!(m_pShapeFactory&&m_xLogicTarget.is()&&m_xFinalTarget.is()&&m_xShapeFactory.is()))
         return;
 
@@ -194,15 +194,14 @@ void VDiagram::createShapes_2d()
         m_xWall2D = uno::Reference< drawing::XShape >(
             m_xShapeFactory->createInstance( C2U(
             "com.sun.star.drawing.RectangleShape" ) ), uno::UNO_QUERY );
-        //m_xWall2D->setPosition(m_aAvailablePosIncludingAxes);
-        //m_xWall2D->setSize(m_aAvailableSizeIncludingAxes);
+
         xGroupForWall->add(m_xWall2D);
         uno::Reference< beans::XPropertySet > xProp( m_xWall2D, uno::UNO_QUERY );
         if( xProp.is())
         {
             try
             {
-                DBG_ASSERT( m_xDiagram.is(), "Invalid Diagram model" );
+                OSL_ENSURE( m_xDiagram.is(), "Invalid Diagram model" );
                 if( m_xDiagram.is() )
                 {
                     uno::Reference< beans::XPropertySet > xWallProp( m_xDiagram->getWall());
@@ -314,7 +313,7 @@ namespace
 
 void lcl_ensureScaleValue( double& rfScale )
 {
-    DBG_ASSERT(rfScale>0, "calculation error for automatic 3D height in chart");
+    OSL_ENSURE(rfScale>0, "calculation error for automatic 3D height in chart");
     if( rfScale<0 )
         rfScale = 1.0;
     else if( rfScale<0.2 )
@@ -327,7 +326,7 @@ void lcl_ensureScaleValue( double& rfScale )
 
 void VDiagram::adjustAspectRatio3d( const awt::Size& rAvailableSize )
 {
-    DBG_ASSERT(m_xAspectRatio3D.is(), "created shape offers no XPropertySet");
+    OSL_PRECOND(m_xAspectRatio3D.is(), "created shape offers no XPropertySet");
     if( m_xAspectRatio3D.is())
     {
         try
@@ -350,9 +349,7 @@ void VDiagram::adjustAspectRatio3d( const awt::Size& rAvailableSize )
                 double fW = rAvailableSize.Width;
                 double fH = rAvailableSize.Height;
 
-//                 double cx = fabs(cos(m_fXAnglePi));
                 double sx = fabs(sin(m_fXAnglePi));
-//                 double cy = fabs(cos(m_fYAnglePi));
                 double sy = fabs(sin(m_fYAnglePi));
                 double cz = fabs(cos(m_fZAnglePi));
                 double sz = fabs(sin(m_fZAnglePi));
@@ -388,7 +385,7 @@ void VDiagram::adjustAspectRatio3d( const awt::Size& rAvailableSize )
                     else
                     {
                         //todo
-                        DBG_ASSERT(false, "not implemented yet");
+                        OSL_FAIL("not implemented yet");
 
                         if( fScaleX<0 )
                             fScaleX = 1.0;
@@ -416,20 +413,6 @@ void VDiagram::adjustAspectRatio3d( const awt::Size& rAvailableSize )
                         else
                             fScaleY = 1.0;//looking from top or bottom the height is irrelevant
 
-                        /*
-                        //fW*zoomfactor == fScaleX*cy*cz + fScaleY*sz*cy + fScaleZ*sy*cx;
-                        //fH*zoomfactor == fScaleY*cx*cz + fScaleX*sz*cy + fScaleZ*sx*cz;
-                        //==> fScaleY*(sz*cy*fH -cx*cz*fW) =  fScaleX*(sz*cy*fW - cy*cz*fH) + fScaleZ*(sx*cz*fW - sy*cx*fH);
-                        double fDivide = sz*cy*fH -cx*cz*fW;
-                        if( !::basegfx::fTools::equalZero(fDivide) )
-                        {
-                            fScaleY = ( fScaleX*(sz*cy*fW - cy*cz*fH)
-                                + fScaleZ*(sx*cz*fW - sy*cx*fH) ) / fDivide;
-                            lcl_ensureScaleValue(fScaleY);
-                        }
-                        else
-                            fScaleY = 1.0;//looking from top or bottom hieght is irrelevant
-                        */
                     }
                     else if( fScaleY>0 && fScaleZ>0 )
                     {
@@ -446,7 +429,7 @@ void VDiagram::adjustAspectRatio3d( const awt::Size& rAvailableSize )
                     else
                     {
                         //todo
-                        DBG_ASSERT(false, "not implemented yet");
+                        OSL_FAIL("not implemented yet");
 
                         if( fScaleX<0 )
                             fScaleX = 1.0;
@@ -510,7 +493,7 @@ void VDiagram::adjustAspectRatio3d( const awt::Size& rAvailableSize )
 
 void VDiagram::createShapes_3d()
 {
-    DBG_ASSERT(m_pShapeFactory&&m_xLogicTarget.is()&&m_xFinalTarget.is()&&m_xShapeFactory.is(),"is not proper initialized");
+    OSL_PRECOND(m_pShapeFactory&&m_xLogicTarget.is()&&m_xFinalTarget.is()&&m_xShapeFactory.is(),"is not proper initialized");
     if(!(m_pShapeFactory&&m_xLogicTarget.is()&&m_xFinalTarget.is()&&m_xShapeFactory.is()))
         return;
 
@@ -697,7 +680,7 @@ void VDiagram::createShapes_3d()
         m_xCoordinateRegionShape = uno::Reference< drawing::XShape >( xShapes, uno::UNO_QUERY );
 
         uno::Reference< beans::XPropertySet > xShapeProp( m_xCoordinateRegionShape, uno::UNO_QUERY );
-        DBG_ASSERT(xShapeProp.is(), "created shape offers no XPropertySet");
+        OSL_ENSURE(xShapeProp.is(), "created shape offers no XPropertySet");
         if( xShapeProp.is())
         {
             try
@@ -806,3 +789,4 @@ void VDiagram::reduceToMimimumSize()
 } //namespace chart
 //.............................................................................
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/diagram/makefile.mk b/chart2/source/view/diagram/makefile.mk
deleted file mode 100644
index 652f203b2267..000000000000
--- a/chart2/source/view/diagram/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=				..$/..$/..
-PRJINC=				$(PRJ)$/source
-PRJNAME=			chart2
-TARGET=				chvdiagram
-
-ENABLE_EXCEPTIONS=	TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE: settings.mk
-.INCLUDE: $(PRJ)$/chartview.pmk
-
-# --- export library -------------------------------------------------
-
-#object files to build and link together to lib $(SLB)$/$(TARGET).lib
-SLOFILES =	$(SLO)$/VDiagram.obj
-
-# --- Targets -----------------------------------------------------------------
-
-.INCLUDE: target.mk
-
diff --git a/chart2/source/view/inc/Clipping.hxx b/chart2/source/view/inc/Clipping.hxx
index d04a576737bf..f4df4995748a 100644
--- a/chart2/source/view/inc/Clipping.hxx
+++ b/chart2/source/view/inc/Clipping.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -68,3 +69,5 @@ public:
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/inc/DateHelper.hxx b/chart2/source/view/inc/DateHelper.hxx
index c2352e246695..7891035fc338 100644
--- a/chart2/source/view/inc/DateHelper.hxx
+++ b/chart2/source/view/inc/DateHelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -58,3 +59,5 @@ public:
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/inc/LabelAlignment.hxx b/chart2/source/view/inc/LabelAlignment.hxx
index 26ec703db302..c8472b51a061 100644
--- a/chart2/source/view/inc/LabelAlignment.hxx
+++ b/chart2/source/view/inc/LabelAlignment.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,3 +40,5 @@ enum LabelAlignment { LABEL_ALIGN_CENTER, LABEL_ALIGN_LEFT, LABEL_ALIGN_TOP, LAB
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/inc/LabelPositionHelper.hxx b/chart2/source/view/inc/LabelPositionHelper.hxx
index a240736018bc..02c4897e8c66 100644
--- a/chart2/source/view/inc/LabelPositionHelper.hxx
+++ b/chart2/source/view/inc/LabelPositionHelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -84,3 +85,5 @@ private:
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/inc/LegendEntryProvider.hxx b/chart2/source/view/inc/LegendEntryProvider.hxx
index 1ecc78107d2b..fd2c41c338c2 100644
--- a/chart2/source/view/inc/LegendEntryProvider.hxx
+++ b/chart2/source/view/inc/LegendEntryProvider.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -94,3 +95,5 @@ public:
 
 // CHART2_VIEW_LEGENDENTRYPROVIDER_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/inc/Linear3DTransformation.hxx b/chart2/source/view/inc/Linear3DTransformation.hxx
index 71a728d2dc73..f15bb1dd64ab 100644
--- a/chart2/source/view/inc/Linear3DTransformation.hxx
+++ b/chart2/source/view/inc/Linear3DTransformation.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -65,3 +66,4 @@ private:
 // _CHART_LINEAR3DTRANSFORMATION_HXX
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx b/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx
index dee1fec8e67d..b84fba786baf 100644
--- a/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx
+++ b/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -105,3 +106,5 @@ private:
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/inc/PlotterBase.hxx b/chart2/source/view/inc/PlotterBase.hxx
index 7920845248e4..b4e7e87b1610 100644
--- a/chart2/source/view/inc/PlotterBase.hxx
+++ b/chart2/source/view/inc/PlotterBase.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -72,9 +73,6 @@ public:
 
     static bool isValidPosition( const ::com::sun::star::drawing::Position3D& rPos );
 
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
 private: //methods
     //no default constructor
     PlotterBase();
@@ -93,8 +91,6 @@ protected: //member
     ::com::sun::star::uno::Reference<
                     ::com::sun::star::lang::XMultiServiceFactory>       m_xShapeFactory;
     ShapeFactory*                                                       m_pShapeFactory;
-    //::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>          m_xCC;
-
     rtl::OUString   m_aCID;
 
     sal_Int32                                           m_nDimension;
@@ -105,3 +101,5 @@ protected: //member
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/inc/PlottingPositionHelper.hxx b/chart2/source/view/inc/PlottingPositionHelper.hxx
index 42c7a90a0116..a54365e88cf3 100644
--- a/chart2/source/view/inc/PlottingPositionHelper.hxx
+++ b/chart2/source/view/inc/PlottingPositionHelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -162,10 +163,6 @@ enum NormalAxis
 };
 
 class PolarPlottingPositionHelper : public PlottingPositionHelper
-    /*
-                                  , public ::cppu::WeakImplHelper1<
-                                ::com::sun::star::chart2::XTransformation >
-                                */
 {
 public:
     PolarPlottingPositionHelper( NormalAxis eNormalAxis=NormalAxis_Z );
@@ -200,28 +197,10 @@ public:
 
     using PlottingPositionHelper::transformScaledLogicToScene;
 
-#ifdef NOTYET
-    double  getInnerLogicRadius() const;
-#endif
     double  getOuterLogicRadius() const;
 
     inline bool isMathematicalOrientationAngle() const;
     inline bool isMathematicalOrientationRadius() const;
-
-    /*
-    // ____ XTransformation ____
-    /// @see ::com::sun::star::chart2::XTransformation
-    virtual ::com::sun::star::uno::Sequence< double > SAL_CALL transform(
-        const ::com::sun::star::uno::Sequence< double >& rSourceValues )
-        throw (::com::sun::star::lang::IllegalArgumentException,
-               ::com::sun::star::uno::RuntimeException);
-    /// @see ::com::sun::star::chart2::XTransformation
-    virtual sal_Int32 SAL_CALL getSourceDimension()
-        throw (::com::sun::star::uno::RuntimeException);
-    /// @see ::com::sun::star::chart2::XTransformation
-    virtual sal_Int32 SAL_CALL getTargetDimension()
-        throw (::com::sun::star::uno::RuntimeException);
-        */
 public:
     //Offset for radius axis in absolute logic scaled values (1.0 == 1 category)
     double      m_fRadiusOffset;
@@ -448,3 +427,5 @@ inline bool PlottingPositionHelper::maySkipPointsInRegressionCalculation() const
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/inc/PolarLabelPositionHelper.hxx b/chart2/source/view/inc/PolarLabelPositionHelper.hxx
index b4fd1fdc8483..754e43e93cde 100644
--- a/chart2/source/view/inc/PolarLabelPositionHelper.hxx
+++ b/chart2/source/view/inc/PolarLabelPositionHelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -74,3 +75,5 @@ private:
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/inc/PropertyMapper.hxx b/chart2/source/view/inc/PropertyMapper.hxx
index c0871b94f835..872f1e0d1210 100644
--- a/chart2/source/view/inc/PropertyMapper.hxx
+++ b/chart2/source/view/inc/PropertyMapper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -131,3 +132,5 @@ public:
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/inc/ScaleAutomatism.hxx b/chart2/source/view/inc/ScaleAutomatism.hxx
index 327027efcf39..2ebe000c932c 100644
--- a/chart2/source/view/inc/ScaleAutomatism.hxx
+++ b/chart2/source/view/inc/ScaleAutomatism.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -132,3 +133,5 @@ private:
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/inc/ShapeFactory.hxx b/chart2/source/view/inc/ShapeFactory.hxx
index ef75f3a323af..176f76ac9cd0 100644
--- a/chart2/source/view/inc/ShapeFactory.hxx
+++ b/chart2/source/view/inc/ShapeFactory.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -252,3 +253,5 @@ private:
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/inc/Stripe.hxx b/chart2/source/view/inc/Stripe.hxx
index ca1aaf155d1e..f5193ec7ddc9 100644
--- a/chart2/source/view/inc/Stripe.hxx
+++ b/chart2/source/view/inc/Stripe.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -87,3 +88,5 @@ private:
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/inc/VCoordinateSystem.hxx b/chart2/source/view/inc/VCoordinateSystem.hxx
index f4fd12547118..f4b5e380d8b0 100644
--- a/chart2/source/view/inc/VCoordinateSystem.hxx
+++ b/chart2/source/view/inc/VCoordinateSystem.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -207,3 +208,5 @@ private:
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/inc/VDataSeries.hxx b/chart2/source/view/inc/VDataSeries.hxx
index 62d61cb17269..4f811a6d8667 100644
--- a/chart2/source/view/inc/VDataSeries.hxx
+++ b/chart2/source/view/inc/VDataSeries.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -44,14 +45,9 @@
 #include <com/sun/star/drawing/XShapes.hpp>
 #include <cppuhelper/weakref.hxx>
 
-//.............................................................................
 namespace chart
 {
-//.............................................................................
 
-//-----------------------------------------------------------------------------
-/**
-*/
 class VDataSequence
 {
 public:
@@ -152,10 +148,9 @@ public:
     sal_Int32   m_nPolygonIndex;
     double m_fLogicMinX;
     double m_fLogicMaxX;
-    //
+
     //this is here for deep stacking:
     double m_fLogicZPos;//from 0 to series count -1
-    //
 
     rtl::OUString       getCID() const;
     rtl::OUString       getSeriesParticle() const;
@@ -256,13 +251,12 @@ private: //member
                                                     m_apSymbolProperties_InvisibleSymbolForSelection;
     mutable sal_Int32                               m_nCurrentAttributedPoint;
     ::com::sun::star::awt::Size                     m_aReferenceSize;
-    //
 
     sal_Int32   m_nMissingValueTreatment;
     bool        m_bAllowPercentValueInDataLabel;
 };
 
-//.............................................................................
 } //namespace chart
-//.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/inc/VDiagram.hxx b/chart2/source/view/inc/VDiagram.hxx
index 6bcef92111ef..1a7dc6f7fa7c 100644
--- a/chart2/source/view/inc/VDiagram.hxx
+++ b/chart2/source/view/inc/VDiagram.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -77,9 +78,6 @@ public: //methods
 
     ::basegfx::B2IRectangle    adjustInnerSize( const ::basegfx::B2IRectangle& rConsumedOuterRect );
 
-    //    updateShapes(..);
-    // const awt::Point& rPos, const awt::Size& rSize );
-
 private: //methods
     void    createShapes_2d();
     void    createShapes_3d();
@@ -134,3 +132,4 @@ private: //members
 #endif
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/inc/VLegendSymbolFactory.hxx b/chart2/source/view/inc/VLegendSymbolFactory.hxx
index 4ea3c67d5ece..4b6deb816699 100644
--- a/chart2/source/view/inc/VLegendSymbolFactory.hxx
+++ b/chart2/source/view/inc/VLegendSymbolFactory.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -69,3 +70,5 @@ private:
 
 // CHART2_VLEGENDSYMBOLFACTORY_HXX
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/inc/VLineProperties.hxx b/chart2/source/view/inc/VLineProperties.hxx
index f6ec92d38cf8..ccfc78c2e2dd 100644
--- a/chart2/source/view/inc/VLineProperties.hxx
+++ b/chart2/source/view/inc/VLineProperties.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -59,3 +60,5 @@ struct VLineProperties
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/inc/VPolarTransformation.hxx b/chart2/source/view/inc/VPolarTransformation.hxx
index f3da18ac92b6..5004c0c49347 100644
--- a/chart2/source/view/inc/VPolarTransformation.hxx
+++ b/chart2/source/view/inc/VPolarTransformation.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -65,3 +66,4 @@ private:
 // _CHART_VPOLARTRANSFORMATION_HXX
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx
index 9e427a5e2a81..53cabce9ecc4 100644
--- a/chart2/source/view/inc/VSeriesPlotter.hxx
+++ b/chart2/source/view/inc/VSeriesPlotter.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -449,3 +450,5 @@ private: //member
 } //namespace chart
 //.............................................................................
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/inc/ViewDefines.hxx b/chart2/source/view/inc/ViewDefines.hxx
index 623e46e64fb7..c9306f1331f5 100644
--- a/chart2/source/view/inc/ViewDefines.hxx
+++ b/chart2/source/view/inc/ViewDefines.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -45,3 +46,5 @@ const sal_Int32 AXIS2D_TICKLABELSPACING = 100;//value like in old chart
 
 }//end namespace chart
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx
index c66044b9aa0d..0e8c53566098 100644
--- a/chart2/source/view/main/ChartItemPool.cxx
+++ b/chart2/source/view/main/ChartItemPool.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,7 +31,6 @@
 
 #include "ChartItemPool.hxx"
 #include "macros.hxx"
-
 #include "chartview/ChartSfxItemIds.hxx"
 #include <svx/chrtitem.hxx>
 #include <svl/intitem.hxx>
@@ -52,7 +52,6 @@ namespace chart
 ChartItemPool::ChartItemPool():
         SfxItemPool( String( RTL_CONSTASCII_USTRINGPARAM( "ChartItemPool" )), SCHATTR_START, SCHATTR_END, NULL, NULL )
 {
-//     OSL_TRACE( "SCH: CTOR: ChartItemPool" );
     /**************************************************************************
     * PoolDefaults
     **************************************************************************/
@@ -96,11 +95,11 @@ ChartItemPool::ChartItemPool():
     ppPoolDefaults[SCHATTR_STYLE_LINES    - SCHATTR_START] = new SfxBoolItem (SCHATTR_STYLE_LINES, 0);
     ppPoolDefaults[SCHATTR_STYLE_PERCENT  - SCHATTR_START] = new SfxBoolItem (SCHATTR_STYLE_PERCENT, 0);
     ppPoolDefaults[SCHATTR_STYLE_STACKED  - SCHATTR_START] = new SfxBoolItem (SCHATTR_STYLE_STACKED, 0);
-    ppPoolDefaults[SCHATTR_STYLE_SPLINES  - SCHATTR_START] = new SfxInt32Item (SCHATTR_STYLE_SPLINES, 0); //Bug: war Bool! ->Fileformat testen (betrifft nur 5er)
+    ppPoolDefaults[SCHATTR_STYLE_SPLINES    - SCHATTR_START] = new SfxInt32Item (SCHATTR_STYLE_SPLINES, 0); //Bug: was Bool! test ->Fileformat (touches only 5's)
     ppPoolDefaults[SCHATTR_STYLE_SYMBOL   - SCHATTR_START] = new SfxInt32Item (SCHATTR_STYLE_SYMBOL, 0);
     ppPoolDefaults[SCHATTR_STYLE_SHAPE    - SCHATTR_START] = new SfxInt32Item (SCHATTR_STYLE_SHAPE, 0);
 
-    ppPoolDefaults[SCHATTR_AXIS                 - SCHATTR_START] = new SfxInt32Item(SCHATTR_AXIS,2); //2 = Y-Achse!!!
+    ppPoolDefaults[SCHATTR_AXIS             - SCHATTR_START] = new SfxInt32Item(SCHATTR_AXIS,2); //2 = Y-Axis!!!
 
     //axis scale
     ppPoolDefaults[SCHATTR_AXISTYPE             - SCHATTR_START] = new SfxInt32Item(SCHATTR_AXISTYPE, CHART_AXIS_REALNUMBER);
@@ -113,6 +112,7 @@ ChartItemPool::ChartItemPool():
     ppPoolDefaults[SCHATTR_AXIS_STEP_MAIN       - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_AXIS_STEP_MAIN);
     ppPoolDefaults[SCHATTR_AXIS_MAIN_TIME_UNIT  - SCHATTR_START] = new SfxInt32Item(SCHATTR_AXIS_MAIN_TIME_UNIT,2);
     ppPoolDefaults[SCHATTR_AXIS_AUTO_STEP_HELP  - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_AUTO_STEP_HELP);
+    // type changed from double to sal_Int32
     ppPoolDefaults[SCHATTR_AXIS_STEP_HELP       - SCHATTR_START] = new SfxInt32Item(SCHATTR_AXIS_STEP_HELP,0);
     ppPoolDefaults[SCHATTR_AXIS_HELP_TIME_UNIT  - SCHATTR_START] = new SfxInt32Item(SCHATTR_AXIS_HELP_TIME_UNIT,2);
     ppPoolDefaults[SCHATTR_AXIS_AUTO_TIME_RESOLUTION    - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_AUTO_TIME_RESOLUTION);
@@ -171,11 +171,11 @@ ChartItemPool::ChartItemPool():
     **************************************************************************/
     pItemInfos = new SfxItemInfo[SCHATTR_END - SCHATTR_START + 1];
 
-    sal_uInt16 i;
-    for( i = SCHATTR_START; i <= SCHATTR_END; i++ )
+    const sal_uInt16 nMax = SCHATTR_END - SCHATTR_START + 1;
+    for( sal_uInt16 i = 0; i < nMax; i++ )
     {
-        pItemInfos[i - SCHATTR_START]._nSID = 0;
-        pItemInfos[i - SCHATTR_START]._nFlags = SFX_ITEM_POOLABLE;
+        pItemInfos[i]._nSID = 0;
+        pItemInfos[i]._nFlags = SFX_ITEM_POOLABLE;
     }
 
     // slot ids differing from which ids
@@ -190,12 +190,10 @@ ChartItemPool::ChartItemPool():
 ChartItemPool::ChartItemPool(const ChartItemPool& rPool):
     SfxItemPool(rPool)
 {
-//     OSL_TRACE( "SCH: CTOR: ChartItemPool" );
 }
 
 ChartItemPool::~ChartItemPool()
 {
-//     OSL_TRACE( "SCH: DTOR: ChartItemPool" );
     Delete();
 
     delete[] pItemInfos;
@@ -226,3 +224,5 @@ SfxItemPool* ChartItemPool::CreateChartItemPool()
 }
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/main/ChartItemPool.hxx b/chart2/source/view/main/ChartItemPool.hxx
index 10d30e9d2cf4..cb13e29fe52a 100644
--- a/chart2/source/view/main/ChartItemPool.hxx
+++ b/chart2/source/view/main/ChartItemPool.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -56,3 +57,5 @@ public:
 
 #endif
 // _CHART2_ITEMPOOL_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index ee915ceac688..779c57498f90 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -60,6 +61,7 @@
 #include "DateHelper.hxx"
 
 #include <comphelper/scopeguard.hxx>
+#include <comphelper/servicehelper.hxx>
 #include <boost/bind.hpp>
 #include <unotools/streamwrap.hxx>
 // header for class LocaleDataWrapper
@@ -72,7 +74,7 @@
 #include <svx/unoshape.hxx>
 // header for class Application
 #include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <svx/unofill.hxx>
 
 #include <time.h>
@@ -118,20 +120,14 @@ using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Any;
 using rtl::OUString;
 
+namespace
+{
+    class theExplicitValueProviderUnoTunnelId  : public rtl::Static< UnoTunnelIdInit, theExplicitValueProviderUnoTunnelId > {};
+}
+
 const uno::Sequence<sal_Int8>& ExplicitValueProvider::getUnoTunnelId()
 {
-    static uno::Sequence<sal_Int8> * pSeq = 0;
-    if( !pSeq )
-    {
-        osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
-        if( !pSeq )
-        {
-            static uno::Sequence< sal_Int8 > aSeq( 16 );
-            rtl_createUuid( (sal_uInt8*)aSeq.getArray(), 0, sal_True );
-            pSeq = &aSeq;
-        }
-    }
-    return *pSeq;
+    return theExplicitValueProviderUnoTunnelId::get().getSeq();
 }
 
 ExplicitValueProvider* ExplicitValueProvider::getExplicitValueProvider(
@@ -184,26 +180,24 @@ void ChartView::impl_setChartModel( const uno::Reference< frame::XModel >& xChar
 void SAL_CALL ChartView::initialize( const uno::Sequence< uno::Any >& aArguments )
                 throw ( uno::Exception, uno::RuntimeException)
 {
-    DBG_ASSERT(aArguments.getLength() >= 1,"need 1 argument to initialize the view: xModel");
+    OSL_PRECOND(aArguments.getLength() >= 1,"need 1 argument to initialize the view: xModel");
     if( !(aArguments.getLength() >= 1) )
         return;
 
     uno::Reference< frame::XModel > xNewChartModel;
     if( !(aArguments[0] >>= xNewChartModel) )
     {
-        DBG_ERROR( "need a Reference to frame::XModel as first parameter for view initialization" );
+        OSL_FAIL( "need a Reference to frame::XModel as first parameter for view initialization" );
     }
     impl_setChartModel( xNewChartModel );
 
     if( !m_pDrawModelWrapper.get() )
     {
-        // /--
-        ::vos::OGuard aSolarGuard( Application::GetSolarMutex());
+        SolarMutexGuard aSolarGuard;
         m_pDrawModelWrapper = ::boost::shared_ptr< DrawModelWrapper >( new DrawModelWrapper( m_xCC ) );
         m_xShapeFactory = m_pDrawModelWrapper->getShapeFactory();
         m_xDrawPage = m_pDrawModelWrapper->getMainDrawPage();
-        StartListening( m_pDrawModelWrapper->getSdrModel(), sal_False /*bPreventDups*/ );
-        // \--
+        StartListening( m_pDrawModelWrapper->getSdrModel(), false /*bPreventDups*/ );
     }
 }
 
@@ -211,8 +205,8 @@ ChartView::~ChartView()
 {
     if( m_pDrawModelWrapper.get() )
     {
-        EndListening( m_pDrawModelWrapper->getSdrModel(), sal_False /*bAllDups*/ );
-        ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+        EndListening( m_pDrawModelWrapper->getSdrModel(), false /*bAllDups*/ );
+        SolarMutexGuard aSolarGuard;
         m_pDrawModelWrapper.reset();
     }
     m_xDrawPage = NULL;
@@ -226,7 +220,7 @@ void ChartView::impl_deleteCoordinateSystems()
     ::std::swap( aVectorToDeleteObjects, m_aVCooSysList );//#i109770#
     ::std::vector< VCoordinateSystem* >::const_iterator       aIter = aVectorToDeleteObjects.begin();
     const ::std::vector< VCoordinateSystem* >::const_iterator aEnd  = aVectorToDeleteObjects.end();
-    for( ; aIter != aEnd; aIter++ )
+    for( ; aIter != aEnd; ++aIter )
     {
         delete *aIter;
     }
@@ -463,7 +457,6 @@ struct AxisUsage
     void addCoordinateSystem( VCoordinateSystem* pCooSys, sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex );
     ::std::vector< VCoordinateSystem* > getCoordinateSystems( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex );
     sal_Int32 getMaxAxisIndexForDimension( sal_Int32 nDimensionIndex );
-    //tFullAxisIndex getDimensionAndIndexForCooSys( VCoordinateSystem* pCooSys );
 
     ScaleAutomatism         aScaleAutomatism;
 
@@ -482,19 +475,6 @@ AxisUsage::~AxisUsage()
     aCoordinateSystems.clear();
 }
 
-/*
-tFullScaleIndex AxisUsage::getDimensionAndIndexForCooSys( VCoordinateSystem* pCooSys )
-{
-    tFullScaleIndex aRet(0,0);
-
-    tCoordinateSystemMap::const_iterator aFound( aCoordinateSystems.find(pCooSys) );
-    if(aFound!=aCoordinateSystems.end())
-        aRet = aFound->second;
-
-    return aRet;
-}
-*/
-
 void AxisUsage::addCoordinateSystem( VCoordinateSystem* pCooSys, sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex )
 {
     if(!pCooSys)
@@ -602,7 +582,7 @@ SeriesPlotterContainer::~SeriesPlotterContainer()
     // - delete all plotter
     ::std::vector< VSeriesPlotter* >::const_iterator       aPlotterIter = m_aSeriesPlotterList.begin();
     const ::std::vector< VSeriesPlotter* >::const_iterator aPlotterEnd  = m_aSeriesPlotterList.end();
-    for( aPlotterIter = m_aSeriesPlotterList.begin(); aPlotterIter != aPlotterEnd; aPlotterIter++ )
+    for( aPlotterIter = m_aSeriesPlotterList.begin(); aPlotterIter != aPlotterEnd; ++aPlotterIter )
         delete *aPlotterIter;
     m_aSeriesPlotterList.clear();
 }
@@ -622,7 +602,7 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(
               const uno::Reference< frame::XModel >& xChartModel )
 {
     //------------ get model series from model
-    sal_Int32 nDiagramIndex = 0;//todo if more than one diagam is supported
+    sal_Int32 nDiagramIndex = 0;//todo if more than one diagram is supported
     uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) );
     if( !xDiagram.is())
         return;
@@ -698,13 +678,14 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(
             m_aSeriesPlotterList.push_back( pPlotter );
             pPlotter->setNumberFormatsSupplier( xNumberFormatsSupplier );
             pPlotter->setColorScheme( xColorScheme );
-            pPlotter->setExplicitCategoriesProvider( pVCooSys->getExplicitCategoriesProvider() );
+            if(pVCooSys)
+                pPlotter->setExplicitCategoriesProvider( pVCooSys->getExplicitCategoriesProvider() );
             sal_Int32 nMissingValueTreatment = DiagramHelper::getCorrectedMissingValueTreatment( xDiagram, xChartType );
 
             if(pVCooSys)
                 pVCooSys->addMinimumAndMaximumSupplier(pPlotter);
 
-            //------------ add series to plotter and thus prepare him for providing minimum and maximum values
+            //------------ add series to plotter and thus prepare him(it) for providing minimum and maximum values
             uno::Reference< XDataSeriesContainer > xDataSeriesContainer( xChartType, uno::UNO_QUERY );
             OSL_ASSERT( xDataSeriesContainer.is());
             if( !xDataSeriesContainer.is() )
@@ -776,7 +757,7 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(
     }
 
     //transport seriesnames to the coordinatesystems if needed
-    if( m_aSeriesPlotterList.size() )
+    if( !m_aSeriesPlotterList.empty() )
     {
         uno::Sequence< rtl::OUString > aSeriesNames;
         bool bSeriesNamesInitialized = false;
@@ -850,7 +831,7 @@ void SeriesPlotterContainer::initAxisUsageList(const Date& rNullDate)
     m_nMaxAxisIndex = 0;
     for(sal_Int32 nDimensionIndex=0; nDimensionIndex<3; nDimensionIndex++)
     {
-        for( aAxisIter = m_aAxisUsageList.begin(); aAxisIter != aAxisEndIter; aAxisIter++ )
+        for( aAxisIter = m_aAxisUsageList.begin(); aAxisIter != aAxisEndIter; ++aAxisIter )
         {
             sal_Int32 nLocalMax = aAxisIter->second.getMaxAxisIndexForDimension( nDimensionIndex );
             if( m_nMaxAxisIndex < nLocalMax )
@@ -864,7 +845,7 @@ void SeriesPlotterContainer::setScalesFromCooSysToPlotter()
     //set scales to plotter to enable them to provide the preferred scene AspectRatio
     ::std::vector< VSeriesPlotter* >::const_iterator       aPlotterIter = m_aSeriesPlotterList.begin();
     const ::std::vector< VSeriesPlotter* >::const_iterator aPlotterEnd  = m_aSeriesPlotterList.end();
-    for( aPlotterIter = m_aSeriesPlotterList.begin(); aPlotterIter != aPlotterEnd; aPlotterIter++ )
+    for( aPlotterIter = m_aSeriesPlotterList.begin(); aPlotterIter != aPlotterEnd; ++aPlotterIter )
     {
         VSeriesPlotter* pSeriesPlotter = *aPlotterIter;
         VCoordinateSystem* pVCooSys = lcl_getCooSysForPlotter( m_rVCooSysList, pSeriesPlotter );
@@ -880,11 +861,11 @@ void SeriesPlotterContainer::setScalesFromCooSysToPlotter()
 
 void SeriesPlotterContainer::setNumberFormatsFromAxes()
 {
-    //set numberfarmats to plotter to enable them to display the data labels in the numberfromat of teh axis
+    //set numberformats to plotter to enable them to display the data labels in the numberformat of the axis
 
     ::std::vector< VSeriesPlotter* >::const_iterator       aPlotterIter = m_aSeriesPlotterList.begin();
     const ::std::vector< VSeriesPlotter* >::const_iterator aPlotterEnd  = m_aSeriesPlotterList.end();
-    for( aPlotterIter = m_aSeriesPlotterList.begin(); aPlotterIter != aPlotterEnd; aPlotterIter++ )
+    for( aPlotterIter = m_aSeriesPlotterList.begin(); aPlotterIter != aPlotterEnd; ++aPlotterIter )
     {
         VSeriesPlotter* pSeriesPlotter = *aPlotterIter;
         VCoordinateSystem* pVCooSys = lcl_getCooSysForPlotter( m_rVCooSysList, pSeriesPlotter );
@@ -947,7 +928,7 @@ void SeriesPlotterContainer::doAutoScaling( const uno::Reference< frame::XModel
     {
 
         // - first do autoscale for all x and z scales (because they are treated independent)
-        for( aAxisIter = m_aAxisUsageList.begin(); aAxisIter != aAxisEndIter; aAxisIter++ )
+        for( aAxisIter = m_aAxisUsageList.begin(); aAxisIter != aAxisEndIter; ++aAxisIter )
         {
             AxisUsage& rAxisUsage = (*aAxisIter).second;
             ::std::vector< VCoordinateSystem* > aVCooSysList_X = rAxisUsage.getCoordinateSystems(0,nAxisIndex);
@@ -969,7 +950,7 @@ void SeriesPlotterContainer::doAutoScaling( const uno::Reference< frame::XModel
         }
 
         // - second do autoscale for the dependent y scales (the coordinate systems are prepared with x and z scales already )
-        for( aAxisIter = m_aAxisUsageList.begin(); aAxisIter != aAxisEndIter; aAxisIter++ )
+        for( aAxisIter = m_aAxisUsageList.begin(); aAxisIter != aAxisEndIter; ++aAxisIter )
         {
             AxisUsage& rAxisUsage = (*aAxisIter).second;
             ::std::vector< VCoordinateSystem* > aVCooSysList_X = rAxisUsage.getCoordinateSystems(0,nAxisIndex);
@@ -1006,7 +987,7 @@ void SeriesPlotterContainer::AdaptScaleOfYAxisWithoutAttachedSeries( const uno::
 
     for( sal_Int32 nAxisIndex=0; nAxisIndex<=m_nMaxAxisIndex; nAxisIndex++ )
     {
-        for( aAxisIter = m_aAxisUsageList.begin(); aAxisIter != aAxisEndIter; aAxisIter++ )
+        for( aAxisIter = m_aAxisUsageList.begin(); aAxisIter != aAxisEndIter; ++aAxisIter )
         {
             AxisUsage& rAxisUsage = (*aAxisIter).second;
             ::std::vector< VCoordinateSystem* > aVCooSysList_Y = rAxisUsage.getCoordinateSystems( 1, nAxisIndex );
@@ -1021,7 +1002,7 @@ void SeriesPlotterContainer::AdaptScaleOfYAxisWithoutAttachedSeries( const uno::
                 {
                     ::std::vector< Reference< XDataSeries > > aSeriesVector( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
                     ::std::vector< Reference< XDataSeries > >::const_iterator aIter = aSeriesVector.begin();
-                    for( ; aIter != aSeriesVector.end(); aIter++ )
+                    for( ; aIter != aSeriesVector.end(); ++aIter )
                     {
                         sal_Int32 nCurrentIndex = DataSeriesHelper::getAttachedAxisIndex( *aIter );
                         if( nAxisIndex == nCurrentIndex )
@@ -1102,7 +1083,7 @@ void SeriesPlotterContainer::AdaptScaleOfYAxisWithoutAttachedSeries( const uno::
         //correct origin for y main axis (the origin is where the other main axis crosses)
         sal_Int32 nAxisIndex=0;
         sal_Int32 nDimensionIndex=1;
-        for( aAxisIter = m_aAxisUsageList.begin(); aAxisIter != aAxisEndIter; aAxisIter++ )
+        for( aAxisIter = m_aAxisUsageList.begin(); aAxisIter != aAxisEndIter; ++aAxisIter )
         {
             AxisUsage& rAxisUsage = (*aAxisIter).second;
             ::std::vector< VCoordinateSystem* > aVCooSysList = rAxisUsage.getCoordinateSystems(nDimensionIndex,nAxisIndex);
@@ -1152,7 +1133,7 @@ drawing::Direction3D SeriesPlotterContainer::getPreferredAspectRatio()
     ::std::vector< VSeriesPlotter* >::const_iterator       aPlotterIter = m_aSeriesPlotterList.begin();
     const ::std::vector< VSeriesPlotter* >::const_iterator aPlotterEnd  = m_aSeriesPlotterList.end();
     for( aPlotterIter = m_aSeriesPlotterList.begin(), nPlotterCount=0
-        ; aPlotterIter != aPlotterEnd; aPlotterIter++, nPlotterCount++ )
+        ; aPlotterIter != aPlotterEnd; ++aPlotterIter, ++nPlotterCount )
     {
         drawing::Direction3D aSingleRatio( (*aPlotterIter)->getPreferredDiagramAspectRatio() );
         if( fx<0 && aSingleRatio.DirectionX>0 )
@@ -1505,7 +1486,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer&
     m_bPointsWereSkipped = false;
     ::std::vector< VSeriesPlotter* >::const_iterator       aPlotterIter = rSeriesPlotterList.begin();
     const ::std::vector< VSeriesPlotter* >::const_iterator aPlotterEnd  = rSeriesPlotterList.end();
-    for( aPlotterIter = rSeriesPlotterList.begin(); aPlotterIter != aPlotterEnd; aPlotterIter++ )
+    for( aPlotterIter = rSeriesPlotterList.begin(); aPlotterIter != aPlotterEnd; ++aPlotterIter )
     {
         //------------ set transformation to plotter / create series
         VSeriesPlotter* pSeriesPlotter = *aPlotterIter;
@@ -1516,7 +1497,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer&
         else
         {
             xSeriesTarget = xSeriesTargetBehindAxis;
-            DBG_ASSERT( !bIsPieOrDonut, "not implemented yet! - during a complete recreation this shape is destroyed so no series can be created anymore" );
+            OSL_ENSURE( !bIsPieOrDonut, "not implemented yet! - during a complete recreation this shape is destroyed so no series can be created anymore" );
         }
         pSeriesPlotter->initPlotter( xSeriesTarget,xTextTargetShapes,m_xShapeFactory,aCID );
         pSeriesPlotter->setPageReferenceSize( rPageSize );
@@ -1545,7 +1526,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer&
         if( !bUseFixedInnerSize )
             aNewInnerRect = aVDiagram.adjustInnerSize( aConsumedOuterRect );
 
-        for( aPlotterIter = rSeriesPlotterList.begin(); aPlotterIter != aPlotterEnd; aPlotterIter++ )
+        for( aPlotterIter = rSeriesPlotterList.begin(); aPlotterIter != aPlotterEnd; ++aPlotterIter )
         {
             VSeriesPlotter* pSeriesPlotter = *aPlotterIter;
             pSeriesPlotter->releaseShapes();
@@ -1565,7 +1546,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer&
         }
 
         // - create data series for all charttypes
-        for( aPlotterIter = rSeriesPlotterList.begin(); aPlotterIter != aPlotterEnd; aPlotterIter++ )
+        for( aPlotterIter = rSeriesPlotterList.begin(); aPlotterIter != aPlotterEnd; ++aPlotterIter )
         {
             //------------ set transformation to plotter / create series
             VSeriesPlotter* pSeriesPlotter = *aPlotterIter;
@@ -1576,25 +1557,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer&
             m_bPointsWereSkipped = m_bPointsWereSkipped || pSeriesPlotter->PointsWereSkipped();
         }
 
-        /*
-        uno::Reference< drawing::XShape > xDiagramPlusAxes_KeepRatio( xDiagramPlusAxes_Shapes, uno::UNO_QUERY );
-
-        awt::Size aNewSize( rAvailableSize );
-        awt::Point aNewPos( rAvailablePos );
-        if( bKeepAspectRatio )
-        {
-            awt::Size aCurrentSize( xDiagramPlusAxes_KeepRatio->getSize());
-
-            aNewSize = ShapeFactory::calculateNewSizeRespectingAspectRatio(
-                            rAvailableSize, aCurrentSize );
-            aNewPos = ShapeFactory::calculateTopLeftPositionToCenterObject(
-                    rAvailablePos, rAvailableSize, aNewSize );
-        }
-
-        xDiagramPlusAxes_KeepRatio->setPosition( aNewPos );
-        xDiagramPlusAxes_KeepRatio->setSize( aNewSize );
-        */
-        for( aPlotterIter = rSeriesPlotterList.begin(); aPlotterIter != aPlotterEnd; aPlotterIter++ )
+        for( aPlotterIter = rSeriesPlotterList.begin(); aPlotterIter != aPlotterEnd; ++aPlotterIter )
         {
             VSeriesPlotter* pSeriesPlotter = *aPlotterIter;
             pSeriesPlotter->rearrangeLabelToAvoidOverlapIfRequested( rPageSize );
@@ -1603,15 +1566,13 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer&
 
     if( bUseFixedInnerSize )
     {
-        //if( !bIsPieOrDonut )
-        //    aConsumedOuterRect = ::basegfx::B2IRectangle( ShapeFactory::getRectangleOfShape(xBoundingShape) );
         aUsedOuterRect = awt::Rectangle( aConsumedOuterRect.getMinX(), aConsumedOuterRect.getMinY(), aConsumedOuterRect.getWidth(), aConsumedOuterRect.getHeight() );
     }
     else
         aUsedOuterRect = awt::Rectangle( rAvailablePos.X, rAvailablePos.Y, rAvailableSize.Width, rAvailableSize.Height );
 
     bool bSnapRectToUsedArea = false;
-    for( aPlotterIter = rSeriesPlotterList.begin(); aPlotterIter != aPlotterEnd; aPlotterIter++ )
+    for( aPlotterIter = rSeriesPlotterList.begin(); aPlotterIter != aPlotterEnd; ++aPlotterIter )
     {
         VSeriesPlotter* pSeriesPlotter = *aPlotterIter;
         bSnapRectToUsedArea = pSeriesPlotter->shouldSnapRectToUsedArea();
@@ -1732,7 +1693,7 @@ SdrPage* ChartView::getSdrPage()
 
 uno::Reference< drawing::XShape > ChartView::getShapeForCID( const rtl::OUString& rObjectCID )
 {
-    ::vos::OGuard aSolarGuard( Application::GetSolarMutex());
+    SolarMutexGuard aSolarGuard;
     SdrObject* pObj = DrawModelWrapper::getNamedSdrObject( rObjectCID, this->getSdrPage() );
     if( pObj )
         return uno::Reference< drawing::XShape >( pObj->getUnoShape(), uno::UNO_QUERY);
@@ -1758,7 +1719,7 @@ awt::Rectangle ChartView::getRectangleOfObject( const rtl::OUString& rObjectCID,
         ObjectType eObjectType( ObjectIdentifier::getObjectType( rObjectCID ) );
         if( eObjectType == OBJECTTYPE_AXIS || eObjectType == OBJECTTYPE_DIAGRAM )
         {
-            ::vos::OGuard aSolarGuard( Application::GetSolarMutex());
+            SolarMutexGuard aSolarGuard;
             SvxShape* pRoot = SvxShape::getImplementation( xShape );
             if( pRoot )
             {
@@ -2425,27 +2386,7 @@ void lcl_removeEmptyGroupShapes( const Reference< drawing::XShapes>& xParent )
 
 bool ChartView::impl_AddInDrawsAllByItself()
 {
-    bool bRet = false;
-    /*
-    uno::Reference< beans::XPropertySet > xProp( m_xChartModel, uno::UNO_QUERY );
-    if( xProp.is()) try
-    {
-        uno::Reference< util::XRefreshable > xAddIn;
-        xProp->getPropertyValue( C2U( "AddIn" ) ) >>= xAddIn;
-        if( xAddIn.is() )
-        {
-            rtl::OUString aBaseDiagram;
-            xProp->getPropertyValue( C2U( "BaseDiagram" ) ) >>= aBaseDiagram;
-            if(aBaseDiagram.getLength())
-                bRet = true;
-        }
-    }
-    catch( uno::Exception& e )
-    {
-        ASSERT_EXCEPTION( e );
-    }
-    */
-    return bRet;
+    return false;
 }
 
 void ChartView::impl_refreshAddIn()
@@ -2488,12 +2429,10 @@ void ChartView::createShapes()
     impl_deleteCoordinateSystems();
     if( m_pDrawModelWrapper )
     {
-        // /--
-        ::vos::OGuard aSolarGuard( Application::GetSolarMutex());
+        SolarMutexGuard aSolarGuard;
         // #i12587# support for shapes in chart
         m_pDrawModelWrapper->getSdrModel().EnableUndo( sal_False );
         m_pDrawModelWrapper->clearMainDrawPage();
-        // \--
     }
 
     lcl_setDefaultWritingMode( m_pDrawModelWrapper, m_xChartModel );
@@ -2508,11 +2447,11 @@ void ChartView::createShapes()
         pPage->SetSize(Size(aPageSize.Width,aPageSize.Height));
     else
     {
-        DBG_ERROR("could not set page size correctly");
+        OSL_FAIL("could not set page size correctly");
     }
 
     {
-        ::vos::OGuard aSolarGuard( Application::GetSolarMutex());
+        SolarMutexGuard aSolarGuard;
 
         //------------ apply fill properties to page
         // todo: it would be nicer to just pass the page m_xDrawPage and format it,
@@ -2654,8 +2593,8 @@ void ChartView::createShapes()
     // #i12587# support for shapes in chart
     if ( m_pDrawModelWrapper )
     {
-        ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
-        m_pDrawModelWrapper->getSdrModel().EnableUndo( sal_True );
+        SolarMutexGuard aSolarGuard;
+        m_pDrawModelWrapper->getSdrModel().EnableUndo( true );
     }
 
 #if OSL_DEBUG_LEVEL > 0
@@ -2697,10 +2636,8 @@ void ChartView::impl_updateView()
 
             //prepare draw model
             {
-                // /--
-                ::vos::OGuard aSolarGuard( Application::GetSolarMutex());
+                SolarMutexGuard aSolarGuard;
                 m_pDrawModelWrapper->lockControllers();
-                // \--
             }
 
             //create chart view
@@ -2734,10 +2671,8 @@ void ChartView::impl_updateView()
         }
 
         {
-            // /--
-            ::vos::OGuard aSolarGuard( Application::GetSolarMutex());
+            SolarMutexGuard aSolarGuard;
             m_pDrawModelWrapper->unlockControllers();
-            // \--
         }
 
         impl_notifyModeChangeListener(C2U("valid"));
@@ -2888,7 +2823,7 @@ void SAL_CALL ChartView::update() throw (uno::RuntimeException)
 Reference< beans::XPropertySetInfo > SAL_CALL ChartView::getPropertySetInfo()
     throw (uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented");
+    OSL_FAIL("not implemented");
     return 0;
 }
 
@@ -2964,25 +2899,25 @@ void SAL_CALL ChartView::addPropertyChangeListener(
     const ::rtl::OUString& /* aPropertyName */, const Reference< beans::XPropertyChangeListener >& /* xListener */ )
         throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented");
+    OSL_FAIL("not implemented");
 }
 void SAL_CALL ChartView::removePropertyChangeListener(
     const ::rtl::OUString& /* aPropertyName */, const Reference< beans::XPropertyChangeListener >& /* aListener */ )
     throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented");
+    OSL_FAIL("not implemented");
 }
 
 void SAL_CALL ChartView::addVetoableChangeListener( const ::rtl::OUString& /* PropertyName */, const Reference< beans::XVetoableChangeListener >& /* aListener */ )
     throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented");
+    OSL_FAIL("not implemented");
 }
 
 void SAL_CALL ChartView::removeVetoableChangeListener( const ::rtl::OUString& /* PropertyName */, const Reference< beans::XVetoableChangeListener >& /* aListener */ )
     throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    OSL_ENSURE(false,"not implemented");
+    OSL_FAIL("not implemented");
 }
 
 // ____ XMultiServiceFactory ____
@@ -3071,3 +3006,5 @@ uno::Sequence< ::rtl::OUString > ChartView::getAvailableServiceNames() throw (un
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/main/ChartView.hxx b/chart2/source/view/main/ChartView.hxx
index 76c1ce5c4858..a7aec605e89b 100644
--- a/chart2/source/view/main/ChartView.hxx
+++ b/chart2/source/view/main/ChartView.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -259,3 +260,5 @@ private: //member
 //.............................................................................
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/main/Clipping.cxx b/chart2/source/view/main/Clipping.cxx
index 7eced29eb271..1965eda06834 100644
--- a/chart2/source/view/main/Clipping.cxx
+++ b/chart2/source/view/main/Clipping.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -164,7 +165,7 @@ void lcl_addPointToPoly( drawing::PolyPolygonShape3D& rPoly
 {
     if(nPolygonIndex<0)
     {
-        OSL_ENSURE( false, "The polygon index needs to be > 0");
+        OSL_FAIL( "The polygon index needs to be > 0");
         nPolygonIndex=0;
     }
 
@@ -190,7 +191,7 @@ void lcl_addPointToPoly( drawing::PolyPolygonShape3D& rPoly
         if( nNewResultPointCount > nReallocLength )
         {
             nReallocLength = nNewResultPointCount;
-            DBG_ERROR("this should not be the case to avoid performance problems");
+            OSL_FAIL("this should not be the case to avoid performance problems");
         }
         pOuterSequenceX->realloc(nReallocLength);
         pOuterSequenceY->realloc(nReallocLength);
@@ -302,3 +303,5 @@ void Clipping::clipPolygonAtRectangle( const drawing::PolyPolygonShape3D& rPolyg
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/main/DataPointSymbolSupplier.cxx b/chart2/source/view/main/DataPointSymbolSupplier.cxx
index d59a011cd429..a01b17cc1999 100644
--- a/chart2/source/view/main/DataPointSymbolSupplier.cxx
+++ b/chart2/source/view/main/DataPointSymbolSupplier.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -37,7 +38,6 @@ namespace chart
 {
 //.............................................................................
 using namespace ::com::sun::star;
-//using namespace ::com::sun::star::chart2;
 
 uno::Reference< drawing::XShapes > DataPointSymbolSupplier::create2DSymbolList(
             uno::Reference< lang::XMultiServiceFactory > xShapeFactory
@@ -64,3 +64,5 @@ uno::Reference< drawing::XShapes > DataPointSymbolSupplier::create2DSymbolList(
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/main/DrawModelWrapper.cxx b/chart2/source/view/main/DrawModelWrapper.cxx
index a23041ada673..938ba9ea9758 100644
--- a/chart2/source/view/main/DrawModelWrapper.cxx
+++ b/chart2/source/view/main/DrawModelWrapper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -174,7 +175,7 @@ DrawModelWrapper::DrawModelWrapper(
     }
     catch(...)
     {
-        DBG_ERROR("Can't get Hyphenator or SpellChecker for chart");
+        OSL_FAIL("Can't get Hyphenator or SpellChecker for chart");
     }
 
     //ref device for font rendering
@@ -407,3 +408,5 @@ bool DrawModelWrapper::removeShape( const uno::Reference< drawing::XShape >& xSh
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/main/LabelPositionHelper.cxx b/chart2/source/view/main/LabelPositionHelper.cxx
index cd954f53b7ba..5bb2a5f08d07 100644
--- a/chart2/source/view/main/LabelPositionHelper.cxx
+++ b/chart2/source/view/main/LabelPositionHelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -98,10 +99,10 @@ void lcl_doDynamicFontResize( uno::Any* pAOldAndNewFontHeightAny
                           , const awt::Size& rOldReferenceSize
                           , const awt::Size& rNewReferenceSize  )
 {
-    double fOldFontHeight = 0, fNewFontHeight;
+    double fOldFontHeight = 0;
     if( pAOldAndNewFontHeightAny && ( *pAOldAndNewFontHeightAny >>= fOldFontHeight ) )
     {
-        fNewFontHeight = RelativeSizeHelper::calculate( fOldFontHeight, rOldReferenceSize, rNewReferenceSize );
+        double fNewFontHeight = RelativeSizeHelper::calculate( fOldFontHeight, rOldReferenceSize, rNewReferenceSize );
         *pAOldAndNewFontHeightAny = uno::makeAny(fNewFontHeight);
     }
 }
@@ -483,3 +484,5 @@ void LabelPositionHelper::correctPositionForRotation( const uno::Reference< draw
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/main/Linear3DTransformation.cxx b/chart2/source/view/main/Linear3DTransformation.cxx
index 9292ee6eb757..e804735dbaa6 100644
--- a/chart2/source/view/main/Linear3DTransformation.cxx
+++ b/chart2/source/view/main/Linear3DTransformation.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -105,3 +106,5 @@ sal_Int32 SAL_CALL Linear3DTransformation::getTargetDimension()
 
 
 }  // namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/main/PlotterBase.cxx b/chart2/source/view/main/PlotterBase.cxx
index 8a71f45b4dbb..7210cf60801b 100644
--- a/chart2/source/view/main/PlotterBase.cxx
+++ b/chart2/source/view/main/PlotterBase.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,7 +33,6 @@
 #include "ShapeFactory.hxx"
 #include <rtl/math.hxx>
 #include <com/sun/star/chart2/DataPointLabel.hpp>
-#include <tools/debug.hxx>
 
 //.............................................................................
 namespace chart
@@ -62,7 +62,7 @@ void PlotterBase::initPlotter(  const uno::Reference< drawing::XShapes >& xLogic
        , const rtl::OUString& rCID )
             throw (uno::RuntimeException)
 {
-    DBG_ASSERT(xLogicTarget.is()&&xFinalTarget.is()&&xShapeFactory.is(),"no proper initialization parameters");
+    OSL_PRECOND(xLogicTarget.is()&&xFinalTarget.is()&&xShapeFactory.is(),"no proper initialization parameters");
     //is only allowed to be called once
     m_xLogicTarget  = xLogicTarget;
     m_xFinalTarget  = xFinalTarget;
@@ -78,14 +78,14 @@ PlotterBase::~PlotterBase()
 
 void PlotterBase::setScales( const std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis )
 {
-    DBG_ASSERT(m_nDimension<=static_cast<sal_Int32>(rScales.size()),"Dimension of Plotter does not fit two dimension of given scale sequence");
+    OSL_PRECOND(m_nDimension<=static_cast<sal_Int32>(rScales.size()),"Dimension of Plotter does not fit two dimension of given scale sequence");
     m_pPosHelper->setScales( rScales, bSwapXAndYAxis );
 }
 
 
 void PlotterBase::setTransformationSceneToScreen( const drawing::HomogenMatrix& rMatrix)
 {
-    DBG_ASSERT(m_nDimension==2,"Set this transformation only in case of 2D");
+    OSL_PRECOND(m_nDimension==2,"Set this transformation only in case of 2D");
     if(m_nDimension!=2)
         return;
     m_pPosHelper->setTransformationSceneToScreen( rMatrix );
@@ -130,3 +130,5 @@ bool PlotterBase::isValidPosition( const drawing::Position3D& rPos )
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/main/PlottingPositionHelper.cxx b/chart2/source/view/main/PlottingPositionHelper.cxx
index e257581d664b..7a9dede36f09 100644
--- a/chart2/source/view/main/PlottingPositionHelper.cxx
+++ b/chart2/source/view/main/PlottingPositionHelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -624,17 +625,6 @@ drawing::Position3D PolarPlottingPositionHelper::transformAngleRadiusToScene( do
     return transformUnitCircleToScene( fUnitAngleDegree, fUnitRadius, fLogicZ, bDoScaling );
 }
 
-#ifdef NOTYET
-double PolarPlottingPositionHelper::getInnerLogicRadius() const
-{
-    const ExplicitScaleData& rScale = m_bSwapXAndY ? m_aScales[0] : m_aScales[1];
-    if( AxisOrientation_MATHEMATICAL==rScale.Orientation )
-        return rScale.Minimum;
-    else
-        return rScale.Maximum;
-}
-#endif
-
 double PolarPlottingPositionHelper::getOuterLogicRadius() const
 {
     const ExplicitScaleData& rScale = m_bSwapXAndY ? m_aScales[0] : m_aScales[1];
@@ -689,27 +679,6 @@ void PlottingPositionHelper::AllowShiftZAxisPos( bool bAllowShift )
     m_bAllowShiftZAxisPos = bAllowShift;
 }
 
-/*
-// ____ XTransformation ____
-uno::Sequence< double > SAL_CALL PolarPlottingPositionHelper::transform(
-                        const uno::Sequence< double >& rSourceValues )
-            throw (uno::RuntimeException, lang::IllegalArgumentException)
-{
-    uno::Sequence< double > aSourceValues(3);
-    return aSourceValues;
 }
 
-sal_Int32 SAL_CALL PolarPlottingPositionHelper::getSourceDimension() throw (uno::RuntimeException)
-{
-    return 3;
-}
-
-sal_Int32 SAL_CALL PolarPlottingPositionHelper::getTargetDimension() throw (uno::RuntimeException)
-{
-    return 3;
-}
-*/
-
-//.............................................................................
-} //namespace chart
-//.............................................................................
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/main/PolarLabelPositionHelper.cxx b/chart2/source/view/main/PolarLabelPositionHelper.cxx
index 8e5402b48d63..bcc53068bef0 100644
--- a/chart2/source/view/main/PolarLabelPositionHelper.cxx
+++ b/chart2/source/view/main/PolarLabelPositionHelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -186,3 +187,5 @@ awt::Point PolarLabelPositionHelper::getLabelScreenPositionAndAlignmentForUnitCi
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/main/PropertyMapper.cxx b/chart2/source/view/main/PropertyMapper.cxx
index 18b5f2717afd..9e9e987ae0b5 100644
--- a/chart2/source/view/main/PropertyMapper.cxx
+++ b/chart2/source/view/main/PropertyMapper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -172,40 +173,14 @@ uno::Any* PropertyMapper::getValuePointerForLimitedSpace( tAnySequence& rPropVal
         , bLimitedHeight ? C2U("TextMaximumFrameHeight") : C2U("TextMaximumFrameWidth") );
 }
 
-/*
-//set some properties from service style::CharacterProperties:
-//-------- tabpage: Zeichen -----------
-//Schriftart z.B. Albany            UNO_NAME_EDIT_CHAR_FONTNAME == UNO_NAME_EDIT_CHAR_FONTSTYLENAME    //UNO_NAME_CHAR_FONT
-//Schriftschnitt z.B. kursiv        UNO_NAME_EDIT_CHAR_POSTURE    UNO_NAME_CHAR_POSTURE awt::FontSlant NONE OBLIQUE ITALIC DONTKNOW REVERSE_OBLIQUE REVERSE_ITALIC
-//Schriftgrad (Punktgr�sse z.B. 12) UNO_NAME_EDIT_CHAR_HEIGHT == UNO_NAME_CHAR_HEIGHT
-        //? UNO_NAME_EDIT_CHAR_WEIGHT == UNO_NAME_CHAR_WEIGHT
-//Sprache                           UNO_NAME_EDIT_CHAR_LOCALE lang::Locale
-
-//-------- tabpage: Schrifteffekt -----------
-//Unterstreichung                   UNO_NAME_CHAR_UNDERLINE sal_Int16 awt::FontUnderline_NONE _SINGLE _DOUBLE _DOTTED _DONTKNOW _DASH ...
-//Unterstreichung-farbe             ??? 'CharUnderlineColor' + CharUnderlineHasColor
-//Durchstreichung z.B. doppelt      "CharStrikeout" sal_Int16 awt::FontStrikeout_NONE _SINGLE _DOUBLE ...
-//wortweise-Durchstreichung ja/nein "CharWordMode" bool
-//Schriftfarbe                      UNO_NAME_EDIT_CHAR_COLOR sal_Int32      UNO_NAME_CHAR_COLOR
-//ReliefArt ohne/erhaben/tief       "CharRelief" sal_Int16 text::FontRelief_NONE FontRelief_EMBOSSED FontRelief_ENGRAVED
-//Kontur                            "CharContoured" bool
-//Schatten                          UNO_NAME_CHAR_SHADOWED bool
-*/
-
 const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForCharacterProperties()
 {
     //shape property -- chart model object property
     static tMakePropertyNameMap m_aShapePropertyMapForCharacterProperties =
         tMakePropertyNameMap
-//      ( C2U( "CharBackColor" ),           C2U("TextBackgroundColor") )
-//      ( C2U( "CharCaseMap" ),             C2U("CaseMapping") )
         ( C2U( "CharColor" ),               C2U("CharColor") )
         ( C2U( "CharContoured" ),           C2U("CharContoured") )
-/////// ( C2U( "CharCrossedOut" ),          C2U("CharCrossedOut") ) //setting this explicitly somehow conflicts with CharStrikeout
         ( C2U( "CharEmphasis" ),            C2U("CharEmphasis") )//the service style::CharacterProperties  describes a property called 'CharEmphasize' wich is nowhere implemented
-//        ( C2U( "CharEscapement" ),          C2U("CharEscapement") ) //#i98344# @future: add these to properties again, if the user interface offers the possibility to change them; then make sure that older wrong files are corrected on import
-//        ( C2U( "CharEscapementHeight" ),    C2U("CharEscapementHeight") ) //#i98344# @future: add these to properties again, if the user interface offers the possibility to change them; then make sure that older wrong files are corrected on import
-//      ( C2U( "CharFlash" ),               C2U("Flashing") )
 
         ( C2U( "CharFontFamily" ),          C2U("CharFontFamily") )
         ( C2U( "CharFontFamilyAsian" ),     C2U("CharFontFamilyAsian") )
@@ -230,13 +205,10 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForCharacterProper
         ( C2U( "CharLocale" ),              C2U("CharLocale") )
         ( C2U( "CharLocaleAsian" ),         C2U("CharLocaleAsian") )
         ( C2U( "CharLocaleComplex" ),       C2U("CharLocaleComplex") )
-//      ( C2U( "CharNoHyphenation" ),       C2U("InhibitHyphenation") )
         ( C2U( "CharPosture" ),             C2U("CharPosture") )
         ( C2U( "CharPostureAsian" ),        C2U("CharPostureAsian") )
         ( C2U( "CharPostureComplex" ),      C2U("CharPostureComplex") )
         ( C2U( "CharRelief" ),              C2U("CharRelief") )
-//      ( C2U( "CharRotation" ),            C2U("Rotation") ) --> additional feature ...
-//      ( C2U( "CharScaleWidth" ),          C2U("CharScaleWidth") )
         ( C2U( "CharShadowed" ),            C2U("CharShadowed") )
         ( C2U( "CharStrikeout" ),           C2U("CharStrikeout") )
         ( C2U( "CharUnderline" ),           C2U("CharUnderline") )
@@ -252,10 +224,6 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForCharacterProper
 
         ( C2U( "WritingMode" ),             C2U("WritingMode") )
 
-//      ( C2U( "RubyText" ),                C2U("RubyText") )
-//      ( C2U( "RubyAdjust" ),              C2U("RubyAdjust") )
-//      ( C2U( "RubyCharStyleName" ),       C2U("RubyStyleName") )
-//      ( C2U( "RubyIsAbove" ),             C2U("RubyIsAbove") )
         ( C2U( "ParaIsCharacterDistance" ), C2U("ParaIsCharacterDistance") )
         ;
     return m_aShapePropertyMapForCharacterProperties;
@@ -337,18 +305,7 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForTextShapeProper
         tMakePropertyNameMap
         ( PropertyMapper::getPropertyNameMapForCharacterProperties() )
         ( PropertyMapper::getPropertyNameMapForFillProperties() )
-        ( PropertyMapper::getPropertyNameMapForLineProperties() )
-//         ( PropertyMapper::getPropertyNameMapForParagraphProperties() )
-        // some text properties
-//         ( C2U( "TextHorizontalAdjust" ),   C2U( "TextHorizontalAdjust" ) )
-//         ( C2U( "TextVerticalAdjust" ),     C2U( "TextVerticalAdjust" ) )
-//         ( C2U( "TextAutoGrowHeight" ),     C2U( "TextAutoGrowHeight" ) )
-//         ( C2U( "TextAutoGrowWidth" ),      C2U( "TextAutoGrowWidth" ) )
-//         ( C2U( "TextLeftDistance" ),       C2U( "TextLeftDistance" ) )
-//         ( C2U( "TextRightDistance" ),      C2U( "TextRightDistance" ) )
-//         ( C2U( "TextUpperDistance" ),      C2U( "TextUpperDistance" ) )
-//         ( C2U( "TextLowerDistance" ),      C2U( "TextLowerDistance" ) )
-        ;
+        ( PropertyMapper::getPropertyNameMapForLineProperties() );
 
     return m_aShapePropertyMapForTextShapeProperties;
 }
@@ -360,7 +317,6 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForLineSeriesPrope
         tMakePropertyNameMap
         ( C2U( "LineColor" ),           C2U("Color") )
         ( C2U( "LineDashName" ),        C2U("LineDashName") )
-//      ( C2U( "LineJoint" ),           C2U("LineJoint") )
         ( C2U( "LineStyle" ),           C2U("LineStyle") )
         ( C2U( "LineTransparence" ),    C2U("Transparency") )
         ( C2U( "LineWidth" ),           C2U("LineWidth") )
@@ -396,7 +352,6 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForFilledSeriesPro
         //line properties
         ( C2U( "LineColor" ),           C2U("BorderColor") )
         ( C2U( "LineDashName" ),        C2U("BorderDashName") )
-//      ( C2U( "LineJoint" ),           C2U("LineJoint") )
         ( C2U( "LineStyle" ),           C2U("BorderStyle") )
         ( C2U( "LineTransparence" ),    C2U("BorderTransparency") )
         ( C2U( "LineWidth" ),           C2U("BorderWidth") )
@@ -469,7 +424,6 @@ void PropertyMapper::getTextLabelMultiPropertyLists(
     aValueMap.insert( tPropertyNameValueMap::value_type( C2U("LineStyle"), uno::makeAny(drawing::LineStyle_NONE) ) ); // drawing::LineStyle
     aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextHorizontalAdjust"), uno::makeAny(drawing::TextHorizontalAdjust_CENTER) ) ); // drawing::TextHorizontalAdjust - needs to be overwritten
     aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextVerticalAdjust"), uno::makeAny(drawing::TextVerticalAdjust_CENTER) ) ); //drawing::TextVerticalAdjust - needs to be overwritten
-    //aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextWritingMode"), uno::makeAny(eWritingMode) ) ); //text::WritingMode
     aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextAutoGrowHeight"), uno::makeAny(sal_True) ) ); // sal_Bool
     aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextAutoGrowWidth"), uno::makeAny(sal_True) ) ); // sal_Bool
     if( bName )
@@ -484,15 +438,6 @@ void PropertyMapper::getTextLabelMultiPropertyLists(
         aValueMap.insert( tPropertyNameValueMap::value_type( C2U("ParaIsHyphenation"), uno::makeAny(sal_True) ) );
     }
 
-    /*
-    //@todo ?: add paragraph properties:
-    //(uno::makeAny(eParaAdjust)) //ParaAdjust - style::ParagraphAdjust
-    //(uno::makeAny( (sal_Bool)rAxisLabelProperties.bLineBreakAllowed )) //ParaIsHyphenation - sal_Bool
-    style::ParagraphAdjust eParaAdjust( style::ParagraphAdjust_LEFT );
-    if( eHorizontalAdjust == drawing::TextHorizontalAdjust_RIGHT )
-        eParaAdjust = style::ParagraphAdjust_RIGHT;
-    */
-
     PropertyMapper::getMultiPropertyListsFromValueMap( rPropNames, rPropValues, aValueMap );
 }
 
@@ -530,3 +475,5 @@ void PropertyMapper::getPreparedTextShapePropertyLists(
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx
index 311b5e076e9a..e152c47b3a7c 100644
--- a/chart2/source/view/main/ShapeFactory.cxx
+++ b/chart2/source/view/main/ShapeFactory.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -54,14 +55,11 @@
 
 #include <editeng/unoprnms.hxx>
 #include <tools/color.hxx>
-#include <tools/debug.hxx>
 #include <rtl/math.hxx>
 #include <svx/svdocirc.hxx>
 #include <svx/svdopath.hxx>
 
-#ifndef _BGFX_VECTOR_B2DPOINT_HXX
 #include <basegfx/point/b2dpoint.hxx>
-#endif
 #include <basegfx/matrix/b3dhommatrix.hxx>
 
 #include <algorithm>
@@ -86,7 +84,7 @@ void ShapeFactory::setShapeName( const uno::Reference< drawing::XShape >& xShape
     if(!xShape.is())
         return;
     uno::Reference< beans::XPropertySet > xProp( xShape, uno::UNO_QUERY );
-    DBG_ASSERT(xProp.is(), "shape offers no XPropertySet");
+    OSL_ENSURE(xProp.is(), "shape offers no XPropertySet");
     if( xProp.is())
     {
         try
@@ -108,7 +106,7 @@ rtl::OUString ShapeFactory::getShapeName( const uno::Reference< drawing::XShape
     rtl::OUString aRet;
 
     uno::Reference< beans::XPropertySet > xProp( xShape, uno::UNO_QUERY );
-    DBG_ASSERT(xProp.is(), "shape offers no XPropertySet");
+    OSL_ENSURE(xProp.is(), "shape offers no XPropertySet");
     if( xProp.is())
     {
         try
@@ -175,7 +173,7 @@ uno::Reference< drawing::XShapes > ShapeFactory::getOrCreateChartRootShape(
 uno::Any createPolyPolygon_Cube(
             const drawing::Direction3D& rSize, double fRoundedEdge, bool bRounded = true )
 {
-    DBG_ASSERT(fRoundedEdge>=0, "fRoundedEdge needs to be >= 0");
+    OSL_PRECOND(fRoundedEdge>=0, "fRoundedEdge needs to be >= 0");
 
     // always use extra points, so set percent diagonal to 0.4 which is 0% in the UI (old Chart comment)
     if( fRoundedEdge == 0.0  && bRounded)
@@ -186,7 +184,6 @@ uno::Any createPolyPolygon_Cube(
     //fWidthH stands for Half Width
     const double fWidthH = rSize.DirectionX >=0.0?  rSize.DirectionX/2.0  : -rSize.DirectionX/2.0;
     const double fHeight = rSize.DirectionY;
-//     const double fDepth  = rSize.DirectionZ >=0.0?  rSize.DirectionZ      : -rSize.DirectionZ ;
 
     const double fHeightSign = fHeight >= 0.0 ? 1.0 : -1.0;
 
@@ -215,7 +212,6 @@ uno::Any createPolyPolygon_Cube(
 
     for(sal_Int32 nN = nPointCount; nN--;)
         *pInnerSequenceZ++ = 0.0;
-        //*pInnerSequenceZ++ = -fDepth/2.0;
 
     if(nPointCount == 5)
     {
@@ -270,7 +266,7 @@ uno::Any createPolyPolygon_Cylinder(
            , sal_Int32& nVerticalSegmentCount )
 {
     //fHeight may be negative
-    DBG_ASSERT(fRadius>0, "The radius of a cylinder needs to be > 0");
+    OSL_PRECOND(fRadius>0, "The radius of a cylinder needs to be > 0");
 
     //--------------------------------------
     drawing::PolyPolygonShape3D aPP;
@@ -356,7 +352,7 @@ uno::Any createPolyPolygon_Cylinder(
 uno::Any createPolyPolygon_Cone( double fHeight, double fRadius, double fTopHeight
             , sal_Int32& nVerticalSegmentCount )
 {
-    DBG_ASSERT(fRadius>0, "The radius of a cone needs to be > 0");
+    OSL_PRECOND(fRadius>0, "The radius of a cone needs to be > 0");
 
     //for stacked charts we need cones without top -> fTopHeight != 0 resp. bTopless == true
     //fTopHeight indicates the high of the cutted top only (not the full height)
@@ -493,7 +489,7 @@ uno::Reference<drawing::XShape>
 
     //set properties
     uno::Reference< beans::XPropertySet > xProp( xShape, uno::UNO_QUERY );
-    DBG_ASSERT(xProp.is(), "created shape offers no XPropertySet");
+    OSL_ENSURE(xProp.is(), "created shape offers no XPropertySet");
     if( xProp.is())
     {
         try
@@ -736,7 +732,7 @@ uno::Reference<drawing::XShape>
 
     //set properties
     uno::Reference< beans::XPropertySet > xProp( xShape, uno::UNO_QUERY );
-    DBG_ASSERT(xProp.is(), "created shape offers no XPropertySet");
+    OSL_ENSURE(xProp.is(), "created shape offers no XPropertySet");
     if( xProp.is())
     {
         try
@@ -953,26 +949,6 @@ drawing::PolyPolygonBezierCoords getRingBezierCoords(
         fStartAngleRadian, fWidthAngleRadian, fUnitCircleInnerRadius, aTransformationFromUnitCircle, fAngleSubdivisionRadian );
     appendAndCloseBezierCoords( aReturn, aInnerArc, sal_True );
 
-    //fill rMarkHandlePoints
-    /*
-    {
-        rMarkHandlePoints.realloc(1);
-        rMarkHandlePoints[0].realloc(6);
-        sal_Int32 nHandleCount=0;
-        sal_Int32 nOuterArcCount = aOuterArc.Coordinates[0].getLength();
-        if(nOuterArcCount>0)
-            rMarkHandlePoints[0][nHandleCount++]=aOuterArc.Coordinates[0][0];
-        if(nOuterArcCount>1)
-            rMarkHandlePoints[0][nHandleCount++]=aOuterArc.Coordinates[0][nOuterArcCount-1];
-        sal_Int32 nInnerArcCount = aInnerArc.Coordinates[0].getLength();
-        if(nInnerArcCount>0)
-            rMarkHandlePoints[0][nHandleCount++]=aInnerArc.Coordinates[0][0];
-        if(nInnerArcCount>1)
-            rMarkHandlePoints[0][nHandleCount++]=aInnerArc.Coordinates[0][nInnerArcCount-1];
-        rMarkHandlePoints[0].realloc(nHandleCount);
-    }
-    */
-
     return aReturn;
 }
 
@@ -1002,7 +978,7 @@ uno::Reference< drawing::XShape >
 
     //set properties
     uno::Reference< beans::XPropertySet > xProp( xShape, uno::UNO_QUERY );
-    DBG_ASSERT(xProp.is(), "created shape offers no XPropertySet");
+    OSL_ENSURE(xProp.is(), "created shape offers no XPropertySet");
     if( xProp.is())
     {
         try
@@ -1018,19 +994,6 @@ uno::Reference< drawing::XShape >
                 , aTransformationFromUnitCircle, fAngleSubdivisionRadian );
 
             xProp->setPropertyValue( C2U( "PolyPolygonBezier" ), uno::makeAny( aCoords ) );
-
-            //add shape for markhandles
-            /*
-            drawing::PointSequenceSequence aMarkHandlePoints(1); to be filled within getRingBezierCoords
-            if( xGroup.is() )
-            {
-                VLineProperties aHandleLineProperties;
-                aHandleLineProperties.LineStyle    = uno::makeAny( drawing::LineStyle_NONE );
-                uno::Reference< drawing::XShape > xHandleShape =
-                    this->createLine2D( xGroup, aMarkHandlePoints, &aHandleLineProperties );
-                this->setShapeName( xHandleShape, C2U("HandlesOnly") );
-            }
-            */
         }
         catch( uno::Exception& e )
         {
@@ -1068,7 +1031,7 @@ uno::Reference< drawing::XShape >
 
     //set properties
     uno::Reference< beans::XPropertySet > xProp( xShape, uno::UNO_QUERY );
-    DBG_ASSERT(xProp.is(), "created shape offers no XPropertySet");
+    OSL_ENSURE(xProp.is(), "created shape offers no XPropertySet");
     if( xProp.is())
     {
         try
@@ -1148,7 +1111,7 @@ uno::Reference< drawing::XShape >
 
     //set properties
     uno::Reference< beans::XPropertySet > xProp( xShape, uno::UNO_QUERY );
-    DBG_ASSERT(xProp.is(), "created shape offers no XPropertySet");
+    OSL_ENSURE(xProp.is(), "created shape offers no XPropertySet");
     if( xProp.is())
     {
         try
@@ -1207,7 +1170,7 @@ uno::Reference< drawing::XShape >
 
     //set properties
     uno::Reference< beans::XPropertySet > xProp( xShape, uno::UNO_QUERY );
-    DBG_ASSERT(xProp.is(), "created shape offers no XPropertySet");
+    OSL_ENSURE(xProp.is(), "created shape offers no XPropertySet");
     if( xProp.is())
     {
         try
@@ -1267,7 +1230,7 @@ uno::Reference< drawing::XShape >
 
     //set properties
     uno::Reference< beans::XPropertySet > xProp( xShape, uno::UNO_QUERY );
-    DBG_ASSERT(xProp.is(), "created shape offers no XPropertySet");
+    OSL_ENSURE(xProp.is(), "created shape offers no XPropertySet");
     if( xProp.is())
     {
         try
@@ -1494,7 +1457,7 @@ drawing::PolyPolygonShape3D createPolyPolygon_Symbol( const drawing::Position3D&
             break;
         }
     }
-    //return uno::Any( &aPP, ::getCppuType((const drawing::PolyPolygonShape3D*)0) );
+
     return aPP;
 }
 
@@ -1518,7 +1481,7 @@ uno::Reference< drawing::XShape >
 
     //set properties
     uno::Reference< beans::XPropertySet > xProp( xShape, uno::UNO_QUERY );
-    DBG_ASSERT(xProp.is(), "created shape offers no XPropertySet");
+    OSL_ENSURE(xProp.is(), "created shape offers no XPropertySet");
     if( xProp.is())
     {
         try
@@ -1580,7 +1543,7 @@ uno::Reference< drawing::XShape >
         ASSERT_EXCEPTION( e );
     }
     uno::Reference< beans::XPropertySet > xProp( xShape, uno::UNO_QUERY );
-    DBG_ASSERT(xProp.is(), "created shape offers no XPropertySet");
+    OSL_ENSURE(xProp.is(), "created shape offers no XPropertySet");
     if( xProp.is())
     {
         try
@@ -1645,13 +1608,13 @@ uno::Reference< drawing::XShapes >
 
         xTarget->add(xShape);
 
-        //it is necessary to set the transform matrix to initialize the scene properly (bug #106316#)
+        //it is necessary to set the transform matrix to initialize the scene properly
         //otherwise all objects which are placed into this Group will not be visible
         //the following should be unnecessary after a the bug is fixed
         {
             //set properties
             uno::Reference< beans::XPropertySet > xProp( xShape, uno::UNO_QUERY );
-            DBG_ASSERT(xProp.is(), "created shape offers no XPropertySet");
+            OSL_ENSURE(xProp.is(), "created shape offers no XPropertySet");
             if( xProp.is())
             {
                 try
@@ -1713,7 +1676,7 @@ uno::Reference< drawing::XShape >
 
     //set properties
     uno::Reference< beans::XPropertySet > xProp( xShape, uno::UNO_QUERY );
-    DBG_ASSERT(xProp.is(), "created shape offers no XPropertySet");
+    OSL_ENSURE(xProp.is(), "created shape offers no XPropertySet");
     if( xProp.is())
     {
         try
@@ -1749,7 +1712,7 @@ uno::Reference< drawing::XShape >
 
     //set properties
     uno::Reference< beans::XPropertySet > xProp( xShape, uno::UNO_QUERY );
-    DBG_ASSERT(xProp.is(), "created shape offers no XPropertySet");
+    OSL_ENSURE(xProp.is(), "created shape offers no XPropertySet");
     if( xProp.is())
     {
         try
@@ -1805,16 +1768,12 @@ uno::Reference< drawing::XShape >
     //create shape
     uno::Reference< drawing::XShape > xShape(
         m_xShapeFactory->createInstance( C2U(
-            //"com.sun.star.drawing.LineShape") ), uno::UNO_QUERY );
             "com.sun.star.drawing.PolyLineShape") ), uno::UNO_QUERY );
-            //"com.sun.star.drawing.PolyLinePathShape") ), uno::UNO_QUERY );
-            //"com.sun.star.drawing.PolyPolygonPathShape") ), uno::UNO_QUERY );
-            //"com.sun.star.drawing.PolyPolygonShape") ), uno::UNO_QUERY );
     xTarget->add(xShape);
 
     //set properties
     uno::Reference< beans::XPropertySet > xProp( xShape, uno::UNO_QUERY );
-    DBG_ASSERT(xProp.is(), "created shape offers no XPropertySet");
+    OSL_ENSURE(xProp.is(), "created shape offers no XPropertySet");
     if( xProp.is())
     {
         try
@@ -1874,7 +1833,7 @@ uno::Any ShapeFactory::makeTransformation( const awt::Point& rScreenPosition2D,
 void ShapeFactory::makeShapeInvisible( const uno::Reference< drawing::XShape >& xShape )
 {
     uno::Reference< beans::XPropertySet > xShapeProp( xShape, uno::UNO_QUERY );
-    DBG_ASSERT(xShapeProp.is(), "created shape offers no XPropertySet");
+    OSL_ENSURE(xShapeProp.is(), "created shape offers no XPropertySet");
     if( xShapeProp.is())
     {
         try
@@ -1997,7 +1956,7 @@ bool ShapeFactory::isPolygonEmptyOrSinglePoint( drawing::PolyPolygonShape3D& rPo
 
 void ShapeFactory::closePolygon( drawing::PolyPolygonShape3D& rPoly)
 {
-    DBG_ASSERT( rPoly.SequenceX.getLength() <= 1, "ShapeFactory::closePolygon - single polygon expected" );
+    OSL_ENSURE( rPoly.SequenceX.getLength() <= 1, "ShapeFactory::closePolygon - single polygon expected" );
     //add a last point == first point
     if(isPolygonEmptyOrSinglePoint(rPoly))
         return;
@@ -2099,3 +2058,5 @@ void ShapeFactory::removeSubShapes( const uno::Reference< drawing::XShapes >& xS
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/main/Stripe.cxx b/chart2/source/view/main/Stripe.cxx
index 2df78e2a8e91..0daddbbc0ea6 100644
--- a/chart2/source/view/main/Stripe.cxx
+++ b/chart2/source/view/main/Stripe.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -358,3 +359,5 @@ uno::Any Stripe::getTexturePolygon( short nRotatedTexture ) const
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx
index 2b9512d4af2a..e63dba596ed0 100644
--- a/chart2/source/view/main/VDataSeries.cxx
+++ b/chart2/source/view/main/VDataSeries.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,7 +41,6 @@
 #include <com/sun/star/chart/MissingValueTreatment.hpp>
 #include <com/sun/star/chart2/Symbol.hpp>
 
-//#include "CommonConverters.hxx"
 #include <rtl/math.hxx>
 #include <tools/debug.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -113,7 +113,7 @@ struct lcl_LessXOfPoint
     inline bool operator() ( const std::vector< double >& first,
                              const std::vector< double >& second )
     {
-        if( first.size() > 0 && second.size() > 0 )
+        if( !first.empty() && !second.empty() )
         {
             return first[0]<second[0];
         }
@@ -299,7 +299,7 @@ void VDataSeries::doSortByXValues()
 {
     if( m_aValues_X.is() && m_aValues_X.Doubles.getLength() )
     {
-        //prepare a vector vor sorting
+        //prepare a vector for sorting
         std::vector< ::std::vector< double > > aTmp;//outer vector are points, inner vector are the different values of athe point
         double fNan;
         ::rtl::math::setNan( & fNan );
@@ -315,7 +315,7 @@ void VDataSeries::doSortByXValues()
         //do sort
         std::sort( aTmp.begin(), aTmp.end(), lcl_LessXOfPoint() );
 
-        //fill the sorted points back to the mambers
+        //fill the sorted points back to the members
         m_aValues_X.Doubles.realloc( m_nPointCount );
         m_aValues_Y.Doubles.realloc( m_nPointCount );
 
@@ -622,7 +622,7 @@ sal_Int32 VDataSeries::getLabelPlacement( sal_Int32 nPointIndex, const uno::Refe
             return nLabelPlacement;
         }
 
-        DBG_ERROR("no label placement supported");
+        OSL_FAIL("no label placement supported");
     }
     catch( uno::Exception& e )
     {
@@ -1000,3 +1000,5 @@ sal_Int32 VDataSeries::getMissingValueTreatment() const
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx
index e7c681d80781..0c074aea367a 100755..100644
--- a/chart2/source/view/main/VLegend.cxx
+++ b/chart2/source/view/main/VLegend.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -88,25 +89,6 @@ double lcl_CalcViewFontSize(
             if( (xProp->getPropertyValue( C2U( "ReferencePageSize" )) >>= aPropRefSize) &&
                 (aPropRefSize.Height > 0))
             {
-                // todo: find out if asian text is really used
-//         Reference< beans::XPropertySetInfo >xInfo( xProp, uno::UNO_QUERY );
-//         float fFontHeight2 = fFontHeight;
-//         if( xInfo.is() &&
-//             xInfo->hasPropertyByName(C2U("CharHeightAsian")) &&
-//             (xProp->getPropertyValue(C2U("CharHeightAsian")) >>= fFontHeight2) &&
-//             fFontHeight2 > fFontHeight )
-//         {
-//             fFontHeight = fFontHeight2;
-//         }
-
-//         if( xInfo.is() &&
-//             xInfo->hasPropertyByName(C2U("CharHeightComplex")) &&
-//             (xProp->getPropertyValue(C2U("CharHeightComplex")) >>= fFontHeight2) &&
-//             fFontHeight2 > fFontHeight )
-//         {
-//             fFontHeight = fFontHeight2;
-//         }
-
                 fResult = ::chart::RelativeSizeHelper::calculate( fFontHeight, aPropRefSize, rReferenceSize );
             }
         }
@@ -361,7 +343,6 @@ awt::Size lcl_placeLegendEntries(
     {
         sal_Int32 nCurrentRow=0;
         sal_Int32 nCurrentColumn=-1;
-        sal_Int32 nColumnCount=0;
         sal_Int32 nMaxColumnCount=-1;
         for( sal_Int32 nN=0; nN<static_cast<sal_Int32>(aTextShapes.size()); nN++ )
         {
@@ -410,7 +391,6 @@ awt::Size lcl_placeLegendEntries(
                     nN=-1;
                     nCurrentRow=0;
                     nCurrentColumn=-1;
-                    nColumnCount=0;
                     aColumnWidths.clear();
                 }
             }
@@ -918,8 +898,8 @@ void VLegend::createShapes(
                     RelativeSize aRelativeSize;
                     if ((xLegendProp->getPropertyValue( C2U( "RelativeSize" )) >>= aRelativeSize))
                     {
-                        aLegendSize.Width = static_cast<sal_Int32>( ::rtl::math::approxCeil( aRelativeSize.Primary * rPageSize.Width ) ); //i117185
-                        aLegendSize.Height = static_cast<sal_Int32>( ::rtl::math::approxCeil( aRelativeSize.Secondary * rPageSize.Height ) ); //i117185
+                        aLegendSize.Width = static_cast<sal_Int32>(::rtl::math::approxCeil( aRelativeSize.Primary * rPageSize.Width ));
+                        aLegendSize.Height = static_cast<sal_Int32>(::rtl::math::approxCeil( aRelativeSize.Secondary * rPageSize.Height ));
                     }
                     else
                         eExpansion = ::com::sun::star::chart::ChartLegendExpansion_HIGH;
@@ -948,7 +928,7 @@ void VLegend::createShapes(
 
             ::std::vector< LegendEntryProvider* >::const_iterator       aIter = m_aLegendEntryProviderList.begin();
             const ::std::vector< LegendEntryProvider* >::const_iterator aEnd  = m_aLegendEntryProviderList.end();
-            for( aIter = m_aLegendEntryProviderList.begin(); aIter != aEnd; aIter++ )
+            for( aIter = m_aLegendEntryProviderList.begin(); aIter != aEnd; ++aIter )
             {
                 LegendEntryProvider* pLegendEntryProvider( *aIter );
                 if( pLegendEntryProvider )
@@ -965,7 +945,7 @@ void VLegend::createShapes(
             awt::Size aMaxSymbolExtent( nSymbolWidth, nSymbolHeigth );
 
             tViewLegendEntryContainer aViewEntries;
-            for( aIter = m_aLegendEntryProviderList.begin(); aIter != aEnd; aIter++ )
+            for( aIter = m_aLegendEntryProviderList.begin(); aIter != aEnd; ++aIter )
             {
                 LegendEntryProvider* pLegendEntryProvider( *aIter );
                 if( pLegendEntryProvider )
@@ -1048,3 +1028,5 @@ void VLegend::changePosition(
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/main/VLegend.hxx b/chart2/source/view/main/VLegend.hxx
index 4534a350f4f4..9770730697be 100644
--- a/chart2/source/view/main/VLegend.hxx
+++ b/chart2/source/view/main/VLegend.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -109,3 +110,4 @@ private:
 //.............................................................................
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/main/VLegendSymbolFactory.cxx b/chart2/source/view/main/VLegendSymbolFactory.cxx
index b7168bd7ee9f..7f00e2f3f0aa 100644
--- a/chart2/source/view/main/VLegendSymbolFactory.cxx
+++ b/chart2/source/view/main/VLegendSymbolFactory.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -35,9 +36,6 @@
 #include <com/sun/star/drawing/LineStyle.hpp>
 #include <com/sun/star/chart2/Symbol.hpp>
 
-// header for define DBG_ASSERT
-#include <tools/debug.hxx>
-
 using namespace ::com::sun::star;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
@@ -174,7 +172,7 @@ Reference< drawing::XShape > VLegendSymbolFactory::createSymbol(
                 }
                 else if( aSymbol.Style == chart2::SymbolStyle_AUTO )
                 {
-                    DBG_ERROR("the given parameter is not allowed to contain an automatic symbol style");
+                    OSL_TRACE("the given parameter is not allowed to contain an automatic symbol style");
                 }
             }
         }
@@ -213,3 +211,5 @@ Reference< drawing::XShape > VLegendSymbolFactory::createSymbol(
 }
 
 } //  namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/main/VLineProperties.cxx b/chart2/source/view/main/VLineProperties.cxx
index dc8409a6891d..90f80462694a 100644
--- a/chart2/source/view/main/VLineProperties.cxx
+++ b/chart2/source/view/main/VLineProperties.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -107,3 +108,5 @@ bool VLineProperties::isLineVisible() const
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/main/VPolarTransformation.cxx b/chart2/source/view/main/VPolarTransformation.cxx
index fd3037316cc6..8c40283cb4a4 100644
--- a/chart2/source/view/main/VPolarTransformation.cxx
+++ b/chart2/source/view/main/VPolarTransformation.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -92,3 +93,5 @@ sal_Int32 SAL_CALL VPolarTransformation::getTargetDimension()
 
 
 }  // namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/main/VTitle.cxx b/chart2/source/view/main/VTitle.cxx
index c2aa01163b17..6af228d02c11 100644
--- a/chart2/source/view/main/VTitle.cxx
+++ b/chart2/source/view/main/VTitle.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -161,17 +162,12 @@ void VTitle::createShapes(
         {
             drawing::TextHorizontalAdjust eHorizontalAdjust = drawing::TextHorizontalAdjust_CENTER;
             drawing::TextVerticalAdjust eVerticalAdjust = drawing::TextVerticalAdjust_CENTER;
-            //text::WritingMode eWritingMode = text::WritingMode_LR_TB;//@todo get correct one
 
             aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextHorizontalAdjust"), uno::makeAny(eHorizontalAdjust) ) ); // drawing::TextHorizontalAdjust
             aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextVerticalAdjust"), uno::makeAny(eVerticalAdjust) ) ); //drawing::TextVerticalAdjust
-            //aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextWritingMode"), uno::makeAny(eWritingMode) ) ); //text::WritingMode
             aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextAutoGrowHeight"), uno::makeAny(sal_True) ) ); // sal_Bool
             aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextAutoGrowWidth"), uno::makeAny(sal_True) ) ); // sal_Bool
 
-            ////aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextMaximumFrameWidth"), uno::makeAny(rSize.Width) ) ); //sal_Int32
-            ////aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextMaximumFrameHeight"), uno::makeAny(rSize.Height) ) ); //sal_Int32
-
             //set name/classified ObjectID (CID)
             if( m_aCID.getLength() )
                 aValueMap.insert( tPropertyNameValueMap::value_type( C2U("Name"), uno::makeAny( m_aCID ) ) ); //CID rtl::OUString
@@ -236,11 +232,8 @@ void VTitle::createShapes(
             bool bHasRefPageSize =
                 ( xTitleProperties->getPropertyValue( C2U("ReferencePageSize")) >>= aOldRefSize );
 
-            //for( nN=0; nN<aStringList.getLength();nN++ ) //portion wise fromatting does not work still
             if( aStringList.getLength()>0 )
             {
-                //uno::Reference< beans::XPropertySet > xTargetProps( aCursorList[nN], uno::UNO_QUERY );
-                //uno::Reference< beans::XPropertySet > xSourceProps( aStringList[nN], uno::UNO_QUERY );
                 uno::Reference< beans::XPropertySet > xTargetProps( xShape, uno::UNO_QUERY );
                 uno::Reference< beans::XPropertySet > xSourceProps( aStringList[0], uno::UNO_QUERY );
                 PropertyMapper::setMappedProperties( xTargetProps, xSourceProps, PropertyMapper::getPropertyNameMapForCharacterProperties() );
@@ -297,3 +290,5 @@ void VTitle::createShapes(
 //.............................................................................
 } //namespace chart
 //.............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/main/VTitle.hxx b/chart2/source/view/main/VTitle.hxx
index e097ecd3bbcc..61b7cadafccd 100644
--- a/chart2/source/view/main/VTitle.hxx
+++ b/chart2/source/view/main/VTitle.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -81,3 +82,4 @@ private:
 //.............................................................................
 #endif
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/main/_serviceregistration_view.cxx b/chart2/source/view/main/_serviceregistration_view.cxx
index 2f7e3db441e1..828564bec31c 100644
--- a/chart2/source/view/main/_serviceregistration_view.cxx
+++ b/chart2/source/view/main/_serviceregistration_view.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -62,3 +63,5 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
 }
 }
 //=========================================================================
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/main/makefile.mk b/chart2/source/view/main/makefile.mk
deleted file mode 100644
index 8675930aa107..000000000000
--- a/chart2/source/view/main/makefile.mk
+++ /dev/null
@@ -1,67 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=				..$/..$/..
-PRJINC=				$(PRJ)$/source
-PRJNAME=			chart2
-TARGET=				chview
-
-ENABLE_EXCEPTIONS=	TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE: settings.mk
-.INCLUDE: $(PRJ)$/chartview.pmk
-
-# --- export library -------------------------------------------------
-
-#object files to build and link together to lib $(SLB)$/$(TARGET).lib
-SLOFILES =  \
-            $(SLO)$/ChartItemPool.obj \
-            $(SLO)$/DrawModelWrapper.obj \
-            $(SLO)$/PropertyMapper.obj \
-            $(SLO)$/Stripe.obj \
-            $(SLO)$/VLineProperties.obj \
-            $(SLO)$/ShapeFactory.obj \
-            $(SLO)$/VLegendSymbolFactory.obj \
-            $(SLO)$/DataPointSymbolSupplier.obj \
-            $(SLO)$/Linear3DTransformation.obj \
-            $(SLO)$/VPolarTransformation.obj \
-            $(SLO)$/Clipping.obj \
-            $(SLO)$/PlottingPositionHelper.obj \
-            $(SLO)$/LabelPositionHelper.obj \
-            $(SLO)$/PolarLabelPositionHelper.obj \
-            $(SLO)$/PlotterBase.obj \
-            $(SLO)$/VDataSeries.obj \
-            $(SLO)$/VLegend.obj \
-            $(SLO)$/VTitle.obj \
-            $(SLO)$/ChartView.obj \
-            $(SLO)$/_serviceregistration_view.obj
-
-# --- Targets -----------------------------------------------------------------
-
-.INCLUDE: target.mk
diff --git a/chart2/source/view/makefile.mk b/chart2/source/view/makefile.mk
deleted file mode 100644
index 0b54ac976ad2..000000000000
--- a/chart2/source/view/makefile.mk
+++ /dev/null
@@ -1,128 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=				..$/..
-PRJNAME=			chart2
-TARGET=				chartview
-
-USE_DEFFILE=		TRUE
-ENABLE_EXCEPTIONS=	TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-.INCLUDE: $(PRJ)$/chartview.pmk
-
-# --- export library -------------------------------------------------
-
-#You can use several library macros of this form to build libraries that
-#do not consist of all object files in a directory or to merge different libraries.
-LIB1TARGET=		$(SLB)$/$(TARGET).lib
-
-LIB1FILES=		\
-                $(SLB)$/chvaxes.lib \
-                $(SLB)$/chvtypes.lib \
-                $(SLB)$/chvdiagram.lib \
-                $(SLB)$/chview.lib
-
-#--------
-
-#Indicates the filename of the shared library.
-SHL1TARGET=		$(TARGET)$(DLLPOSTFIX)
-
-#indicates dependencies:
-.IF "$(COM)" == "MSC"
-SHL1DEPN = \
-        $(LB)$/icharttools.lib
-.ELSE
-SHL1DEPN =
-.ENDIF
-
-#Specifies an import library to create. For Win32 only.
-SHL1IMPLIB=		i$(TARGET)
-
-#Specifies libraries from the same module to put into the shared library.
-#was created above
-SHL1LIBS= 		$(LIB1TARGET)
-
-#Links import libraries.
-
-SHL1STDLIBS=	$(CHARTTOOLS)		\
-                $(CPPULIB)			\
-                $(EDITENGLIB)			\
-                $(CPPUHELPERLIB)	\
-                $(COMPHELPERLIB)	\
-                $(SALLIB)			\
-                $(SVLLIB)			\
-                $(SVTOOLLIB)		\
-                $(SVXCORELIB)			\
-                $(TOOLSLIB) 		\
-                $(UNOTOOLSLIB)      \
-                $(BASEGFXLIB) 		\
-                $(VCLLIB)           \
-                $(SFXLIB)			\
-                $(BASEGFXLIB)
-
-#--------exports
-
-#specifies the exported symbols for Windows only:
-SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
-
-#Specifies the library name to parse for symbols. For Win32 only.
-DEFLIB1NAME=	$(TARGET)
-
-#A file of symbols to export.
-#DEF1EXPORTFILE=	$(PRJ)$/source$/inc$/exports.dxp
-
-#--------definition file
-
-#name of the definition file:
-DEF1NAME=		$(SHL1TARGET)
-
-# indicates definition file dependencies
-DEF1DEPN=		$(MISC)$/$(SHL1TARGET).flt
-
-#A comment on the definition file.
-DEF1DES=		Viewable Component Chart View
-
-# --- Targets -----------------------------------------------------------------
-
-.INCLUDE: target.mk
-
-# --- Filter -----------------------------------------------------------
-
-$(MISC)$/$(SHL1TARGET).flt: makefile.mk \
-                            exports.flt
-    $(TYPE) exports.flt > $@
-
-ALLTAR : $(MISC)/chartview.component
-
-$(MISC)/chartview.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        chartview.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt chartview.component
diff --git a/chart2/uiconfig/menubar/menubar.xml b/chart2/uiconfig/menubar/menubar.xml
index 788dac2fc90b..3c50167ef845 100644
--- a/chart2/uiconfig/menubar/menubar.xml
+++ b/chart2/uiconfig/menubar/menubar.xml
@@ -147,9 +147,9 @@
             <menu:menuitem menu:id=".uno:HelpIndex"/>
             <menu:menuitem menu:id=".uno:ExtendedHelp"/>
             <menu:menuseparator/>
-            <menu:menuitem menu:id=".uno:HelpSupport"/>
-            <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
+            <menu:menuitem menu:id=".uno:ShowLicense"/>
             <menu:menuseparator/>
+            <menu:menuitem menu:id=".uno:ShowCredits"/>
             <menu:menuitem menu:id=".uno:About"/>
         </menu:menupopup>
     </menu:menu>
diff --git a/chart2/util/makefile.mk b/chart2/util/makefile.mk
deleted file mode 100644
index dff14676a5b1..000000000000
--- a/chart2/util/makefile.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-PRJPCH=
-
-PRJNAME=chart2
-TARGET=chart_db
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  makefile.pmk
-
-#-------------------------------------------------------------------
-
-# UNOIDLDBFILES= \
-# 	$(UCR)$/csschart2.db
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.IF "$(L10N_framewor)"==""
-ALLTAR : \
-    $(BIN)$/$(PRJNAME).rdb \
-    $(MISC)$/$(TARGET).don
-
-$(BIN)$/$(PRJNAME).rdb : $(UCR)$/$(PRJNAME).db
-    $(GNUCOPY) -f $(UCR)$/$(PRJNAME).db $@
-
-$(MISC)$/$(TARGET).don : $(UCR)$/$(PRJNAME).db
-    $(CPPUMAKER) -O$(OUT)$/inc -BUCR $(UCR)$/$(PRJNAME).db -X$(SOLARBINDIR)$/types.rdb && echo > $@
-    echo $@
-
-.ENDIF			# "$(L10N_framewor)"==""
-
diff --git a/chart2/util/makefile.pmk b/chart2/util/makefile.pmk
deleted file mode 100644
index 3819e6175504..000000000000
--- a/chart2/util/makefile.pmk
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*- makefile -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  settings.mk
-
-# define macro for (chart-specific) tools library
-.IF "$(COM)" == "MSC" || "$(GUI)" == "OS2"
-    CHARTTOOLS= icharttools.lib
-.ELSE
-    CHARTTOOLS= -lcharttools$(DLLPOSTFIX)
-.ENDIF
-
-.IF "$(COM)" == "MSC" || "$(GUI)" == "OS2"
-    CHARTVIEW= ichartview.lib
-.ELSE
-    CHARTVIEW= -lchartview$(DLLPOSTFIX)
-.ENDIF
-
diff --git a/chart2/workbench/addin/makefile.mk b/chart2/workbench/addin/makefile.mk
index 2a7ebd1c80d9..380a0ce18cd0 100644
--- a/chart2/workbench/addin/makefile.mk
+++ b/chart2/workbench/addin/makefile.mk
@@ -73,8 +73,7 @@ SHL1OBJS=$(SLOFILES)
 SHL1STDLIBS= \
         $(CPPUHELPERLIB)	\
         $(CPPULIB)			\
-        $(VOSLIB)			\
-        $(SALLIB) 
+        $(SALLIB)
 
 SHL1DEPN=makefile.mk
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
diff --git a/chart2/workbench/addin/sampleaddin.cxx b/chart2/workbench/addin/sampleaddin.cxx
index a986dd9557c7..2b95474708b1 100644
--- a/chart2/workbench/addin/sampleaddin.cxx
+++ b/chart2/workbench/addin/sampleaddin.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -36,13 +37,14 @@
 #include <com/sun/star/chart/X3DDisplay.hpp>
 
 using namespace com::sun::star;
-using namespace rtl;
+
+using ::rtl::OUString;
 
 // code for creating instances of SampleAddIn
 
 extern "C" {
 
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
@@ -55,9 +57,9 @@ sal_Bool SAL_CALL component_writeInfo(
     {
         try
         {
-            OUString aImpl = OUString::createFromAscii( "/" );
+            OUString aImpl( RTL_CONSTASCII_USTRINGPARAM( "/" ));
             aImpl += SampleAddIn::getImplementationName_Static();
-            aImpl += OUString::createFromAscii( "/UNO/SERVICES" );
+            aImpl += OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" ));
 
             uno::Reference< registry::XRegistryKey> xNewKey(
                 reinterpret_cast<registry::XRegistryKey*>( pRegistryKey )->createKey( aImpl ) );
@@ -69,15 +71,15 @@ sal_Bool SAL_CALL component_writeInfo(
 
             return sal_True;
         }
-        catch( registry::InvalidRegistryException& )
+        catch( const registry::InvalidRegistryException& )
         {
-            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
+            OSL_FAIL( "### InvalidRegistryException!" );
         }
     }
     return sal_False;
 }
 
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
     void* pRet = 0;
@@ -136,9 +138,9 @@ sal_Bool SampleAddIn::getLogicalPosition( uno::Reference< drawing::XShape >& xAx
             try
             {
                 double fMin(0.0), fMax(0.0);
-                uno::Any aAny = xProp->getPropertyValue( OUString::createFromAscii( "Min" ));
+                uno::Any aAny = xProp->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Min" )));
                 aAny >>= fMin;
-                aAny = xProp->getPropertyValue( OUString::createFromAscii( "Max" ));
+                aAny = xProp->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Max" )));
                 aAny >>= fMax;
 
                 double fRange = fMax - fMin;
@@ -161,7 +163,7 @@ sal_Bool SampleAddIn::getLogicalPosition( uno::Reference< drawing::XShape >& xAx
                     bRet = sal_True;
                 }
             }
-            catch( beans::UnknownPropertyException )
+            catch( const beans::UnknownPropertyException& )
             {
                 // the shape xAxis was no chart axis
             }
@@ -173,17 +175,17 @@ sal_Bool SampleAddIn::getLogicalPosition( uno::Reference< drawing::XShape >& xAx
 
 OUString SampleAddIn::getImplementationName_Static()
 {
-    return OUString::createFromAscii( "SampleAddIn" );
+    return OUString( RTL_CONSTASCII_USTRINGPARAM( "SampleAddIn" ));
 }
 
 uno::Sequence< ::rtl::OUString > SampleAddIn::getSupportedServiceNames_Static()
 {
     uno::Sequence< OUString > aSeq( 4 );
 
-    aSeq[ 0 ] = OUString::createFromAscii( "com.sun.star.chart.ChartAxisXSupplier" );
-    aSeq[ 1 ] = OUString::createFromAscii( "com.sun.star.chart.ChartAxisYSupplier" );
-    aSeq[ 2 ] = OUString::createFromAscii( "com.sun.star.chart.Diagram" );
-    aSeq[ 3 ] = OUString::createFromAscii( "com.sun.star.chart.SampleAddIn" );
+    aSeq[ 0 ] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.ChartAxisXSupplier" ));
+    aSeq[ 1 ] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.ChartAxisYSupplier" ));
+    aSeq[ 2 ] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.Diagram" ));
+    aSeq[ 3 ] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.SampleAddIn" ));
 
     return aSeq;
 }
@@ -218,7 +220,7 @@ void SAL_CALL SampleAddIn::initialize( const uno::Sequence< uno::Any >& aArgumen
             aBaseType <<= rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.XYDiagram" ));
             try
             {
-                xDocProp->setPropertyValue( rtl::OUString::createFromAscii( "BaseDiagram" ), aBaseType );
+                xDocProp->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BaseDiagram" )), aBaseType );
             }
             catch( ... )
             {}
@@ -235,8 +237,8 @@ void SAL_CALL SampleAddIn::initialize( const uno::Sequence< uno::Any >& aArgumen
             {
                 uno::Any aAny;
                 aAny <<= (sal_Int32)( 0xe0e0f0 );
-                xDiaProp->setPropertyValue( OUString::createFromAscii( "FillColor" ), aAny );
-                xLegendProp->setPropertyValue( OUString::createFromAscii( "FillColor" ), aAny );
+                xDiaProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "FillColor" )), aAny );
+                xLegendProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "FillColor" )), aAny );
             }
         }
     }
@@ -284,7 +286,7 @@ void SAL_CALL SampleAddIn::refresh() throw( uno::RuntimeException )
                 if( ! mxMyRedLine.is())
                 {
                     mxMyRedLine = uno::Reference< drawing::XShape >(
-                        xFactory->createInstance( OUString::createFromAscii( "com.sun.star.drawing.LineShape" )),
+                        xFactory->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.LineShape" ))),
                         uno::UNO_QUERY );
                     xPage->add( mxMyRedLine );
 
@@ -297,8 +299,8 @@ void SAL_CALL SampleAddIn::refresh() throw( uno::RuntimeException )
                         aWidth <<= (sal_Int32)(50);         // 0.5 mm
                         try
                         {
-                            xShapeProp->setPropertyValue( OUString::createFromAscii( "LineColor" ), aColor );
-                            xShapeProp->setPropertyValue( OUString::createFromAscii( "LineWidth" ), aWidth );
+                            xShapeProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "LineColor" )), aColor );
+                            xShapeProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "LineWidth" )), aWidth );
                         }
                         catch( ... )
                         {}
@@ -308,17 +310,12 @@ void SAL_CALL SampleAddIn::refresh() throw( uno::RuntimeException )
                 if( ! mxMyText.is())
                 {
                     mxMyText = uno::Reference< drawing::XShape >(
-                        xFactory->createInstance( OUString::createFromAscii( "com.sun.star.drawing.TextShape" )),
+                        xFactory->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.TextShape" ))),
                         uno::UNO_QUERY );
                     xPage->add( mxMyText );
 
                     // change text
-                    OUString aText;
-//                  if( maLocale.Language.equalsIgnoreCase( OUString::createFromAscii("DE")))
-//                      aText = OUString::createFromAscii( "Kleines Beispiel" );
-//                  else
-                        aText = OUString::createFromAscii( "Little Example" );
-
+                    OUString aText(RTL_CONSTASCII_USTRINGPARAM( "Little Example" ));
                     uno::Reference< beans::XPropertySet > xTextProp( mxMyText, uno::UNO_QUERY );
                     if( xTextProp.is())
                     {
@@ -326,7 +323,7 @@ void SAL_CALL SampleAddIn::refresh() throw( uno::RuntimeException )
                         aTrueAny <<= (sal_Bool)(sal_True);
                         try
                         {
-                            xTextProp->setPropertyValue( rtl::OUString::createFromAscii( "TextAutoGrowWidth" ), aTrueAny );
+                            xTextProp->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TextAutoGrowWidth" )), aTrueAny );
                         }
                         catch( ... )
                         {}
@@ -378,7 +375,7 @@ void SAL_CALL SampleAddIn::refresh() throw( uno::RuntimeException )
                     {
                         uno::Any aAny;
                         aAny <<= aPtSeq;
-                        xShapeProp->setPropertyValue( rtl::OUString::createFromAscii( "PolyPolygon" ), aAny );
+                        xShapeProp->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PolyPolygon" )), aAny );
                     }
                 }
                 if( mxMyText.is())
@@ -392,30 +389,6 @@ void SAL_CALL SampleAddIn::refresh() throw( uno::RuntimeException )
             }
         }
     }
-
-    // set axis scale to 200
-//      uno::Reference< beans::XPropertySet > xXAxis( getXAxis(), uno::UNO_QUERY );
-//      if( xXAxis.is())
-//      {
-//          uno::Any aAny;
-//          aAny <<= (sal_Bool)(sal_False);
-//          xXAxis->setPropertyValue( rtl::OUString::createFromAscii( "AutoStepMain" ),
-//                                    aAny );
-//          aAny <<= (double)(200.0);
-//          xXAxis->setPropertyValue( rtl::OUString::createFromAscii( "StepMain" ),
-//                                    aAny );
-//      }
-
-// try setting symbols
-//      uno::Reference< beans::XPropertySet > xProp = getDataRowProperties( 0 );
-//      if( xProp.is())
-//      {
-//          uno::Any aAny;
-//          aAny <<= (sal_Int32)(-1);
-//          xProp->setPropertyValue( OUString::createFromAscii( "SymbolType" ), aAny );
-//          aAny <<= rtl::OUString::createFromAscii( "http://mib-1168/www/images/go.gif" );
-//          xProp->setPropertyValue( OUString::createFromAscii( "SymbolBitmapURL" ), aAny );
-//      }
 }
 
 void SAL_CALL SampleAddIn::addRefreshListener( const uno::Reference< util::XRefreshListener >&  )
@@ -435,7 +408,7 @@ void SAL_CALL SampleAddIn::removeRefreshListener( const uno::Reference< util::XR
 // XDiagram
 OUString SAL_CALL SampleAddIn::getDiagramType() throw( uno::RuntimeException )
 {
-    return OUString::createFromAscii( "com.sun.star.chart.SampleDiagram" );
+    return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.SampleDiagram" ));
 }
 
 // the following methods just delegate to the "parent diagram" (which in the future might no longer exist)
@@ -520,7 +493,7 @@ void SAL_CALL SampleAddIn::setPosition( const awt::Point& aPos )
 // XShapeDescriptor ( ::XShape ::XDiagram )
 rtl::OUString SAL_CALL SampleAddIn::getShapeType() throw( com::sun::star::uno::RuntimeException )
 {
-    return OUString::createFromAscii( "com.sun.star.chart.SampleAddinShape" );
+    return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.SampleAddinShape" ));
 }
 
 // XAxisXSupplier
@@ -672,7 +645,7 @@ uno::Reference< beans::XPropertySet > SAL_CALL SampleAddIn::getMinMaxLine()
 // XServiceName
 OUString SAL_CALL SampleAddIn::getServiceName() throw( uno::RuntimeException )
 {
-    return OUString::createFromAscii( "com.sun.star.chart.SampleAddIn" );
+    return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.SampleAddIn" ));
 }
 
 // XServiceInfo
@@ -714,3 +687,5 @@ lang::Locale SAL_CALL SampleAddIn::getLocale()
 {
     return maLocale;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/workbench/addin/sampleaddin.hxx b/chart2/workbench/addin/sampleaddin.hxx
index 59b1ab32c8f1..45369c4809e3 100644
--- a/chart2/workbench/addin/sampleaddin.hxx
+++ b/chart2/workbench/addin/sampleaddin.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -159,3 +160,5 @@ public:
 };
 
 #endif  // _SAMPLEADDIN_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */