[Libreoffice-commits] core.git: accessibility/source basctl/source basic/source chart2/source codemaker/source comphelper/source connectivity/source cppuhelper/source cppu/source dbaccess/source desktop/source dtrans/source editeng/source extensions/source filter/source forms/source fpicker/source framework/source lingucomponent/source mysqlc/source odk/examples oox/source package/source pyuno/source reportdesign/source sal/qa sax/source sc/source sd/source sd/workben sfx2/source shell/source sot/source svtools/source svx/source sw/source toolkit/source ucb/source uui/source vcl/opengl vcl/source writerperfect/source xmloff/source xmlscript/source

[Jochen Nitschke]

 accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx          |    2 
 accessibility/source/extended/AccessibleGridControlTableCell.cxx        |    2 
 basctl/source/basicide/docsignature.cxx                                 |    2 
 basctl/source/basicide/documentenumeration.cxx                          |    4 -
 basctl/source/basicide/macrodlg.cxx                                     |    1 
 basctl/source/basicide/scriptdocument.cxx                               |   11 ----
 basic/source/basmgr/basicmanagerrepository.cxx                          |    3 -
 chart2/source/controller/accessibility/AccessibleChartElement.cxx       |    3 -
 chart2/source/controller/chartapiwrapper/AxisWrapper.cxx                |    1 
 chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx           |    1 
 chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx       |    1 
 chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx     |    1 
 chart2/source/controller/chartapiwrapper/GridWrapper.cxx                |    1 
 chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx          |    1 
 chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx           |    1 
 chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx |    1 
 chart2/source/controller/dialogs/DataBrowser.cxx                        |    1 
 chart2/source/controller/main/ChartModelClone.cxx                       |    2 
 chart2/source/controller/main/UndoActions.cxx                           |    9 ---
 chart2/source/controller/sidebar/ChartAxisPanel.cxx                     |    2 
 chart2/source/controller/sidebar/ChartElementsPanel.cxx                 |    2 
 chart2/source/controller/sidebar/ChartErrorBarPanel.cxx                 |    2 
 chart2/source/controller/sidebar/ChartSeriesPanel.cxx                   |    2 
 chart2/source/model/main/DataPoint.cxx                                  |    1 
 chart2/source/model/main/GridProperties.cxx                             |    1 
 chart2/source/model/main/PageBackground.cxx                             |    1 
 chart2/source/model/main/StockBar.cxx                                   |    1 
 chart2/source/model/main/UndoManager.cxx                                |    1 
 chart2/source/model/main/Wall.cxx                                       |    1 
 chart2/source/model/template/AreaChartTypeTemplate.cxx                  |    1 
 chart2/source/model/template/BarChartTypeTemplate.cxx                   |    1 
 chart2/source/model/template/BubbleChartType.cxx                        |    1 
 chart2/source/model/template/BubbleChartTypeTemplate.cxx                |    1 
 chart2/source/model/template/CandleStickChartType.cxx                   |    1 
 chart2/source/model/template/ChartType.cxx                              |    1 
 chart2/source/model/template/ChartTypeManager.cxx                       |    1 
 chart2/source/model/template/ColumnLineChartTypeTemplate.cxx            |    1 
 chart2/source/model/template/FilledNetChartType.cxx                     |    3 -
 chart2/source/model/template/LineChartType.cxx                          |    1 
 chart2/source/model/template/LineChartTypeTemplate.cxx                  |    1 
 chart2/source/model/template/NetChartType.cxx                           |    1 
 chart2/source/model/template/NetChartTypeTemplate.cxx                   |    1 
 chart2/source/model/template/PieChartType.cxx                           |    1 
 chart2/source/model/template/PieChartTypeTemplate.cxx                   |    1 
 chart2/source/model/template/ScatterChartType.cxx                       |    1 
 chart2/source/model/template/ScatterChartTypeTemplate.cxx               |    1 
 chart2/source/model/template/StockChartTypeTemplate.cxx                 |    1 
 chart2/source/tools/DataSource.cxx                                      |    1 
 chart2/source/tools/OPropertySet.cxx                                    |    1 
 chart2/source/tools/RegressionCurveModel.cxx                            |    1 
 chart2/source/view/axes/Tickmarks_Dates.cxx                             |    1 
 chart2/source/view/axes/Tickmarks_Equidistant.cxx                       |    1 
 chart2/source/view/main/OpenglShapeFactory.cxx                          |    2 
 chart2/source/view/main/VLegendSymbolFactory.cxx                        |    1 
 codemaker/source/cppumaker/cppuoptions.cxx                              |    2 
 comphelper/source/misc/accimplaccess.cxx                                |    4 -
 comphelper/source/misc/anycompare.cxx                                   |    3 -
 comphelper/source/misc/componentmodule.cxx                              |    3 -
 comphelper/source/misc/docpasswordrequest.cxx                           |    1 
 comphelper/source/misc/documentinfo.cxx                                 |    4 -
 comphelper/source/misc/logging.cxx                                      |    1 
 comphelper/source/property/ChainablePropertySetInfo.cxx                 |    2 
 comphelper/source/property/MasterPropertySetInfo.cxx                    |    2 
 connectivity/source/commontools/RowFunctionParser.cxx                   |    3 -
 connectivity/source/commontools/dbmetadata.cxx                          |    6 --
 connectivity/source/commontools/formattedcolumnvalue.cxx                |    2 
 connectivity/source/commontools/predicateinput.cxx                      |    2 
 connectivity/source/commontools/sqlerror.cxx                            |    2 
 connectivity/source/drivers/firebird/Services.cxx                       |    1 
 connectivity/source/drivers/hsqldb/HConnection.cxx                      |    5 --
 connectivity/source/drivers/hsqldb/HView.cxx                            |    1 
 connectivity/source/drivers/postgresql/pq_baseresultset.cxx             |   10 ----
 connectivity/source/drivers/postgresql/pq_connection.cxx                |    7 --
 connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx  |    3 -
 connectivity/source/drivers/postgresql/pq_preparedstatement.cxx         |    8 ---
 connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx         |    3 -
 connectivity/source/drivers/postgresql/pq_statement.cxx                 |    5 --
 connectivity/source/drivers/postgresql/pq_tools.cxx                     |    1 
 connectivity/source/drivers/postgresql/pq_xbase.cxx                     |    2 
 connectivity/source/drivers/postgresql/pq_xcolumns.cxx                  |    6 --
 connectivity/source/drivers/postgresql/pq_xcolumns.hxx                  |    1 
 connectivity/source/drivers/postgresql/pq_xcontainer.cxx                |   12 -----
 connectivity/source/drivers/postgresql/pq_xindex.cxx                    |   24 ----------
 connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx             |    7 --
 connectivity/source/drivers/postgresql/pq_xindexes.cxx                  |    5 --
 connectivity/source/drivers/postgresql/pq_xkey.cxx                      |   24 ----------
 connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx               |    9 ---
 connectivity/source/drivers/postgresql/pq_xkeys.cxx                     |    5 --
 connectivity/source/drivers/postgresql/pq_xtable.cxx                    |   14 -----
 connectivity/source/drivers/postgresql/pq_xtables.cxx                   |    8 ---
 connectivity/source/drivers/postgresql/pq_xuser.cxx                     |   21 --------
 connectivity/source/drivers/postgresql/pq_xusers.cxx                    |    8 ---
 connectivity/source/drivers/postgresql/pq_xview.cxx                     |   19 -------
 connectivity/source/drivers/postgresql/pq_xviews.cxx                    |   10 ----
 cppu/source/uno/lbmap.cxx                                               |    2 
 cppuhelper/source/component.cxx                                         |    1 
 cppuhelper/source/implbase.cxx                                          |    2 
 cppuhelper/source/implbase_ex.cxx                                       |    2 
 cppuhelper/source/servicemanager.cxx                                    |    1 
 dbaccess/source/core/api/View.cxx                                       |    9 ---
 dbaccess/source/core/api/columnsettings.cxx                             |    3 -
 dbaccess/source/core/dataaccess/databaseregistrations.cxx               |    2 
 dbaccess/source/core/dataaccess/documenteventexecutor.cxx               |    1 
 dbaccess/source/core/dataaccess/documenteventnotifier.cxx               |    2 
 dbaccess/source/core/dataaccess/documentevents.cxx                      |    2 
 dbaccess/source/core/misc/objectnameapproval.cxx                        |    2 
 dbaccess/source/core/recovery/dbdocrecovery.cxx                         |   14 -----
 dbaccess/source/core/recovery/settingsimport.cxx                        |    3 -
 dbaccess/source/core/recovery/storagestream.cxx                         |    4 -
 dbaccess/source/core/recovery/storagetextstream.cxx                     |    4 -
 dbaccess/source/core/recovery/storagexmlstream.cxx                      |    8 ---
 dbaccess/source/core/recovery/subcomponentloader.cxx                    |    1 
 dbaccess/source/core/recovery/subcomponentrecovery.cxx                  |    1 
 dbaccess/source/ext/macromigration/docinteraction.cxx                   |    3 -
 dbaccess/source/ext/macromigration/macromigrationdialog.cxx             |    5 --
 dbaccess/source/ext/macromigration/macromigrationpages.cxx              |    2 
 dbaccess/source/ext/macromigration/migrationengine.cxx                  |   13 -----
 dbaccess/source/ext/macromigration/progresscapture.cxx                  |    2 
 dbaccess/source/sdbtools/connection/datasourcemetadata.cxx              |    3 -
 dbaccess/source/sdbtools/connection/objectnames.cxx                     |    3 -
 dbaccess/source/sdbtools/connection/tablename.cxx                       |    2 
 dbaccess/source/sdbtools/misc/sdbt_services.cxx                         |    3 -
 dbaccess/source/ui/app/AppController.cxx                                |    1 
 dbaccess/source/ui/app/AppControllerGen.cxx                             |    2 
 dbaccess/source/ui/app/subcomponentmanager.cxx                          |    1 
 dbaccess/source/ui/control/opendoccontrols.cxx                          |    3 -
 dbaccess/source/ui/dlg/advancedsettings.cxx                             |    1 
 dbaccess/source/ui/misc/TokenWriter.cxx                                 |    1 
 dbaccess/source/ui/misc/UITools.cxx                                     |    2 
 dbaccess/source/ui/misc/controllerframe.cxx                             |    3 -
 dbaccess/source/ui/misc/datasourceconnector.cxx                         |    1 
 dbaccess/source/ui/misc/dbaundomanager.cxx                              |    1 
 dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx                    |    1 
 dbaccess/source/ui/misc/defaultobjectnamecheck.cxx                      |    5 --
 dbaccess/source/ui/misc/imageprovider.cxx                               |    2 
 dbaccess/source/ui/misc/propertystorage.cxx                             |    3 -
 dbaccess/source/ui/misc/singledoccontroller.cxx                         |    4 -
 dbaccess/source/ui/uno/copytablewizard.cxx                              |    5 --
 desktop/source/deployment/registry/executable/dp_executable.cxx         |    1 
 dtrans/source/win32/clipb/MtaOleClipb.cxx                               |    3 -
 editeng/source/uno/unoipset.cxx                                         |    1 
 extensions/source/logging/consolehandler.cxx                            |    1 
 extensions/source/logging/logger.cxx                                    |    1 
 extensions/source/propctrlr/browserlistbox.cxx                          |    1 
 extensions/source/propctrlr/commoncontrol.cxx                           |    1 
 extensions/source/propctrlr/composeduiupdate.cxx                        |    1 
 extensions/source/propctrlr/defaultforminspection.cxx                   |    2 
 extensions/source/propctrlr/defaulthelpprovider.cxx                     |    2 
 extensions/source/propctrlr/eventhandler.cxx                            |    3 -
 extensions/source/propctrlr/formcontroller.cxx                          |    8 ---
 extensions/source/propctrlr/formgeometryhandler.cxx                     |    2 
 extensions/source/propctrlr/inspectormodelbase.cxx                      |    2 
 extensions/source/propctrlr/objectinspectormodel.cxx                    |    1 
 extensions/source/propctrlr/propertycontrolextender.cxx                 |    1 
 extensions/source/propctrlr/propeventtranslation.cxx                    |    2 
 extensions/source/propctrlr/sqlcommanddesign.cxx                        |    8 ---
 filter/source/flash/swfexporter.cxx                                     |    7 --
 filter/source/flash/swffilter.cxx                                       |    3 -
 forms/source/component/Pattern.cxx                                      |    2 
 forms/source/component/cachedrowset.cxx                                 |    4 -
 forms/source/helper/commandimageprovider.cxx                            |    2 
 forms/source/helper/resettable.cxx                                      |    3 -
 forms/source/runtime/formoperations.cxx                                 |    1 
 forms/source/xforms/binding.cxx                                         |    6 --
 forms/source/xforms/computedexpression.cxx                              |   12 -----
 forms/source/xforms/model.cxx                                           |    6 --
 forms/source/xforms/model_ui.cxx                                        |    4 -
 forms/source/xforms/pathexpression.cxx                                  |   11 ----
 forms/source/xforms/submission.cxx                                      |    5 --
 forms/source/xforms/submission/serialization_app_xml.cxx                |    3 -
 forms/source/xforms/unohelper.cxx                                       |    4 -
 forms/source/xforms/xpathlib/extension.cxx                              |    1 
 fpicker/source/aqua/FPentry.mm                                          |    1 
 fpicker/source/win32/filepicker/FPentry.cxx                             |    1 
 fpicker/source/win32/folderpicker/FolderPicker.cxx                      |    3 -
 fpicker/source/win32/folderpicker/MtaFop.cxx                            |    2 
 fpicker/source/win32/folderpicker/WinFOPImpl.cxx                        |    2 
 framework/source/uiconfiguration/moduleimagemanager.cxx                 |    1 
 framework/source/uielement/statusbarmerger.cxx                          |    1 
 lingucomponent/source/lingutil/lingutil.cxx                             |    1 
 lingucomponent/source/spellcheck/macosxspell/macspellimp.mm             |    2 
 mysqlc/source/mysqlc_preparedstatement.cxx                              |    1 
 mysqlc/source/mysqlc_services.cxx                                       |    1 
 odk/examples/cpp/complextoolbarcontrols/ListenerHelper.cxx              |    1 
 odk/examples/cpp/custompanel/ctp_factory.cxx                            |    5 --
 odk/examples/cpp/custompanel/ctp_panel.cxx                              |    2 
 oox/source/core/filterdetect.cxx                                        |    1 
 oox/source/drawingml/chart/chartspaceconverter.cxx                      |    1 
 oox/source/drawingml/chart/titleconverter.cxx                           |    1 
 oox/source/drawingml/colorchoicecontext.cxx                             |    5 --
 oox/source/drawingml/fillpropertiesgroupcontext.cxx                     |    1 
 oox/source/drawingml/lineproperties.cxx                                 |    2 
 oox/source/drawingml/shape3dproperties.cxx                              |    2 
 oox/source/drawingml/textparagraphpropertiescontext.cxx                 |    2 
 oox/source/drawingml/transform2dcontext.cxx                             |    4 -
 oox/source/export/chartexport.cxx                                       |   10 ----
 oox/source/export/drawingml.cxx                                         |    2 
 oox/source/export/shapes.cxx                                            |    5 --
 oox/source/ole/olehelper.cxx                                            |   13 -----
 oox/source/ppt/commontimenodecontext.cxx                                |    1 
 package/source/zipapi/XUnbufferedStream.cxx                             |    1 
 pyuno/source/loader/pyuno_loader.cxx                                    |    1 
 pyuno/source/module/pyuno.cxx                                           |    6 --
 pyuno/source/module/pyuno_adapter.cxx                                   |    2 
 pyuno/source/module/pyuno_callable.cxx                                  |    5 --
 pyuno/source/module/pyuno_module.cxx                                    |    3 -
 pyuno/source/module/pyuno_runtime.cxx                                   |    3 -
 pyuno/source/module/pyuno_struct.cxx                                    |    2 
 pyuno/source/module/pyuno_type.cxx                                      |    1 
 pyuno/source/module/pyuno_util.cxx                                      |   10 ----
 reportdesign/source/core/sdr/formatnormalizer.cxx                       |    1 
 reportdesign/source/filter/xml/dbloader2.cxx                            |    1 
 sal/qa/osl/file/osl_old_test_file.cxx                                   |    2 
 sal/qa/osl/module/osl_Module.cxx                                        |    2 
 sal/qa/osl/pipe/osl_Pipe.cxx                                            |    1 
 sal/qa/rtl/uuid/rtl_Uuid.cxx                                            |    3 -
 sax/source/tools/fastserializer.cxx                                     |    1 
 sc/source/core/data/clipparam.cxx                                       |    1 
 sc/source/core/data/dpfilteredcache.cxx                                 |   13 -----
 sc/source/core/data/global2.cxx                                         |    1 
 sc/source/core/data/pivot2.cxx                                          |    2 
 sc/source/core/tool/docoptio.cxx                                        |    1 
 sc/source/core/tool/formulaopt.cxx                                      |    2 
 sc/source/core/tool/scmatrix.cxx                                        |    2 
 sc/source/filter/excel/xechart.cxx                                      |    2 
 sc/source/filter/excel/xecontent.cxx                                    |    5 --
 sc/source/filter/excel/xeescher.cxx                                     |    7 --
 sc/source/filter/excel/xepivot.cxx                                      |    1 
 sc/source/filter/excel/xestream.cxx                                     |    4 -
 sc/source/filter/excel/xichart.cxx                                      |    4 -
 sc/source/filter/excel/xiescher.cxx                                     |    2 
 sc/source/filter/excel/xipivot.cxx                                      |    1 
 sc/source/filter/excel/xlroot.cxx                                       |    3 -
 sc/source/filter/ftools/fapihelper.cxx                                  |    2 
 sc/source/filter/oox/biffcodec.cxx                                      |    2 
 sc/source/filter/oox/commentsbuffer.cxx                                 |    2 
 sc/source/filter/oox/stylesbuffer.cxx                                   |    1 
 sc/source/filter/oox/themebuffer.cxx                                    |    1 
 sc/source/filter/xcl97/xcl97esc.cxx                                     |    3 -
 sc/source/filter/xcl97/xcl97rec.cxx                                     |    1 
 sc/source/ui/Accessibility/AccessibleFilterMenu.cxx                     |    2 
 sc/source/ui/app/inputwin.cxx                                           |    5 --
 sc/source/ui/docshell/docsh6.cxx                                        |    9 ---
 sc/source/ui/docshell/macromgr.cxx                                      |    1 
 sc/source/ui/optdlg/tpformula.cxx                                       |    5 --
 sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx                      |    2 
 sc/source/ui/undo/undotab.cxx                                           |    1 
 sc/source/ui/unoobj/defltuno.cxx                                        |    1 
 sc/source/ui/unoobj/warnpassword.cxx                                    |    3 -
 sc/source/ui/view/cellsh3.cxx                                           |    1 
 sc/source/ui/view/overlayobject.cxx                                     |    1 
 sd/source/core/CustomAnimationEffect.cxx                                |    5 --
 sd/source/core/drawdoc.cxx                                              |    1 
 sd/source/core/stlsheet.cxx                                             |    1 
 sd/source/core/undoanim.cxx                                             |    2 
 sd/source/filter/eppt/pptexanimations.cxx                               |    5 --
 sd/source/filter/eppt/pptx-epptbase.cxx                                 |    5 --
 sd/source/filter/ppt/pptinanimations.cxx                                |    1 
 sd/source/ui/animations/CustomAnimationList.cxx                         |    3 -
 sd/source/ui/animations/CustomAnimationPane.cxx                         |    4 -
 sd/source/ui/animations/SlideTransitionPane.cxx                         |    3 -
 sd/source/ui/dlg/PaneChildWindows.cxx                                   |    7 --
 sd/source/ui/framework/factories/PresentationFactory.cxx                |    3 -
 sd/source/ui/framework/factories/ViewShellWrapper.cxx                   |    3 -
 sd/source/ui/slideshow/slideshow.cxx                                    |    2 
 sd/source/ui/slideshow/slideshowimpl.cxx                                |    1 
 sd/source/ui/slideshow/slideshowviewimpl.cxx                            |    5 --
 sd/source/ui/unoidl/randomnode.cxx                                      |    1 
 sd/source/ui/view/ViewShellImplementation.cxx                           |    2 
 sd/source/ui/view/ViewTabBar.cxx                                        |    2 
 sd/workben/custompanel/ctp_panel.cxx                                    |    4 -
 sfx2/source/appl/appbaslib.cxx                                          |    2 
 sfx2/source/doc/docmacromode.cxx                                        |    6 --
 sfx2/source/doc/docstoragemodifylistener.cxx                            |    2 
 sfx2/source/doc/docundomanager.cxx                                      |    6 --
 sfx2/source/view/frame2.cxx                                             |    2 
 sfx2/source/view/frmload.cxx                                            |    6 --
 sfx2/source/view/viewfrm2.cxx                                           |    2 
 shell/source/cmdmail/cmdmailsuppl.cxx                                   |    2 
 shell/source/unix/exec/shellexec.cxx                                    |    1 
 shell/source/win32/SysShExec.cxx                                        |    3 -
 shell/source/win32/shlxthandler/classfactory.cxx                        |    2 
 shell/source/win32/simplemail/smplmailmsg.cxx                           |    2 
 shell/source/win32/simplemail/smplmailsuppl.cxx                         |    1 
 sot/source/base/formats.cxx                                             |    4 -
 svtools/source/brwbox/brwbox1.cxx                                       |    1 
 svtools/source/brwbox/editbrowsebox.cxx                                 |    2 
 svtools/source/contnr/contentenumeration.cxx                            |    2 
 svtools/source/table/cellvalueconversion.cxx                            |    1 
 svtools/source/table/gridtablerenderer.cxx                              |    2 
 svtools/source/uno/unocontroltablemodel.cxx                             |    8 ---
 svtools/source/uno/unoevent.cxx                                         |    1 
 svtools/source/uno/unogridcolumnfacade.cxx                              |    1 
 svtools/source/uno/wizard/wizardpagecontroller.cxx                      |    4 -
 svtools/source/uno/wizard/wizardshell.cxx                               |    3 -
 svx/source/accessibility/AccessibleFrameSelector.cxx                    |    1 
 svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx           |    1 
 svx/source/form/filtnav.cxx                                             |    5 --
 svx/source/form/fmpage.cxx                                              |    4 -
 svx/source/form/fmpgeimp.cxx                                            |    2 
 svx/source/form/fmscriptingenv.cxx                                      |    4 -
 svx/source/form/fmvwimp.cxx                                             |   10 ----
 svx/source/form/formcontrolfactory.cxx                                  |    6 --
 svx/source/form/formcontroller.cxx                                      |    5 --
 svx/source/form/formcontrolling.cxx                                     |    4 -
 svx/source/form/formdispatchinterceptor.cxx                             |    2 
 svx/source/form/tbxform.cxx                                             |    2 
 svx/source/sdr/contact/viewcontactofunocontrol.cxx                      |    4 -
 svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx                |    4 -
 svx/source/sidebar/graphic/GraphicPropertyPanel.cxx                     |    2 
 svx/source/sidebar/line/LinePropertyPanel.cxx                           |    2 
 svx/source/sidebar/line/LinePropertyPanelBase.cxx                       |    2 
 svx/source/sidebar/possize/PosSizePropertyPanel.cxx                     |    2 
 svx/source/sidebar/shadow/ShadowPropertyPanel.cxx                       |    2 
 svx/source/table/svdotable.cxx                                          |    1 
 svx/source/table/tablelayouter.cxx                                      |    2 
 svx/source/unodraw/shapepropertynotifier.cxx                            |    3 -
 svx/source/unodraw/unoshape.cxx                                         |    1 
 svx/source/unodraw/unoshtxt.cxx                                         |    2 
 svx/source/xml/xmlgrhlp.cxx                                             |    2 
 sw/source/core/access/accpreview.cxx                                    |    1 
 sw/source/core/doc/docxforms.cxx                                        |    3 -
 sw/source/core/unocore/unoevent.cxx                                     |    6 --
 sw/source/filter/ww8/writerwordglue.cxx                                 |    1 
 sw/source/filter/xml/XMLRedlineImportHelper.cxx                         |    2 
 sw/source/ui/dialog/macassgn.cxx                                        |    1 
 toolkit/source/awt/animatedimagespeer.cxx                               |    1 
 toolkit/source/awt/stylesettings.cxx                                    |    2 
 toolkit/source/controls/grid/grideventforwarder.cxx                     |    2 
 ucb/source/ucp/ext/ucpext_content.cxx                                   |   12 -----
 ucb/source/ucp/ext/ucpext_datasupplier.cxx                              |    5 --
 ucb/source/ucp/ext/ucpext_provider.cxx                                  |    2 
 ucb/source/ucp/ext/ucpext_resultset.cxx                                 |    5 --
 ucb/source/ucp/ext/ucpext_services.cxx                                  |    4 -
 uui/source/iahndl.cxx                                                   |    2 
 vcl/opengl/scale.cxx                                                    |    3 -
 vcl/source/gdi/textlayout.cxx                                           |    1 
 vcl/source/window/accessibility.cxx                                     |    8 ---
 vcl/source/window/window.cxx                                            |    2 
 writerperfect/source/calc/MWAWCalcImportFilter.cxx                      |    1 
 writerperfect/source/calc/NumbersImportFilter.cxx                       |    1 
 writerperfect/source/draw/CDRImportFilter.cxx                           |    1 
 writerperfect/source/draw/CMXImportFilter.cxx                           |    1 
 writerperfect/source/draw/FreehandImportFilter.cxx                      |    1 
 writerperfect/source/draw/MSPUBImportFilter.cxx                         |    1 
 writerperfect/source/draw/MWAWDrawImportFilter.cxx                      |    1 
 writerperfect/source/draw/PageMakerImportFilter.cxx                     |    1 
 writerperfect/source/draw/VisioImportFilter.cxx                         |    1 
 writerperfect/source/draw/WPGImportFilter.cxx                           |    1 
 writerperfect/source/impress/KeynoteImportFilter.cxx                    |    1 
 writerperfect/source/impress/MWAWPresentationImportFilter.cxx           |    1 
 writerperfect/source/writer/AbiWordImportFilter.cxx                     |    1 
 writerperfect/source/writer/EBookImportFilter.cxx                       |    1 
 writerperfect/source/writer/MWAWImportFilter.cxx                        |    1 
 writerperfect/source/writer/PagesImportFilter.cxx                       |    1 
 writerperfect/source/writer/WordPerfectImportFilter.cxx                 |    9 ---
 xmloff/source/chart/SchXMLAutoStylePoolP.cxx                            |    2 
 xmloff/source/core/DomBuilderContext.cxx                                |    4 -
 xmloff/source/core/DomExport.cxx                                        |    2 
 xmloff/source/draw/XMLImageMapContext.cxx                               |    2 
 xmloff/source/script/XMLEventExport.cxx                                 |    1 
 xmloff/source/style/MultiPropertySetHelper.cxx                          |    6 --
 xmloff/source/text/XMLAutoTextEventExport.cxx                           |    4 -
 xmloff/source/text/XMLChangeElementImportContext.cxx                    |    1 
 xmloff/source/text/XMLChangeImportContext.cxx                           |    2 
 xmloff/source/text/XMLFootnoteBodyImportContext.cxx                     |    1 
 xmloff/source/text/XMLIndexBibliographyEntryContext.cxx                 |    1 
 xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx                  |    1 
 xmloff/source/text/XMLIndexSimpleEntryContext.cxx                       |    1 
 xmloff/source/text/XMLIndexTemplateContext.cxx                          |    1 
 xmloff/source/text/XMLPropertyBackpatcher.cxx                           |    1 
 xmloff/source/text/XMLSectionExport.cxx                                 |    6 --
 xmloff/source/text/txtsecte.cxx                                         |   14 -----
 xmloff/source/xforms/SchemaRestrictionContext.cxx                       |    1 
 xmloff/source/xforms/SchemaSimpleTypeContext.cxx                        |    2 
 xmloff/source/xforms/XFormsBindContext.cxx                              |    1 
 xmloff/source/xforms/XFormsInstanceContext.cxx                          |    4 -
 xmloff/source/xforms/XFormsModelContext.cxx                             |    2 
 xmloff/source/xforms/XFormsSubmissionContext.cxx                        |    3 -
 xmloff/source/xforms/xformsapi.cxx                                      |    2 
 xmloff/source/xforms/xformsexport.cxx                                   |    4 -
 xmlscript/source/xml_helper/xml_byteseq.cxx                             |    1 
 382 files changed, 6 insertions(+), 1163 deletions(-)

