[Libreoffice-commits] core.git: 2 commits - chart2/inc chart2/source connectivity/qa connectivity/source cui/source dbaccess/source desktop/source embeddedobj/source extensions/source filter/source include/comphelper include/svx include/vcl include/xmloff reportdesign/source sal/qa scripting/source sc/source sd/source svl/qa svx/source sw/source vcl/source vcl/win winaccessibility/source xmloff/source
Thomas Arnhold
thomas at arnhold.org
Mon Apr 21 09:10:37 PDT 2014
chart2/inc/ChartView.hxx | 1
chart2/source/controller/accessibility/AccessibleBase.cxx | 1
chart2/source/controller/accessibility/AccessibleChartElement.cxx | 1
chart2/source/controller/accessibility/AccessibleChartView.cxx | 3 -
chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx | 1
chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx | 1
chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx | 5 --
chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx | 1
chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx | 3 -
chart2/source/controller/dialogs/dlg_DataEditor.cxx | 3 -
chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx | 1
chart2/source/controller/dialogs/dlg_NumberFormat.cxx | 6 ---
chart2/source/controller/dialogs/dlg_View3D.cxx | 1
chart2/source/controller/dialogs/res_DataLabel.cxx | 7 ----
chart2/source/controller/dialogs/res_DataLabel.hxx | 3 -
chart2/source/controller/dialogs/res_ErrorBar.cxx | 1
chart2/source/controller/dialogs/res_Trendline.hxx | 3 -
chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx | 4 --
chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx | 4 --
chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx | 6 ---
chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx | 5 --
chart2/source/controller/dialogs/tp_AxisLabel.cxx | 3 -
chart2/source/controller/dialogs/tp_AxisPositions.cxx | 8 ----
chart2/source/controller/dialogs/tp_AxisPositions.hxx | 1
chart2/source/controller/dialogs/tp_ChartType.hxx | 2 -
chart2/source/controller/dialogs/tp_DataSource.cxx | 1
chart2/source/controller/dialogs/tp_DataSource.hxx | 6 ---
chart2/source/controller/dialogs/tp_DataSourceControls.hxx | 2 -
chart2/source/controller/dialogs/tp_PointGeometry.cxx | 2 -
chart2/source/controller/dialogs/tp_PointGeometry.hxx | 1
chart2/source/controller/dialogs/tp_Scale.cxx | 8 ----
chart2/source/controller/dialogs/tp_Scale.hxx | 6 ---
chart2/source/controller/dialogs/tp_SeriesToAxis.cxx | 3 -
chart2/source/controller/dialogs/tp_SeriesToAxis.hxx | 4 --
chart2/source/controller/dialogs/tp_TitleRotation.cxx | 3 -
chart2/source/controller/dialogs/tp_TitleRotation.hxx | 1
chart2/source/controller/drawinglayer/DrawViewWrapper.cxx | 7 ----
chart2/source/controller/drawinglayer/ViewElementListProvider.cxx | 17 ----------
chart2/source/controller/inc/AccessibleChartView.hxx | 1
chart2/source/controller/inc/ConfigurationAccess.hxx | 1
chart2/source/controller/inc/ItemConverter.hxx | 1
chart2/source/controller/inc/dlg_ChartType.hxx | 3 -
chart2/source/controller/inc/dlg_CreationWizard.hxx | 1
chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx | 1
chart2/source/controller/inc/dlg_DataSource.hxx | 5 --
chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx | 3 -
chart2/source/controller/inc/dlg_InsertDataLabel.hxx | 3 -
chart2/source/controller/inc/dlg_View3D.hxx | 3 -
chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx | 3 -
chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx | 4 --
chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx | 2 -
chart2/source/controller/itemsetwrapper/ItemConverter.cxx | 1
chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx | 1
chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx | 5 --
chart2/source/controller/main/ChartController.cxx | 3 -
chart2/source/controller/main/ChartController_EditData.cxx | 1
chart2/source/controller/main/ChartController_Insert.cxx | 4 --
chart2/source/controller/main/ChartController_Position.cxx | 1
chart2/source/controller/main/ChartController_Properties.cxx | 3 -
chart2/source/controller/main/ChartController_TextEdit.cxx | 3 -
chart2/source/controller/main/ChartController_Tools.cxx | 8 ----
chart2/source/controller/main/ChartController_Window.cxx | 6 ---
chart2/source/controller/main/ChartDropTargetHelper.hxx | 1
chart2/source/controller/main/ChartTransferable.cxx | 2 -
chart2/source/controller/main/ConfigurationAccess.cxx | 3 -
chart2/source/controller/main/DragMethod_Base.cxx | 2 -
chart2/source/controller/main/DragMethod_Base.hxx | 3 -
chart2/source/controller/main/DragMethod_RotateDiagram.cxx | 1
chart2/source/controller/main/DragMethod_RotateDiagram.hxx | 1
chart2/source/controller/main/PositionAndSizeHelper.cxx | 1
chart2/source/controller/main/SelectionHelper.cxx | 2 -
chart2/source/controller/main/SelectionHelper.hxx | 1
chart2/source/controller/main/UndoCommandDispatch.cxx | 1
chart2/source/inc/LegendHelper.hxx | 1
chart2/source/inc/ModifyListenerCallBack.hxx | 1
chart2/source/inc/ObjectIdentifier.hxx | 1
chart2/source/inc/WrappedPropertySet.hxx | 2 -
chart2/source/inc/chartview/DrawModelWrapper.hxx | 3 -
chart2/source/model/filter/XMLFilter.cxx | 5 --
chart2/source/model/inc/XMLFilter.hxx | 1
chart2/source/model/main/ChartModel.cxx | 2 -
chart2/source/tools/AxisHelper.cxx | 1
chart2/source/tools/CharacterProperties.cxx | 1
chart2/source/tools/DiagramHelper.cxx | 1
chart2/source/tools/NumberFormatterWrapper.cxx | 2 -
chart2/source/tools/ObjectIdentifier.cxx | 1
chart2/source/tools/WrappedPropertySet.cxx | 1
chart2/source/view/charttypes/VSeriesPlotter.cxx | 1
chart2/source/view/diagram/VDiagram.cxx | 2 -
chart2/source/view/main/ChartView.cxx | 5 --
chart2/source/view/main/DrawModelWrapper.cxx | 12 -------
connectivity/qa/connectivity/ado/DriverTest.cxx | 4 --
connectivity/source/manager/mdrivermanager.hxx | 1
cui/source/inc/transfrm.hxx | 1
cui/source/options/cfgchart.hxx | 4 --
cui/source/options/optchart.hxx | 5 --
cui/source/options/optinet2.cxx | 1
cui/source/tabpages/page.cxx | 2 -
dbaccess/source/ui/misc/linkeddocuments.cxx | 1
desktop/source/splash/unxsplash.cxx | 1
embeddedobj/source/msole/olevisual.cxx | 1
extensions/source/scanner/grid.cxx | 1
filter/source/flash/swfwriter.hxx | 2 -
include/comphelper/scoped_disposing_ptr.hxx | 1
include/svx/ActionDescriptionProvider.hxx | 1
include/svx/formatpaintbrushctrl.hxx | 2 -
include/vcl/IconThemeInfo.hxx | 1
include/vcl/slider.hxx | 1
include/xmloff/xmlerror.hxx | 1
reportdesign/source/filter/xml/xmlExport.cxx | 1
sal/qa/osl/security/osl_Security.cxx | 2 -
sc/source/filter/excel/colrowst.cxx | 2 -
sc/source/filter/excel/xename.cxx | 2 -
sc/source/filter/excel/xiname.cxx | 3 -
sc/source/ui/Accessibility/AccessibleCsvControl.cxx | 1
sc/source/ui/app/transobj.cxx | 1
sc/source/ui/app/typemap.cxx | 3 -
sc/source/ui/attrdlg/scdlgfact.cxx | 2 -
sc/source/ui/dbgui/asciiopt.cxx | 1
sc/source/ui/dbgui/csvtablebox.cxx | 2 -
sc/source/ui/inc/scuitphfedit.hxx | 1
sc/source/ui/unoobj/funcuno.cxx | 1
sc/source/ui/view/gridwin4.cxx | 2 -
scripting/source/vbaevents/eventhelper.cxx | 1
sd/source/core/CustomAnimationCloner.cxx | 1
sd/source/filter/ppt/ppt97animations.cxx | 4 --
sd/source/filter/ppt/ppt97animations.hxx | 1
sd/source/ui/dlg/animobjs.cxx | 1
sd/source/ui/func/fumorph.cxx | 1
sd/source/ui/inc/fuformatpaintbrush.hxx | 1
sd/source/ui/slideshow/slideshowimpl.cxx | 2 -
svl/qa/unit/items/test_IndexedStyleSheets.cxx | 1
svx/source/customshapes/EnhancedCustomShape2d.cxx | 2 -
svx/source/dialog/contwnd.cxx | 2 -
svx/source/dialog/graphctl.cxx | 2 -
svx/source/svdraw/sdrmasterpagedescriptor.cxx | 3 -
svx/source/svdraw/svdedtv.cxx | 2 -
svx/source/svdraw/svdedtv2.cxx | 3 -
svx/source/svdraw/svdoole2.cxx | 5 --
svx/source/svdraw/svdpagv.cxx | 1
svx/source/tbxctrls/formatpaintbrushctrl.cxx | 5 --
svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx | 6 ---
svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx | 4 --
svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx | 4 --
svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx | 2 -
svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx | 2 -
svx/source/unodraw/unomlstr.cxx | 2 -
svx/source/unodraw/unoshap2.cxx | 2 -
svx/source/unodraw/unoshape.cxx | 1
sw/source/core/SwNumberTree/SwNodeNum.cxx | 1
sw/source/core/access/accpara.cxx | 3 -
sw/source/core/crsr/pam.cxx | 2 -
sw/source/core/docnode/ndsect.cxx | 1
sw/source/core/docnode/ndtbl.cxx | 1
sw/source/core/draw/dview.cxx | 3 -
sw/source/core/frmedt/fetab.cxx | 1
sw/source/core/inc/anchoredobjectposition.hxx | 2 -
sw/source/core/inc/frmtool.hxx | 1
sw/source/core/inc/layouter.hxx | 4 --
sw/source/core/layout/anchoreddrawobject.cxx | 2 -
sw/source/core/layout/anchoredobject.cxx | 2 -
sw/source/core/layout/calcmove.cxx | 2 -
sw/source/core/layout/flyincnt.cxx | 1
sw/source/core/layout/flylay.cxx | 2 -
sw/source/core/layout/hffrm.cxx | 2 -
sw/source/core/layout/layact.cxx | 1
sw/source/core/layout/laycache.cxx | 1
sw/source/core/layout/layouter.cxx | 2 -
sw/source/core/layout/paintfrm.cxx | 2 -
sw/source/core/layout/sectfrm.cxx | 1
sw/source/core/layout/virtoutp.cxx | 1
sw/source/core/layout/wsfrm.cxx | 1
sw/source/core/objectpositioning/anchoredobjectposition.cxx | 1
sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx | 1
sw/source/core/text/frmform.cxx | 2 -
sw/source/core/text/frmpaint.cxx | 1
sw/source/core/text/inftxt.cxx | 1
sw/source/core/text/itrcrsr.cxx | 1
sw/source/core/text/itrpaint.cxx | 1
sw/source/core/text/porfly.cxx | 1
sw/source/core/text/porfly.hxx | 2 -
sw/source/core/text/txtfly.cxx | 1
sw/source/core/text/txtftn.cxx | 1
sw/source/core/text/txttab.cxx | 1
sw/source/core/uibase/docvw/edtwin2.cxx | 1
sw/source/core/uibase/inc/formatclipboard.hxx | 3 -
sw/source/core/uibase/shells/frmsh.cxx | 3 -
sw/source/core/uibase/uiview/formatclipboard.cxx | 7 ----
sw/source/core/uibase/uiview/view1.cxx | 2 -
sw/source/core/uibase/uno/unotxdoc.cxx | 1
sw/source/core/undo/undobj1.cxx | 1
sw/source/core/unocore/unomap.cxx | 1
sw/source/core/unocore/unoportenum.cxx | 1
sw/source/core/unocore/unotbl.cxx | 1
sw/source/core/view/viewimp.cxx | 1
sw/source/filter/basflt/shellio.cxx | 2 -
sw/source/filter/ww8/wrtw8esh.cxx | 2 -
sw/source/filter/ww8/ww8graf.cxx | 1
sw/source/filter/ww8/ww8par6.cxx | 1
sw/source/filter/xml/XMLRedlineImportHelper.cxx | 2 -
sw/source/filter/xml/swxml.cxx | 1
sw/source/filter/xml/xmlexp.cxx | 2 -
sw/source/filter/xml/xmlimp.cxx | 1
sw/source/filter/xml/xmltbli.cxx | 2 -
sw/source/filter/xml/xmltexti.cxx | 3 -
sw/source/ui/app/mn.src | 11 ------
sw/source/ui/dialog/docstdlg.cxx | 2 -
sw/source/ui/fldui/fldref.cxx | 1
sw/source/ui/fldui/fldref.hxx | 1
sw/source/ui/frmdlg/wrap.cxx | 1
vcl/source/helper/canvastools.cxx | 2 -
vcl/win/source/gdi/winlayout.cxx | 1
winaccessibility/source/service/AccResource.cxx | 10 -----
xmloff/source/chart/PropertyMaps.cxx | 1
xmloff/source/chart/SchXMLEnumConverter.cxx | 1
xmloff/source/chart/SchXMLExport.cxx | 1
xmloff/source/chart/SchXMLSeries2Context.cxx | 2 -
xmloff/source/chart/SchXMLSeries2Context.hxx | 1
xmloff/source/chart/SchXMLSeriesHelper.cxx | 1
xmloff/source/chart/SchXMLTools.cxx | 5 --
xmloff/source/style/MultiPropertySetHelper.cxx | 1
xmloff/source/style/xmlimppr.cxx | 1
xmloff/source/text/XMLTextFrameHyperlinkContext.cxx | 1
xmloff/source/text/txtparai.cxx | 2 -
xmloff/source/text/txtprhdl.cxx | 1
xmloff/source/text/txtstyli.cxx | 1
226 files changed, 8 insertions(+), 512 deletions(-)
New commits:
commit 97a5ba4a71c39207859556296ed46dc474762164
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Apr 21 10:54:54 2014 +0200
remove comments why a file gets included
also remove some commented out code
Change-Id: Ia80c5c57d8d2a74418032de50eee95642cc0969d
diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx
index 4217ca9..bc458a9 100644
--- a/chart2/inc/ChartView.hxx
+++ b/chart2/inc/ChartView.hxx
@@ -25,7 +25,6 @@
#include <cppuhelper/implbase10.hxx>
#include <cppuhelper/interfacecontainer.hxx>
-// header for class SfxListener
#include <svl/lstner.hxx>
#include <com/sun/star/datatransfer/XTransferable.hpp>
#include <com/sun/star/drawing/XDrawPage.hpp>
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx
index a2b1a69..db5e603 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -32,7 +32,6 @@
#include <com/sun/star/drawing/LineStyle.hpp>
#include <com/sun/star/drawing/FillStyle.hpp>
#include <rtl/ustrbuf.hxx>
-// for SolarMutex
#include <vcl/svapp.hxx>
#include <rtl/uuid.h>
#include <cppuhelper/queryinterface.hxx>
diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.cxx b/chart2/source/controller/accessibility/AccessibleChartElement.cxx
index 617ee8e..0f89470 100644
--- a/chart2/source/controller/accessibility/AccessibleChartElement.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartElement.cxx
@@ -30,7 +30,6 @@
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
-// for SolarMutex
#include <vcl/svapp.hxx>
#include <rtl/ustrbuf.hxx>
diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx b/chart2/source/controller/accessibility/AccessibleChartView.cxx
index 62e23c6..83bec76 100644
--- a/chart2/source/controller/accessibility/AccessibleChartView.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx
@@ -34,10 +34,7 @@
#include <rtl/ustring.hxx>
#include <vcl/window.hxx>
#include <toolkit/helper/vclunohelper.hxx>
-// for SolarMutex
#include <vcl/svapp.hxx>
-
-// header for typedef MutexGuard
#include <osl/mutex.hxx>
using namespace ::com::sun::star;
diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
index 369e212..ddef4f4 100644
--- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
@@ -26,7 +26,6 @@
#include <com/sun/star/chart2/XDiagram.hpp>
-// header for class OPropertyArrayHelper
#include <cppuhelper/propshlp.hxx>
#include <cppuhelper/implbase6.hxx>
#include <com/sun/star/beans/XMultiPropertySet.hpp>
diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
index c4c003b..9d6f0f0 100644
--- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
@@ -25,7 +25,6 @@
#include <com/sun/star/chart2/XDiagram.hpp>
-// header for class OPropertyArrayHelper
#include <cppuhelper/propshlp.hxx>
#include <cppuhelper/implbase6.hxx>
#include <com/sun/star/beans/XMultiPropertySet.hpp>
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
index b8f9a8e..bc71bee 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
@@ -28,16 +28,11 @@
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/chart/ChartSymbolType.hpp>
#include <com/sun/star/drawing/LineStyle.hpp>
-
#include <com/sun/star/graphic/GraphicProvider.hpp>
#include <com/sun/star/graphic/XGraphicProvider.hpp>
-// for UNO_NAME_GRAPHOBJ_URLPREFIX
#include <editeng/unoprnms.hxx>
-
-// for Graphic
#include <vcl/graph.hxx>
-// for GraphicObject
#include <svtools/grfmgr.hxx>
#include <vcl/outdev.hxx>
diff --git a/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx b/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx
index f564673..34aec55 100644
--- a/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx
+++ b/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx
@@ -19,7 +19,6 @@
#include "TimerTriggeredControllerLock.hxx"
-// header for define EDIT_UPDATEDATA_TIMEOUT
#include <vcl/edit.hxx>
namespace chart
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
index dfd24d7..45d1e01 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
@@ -24,12 +24,9 @@
#include "ContainerHelper.hxx"
#include "TimerTriggeredControllerLock.hxx"
#include <osl/mutex.hxx>
-// header for class Application
#include <vcl/svapp.hxx>
#include <toolkit/awt/vclxwindow.hxx>
-// header for define RET_CANCEL
#include <vcl/msgbox.hxx>
-// header for class OImplementationId
#include <cppuhelper/typeprovider.hxx>
#include <comphelper/servicehelper.hxx>
#include <com/sun/star/awt/Point.hpp>
diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
index ddba251..a1ebedc 100644
--- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
@@ -27,10 +27,7 @@
#include <vcl/taskpanelist.hxx>
#include <svtools/miscopt.hxx>
#include <unotools/pathoptions.hxx>
-
-// for SfxBoolItem
#include <svl/eitem.hxx>
-
#include <vcl/edit.hxx>
#include <com/sun/star/frame/XStorable.hpp>
diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
index 1dad1d8..bff841e 100644
--- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
@@ -24,7 +24,6 @@
#include "HelpIds.hrc"
#include "ObjectNameProvider.hxx"
-// header for class SfxBoolItem
#include <svl/eitem.hxx>
namespace chart
diff --git a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
index 5d22669..332fcfe 100644
--- a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
+++ b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
@@ -19,17 +19,11 @@
#include "dlg_NumberFormat.hxx"
-// header for class SfxItemSet
#include <svl/itemset.hxx>
-
-// header for class SvxNumberInfoItem
#include <svx/numinf.hxx>
-
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
#include <sfx2/tabdlg.hxx>
-
-// header for SvNumberFormatter
#include <svl/zforlist.hxx>
namespace chart
diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx b/chart2/source/controller/dialogs/dlg_View3D.cxx
index 61f3826..d15e8b6 100644
--- a/chart2/source/controller/dialogs/dlg_View3D.cxx
+++ b/chart2/source/controller/dialogs/dlg_View3D.cxx
@@ -29,7 +29,6 @@
#include "ControllerLockGuard.hxx"
#include <com/sun/star/beans/XPropertySet.hpp>
-// for RET_OK
#include <vcl/msgbox.hxx>
namespace chart
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx
index 383f492..a775e72 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -22,22 +22,15 @@
#include "chartview/ChartSfxItemIds.hxx"
#include "dlg_NumberFormat.hxx"
-// header for class SvxNumberInfoItem
#include <svx/numinf.hxx>
#include <svl/eitem.hxx>
-// for SfxUInt32Item
#include <svl/intitem.hxx>
-// header for class SfxStringItem
#include <svl/stritem.hxx>
-//SfxIntegerListItem
#include <svl/ilstitem.hxx>
#include <editeng/eeitem.hxx>
#include <editeng/frmdiritem.hxx>
-
-// header for define RET_OK
#include <vcl/msgbox.hxx>
#include <svx/svxids.hrc>
-// header for SvNumberFormatter
#include <svl/zforlist.hxx>
#include <svtools/controldims.hrc>
diff --git a/chart2/source/controller/dialogs/res_DataLabel.hxx b/chart2/source/controller/dialogs/res_DataLabel.hxx
index 69317e8..8875136 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.hxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.hxx
@@ -21,13 +21,10 @@
#define NUMBER_SEPARATORS 4
-// header for class CheckBox
#include <vcl/button.hxx>
#include <vcl/layout.hxx>
-// header for class SfxItemSet
#include <svl/itemset.hxx>
#include "TextDirectionListBox.hxx"
-
#include <svx/dialcontrol.hxx>
#include <svx/wrapfield.hxx>
#include <sfx2/tabdlg.hxx>
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index 4270b53..60b4987 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -21,7 +21,6 @@
#include "ResId.hxx"
#include "Bitmaps.hrc"
#include "RangeSelectionHelper.hxx"
-// for RANGE_SELECTION_INVALID_RANGE_BACKGROUND_COLOR
#include "TabPageNotifiable.hxx"
#include "macros.hxx"
diff --git a/chart2/source/controller/dialogs/res_Trendline.hxx b/chart2/source/controller/dialogs/res_Trendline.hxx
index bf26e30..8399b61 100644
--- a/chart2/source/controller/dialogs/res_Trendline.hxx
+++ b/chart2/source/controller/dialogs/res_Trendline.hxx
@@ -25,10 +25,9 @@
#include <svl/itemset.hxx>
#include <svx/chrtitem.hxx>
#include <vcl/field.hxx>
-// header for class SvNumberformat
#include <svl/zformat.hxx>
-// header for class FormattedField
#include <svtools/fmtfield.hxx>
+
namespace chart
{
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx
index c0ee287..c08cea1 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx
@@ -19,13 +19,9 @@
#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TP_3D_SCENEAPPEARANCE_HXX
#define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TP_3D_SCENEAPPEARANCE_HXX
-// header for class TabPage
#include <vcl/tabpage.hxx>
-// header for class MetricField
#include <vcl/field.hxx>
-// header for class CheckBox
#include <vcl/button.hxx>
-// header for class ListBox
#include <vcl/lstbox.hxx>
#include <com/sun/star/drawing/ShadeMode.hpp>
#include <com/sun/star/frame/XModel.hpp>
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx
index e6dccc5..decc521 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx
@@ -22,13 +22,9 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <basegfx/matrix/b3dhommatrix.hxx>
-// header for class TabPage
#include <vcl/tabpage.hxx>
-// header for class FixedLine
#include <vcl/fixed.hxx>
-// header for class MetricField
#include <vcl/field.hxx>
-// header for class OKButton
#include <vcl/button.hxx>
#include "ControllerLockGuard.hxx"
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index 9ab6183..839f200 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -23,16 +23,10 @@
#include "CommonConverters.hxx"
#include "svx/dialogs.hrc"
-// header for define SVX_RES
#include <svx/dialmgr.hxx>
#include <rtl/math.hxx>
-
-// header for class SvColorDialog
#include <svtools/colrdlg.hxx>
-
-// header for define RET_OK
#include <vcl/msgbox.hxx>
-
#include <svx/svx3ditems.hxx>
#include <svx/svddef.hxx>
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
index 09d1725..f08560b 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
@@ -24,15 +24,10 @@
#include <com/sun/star/beans/XPropertySet.hpp>
-// header for class TabPage
#include <vcl/tabpage.hxx>
-// header for class FixedText
#include <vcl/fixed.hxx>
-// header for class CheckBox
#include <vcl/button.hxx>
-// header for class ColorLB
#include <svx/dlgctrl.hxx>
-// header for class SvxLightCtl3D
#include <svx/dlgctl3d.hxx>
namespace chart
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index eaa6ed5..efa7aa4 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -23,10 +23,7 @@
#include "TabPages.hrc"
#include "chartview/ChartSfxItemIds.hxx"
-// header for SvxChartTextOrientItem / SvxChartTextOrderItem
#include <svx/chrtitem.hxx>
-
-// header for SfxInt32Item
#include <svl/intitem.hxx>
#include <editeng/eeitem.hxx>
#include <editeng/frmdiritem.hxx>
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
index 0108a45..a0e28ca 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
@@ -27,19 +27,11 @@
#include <svx/svxids.hrc>
#include <rtl/math.hxx>
-// header for class SvxDoubleItem
#include <svx/chrtitem.hxx>
-// header for class SfxBoolItem
#include <svl/eitem.hxx>
-// header for SfxInt32Item
#include <svl/intitem.hxx>
-
-// header for class WarningBox
#include <vcl/msgbox.hxx>
-
-// header for class SvNumberformat
#include <svl/zformat.hxx>
-
#include <svtools/controldims.hrc>
#include <com/sun/star/chart/ChartAxisPosition.hpp>
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.hxx b/chart2/source/controller/dialogs/tp_AxisPositions.hxx
index b143b44..21c92f0 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.hxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TP_AXISPOSITIONS_HXX
#define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TP_AXISPOSITIONS_HXX
-// header for SfxTabPage
#include <sfx2/tabdlg.hxx>
#include <svtools/fmtfield.hxx>
#include <vcl/fixed.hxx>
diff --git a/chart2/source/controller/dialogs/tp_ChartType.hxx b/chart2/source/controller/dialogs/tp_ChartType.hxx
index e876d59..4d3229a 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.hxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.hxx
@@ -30,9 +30,7 @@
#include <svtools/wizardmachine.hxx>
#include <svtools/valueset.hxx>
#include <vcl/fixed.hxx>
-// header for class MetricField
#include <vcl/field.hxx>
-// header for class ListBox
#include <vcl/lstbox.hxx>
#include <com/sun/star/uno/XComponentContext.hpp>
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 02e386f..8a83c5b 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -36,7 +36,6 @@
#include <com/sun/star/util/XModifiable.hpp>
#include <com/sun/star/chart2/data/XDataSink.hpp>
-// for RET_OK
#include <vcl/msgbox.hxx>
#include <rtl/ustrbuf.hxx>
diff --git a/chart2/source/controller/dialogs/tp_DataSource.hxx b/chart2/source/controller/dialogs/tp_DataSource.hxx
index de20639..b89d4d4 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.hxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.hxx
@@ -24,17 +24,11 @@
#include "DialogModel.hxx"
#include "TabPageNotifiable.hxx"
-// header for class Edit
#include <vcl/edit.hxx>
-// header for class ListBox
#include <vcl/lstbox.hxx>
-// header for class PushButton, OKButton, CancelButton, HelpButton
#include <vcl/button.hxx>
-// header for class FixedText, FixedLine
#include <vcl/fixed.hxx>
-// header for class SvTabListBox
#include <svtools/svtabbx.hxx>
-// header for class SvTreeListBox
#include <svtools/treelistbox.hxx>
#include <com/sun/star/chart2/XChartDocument.hpp>
#include <com/sun/star/chart2/XDiagram.hpp>
diff --git a/chart2/source/controller/dialogs/tp_DataSourceControls.hxx b/chart2/source/controller/dialogs/tp_DataSourceControls.hxx
index 4497135..82ae7ad 100644
--- a/chart2/source/controller/dialogs/tp_DataSourceControls.hxx
+++ b/chart2/source/controller/dialogs/tp_DataSourceControls.hxx
@@ -23,9 +23,7 @@
#include <com/sun/star/chart2/XDataSeries.hpp>
#include <com/sun/star/chart2/data/XLabeledDataSequence.hpp>
-// header for class SvTabListBox
#include <svtools/svtabbx.hxx>
-// header for class SvTreeListBox
#include <svtools/treelistbox.hxx>
#include "svtools/treelistentry.hxx"
diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.cxx b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
index b30160c..68a20d9 100644
--- a/chart2/source/controller/dialogs/tp_PointGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
@@ -24,9 +24,7 @@
#include "chartview/ChartSfxItemIds.hxx"
-// header for SfxInt32Item
#include <svl/intitem.hxx>
-// header for class Svx3DHorizontalSegmentsItem
#include <svx/svx3ditems.hxx>
namespace chart
diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.hxx b/chart2/source/controller/dialogs/tp_PointGeometry.hxx
index a1a3f29..b4098a7 100644
--- a/chart2/source/controller/dialogs/tp_PointGeometry.hxx
+++ b/chart2/source/controller/dialogs/tp_PointGeometry.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TP_POINTGEOMETRY_HXX
#define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TP_POINTGEOMETRY_HXX
-// header for SfxTabPage
#include <sfx2/tabdlg.hxx>
namespace chart
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx
index 6edd87e..a3df39f 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -26,19 +26,11 @@
#include <svx/svxids.hrc>
#include <rtl/math.hxx>
-// header for class SvxDoubleItem
#include <svx/chrtitem.hxx>
-// header for class SfxBoolItem
#include <svl/eitem.hxx>
-// header for SfxInt32Item
#include <svl/intitem.hxx>
-
-// header for class WarningBox
#include <vcl/msgbox.hxx>
-
-// header for class SvNumberformat
#include <svl/zformat.hxx>
-
#include <svtools/controldims.hrc>
#include <com/sun/star/chart2/AxisType.hpp>
diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx
index f7203ef..6839c09 100644
--- a/chart2/source/controller/dialogs/tp_Scale.hxx
+++ b/chart2/source/controller/dialogs/tp_Scale.hxx
@@ -19,17 +19,11 @@
#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TP_SCALE_HXX
#define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TP_SCALE_HXX
-// header for SfxTabPage
#include <sfx2/tabdlg.hxx>
-// header for class FormattedField
#include <svtools/fmtfield.hxx>
-// header for FixedText
#include <vcl/fixed.hxx>
-// header for CheckBox
#include <vcl/button.hxx>
-// header for MetricField
#include <vcl/field.hxx>
-// header for class ListBox
#include <vcl/lstbox.hxx>
namespace chart
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
index 4b2fed5..683fdc1 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
@@ -22,11 +22,8 @@
#include "ResId.hxx"
#include "chartview/ChartSfxItemIds.hxx"
-// header for class SfxBoolItem
#include <svl/eitem.hxx>
-// header for SfxInt32Item
#include <svl/intitem.hxx>
-//SfxIntegerListItem
#include <svl/ilstitem.hxx>
#include <svtools/controldims.hrc>
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
index cabe837..2336eb5 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
@@ -19,13 +19,9 @@
#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TP_SERIESTOAXIS_HXX
#define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TP_SERIESTOAXIS_HXX
-// header for SfxTabPage
#include <sfx2/tabdlg.hxx>
-// header for FixedText
#include <vcl/fixed.hxx>
-// header for CheckBox
#include <vcl/button.hxx>
-// header for MetricField
#include <vcl/field.hxx>
namespace chart
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
index ee5237c..ab0dc4c 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
@@ -23,10 +23,9 @@
#include "TabPages.hrc"
#include "chartview/ChartSfxItemIds.hxx"
#include "HelpIds.hrc"
+
#include <editeng/eeitem.hxx>
#include <editeng/frmdiritem.hxx>
-
-// header for class SfxInt32Item
#include <svl/intitem.hxx>
namespace chart
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.hxx b/chart2/source/controller/dialogs/tp_TitleRotation.hxx
index 9740b9f..14fff72 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.hxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TP_TITLEROTATION_HXX
#define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TP_TITLEROTATION_HXX
-// header for SfxTabPage
#include <sfx2/tabdlg.hxx>
#include <svx/dialcontrol.hxx>
#include <svx/wrapfield.hxx>
diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
index f97c537..c32ee01 100644
--- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
+++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
@@ -24,20 +24,13 @@
#include <unotools/lingucfg.hxx>
#include <editeng/langitem.hxx>
-// header for class SdrPage
#include <svx/svdpage.hxx>
-//header for class SdrPageView
#include <svx/svdpagv.hxx>
-// header for class SdrModel
#include <svx/svdmodel.hxx>
-// header for class E3dScene
#include <svx/scene3d.hxx>
#include <svx/svdetc.hxx>
#include <svx/svdoutl.hxx>
-
#include <svx/svxids.hrc>
-
-// header for class SvxShape
#include <svx/unoshape.hxx>
#include <editeng/fhgtitem.hxx>
diff --git a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
index 8ad08cc..af648da 100644
--- a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
+++ b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
@@ -22,39 +22,24 @@
#include "chartview/DataPointSymbolSupplier.hxx"
#include "macros.hxx"
#include "DrawViewWrapper.hxx"
+
#include <svx/xtable.hxx>
#include <svx/XPropertyTable.hxx>
#include <svx/unofill.hxx>
#include <svx/unoapi.hxx>
-
-// header for class NameOrIndex
#include <svx/xit.hxx>
-// header for class XFillBitmapItem
#include <svx/xbtmpit.hxx>
#include <svx/xflftrit.hxx>
#include <svx/xlndsit.hxx>
#include <svx/xflhtit.hxx>
#include <svx/xflgrit.hxx>
-// header for class XLineStartItem
#include <svx/xlnstit.hxx>
-// header for class XLineEndItem
#include <svx/xlnedit.hxx>
-
-//oldChartModelWrapper
-
-// header for class SfxItemPool
#include <svl/itempool.hxx>
-// header for class FontList
#include <svtools/ctrltool.hxx>
-// header for class Application
#include <vcl/svapp.hxx>
-// header for class SdrObject
#include <svx/svdobj.hxx>
-
-//for creation of a symbol Graphic
-// header for class VirtualDevice
#include <vcl/virdev.hxx>
-// header for class SdrView
#include <svx/svdview.hxx>
namespace chart
diff --git a/chart2/source/controller/inc/AccessibleChartView.hxx b/chart2/source/controller/inc/AccessibleChartView.hxx
index 3e5ce28..84dc977 100644
--- a/chart2/source/controller/inc/AccessibleChartView.hxx
+++ b/chart2/source/controller/inc/AccessibleChartView.hxx
@@ -23,7 +23,6 @@
#include "MutexContainer.hxx"
#include "ServiceMacros.hxx"
#include <cppuhelper/implbase2.hxx>
-// header for class WeakReference
#include <cppuhelper/weakref.hxx>
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/frame/XModel.hpp>
diff --git a/chart2/source/controller/inc/ConfigurationAccess.hxx b/chart2/source/controller/inc/ConfigurationAccess.hxx
index 679e7fc..7ec2c1a 100644
--- a/chart2/source/controller/inc/ConfigurationAccess.hxx
+++ b/chart2/source/controller/inc/ConfigurationAccess.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_INC_CONFIGURATIONACCESS_HXX
#define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_CONFIGURATIONACCESS_HXX
-// header for enum FieldUnit
#include <tools/fldunit.hxx>
namespace chart
diff --git a/chart2/source/controller/inc/ItemConverter.hxx b/chart2/source/controller/inc/ItemConverter.hxx
index e4143c1..ea8850d 100644
--- a/chart2/source/controller/inc/ItemConverter.hxx
+++ b/chart2/source/controller/inc/ItemConverter.hxx
@@ -24,7 +24,6 @@
#include <svl/itemset.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
-// for pair
#include <utility>
namespace comphelper
diff --git a/chart2/source/controller/inc/dlg_ChartType.hxx b/chart2/source/controller/inc/dlg_ChartType.hxx
index 992aa2d..227bf96 100644
--- a/chart2/source/controller/inc/dlg_ChartType.hxx
+++ b/chart2/source/controller/inc/dlg_ChartType.hxx
@@ -19,11 +19,8 @@
#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DLG_CHARTTYPE_HXX
#define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DLG_CHARTTYPE_HXX
-// header for class ModalDialog
#include <vcl/dialog.hxx>
-// header for class FixedLine
#include <vcl/fixed.hxx>
-// header for class OKButton
#include <vcl/button.hxx>
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
diff --git a/chart2/source/controller/inc/dlg_CreationWizard.hxx b/chart2/source/controller/inc/dlg_CreationWizard.hxx
index fbf64b6..0b9739b 100644
--- a/chart2/source/controller/inc/dlg_CreationWizard.hxx
+++ b/chart2/source/controller/inc/dlg_CreationWizard.hxx
@@ -28,7 +28,6 @@
#include <svtools/roadmapwizard.hxx>
#include <com/sun/star/uno/XComponentContext.hpp>
-// for auto_ptr
#include <memory>
namespace chart
diff --git a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx
index 5bb42e9..4d4b8c0 100644
--- a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx
+++ b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx
@@ -32,7 +32,6 @@
#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-// header for define DECL_LINK
#include <tools/link.hxx>
#include <vcl/vclevent.hxx>
diff --git a/chart2/source/controller/inc/dlg_DataSource.hxx b/chart2/source/controller/inc/dlg_DataSource.hxx
index a960e56..6341fe0 100644
--- a/chart2/source/controller/inc/dlg_DataSource.hxx
+++ b/chart2/source/controller/inc/dlg_DataSource.hxx
@@ -19,19 +19,14 @@
#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DLG_DATASOURCE_HXX
#define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DLG_DATASOURCE_HXX
-// header for class TabDialog
#include <vcl/tabdlg.hxx>
-// header for class TabControl
#include <vcl/tabctrl.hxx>
-// header for class OKButton
#include <vcl/button.hxx>
-
#include "TabPageNotifiable.hxx"
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/chart2/XChartDocument.hpp>
-// for auto_ptr
#include <memory>
namespace chart
diff --git a/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx b/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx
index 30ae588..82636bc 100644
--- a/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx
+++ b/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx
@@ -19,11 +19,8 @@
#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DLG_INSERTAXIS_GRID_HXX
#define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DLG_INSERTAXIS_GRID_HXX
-// header for class ModalDialog
#include <vcl/dialog.hxx>
-// header for class FixedLine
#include <vcl/fixed.hxx>
-// header for class CheckBox
#include <vcl/button.hxx>
#include <com/sun/star/uno/Sequence.hxx>
diff --git a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx
index 3117075..35268d4 100644
--- a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx
+++ b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx
@@ -19,11 +19,8 @@
#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DLG_INSERTDATALABEL_HXX
#define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DLG_INSERTDATALABEL_HXX
-// header for class ModalDialog
#include <vcl/dialog.hxx>
-// header for class CheckBox
#include <vcl/button.hxx>
-// header for class SfxItemSet
#include <svl/itemset.hxx>
#include <boost/scoped_ptr.hpp>
diff --git a/chart2/source/controller/inc/dlg_View3D.hxx b/chart2/source/controller/inc/dlg_View3D.hxx
index 7ffa768..6cc6408 100644
--- a/chart2/source/controller/inc/dlg_View3D.hxx
+++ b/chart2/source/controller/inc/dlg_View3D.hxx
@@ -22,11 +22,8 @@
#include <com/sun/star/drawing/ShadeMode.hpp>
#include <com/sun/star/frame/XModel.hpp>
-// header for class TabDialog
#include <vcl/tabdlg.hxx>
-// header for class TabControl
#include <vcl/tabctrl.hxx>
-// header for class XColorList
#include <svx/xtable.hxx>
#include "ControllerLockGuard.hxx"
diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
index 6a15e71..ee25d44 100644
--- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
@@ -37,11 +37,8 @@
#include <com/sun/star/chart2/AxisOrientation.hpp>
#include <com/sun/star/chart2/AxisType.hpp>
-// for SfxBoolItem
#include <svl/eitem.hxx>
-// for SvxDoubleItem
#include <svx/chrtitem.hxx>
-// for SfxInt32Item
#include <svl/intitem.hxx>
#include <rtl/math.hxx>
diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
index 57643b7..f03c410 100644
--- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
@@ -34,19 +34,15 @@
#include <com/sun/star/chart2/DataPointLabel.hpp>
#include <com/sun/star/chart2/Symbol.hpp>
-// header for class XFillColorItem
#include <svx/xflclit.hxx>
#include <svl/intitem.hxx>
#include <editeng/sizeitem.hxx>
-// header for class SfxStringItem
#include <svl/stritem.hxx>
#include <editeng/brushitem.hxx>
-//SfxIntegerListItem
#include <svl/ilstitem.hxx>
#include <vcl/graph.hxx>
#include <com/sun/star/graphic/XGraphic.hpp>
-// for SVX_SYMBOLTYPE_...
#include <svx/tabline.hxx>
#include <functional>
diff --git a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
index 65263e1..f7e03ff 100644
--- a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
@@ -36,9 +36,7 @@
#include <svx/xfltrit.hxx>
#include <svx/xlntrit.hxx>
#include <editeng/eeitem.hxx>
-// for SfxBoolItem
#include <svl/eitem.hxx>
-// for XFillGradientStepCountItem
#include <svx/xgrscit.hxx>
#include <com/sun/star/beans/XPropertyState.hpp>
#include <com/sun/star/chart2/FillBitmap.hpp>
diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
index 6c35654..74bf8a2 100644
--- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
@@ -22,7 +22,6 @@
#include <com/sun/star/lang/XComponent.hpp>
#include <svl/itemprop.hxx>
#include <svl/itemiter.hxx>
-// header for class SfxWhichIter
#include <svl/whiter.hxx>
#include <svx/svxids.hrc>
diff --git a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
index 9181867..df4b19b 100644
--- a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
@@ -26,7 +26,6 @@
#include <com/sun/star/chart2/XRegressionCurve.hpp>
-// for SfxBoolItem
#include <svl/eitem.hxx>
#include <svl/intitem.hxx>
#include <svl/stritem.hxx>
diff --git a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
index 34042ca..362f3d9 100644
--- a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
@@ -33,14 +33,11 @@
#include <com/sun/star/chart/MissingValueTreatment.hpp>
#include <com/sun/star/chart2/XDataSeries.hpp>
-// for SfxBoolItem
#include <svl/eitem.hxx>
#include <svl/intitem.hxx>
-
-//SfxIntegerListItem
#include <svl/ilstitem.hxx>
-
#include <rtl/math.hxx>
+
#include <functional>
#include <algorithm>
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index b711d6b..aaf3223 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -59,10 +59,7 @@
#include <com/sun/star/document/XUndoManagerSupplier.hpp>
#include <com/sun/star/document/XUndoAction.hpp>
-
-// header for define RET_OK
#include <vcl/msgbox.hxx>
-
#include <toolkit/awt/vclxwindow.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/svapp.hxx>
diff --git a/chart2/source/controller/main/ChartController_EditData.cxx b/chart2/source/controller/main/ChartController_EditData.cxx
index ec72c7c..c87f167 100644
--- a/chart2/source/controller/main/ChartController_EditData.cxx
+++ b/chart2/source/controller/main/ChartController_EditData.cxx
@@ -28,7 +28,6 @@
#include "ResId.hxx"
#include "Strings.hrc"
-// for RET_OK
#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
#include <osl/mutex.hxx>
diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx
index ea435b6..dff59c8 100644
--- a/chart2/source/controller/main/ChartController_Insert.cxx
+++ b/chart2/source/controller/main/ChartController_Insert.cxx
@@ -55,13 +55,9 @@
#include <com/sun/star/chart/ErrorBarStyle.hpp>
#include <svx/ActionDescriptionProvider.hxx>
-// header for define RET_OK
#include <vcl/msgbox.hxx>
-// header for class OUStringBuffer
#include <rtl/ustrbuf.hxx>
-// header for class Application
#include <vcl/svapp.hxx>
-// header for class ::vos::OGuard
#include <osl/mutex.hxx>
using namespace ::com::sun::star;
diff --git a/chart2/source/controller/main/ChartController_Position.cxx b/chart2/source/controller/main/ChartController_Position.cxx
index e77fa95..f83a149 100644
--- a/chart2/source/controller/main/ChartController_Position.cxx
+++ b/chart2/source/controller/main/ChartController_Position.cxx
@@ -32,7 +32,6 @@
#include "CommonConverters.hxx"
#include <svx/ActionDescriptionProvider.hxx>
-// header for define RET_OK
#include <vcl/msgbox.hxx>
#include <svx/svxids.hrc>
#include <svx/rectenum.hxx>
diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx
index 5c05794..dd2e0fa3 100644
--- a/chart2/source/controller/main/ChartController_Properties.cxx
+++ b/chart2/source/controller/main/ChartController_Properties.cxx
@@ -52,12 +52,9 @@
#include "RegressionCurveHelper.hxx"
#include <com/sun/star/chart2/XChartDocument.hpp>
-//for auto_ptr
#include <memory>
-// header for define RET_OK
#include <vcl/msgbox.hxx>
-// for SolarMutex
#include <vcl/svapp.hxx>
#include <osl/mutex.hxx>
#include <svx/ActionDescriptionProvider.hxx>
diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx
index 729c816..c9ae457 100644
--- a/chart2/source/controller/main/ChartController_TextEdit.cxx
+++ b/chart2/source/controller/main/ChartController_TextEdit.cxx
@@ -32,10 +32,7 @@
#include "chartview/DrawModelWrapper.hxx"
#include <svx/svdotext.hxx>
-
-// header for define RET_OK
#include <vcl/msgbox.hxx>
-// header for class SdrOutliner
#include <svx/svdoutl.hxx>
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx
index 1fbd176..ff61697 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -52,24 +52,16 @@
#include <com/sun/star/chart/ErrorBarStyle.hpp>
#include <svx/ActionDescriptionProvider.hxx>
-// for TransferableDataHelper/TransferableHelper
#include <svtools/transfer.hxx>
-// for SotStorageStreamRef
#include <sot/storage.hxx>
-// for Graphic
#include <vcl/graph.hxx>
-// for SvxDrawingLayerImport/SvxUnoDrawingModel
#include <svx/unomodel.hxx>
-// for SdrModel
#include <svx/svdmodel.hxx>
-// for OInputStreamWrapper
#include <unotools/streamwrap.hxx>
-// for SolarMutex
#include <vcl/svapp.hxx>
#include <osl/mutex.hxx>
#include <svx/dialmgr.hxx>
#include <svx/dialogs.hrc>
-// for OutlinerView
#include <editeng/outliner.hxx>
#include <svx/svditer.hxx>
#include <svx/svdpage.hxx>
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index aded435..a60f172 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -62,19 +62,13 @@
#include <svx/svxids.hrc>
#include <svx/ActionDescriptionProvider.hxx>
-// header for class E3dObject
#include <svx/obj3d.hxx>
-// header for class E3dScene
#include <svx/scene3d.hxx>
-// header for class SdrDragMethod
#include <svx/svddrgmt.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <osl/mutex.hxx>
-
-// for InfoBox
#include <vcl/msgbox.hxx>
-
#include <rtl/math.hxx>
#include <svtools/acceleratorexecute.hxx>
diff --git a/chart2/source/controller/main/ChartDropTargetHelper.hxx b/chart2/source/controller/main/ChartDropTargetHelper.hxx
index fca3b87..cbb9934 100644
--- a/chart2/source/controller/main/ChartDropTargetHelper.hxx
+++ b/chart2/source/controller/main/ChartDropTargetHelper.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_MAIN_CHARTDROPTARGETHELPER_HXX
#define INCLUDED_CHART2_SOURCE_CONTROLLER_MAIN_CHARTDROPTARGETHELPER_HXX
-// for DropTargetHelper
#include <svtools/transfer.hxx>
namespace com { namespace sun { namespace star {
diff --git a/chart2/source/controller/main/ChartTransferable.cxx b/chart2/source/controller/main/ChartTransferable.cxx
index a04d755..20f46ac 100644
--- a/chart2/source/controller/main/ChartTransferable.cxx
+++ b/chart2/source/controller/main/ChartTransferable.cxx
@@ -28,8 +28,6 @@
#include <svx/svdmodel.hxx>
#include <svx/svdpage.hxx>
#include <svx/unomodel.hxx>
-
-// header for class SdrView
#include <svx/svdview.hxx>
#define CHARTTRANSFER_OBJECTTYPE_DRAWMODEL 1
diff --git a/chart2/source/controller/main/ConfigurationAccess.cxx b/chart2/source/controller/main/ConfigurationAccess.cxx
index 96c13df..50f638a 100644
--- a/chart2/source/controller/main/ConfigurationAccess.cxx
+++ b/chart2/source/controller/main/ConfigurationAccess.cxx
@@ -20,11 +20,8 @@
#include "ConfigurationAccess.hxx"
#include "macros.hxx"
-// header for class SvtSysLocale
#include <unotools/syslocale.hxx>
-// header for class ConfigItem
#include <unotools/configitem.hxx>
-// header for rtl::Static
#include <rtl/instance.hxx>
namespace chart
diff --git a/chart2/source/controller/main/DragMethod_Base.cxx b/chart2/source/controller/main/DragMethod_Base.cxx
index 6da22f5..f0213a9 100644
--- a/chart2/source/controller/main/DragMethod_Base.cxx
+++ b/chart2/source/controller/main/DragMethod_Base.cxx
@@ -24,8 +24,8 @@
#include "macros.hxx"
#include "ObjectNameProvider.hxx"
#include "ObjectIdentifier.hxx"
+
#include <rtl/math.hxx>
-//header for class SdrPageView
#include <svx/svdpagv.hxx>
#include <svx/ActionDescriptionProvider.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/chart2/source/controller/main/DragMethod_Base.hxx b/chart2/source/controller/main/DragMethod_Base.hxx
index dbc33d1..a068a01 100644
--- a/chart2/source/controller/main/DragMethod_Base.hxx
+++ b/chart2/source/controller/main/DragMethod_Base.hxx
@@ -21,10 +21,7 @@
#include "DrawViewWrapper.hxx"
#include <svx/ActionDescriptionProvider.hxx>
-// header for class SdrDragMethod
#include <svx/svddrgmt.hxx>
-
-// header for class WeakReference
#include <cppuhelper/weakref.hxx>
namespace chart
diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
index 9daa3db..eb0ea60 100644
--- a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
+++ b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
@@ -30,7 +30,6 @@
#include <svx/sdr/overlay/overlaypolypolygon.hxx>
#include <svx/sdr/overlay/overlaymanager.hxx>
-// header for class E3dScene
#include <svx/scene3d.hxx>
#include <basegfx/matrix/b3dhommatrix.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.hxx b/chart2/source/controller/main/DragMethod_RotateDiagram.hxx
index 98825df..919fec0 100644
--- a/chart2/source/controller/main/DragMethod_RotateDiagram.hxx
+++ b/chart2/source/controller/main/DragMethod_RotateDiagram.hxx
@@ -21,7 +21,6 @@
#include "DragMethod_Base.hxx"
-// header for class ::basegfx::B3DPolyPolygon
#include <basegfx/polygon/b3dpolypolygon.hxx>
namespace chart
diff --git a/chart2/source/controller/main/PositionAndSizeHelper.cxx b/chart2/source/controller/main/PositionAndSizeHelper.cxx
index 7b7f255..5283348 100644
--- a/chart2/source/controller/main/PositionAndSizeHelper.cxx
+++ b/chart2/source/controller/main/PositionAndSizeHelper.cxx
@@ -27,7 +27,6 @@
#include <com/sun/star/chart2/RelativeSize.hpp>
#include "chartview/ExplicitValueProvider.hxx"
-// header for class Rectangle
#include <tools/gen.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx
index cb264ea..486f5a6 100644
--- a/chart2/source/controller/main/SelectionHelper.cxx
+++ b/chart2/source/controller/main/SelectionHelper.cxx
@@ -23,11 +23,9 @@
#include "DiagramHelper.hxx"
#include "ChartModelHelper.hxx"
-// header for class SdrObjList
#include <svx/svdpage.hxx>
#include <svx/svditer.hxx>
#include "svx/obj3d.hxx"
-// header for class SdrPathObj
#include <svx/svdopath.hxx>
#include <vcl/svapp.hxx>
#include <osl/mutex.hxx>
diff --git a/chart2/source/controller/main/SelectionHelper.hxx b/chart2/source/controller/main/SelectionHelper.hxx
index 3a57622..9a5f565 100644
--- a/chart2/source/controller/main/SelectionHelper.hxx
+++ b/chart2/source/controller/main/SelectionHelper.hxx
@@ -23,7 +23,6 @@
#include "ObjectIdentifier.hxx"
class SdrObject;
-// header for enum SdrDragMode
#include <svx/svdtypes.hxx>
#include <com/sun/star/drawing/XShape.hpp>
diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx b/chart2/source/controller/main/UndoCommandDispatch.cxx
index 09ca819..88e700a 100644
--- a/chart2/source/controller/main/UndoCommandDispatch.cxx
+++ b/chart2/source/controller/main/UndoCommandDispatch.cxx
@@ -28,7 +28,6 @@
#include <vcl/svapp.hxx>
#include <tools/diagnose_ex.h>
-// for resource strings STR_UNDO and STR_REDO
#include <svtools/svtools.hrc>
#include <svtools/svtresid.hxx>
diff --git a/chart2/source/inc/LegendHelper.hxx b/chart2/source/inc/LegendHelper.hxx
index e30297c..daed677 100644
--- a/chart2/source/inc/LegendHelper.hxx
+++ b/chart2/source/inc/LegendHelper.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_CHART2_SOURCE_INC_LEGENDHELPER_HXX
#define INCLUDED_CHART2_SOURCE_INC_LEGENDHELPER_HXX
-// header for class OUString
#include <rtl/ustring.hxx>
#include <com/sun/star/chart2/XLegend.hpp>
#include <com/sun/star/chart2/XDiagram.hpp>
diff --git a/chart2/source/inc/ModifyListenerCallBack.hxx b/chart2/source/inc/ModifyListenerCallBack.hxx
index 8e2b790..de6412c 100644
--- a/chart2/source/inc/ModifyListenerCallBack.hxx
+++ b/chart2/source/inc/ModifyListenerCallBack.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_CHART2_SOURCE_INC_MODIFYLISTENERCALLBACK_HXX
#define INCLUDED_CHART2_SOURCE_INC_MODIFYLISTENERCALLBACK_HXX
-// header for class Link
#include <tools/link.hxx>
#include <com/sun/star/util/XModifyBroadcaster.hpp>
#include <com/sun/star/util/XModifyListener.hpp>
diff --git a/chart2/source/inc/ObjectIdentifier.hxx b/chart2/source/inc/ObjectIdentifier.hxx
index 01809de..d30a00d 100644
--- a/chart2/source/inc/ObjectIdentifier.hxx
+++ b/chart2/source/inc/ObjectIdentifier.hxx
@@ -28,7 +28,6 @@
#include "charttoolsdllapi.hxx"
#include "ChartModel.hxx"
-// header for class OUString
#include <rtl/ustring.hxx>
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/chart2/source/inc/WrappedPropertySet.hxx b/chart2/source/inc/WrappedPropertySet.hxx
index 5fa0d63..e3b1446 100644
--- a/chart2/source/inc/WrappedPropertySet.hxx
+++ b/chart2/source/inc/WrappedPropertySet.hxx
@@ -28,8 +28,6 @@
#include <com/sun/star/beans/XPropertyState.hpp>
#include <com/sun/star/beans/Property.hpp>
#include <cppuhelper/implbase4.hxx>
-
-// header for class OPropertyArrayHelper, OMultiTypeInterfaceContainerHelperInt32
#include <cppuhelper/propshlp.hxx>
#include <vector>
diff --git a/chart2/source/inc/chartview/DrawModelWrapper.hxx b/chart2/source/inc/chartview/DrawModelWrapper.hxx
index 4d13598..986a6b9 100644
--- a/chart2/source/inc/chartview/DrawModelWrapper.hxx
+++ b/chart2/source/inc/chartview/DrawModelWrapper.hxx
@@ -19,12 +19,9 @@
#ifndef INCLUDED_CHART2_SOURCE_INC_CHARTVIEW_DRAWMODELWRAPPER_HXX
#define INCLUDED_CHART2_SOURCE_INC_CHARTVIEW_DRAWMODELWRAPPER_HXX
-
#include <svx/svdmodel.hxx>
-// header for class SdrObject
#include <svx/svdobj.hxx>
-
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/drawing/XDrawPage.hpp>
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx
index 237c4e8..f459bc9 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -22,17 +22,12 @@
#include "MediaDescriptorHelper.hxx"
#include "ContainerHelper.hxx"
-// for ERRCODE_SFX_GENERAL etc.
-// header contains only macros
#include <svtools/sfxecode.hxx>
-// header for class SvtSaveOptions
#include <unotools/saveopt.hxx>
#include <comphelper/genericpropertyset.hxx>
-// header for struct PropertyMapEntry
#include <comphelper/propertysetinfo.hxx>
#include <comphelper/documentconstants.hxx>
-// header for class SotStorage
#include <sot/storage.hxx>
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/chart2/source/model/inc/XMLFilter.hxx b/chart2/source/model/inc/XMLFilter.hxx
index 500e6be..ad316d0 100644
--- a/chart2/source/model/inc/XMLFilter.hxx
+++ b/chart2/source/model/inc/XMLFilter.hxx
@@ -30,7 +30,6 @@
#include <com/sun/star/xml/sax/XWriter.hpp>
#include <osl/mutex.hxx>
-// for APPHELPER_... macros
#include "ServiceMacros.hxx"
namespace com { namespace sun { namespace star {
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index 8468ecf..1b725ac 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -38,7 +38,6 @@
#include <comphelper/InlineContainer.hxx>
#include <comphelper/processfactory.hxx>
-// header for class SvNumberFormatsSupplierObj
#include <svl/numuno.hxx>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
@@ -60,7 +59,6 @@
#include <com/sun/star/document/DocumentProperties.hpp>
#include <com/sun/star/chart2/XTimeBased.hpp>
-// header for class SvNumberFormatter
#include <svl/zforlist.hxx>
using ::com::sun::star::uno::Sequence;
diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx
index 6001094..d5e6db4 100644
--- a/chart2/source/tools/AxisHelper.cxx
+++ b/chart2/source/tools/AxisHelper.cxx
@@ -39,7 +39,6 @@
#include <com/sun/star/chart2/XDataSeriesContainer.hpp>
#include <com/sun/star/chart2/data/XDataSource.hpp>
-// header for class OUStringBuffer
#include <rtl/ustrbuf.hxx>
#include <rtl/math.hxx>
diff --git a/chart2/source/tools/CharacterProperties.cxx b/chart2/source/tools/CharacterProperties.cxx
index 5aac560..2918d60 100644
--- a/chart2/source/tools/CharacterProperties.cxx
+++ b/chart2/source/tools/CharacterProperties.cxx
@@ -41,7 +41,6 @@
#include <comphelper/InlineContainer.hxx>
-// header for struct SvtLinguConfig
#include <unotools/lingucfg.hxx>
#include <i18nlangtag/mslangid.hxx>
#include <i18nlangtag/languagetag.hxx>
diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx
index 8d853cc..27d3c7c 100644
--- a/chart2/source/tools/DiagramHelper.cxx
+++ b/chart2/source/tools/DiagramHelper.cxx
@@ -55,7 +55,6 @@
#include <unotools/saveopt.hxx>
#include <rtl/math.hxx>
#include <svl/zformat.hxx>
-// header for class Application
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
diff --git a/chart2/source/tools/NumberFormatterWrapper.cxx b/chart2/source/tools/NumberFormatterWrapper.cxx
index f543f27..cef25c2 100644
--- a/chart2/source/tools/NumberFormatterWrapper.cxx
+++ b/chart2/source/tools/NumberFormatterWrapper.cxx
@@ -20,9 +20,7 @@
#include "NumberFormatterWrapper.hxx"
#include "macros.hxx"
#include <comphelper/processfactory.hxx>
-// header for class SvNumberFormatsSupplierObj
#include <svl/numuno.hxx>
-// header for class SvNumberformat
#include <svl/zformat.hxx>
#include <tools/color.hxx>
#include <i18nlangtag/mslangid.hxx>
diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx
index fcad9f0..c681b86 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -32,7 +32,6 @@
#include <com/sun/star/chart2/XAxis.hpp>
#include <com/sun/star/chart2/XRegressionCurveContainer.hpp>
-// header for define DBG_ASSERT
#include <tools/debug.hxx>
#include <comphelper/InlineContainer.hxx>
diff --git a/chart2/source/tools/WrappedPropertySet.cxx b/chart2/source/tools/WrappedPropertySet.cxx
index 86c4195..4ef8e87 100644
--- a/chart2/source/tools/WrappedPropertySet.cxx
+++ b/chart2/source/tools/WrappedPropertySet.cxx
@@ -20,7 +20,6 @@
#include "WrappedPropertySet.hxx"
#include "macros.hxx"
-// header for define DELETEZ
#include <tools/solar.h>
namespace chart
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 0aaf199..c686911 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -59,7 +59,6 @@
#include <com/sun/star/chart2/RelativePosition.hpp>
#include <editeng/unoprnms.hxx>
#include <tools/color.hxx>
-// header for class OUStringBuffer
#include <rtl/ustrbuf.hxx>
#include <rtl/math.hxx>
#include <basegfx/vector/b2dvector.hxx>
diff --git a/chart2/source/view/diagram/VDiagram.cxx b/chart2/source/view/diagram/VDiagram.cxx
index 966100b..e04418c 100644
--- a/chart2/source/view/diagram/VDiagram.cxx
+++ b/chart2/source/view/diagram/VDiagram.cxx
@@ -36,9 +36,7 @@
#include <com/sun/star/drawing/ShadeMode.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
-// header for class SvxShape
#include <svx/unoshape.hxx>
-// header for class E3dScene
#include <svx/scene3d.hxx>
#include <svx/e3dsceneupdater.hxx>
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index c530354..8bb5b2f 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -58,15 +58,10 @@
#include <comphelper/servicehelper.hxx>
#include <boost/bind.hpp>
#include <unotools/streamwrap.hxx>
-// header for class LocaleDataWrapper
#include <unotools/localedatawrapper.hxx>
-// header for class SdrPage
#include <svx/svdpage.hxx>
-// header for class SvxDrawPage
#include <svx/unopage.hxx>
-// header for class SvxShape
#include <svx/unoshape.hxx>
-// header for class Application
#include <vcl/svapp.hxx>
#include <osl/mutex.hxx>
#include <svx/unofill.hxx>
diff --git a/chart2/source/view/main/DrawModelWrapper.cxx b/chart2/source/view/main/DrawModelWrapper.cxx
index 6d6954c..7b5d0a1 100644
--- a/chart2/source/view/main/DrawModelWrapper.cxx
+++ b/chart2/source/view/main/DrawModelWrapper.cxx
@@ -24,29 +24,17 @@
#include "ObjectIdentifier.hxx"
#include <svx/unomodel.hxx>
#include <svl/itempool.hxx>
-// header for class SfxBoolItem
#include <svl/eitem.hxx>
-// header for define EE_PARA_HYPHENATE
#include <editeng/eeitem.hxx>
-// header for class Svx3DPercentDiagonalItem
#include <svx/svx3ditems.hxx>
-// header for class SvtPathOptions
#include <unotools/pathoptions.hxx>
-// header E3dObjFactory
#include <svx/objfac3d.hxx>
-// header for class SdrObjList
#include <svx/svdpage.hxx>
-// header for SvxUnoXDashTable_createInstance
#include <svx/XPropertyTable.hxx>
-// header for class XDashList
#include <svx/xtable.hxx>
-// header for class SdrOutliner
#include <svx/svdoutl.hxx>
-// header for class LinguMgr
#include <editeng/unolingu.hxx>
-// header for class Application
#include <vcl/svapp.hxx>
-// header for class VirtualDevice
#include <vcl/virdev.hxx>
#include <com/sun/star/container/XChild.hpp>
diff --git a/connectivity/qa/connectivity/ado/DriverTest.cxx b/connectivity/qa/connectivity/ado/DriverTest.cxx
index 82c63b6..80753fa 100644
--- a/connectivity/qa/connectivity/ado/DriverTest.cxx
+++ b/connectivity/qa/connectivity/ado/DriverTest.cxx
@@ -9,10 +9,6 @@
#include <test/bootstrapfixture.hxx>
-//#include "ado/ADriver.hxx"
-//#include "ado/AConnection.hxx"
-//#include <com/sun/star/sdbc/XDriver.hpp>
-
#include "ado/AConnection.hxx"
#include "ado/ADatabaseMetaData.hxx"
#include "ado/ADriver.hxx"
diff --git a/connectivity/source/manager/mdrivermanager.hxx b/connectivity/source/manager/mdrivermanager.hxx
index 8f560a4..6d41d0a 100644
--- a/connectivity/source/manager/mdrivermanager.hxx
+++ b/connectivity/source/manager/mdrivermanager.hxx
@@ -30,7 +30,6 @@
#include <com/sun/star/uno/XNamingService.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/sdbc/XDriverAccess.hpp>
-//#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/lang/XSingleComponentFactory.hpp>
#include <cppuhelper/implbase3.hxx>
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index 8ba9af1..d97856e 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -24,7 +24,6 @@
#include <vcl/fixed.hxx>
-// #i75273#
#include <basegfx/range/b2drange.hxx>
// predefines
diff --git a/cui/source/options/cfgchart.hxx b/cui/source/options/cfgchart.hxx
index 134661a..0a0ad21 100644
--- a/cui/source/options/cfgchart.hxx
+++ b/cui/source/options/cfgchart.hxx
@@ -20,13 +20,9 @@
#ifndef INCLUDED_CUI_SOURCE_OPTIONS_CFGCHART_HXX
#define INCLUDED_CUI_SOURCE_OPTIONS_CFGCHART_HXX
-// header for TYPEINFO
#include <tools/rtti.hxx>
-// header for ConfigItem
#include <unotools/configitem.hxx>
-// header for SfxPoolItem
#include <svl/poolitem.hxx>
-// header for XColorEntry
#include <svx/xtable.hxx>
#include <vector>
diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx
index b159267..5590d5a 100644
--- a/cui/source/options/optchart.hxx
+++ b/cui/source/options/optchart.hxx
@@ -20,16 +20,11 @@
#ifndef INCLUDED_CUI_SOURCE_OPTIONS_OPTCHART_HXX
#define INCLUDED_CUI_SOURCE_OPTIONS_OPTCHART_HXX
-// header for SfxTabPage
#include <sfx2/tabdlg.hxx>
#include <vcl/fixed.hxx>
-// header for ValueSet
#include <svtools/valueset.hxx>
-// header for ColorLB
#include <svx/dlgctrl.hxx>
-// header for PushButton
#include <vcl/button.hxx>
-// header for XColorList
#include <svx/xtable.hxx>
#include "cfgchart.hxx"
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 653c603..d151e2f 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -52,7 +52,6 @@
#include <sfx2/htmlmode.hxx>
#include <svx/svxids.hrc>
-// for security TP
#include <com/sun/star/security/DocumentDigitalSignatures.hpp>
#ifdef UNX
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 24c2edc..7484ea0 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -50,8 +50,6 @@
#include <editeng/eerdll.hxx>
#include <editeng/editrids.hrc>
#include <svx/svxids.hrc>
-
-// #i4219#
#include <svtools/optionsdrawinglayer.hxx>
#include <svl/slstitm.hxx>
#include <svl/aeitem.hxx>
diff --git a/dbaccess/source/ui/misc/linkeddocuments.cxx b/dbaccess/source/ui/misc/linkeddocuments.cxx
index 4ead10d..e3bff76 100644
--- a/dbaccess/source/ui/misc/linkeddocuments.cxx
+++ b/dbaccess/source/ui/misc/linkeddocuments.cxx
@@ -43,7 +43,6 @@
#include "browserids.hxx"
#include <sfx2/new.hxx>
#include "moduledbu.hxx"
-// for calling basic
#include <sfx2/app.hxx>
#include <basic/sbx.hxx>
#include <basic/sbuno.hxx>
diff --git a/desktop/source/splash/unxsplash.cxx b/desktop/source/splash/unxsplash.cxx
index c084b2f..0673286 100644
--- a/desktop/source/splash/unxsplash.cxx
+++ b/desktop/source/splash/unxsplash.cxx
@@ -20,7 +20,6 @@
#include "unxsplash.hxx"
#include <stdio.h>
#include <osl/process.h>
-//#include <com/sun/star/registry/XRegistryKey.hpp>
#include <cppuhelper/implementationentry.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <rtl/ustrbuf.hxx>
diff --git a/embeddedobj/source/msole/olevisual.cxx b/embeddedobj/source/msole/olevisual.cxx
index 76ed05d..b50c031 100644
--- a/embeddedobj/source/msole/olevisual.cxx
+++ b/embeddedobj/source/msole/olevisual.cxx
@@ -26,7 +26,6 @@
#include <com/sun/star/embed/NoVisualAreaSizeException.hpp>
#include <oleembobj.hxx>
-//#include <olecomponent.hxx>
#include <comphelper/mimeconfighelper.hxx>
#include <comphelper/seqstream.hxx>
diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx
index 8f12b06..34e1f5e 100644
--- a/extensions/source/scanner/grid.cxx
+++ b/extensions/source/scanner/grid.cxx
@@ -27,7 +27,6 @@
#include <grid.hxx>
-// for ::std::sort
#include <algorithm>
#include <boost/scoped_array.hpp>
diff --git a/filter/source/flash/swfwriter.hxx b/filter/source/flash/swfwriter.hxx
index 9cac131..c65388f 100644
--- a/filter/source/flash/swfwriter.hxx
+++ b/filter/source/flash/swfwriter.hxx
@@ -30,8 +30,6 @@
#include <tools/poly.hxx>
#include <tools/gen.hxx>
#include <tools/stream.hxx>
-
-// #i73264#
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <osl/file.hxx>
diff --git a/include/comphelper/scoped_disposing_ptr.hxx b/include/comphelper/scoped_disposing_ptr.hxx
index 033307b..ff249ab 100644
--- a/include/comphelper/scoped_disposing_ptr.hxx
+++ b/include/comphelper/scoped_disposing_ptr.hxx
@@ -17,7 +17,6 @@
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/frame/XDesktop.hpp>
-// for locking SolarMutex: svapp + mutex
#include <vcl/svapp.hxx>
#include <osl/mutex.hxx>
diff --git a/include/svx/ActionDescriptionProvider.hxx b/include/svx/ActionDescriptionProvider.hxx
index bacbe7e..3dc39fe 100644
--- a/include/svx/ActionDescriptionProvider.hxx
+++ b/include/svx/ActionDescriptionProvider.hxx
@@ -22,7 +22,6 @@
#include <svx/svxdllapi.h>
-// header for class OUString
#include <rtl/ustring.hxx>
diff --git a/include/svx/formatpaintbrushctrl.hxx b/include/svx/formatpaintbrushctrl.hxx
index d5d47c0..8760cf8 100644
--- a/include/svx/formatpaintbrushctrl.hxx
+++ b/include/svx/formatpaintbrushctrl.hxx
@@ -20,9 +20,7 @@
#ifndef INCLUDED_SVX_FORMATPAINTBRUSHCTRL_HXX
#define INCLUDED_SVX_FORMATPAINTBRUSHCTRL_HXX
-// header for class SfxToolBoxControl
#include <sfx2/tbxctrl.hxx>
-// header for class Timer
#include <vcl/timer.hxx>
#include <svx/svxdllapi.h>
diff --git a/include/vcl/IconThemeInfo.hxx b/include/vcl/IconThemeInfo.hxx
index 3e1cc30..8d9c0e3 100644
--- a/include/vcl/IconThemeInfo.hxx
+++ b/include/vcl/IconThemeInfo.hxx
@@ -11,7 +11,6 @@
#define INCLUDED_VCL_ICONTHEMEINFO_HXX
#include <vcl/dllapi.h>
-// for Size
#include <tools/gen.hxx>
#include <rtl/ustring.hxx>
diff --git a/include/vcl/slider.hxx b/include/vcl/slider.hxx
index 92b2a56..b0ce530 100644
--- a/include/vcl/slider.hxx
+++ b/include/vcl/slider.hxx
@@ -22,7 +22,6 @@
#include <vcl/dllapi.h>
#include <vcl/ctrl.hxx>
-// for enum ScrollType
#include <vcl/scrbar.hxx>
class VCL_DLLPUBLIC Slider : public Control
diff --git a/include/xmloff/xmlerror.hxx b/include/xmloff/xmlerror.hxx
index baf5e6a..8b62119 100644
--- a/include/xmloff/xmlerror.hxx
+++ b/include/xmloff/xmlerror.hxx
@@ -23,7 +23,6 @@
#include <com/sun/star/xml/sax/SAXParseException.hpp>
#include <sal/types.h>
-// STL includes
#include <vector>
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx
index 1b6eebb..7944be6 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -52,7 +52,6 @@
#include <com/sun/star/report/XFixedLine.hpp>
#include <com/sun/star/frame/XController.hpp>
#include "RptDef.hxx"
-// for locking SolarMutex: svapp + mutex
#include <vcl/svapp.hxx>
#include <osl/mutex.hxx>
#include <sal/macros.h>
diff --git a/sal/qa/osl/security/osl_Security.cxx b/sal/qa/osl/security/osl_Security.cxx
index 15089c3..b675ab1 100644
--- a/sal/qa/osl/security/osl_Security.cxx
+++ b/sal/qa/osl/security/osl_Security.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-// header file
-
#ifdef WNT
#include <windows.h>
#undef min
diff --git a/sc/source/filter/excel/colrowst.cxx b/sc/source/filter/excel/colrowst.cxx
index c048ab8..cc447e2 100644
--- a/sc/source/filter/excel/colrowst.cxx
+++ b/sc/source/filter/excel/colrowst.cxx
@@ -28,8 +28,6 @@
#include "xistream.hxx"
#include "xistyle.hxx"
#include "queryparam.hxx"
-
-// for filter manager
#include "excimp8.hxx"
const sal_uInt8 EXC_COLROW_USED = 0x01;
diff --git a/sc/source/filter/excel/xename.cxx b/sc/source/filter/excel/xename.cxx
index ec3916d..005ec4b 100644
--- a/sc/source/filter/excel/xename.cxx
+++ b/sc/source/filter/excel/xename.cxx
@@ -28,8 +28,6 @@
#include "xehelper.hxx"
#include "xelink.hxx"
#include "globalnames.hxx"
-
-// for filter manager
#include "excrecds.hxx"
#include <formula/grammar.hxx>
diff --git a/sc/source/filter/excel/xiname.cxx b/sc/source/filter/excel/xiname.cxx
index 5defaec..0c75adf 100644
--- a/sc/source/filter/excel/xiname.cxx
+++ b/sc/source/filter/excel/xiname.cxx
@@ -20,10 +20,7 @@
#include "xiname.hxx"
#include "rangenam.hxx"
#include "xistream.hxx"
-
-// for formula compiler
#include "excform.hxx"
-// for filter manager
#include "excimp8.hxx"
#include "scextopt.hxx"
#include "document.hxx"
diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
index 698b865..5fd7c97 100644
--- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
@@ -46,7 +46,6 @@
#include <svtools/colorcfg.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
-// ause
#include "editutil.hxx"
using ::utl::AccessibleRelationSetHelper;
diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index 81076c0..8b64728 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -49,7 +49,6 @@
#include "clipdata.hxx"
#include "clipparam.hxx"
-// for InitDocShell
#include <editeng/paperinf.hxx>
#include <editeng/sizeitem.hxx>
#include <svx/algitem.hxx>
diff --git a/sc/source/ui/app/typemap.cxx b/sc/source/ui/app/typemap.cxx
index c4eb778..973d63f 100644
--- a/sc/source/ui/app/typemap.cxx
+++ b/sc/source/ui/app/typemap.cxx
@@ -91,10 +91,7 @@
#include <svx/xlinjoit.hxx>
#include <svx/AffineMatrixItem.hxx>
#include <svx/galleryitem.hxx>
-
-// #i25616#
#include <svx/sdshitm.hxx>
-
#include <svl/aeitem.hxx>
#include <avmedia/mediaitem.hxx>
#include <sfx2/frame.hxx>
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index aa73092..807863c 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -72,8 +72,6 @@
#include "condformatdlg.hxx"
#include "condformatmgr.hxx"
#include "xmlsourcedlg.hxx"
-
-// ause
#include "editutil.hxx"
IMPL_ABSTDLG_BASE(ScVclAbstractDialog_Impl);
diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx
index 7c44b23..268e194 100644
--- a/sc/source/ui/dbgui/asciiopt.cxx
+++ b/sc/source/ui/dbgui/asciiopt.cxx
@@ -26,7 +26,6 @@
#include <osl/thread.h>
#include <rtl/tencinfo.h>
#include <unotools/transliterationwrapper.hxx>
-// ause
#include "editutil.hxx"
static const sal_Char pStrFix[] = "FIX";
diff --git a/sc/source/ui/dbgui/csvtablebox.cxx b/sc/source/ui/dbgui/csvtablebox.cxx
index 8600dec..31e9fc9 100644
--- a/sc/source/ui/dbgui/csvtablebox.cxx
+++ b/sc/source/ui/dbgui/csvtablebox.cxx
@@ -21,8 +21,6 @@
#include <vcl/builder.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/settings.hxx>
-
-// ause
#include "editutil.hxx"
ScCsvTableBox::ScCsvTableBox( Window* pParent, WinBits nBits ) :
diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx
index 53b9e69..f74eaff 100644
--- a/sc/source/ui/inc/scuitphfedit.hxx
+++ b/sc/source/ui/inc/scuitphfedit.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_SC_SOURCE_UI_INC_SCUITPHFEDIT_HXX
#include "tphfedit.hxx"
-//#include <boost/graph/graph_concepts.hpp>
enum ScHFEntryId
diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx
index 94ab2c2..2c84f30 100644
--- a/sc/source/ui/unoobj/funcuno.cxx
+++ b/sc/source/ui/unoobj/funcuno.cxx
@@ -37,7 +37,6 @@
#include "docoptio.hxx"
#include "optuno.hxx"
#include <docuno.hxx>
-// for lcl_CopyData:
#include "markdata.hxx"
#include "patattr.hxx"
#include "docpool.hxx"
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index d928cc1..b965c57 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -61,8 +61,6 @@
#include "markdata.hxx"
#include "sc.hrc"
#include <vcl/virdev.hxx>
-
-// #i74769#
#include <svx/sdrpaintwindow.hxx>
#include <boost/scoped_ptr.hpp>
diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx
index 48920fe..0a4f35d 100644
--- a/scripting/source/vbaevents/eventhelper.cxx
+++ b/scripting/source/vbaevents/eventhelper.cxx
@@ -67,7 +67,6 @@
#include <filter/msfilter/msvbahelper.hxx>
#include <vbahelper/vbareturntypes.hxx>
-// for debug
#include <comphelper/anytostring.hxx>
#include <com/sun/star/script/XScriptListener.hpp>
diff --git a/sd/source/core/CustomAnimationCloner.cxx b/sd/source/core/CustomAnimationCloner.cxx
index b71f9e7..f4971f6 100644
--- a/sd/source/core/CustomAnimationCloner.cxx
+++ b/sd/source/core/CustomAnimationCloner.cxx
@@ -42,7 +42,6 @@
#include "rtl/ref.hxx"
#include <animations/animationnodehelper.hxx>
-// header for class SdrObjListIter
#include <svx/svditer.hxx>
#include "CustomAnimationCloner.hxx"
diff --git a/sd/source/filter/ppt/ppt97animations.cxx b/sd/source/filter/ppt/ppt97animations.cxx
index 0134649..7af1c05 100644
--- a/sd/source/filter/ppt/ppt97animations.cxx
+++ b/sd/source/filter/ppt/ppt97animations.cxx
@@ -20,13 +20,9 @@
#include "ppt97animations.hxx"
-// header for class SdrObject
#include <svx/svdobj.hxx>
-// header for class SdPage
#include "sdpage.hxx"
-// header for define DBG_ERROR
#include <tools/debug.hxx>
-// header for define GetXShapeForSdrObject
#include <svx/unoapi.hxx>
#include "EffectMigration.hxx"
#include <CustomAnimationPreset.hxx>
diff --git a/sd/source/filter/ppt/ppt97animations.hxx b/sd/source/filter/ppt/ppt97animations.hxx
index bf4d438..28be9d3 100644
--- a/sd/source/filter/ppt/ppt97animations.hxx
+++ b/sd/source/filter/ppt/ppt97animations.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_SD_SOURCE_FILTER_PPT_PPT97ANIMATIONS_HXX
#define INCLUDED_SD_SOURCE_FILTER_PPT_PPT97ANIMATIONS_HXX
-// header for class SvStream
#include <tools/stream.hxx>
class SdrObject;
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index 59cc9bb..203b53b 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -45,7 +45,6 @@
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
-// #i42894#
#include <EffectMigration.hxx>
#include <string>
diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx
index faa94e1..5a94f8f 100644
--- a/sd/source/ui/func/fumorph.cxx
+++ b/sd/source/ui/func/fumorph.cxx
@@ -40,7 +40,6 @@
#include "sdabstdlg.hxx"
-// #i48168#
#include <svx/svditer.hxx>
#include <basegfx/color/bcolor.hxx>
diff --git a/sd/source/ui/inc/fuformatpaintbrush.hxx b/sd/source/ui/inc/fuformatpaintbrush.hxx
index 0612242..1cd122b 100644
--- a/sd/source/ui/inc/fuformatpaintbrush.hxx
+++ b/sd/source/ui/inc/fuformatpaintbrush.hxx
@@ -22,7 +22,6 @@
#include "futext.hxx"
-// header for class SfxItemSet
#include <svl/itemset.hxx>
#include <boost/scoped_ptr.hpp>
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index f7dd911..1ee08c3 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -44,8 +44,6 @@
#include <sfx2/app.hxx>
#include <svx/unoapi.hxx>
#include <svx/svdoole2.hxx>
-
-// for child window ids
#include <sfx2/templdlg.hxx>
#include <svx/f3dchild.hxx>
#include <svx/imapdlg.hxx>
diff --git a/svl/qa/unit/items/test_IndexedStyleSheets.cxx b/svl/qa/unit/items/test_IndexedStyleSheets.cxx
index ec8d82d..3b0a0e0 100644
--- a/svl/qa/unit/items/test_IndexedStyleSheets.cxx
+++ b/svl/qa/unit/items/test_IndexedStyleSheets.cxx
@@ -9,7 +9,6 @@
#include <svl/IndexedStyleSheets.hxx>
-// for SfxStyleSheetBase
#include <svl/style.hxx>
#include <cppunit/TestAssert.h>
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 26d4156..4cf1740 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -51,8 +51,6 @@
#include <basegfx/numeric/ftools.hxx>
#include <basegfx/color/bcolortools.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
-
-// #i76201#
#include <basegfx/polygon/b2dpolygontools.hxx>
#include <rtl/strbuf.hxx>
#include <math.h>
diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx
index 24e9e44..41fb498 100644
--- a/svx/source/dialog/contwnd.cxx
+++ b/svx/source/dialog/contwnd.cxx
@@ -28,8 +28,6 @@
#include <svx/xfillit.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
#include <basegfx/polygon/b2dpolypolygontools.hxx>
-
-// #i75482#
#include "svx/sdrpaintwindow.hxx"
#define TRANSCOL Color( COL_WHITE )
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx
index 73ecb74..65a9538 100644
--- a/svx/source/dialog/graphctl.cxx
+++ b/svx/source/dialog/graphctl.cxx
@@ -33,8 +33,6 @@
#include "svx/xoutbmp.hxx"
#include <svx/svxids.hrc>
#include <svx/svdpage.hxx>
-
-// #i72889#
#include "svx/sdrpaintwindow.hxx"
void GraphCtrlUserCall::Changed( const SdrObject& rObj, SdrUserCallType eType, const Rectangle& /*rOldBoundRect*/ )
diff --git a/svx/source/svdraw/sdrmasterpagedescriptor.cxx b/svx/source/svdraw/sdrmasterpagedescriptor.cxx
index 8331c33..39ae2a7 100644
--- a/svx/source/svdraw/sdrmasterpagedescriptor.cxx
+++ b/svx/source/svdraw/sdrmasterpagedescriptor.cxx
@@ -20,14 +20,11 @@
#include <svx/sdrmasterpagedescriptor.hxx>
#include <svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx>
#include <svx/svdpage.hxx>
-
-// #i42075#
#include <svx/svdobj.hxx>
#include <svx/xfillit0.hxx>
#include <svl/itemset.hxx>
-
namespace sdr
{
// ViewContact part
diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx
index ff62dd0..430cfb1 100644
--- a/svx/source/svdraw/svdedtv.cxx
+++ b/svx/source/svdraw/svdedtv.cxx
@@ -34,8 +34,6 @@
#include <svx/e3dsceneupdater.hxx>
#include <rtl/strbuf.hxx>
#include <svx/svdview.hxx>
-
-// #i13033#
#include <clonelist.hxx>
void SdrEditView::ImpResetPossibilityFlags()
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index 29bc434..055e3f0 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -38,11 +38,8 @@
#include <editeng/eeitem.hxx>
#include <basegfx/polygon/b2dpolypolygon.hxx>
#include <basegfx/polygon/b2dpolypolygontools.hxx>
-
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
-
-// #i37011#
#include <svx/svdoashp.hxx>
#include <basegfx/polygon/b2dpolypolygoncutter.hxx>
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 0a076f7..38e955b 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -75,18 +75,13 @@
#include <svx/sdr/contact/viewcontactofsdrole2obj.hxx>
#include <svx/svdograf.hxx>
#include <svx/sdr/properties/oleproperties.hxx>
-
-// #i100710#
#include <svx/xlnclit.hxx>
#include <svx/xbtmpit.hxx>
#include <svx/xflbmtit.hxx>
#include <svx/xflbstit.hxx>
-
-// #i118485#
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/polygon/b2dpolypolygon.hxx>
#include <editeng/outlobj.hxx>
-
#include <svx/svdpage.hxx>
using namespace ::rtl;
diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
index b6ab640..31545c9 100644
--- a/svx/source/svdraw/svdpagv.cxx
+++ b/svx/source/svdraw/svdpagv.cxx
@@ -40,7 +40,6 @@
#include <svx/sdr/contact/viewobjectcontactredirector.hxx>
#include <svx/fmview.hxx>
-// for search on vector
#include <algorithm>
using namespace ::rtl;
diff --git a/svx/source/tbxctrls/formatpaintbrushctrl.cxx b/svx/source/tbxctrls/formatpaintbrushctrl.cxx
index 532e6ef..0c977e6 100644
--- a/svx/source/tbxctrls/formatpaintbrushctrl.cxx
+++ b/svx/source/tbxctrls/formatpaintbrushctrl.cxx
@@ -20,13 +20,8 @@
#include "svx/formatpaintbrushctrl.hxx"
-// header for class SfxBoolItem
#include <svl/eitem.hxx>
-
-// header for define SFX_APP
#include <sfx2/app.hxx>
-
-// header for class ToolBox
#include <vcl/toolbox.hxx>
#include <vcl/settings.hxx>
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
index 3890774..ddcc2f7 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
@@ -27,21 +27,15 @@
#include <com/sun/star/linguistic2/XConversionPropertyType.hpp>
#include <com/sun/star/util/XFlushable.hpp>
#include <com/sun/star/lang/Locale.hpp>
-// header for class HeaderBar
#include <svtools/headbar.hxx>
#include <svtools/svlbitm.hxx>
#include "svtools/treelistentry.hxx"
-// header for define RET_OK
#include <vcl/msgbox.hxx>
#include <vcl/settings.hxx>
-
-// header for class SvtLinguConfigItem
#include <unotools/lingucfg.hxx>
#include <unotools/linguprops.hxx>
-// header for class IntlWrapper
#include <unotools/intlwrapper.hxx>
#include <comphelper/processfactory.hxx>
-// header for class Application
#include <vcl/svapp.hxx>
#include "helpid.hrc"
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
index 4e0aaaa..182c498 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
@@ -21,13 +21,9 @@
#define INCLUDED_SVX_SOURCE_UNODIALOGS_TEXTCONVERSIONDLGS_CHINESE_DICTIONARYDIALOG_HXX
#include <vcl/dialog.hxx>
-// header for class FixedLine
#include <vcl/fixed.hxx>
-// header for class RadioButton
#include <vcl/button.hxx>
-// header for class Edit
#include <vcl/edit.hxx>
-// header for class ListBox
#include <vcl/lstbox.hxx>
#include <svtools/simptabl.hxx>
#include <com/sun/star/uno/XComponentContext.hpp>
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
index 7dbb8d3..16baa19 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
@@ -21,13 +21,9 @@
#include "chinese_translation_unodialog.hxx"
#include "chinese_translationdialog.hxx"
#include <osl/mutex.hxx>
-// header for class Application
#include <vcl/svapp.hxx>
#include <toolkit/awt/vclxwindow.hxx>
-// header for define RET_CANCEL
#include <vcl/msgbox.hxx>
-
-// header for class OImplementationId
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/typeprovider.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
index 089874c..adf98f6 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
@@ -21,9 +21,7 @@
#include "chinese_translationdialog.hxx"
#include "chinese_dictionarydialog.hxx"
#include <com/sun/star/i18n/TextConversionOption.hpp>
-// header for define RET_OK
#include <vcl/msgbox.hxx>
-// header for class SvtLinguConfigItem
#include <unotools/lingucfg.hxx>
#include <unotools/linguprops.hxx>
#include "helpid.hrc"
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx
index 6f01412..03342a6 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx
@@ -21,9 +21,7 @@
#define INCLUDED_SVX_SOURCE_UNODIALOGS_TEXTCONVERSIONDLGS_CHINESE_TRANSLATIONDIALOG_HXX
#include <vcl/dialog.hxx>
-// header for class FixedLine
#include <vcl/fixed.hxx>
-// header for class RadioButton
#include <vcl/button.hxx>
diff --git a/svx/source/unodraw/unomlstr.cxx b/svx/source/unodraw/unomlstr.cxx
index dd79385..10d5f35 100644
--- a/svx/source/unodraw/unomlstr.cxx
+++ b/svx/source/unodraw/unomlstr.cxx
@@ -18,9 +18,7 @@
*/
#include <svx/svdobj.hxx>
-// header for class OGuard
#include <osl/mutex.hxx>
-// header for class Application
#include <vcl/svapp.hxx>
#include "unomlstr.hxx"
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index a243deb..ec78f47 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -47,8 +47,6 @@
#include "shapeimpl.hxx"
#include "svx/unoshprp.hxx"
#include <svx/svdoashp.hxx>
-
-// #i29181#
#include "svx/svdviter.hxx"
#include <svx/svdview.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 808c82b..fcb33c4 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -90,7 +90,6 @@
#include <vector>
-// #i68523#
#include "svx/lathe3d.hxx"
#include "svx/extrud3d.hxx"
diff --git a/sw/source/core/SwNumberTree/SwNodeNum.cxx b/sw/source/core/SwNumberTree/SwNodeNum.cxx
index 276c18b..09fae20 100644
--- a/sw/source/core/SwNumberTree/SwNodeNum.cxx
+++ b/sw/source/core/SwNumberTree/SwNodeNum.cxx
@@ -23,7 +23,6 @@
#include <ndtxt.hxx>
#include <pam.hxx>
#include <stdio.h>
-// #i83479#
#include <IDocumentListItems.hxx>
#include <doc.hxx>
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 74549d5..1bc2956 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -65,7 +65,6 @@
#include <txtfld.hxx>
#include <fmtfld.hxx>
#include <modcfg.hxx>
-//#include "accnote.hxx"
#include <com/sun/star/beans/XPropertySet.hpp>
#include "swmodule.hxx"
#include "redline.hxx"
@@ -79,14 +78,12 @@
#include <unosett.hxx>
#include <paratr.hxx>
#include <com/sun/star/container/XIndexReplace.hpp>
-// --> OD 2006-07-12 #i63870#
#include <unomap.hxx>
#include <unoprnms.hxx>
#include <com/sun/star/text/WritingMode2.hpp>
#include <viewimp.hxx>
#include <boost/scoped_ptr.hpp>
#include <textmarkuphelper.hxx>
-// #i10825#
#include <parachangetrackinginfo.hxx>
#include <com/sun/star/text/TextMarkupType.hpp>
#include <comphelper/servicehelper.hxx>
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index 8da7ed6..b23a8ac 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -31,8 +31,6 @@
#include <frmatr.hxx>
#include <swtable.hxx>
#include <crsskip.hxx>
-
-// Formular view
#include <flyfrm.hxx>
#include <fmteiro.hxx>
#include <section.hxx>
diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx
index 9512859..c3e1eb8 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -50,7 +50,6 @@
#include <doctxm.hxx>
#include <fmtftntx.hxx>
#include <comcore.hrc>
-// #i27138#
#include <viewsh.hxx>
#include <txtfrm.hxx>
#include <boost/scoped_ptr.hpp>
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 7132396..4dbd160 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -25,7 +25,6 @@
#include <editeng/protitem.hxx>
#include <editeng/boxitem.hxx>
#include <svl/stritem.hxx>
-// #i17174#
#include <editeng/shaditem.hxx>
#include <fmtfsize.hxx>
#include <fmtornt.hxx>
diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx
index 72342d9..a1b4eea 100644
--- a/sw/source/core/draw/dview.cxx
+++ b/sw/source/core/draw/dview.cxx
@@ -46,11 +46,10 @@
#include "shellres.hxx"
#include <IDocumentUndoRedo.hxx>
-// #i7672#
#include <com/sun/star/embed/Aspects.hpp>
#include <vector>
-// #i28701#
+
#include <sortedobjs.hxx>
#include <flyfrms.hxx>
#include <UndoManager.hxx>
diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx
index fa3ca95..bd4fcdd 100644
--- a/sw/source/core/frmedt/fetab.cxx
+++ b/sw/source/core/frmedt/fetab.cxx
@@ -57,7 +57,6 @@
#include <frmtool.hxx>
#include <node.hxx>
-// OD 2004-05-24 #i28701#
#include <sortedobjs.hxx>
using namespace ::com::sun::star;
diff --git a/sw/source/core/inc/anchoredobjectposition.hxx b/sw/source/core/inc/anchoredobjectposition.hxx
index b96e674..7b8b34b 100644
--- a/sw/source/core/inc/anchoredobjectposition.hxx
+++ b/sw/source/core/inc/anchoredobjectposition.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_SW_SOURCE_CORE_INC_ANCHOREDOBJECTPOSITION_HXX
#include <swtypes.hxx>
-// #i11860#
#include <frame.hxx>
class SdrObject;
@@ -33,7 +32,6 @@ class SwRect;
class SvxLRSpaceItem;
class SvxULSpaceItem;
class SwFmtHoriOrient;
-// #i26701#
class SwAnchoredObject;
namespace objectpositioning
diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx
index 7645ad0..e8a3c2b 100644
--- a/sw/source/core/inc/frmtool.hxx
+++ b/sw/source/core/inc/frmtool.hxx
@@ -24,7 +24,6 @@
#include "layfrm.hxx"
#include "frmatr.hxx"
#include "swcache.hxx"
-// #i96772#
#include <editeng/lrspitem.hxx>
#include <swfont.hxx>
diff --git a/sw/source/core/inc/layouter.hxx b/sw/source/core/inc/layouter.hxx
index 1bc4b6b..ac55613 100644
--- a/sw/source/core/inc/layouter.hxx
+++ b/sw/source/core/inc/layouter.hxx
@@ -28,15 +28,11 @@ class SwFtnFrm;
class SwPageFrm;
class SwLooping;
-// --> #i28701#
class SwMovedFwdFrmsByObjPos;
class SwTxtFrm;
-// --> #i26945#
class SwRowFrm;
-// --> #i35911#
class SwObjsMarkedAsTmpConsiderWrapInfluence;
class SwAnchoredObject;
-// --> #i65250#
#include <boost/unordered_map.hpp>
class SwFlowFrm;
class SwLayoutFrm;
diff --git a/sw/source/core/layout/anchoreddrawobject.cxx b/sw/source/core/layout/anchoreddrawobject.cxx
index e9630a9..80678e8 100644
--- a/sw/source/core/layout/anchoreddrawobject.cxx
+++ b/sw/source/core/layout/anchoreddrawobject.cxx
@@ -24,9 +24,7 @@
#include <tolayoutanchoredobjectposition.hxx>
#include <frmtool.hxx>
#include <fmtornt.hxx>
-// --> #i32795#
#include <txtfrm.hxx>
-// --> #i32795#
#include <vector>
#include <svx/svdogrp.hxx>
diff --git a/sw/source/core/layout/anchoredobject.cxx b/sw/source/core/layout/anchoredobject.cxx
index ac602a8..b4a0cd8 100644
--- a/sw/source/core/layout/anchoredobject.cxx
+++ b/sw/source/core/layout/anchoredobject.cxx
@@ -19,7 +19,6 @@
#include <txtfrm.hxx>
#include <fmtornt.hxx>
-// --> #i28701#
#include <doc.hxx>
#include <fmtsrnd.hxx>
#include <dcontact.hxx>
@@ -27,7 +26,6 @@
#include <editeng/lrspitem.hxx>
#include <sortedobjs.hxx>
#include <pagefrm.hxx>
-// --> #i35911#
#include <layouter.hxx>
using namespace ::com::sun::star;
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx
index ccbd8e8..218b70e 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -37,10 +37,8 @@
#include "sectfrm.hxx"
#include "dbg_lay.hxx"
-// #i28701#
#include <sortedobjs.hxx>
#include <layouter.hxx>
-// #i36347#
#include <flyfrms.hxx>
// Move methods
diff --git a/sw/source/core/layout/flyincnt.cxx b/sw/source/core/layout/flyincnt.cxx
index 0cafd37..57406cc 100644
--- a/sw/source/core/layout/flyincnt.cxx
+++ b/sw/source/core/layout/flyincnt.cxx
@@ -23,7 +23,6 @@
#include <fmtornt.hxx>
#include "txtfrm.hxx"
#include "flyfrms.hxx"
-// OD 2004-01-19 #110582#
#include <dflyobj.hxx>
SwFlyInCntFrm::SwFlyInCntFrm( SwFlyFrmFmt *pFmt, SwFrm* pSib, SwFrm *pAnch ) :
diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx
index ba273a8..a878b62 100644
--- a/sw/source/core/layout/flylay.cxx
+++ b/sw/source/core/layout/flylay.cxx
@@ -34,10 +34,8 @@
#include "ndole.hxx"
#include "tabfrm.hxx"
#include "flyfrms.hxx"
-// #i18732#
#include <fmtfollowtextflow.hxx>
#include <environmentofanchoredobject.hxx>
-// #i28701#
#include <sortedobjs.hxx>
#include <viewimp.hxx>
diff --git a/sw/source/core/layout/hffrm.cxx b/sw/source/core/layout/hffrm.cxx
index 0cc8b43..b99aca0 100644
--- a/sw/source/core/layout/hffrm.cxx
+++ b/sw/source/core/layout/hffrm.cxx
@@ -29,9 +29,7 @@
#include "flyfrm.hxx"
#include "frmtool.hxx"
#include "hfspacingitem.hxx"
-// OD 2004-05-24 #i28701#
#include <sortedobjs.hxx>
-// #i43771#
#include <objectformatter.hxx>
extern bool bObjsDirect; //frmtool.cxx
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 12016e9..6c15b5c 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -54,7 +54,6 @@
#include "mdiexp.hxx"
#include "sectfrm.hxx"
#include <acmplwrd.hxx>
-// #i28701#
#include <sortedobjs.hxx>
#include <objectformatter.hxx>
#include <vector>
diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx
index aaa544c..d7aa2e8 100644
--- a/sw/source/core/layout/laycache.cxx
+++ b/sw/source/core/layout/laycache.cxx
@@ -38,7 +38,6 @@
#include <dcontact.hxx>
#include "viewopt.hxx"
#include <flyfrm.hxx>
-// OD 2004-05-24 #i28701#
#include <sortedobjs.hxx>
#include <set>
diff --git a/sw/source/core/layout/layouter.cxx b/sw/source/core/layout/layouter.cxx
index 62e710b..ff9426a 100644
--- a/sw/source/core/layout/layouter.cxx
+++ b/sw/source/core/layout/layouter.cxx
@@ -24,9 +24,7 @@
#include "ftnfrm.hxx"
#include "txtfrm.hxx"
-// #i28701#
#include <movedfwdfrmsbyobjpos.hxx>
-// #i35911#
#include <objstmpconsiderwrapinfl.hxx>
#define LOOP_DETECT 250
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 5e70d16..3da4f87 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -65,11 +65,9 @@
#include <bodyfrm.hxx>
#include <hffrm.hxx>
#include <colfrm.hxx>
-// --> OD #i76669#
#include <svx/sdr/contact/viewobjectcontactredirector.hxx>
#include <svx/sdr/contact/viewobjectcontact.hxx>
#include <svx/sdr/contact/viewcontact.hxx>
-// <--
#include <ndole.hxx>
#include <svx/charthelper.hxx>
diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx
index 361b66b..1b0ab34 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -49,7 +49,6 @@
#include <editeng/lrspitem.hxx>
#include <editeng/brushitem.hxx>
#include <fmtftntx.hxx>
-// OD 2004-05-24 #i28701#
#include <dflyobj.hxx>
#include <flyfrms.hxx>
#include <sortedobjs.hxx>
diff --git a/sw/source/core/layout/virtoutp.cxx b/sw/source/core/layout/virtoutp.cxx
index e821d57..aaae3e5 100644
--- a/sw/source/core/layout/virtoutp.cxx
+++ b/sw/source/core/layout/virtoutp.cxx
@@ -24,7 +24,6 @@
#include "virtoutp.hxx"
#include "viewopt.hxx"
#include "rootfrm.hxx"
-// OD 12.11.2002 #96272# - include declaration for <SetMappingForVirtDev>
#include "setmapvirtdev.hxx"
#if OSL_DEBUG_LEVEL > 1
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index 84f0740..0842b93 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -61,7 +61,6 @@
#include <cellfrm.hxx>
#include <dbg_lay.hxx>
#include <editeng/frmdiritem.hxx>
-// OD 2004-05-24 #i28701#
#include <sortedobjs.hxx>
#include <svx/xdef.hxx>
diff --git a/sw/source/core/objectpositioning/anchoredobjectposition.cxx b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
index b161f1c..7067fdf 100644
--- a/sw/source/core/objectpositioning/anchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
@@ -29,7 +29,6 @@
#include <dcontact.hxx>
#include <frmfmt.hxx>
#include <fmtornt.hxx>
-// #i62875#
#include <fmtfollowtextflow.hxx>
#include <editeng/lrspitem.hxx>
#include <editeng/ulspitem.hxx>
diff --git a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
index 0245cb3..6b31e7f 100644
--- a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
@@ -23,7 +23,6 @@
#include <txtfrm.hxx>
#include <pagefrm.hxx>
#include <sectfrm.hxx>
-// #i26945#
#include <tabfrm.hxx>
#include "rootfrm.hxx"
#include "viewopt.hxx"
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index 5eb0f47..1d45c7a 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -43,10 +43,8 @@
#include <porfld.hxx>
#include <sectfrm.hxx>
#include <pormulti.hxx>
-
#include <rootfrm.hxx>
#include <frmfmt.hxx>
-// #i28701#
#include <sortedobjs.hxx>
#include <portab.hxx>
#include <editeng/lrspitem.hxx>
diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx
index 9a6bf4a..fb41bab 100644
--- a/sw/source/core/text/frmpaint.cxx
+++ b/sw/source/core/text/frmpaint.cxx
@@ -46,7 +46,6 @@
#include <numrule.hxx>
#include <SwGrammarMarkUp.hxx>
-// #i12836# enhanced pdf export
#include <EnhancedPDFExportHelper.hxx>
#include <IDocumentStylePoolAccess.hxx>
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index bf24d38..7ce119c 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -61,7 +61,6 @@
#include <pam.hxx>
#include <SwGrammarMarkUp.hxx>
#include "numrule.hxx"
-// #i12836# enhanced pdf export
#include <EnhancedPDFExportHelper.hxx>
#include <docufld.hxx>
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index 450bdfd..7934640 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -45,7 +45,6 @@
#include "pordrop.hxx"
#include "crstate.hxx"
#include <pormulti.hxx>
-// #i111284#
#include <numrule.hxx>
// Not reentrant !!!
diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx
index 1c10975..fff6ea7 100644
--- a/sw/source/core/text/itrpaint.cxx
+++ b/sw/source/core/text/itrpaint.cxx
@@ -36,7 +36,6 @@
#include <pagedesc.hxx>
#include <tgrditem.hxx>
-// #i12836# enhanced pdf export
#include <EnhancedPDFExportHelper.hxx>
#include "flyfrms.hxx"
diff --git a/sw/source/core/text/porfly.cxx b/sw/source/core/text/porfly.cxx
index 72643ad..5fb22df 100644
--- a/sw/source/core/text/porfly.cxx
+++ b/sw/source/core/text/porfly.cxx
@@ -38,7 +38,6 @@
#include "porlay.hxx"
#include "inftxt.hxx"
-// OD 2004-05-24 #i28701#
#include <sortedobjs.hxx>
// class SwFlyPortion => we expect a frame-locale SwRect!
diff --git a/sw/source/core/text/porfly.hxx b/sw/source/core/text/porfly.hxx
index 9c1aac0..3508258 100644
--- a/sw/source/core/text/porfly.hxx
+++ b/sw/source/core/text/porfly.hxx
@@ -18,7 +18,7 @@
*/
#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_PORFLY_HXX
#define INCLUDED_SW_SOURCE_CORE_TEXT_PORFLY_HXX
-// OD 28.10.2003 #113049#
+
#include <ascharanchoredobjectposition.hxx>
#include "porglue.hxx"
diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx
index 6eb433e..d4cd734 100644
--- a/sw/source/core/text/txtfly.cxx
+++ b/sw/source/core/text/txtfly.cxx
@@ -41,7 +41,6 @@
#include <editeng/txtrange.hxx>
#include <editeng/lrspitem.hxx>
#include <editeng/ulspitem.hxx>
-// #i28701#
#include <editeng/lspcitem.hxx>
#include <fmtsrnd.hxx>
#include <fmtanchr.hxx>
diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx
index 0679d76..fc93252 100644
--- a/sw/source/core/text/txtftn.cxx
+++ b/sw/source/core/text/txtftn.cxx
@@ -36,7 +36,6 @@
#include <breakit.hxx>
#include <com/sun/star/i18n/ScriptType.hpp>
#include <tabfrm.hxx>
-// #i28701#
#include <sortedobjs.hxx>
#include "swfont.hxx"
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx
index e1d85ad..314f163 100644
--- a/sw/source/core/text/txttab.cxx
+++ b/sw/source/core/text/txttab.cxx
@@ -32,7 +32,6 @@
#include "itrform2.hxx"
#include "txtfrm.hxx"
#include <numrule.hxx>
-// #i89179#
#include <porfld.hxx>
#include <boost/scoped_ptr.hpp>
diff --git a/sw/source/core/uibase/docvw/edtwin2.cxx b/sw/source/core/uibase/docvw/edtwin2.cxx
index 859d964..df9b704 100644
--- a/sw/source/core/uibase/docvw/edtwin2.cxx
+++ b/sw/source/core/uibase/docvw/edtwin2.cxx
@@ -65,7 +65,6 @@
#include <PostItMgr.hxx>
#include <fmtfld.hxx>
-// #i104300#
#include <IDocumentMarkAccess.hxx>
#include <ndtxt.hxx>
diff --git a/sw/source/core/uibase/inc/formatclipboard.hxx b/sw/source/core/uibase/inc/formatclipboard.hxx
index 2d61a99..4c90ed2 100644
--- a/sw/source/core/uibase/inc/formatclipboard.hxx
+++ b/sw/source/core/uibase/inc/formatclipboard.hxx
@@ -20,11 +20,8 @@
#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FORMATCLIPBOARD_HXX
#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FORMATCLIPBOARD_HXX
-// header for class SwWrtShell
#include <wrtsh.hxx>
-// header for class SfxItemSet
#include <svl/itemset.hxx>
-// header for class SfxStyleSheetBasePool
#include <svl/style.hxx>
/** This class acts as data container and execution class for the format paintbrush feature in writer.
diff --git a/sw/source/core/uibase/shells/frmsh.cxx b/sw/source/core/uibase/shells/frmsh.cxx
index b565dd9..b140b44 100644
--- a/sw/source/core/uibase/shells/frmsh.cxx
+++ b/sw/source/core/uibase/shells/frmsh.cxx
@@ -39,7 +39,6 @@
#include <sfx2/objface.hxx>
#include <sfx2/sidebar/EnumContext.hxx>
#include <svx/hlnkitem.hxx>
-// #i73249#
#include <svx/svdview.hxx>
#include <vcl/msgbox.hxx>
#include <tools/diagnose_ex.h>
@@ -75,7 +74,7 @@
#include <shells.hrc>
#include "swabstdlg.hxx"
#include "misc.hrc"
-// #i73249#
+
#include <svx/dialogs.hrc>
#include <wordcountdialog.hxx>
diff --git a/sw/source/core/uibase/uiview/formatclipboard.cxx b/sw/source/core/uibase/uiview/formatclipboard.cxx
index b6dd3f5..ed2144c 100644
--- a/sw/source/core/uibase/uiview/formatclipboard.cxx
+++ b/sw/source/core/uibase/uiview/formatclipboard.cxx
@@ -25,20 +25,13 @@
#include <frmfmt.hxx>
#include <docstyle.hxx>
#include <fchrfmt.hxx>
-// header for class SdrView
#include <svx/svdview.hxx>
-//SvxBrushItem
#include <editeng/brushitem.hxx>
#include <editeng/shaditem.hxx>
-// header for class SvxBoxInfoItem
#include <editeng/boxitem.hxx>
-// header for class SvxFmtBreakItem
#include <editeng/formatbreakitem.hxx>
-// header for class SwFmtLayoutSplit
#include <fmtlsplt.hxx>
-// header for class SvxFmtKeepItem
#include <editeng/keepitem.hxx>
-// header for class SvxFrameDirectionItem
#include <editeng/frmdiritem.hxx>
#include <fmtpdsc.hxx>
#include <fmtrowsplt.hxx>
diff --git a/sw/source/core/uibase/uiview/view1.cxx b/sw/source/core/uibase/uiview/view1.cxx
index 975c879..e122d0c 100644
--- a/sw/source/core/uibase/uiview/view1.cxx
+++ b/sw/source/core/uibase/uiview/view1.cxx
@@ -35,9 +35,7 @@
#include <edtwin.hxx>
#include "formatclipboard.hxx"
#include <cmdid.h>
-// header for class SfxRequest
#include <sfx2/request.hxx>
-
#include <sfx2/viewfrm.hxx>
extern int bDocSzUpdated;
diff --git a/sw/source/core/uibase/uno/unotxdoc.cxx b/sw/source/core/uibase/uno/unotxdoc.cxx
index 4cb01d9..c0d9032 100644
--- a/sw/source/core/uibase/uno/unotxdoc.cxx
+++ b/sw/source/core/uibase/uno/unotxdoc.cxx
@@ -102,7 +102,6 @@
#include <comphelper/storagehelper.hxx>
#include <cppuhelper/supportsservice.hxx>
-// #i12836# enhanced pdf export
#include <EnhancedPDFExportHelper.hxx>
#include <numrule.hxx>
diff --git a/sw/source/core/undo/undobj1.cxx b/sw/source/core/undo/undobj1.cxx
index ca00c41..9537429 100644
--- a/sw/source/core/undo/undobj1.cxx
+++ b/sw/source/core/undo/undobj1.cxx
@@ -35,7 +35,6 @@
#include <swundo.hxx>
#include <pam.hxx>
#include <ndtxt.hxx>
-// OD 26.06.2003 #108784#
#include <dcontact.hxx>
#include <ndole.hxx>
diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx
index 660d8ef..08d2371 100644
--- a/sw/source/core/unocore/unomap.cxx
+++ b/sw/source/core/unocore/unomap.cxx
@@ -76,7 +76,6 @@
#include <com/sun/star/util/Date.hpp>
#include <com/sun/star/util/DateTime.hpp>
#include <com/sun/star/script/XLibraryContainer.hpp>
-// #i28749#
#include <com/sun/star/drawing/HomogenMatrix3.hpp>
#include <swtypes.hxx>
#include <unomap.hxx>
diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx
index 439b947..10db734 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -19,7 +19,6 @@
#include <unoport.hxx>
#include <IMark.hxx>
-// #i81002#
#include <crossrefbookmark.hxx>
#include <annotationmark.hxx>
#include <doc.hxx>
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index d1980ce..57096bc 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -17,7 +17,6 @@
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list