New commits:
commit 150ac9cf05ed9da6a2af5bc3f820280fd853e519
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date:   Sun Apr 17 19:20:37 2016 +0200

    clean-up: unused using declarations and includes
    
    Searched source for using declarations.
    Checked if those symbols reappear in the source file,
    even in comments or dead code but not in #include statements.
    If they don't reappear, remove the declaration.
    Remove includes whose symbol got removed.
    
    Change-Id: Ibb77163f63c1120070e9518e3dc0a78c6c59fab0
    Reviewed-on: https://gerrit.libreoffice.org/24148
    Reviewed-by: Jochen Nitschke <j.nitschke+logerrit at ok.de>
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
    Tested-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
index 74d344b6..bcfe905 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
@@ -20,7 +20,6 @@
 
 #include "accessibility/extended/AccessibleBrowseBoxTableCell.hxx"
 #include <svtools/accessibletableprovider.hxx>
-#include "accessibility/extended/AccessibleBrowseBox.hxx"
 #include <toolkit/helper/vclunohelper.hxx>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 
@@ -42,7 +41,6 @@ namespace accessibility
     using namespace ::com::sun::star::lang;
     using namespace utl;
     using namespace comphelper;
-    using ::accessibility::AccessibleBrowseBox;
     using namespace ::com::sun::star::uno;
     using ::com::sun::star::accessibility::XAccessible;
     using namespace ::com::sun::star::accessibility;
diff --git a/accessibility/source/extended/AccessibleGridControlTableCell.cxx b/accessibility/source/extended/AccessibleGridControlTableCell.cxx
index 771b806..b2ca0ee 100644
--- a/accessibility/source/extended/AccessibleGridControlTableCell.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTableCell.cxx
@@ -20,7 +20,6 @@
 
 #include "accessibility/extended/AccessibleGridControlTableCell.hxx"
 #include <svtools/accessibletable.hxx>
-#include "accessibility/extended/AccessibleGridControl.hxx"
 #include <tools/gen.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
@@ -40,7 +39,6 @@ namespace accessibility
     using namespace ::com::sun::star::lang;
     using namespace utl;
     using namespace comphelper;
-    using ::accessibility::AccessibleGridControl;
     using namespace ::com::sun::star::uno;
     using ::com::sun::star::accessibility::XAccessible;
     using namespace ::com::sun::star::accessibility;
diff --git a/basctl/source/basicide/docsignature.cxx b/basctl/source/basicide/docsignature.cxx
index 0168653..05280c0 100644
--- a/basctl/source/basicide/docsignature.cxx
+++ b/basctl/source/basicide/docsignature.cxx
@@ -29,8 +29,6 @@
 namespace basctl
 {
     using ::com::sun::star::uno::Reference;
-    using ::com::sun::star::uno::Exception;
-    using ::com::sun::star::uno::RuntimeException;
     using ::com::sun::star::frame::XModel;
 
     // DocumentSignature::Impl
diff --git a/basctl/source/basicide/documentenumeration.cxx b/basctl/source/basicide/documentenumeration.cxx
index ca74448..8e91502 100644
--- a/basctl/source/basicide/documentenumeration.cxx
+++ b/basctl/source/basicide/documentenumeration.cxx
@@ -26,7 +26,6 @@
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/frame/XModel2.hpp>
 #include <com/sun/star/frame/FrameSearchFlag.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
 
 #include <tools/diagnose_ex.h>
 
@@ -40,15 +39,12 @@ namespace basctl { namespace docs {
     using ::com::sun::star::uno::UNO_SET_THROW;
     using ::com::sun::star::frame::Desktop;
     using ::com::sun::star::frame::XDesktop2;
-    using ::com::sun::star::container::XEnumerationAccess;
     using ::com::sun::star::container::XEnumeration;
     using ::com::sun::star::frame::XModel;
-    using ::com::sun::star::frame::XFramesSupplier;
     using ::com::sun::star::frame::XFrames;
     using ::com::sun::star::frame::XController;
     using ::com::sun::star::frame::XModel2;
     using ::com::sun::star::uno::UNO_QUERY;
-    using ::com::sun::star::lang::XServiceInfo;
     using ::com::sun::star::uno::Sequence;
     using ::com::sun::star::frame::XFrame;
 
diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index 894c23a..c361924 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -42,7 +42,6 @@ namespace basctl
 {
 
 using ::std::map;
-using ::std::pair;
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index 3581c1b..9bf477c 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -30,8 +30,6 @@
 #include <com/sun/star/document/MacroExecMode.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/frame/FrameSearchFlag.hpp>
-#include <com/sun/star/frame/XDesktop.hpp>
-#include <com/sun/star/frame/XModel2.hpp>
 #include <com/sun/star/awt/XWindow2.hpp>
 #include <com/sun/star/document/XEmbeddedScripts.hpp>
 #include <com/sun/star/script/vba/XVBACompatibility.hpp>
@@ -70,7 +68,6 @@ namespace basctl
     using ::com::sun::star::script::XLibraryContainer;
     using ::com::sun::star::uno::UNO_QUERY_THROW;
     using ::com::sun::star::uno::UNO_SET_THROW;
-    using ::com::sun::star::beans::XPropertySetInfo;
     using ::com::sun::star::uno::Exception;
     using ::com::sun::star::container::XNameContainer;
     using ::com::sun::star::container::NoSuchElementException;
@@ -78,7 +75,6 @@ namespace basctl
     using ::com::sun::star::task::XStatusIndicator;
     using ::com::sun::star::uno::makeAny;
     using ::com::sun::star::script::XLibraryContainer2;
-    using ::com::sun::star::lang::XMultiServiceFactory;
     using ::com::sun::star::uri::UriReferenceFactory;
     using ::com::sun::star::uri::XUriReferenceFactory;
     using ::com::sun::star::uri::XUriReference;
@@ -96,14 +92,7 @@ namespace basctl
     using ::com::sun::star::frame::XDispatchProvider;
     using ::com::sun::star::frame::XDispatch;
     using ::com::sun::star::beans::PropertyValue;
-    using ::com::sun::star::frame::XDesktop;
-    using ::com::sun::star::container::XEnumerationAccess;
-    using ::com::sun::star::container::XEnumeration;
-    using ::com::sun::star::frame::XModel2;
     using ::com::sun::star::awt::XWindow2;
-    using ::com::sun::star::document::XEventListener;
-    using ::com::sun::star::lang::EventObject;
-    using ::com::sun::star::uno::RuntimeException;
     using ::com::sun::star::document::XEmbeddedScripts;
     using ::com::sun::star::script::ModuleInfo;
     using ::com::sun::star::script::vba::XVBACompatibility;
diff --git a/basic/source/basmgr/basicmanagerrepository.cxx b/basic/source/basmgr/basicmanagerrepository.cxx
index ba2f691..21e248a 100644
--- a/basic/source/basmgr/basicmanagerrepository.cxx
+++ b/basic/source/basmgr/basicmanagerrepository.cxx
@@ -24,7 +24,6 @@
 #include <basic/sbuno.hxx>
 #include "sbintern.hxx"
 
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/document/XStorageBasedDocument.hpp>
 #include <com/sun/star/document/XEmbeddedScripts.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
@@ -60,9 +59,7 @@ namespace basic
     using ::com::sun::star::uno::UNO_QUERY;
     using ::com::sun::star::embed::XStorage;
     using ::com::sun::star::script::XPersistentLibraryContainer;
-    using ::com::sun::star::lang::XMultiServiceFactory;
     using ::com::sun::star::uno::UNO_QUERY_THROW;
-    using ::com::sun::star::beans::XPropertySet;
     using ::com::sun::star::uno::Exception;
     using ::com::sun::star::document::XStorageBasedDocument;
     using ::com::sun::star::lang::XComponent;
diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.cxx b/chart2/source/controller/accessibility/AccessibleChartElement.cxx
index 70d7178..6e24296 100644
--- a/chart2/source/controller/accessibility/AccessibleChartElement.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartElement.cxx
@@ -39,9 +39,6 @@ using namespace ::com::sun::star::accessibility;
 using ::com::sun::star::uno::UNO_QUERY;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::osl::MutexGuard;
-using ::osl::ClearableMutexGuard;
-using ::osl::ResettableMutexGuard;
 using ::com::sun::star::uno::RuntimeException;
 
 namespace chart
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
index f574bba..94491ca 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
@@ -57,7 +57,6 @@ using namespace ::com::sun::star::chart2;
 using namespace ::chart::ContainerHelper;
 
 using ::com::sun::star::beans::Property;
-using ::osl::MutexGuard;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Any;
diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
index 00a83c6..4a5e3d6 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
@@ -53,7 +53,6 @@
 using namespace ::com::sun::star;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::osl::MutexGuard;
 using ::com::sun::star::chart2::XAnyDescriptionAccess;
 using ::com::sun::star::chart::XComplexDescriptionAccess;
 using ::com::sun::star::chart::XChartData;
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index deb0abe..7379ad1 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -76,7 +76,6 @@ using ::com::sun::star::uno::UNO_QUERY_THROW;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::beans::Property;
-using ::osl::MutexGuard;
 
 namespace
 {
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
index d574566..d8805ea 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
@@ -65,7 +65,6 @@ using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::beans::Property;
 using ::com::sun::star::uno::Any;
-using ::osl::MutexGuard;
 
 namespace
 {
diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
index a430ef0..45ad726 100644
--- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
@@ -39,7 +39,6 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
 
 using ::com::sun::star::beans::Property;
-using ::osl::MutexGuard;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 
diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
index 1b7db85..2a0780a 100644
--- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
@@ -36,7 +36,6 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
 
 using ::com::sun::star::beans::Property;
-using ::osl::MutexGuard;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Any;
diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
index 547697b..7d345de 100644
--- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
@@ -36,7 +36,6 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
 
 using ::com::sun::star::beans::Property;
-using ::osl::MutexGuard;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Any;
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
index a73533c..729b91a 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
@@ -38,7 +38,6 @@
 using namespace ::com::sun::star;
 using ::com::sun::star::uno::Any;
 using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::beans::Property;
 
 namespace chart
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 4a7b468..2767d01 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -73,7 +73,6 @@
 // e.g.  the first cell, or when being in read-only mode
 
 using namespace ::com::sun::star;
-using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Reference;
 
 using namespace ::svt;
diff --git a/chart2/source/controller/main/ChartModelClone.cxx b/chart2/source/controller/main/ChartModelClone.cxx
index d6b6efe..c4f4755 100644
--- a/chart2/source/controller/main/ChartModelClone.cxx
+++ b/chart2/source/controller/main/ChartModelClone.cxx
@@ -39,11 +39,9 @@ namespace chart
 {
 
     using ::com::sun::star::uno::Reference;
-    using ::com::sun::star::uno::XInterface;
     using ::com::sun::star::uno::UNO_QUERY;
     using ::com::sun::star::uno::UNO_QUERY_THROW;
     using ::com::sun::star::uno::Exception;
-    using ::com::sun::star::uno::RuntimeException;
     using ::com::sun::star::uno::Sequence;
     using ::com::sun::star::frame::XModel;
     using ::com::sun::star::util::XCloneable;
diff --git a/chart2/source/controller/main/UndoActions.cxx b/chart2/source/controller/main/UndoActions.cxx
index 4539436..dd02fb4 100644
--- a/chart2/source/controller/main/UndoActions.cxx
+++ b/chart2/source/controller/main/UndoActions.cxx
@@ -23,9 +23,6 @@
 #include "PropertyHelper.hxx"
 #include "ChartModelClone.hxx"
 
-#include <com/sun/star/chart2/XChartDocument.hpp>
-#include <com/sun/star/util/XCloneable.hpp>
-#include <com/sun/star/view/XSelectionSupplier.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 
 #include <tools/diagnose_ex.h>
@@ -41,15 +38,9 @@ namespace chart
 namespace impl
 {
     using ::com::sun::star::uno::Reference;
-    using ::com::sun::star::uno::XInterface;
-    using ::com::sun::star::uno::Exception;
     using ::com::sun::star::uno::RuntimeException;
     using ::com::sun::star::frame::XModel;
-    using ::com::sun::star::util::XCloneable;
-    using ::com::sun::star::lang::XComponent;
     using ::com::sun::star::lang::DisposedException;
-    using ::com::sun::star::view::XSelectionSupplier;
-    using ::com::sun::star::chart2::XChartDocument;
     using ::com::sun::star::document::UndoFailedException;
 
 UndoElement::UndoElement( const OUString& i_actionString, const Reference< XModel >& i_documentModel, const std::shared_ptr< ChartModelClone >& i_modelClone )
diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.cxx b/chart2/source/controller/sidebar/ChartAxisPanel.cxx
index 0adf173..22cda88 100644
--- a/chart2/source/controller/sidebar/ChartAxisPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartAxisPanel.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <sfx2/sidebar/ResourceDefinitions.hrc>
-#include <sfx2/sidebar/Theme.hxx>
 #include <sfx2/sidebar/ControlFactory.hxx>
 
 #include <com/sun/star/chart/ChartAxisLabelPosition.hpp>
@@ -38,7 +37,6 @@
 
 using namespace css;
 using namespace css::uno;
-using ::sfx2::sidebar::Theme;
 
 namespace chart { namespace sidebar {
 
diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.cxx b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
index 3287fc0..b86cb14 100644
--- a/chart2/source/controller/sidebar/ChartElementsPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <sfx2/sidebar/ResourceDefinitions.hrc>
-#include <sfx2/sidebar/Theme.hxx>
 #include <sfx2/sidebar/ControlFactory.hxx>
 #include <com/sun/star/chart2/LegendPosition.hpp>
 #include <com/sun/star/chart/ChartLegendExpansion.hpp>
@@ -49,7 +48,6 @@
 
 using namespace css;
 using namespace css::uno;
-using ::sfx2::sidebar::Theme;
 
 namespace chart { namespace sidebar {
 
diff --git a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx
index e0f69a0..f845dfa 100644
--- a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <sfx2/sidebar/ResourceDefinitions.hrc>
-#include <sfx2/sidebar/Theme.hxx>
 #include <sfx2/sidebar/ControlFactory.hxx>
 
 #include <com/sun/star/chart/ChartAxisLabelPosition.hpp>
@@ -39,7 +38,6 @@
 
 using namespace css;
 using namespace css::uno;
-using ::sfx2::sidebar::Theme;
 
 namespace chart { namespace sidebar {
 
diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
index 512a2d3..c255fb1 100644
--- a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <sfx2/sidebar/ResourceDefinitions.hrc>
-#include <sfx2/sidebar/Theme.hxx>
 #include <sfx2/sidebar/ControlFactory.hxx>
 
 #include <com/sun/star/chart2/DataPointLabel.hpp>
@@ -50,7 +49,6 @@
 
 using namespace css;
 using namespace css::uno;
-using ::sfx2::sidebar::Theme;
 
 namespace chart { namespace sidebar {
 
diff --git a/chart2/source/model/main/DataPoint.cxx b/chart2/source/model/main/DataPoint.cxx
index d988823..274bb4e 100644
--- a/chart2/source/model/main/DataPoint.cxx
+++ b/chart2/source/model/main/DataPoint.cxx
@@ -37,7 +37,6 @@ using namespace ::com::sun::star;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::beans::Property;
-using ::osl::MutexGuard;
 
 namespace
 {
diff --git a/chart2/source/model/main/GridProperties.cxx b/chart2/source/model/main/GridProperties.cxx
index 7eb1350..70aa84e 100644
--- a/chart2/source/model/main/GridProperties.cxx
+++ b/chart2/source/model/main/GridProperties.cxx
@@ -34,7 +34,6 @@ using namespace ::com::sun::star;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::beans::Property;
-using ::osl::MutexGuard;
 
 namespace
 {
diff --git a/chart2/source/model/main/PageBackground.cxx b/chart2/source/model/main/PageBackground.cxx
index 9be30b3..f5fe633 100644
--- a/chart2/source/model/main/PageBackground.cxx
+++ b/chart2/source/model/main/PageBackground.cxx
@@ -36,7 +36,6 @@
 using namespace ::com::sun::star;
 
 using ::com::sun::star::beans::Property;
-using ::osl::MutexGuard;
 
 namespace
 {
diff --git a/chart2/source/model/main/StockBar.cxx b/chart2/source/model/main/StockBar.cxx
index 58a84dd2..9eafe97 100644
--- a/chart2/source/model/main/StockBar.cxx
+++ b/chart2/source/model/main/StockBar.cxx
@@ -36,7 +36,6 @@ using namespace ::com::sun::star;
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::beans::Property;
-using ::osl::MutexGuard;
 
 namespace
 {
diff --git a/chart2/source/model/main/UndoManager.cxx b/chart2/source/model/main/UndoManager.cxx
index 91a4184..08095b2 100644
--- a/chart2/source/model/main/UndoManager.cxx
+++ b/chart2/source/model/main/UndoManager.cxx
@@ -32,7 +32,6 @@ namespace chart
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::uno::XInterface;
     using ::com::sun::star::uno::UNO_QUERY;
-    using ::com::sun::star::uno::Exception;
     using ::com::sun::star::uno::RuntimeException;
     using ::com::sun::star::uno::Sequence;
     using ::com::sun::star::lang::DisposedException;
diff --git a/chart2/source/model/main/Wall.cxx b/chart2/source/model/main/Wall.cxx
index af0fc16..3fa5b18 100644
--- a/chart2/source/model/main/Wall.cxx
+++ b/chart2/source/model/main/Wall.cxx
@@ -41,7 +41,6 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::beans::PropertyAttribute;
 
 using ::com::sun::star::beans::Property;
-using ::osl::MutexGuard;
 
 namespace
 {
diff --git a/chart2/source/model/template/AreaChartTypeTemplate.cxx b/chart2/source/model/template/AreaChartTypeTemplate.cxx
index ecaedfa..42b2f9f 100644
--- a/chart2/source/model/template/AreaChartTypeTemplate.cxx
+++ b/chart2/source/model/template/AreaChartTypeTemplate.cxx
@@ -34,7 +34,6 @@ using namespace ::com::sun::star;
 using ::com::sun::star::beans::Property;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Reference;
-using ::osl::MutexGuard;
 
 namespace
 {
diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx b/chart2/source/model/template/BarChartTypeTemplate.cxx
index b1ad51e..a4db718 100644
--- a/chart2/source/model/template/BarChartTypeTemplate.cxx
+++ b/chart2/source/model/template/BarChartTypeTemplate.cxx
@@ -35,7 +35,6 @@ using namespace ::com::sun::star;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::beans::Property;
-using ::osl::MutexGuard;
 
 namespace
 {
diff --git a/chart2/source/model/template/BubbleChartType.cxx b/chart2/source/model/template/BubbleChartType.cxx
index 188c134..df1731c 100644
--- a/chart2/source/model/template/BubbleChartType.cxx
+++ b/chart2/source/model/template/BubbleChartType.cxx
@@ -35,7 +35,6 @@ using namespace ::com::sun::star;
 using ::com::sun::star::beans::Property;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Reference;
-using ::osl::MutexGuard;
 
 namespace
 {
diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.cxx b/chart2/source/model/template/BubbleChartTypeTemplate.cxx
index b4ef474..fc8fe86 100644
--- a/chart2/source/model/template/BubbleChartTypeTemplate.cxx
+++ b/chart2/source/model/template/BubbleChartTypeTemplate.cxx
@@ -37,7 +37,6 @@ using namespace ::com::sun::star;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::beans::Property;
-using ::osl::MutexGuard;
 
 namespace
 {
diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx
index 0555b81..e9d2b32 100644
--- a/chart2/source/model/template/CandleStickChartType.cxx
+++ b/chart2/source/model/template/CandleStickChartType.cxx
@@ -31,7 +31,6 @@ using namespace ::com::sun::star;
 using ::com::sun::star::beans::Property;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Reference;
-using ::osl::MutexGuard;
 
 namespace
 {
diff --git a/chart2/source/model/template/ChartType.cxx b/chart2/source/model/template/ChartType.cxx
index 4eb9558..7b020dc 100644
--- a/chart2/source/model/template/ChartType.cxx
+++ b/chart2/source/model/template/ChartType.cxx
@@ -35,7 +35,6 @@ using namespace ::com::sun::star;
 using ::com::sun::star::beans::Property;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Reference;
-using ::osl::MutexGuard;
 
 namespace chart
 {
diff --git a/chart2/source/model/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx
index ae5fd64..ad53907 100644
--- a/chart2/source/model/template/ChartTypeManager.cxx
+++ b/chart2/source/model/template/ChartTypeManager.cxx
@@ -53,7 +53,6 @@
 using namespace ::com::sun::star;
 
 using ::com::sun::star::uno::Sequence;
-using ::osl::MutexGuard;
 
 namespace
 {
diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
index ce14045..4d81f4e 100644
--- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
@@ -39,7 +39,6 @@ using namespace ::com::sun::star;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::beans::Property;
-using ::osl::MutexGuard;
 
 namespace
 {
diff --git a/chart2/source/model/template/FilledNetChartType.cxx b/chart2/source/model/template/FilledNetChartType.cxx
index 25100e4..5a04305 100644
--- a/chart2/source/model/template/FilledNetChartType.cxx
+++ b/chart2/source/model/template/FilledNetChartType.cxx
@@ -25,16 +25,13 @@
 #include "servicenames_charttypes.hxx"
 #include "ContainerHelper.hxx"
 #include "AxisIndexDefines.hxx"
-#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/chart2/AxisType.hpp>
 #include <cppuhelper/supportsservice.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
 
-using ::com::sun::star::beans::Property;
 using ::com::sun::star::uno::Sequence;
-using ::osl::MutexGuard;
 
 namespace chart
 {
diff --git a/chart2/source/model/template/LineChartType.cxx b/chart2/source/model/template/LineChartType.cxx
index 30ea4a4..1b77e28 100644
--- a/chart2/source/model/template/LineChartType.cxx
+++ b/chart2/source/model/template/LineChartType.cxx
@@ -32,7 +32,6 @@ using namespace ::com::sun::star;
 
 using ::com::sun::star::beans::Property;
 using ::com::sun::star::uno::Sequence;
-using ::osl::MutexGuard;
 
 namespace
 {
diff --git a/chart2/source/model/template/LineChartTypeTemplate.cxx b/chart2/source/model/template/LineChartTypeTemplate.cxx
index 457e8c6..9796f4e 100644
--- a/chart2/source/model/template/LineChartTypeTemplate.cxx
+++ b/chart2/source/model/template/LineChartTypeTemplate.cxx
@@ -38,7 +38,6 @@ using namespace ::com::sun::star;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::beans::Property;
-using ::osl::MutexGuard;
 
 namespace
 {
diff --git a/chart2/source/model/template/NetChartType.cxx b/chart2/source/model/template/NetChartType.cxx
index df8f238..c1ca343 100644
--- a/chart2/source/model/template/NetChartType.cxx
+++ b/chart2/source/model/template/NetChartType.cxx
@@ -36,7 +36,6 @@ using namespace ::com::sun::star::chart2;
 using ::com::sun::star::beans::Property;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Reference;
-using ::osl::MutexGuard;
 
 namespace chart
 {
diff --git a/chart2/source/model/template/NetChartTypeTemplate.cxx b/chart2/source/model/template/NetChartTypeTemplate.cxx
index 68dc521..b4a5954 100644
--- a/chart2/source/model/template/NetChartTypeTemplate.cxx
+++ b/chart2/source/model/template/NetChartTypeTemplate.cxx
@@ -31,7 +31,6 @@ using namespace ::com::sun::star;
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::osl::MutexGuard;
 
 namespace chart
 {
diff --git a/chart2/source/model/template/PieChartType.cxx b/chart2/source/model/template/PieChartType.cxx
index 98d0f50..e20a341 100644
--- a/chart2/source/model/template/PieChartType.cxx
+++ b/chart2/source/model/template/PieChartType.cxx
@@ -34,7 +34,6 @@ using namespace ::com::sun::star;
 using ::com::sun::star::beans::Property;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Reference;
-using ::osl::MutexGuard;
 
 namespace
 {
diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx
index 3871db1..78e113e 100644
--- a/chart2/source/model/template/PieChartTypeTemplate.cxx
+++ b/chart2/source/model/template/PieChartTypeTemplate.cxx
@@ -43,7 +43,6 @@ using namespace ::com::sun::star;
 using ::com::sun::star::beans::Property;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Reference;
-using ::osl::MutexGuard;
 
 namespace
 {
diff --git a/chart2/source/model/template/ScatterChartType.cxx b/chart2/source/model/template/ScatterChartType.cxx
index b009a8c..c7db754 100644
--- a/chart2/source/model/template/ScatterChartType.cxx
+++ b/chart2/source/model/template/ScatterChartType.cxx
@@ -37,7 +37,6 @@ using namespace ::com::sun::star;
 using ::com::sun::star::beans::Property;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Reference;
-using ::osl::MutexGuard;
 
 namespace
 {
diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.cxx b/chart2/source/model/template/ScatterChartTypeTemplate.cxx
index 7f6dee8..aefdf20 100644
--- a/chart2/source/model/template/ScatterChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ScatterChartTypeTemplate.cxx
@@ -40,7 +40,6 @@ using namespace ::com::sun::star;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::beans::Property;
-using ::osl::MutexGuard;
 
 namespace
 {
diff --git a/chart2/source/model/template/StockChartTypeTemplate.cxx b/chart2/source/model/template/StockChartTypeTemplate.cxx
index 85d8d5e..d58bcb4 100644
--- a/chart2/source/model/template/StockChartTypeTemplate.cxx
+++ b/chart2/source/model/template/StockChartTypeTemplate.cxx
@@ -45,7 +45,6 @@ using namespace ::com::sun::star::chart2;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::beans::Property;
-using ::osl::MutexGuard;
 
 namespace
 {
diff --git a/chart2/source/tools/DataSource.cxx b/chart2/source/tools/DataSource.cxx
index 82c6ffad..724775d 100644
--- a/chart2/source/tools/DataSource.cxx
+++ b/chart2/source/tools/DataSource.cxx
@@ -21,7 +21,6 @@
 #include "LabeledDataSequence.hxx"
 #include <cppuhelper/supportsservice.hxx>
 
-using ::osl::MutexGuard;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::RuntimeException;
diff --git a/chart2/source/tools/OPropertySet.cxx b/chart2/source/tools/OPropertySet.cxx
index 4c00807..29d751c3 100644
--- a/chart2/source/tools/OPropertySet.cxx
+++ b/chart2/source/tools/OPropertySet.cxx
@@ -40,7 +40,6 @@ using ::osl::MutexGuard;
 // needed for MS compiler
 using ::cppu::OBroadcastHelper;
 using ::cppu::OPropertySetHelper;
-using ::cppu::OWeakObject;
 
 namespace property
 {
diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx
index e74f185..185354c 100644
--- a/chart2/source/tools/RegressionCurveModel.cxx
+++ b/chart2/source/tools/RegressionCurveModel.cxx
@@ -34,7 +34,6 @@
 using namespace ::com::sun::star;
 
 using ::com::sun::star::beans::Property;
-using ::osl::MutexGuard;
 
 namespace
 {
diff --git a/chart2/source/view/axes/Tickmarks_Dates.cxx b/chart2/source/view/axes/Tickmarks_Dates.cxx
index 5b9b9da..51ba441 100644
--- a/chart2/source/view/axes/Tickmarks_Dates.cxx
+++ b/chart2/source/view/axes/Tickmarks_Dates.cxx
@@ -27,7 +27,6 @@ namespace chart
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
 using namespace ::rtl::math;
-using ::basegfx::B2DVector;
 using ::com::sun::star::chart::TimeUnit::DAY;
 using ::com::sun::star::chart::TimeUnit::MONTH;
 using ::com::sun::star::chart::TimeUnit::YEAR;
diff --git a/chart2/source/view/axes/Tickmarks_Equidistant.cxx b/chart2/source/view/axes/Tickmarks_Equidistant.cxx
index 792635b..b1ddc87 100644
--- a/chart2/source/view/axes/Tickmarks_Equidistant.cxx
+++ b/chart2/source/view/axes/Tickmarks_Equidistant.cxx
@@ -28,7 +28,6 @@ namespace chart
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
 using namespace ::rtl::math;
-using ::basegfx::B2DVector;
 
 //static
 double EquidistantTickFactory::getMinimumAtIncrement( double fMin, const ExplicitIncrementData& rIncrement )
diff --git a/chart2/source/view/main/OpenglShapeFactory.cxx b/chart2/source/view/main/OpenglShapeFactory.cxx
index 964adb9..6c1e589 100644
--- a/chart2/source/view/main/OpenglShapeFactory.cxx
+++ b/chart2/source/view/main/OpenglShapeFactory.cxx
@@ -65,8 +65,6 @@ extern "C" {
                               {    return new opengl::OpenglShapeFactory();}
     }
 
-using dummy::DummyXShape;
-using dummy::DummyXShapes;
 using dummy::DummyCylinder;
 using dummy::DummyRectangle;
 using dummy::DummyPyramid;
diff --git a/chart2/source/view/main/VLegendSymbolFactory.cxx b/chart2/source/view/main/VLegendSymbolFactory.cxx
index aff64eb..b7abf08 100644
--- a/chart2/source/view/main/VLegendSymbolFactory.cxx
+++ b/chart2/source/view/main/VLegendSymbolFactory.cxx
@@ -27,7 +27,6 @@
 
 using namespace ::com::sun::star;
 using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::Sequence;
 
 namespace
 {
diff --git a/codemaker/source/cppumaker/cppuoptions.cxx b/codemaker/source/cppumaker/cppuoptions.cxx
index 0744dea..01e5f8c 100644
--- a/codemaker/source/cppumaker/cppuoptions.cxx
+++ b/codemaker/source/cppumaker/cppuoptions.cxx
@@ -24,8 +24,6 @@
 #include "osl/thread.h"
 #include "osl/process.h"
 
-using ::rtl::OUString;
-using ::rtl::OUStringToOString;
 using ::rtl::OString;
 
 #ifdef SAL_UNX
diff --git a/comphelper/source/misc/accimplaccess.cxx b/comphelper/source/misc/accimplaccess.cxx
index a9b265e..76ed77c 100644
--- a/comphelper/source/misc/accimplaccess.cxx
+++ b/comphelper/source/misc/accimplaccess.cxx
@@ -19,7 +19,6 @@
 
 #include <comphelper/accimplaccess.hxx>
 #include <com/sun/star/accessibility/XAccessible.hpp>
-#include <com/sun/star/accessibility/XAccessibleContext.hpp>
 #include <cppuhelper/typeprovider.hxx>
 #include <osl/diagnose.h>
 
@@ -33,11 +32,8 @@ namespace comphelper
 
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::uno::Sequence;
-    using ::com::sun::star::uno::Exception;
     using ::com::sun::star::uno::RuntimeException;
-    using ::com::sun::star::lang::XUnoTunnel;
     using ::com::sun::star::accessibility::XAccessible;
-    using ::com::sun::star::accessibility::XAccessibleContext;
 
     struct OAccImpl_Impl
     {
diff --git a/comphelper/source/misc/anycompare.cxx b/comphelper/source/misc/anycompare.cxx
index 07c75579..18ae7bd 100644
--- a/comphelper/source/misc/anycompare.cxx
+++ b/comphelper/source/misc/anycompare.cxx
@@ -26,9 +26,6 @@
 namespace comphelper
 {
     using ::com::sun::star::uno::Reference;
-    using ::com::sun::star::uno::XInterface;
-    using ::com::sun::star::uno::Exception;
-    using ::com::sun::star::uno::RuntimeException;
     using ::com::sun::star::uno::Type;
     using ::com::sun::star::uno::TypeClass_CHAR;
     using ::com::sun::star::uno::TypeClass_BOOLEAN;
diff --git a/comphelper/source/misc/componentmodule.cxx b/comphelper/source/misc/componentmodule.cxx
index 7e91b3c..fede3e2 100644
--- a/comphelper/source/misc/componentmodule.cxx
+++ b/comphelper/source/misc/componentmodule.cxx
@@ -33,9 +33,6 @@ namespace comphelper
     using ::com::sun::star::uno::Sequence;
     using ::com::sun::star::uno::RuntimeException;
     using ::com::sun::star::uno::Reference;
-    using ::com::sun::star::lang::XMultiServiceFactory;
-    using ::com::sun::star::registry::XRegistryKey;
-    using ::com::sun::star::uno::Exception;
     using ::com::sun::star::uno::XInterface;
 
     typedef ::std::vector< ComponentDescription >   ComponentDescriptions;
diff --git a/comphelper/source/misc/docpasswordrequest.cxx b/comphelper/source/misc/docpasswordrequest.cxx
index ade16fe..29cf4a9 100644
--- a/comphelper/source/misc/docpasswordrequest.cxx
+++ b/comphelper/source/misc/docpasswordrequest.cxx
@@ -39,7 +39,6 @@ using ::com::sun::star::task::PasswordRequestMode;
 using ::com::sun::star::task::XInteractionAbort;
 using ::com::sun::star::task::XInteractionContinuation;
 using ::com::sun::star::task::XInteractionPassword2;
-using ::com::sun::star::task::XInteractionRequest;
 
 namespace comphelper {
 
diff --git a/comphelper/source/misc/documentinfo.cxx b/comphelper/source/misc/documentinfo.cxx
index a30b041..b4cf505 100644
--- a/comphelper/source/misc/documentinfo.cxx
+++ b/comphelper/source/misc/documentinfo.cxx
@@ -21,7 +21,6 @@
 #include <comphelper/documentinfo.hxx>
 #include <comphelper/namedvaluecollection.hxx>
 
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <com/sun/star/document/XDocumentProperties.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
@@ -39,15 +38,12 @@ namespace comphelper {
     using ::com::sun::star::uno::UNO_QUERY;
     using ::com::sun::star::uno::UNO_QUERY_THROW;
     using ::com::sun::star::uno::Exception;
-    using ::com::sun::star::uno::RuntimeException;
     using ::com::sun::star::frame::XModel;
     using ::com::sun::star::frame::XTitle;
     using ::com::sun::star::frame::XController;
-    using ::com::sun::star::beans::XPropertySet;
     using ::com::sun::star::document::XDocumentPropertiesSupplier;
     using ::com::sun::star::document::XDocumentProperties;
     using ::com::sun::star::frame::XStorable;
-    using ::com::sun::star::beans::XPropertySetInfo;
     using ::com::sun::star::uno::XInterface;
     using ::com::sun::star::frame::XFrame;
 
diff --git a/comphelper/source/misc/logging.cxx b/comphelper/source/misc/logging.cxx
index dcab775..0899e61 100644
--- a/comphelper/source/misc/logging.cxx
+++ b/comphelper/source/misc/logging.cxx
@@ -41,7 +41,6 @@ namespace comphelper
     using ::com::sun::star::logging::XLogger;
     using ::com::sun::star::uno::UNO_QUERY_THROW;
     using ::com::sun::star::uno::Exception;
-    using ::com::sun::star::logging::XLogHandler;
     using ::com::sun::star::resource::XResourceBundle;
     using ::com::sun::star::resource::XResourceBundleLoader;
 
diff --git a/comphelper/source/property/ChainablePropertySetInfo.cxx b/comphelper/source/property/ChainablePropertySetInfo.cxx
index 3cb989c..4a2c347 100644
--- a/comphelper/source/property/ChainablePropertySetInfo.cxx
+++ b/comphelper/source/property/ChainablePropertySetInfo.cxx
@@ -24,10 +24,8 @@ using ::comphelper::PropertyInfo;
 using ::comphelper::ChainablePropertySetInfo;
 using ::com::sun::star::uno::Type;
 using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::uno::XInterface;
 using ::com::sun::star::uno::RuntimeException;
 using ::com::sun::star::beans::Property;
-using ::com::sun::star::beans::XPropertySetInfo;
 using ::com::sun::star::beans::UnknownPropertyException;
 
 ChainablePropertySetInfo::ChainablePropertySetInfo( PropertyInfo const * pMap )
diff --git a/comphelper/source/property/MasterPropertySetInfo.cxx b/comphelper/source/property/MasterPropertySetInfo.cxx
index 0fd7aca..1db0906 100644
--- a/comphelper/source/property/MasterPropertySetInfo.cxx
+++ b/comphelper/source/property/MasterPropertySetInfo.cxx
@@ -24,10 +24,8 @@ using ::comphelper::PropertyInfo;
 using ::comphelper::MasterPropertySetInfo;
 using ::com::sun::star::uno::Type;
 using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::uno::XInterface;
 using ::com::sun::star::uno::RuntimeException;
 using ::com::sun::star::beans::Property;
-using ::com::sun::star::beans::XPropertySetInfo;
 using ::com::sun::star::beans::UnknownPropertyException;
 
 MasterPropertySetInfo::MasterPropertySetInfo( PropertyInfo const * pMap )
diff --git a/connectivity/source/commontools/RowFunctionParser.cxx b/connectivity/source/commontools/RowFunctionParser.cxx
index ef2e77a..94c2e4f 100644
--- a/connectivity/source/commontools/RowFunctionParser.cxx
+++ b/connectivity/source/commontools/RowFunctionParser.cxx
@@ -302,12 +302,9 @@ public:
         // grammar definition
         explicit definition( const ExpressionGrammar& self )
         {
-            using ::boost::spirit::str_p;
             using ::boost::spirit::space_p;
             using ::boost::spirit::range_p;
             using ::boost::spirit::lexeme_d;
-            using ::boost::spirit::real_parser;
-            using ::boost::spirit::chseq_p;
             using ::boost::spirit::ch_p;
             using ::boost::spirit::int_p;
             using ::boost::spirit::as_lower_d;
diff --git a/connectivity/source/commontools/dbmetadata.cxx b/connectivity/source/commontools/dbmetadata.cxx
index 1b0795b..090d410 100644
--- a/connectivity/source/commontools/dbmetadata.cxx
+++ b/connectivity/source/commontools/dbmetadata.cxx
@@ -27,13 +27,10 @@
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <com/sun/star/sdb/BooleanComparisonMode.hpp>
 #include <com/sun/star/sdbc/XDatabaseMetaData2.hpp>
 #include <com/sun/star/sdbcx/XUsersSupplier.hpp>
 #include <com/sun/star/sdbcx/XDataDefinitionSupplier.hpp>
-#include <com/sun/star/sdbc/XDriverAccess.hpp>
 #include <com/sun/star/sdbc/DriverManager.hpp>
 
 #include <tools/diagnose_ex.h>
@@ -59,12 +56,9 @@ namespace dbtools
     using ::com::sun::star::container::XChild;
     using ::com::sun::star::uno::UNO_QUERY_THROW;
     using ::com::sun::star::beans::XPropertySet;
-    using ::com::sun::star::beans::PropertyValue;
-    using ::com::sun::star::beans::XPropertySetInfo;
     using ::com::sun::star::uno::UNO_QUERY;
     using ::com::sun::star::sdbcx::XUsersSupplier;
     using ::com::sun::star::sdbcx::XDataDefinitionSupplier;
-    using ::com::sun::star::sdbc::XDriverAccess;
     using ::com::sun::star::sdbc::DriverManager;
     using ::com::sun::star::sdbc::XDriverManager2;
     using ::com::sun::star::uno::UNO_SET_THROW;
diff --git a/connectivity/source/commontools/formattedcolumnvalue.cxx b/connectivity/source/commontools/formattedcolumnvalue.cxx
index 3a8bb3a..8a75af3 100644
--- a/connectivity/source/commontools/formattedcolumnvalue.cxx
+++ b/connectivity/source/commontools/formattedcolumnvalue.cxx
@@ -45,7 +45,6 @@ namespace dbtools
     using ::com::sun::star::uno::UNO_QUERY_THROW;
     using ::com::sun::star::uno::UNO_SET_THROW;
     using ::com::sun::star::uno::Exception;
-    using ::com::sun::star::uno::RuntimeException;
     using ::com::sun::star::uno::XComponentContext;
     using ::com::sun::star::sdbc::XRowSet;
     using ::com::sun::star::beans::XPropertySet;
@@ -59,7 +58,6 @@ namespace dbtools
     using ::com::sun::star::util::XNumberFormatTypes;
     using ::com::sun::star::sdb::XColumn;
     using ::com::sun::star::sdb::XColumnUpdate;
-    using ::com::sun::star::lang::XComponent;
 
     namespace DataType = ::com::sun::star::sdbc::DataType;
     namespace NumberFormat = ::com::sun::star::util::NumberFormat;
diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx
index ab06dcb..29119e7 100644
--- a/connectivity/source/commontools/predicateinput.cxx
+++ b/connectivity/source/commontools/predicateinput.cxx
@@ -41,7 +41,6 @@ namespace dbtools
     using ::com::sun::star::sdbc::XConnection;
     using ::com::sun::star::util::XNumberFormatsSupplier;
     using ::com::sun::star::util::NumberFormatter;
-    using ::com::sun::star::util::XNumberFormatter;
     using ::com::sun::star::uno::UNO_QUERY_THROW;
     using ::com::sun::star::uno::XComponentContext;
     using ::com::sun::star::beans::XPropertySet;
@@ -50,7 +49,6 @@ namespace dbtools
     using ::com::sun::star::uno::Exception;
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::i18n::LocaleData;
-    using ::com::sun::star::i18n::XLocaleData;
     using ::com::sun::star::i18n::LocaleDataItem;
     using ::com::sun::star::uno::Any;
 
diff --git a/connectivity/source/commontools/sqlerror.cxx b/connectivity/source/commontools/sqlerror.cxx
index 0d93a5f..6dc4681 100644
--- a/connectivity/source/commontools/sqlerror.cxx
+++ b/connectivity/source/commontools/sqlerror.cxx
@@ -35,8 +35,6 @@ namespace connectivity
 
 
     using ::com::sun::star::uno::Reference;
-    using ::com::sun::star::uno::Exception;
-    using ::com::sun::star::uno::RuntimeException;
     using ::com::sun::star::uno::Any;
     using ::com::sun::star::uno::XInterface;
     using ::com::sun::star::uno::XComponentContext;
diff --git a/connectivity/source/drivers/firebird/Services.cxx b/connectivity/source/drivers/firebird/Services.cxx
index 83ebcbe..87c819c 100644
--- a/connectivity/source/drivers/firebird/Services.cxx
+++ b/connectivity/source/drivers/firebird/Services.cxx
@@ -27,7 +27,6 @@ using namespace connectivity::firebird;
 using ::rtl::OUString;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::registry::XRegistryKey;
 using ::com::sun::star::lang::XSingleServiceFactory;
 using ::com::sun::star::lang::XMultiServiceFactory;
 
diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx
index 294a9f0..aa69602 100644
--- a/connectivity/source/drivers/hsqldb/HConnection.cxx
+++ b/connectivity/source/drivers/hsqldb/HConnection.cxx
@@ -24,10 +24,8 @@
 
 #include <connectivity/dbtools.hxx>
 
-#include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/sdbcx/XDataDefinitionSupplier.hpp>
-#include <com/sun/star/lang/ServiceNotRegisteredException.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/graphic/GraphicProvider.hpp>
 #include <com/sun/star/graphic/XGraphicProvider.hpp>
@@ -59,11 +57,8 @@ using ::com::sun::star::sdbcx::XDataDefinitionSupplier;
 using ::com::sun::star::sdbcx::XTablesSupplier;
 using ::com::sun::star::container::XNameAccess;
 using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::beans::NamedValue;
 using ::com::sun::star::lang::WrappedTargetException;
-using ::com::sun::star::lang::ServiceNotRegisteredException;
 using ::com::sun::star::sdbc::XDriver;
-using ::com::sun::star::lang::XMultiServiceFactory;
 using ::com::sun::star::graphic::XGraphic;
 using ::com::sun::star::graphic::GraphicProvider;
 using ::com::sun::star::graphic::XGraphicProvider;
diff --git a/connectivity/source/drivers/hsqldb/HView.cxx b/connectivity/source/drivers/hsqldb/HView.cxx
index 27efd67..7498422 100644
--- a/connectivity/source/drivers/hsqldb/HView.cxx
+++ b/connectivity/source/drivers/hsqldb/HView.cxx
@@ -44,7 +44,6 @@ namespace connectivity { namespace hsqldb
     using ::com::sun::star::uno::Exception;
     using ::com::sun::star::uno::RuntimeException;
     using ::com::sun::star::uno::Any;
-    using ::com::sun::star::sdbc::XDatabaseMetaData;
     using ::com::sun::star::sdbc::SQLException;
     using ::com::sun::star::sdbc::XConnection;
     using ::com::sun::star::lang::WrappedTargetException;
diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
index acb92e1..8884e38 100644
--- a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
@@ -58,9 +58,6 @@ using osl::MutexGuard;
 
 
 using com::sun::star::beans::XPropertySetInfo;
-using com::sun::star::beans::XPropertySet;
-using com::sun::star::beans::XMultiPropertySet;
-using com::sun::star::beans::XFastPropertySet;
 
 using com::sun::star::uno::Any;
 using com::sun::star::uno::makeAny;
@@ -73,16 +70,9 @@ using com::sun::star::uno::XInterface;
 
 using com::sun::star::lang::IllegalArgumentException;
 
-using com::sun::star::sdbc::XWarningsSupplier;
-using com::sun::star::sdbc::XCloseable;
-using com::sun::star::sdbc::XStatement;
-using com::sun::star::sdbc::XResultSet;
-using com::sun::star::sdbc::XConnection;
 using com::sun::star::sdbc::SQLException;
 using com::sun::star::sdbc::XRow;
-using com::sun::star::sdbc::XColumnLocate;
 using com::sun::star::sdbc::XResultSetMetaData;
-using com::sun::star::sdbc::XResultSetMetaDataSupplier;
 
 
 using com::sun::star::beans::Property;
diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx
index 91014ad..1a4d5e4 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.cxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.cxx
@@ -61,14 +61,12 @@
 
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/script/Converter.hpp>
-#include <com/sun/star/sdbc/XRow.hpp>
 
 using osl::MutexGuard;
 
 using com::sun::star::container::XNameAccess;
 
 using com::sun::star::lang::XComponent;
-using com::sun::star::lang::XInitialization;
 using com::sun::star::lang::IllegalArgumentException;
 
 using com::sun::star::script::Converter;
@@ -84,14 +82,9 @@ using com::sun::star::uno::XComponentContext;
 using com::sun::star::uno::Any;
 
 using com::sun::star::beans::PropertyValue;
-using com::sun::star::beans::XPropertySet;
 
-using com::sun::star::sdbc::XConnection;
-using com::sun::star::sdbc::XResultSet;
-using com::sun::star::sdbc::XRow;
 using com::sun::star::sdbc::XCloseable;
 using com::sun::star::sdbc::SQLException;
-using com::sun::star::sdbc::XWarningsSupplier;
 using com::sun::star::sdbc::XPreparedStatement;
 using com::sun::star::sdbc::XStatement;
 using com::sun::star::sdbc::XDatabaseMetaData;
diff --git a/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx b/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx
index cea2dba..ff6aa44 100644
--- a/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx
@@ -47,11 +47,8 @@ using com::sun::star::uno::Type;
 using com::sun::star::uno::RuntimeException;
 
 using com::sun::star::sdbc::SQLException;
-using com::sun::star::sdbc::XResultSet;
 using com::sun::star::sdbc::XResultSetUpdate;
 using com::sun::star::sdbc::XRowUpdate;
-using com::sun::star::sdbc::XRow;
-using com::sun::star::sdbc::XStatement;
 
 namespace pq_sdbc_driver
 {
diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
index 0bd05a5..47142ea 100644
--- a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
@@ -67,29 +67,21 @@ using com::sun::star::uno::RuntimeException;
 using com::sun::star::uno::Exception;
 using com::sun::star::uno::Sequence;
 using com::sun::star::uno::Reference;
-using com::sun::star::uno::XInterface;
 using com::sun::star::uno::UNO_QUERY;
 
 using com::sun::star::lang::IllegalArgumentException;
 
-using com::sun::star::sdbc::XWarningsSupplier;
 using com::sun::star::sdbc::XCloseable;
-using com::sun::star::sdbc::XPreparedStatement;
-using com::sun::star::sdbc::XParameters;
 using com::sun::star::sdbc::XResultSet;
 using com::sun::star::sdbc::XRef;
 using com::sun::star::sdbc::XBlob;
 using com::sun::star::sdbc::XClob;
 using com::sun::star::sdbc::XArray;
 using com::sun::star::sdbc::XConnection;
-using com::sun::star::sdbc::XGeneratedResultSet;
 using com::sun::star::sdbc::SQLException;
 
 using com::sun::star::beans::Property;
 using com::sun::star::beans::XPropertySetInfo;
-using com::sun::star::beans::XPropertySet;
-using com::sun::star::beans::XMultiPropertySet;
-using com::sun::star::beans::XFastPropertySet;
 
 using namespace dbtools;
 
diff --git a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
index ee82f30..e2510bb 100644
--- a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
@@ -47,7 +47,6 @@
 
 #include <string.h>
 
-using osl::Mutex;
 using osl::MutexGuard;
 
 
@@ -55,10 +54,8 @@ using com::sun::star::uno::Any;
 using com::sun::star::uno::RuntimeException;
 using com::sun::star::uno::Exception;
 using com::sun::star::uno::Reference;
-using com::sun::star::uno::XInterface;
 using com::sun::star::uno::UNO_QUERY;
 
-using com::sun::star::lang::IllegalArgumentException;
 
 using com::sun::star::sdbc::SQLException;
 using com::sun::star::sdbc::XStatement;
diff --git a/connectivity/source/drivers/postgresql/pq_statement.cxx b/connectivity/source/drivers/postgresql/pq_statement.cxx
index 60be95b..ebaabb5 100644
--- a/connectivity/source/drivers/postgresql/pq_statement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_statement.cxx
@@ -82,26 +82,21 @@ using com::sun::star::uno::UNO_QUERY;
 
 using com::sun::star::lang::IllegalArgumentException;
 
-using com::sun::star::sdbc::XWarningsSupplier;
 using com::sun::star::sdbc::XCloseable;
 using com::sun::star::sdbc::XStatement;
 using com::sun::star::sdbc::XPreparedStatement;
 using com::sun::star::sdbc::XParameters;
 using com::sun::star::sdbc::XRow;
 using com::sun::star::sdbc::XResultSet;
-using com::sun::star::sdbc::XGeneratedResultSet;
 using com::sun::star::sdbc::XConnection;
 using com::sun::star::sdbc::SQLException;
 
 using com::sun::star::sdbcx::XColumnsSupplier;
-using com::sun::star::sdbcx::XTablesSupplier;
 using com::sun::star::sdbcx::XKeysSupplier;
 
 using com::sun::star::beans::Property;
 using com::sun::star::beans::XPropertySetInfo;
 using com::sun::star::beans::XPropertySet;
-using com::sun::star::beans::XFastPropertySet;
-using com::sun::star::beans::XMultiPropertySet;
 
 using com::sun::star::container::XNameAccess;
 using com::sun::star::container::XEnumerationAccess;
diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx b/connectivity/source/drivers/postgresql/pq_tools.cxx
index 672ef5d..c55834d 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.cxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.cxx
@@ -68,7 +68,6 @@ using com::sun::star::sdbc::XRow;
 
 using com::sun::star::sdbcx::XColumnsSupplier;
 
-using com::sun::star::uno::RuntimeException;
 using com::sun::star::uno::UNO_QUERY;
 using com::sun::star::uno::UNO_QUERY_THROW;
 using com::sun::star::uno::Reference;
diff --git a/connectivity/source/drivers/postgresql/pq_xbase.cxx b/connectivity/source/drivers/postgresql/pq_xbase.cxx
index bfee078..a29b2a3 100644
--- a/connectivity/source/drivers/postgresql/pq_xbase.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xbase.cxx
@@ -52,8 +52,6 @@ using com::sun::star::uno::RuntimeException;
 
 using com::sun::star::beans::Property;
 using com::sun::star::beans::XPropertySetInfo;
-using com::sun::star::beans::XMultiPropertySet;
-using com::sun::star::beans::XFastPropertySet;
 using com::sun::star::beans::XPropertySet;
 
 namespace pq_sdbc_driver
diff --git a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
index f580641..a26b582 100644
--- a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
@@ -38,7 +38,6 @@
 #include <rtl/strbuf.hxx>
 
 #include <com/sun/star/sdbc/XRow.hpp>
-#include <com/sun/star/sdbc/XParameters.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 
@@ -59,19 +58,14 @@ using com::sun::star::beans::PropertyChangeEvent;
 using com::sun::star::uno::Any;
 using com::sun::star::uno::makeAny;
 using com::sun::star::uno::UNO_QUERY;
-using com::sun::star::uno::XInterface;
 using com::sun::star::uno::Reference;
 using com::sun::star::uno::RuntimeException;
 
 using com::sun::star::container::NoSuchElementException;
-using com::sun::star::lang::WrappedTargetException;
 
 using com::sun::star::sdbc::XRow;
-using com::sun::star::sdbc::XCloseable;
 using com::sun::star::sdbc::XStatement;
 using com::sun::star::sdbc::XResultSet;
-using com::sun::star::sdbc::XParameters;
-using com::sun::star::sdbc::XPreparedStatement;
 using com::sun::star::sdbc::XDatabaseMetaData;
 using com::sun::star::sdbc::SQLException;
 
diff --git a/connectivity/source/drivers/postgresql/pq_xcolumns.hxx b/connectivity/source/drivers/postgresql/pq_xcolumns.hxx
index ef32525..0af1337 100644
--- a/connectivity/source/drivers/postgresql/pq_xcolumns.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xcolumns.hxx
@@ -39,6 +39,7 @@
 
 #include "pq_xcontainer.hxx"
 #include "pq_xbase.hxx"
+#include <com/sun/star/sdbc/XRow.hpp>
 
 namespace pq_sdbc_driver
 {
diff --git a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
index 1e383df..2f92174 100644
--- a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
@@ -36,10 +36,6 @@
 
 #include <rtl/ustrbuf.hxx>
 
-#include <com/sun/star/sdbc/XRow.hpp>
-#include <com/sun/star/sdbc/XParameters.hpp>
-
-
 #include <cppuhelper/implbase.hxx>
 
 #include "pq_xcontainer.hxx"
@@ -48,7 +44,6 @@
 
 using osl::MutexGuard;
 
-
 using com::sun::star::beans::XPropertySet;
 
 using com::sun::star::uno::Any;
@@ -68,13 +63,6 @@ using com::sun::star::lang::XEventListener;
 
 using com::sun::star::lang::WrappedTargetException;
 
-using com::sun::star::sdbc::XRow;
-using com::sun::star::sdbc::XCloseable;
-using com::sun::star::sdbc::XStatement;
-using com::sun::star::sdbc::XResultSet;
-using com::sun::star::sdbc::XParameters;
-using com::sun::star::sdbc::XPreparedStatement;
-using com::sun::star::sdbcx::XDataDescriptorFactory;
 
 namespace pq_sdbc_driver
 {
diff --git a/connectivity/source/drivers/postgresql/pq_xindex.cxx b/connectivity/source/drivers/postgresql/pq_xindex.cxx
index b0ab5a60..55b53e9 100644
--- a/connectivity/source/drivers/postgresql/pq_xindex.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xindex.cxx
@@ -41,9 +41,6 @@
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 
-#include <com/sun/star/sdbc/XRow.hpp>
-#include <com/sun/star/sdbc/XParameters.hpp>
-
 #include "pq_xindex.hxx"
 #include "pq_xindexcolumns.hxx"
 #include "pq_tools.hxx"
@@ -52,35 +49,16 @@
 using osl::MutexGuard;
 using osl::Mutex;
 
-
 using com::sun::star::container::XNameAccess;
-using com::sun::star::container::XIndexAccess;
-using com::sun::star::container::ElementExistException;
-using com::sun::star::container::NoSuchElementException;
 
 using com::sun::star::uno::Reference;
-using com::sun::star::uno::Exception;
-using com::sun::star::uno::XInterface;
 using com::sun::star::uno::Sequence;
 using com::sun::star::uno::Any;
 using com::sun::star::uno::Type;
 using com::sun::star::uno::RuntimeException;
 
-using com::sun::star::lang::IllegalArgumentException;
-using com::sun::star::lang::IndexOutOfBoundsException;
-
-using com::sun::star::beans::XPropertySetInfo;
-using com::sun::star::beans::XFastPropertySet;
-using com::sun::star::beans::XMultiPropertySet;
 using com::sun::star::beans::XPropertySet;
-using com::sun::star::beans::Property;
-
-using com::sun::star::sdbc::XResultSet;
-using com::sun::star::sdbc::XPreparedStatement;
-using com::sun::star::sdbc::XStatement;
-using com::sun::star::sdbc::XParameters;
-using com::sun::star::sdbc::XRow;
-using com::sun::star::sdbc::SQLException;
+
 
 namespace pq_sdbc_driver
 {
diff --git a/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx b/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx
index 298c144..303a860 100644
--- a/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx
@@ -40,7 +40,6 @@
 #include <rtl/strbuf.hxx>
 
 #include <com/sun/star/sdbc/XRow.hpp>
-#include <com/sun/star/sdbc/XParameters.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 
@@ -52,26 +51,20 @@
 
 using osl::MutexGuard;
 
-
 using com::sun::star::beans::XPropertySet;
 
 using com::sun::star::uno::Any;
 using com::sun::star::uno::makeAny;
 using com::sun::star::uno::UNO_QUERY;
-using com::sun::star::uno::XInterface;
 using com::sun::star::uno::Reference;
 using com::sun::star::uno::Sequence;
 using com::sun::star::uno::RuntimeException;
 
 using com::sun::star::container::NoSuchElementException;
-using com::sun::star::lang::WrappedTargetException;
 
 using com::sun::star::sdbc::XRow;
-using com::sun::star::sdbc::XCloseable;
 using com::sun::star::sdbc::XStatement;
 using com::sun::star::sdbc::XResultSet;
-using com::sun::star::sdbc::XParameters;
-using com::sun::star::sdbc::XPreparedStatement;
 using com::sun::star::sdbc::XDatabaseMetaData;
 using com::sun::star::sdbc::SQLException;
 
diff --git a/connectivity/source/drivers/postgresql/pq_xindexes.cxx b/connectivity/source/drivers/postgresql/pq_xindexes.cxx
index 2790f20..39824ef 100644
--- a/connectivity/source/drivers/postgresql/pq_xindexes.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xindexes.cxx
@@ -55,22 +55,17 @@ using com::sun::star::beans::XPropertySet;
 using com::sun::star::uno::Any;
 using com::sun::star::uno::makeAny;
 using com::sun::star::uno::UNO_QUERY;
-using com::sun::star::uno::XInterface;
 using com::sun::star::uno::Reference;
 using com::sun::star::uno::Sequence;
 using com::sun::star::uno::RuntimeException;
 
-using com::sun::star::container::NoSuchElementException;
 using com::sun::star::container::XEnumerationAccess;
 using com::sun::star::container::XEnumeration;
 
-using com::sun::star::lang::WrappedTargetException;
 
 using com::sun::star::sdbcx::XColumnsSupplier;
 
 using com::sun::star::sdbc::XRow;
-using com::sun::star::sdbc::XCloseable;
-using com::sun::star::sdbc::XStatement;
 using com::sun::star::sdbc::XResultSet;
 using com::sun::star::sdbc::XParameters;
 using com::sun::star::sdbc::XPreparedStatement;
diff --git a/connectivity/source/drivers/postgresql/pq_xkey.cxx b/connectivity/source/drivers/postgresql/pq_xkey.cxx
index 2ab5700..3e7357f 100644
--- a/connectivity/source/drivers/postgresql/pq_xkey.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xkey.cxx
@@ -41,9 +41,6 @@
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 
-#include <com/sun/star/sdbc/XRow.hpp>
-#include <com/sun/star/sdbc/XParameters.hpp>
-
 #include "pq_xkey.hxx"
 #include "pq_xkeycolumns.hxx"
 #include "pq_tools.hxx"
@@ -52,35 +49,16 @@
 using osl::MutexGuard;
 using osl::Mutex;
 
-
 using com::sun::star::container::XNameAccess;
-using com::sun::star::container::XIndexAccess;
-using com::sun::star::container::ElementExistException;
-using com::sun::star::container::NoSuchElementException;
 
 using com::sun::star::uno::Reference;
-using com::sun::star::uno::Exception;
-using com::sun::star::uno::XInterface;
 using com::sun::star::uno::Sequence;
 using com::sun::star::uno::Any;
 using com::sun::star::uno::Type;
 using com::sun::star::uno::RuntimeException;
 
-using com::sun::star::lang::IllegalArgumentException;
-using com::sun::star::lang::IndexOutOfBoundsException;
-
-using com::sun::star::beans::XPropertySetInfo;
-using com::sun::star::beans::XFastPropertySet;
-using com::sun::star::beans::XMultiPropertySet;
 using com::sun::star::beans::XPropertySet;
-using com::sun::star::beans::Property;
-
-using com::sun::star::sdbc::XResultSet;
-using com::sun::star::sdbc::XPreparedStatement;
-using com::sun::star::sdbc::XStatement;
-using com::sun::star::sdbc::XParameters;
-using com::sun::star::sdbc::XRow;
-using com::sun::star::sdbc::SQLException;
+
 
 namespace pq_sdbc_driver
 {
diff --git a/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx b/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx
index 53dcc37..e001f61 100644
--- a/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx
@@ -38,7 +38,6 @@
 #include <rtl/strbuf.hxx>
 
 #include <com/sun/star/sdbc/XRow.hpp>
-#include <com/sun/star/sdbc/XParameters.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 
@@ -50,26 +49,18 @@
 
 using osl::MutexGuard;
 
-
 using com::sun::star::beans::XPropertySet;
 
 using com::sun::star::uno::Any;
 using com::sun::star::uno::makeAny;
 using com::sun::star::uno::UNO_QUERY;
-using com::sun::star::uno::XInterface;
 using com::sun::star::uno::Reference;
 using com::sun::star::uno::Sequence;
 using com::sun::star::uno::RuntimeException;
 
-using com::sun::star::container::NoSuchElementException;
-using com::sun::star::lang::WrappedTargetException;
-
 using com::sun::star::sdbc::XRow;
-using com::sun::star::sdbc::XCloseable;
 using com::sun::star::sdbc::XStatement;
 using com::sun::star::sdbc::XResultSet;
-using com::sun::star::sdbc::XParameters;
-using com::sun::star::sdbc::XPreparedStatement;
 using com::sun::star::sdbc::XDatabaseMetaData;
 using com::sun::star::sdbc::SQLException;
 
diff --git a/connectivity/source/drivers/postgresql/pq_xkeys.cxx b/connectivity/source/drivers/postgresql/pq_xkeys.cxx
index 1214886..7929acc 100644
--- a/connectivity/source/drivers/postgresql/pq_xkeys.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xkeys.cxx
@@ -54,20 +54,15 @@ using com::sun::star::beans::XPropertySet;
 
 using com::sun::star::uno::makeAny;
 using com::sun::star::uno::UNO_QUERY;
-using com::sun::star::uno::XInterface;
 using com::sun::star::uno::Reference;
 using com::sun::star::uno::RuntimeException;
 
-using com::sun::star::container::NoSuchElementException;
-using com::sun::star::lang::WrappedTargetException;
 
 using com::sun::star::sdbc::XRow;
-using com::sun::star::sdbc::XCloseable;
 using com::sun::star::sdbc::XStatement;
 using com::sun::star::sdbc::XResultSet;
 using com::sun::star::sdbc::XParameters;
 using com::sun::star::sdbc::XPreparedStatement;
-using com::sun::star::sdbc::XDatabaseMetaData;
 
 namespace pq_sdbc_driver
 {
diff --git a/connectivity/source/drivers/postgresql/pq_xtable.cxx b/connectivity/source/drivers/postgresql/pq_xtable.cxx
index 916034d..7a14cbf 100644
--- a/connectivity/source/drivers/postgresql/pq_xtable.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xtable.cxx
@@ -41,9 +41,6 @@
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 
-#include <com/sun/star/sdbc/XRow.hpp>
-#include <com/sun/star/sdbc/XParameters.hpp>
-
 #include "pq_xtable.hxx"
 #include "pq_xtables.hxx"
 #include "pq_xviews.hxx"
@@ -62,29 +59,18 @@ using com::sun::star::container::ElementExistException;
 using com::sun::star::container::NoSuchElementException;
 
 using com::sun::star::uno::Reference;
-using com::sun::star::uno::Exception;
 using com::sun::star::uno::UNO_QUERY;
-using com::sun::star::uno::XInterface;
 using com::sun::star::uno::Sequence;
 using com::sun::star::uno::Any;
 using com::sun::star::uno::makeAny;
 using com::sun::star::uno::Type;
 using com::sun::star::uno::RuntimeException;
 
-using com::sun::star::lang::IllegalArgumentException;
 using com::sun::star::lang::IndexOutOfBoundsException;
 
-using com::sun::star::beans::XPropertySetInfo;
-using com::sun::star::beans::XFastPropertySet;
-using com::sun::star::beans::XMultiPropertySet;
 using com::sun::star::beans::XPropertySet;
-using com::sun::star::beans::Property;
 
-using com::sun::star::sdbc::XResultSet;
-using com::sun::star::sdbc::XPreparedStatement;
 using com::sun::star::sdbc::XStatement;
-using com::sun::star::sdbc::XParameters;
-using com::sun::star::sdbc::XRow;
 using com::sun::star::sdbc::SQLException;
 
 namespace pq_sdbc_driver
diff --git a/connectivity/source/drivers/postgresql/pq_xtables.cxx b/connectivity/source/drivers/postgresql/pq_xtables.cxx
index 7893640..b824ddd 100644
--- a/connectivity/source/drivers/postgresql/pq_xtables.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xtables.cxx
@@ -37,7 +37,6 @@
 #include <rtl/ustrbuf.hxx>
 
 #include <com/sun/star/sdbc/XRow.hpp>
-#include <com/sun/star/sdbc/XParameters.hpp>
 #include <com/sun/star/sdbcx/Privilege.hpp>
 #include <com/sun/star/sdbcx/KeyType.hpp>
 #include <com/sun/star/sdbc/KeyRule.hpp>
@@ -56,26 +55,19 @@ using com::sun::star::beans::XPropertySet;
 using com::sun::star::uno::Any;
 using com::sun::star::uno::makeAny;
 using com::sun::star::uno::UNO_QUERY;
-using com::sun::star::uno::XInterface;
 using com::sun::star::uno::Reference;
 using com::sun::star::uno::Sequence;
 using com::sun::star::uno::RuntimeException;
 
-using com::sun::star::container::NoSuchElementException;
 using com::sun::star::container::XEnumerationAccess;
 using com::sun::star::container::XEnumeration;
-using com::sun::star::lang::WrappedTargetException;
 
 using com::sun::star::sdbc::XRow;
-using com::sun::star::sdbc::XCloseable;
 using com::sun::star::sdbc::XStatement;
 using com::sun::star::sdbc::XResultSet;
-using com::sun::star::sdbc::XParameters;
-using com::sun::star::sdbc::XPreparedStatement;
 using com::sun::star::sdbc::XDatabaseMetaData;
 using com::sun::star::sdbcx::XColumnsSupplier;
 using com::sun::star::sdbcx::XKeysSupplier;
-using com::sun::star::sdbcx::XViewsSupplier;
 
 namespace pq_sdbc_driver
 {
diff --git a/connectivity/source/drivers/postgresql/pq_xuser.cxx b/connectivity/source/drivers/postgresql/pq_xuser.cxx
index f94ceaf..7b91d43 100644
--- a/connectivity/source/drivers/postgresql/pq_xuser.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xuser.cxx
@@ -41,9 +41,6 @@
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 
-#include <com/sun/star/sdbc/XRow.hpp>
-#include <com/sun/star/sdbc/XParameters.hpp>
-
 #include "pq_xuser.hxx"
 #include "pq_tools.hxx"
 #include "pq_statics.hxx"
@@ -51,33 +48,15 @@
 using osl::MutexGuard;
 using osl::Mutex;
 
-using com::sun::star::container::XNameAccess;
-using com::sun::star::container::XIndexAccess;
-using com::sun::star::container::ElementExistException;
-using com::sun::star::container::NoSuchElementException;
-
 using com::sun::star::uno::Reference;
-using com::sun::star::uno::Exception;
-using com::sun::star::uno::XInterface;
 using com::sun::star::uno::Sequence;
 using com::sun::star::uno::Any;
 using com::sun::star::uno::Type;
 using com::sun::star::uno::RuntimeException;
 
-using com::sun::star::lang::IllegalArgumentException;
-using com::sun::star::lang::IndexOutOfBoundsException;
-
-using com::sun::star::beans::XPropertySetInfo;
-using com::sun::star::beans::XFastPropertySet;
-using com::sun::star::beans::XMultiPropertySet;
 using com::sun::star::beans::XPropertySet;
-using com::sun::star::beans::Property;
 
-using com::sun::star::sdbc::XResultSet;
-using com::sun::star::sdbc::XPreparedStatement;
 using com::sun::star::sdbc::XStatement;
-using com::sun::star::sdbc::XParameters;
-using com::sun::star::sdbc::XRow;
 using com::sun::star::sdbc::SQLException;
 
 namespace pq_sdbc_driver
diff --git a/connectivity/source/drivers/postgresql/pq_xusers.cxx b/connectivity/source/drivers/postgresql/pq_xusers.cxx
index 86b80d3..b91ec7f 100644
--- a/connectivity/source/drivers/postgresql/pq_xusers.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xusers.cxx
@@ -37,7 +37,6 @@
 #include <rtl/ustrbuf.hxx>
 
 #include <com/sun/star/sdbc/XRow.hpp>
-#include <com/sun/star/sdbc/XParameters.hpp>
 #include <com/sun/star/sdbcx/Privilege.hpp>
 
 #include "pq_xusers.hxx"
@@ -47,25 +46,18 @@
 
 using osl::MutexGuard;
 
-
 using com::sun::star::beans::XPropertySet;
 
 using com::sun::star::uno::makeAny;
 using com::sun::star::uno::UNO_QUERY;
-using com::sun::star::uno::XInterface;
 using com::sun::star::uno::Reference;
 using com::sun::star::uno::RuntimeException;
 
 using com::sun::star::container::NoSuchElementException;
-using com::sun::star::lang::WrappedTargetException;
 
 using com::sun::star::sdbc::XRow;
-using com::sun::star::sdbc::XCloseable;
 using com::sun::star::sdbc::XStatement;
 using com::sun::star::sdbc::XResultSet;
-using com::sun::star::sdbc::XParameters;
-using com::sun::star::sdbc::XPreparedStatement;
-using com::sun::star::sdbc::XDatabaseMetaData;
 
 namespace pq_sdbc_driver
 {
diff --git a/connectivity/source/drivers/postgresql/pq_xview.cxx b/connectivity/source/drivers/postgresql/pq_xview.cxx
index a9dd74e..a2c6d16 100644
--- a/connectivity/source/drivers/postgresql/pq_xview.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xview.cxx
@@ -41,9 +41,6 @@
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 
-#include <com/sun/star/sdbc/XRow.hpp>
-#include <com/sun/star/sdbc/XParameters.hpp>
-
 #include "pq_xview.hxx"
 #include "pq_xviews.hxx"
 #include "pq_statics.hxx"
@@ -52,34 +49,18 @@
 using osl::MutexGuard;
 using osl::Mutex;
 
-using com::sun::star::container::XNameAccess;
-using com::sun::star::container::XIndexAccess;
 using com::sun::star::container::ElementExistException;
-using com::sun::star::container::NoSuchElementException;
 
 using com::sun::star::uno::Reference;
-using com::sun::star::uno::Exception;
-using com::sun::star::uno::XInterface;
 using com::sun::star::uno::Sequence;
 using com::sun::star::uno::Any;
 using com::sun::star::uno::makeAny;
 using com::sun::star::uno::Type;
 using com::sun::star::uno::RuntimeException;
 
-using com::sun::star::lang::IllegalArgumentException;
-using com::sun::star::lang::IndexOutOfBoundsException;
-
-using com::sun::star::beans::XPropertySetInfo;
-using com::sun::star::beans::XFastPropertySet;
-using com::sun::star::beans::XMultiPropertySet;
 using com::sun::star::beans::XPropertySet;
-using com::sun::star::beans::Property;
 
-using com::sun::star::sdbc::XResultSet;
-using com::sun::star::sdbc::XPreparedStatement;
 using com::sun::star::sdbc::XStatement;
-using com::sun::star::sdbc::XParameters;
-using com::sun::star::sdbc::XRow;
 using com::sun::star::sdbc::SQLException;
 
 namespace pq_sdbc_driver
diff --git a/connectivity/source/drivers/postgresql/pq_xviews.cxx b/connectivity/source/drivers/postgresql/pq_xviews.cxx
index 51d4900..4df8cda 100644
--- a/connectivity/source/drivers/postgresql/pq_xviews.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xviews.cxx
@@ -37,8 +37,6 @@
 #include <rtl/ustrbuf.hxx>
 
 #include <com/sun/star/sdbc/XRow.hpp>
-#include <com/sun/star/sdbc/XParameters.hpp>
-#include <com/sun/star/sdbcx/Privilege.hpp>
 
 #include "pq_xviews.hxx"
 #include "pq_xview.hxx"
@@ -48,27 +46,19 @@
 
 using osl::MutexGuard;
 
-
 using com::sun::star::beans::XPropertySet;
 
 using com::sun::star::uno::makeAny;
 using com::sun::star::uno::UNO_QUERY;
-using com::sun::star::uno::XInterface;
 using com::sun::star::uno::Reference;
 using com::sun::star::uno::RuntimeException;
 
 using com::sun::star::container::NoSuchElementException;
-using com::sun::star::lang::WrappedTargetException;
 
 using com::sun::star::sdbc::XRow;
-using com::sun::star::sdbc::XCloseable;
 using com::sun::star::sdbc::XStatement;
 using com::sun::star::sdbc::XResultSet;
-using com::sun::star::sdbc::XParameters;
-using com::sun::star::sdbc::XPreparedStatement;
-using com::sun::star::sdbc::XDatabaseMetaData;
 
-//  using com::sun::star::sdbcx::Privilege;
 
 namespace pq_sdbc_driver
 {
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index 442c341..8a87c7f 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -50,9 +50,7 @@ using namespace osl;
 using namespace com::sun::star::uno;
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
-using ::rtl::OUStringToOString;
 using ::rtl::OUStringHash;
-using ::rtl::OString;
 
 namespace cppu
 {
diff --git a/cppuhelper/source/component.cxx b/cppuhelper/source/component.cxx
index ccbf179..192a2de 100644
--- a/cppuhelper/source/component.cxx
+++ b/cppuhelper/source/component.cxx
@@ -29,7 +29,6 @@ using namespace com::sun::star;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 
-using ::rtl::OUString;
 using ::rtl::OString;
 using ::rtl::OUStringToOString;
 
diff --git a/cppuhelper/source/implbase.cxx b/cppuhelper/source/implbase.cxx
index be0405c..635ca10 100644
--- a/cppuhelper/source/implbase.cxx
+++ b/cppuhelper/source/implbase.cxx
@@ -29,8 +29,6 @@ using namespace ::osl;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
-using rtl::OUString;
-using rtl::OString;
 
 namespace cppu
 {
diff --git a/cppuhelper/source/implbase_ex.cxx b/cppuhelper/source/implbase_ex.cxx
index 9a3b053..b2fc96d 100644
--- a/cppuhelper/source/implbase_ex.cxx
+++ b/cppuhelper/source/implbase_ex.cxx
@@ -34,9 +34,7 @@ using namespace ::osl;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
-using rtl::OString;
 using rtl::OUString;
-using rtl::OUStringBuffer;
 
 namespace
 {
diff --git a/cppuhelper/source/servicemanager.cxx b/cppuhelper/source/servicemanager.cxx
index cd4d817..c3dfba4 100644
--- a/cppuhelper/source/servicemanager.cxx
+++ b/cppuhelper/source/servicemanager.cxx
@@ -47,7 +47,6 @@
 
 using rtl::OUString;
 using rtl::OString;
-using rtl::OStringBuffer;
 
 #include <registry/registry.hxx>
 #include <xmlreader/xmlreader.hxx>
diff --git a/dbaccess/source/core/api/View.cxx b/dbaccess/source/core/api/View.cxx
index 9d8ed9b..d15c1c21 100644
--- a/dbaccess/source/core/api/View.cxx
+++ b/dbaccess/source/core/api/View.cxx
@@ -23,10 +23,7 @@
 #include "connectivity/dbexception.hxx"
 #include "connectivity/dbtools.hxx"
 
-#include <com/sun/star/lang/WrappedTargetException.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/sdbc/XRow.hpp>
 
 #include <cppuhelper/exc_hlp.hxx>
 #include <tools/diagnose_ex.h>
@@ -36,15 +33,9 @@ namespace dbaccess
 {
 
     using namespace ::com::sun::star::uno;
-    using ::com::sun::star::sdbc::XDatabaseMetaData;
     using ::com::sun::star::sdbc::SQLException;
     using ::com::sun::star::sdbc::XConnection;
-    using ::com::sun::star::lang::WrappedTargetException;
     using ::com::sun::star::lang::XMultiServiceFactory;
-    using ::com::sun::star::sdbc::XResultSet;
-    using ::com::sun::star::sdbc::XStatement;
-    using ::com::sun::star::lang::DisposedException;
-    using ::com::sun::star::sdbc::XRow;
 
     OUString lcl_getServiceNameForSetting(const Reference< css::sdbc::XConnection >& _xConnection,const OUString& i_sSetting)
     {
diff --git a/dbaccess/source/core/api/columnsettings.cxx b/dbaccess/source/core/api/columnsettings.cxx
index 0e88eda..7449c32 100644
--- a/dbaccess/source/core/api/columnsettings.cxx
+++ b/dbaccess/source/core/api/columnsettings.cxx
@@ -31,14 +31,11 @@ namespace dbaccess
 {
 
     using ::com::sun::star::uno::Reference;
-    using ::com::sun::star::uno::XInterface;
     using ::com::sun::star::uno::UNO_QUERY;
     using ::com::sun::star::uno::UNO_SET_THROW;
     using ::com::sun::star::uno::Exception;
-    using ::com::sun::star::uno::RuntimeException;
     using ::com::sun::star::uno::Any;
     using ::com::sun::star::uno::Type;
-    using ::com::sun::star::lang::IllegalArgumentException;
     using ::com::sun::star::beans::XPropertySet;
     using ::com::sun::star::beans::XPropertySetInfo;
 
diff --git a/dbaccess/source/core/dataaccess/databaseregistrations.cxx b/dbaccess/source/core/dataaccess/databaseregistrations.cxx
index c13e7a6..159dbe2 100644
--- a/dbaccess/source/core/dataaccess/databaseregistrations.cxx
+++ b/dbaccess/source/core/dataaccess/databaseregistrations.cxx
@@ -32,8 +32,6 @@
 namespace dbaccess
 {
     using ::com::sun::star::uno::Reference;
-    using ::com::sun::star::uno::XInterface;
-    using ::com::sun::star::uno::Exception;
     using ::com::sun::star::uno::RuntimeException;
     using ::com::sun::star::uno::makeAny;
     using ::com::sun::star::uno::Sequence;
diff --git a/dbaccess/source/core/dataaccess/documenteventexecutor.cxx b/dbaccess/source/core/dataaccess/documenteventexecutor.cxx
index 42a3aa9..fc69be4 100644
--- a/dbaccess/source/core/dataaccess/documenteventexecutor.cxx
+++ b/dbaccess/source/core/dataaccess/documenteventexecutor.cxx
@@ -35,7 +35,6 @@ namespace dbaccess
 {
 
     using ::com::sun::star::uno::Reference;
-    using ::com::sun::star::uno::XInterface;
     using ::com::sun::star::uno::UNO_QUERY;
     using ::com::sun::star::uno::UNO_QUERY_THROW;
     using ::com::sun::star::uno::UNO_SET_THROW;
diff --git a/dbaccess/source/core/dataaccess/documenteventnotifier.cxx b/dbaccess/source/core/dataaccess/documenteventnotifier.cxx
index 1c7cab7..7490a04 100644
--- a/dbaccess/source/core/dataaccess/documenteventnotifier.cxx
+++ b/dbaccess/source/core/dataaccess/documenteventnotifier.cxx
@@ -30,9 +30,7 @@ namespace dbaccess
 {
 
     using ::com::sun::star::uno::Reference;
-    using ::com::sun::star::uno::XInterface;
     using ::com::sun::star::uno::Exception;
-    using ::com::sun::star::uno::RuntimeException;
     using ::com::sun::star::uno::Any;
     using ::com::sun::star::frame::DoubleInitializationException;
     using ::com::sun::star::document::XDocumentEventListener;
diff --git a/dbaccess/source/core/dataaccess/documentevents.cxx b/dbaccess/source/core/dataaccess/documentevents.cxx
index 27f0a89..19530a7 100644
--- a/dbaccess/source/core/dataaccess/documentevents.cxx
+++ b/dbaccess/source/core/dataaccess/documentevents.cxx
@@ -32,8 +32,6 @@
 namespace dbaccess
 {
 
-    using ::com::sun::star::uno::XInterface;
-    using ::com::sun::star::uno::Exception;
     using ::com::sun::star::uno::RuntimeException;
     using ::com::sun::star::uno::Any;
     using ::com::sun::star::beans::PropertyValue;
diff --git a/dbaccess/source/core/misc/objectnameapproval.cxx b/dbaccess/source/core/misc/objectnameapproval.cxx
index dfeb3c8..64142f9 100644
--- a/dbaccess/source/core/misc/objectnameapproval.cxx
+++ b/dbaccess/source/core/misc/objectnameapproval.cxx
@@ -22,7 +22,6 @@
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/sdb/tools/XConnectionTools.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
-#include <com/sun/star/sdbc/SQLException.hpp>
 
 #include <cppuhelper/weakref.hxx>
 #include <cppuhelper/exc_hlp.hxx>
@@ -38,7 +37,6 @@ namespace dbaccess
     using ::com::sun::star::uno::UNO_QUERY_THROW;
     using ::com::sun::star::sdb::tools::XObjectNames;
     using ::com::sun::star::uno::XInterface;
-    using ::com::sun::star::sdbc::SQLException;
 
     namespace CommandType = com::sun::star::sdb::CommandType;
 
diff --git a/dbaccess/source/core/recovery/dbdocrecovery.cxx b/dbaccess/source/core/recovery/dbdocrecovery.cxx
index cee9d7a..3c647ea 100644
--- a/dbaccess/source/core/recovery/dbdocrecovery.cxx
+++ b/dbaccess/source/core/recovery/dbdocrecovery.cxx
@@ -26,13 +26,8 @@
 
 #include <com/sun/star/sdb/application/XDatabaseDocumentUI.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
-#include <com/sun/star/document/XStorageBasedDocument.hpp>
-#include <com/sun/star/io/XTextOutputStream.hpp>
 #include <com/sun/star/io/TextInputStream.hpp>
-#include <com/sun/star/io/XActiveDataSource.hpp>
-#include <com/sun/star/io/XActiveDataSink.hpp>
 #include <com/sun/star/util/XModifiable.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
 
 #include <comphelper/namedvaluecollection.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -44,29 +39,20 @@ namespace dbaccess
 {
 
     using css::uno::Reference;
-    using css::uno::XInterface;
     using css::uno::UNO_QUERY;
     using css::uno::UNO_QUERY_THROW;
     using css::uno::UNO_SET_THROW;
     using css::uno::Exception;
-    using css::uno::RuntimeException;
     using css::uno::Sequence;
     using css::uno::XComponentContext;
     using css::embed::XStorage;
     using css::frame::XController;
     using css::sdb::application::XDatabaseDocumentUI;
     using css::lang::XComponent;
-    using css::document::XStorageBasedDocument;
-    using css::beans::PropertyValue;
     using css::io::XStream;
-    using css::io::XTextOutputStream;
-    using css::io::XActiveDataSource;
     using css::io::TextInputStream;
     using css::io::XTextInputStream2;
-    using css::io::XActiveDataSink;
-    using css::frame::XModel;
     using css::util::XModifiable;
-    using css::beans::XPropertySet;
 
     namespace ElementModes = css::embed::ElementModes;
 
diff --git a/dbaccess/source/core/recovery/settingsimport.cxx b/dbaccess/source/core/recovery/settingsimport.cxx
index 693139e..4063bf2 100644
--- a/dbaccess/source/core/recovery/settingsimport.cxx
+++ b/dbaccess/source/core/recovery/settingsimport.cxx
@@ -27,9 +27,6 @@ namespace dbaccess
 {
 
     using ::com::sun::star::uno::Reference;
-    using ::com::sun::star::uno::XInterface;
-    using ::com::sun::star::uno::Exception;
-    using ::com::sun::star::uno::RuntimeException;
     using ::com::sun::star::uno::Any;
     using ::com::sun::star::xml::sax::XAttributeList;
 
diff --git a/dbaccess/source/core/recovery/storagestream.cxx b/dbaccess/source/core/recovery/storagestream.cxx
index b23bef05..cba882c 100644
--- a/dbaccess/source/core/recovery/storagestream.cxx
+++ b/dbaccess/source/core/recovery/storagestream.cxx
@@ -27,12 +27,8 @@ namespace dbaccess
 {
 
     using ::com::sun::star::uno::Reference;
-    using ::com::sun::star::uno::XInterface;
     using ::com::sun::star::uno::UNO_QUERY_THROW;
     using ::com::sun::star::uno::UNO_SET_THROW;
-    using ::com::sun::star::uno::Exception;
-    using ::com::sun::star::uno::RuntimeException;
-    using ::com::sun::star::uno::XComponentContext;
     using ::com::sun::star::embed::XStorage;
     using ::com::sun::star::io::XStream;
 
diff --git a/dbaccess/source/core/recovery/storagetextstream.cxx b/dbaccess/source/core/recovery/storagetextstream.cxx
index 0b0a801..7dd405b 100644
--- a/dbaccess/source/core/recovery/storagetextstream.cxx
+++ b/dbaccess/source/core/recovery/storagetextstream.cxx
@@ -27,14 +27,10 @@ namespace dbaccess
 {
 
     using ::com::sun::star::uno::Reference;
-    using ::com::sun::star::uno::XInterface;
-    using ::com::sun::star::uno::Exception;
-    using ::com::sun::star::uno::RuntimeException;
     using ::com::sun::star::uno::XComponentContext;
     using ::com::sun::star::embed::XStorage;
     using ::com::sun::star::io::TextOutputStream;
     using ::com::sun::star::io::XTextOutputStream2;
-    using ::com::sun::star::io::XActiveDataSource;
 
     // StorageTextOutputStream_Data
     struct StorageTextOutputStream_Data
diff --git a/dbaccess/source/core/recovery/storagexmlstream.cxx b/dbaccess/source/core/recovery/storagexmlstream.cxx
index f12182b..3919598 100644
--- a/dbaccess/source/core/recovery/storagexmlstream.cxx
+++ b/dbaccess/source/core/recovery/storagexmlstream.cxx
@@ -20,7 +20,6 @@
 #include "storagexmlstream.hxx"
 
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#include <com/sun/star/io/XActiveDataSource.hpp>
 #include <com/sun/star/xml/sax/Parser.hpp>
 #include <com/sun/star/xml/sax/Writer.hpp>
 
@@ -35,19 +34,12 @@ namespace dbaccess
 {
 
     using ::com::sun::star::uno::Reference;
-    using ::com::sun::star::uno::XInterface;
     using ::com::sun::star::uno::UNO_QUERY_THROW;
-    using ::com::sun::star::uno::Exception;
-    using ::com::sun::star::uno::RuntimeException;
     using ::com::sun::star::uno::XComponentContext;
     using ::com::sun::star::embed::XStorage;
     using ::com::sun::star::xml::sax::XDocumentHandler;
-    using ::com::sun::star::xml::sax::XAttributeList;
     using ::com::sun::star::xml::sax::XWriter;
     using ::com::sun::star::xml::sax::Writer;
-    using ::com::sun::star::io::XStream;
-    using ::com::sun::star::io::XOutputStream;
-    using ::com::sun::star::io::XActiveDataSource;
     using ::com::sun::star::xml::sax::Parser;
     using ::com::sun::star::xml::sax::XParser;
     using ::com::sun::star::xml::sax::InputSource;
diff --git a/dbaccess/source/core/recovery/subcomponentloader.cxx b/dbaccess/source/core/recovery/subcomponentloader.cxx
index 92bbe86..25fc14e 100644
--- a/dbaccess/source/core/recovery/subcomponentloader.cxx
+++ b/dbaccess/source/core/recovery/subcomponentloader.cxx
@@ -28,7 +28,6 @@ namespace dbaccess
 {
 
     using ::com::sun::star::uno::Reference;
-    using ::com::sun::star::uno::XInterface;
     using ::com::sun::star::uno::UNO_QUERY_THROW;
     using ::com::sun::star::uno::UNO_SET_THROW;
     using ::com::sun::star::uno::Exception;
diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
index 1c8a546..0043993 100644
--- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx
+++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
@@ -55,7 +55,6 @@ namespace dbaccess
     using css::uno::Any;
     using css::uno::Sequence;
     using css::uno::XComponentContext;
-    using css::lang::XMultiServiceFactory;
     using css::embed::XStorage;
     using css::sdb::application::XDatabaseDocumentUI;
     using css::beans::Pair;
diff --git a/dbaccess/source/ext/macromigration/docinteraction.cxx b/dbaccess/source/ext/macromigration/docinteraction.cxx
index 4cce8b0..8b37b22 100644
--- a/dbaccess/source/ext/macromigration/docinteraction.cxx
+++ b/dbaccess/source/ext/macromigration/docinteraction.cxx
@@ -32,10 +32,7 @@ namespace dbmm
 {
 
     using ::com::sun::star::uno::Reference;
-    using ::com::sun::star::uno::XInterface;
     using ::com::sun::star::uno::UNO_QUERY;
-    using ::com::sun::star::uno::Exception;
-    using ::com::sun::star::uno::RuntimeException;
     using ::com::sun::star::uno::Any;
     using ::com::sun::star::uno::makeAny;
     using ::com::sun::star::uno::XComponentContext;
diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
index ceca235..e090c06 100644
--- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
@@ -64,23 +64,18 @@ namespace dbmm
     using ::com::sun::star::uno::UNO_QUERY_THROW;
     using ::com::sun::star::uno::UNO_SET_THROW;
     using ::com::sun::star::uno::Exception;
-    using ::com::sun::star::uno::RuntimeException;
     using ::com::sun::star::uno::Any;
     using ::com::sun::star::sdb::application::XDatabaseDocumentUI;
     using ::com::sun::star::sdb::XOfficeDatabaseDocument;
     using ::com::sun::star::frame::XModel2;
-    using ::com::sun::star::frame::XController;
     using ::com::sun::star::frame::XController2;
     using ::com::sun::star::container::XEnumeration;
     using ::com::sun::star::frame::XStorable;
     using ::com::sun::star::uno::Sequence;
     using ::com::sun::star::beans::PropertyValue;
     using ::com::sun::star::frame::XFrame;
-    using ::com::sun::star::awt::XWindow;
     using ::com::sun::star::util::XCloseable;
-    using ::com::sun::star::util::XCloseListener;
     using ::com::sun::star::util::CloseVetoException;
-    using ::com::sun::star::lang::EventObject;
     using ::com::sun::star::frame::XComponentLoader;
     using ::com::sun::star::util::XModifiable;
     using ::com::sun::star::ucb::UniversalContentBroker;
diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.cxx b/dbaccess/source/ext/macromigration/macromigrationpages.cxx
index d72d1b5..9192eb6 100644
--- a/dbaccess/source/ext/macromigration/macromigrationpages.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationpages.cxx
@@ -34,10 +34,8 @@ namespace dbmm
 {
 
     using ::com::sun::star::uno::Reference;
-    using ::com::sun::star::uno::XInterface;
     using ::com::sun::star::uno::UNO_QUERY_THROW;
     using ::com::sun::star::uno::Exception;
-    using ::com::sun::star::uno::RuntimeException;
     using ::com::sun::star::frame::XModel;
 
     MacroMigrationPage::MacroMigrationPage(vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription)
diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx b/dbaccess/source/ext/macromigration/migrationengine.cxx
index c9ecb2b..5564edc 100644
--- a/dbaccess/source/ext/macromigration/migrationengine.cxx
+++ b/dbaccess/source/ext/macromigration/migrationengine.cxx
@@ -28,19 +28,13 @@
 #include "progresscapture.hxx"
 #include "progressmixer.hxx"
 
-#include <com/sun/star/sdb/XFormDocumentsSupplier.hpp>
-#include <com/sun/star/sdb/XReportDocumentsSupplier.hpp>
-#include <com/sun/star/util/XCloseable.hpp>
 #include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/frame/XComponentLoader.hpp>
 #include <com/sun/star/ucb/XCommandProcessor.hpp>
 #include <com/sun/star/ucb/XContent.hpp>
-#include <com/sun/star/embed/XComponentSupplier.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/document/XStorageBasedDocument.hpp>
 #include <com/sun/star/embed/XTransactedObject.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
-#include <com/sun/star/embed/XEmbedPersist.hpp>
 #include <com/sun/star/script/DocumentScriptLibraryContainer.hpp>
 #include <com/sun/star/script/DocumentDialogLibraryContainer.hpp>
 #include <com/sun/star/document/XEmbeddedScripts.hpp>
@@ -88,25 +82,18 @@ namespace dbmm
     using ::com::sun::star::uno::makeAny;
     using ::com::sun::star::uno::XComponentContext;
     using ::com::sun::star::sdb::XOfficeDatabaseDocument;
-    using ::com::sun::star::sdb::XFormDocumentsSupplier;
-    using ::com::sun::star::sdb::XReportDocumentsSupplier;
     using ::com::sun::star::container::XNameAccess;
     using ::com::sun::star::uno::Sequence;
-    using ::com::sun::star::util::XCloseable;
-    using ::com::sun::star::util::CloseVetoException;
     using ::com::sun::star::lang::XComponent;
     using ::com::sun::star::frame::XModel;
-    using ::com::sun::star::frame::XComponentLoader;
     using ::com::sun::star::ucb::XCommandProcessor;
     using ::com::sun::star::ucb::XContent;
     using ::com::sun::star::ucb::Command;
-    using ::com::sun::star::embed::XComponentSupplier;
     using ::com::sun::star::task::XStatusIndicator;
     using ::com::sun::star::embed::XStorage;
     using ::com::sun::star::document::XStorageBasedDocument;
     using ::com::sun::star::embed::XTransactedObject;
     using ::com::sun::star::frame::XStorable;
-    using ::com::sun::star::embed::XEmbedPersist;
     using ::com::sun::star::script::DocumentDialogLibraryContainer;
     using ::com::sun::star::script::DocumentScriptLibraryContainer;
     using ::com::sun::star::script::XStorageBasedLibraryContainer;
diff --git a/dbaccess/source/ext/macromigration/progresscapture.cxx b/dbaccess/source/ext/macromigration/progresscapture.cxx
index 98b1d07..37dc871 100644
--- a/dbaccess/source/ext/macromigration/progresscapture.cxx
+++ b/dbaccess/source/ext/macromigration/progresscapture.cxx
@@ -26,8 +26,6 @@
 namespace dbmm
 {
 
-    using ::com::sun::star::uno::XInterface;
-    using ::com::sun::star::uno::Exception;
     using ::com::sun::star::uno::RuntimeException;
 
     // ProgressCapture_Data
diff --git a/dbaccess/source/sdbtools/connection/datasourcemetadata.cxx b/dbaccess/source/sdbtools/connection/datasourcemetadata.cxx
index 600ccf0..f15cb89 100644
--- a/dbaccess/source/sdbtools/connection/datasourcemetadata.cxx
+++ b/dbaccess/source/sdbtools/connection/datasourcemetadata.cxx
@@ -19,8 +19,6 @@
 
 #include "datasourcemetadata.hxx"
 
-#include <com/sun/star/lang/NullPointerException.hpp>
-
 #include <connectivity/dbmetadata.hxx>
 
 namespace sdbtools
@@ -28,7 +26,6 @@ namespace sdbtools
 
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::sdbc::XConnection;
-    using ::com::sun::star::lang::NullPointerException;
     using ::com::sun::star::sdbc::SQLException;
     using ::com::sun::star::uno::RuntimeException;
     using ::com::sun::star::uno::XComponentContext;
diff --git a/dbaccess/source/sdbtools/connection/objectnames.cxx b/dbaccess/source/sdbtools/connection/objectnames.cxx
index 9bd325c..725c5a1 100644
--- a/dbaccess/source/sdbtools/connection/objectnames.cxx
+++ b/dbaccess/source/sdbtools/connection/objectnames.cxx
@@ -22,7 +22,6 @@
 #include "module_sdbt.hxx"
 #include "sdbt_resource.hrc"
 
-#include <com/sun/star/lang/NullPointerException.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/sdb/XQueriesSupplier.hpp>
@@ -41,12 +40,10 @@ namespace sdbtools
 
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::sdbc::XConnection;
-    using ::com::sun::star::lang::NullPointerException;
     using ::com::sun::star::lang::IllegalArgumentException;
     using ::com::sun::star::uno::RuntimeException;
     using ::com::sun::star::sdbc::SQLException;
     using ::com::sun::star::sdbc::XDatabaseMetaData;
-    using ::com::sun::star::uno::XInterface;
     using ::com::sun::star::container::XNameAccess;
     using ::com::sun::star::uno::UNO_QUERY_THROW;
     using ::com::sun::star::sdbcx::XTablesSupplier;
diff --git a/dbaccess/source/sdbtools/connection/tablename.cxx b/dbaccess/source/sdbtools/connection/tablename.cxx
index c4006a5..3f14d77 100644
--- a/dbaccess/source/sdbtools/connection/tablename.cxx
+++ b/dbaccess/source/sdbtools/connection/tablename.cxx
@@ -22,7 +22,6 @@
 #include "module_sdbt.hxx"
 #include "sdbtstrings.hrc"
 
-#include <com/sun/star/lang/NullPointerException.hpp>
 #include <com/sun/star/sdb/tools/CompositionType.hpp>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 
@@ -34,7 +33,6 @@ namespace sdbtools
 
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::sdbc::XConnection;
-    using ::com::sun::star::lang::NullPointerException;
     using ::com::sun::star::uno::RuntimeException;
     using ::com::sun::star::lang::IllegalArgumentException;
     using ::com::sun::star::beans::XPropertySet;
diff --git a/dbaccess/source/sdbtools/misc/sdbt_services.cxx b/dbaccess/source/sdbtools/misc/sdbt_services.cxx
index ba39ca0..65d438c 100644
--- a/dbaccess/source/sdbtools/misc/sdbt_services.cxx
+++ b/dbaccess/source/sdbtools/misc/sdbt_services.cxx
@@ -20,9 +20,6 @@
 #include "module_sdbt.hxx"
 #include "sdbt_services.hxx"
 
-using ::com::sun::star::lang::XMultiServiceFactory;
-using ::com::sun::star::registry::XRegistryKey;
-using ::com::sun::star::registry::InvalidRegistryException;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::XInterface;
 
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index f5800c8..13a03c5 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -149,7 +149,6 @@ using namespace ::com::sun::star::ui::dialogs;
 using namespace ::com::sun::star::task;
 using ::com::sun::star::document::XEmbeddedScripts;
 using ::com::sun::star::document::XDocumentEventBroadcaster;
-using ::com::sun::star::document::DocumentEvent;
 using ::com::sun::star::sdb::application::NamedDatabaseObject;
 
 namespace DatabaseObject = ::com::sun::star::sdb::application::DatabaseObject;
diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx
index 1b8d85f..79e307f 100644
--- a/dbaccess/source/ui/app/AppControllerGen.cxx
+++ b/dbaccess/source/ui/app/AppControllerGen.cxx
@@ -47,7 +47,6 @@
 #include <com/sun/star/ucb/XCommandProcessor.hpp>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
 #include <com/sun/star/uno/XNamingService.hpp>
-#include <com/sun/star/util/XCloseable.hpp>
 #include <com/sun/star/util/XRefreshable.hpp>
 
 #include <cppuhelper/exc_hlp.hxx>
@@ -86,7 +85,6 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::ucb;
 
-using ::com::sun::star::util::XCloseable;
 using ::com::sun::star::ui::XContextMenuInterceptor;
 
 namespace DatabaseObject = ::com::sun::star::sdb::application::DatabaseObject;
diff --git a/dbaccess/source/ui/app/subcomponentmanager.cxx b/dbaccess/source/ui/app/subcomponentmanager.cxx
index b6ec03d..9bcbc5c 100644
--- a/dbaccess/source/ui/app/subcomponentmanager.cxx
+++ b/dbaccess/source/ui/app/subcomponentmanager.cxx
@@ -43,7 +43,6 @@ namespace dbaui
 {
 
     using ::com::sun::star::uno::Reference;
-    using ::com::sun::star::uno::XInterface;
     using ::com::sun::star::uno::UNO_QUERY;
     using ::com::sun::star::uno::UNO_QUERY_THROW;
     using ::com::sun::star::uno::UNO_SET_THROW;
diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx b/dbaccess/source/ui/control/opendoccontrols.cxx
index b1e7b96..0eadbf0 100644
--- a/dbaccess/source/ui/control/opendoccontrols.cxx
+++ b/dbaccess/source/ui/control/opendoccontrols.cxx

... etc. - the rest is truncated