summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2019-11-19 16:32:49 +0100
committerStephan Bergmann <sbergman@redhat.com>2019-11-22 12:57:32 +0100
commitf853ec317f6af1b8c65cc5bd758371689c75118d (patch)
treeb86d729bf9a9465ee619ead3b5635efa62a1804e
parentf31d36966bceb90e261cbecd42634bde4448d527 (diff)
Extend loplugin:external to warn about classes
...following up on 314f15bff08b76bf96acf99141776ef64d2f1355 "Extend loplugin:external to warn about enums". Cases where free functions were moved into an unnamed namespace along with a class, to not break ADL, are in: filter/source/svg/svgexport.cxx sc/source/filter/excel/xelink.cxx sc/source/filter/excel/xilink.cxx svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx All other free functions mentioning moved classes appear to be harmless and not give rise to (silent, even) ADL breakage. (One remaining TODO in compilerplugins/clang/external.cxx is that derived classes are not covered by computeAffectedTypes, even though they could also be affected by ADL-breakage--- but don't seem to be in any acutal case across the code base.) For friend declarations using elaborate type specifiers, like class C1 {}; class C2 { friend class C1; }; * If C2 (but not C1) is moved into an unnamed namespace, the friend declaration must be changed to not use an elaborate type specifier (i.e., "friend C1;"; see C++17 [namespace.memdef]/3: "If the name in a friend declaration is neither qualified nor a template-id and the declaration is a function or an elaborated-type-specifier, the lookup to determine whether the entity has been previously declared shall not consider any scopes outside the innermost enclosing namespace.") * If C1 (but not C2) is moved into an unnamed namespace, the friend declaration must be changed too, see <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71882> "elaborated-type-specifier friend not looked up in unnamed namespace". Apart from that, to keep changes simple and mostly mechanical (which should help avoid regressions), out-of-line definitions of class members have been left in the enclosing (named) namespace. But explicit specializations of class templates had to be moved into the unnamed namespace to appease <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92598> "explicit specialization of template from unnamed namespace using unqualified-id in enclosing namespace". Also, accompanying declarations (of e.g. typedefs or static variables) that could arguably be moved into the unnamed namespace too have been left alone. And in some cases, mention of affected types in blacklists in other loplugins needed to be adapted. And sc/qa/unit/mark_test.cxx uses a hack of including other .cxx, one of which is sc/source/core/data/segmenttree.cxx where e.g. ScFlatUInt16SegmentsImpl is not moved into an unnamed namespace (because it is declared in sc/inc/segmenttree.hxx), but its base ScFlatSegmentsImpl is. GCC warns about such combinations with enabled-by-default -Wsubobject-linkage, but "The compiler doesn’t give this warning for types defined in the main .C file, as those are unlikely to have multiple definitions." (<https://gcc.gnu.org/onlinedocs/gcc-9.2.0/gcc/Warning-Options.html>) The warned-about classes also don't have multiple definitions in the given test, so disable the warning when including the .cxx. Change-Id: Ib694094c0d8168be68f8fe90dfd0acbb66a3f1e4 Reviewed-on: https://gerrit.libreoffice.org/83239 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
-rw-r--r--animations/source/animcore/animcore.cxx4
-rw-r--r--basctl/source/basicide/baside2b.cxx4
-rw-r--r--basctl/source/basicide/baside3.cxx3
-rw-r--r--basctl/source/basicide/moduldl2.cxx4
-rw-r--r--basegfx/source/polygon/b2dpolygon.cxx4
-rw-r--r--basegfx/source/polygon/b2dpolygonclipper.cxx4
-rw-r--r--basegfx/source/polygon/b2dtrapezoid.cxx12
-rw-r--r--basegfx/source/polygon/b3dpolygon.cxx4
-rw-r--r--basic/source/basmgr/basicmanagerrepository.cxx10
-rw-r--r--basic/source/basmgr/basmgr.cxx6
-rw-r--r--basic/source/classes/sb.cxx4
-rw-r--r--basic/source/classes/sbunoobj.cxx21
-rw-r--r--basic/source/classes/sbxmod.cxx8
-rw-r--r--basic/source/comp/codegen.cxx8
-rw-r--r--basic/source/comp/exprgen.cxx4
-rw-r--r--basic/source/comp/parser.cxx4
-rw-r--r--basic/source/comp/token.cxx8
-rw-r--r--basic/source/runtime/inputbox.cxx4
-rw-r--r--basic/source/runtime/iosys.cxx9
-rw-r--r--basic/source/runtime/methods1.cxx4
-rw-r--r--basic/source/runtime/runtime.cxx7
-rw-r--r--basic/source/runtime/stdobj.cxx4
-rw-r--r--bridges/source/jni_uno/jni_java2uno.cxx3
-rw-r--r--bridges/source/jni_uno/jni_uno2java.cxx3
-rw-r--r--canvas/source/cairo/cairo_canvashelper_text.cxx4
-rw-r--r--canvas/source/tools/surfaceproxymanager.cxx4
-rw-r--r--canvas/workben/canvasdemo.cxx7
-rw-r--r--chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx4
-rw-r--r--chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx20
-rw-r--r--chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx36
-rw-r--r--chart2/source/controller/chartapiwrapper/LegendWrapper.cxx4
-rw-r--r--chart2/source/controller/chartapiwrapper/TitleWrapper.cxx8
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx4
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx12
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx5
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx4
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx5
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx48
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx12
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx5
-rw-r--r--chart2/source/controller/dialogs/dlg_DataSource.cxx4
-rw-r--r--chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx4
-rw-r--r--chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx4
-rw-r--r--chart2/source/controller/main/ConfigurationAccess.cxx3
-rw-r--r--chart2/source/model/main/UndoManager.cxx4
-rw-r--r--chart2/source/tools/ExplicitCategoriesProvider.cxx4
-rw-r--r--chart2/source/view/axes/VCartesianAxis.cxx13
-rw-r--r--chart2/source/view/axes/VCartesianCoordinateSystem.cxx4
-rw-r--r--chart2/source/view/axes/VCartesianGrid.cxx4
-rw-r--r--chart2/source/view/charttypes/AreaChart.cxx4
-rw-r--r--chart2/source/view/charttypes/BarChart.cxx4
-rw-r--r--chart2/source/view/charttypes/BubbleChart.cxx4
-rw-r--r--chart2/source/view/charttypes/ConfigAccess.cxx3
-rw-r--r--chart2/source/view/charttypes/NetChart.cxx4
-rw-r--r--comphelper/qa/container/comphelper_ifcontainer.cxx4
-rw-r--r--comphelper/source/compare/AnyCompareFactory.cxx4
-rw-r--r--comphelper/source/container/IndexedPropertyValuesContainer.cxx4
-rw-r--r--comphelper/source/container/NamedPropertyValuesContainer.cxx4
-rw-r--r--comphelper/source/container/enumerablemap.cxx20
-rw-r--r--comphelper/source/container/namecontainer.cxx4
-rw-r--r--comphelper/source/eventattachermgr/eventattachermgr.cxx2
-rw-r--r--comphelper/source/misc/anycompare.cxx3
-rw-r--r--comphelper/source/misc/asyncnotification.cxx11
-rw-r--r--comphelper/source/misc/docpasswordrequest.cxx2
-rw-r--r--comphelper/source/misc/random.cxx4
-rw-r--r--comphelper/source/misc/threadpool.cxx4
-rw-r--r--comphelper/source/property/MasterPropertySet.cxx4
-rw-r--r--comphelper/source/property/genericpropertyset.cxx3
-rw-r--r--comphelper/source/streaming/memorystream.cxx4
-rw-r--r--comphelper/source/xml/ofopxmlhelper.cxx3
-rw-r--r--compilerplugins/clang/badstatics.cxx2
-rw-r--r--compilerplugins/clang/external.cxx10
-rw-r--r--compilerplugins/clang/refcounting.cxx2
-rw-r--r--compilerplugins/clang/staticmethods.cxx2
-rw-r--r--compilerplugins/clang/test/external.cxx12
-rw-r--r--connectivity/source/commontools/FValue.cxx4
-rw-r--r--connectivity/source/commontools/TSortIndex.cxx3
-rw-r--r--connectivity/source/cpool/ZConnectionPool.cxx4
-rw-r--r--connectivity/source/drivers/calc/Cservices.cxx2
-rw-r--r--connectivity/source/drivers/dbase/Dservices.cxx2
-rw-r--r--connectivity/source/drivers/evoab2/EApi.cxx5
-rw-r--r--connectivity/source/drivers/evoab2/NResultSet.cxx8
-rw-r--r--connectivity/source/drivers/evoab2/NServices.cxx2
-rw-r--r--connectivity/source/drivers/firebird/Connection.cxx4
-rw-r--r--connectivity/source/drivers/firebird/Services.cxx3
-rw-r--r--connectivity/source/drivers/flat/Eservices.cxx2
-rw-r--r--connectivity/source/drivers/hsqldb/Hservices.cxx2
-rw-r--r--connectivity/source/drivers/jdbc/jservices.cxx3
-rw-r--r--connectivity/source/drivers/mysql_jdbc/YTable.cxx3
-rw-r--r--connectivity/source/drivers/mysqlc/mysqlc_services.cxx3
-rw-r--r--connectivity/source/drivers/odbc/ORealDriver.cxx3
-rw-r--r--connectivity/source/drivers/odbc/oservices.cxx2
-rw-r--r--connectivity/source/drivers/postgresql/pq_connection.cxx7
-rw-r--r--connectivity/source/drivers/postgresql/pq_driver.cxx3
-rw-r--r--connectivity/source/drivers/postgresql/pq_statics.cxx4
-rw-r--r--connectivity/source/drivers/postgresql/pq_xcontainer.cxx7
-rw-r--r--connectivity/source/drivers/writer/Wservices.cxx3
-rw-r--r--connectivity/source/manager/mdrivermanager.cxx6
-rw-r--r--connectivity/source/parse/sqliterator.cxx3
-rw-r--r--connectivity/source/resource/sharedresources.cxx4
-rw-r--r--cppu/source/AffineBridge/AffineBridge.cxx7
-rw-r--r--cppu/source/UnsafeBridge/UnsafeBridge.cxx4
-rw-r--r--cppu/source/helper/purpenv/helper_purpenv_Environment.cxx4
-rw-r--r--cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx4
-rw-r--r--cppu/source/threadpool/current.cxx3
-rw-r--r--cppu/source/threadpool/threadpool.cxx7
-rw-r--r--cppu/source/typelib/static_types.cxx4
-rw-r--r--cppu/source/typelib/typelib.cxx10
-rw-r--r--cppu/source/uno/EnvStack.cxx6
-rw-r--r--cppu/source/uno/IdentityMapping.cxx4
-rw-r--r--cppu/source/uno/cascade_mapping.cxx4
-rw-r--r--cppu/source/uno/lbmap.cxx15
-rw-r--r--cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx4
-rw-r--r--cppuhelper/source/component_context.cxx7
-rw-r--r--cppuhelper/source/factory.cxx16
-rw-r--r--cppuhelper/source/propshlp.cxx3
-rw-r--r--cppuhelper/source/tdmgr.cxx3
-rw-r--r--cpputools/source/unoexe/unoexe.cxx8
-rw-r--r--cui/source/dialogs/SpellDialog.cxx5
-rw-r--r--cui/source/dialogs/colorpicker.cxx20
-rw-r--r--cui/source/dialogs/hangulhanjadlg.cxx3
-rw-r--r--cui/source/dialogs/hldocntp.cxx4
-rw-r--r--cui/source/dialogs/hlmarkwn.cxx4
-rw-r--r--cui/source/dialogs/linkdlg.cxx4
-rw-r--r--cui/source/factory/dlgfact.cxx4
-rw-r--r--cui/source/options/optasian.cxx4
-rw-r--r--cui/source/options/optcolor.cxx4
-rw-r--r--cui/source/options/optlingu.cxx11
-rw-r--r--cui/source/options/optpath.cxx4
-rw-r--r--cui/source/options/treeopt.cxx16
-rw-r--r--cui/source/tabpages/autocdlg.cxx8
-rw-r--r--cui/source/tabpages/swpossizetabpage.cxx4
-rw-r--r--dbaccess/qa/unit/tdf119625.cxx3
-rw-r--r--dbaccess/qa/unit/tdf126268.cxx3
-rw-r--r--dbaccess/source/core/api/FilteredContainer.cxx6
-rw-r--r--dbaccess/source/core/dataaccess/databasedocument.cxx4
-rw-r--r--dbaccess/source/core/dataaccess/databaseregistrations.cxx5
-rw-r--r--dbaccess/source/core/dataaccess/datasource.cxx8
-rw-r--r--dbaccess/source/core/dataaccess/documentcontainer.cxx4
-rw-r--r--dbaccess/source/core/dataaccess/documentdefinition.cxx22
-rw-r--r--dbaccess/source/core/dataaccess/documentevents.cxx4
-rw-r--r--dbaccess/source/core/dataaccess/intercept.cxx4
-rw-r--r--dbaccess/source/core/dataaccess/myucp_datasupplier.cxx4
-rw-r--r--dbaccess/source/core/recovery/subcomponentrecovery.cxx9
-rw-r--r--dbaccess/source/filter/xml/dbloader2.cxx7
-rw-r--r--dbaccess/source/filter/xml/xmlExport.cxx9
-rw-r--r--dbaccess/source/filter/xml/xmlfilter.cxx4
-rw-r--r--dbaccess/source/sdbtools/connection/objectnames.cxx9
-rw-r--r--dbaccess/source/ui/app/AppController.cxx12
-rw-r--r--dbaccess/source/ui/browser/brwctrlr.cxx4
-rw-r--r--dbaccess/source/ui/browser/dbloader.cxx3
-rw-r--r--dbaccess/source/ui/browser/genericcontroller.cxx4
-rw-r--r--dbaccess/source/ui/browser/sbagrid.cxx5
-rw-r--r--dbaccess/source/ui/dlg/DbAdminImpl.cxx4
-rw-r--r--dbaccess/source/ui/dlg/UserAdmin.cxx4
-rw-r--r--dbaccess/source/ui/dlg/adtabdlg.cxx8
-rw-r--r--dbaccess/source/ui/dlg/sqlmessage.cxx4
-rw-r--r--dbaccess/source/ui/misc/WCopyTable.cxx4
-rw-r--r--dbaccess/source/ui/misc/asyncmodaldialog.cxx4
-rw-r--r--dbaccess/source/ui/misc/controllerframe.cxx5
-rw-r--r--dbaccess/source/ui/misc/dbaundomanager.cxx8
-rw-r--r--dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx4
-rw-r--r--dbaccess/source/ui/misc/dsmeta.cxx4
-rw-r--r--dbaccess/source/ui/querydesign/querycontroller.cxx4
-rw-r--r--dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx4
-rw-r--r--dbaccess/source/ui/uno/copytablewizard.cxx5
-rw-r--r--dbaccess/source/ui/uno/textconnectionsettings_uno.cxx9
-rw-r--r--desktop/qa/desktop_lib/test_desktop_lib.cxx4
-rw-r--r--desktop/source/app/app.cxx7
-rw-r--r--desktop/source/app/appinit.cxx4
-rw-r--r--desktop/source/app/dispatchwatcher.cxx5
-rw-r--r--desktop/source/app/officeipcthread.cxx8
-rw-r--r--desktop/source/deployment/dp_log.cxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_dialog2.cxx3
-rw-r--r--desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx3
-rw-r--r--desktop/source/deployment/gui/dp_gui_service.cxx5
-rw-r--r--desktop/source/deployment/gui/license_dialog.cxx4
-rw-r--r--desktop/source/deployment/manager/dp_informationprovider.cxx3
-rw-r--r--desktop/source/deployment/manager/dp_manager.cxx4
-rw-r--r--desktop/source/deployment/manager/dp_managerfac.cxx2
-rw-r--r--desktop/source/deployment/registry/sfwk/dp_sfwk.cxx3
-rw-r--r--desktop/source/lib/init.cxx12
-rw-r--r--desktop/source/migration/services/jvmfwk.cxx4
-rw-r--r--drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx4
-rw-r--r--drawinglayer/source/primitive2d/baseprimitive2d.cxx5
-rw-r--r--drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx4
-rw-r--r--drawinglayer/source/tools/wmfemfhelper.cxx4
-rw-r--r--editeng/source/accessibility/AccessibleEditableTextPara.cxx4
-rw-r--r--editeng/source/accessibility/AccessibleParaManager.cxx12
-rw-r--r--editeng/source/accessibility/AccessibleStaticTextBase.cxx5
-rw-r--r--editeng/source/editeng/impedit3.cxx4
-rw-r--r--editeng/source/items/svxfont.cxx8
-rw-r--r--editeng/source/misc/txtrange.cxx4
-rw-r--r--editeng/source/misc/unolingu.cxx7
-rw-r--r--editeng/source/uno/unoedprx.cxx3
-rw-r--r--editeng/source/uno/unonrule.cxx4
-rw-r--r--editeng/source/xml/xmltxtexp.cxx2
-rw-r--r--editeng/source/xml/xmltxtimp.cxx5
-rw-r--r--embeddedobj/source/general/docholder.cxx4
-rw-r--r--embeddedobj/source/msole/ownview.cxx3
-rw-r--r--emfio/source/emfuno/xemfparser.cxx4
-rw-r--r--eventattacher/source/eventattacher.cxx8
-rw-r--r--extensions/source/bibliography/bibload.cxx6
-rw-r--r--extensions/source/bibliography/datman.cxx8
-rw-r--r--extensions/source/bibliography/formcontrolcontainer.cxx4
-rw-r--r--extensions/source/bibliography/framectr.cxx3
-rw-r--r--extensions/source/bibliography/general.cxx4
-rw-r--r--extensions/source/logging/consolehandler.cxx5
-rw-r--r--extensions/source/logging/csvformatter.cxx4
-rw-r--r--extensions/source/logging/filehandler.cxx5
-rw-r--r--extensions/source/logging/logger.cxx4
-rw-r--r--extensions/source/logging/plaintextformatter.cxx4
-rw-r--r--extensions/source/logging/simpletextformatter.cxx3
-rw-r--r--extensions/source/propctrlr/browserlistbox.cxx3
-rw-r--r--extensions/source/propctrlr/composeduiupdate.cxx4
-rw-r--r--extensions/source/propctrlr/eventhandler.cxx4
-rw-r--r--extensions/source/propctrlr/fontdialog.cxx3
-rw-r--r--extensions/source/propctrlr/formcomponenthandler.cxx3
-rw-r--r--extensions/source/propctrlr/formgeometryhandler.cxx15
-rw-r--r--extensions/source/propctrlr/formmetadata.cxx2
-rw-r--r--extensions/source/propctrlr/genericpropertyhandler.cxx8
-rw-r--r--extensions/source/propctrlr/objectinspectormodel.cxx3
-rw-r--r--extensions/source/propctrlr/stringrepresentation.cxx4
-rw-r--r--extensions/source/propctrlr/taborder.cxx4
-rw-r--r--extensions/source/scanner/scanunx.cxx7
-rw-r--r--filter/source/config/cache/filterfactory.cxx2
-rw-r--r--filter/source/flash/swffilter.cxx7
-rw-r--r--filter/source/flash/swfwriter2.cxx3
-rw-r--r--filter/source/graphicfilter/egif/egif.cxx2
-rw-r--r--filter/source/graphicfilter/eps/eps.cxx4
-rw-r--r--filter/source/graphicfilter/etiff/etiff.cxx2
-rw-r--r--filter/source/graphicfilter/ieps/ieps.cxx4
-rw-r--r--filter/source/graphicfilter/ios2met/ios2met.cxx4
-rw-r--r--filter/source/graphicfilter/ipbm/ipbm.cxx4
-rw-r--r--filter/source/graphicfilter/ipcd/ipcd.cxx4
-rw-r--r--filter/source/graphicfilter/ipcx/ipcx.cxx4
-rw-r--r--filter/source/graphicfilter/ipict/ipict.cxx8
-rw-r--r--filter/source/graphicfilter/ipsd/ipsd.cxx4
-rw-r--r--filter/source/graphicfilter/iras/iras.cxx4
-rw-r--r--filter/source/graphicfilter/itga/itga.cxx4
-rw-r--r--filter/source/graphicfilter/itiff/itiff.cxx4
-rw-r--r--filter/source/msfilter/escherex.cxx8
-rw-r--r--filter/source/msfilter/msdffimp.cxx13
-rw-r--r--filter/source/msfilter/msvbahelper.cxx4
-rw-r--r--filter/source/msfilter/util.cxx4
-rw-r--r--filter/source/odfflatxml/OdfFlatXml.cxx4
-rw-r--r--filter/source/pdf/pdfexport.cxx4
-rw-r--r--filter/source/pdf/pdffilter.cxx2
-rw-r--r--filter/source/svg/svgexport.cxx5
-rw-r--r--filter/source/svg/svgfilter.cxx4
-rw-r--r--filter/source/xsltdialog/xmlfilterdialogcomponent.cxx3
-rw-r--r--filter/source/xsltdialog/xmlfiltertestdialog.cxx3
-rw-r--r--filter/source/xsltfilter/LibXSLTTransformer.cxx4
-rw-r--r--filter/source/xsltfilter/XSLTFilter.cxx4
-rw-r--r--forms/source/component/Button.cxx2
-rw-r--r--forms/source/component/DatabaseForm.cxx4
-rw-r--r--forms/source/component/FormComponent.cxx4
-rw-r--r--forms/source/component/FormattedField.cxx5
-rw-r--r--forms/source/component/imgprod.cxx2
-rw-r--r--forms/source/helper/commandimageprovider.cxx3
-rw-r--r--forms/source/misc/InterfaceContainer.cxx2
-rw-r--r--forms/source/misc/limitedformats.cxx2
-rw-r--r--formula/source/core/api/token.cxx4
-rw-r--r--fpicker/source/office/fileview.cxx5
-rw-r--r--framework/source/fwe/dispatch/interaction.cxx8
-rw-r--r--framework/source/fwe/helper/documentundoguard.cxx5
-rw-r--r--framework/source/fwe/helper/undomanagerhelper.cxx8
-rw-r--r--framework/source/fwe/xml/menudocumenthandler.cxx4
-rw-r--r--framework/source/fwe/xml/statusbardocumenthandler.cxx4
-rw-r--r--framework/source/fwe/xml/toolboxdocumenthandler.cxx8
-rw-r--r--framework/source/helper/statusindicatorfactory.cxx5
-rw-r--r--framework/source/loadenv/loadenv.cxx4
-rw-r--r--framework/source/uiconfiguration/globalsettings.cxx9
-rw-r--r--framework/source/uielement/subtoolbarcontroller.cxx4
-rw-r--r--framework/source/uielement/thesaurusmenucontroller.cxx4
-rw-r--r--framework/source/uielement/toolbarsmenucontroller.cxx8
-rw-r--r--framework/source/uielement/uicommanddescription.cxx5
-rw-r--r--framework/source/xml/imagesdocumenthandler.cxx4
-rw-r--r--helpcompiler/source/HelpCompiler.cxx4
-rw-r--r--helpcompiler/source/HelpLinker.cxx8
-rw-r--r--hwpfilter/source/attributes.cxx4
-rw-r--r--hwpfilter/source/fontmap.cxx5
-rw-r--r--hwpfilter/source/hcode.cxx5
-rw-r--r--hwpfilter/source/hstyle.cxx4
-rw-r--r--hwpfilter/source/hwpeq.cxx8
-rw-r--r--hwpfilter/source/hwpreader.cxx3
-rw-r--r--hwpfilter/source/lexer.cxx7
-rw-r--r--i18nlangtag/source/isolang/isolang.cxx6
-rw-r--r--i18nlangtag/source/languagetag/languagetag.cxx4
-rw-r--r--i18npool/source/breakiterator/breakiterator_unicode.cxx4
-rw-r--r--i18npool/source/calendar/calendar_jewish.cxx7
-rw-r--r--i18npool/source/localedata/LocaleNode.cxx5
-rw-r--r--i18npool/source/localedata/localedata.cxx4
-rw-r--r--i18npool/source/localedata/saxparser.cxx4
-rw-r--r--i18npool/source/nativenumber/nativenumbersupplier.cxx23
-rw-r--r--i18npool/source/registerservices/registerservices.cxx10
-rw-r--r--i18npool/source/textconversion/genconv_dict.cxx3
-rw-r--r--i18nutil/source/utility/paper.cxx4
-rw-r--r--idl/source/prj/database.cxx4
-rw-r--r--idlc/source/idlc.cxx4
-rw-r--r--io/source/TextInputStream/TextInputStream.cxx4
-rw-r--r--io/source/TextOutputStream/TextOutputStream.cxx4
-rw-r--r--io/source/acceptor/acc_pipe.cxx2
-rw-r--r--io/source/acceptor/acc_socket.cxx7
-rw-r--r--io/source/acceptor/acceptor.cxx7
-rw-r--r--io/source/connector/connector.cxx4
-rw-r--r--io/source/connector/ctr_socket.cxx4
-rw-r--r--io/source/stm/odata.cxx18
-rw-r--r--io/source/stm/omark.cxx7
-rw-r--r--io/source/stm/opipe.cxx3
-rw-r--r--io/source/stm/opump.cxx4
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/util.cxx10
-rw-r--r--libreofficekit/qa/gtktiledviewer/gtv-application.cxx4
-rw-r--r--libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx4
-rw-r--r--libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx4
-rw-r--r--libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx4
-rw-r--r--libreofficekit/qa/tilebench/tilebench.cxx6
-rw-r--r--lingucomponent/source/languageguessing/guesslang.cxx4
-rw-r--r--lingucomponent/source/languageguessing/simpleguesser.cxx4
-rw-r--r--lingucomponent/source/numbertext/numbertext.cxx3
-rw-r--r--linguistic/source/convdicxml.cxx2
-rw-r--r--linguistic/source/lngopt.cxx4
-rw-r--r--linguistic/source/misc.cxx8
-rw-r--r--linguistic/source/spelldsp.cxx2
-rw-r--r--o3tl/qa/test-lru_map.cxx4
-rw-r--r--o3tl/qa/test-sorted_vector.cxx3
-rw-r--r--oox/source/drawingml/chart/objectformatter.cxx4
-rw-r--r--oox/source/drawingml/clrscheme.cxx4
-rw-r--r--oox/source/drawingml/customshapegeometry.cxx53
-rw-r--r--oox/source/drawingml/diagram/datamodelcontext.cxx4
-rw-r--r--oox/source/drawingml/diagram/layoutnodecontext.cxx4
-rw-r--r--oox/source/drawingml/shape.cxx4
-rw-r--r--oox/source/drawingml/textbodycontext.cxx4
-rw-r--r--oox/source/drawingml/themeelementscontext.cxx16
-rw-r--r--oox/source/export/chartexport.cxx4
-rw-r--r--oox/source/helper/progressbar.cxx4
-rw-r--r--oox/source/mathml/import.cxx4
-rw-r--r--oox/source/ppt/customshowlistcontext.cxx4
-rw-r--r--oox/source/ppt/timenodelistcontext.cxx4
-rw-r--r--oox/source/ppt/timetargetelementcontext.cxx4
-rw-r--r--oox/source/shape/ShapeFilterBase.cxx4
-rw-r--r--package/source/zippackage/ZipPackage.cxx4
-rw-r--r--pyuno/source/loader/pyuno_loader.cxx4
-rw-r--r--pyuno/source/module/pyuno_callable.cxx4
-rw-r--r--pyuno/source/module/pyuno_gc.cxx10
-rw-r--r--registry/source/reflread.cxx26
-rw-r--r--registry/tools/regmerge.cxx4
-rw-r--r--remotebridges/source/unourl_resolver/unourl_resolver.cxx4
-rw-r--r--reportdesign/source/core/api/ReportDefinition.cxx15
-rw-r--r--reportdesign/source/core/sdr/UndoEnv.cxx7
-rw-r--r--reportdesign/source/filter/xml/xmlExport.cxx3
-rw-r--r--reportdesign/source/filter/xml/xmlFixedContent.cxx5
-rw-r--r--reportdesign/source/filter/xml/xmlStyleImport.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlfilter.cxx12
-rw-r--r--reportdesign/source/ui/dlg/GroupsSorting.cxx5
-rw-r--r--reportdesign/source/ui/dlg/Navigator.cxx3
-rw-r--r--reportdesign/source/ui/inspection/metadata.cxx2
-rw-r--r--reportdesign/source/ui/report/DesignView.cxx3
-rw-r--r--sal/osl/all/utility.cxx4
-rw-r--r--sal/osl/unx/conditn.cxx4
-rw-r--r--sal/osl/unx/file.cxx4
-rw-r--r--sal/osl/unx/file_path_helper.cxx4
-rw-r--r--sal/osl/unx/process.cxx4
-rw-r--r--sal/osl/unx/process_impl.cxx8
-rw-r--r--sal/osl/unx/profile.cxx4
-rw-r--r--sal/osl/unx/thread.cxx20
-rw-r--r--sal/qa/osl/condition/osl_Condition.cxx4
-rw-r--r--sal/qa/osl/file/osl_File.cxx8
-rw-r--r--sal/qa/osl/module/osl_Module.cxx3
-rw-r--r--sal/qa/osl/mutex/osl_Mutex.cxx16
-rw-r--r--sal/qa/osl/pipe/osl_Pipe.cxx4
-rw-r--r--sal/qa/osl/process/osl_Thread.cxx20
-rw-r--r--sal/qa/osl/process/osl_process.cxx4
-rw-r--r--sal/qa/osl/security/osl_Security.cxx4
-rw-r--r--sal/qa/rtl/doublelock/rtl_doublelocking.cxx3
-rw-r--r--sal/qa/rtl/random/rtl_random.cxx4
-rw-r--r--sal/qa/rtl/ref/rtl_ref.cxx4
-rw-r--r--sal/rtl/alloc_arena.cxx4
-rw-r--r--sal/rtl/bootstrap.cxx12
-rw-r--r--sal/rtl/cipher.cxx12
-rw-r--r--sal/rtl/digest.cxx24
-rw-r--r--sal/rtl/hash.cxx4
-rw-r--r--sal/rtl/locale.cxx4
-rw-r--r--sal/rtl/random.cxx8
-rw-r--r--sal/rtl/uuid.cxx4
-rw-r--r--sal/textenc/convertisciidevangari.cxx4
-rw-r--r--sal/textenc/tcvtutf7.cxx8
-rw-r--r--sal/textenc/tcvtutf8.cxx4
-rw-r--r--sal/textenc/tencinfo.cxx4
-rw-r--r--sc/qa/extras/scddelinkobj.cxx3
-rw-r--r--sc/qa/extras/scuniquecellformatsenumeration.cxx3
-rw-r--r--sc/qa/unit/mark_test.cxx12
-rw-r--r--sc/qa/unit/subsequent_filters-test.cxx4
-rw-r--r--sc/qa/unit/ucalc.cxx4
-rw-r--r--sc/qa/unit/ucalc_formula.cxx4
-rw-r--r--sc/qa/unit/ucalc_sharedformula.cxx4
-rw-r--r--sc/source/core/data/bcaslot.cxx5
-rw-r--r--sc/source/core/data/column3.cxx4
-rw-r--r--sc/source/core/data/document.cxx4
-rw-r--r--sc/source/core/data/dpgroup.cxx8
-rw-r--r--sc/source/core/data/dptabres.cxx8
-rw-r--r--sc/source/core/data/dptabsrc.cxx4
-rw-r--r--sc/source/core/data/formulacell.cxx4
-rw-r--r--sc/source/core/data/funcdesc.cxx4
-rw-r--r--sc/source/core/data/segmenttree.cxx4
-rw-r--r--sc/source/core/data/table3.cxx7
-rw-r--r--sc/source/core/opencl/formulagroupcl.cxx19
-rw-r--r--sc/source/core/tool/compiler.cxx12
-rw-r--r--sc/source/core/tool/detfunc.cxx4
-rw-r--r--sc/source/core/tool/interpr1.cxx4
-rw-r--r--sc/source/core/tool/interpr3.cxx24
-rw-r--r--sc/source/core/tool/interpr6.cxx4
-rw-r--r--sc/source/core/tool/interpr8.cxx9
-rw-r--r--sc/source/core/tool/rangelst.cxx4
-rw-r--r--sc/source/core/tool/scmatrix.cxx24
-rw-r--r--sc/source/core/tool/stylehelper.cxx4
-rw-r--r--sc/source/filter/excel/excimp8.cxx4
-rw-r--r--sc/source/filter/excel/xecontent.cxx4
-rw-r--r--sc/source/filter/excel/xedbdata.cxx3
-rw-r--r--sc/source/filter/excel/xelink.cxx16
-rw-r--r--sc/source/filter/excel/xename.cxx4
-rw-r--r--sc/source/filter/excel/xepage.cxx4
-rw-r--r--sc/source/filter/excel/xestyle.cxx12
-rw-r--r--sc/source/filter/excel/xetable.cxx4
-rw-r--r--sc/source/filter/excel/xiescher.cxx4
-rw-r--r--sc/source/filter/excel/xilink.cxx10
-rw-r--r--sc/source/filter/excel/xistyle.cxx4
-rw-r--r--sc/source/filter/excel/xltoolbar.cxx4
-rw-r--r--sc/source/filter/html/htmlpars.cxx4
-rw-r--r--sc/source/filter/oox/formulaparser.cxx4
-rw-r--r--sc/source/filter/oox/pagesettings.cxx4
-rw-r--r--sc/source/filter/orcus/interface.cxx4
-rw-r--r--sc/source/filter/xcl97/XclExpChangeTrack.cxx4
-rw-r--r--sc/source/filter/xcl97/xcl97rec.cxx8
-rw-r--r--sc/source/filter/xml/XMLTrackedChangesContext.cxx4
-rw-r--r--sc/source/filter/xml/xmlcvali.cxx4
-rw-r--r--sc/source/filter/xml/xmlexprt.cxx4
-rw-r--r--sc/source/filter/xml/xmlfonte.cxx4
-rw-r--r--sc/source/filter/xml/xmlimprt.cxx12
-rw-r--r--sc/source/filter/xml/xmlstyli.cxx8
-rw-r--r--sc/source/ui/Accessibility/AccessibleDocument.cxx8
-rw-r--r--sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx44
-rw-r--r--sc/source/ui/Accessibility/AccessibleText.cxx16
-rw-r--r--sc/source/ui/dbgui/csvgrid.cxx4
-rw-r--r--sc/source/ui/dbgui/dbnamdlg.cxx7
-rw-r--r--sc/source/ui/docshell/docfunc.cxx4
-rw-r--r--sc/source/ui/docshell/macromgr.cxx4
-rw-r--r--sc/source/ui/miscdlgs/solveroptions.cxx4
-rw-r--r--sc/source/ui/unoobj/cellsuno.cxx16
-rw-r--r--sc/source/ui/unoobj/fielduno.cxx4
-rw-r--r--sc/source/ui/unoobj/funcuno.cxx8
-rw-r--r--sc/source/ui/unoobj/servuno.cxx4
-rw-r--r--sc/source/ui/vba/excelvbahelper.cxx4
-rw-r--r--sc/source/ui/vba/vbaapplication.cxx4
-rw-r--r--sc/source/ui/vba/vbaborders.cxx8
-rw-r--r--sc/source/ui/vba/vbachartobjects.cxx4
-rw-r--r--sc/source/ui/vba/vbacomments.cxx4
-rw-r--r--sc/source/ui/vba/vbafiledialogitems.cxx4
-rw-r--r--sc/source/ui/vba/vbamenubars.cxx4
-rw-r--r--sc/source/ui/vba/vbamenuitems.cxx4
-rw-r--r--sc/source/ui/vba/vbamenus.cxx4
-rw-r--r--sc/source/ui/vba/vbanames.cxx4
-rw-r--r--sc/source/ui/vba/vbapagebreaks.cxx8
-rw-r--r--sc/source/ui/vba/vbapalette.cxx4
-rw-r--r--sc/source/ui/vba/vbapivottables.cxx4
-rw-r--r--sc/source/ui/vba/vbarange.cxx28
-rw-r--r--sc/source/ui/vba/vbasheetobjects.cxx12
-rw-r--r--sc/source/ui/vba/vbawindow.cxx4
-rw-r--r--sc/source/ui/vba/vbawindows.cxx9
-rw-r--r--sc/source/ui/vba/vbaworkbooks.cxx4
-rw-r--r--sc/source/ui/vba/vbaworksheets.cxx4
-rw-r--r--sc/source/ui/view/dbfunc3.cxx4
-rw-r--r--sc/source/ui/view/drawview.cxx4
-rw-r--r--sc/source/ui/view/gridwin.cxx4
-rw-r--r--sc/source/ui/view/scextopt.cxx4
-rw-r--r--sc/source/ui/view/tabvwshb.cxx4
-rw-r--r--sccomp/source/solver/CoinMPSolver.cxx4
-rw-r--r--sccomp/source/solver/LpsolveSolver.cxx4
-rw-r--r--sccomp/source/solver/SwarmSolver.cxx6
-rw-r--r--scripting/source/dlgprov/dlgevtatt.cxx3
-rw-r--r--scripting/source/provider/BrowseNodeFactoryImpl.cxx13
-rw-r--r--scripting/source/stringresource/stringresource.cxx4
-rw-r--r--scripting/source/vbaevents/eventhelper.cxx30
-rw-r--r--sd/qa/unit/tiledrendering/tiledrendering.cxx4
-rw-r--r--sd/source/core/CustomAnimationCloner.cxx4
-rw-r--r--sd/source/core/CustomAnimationEffect.cxx12
-rw-r--r--sd/source/core/EffectMigration.cxx13
-rw-r--r--sd/source/core/annotations/Annotation.cxx4
-rw-r--r--sd/source/core/annotations/AnnotationEnumeration.cxx4
-rw-r--r--sd/source/core/drawdoc3.cxx4
-rw-r--r--sd/source/core/sdpage.cxx8
-rw-r--r--sd/source/core/text/textapi.cxx8
-rw-r--r--sd/source/filter/eppt/epptso.cxx4
-rw-r--r--sd/source/filter/eppt/pptx-epptooxml.cxx4
-rw-r--r--sd/source/filter/grf/sdgrffilter.cxx4
-rw-r--r--sd/source/filter/html/HtmlOptionsDialog.cxx4
-rw-r--r--sd/source/filter/html/buttonset.cxx4
-rw-r--r--sd/source/filter/html/htmlex.cxx4
-rw-r--r--sd/source/filter/html/pubdlg.cxx4
-rw-r--r--sd/source/filter/ppt/pptin.cxx4
-rw-r--r--sd/source/filter/xml/sdtransform.cxx4
-rw-r--r--sd/source/filter/xml/sdxmlwrp.cxx4
-rw-r--r--sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx5
-rw-r--r--sd/source/ui/animations/CustomAnimationDialog.cxx68
-rw-r--r--sd/source/ui/animations/CustomAnimationList.cxx8
-rw-r--r--sd/source/ui/animations/SlideTransitionBox.cxx4
-rw-r--r--sd/source/ui/animations/SlideTransitionPane.cxx4
-rw-r--r--sd/source/ui/animations/motionpathtag.cxx16
-rw-r--r--sd/source/ui/annotations/annotationtag.cxx8
-rw-r--r--sd/source/ui/app/tmplctrl.cxx4
-rw-r--r--sd/source/ui/controller/displaymodecontroller.cxx4
-rw-r--r--sd/source/ui/controller/slidelayoutcontroller.cxx4
-rw-r--r--sd/source/ui/dlg/headerfooterdlg.cxx10
-rw-r--r--sd/source/ui/dlg/paragr.cxx4
-rw-r--r--sd/source/ui/framework/tools/FrameworkHelper.cxx4
-rw-r--r--sd/source/ui/presenter/PresenterCanvas.cxx4
-rw-r--r--sd/source/ui/remotecontrol/BluetoothServer.cxx4
-rw-r--r--sd/source/ui/sidebar/LayoutMenu.cxx4
-rw-r--r--sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx4
-rw-r--r--sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx4
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx4
-rw-r--r--sd/source/ui/slidesorter/view/SlideSorterView.cxx3
-rw-r--r--sd/source/ui/slidesorter/view/SlsLayouter.cxx4
-rw-r--r--sd/source/ui/table/TableDesignPane.cxx8
-rw-r--r--sd/source/ui/uitest/uiobject.cxx4
-rw-r--r--sd/source/ui/unoidl/UnoDocumentSettings.cxx4
-rw-r--r--sd/source/ui/unoidl/randomnode.cxx5
-rw-r--r--sd/source/ui/unoidl/unomodel.cxx8
-rw-r--r--sd/source/ui/unoidl/unopage.cxx4
-rw-r--r--sd/source/ui/unoidl/unopool.cxx4
-rw-r--r--sd/source/ui/unoidl/unosrch.cxx4
-rw-r--r--sd/source/ui/view/drviews2.cxx4
-rw-r--r--sd/source/ui/view/drviewsa.cxx3
-rw-r--r--sd/source/ui/view/sdview.cxx4
-rw-r--r--sd/source/ui/view/sdview2.cxx3
-rw-r--r--sd/source/ui/view/sdview3.cxx4
-rw-r--r--sd/source/ui/view/viewoverlaymanager.cxx8
-rw-r--r--sd/source/ui/view/viewshel.cxx4
-rw-r--r--sdext/source/minimizer/pppoptimizertoken.cxx4
-rw-r--r--sdext/source/pdfimport/filterdet.cxx4
-rw-r--r--sdext/source/pdfimport/odf/odfemitter.cxx4
-rw-r--r--sdext/source/pdfimport/pdfparse/pdfparse.cxx3
-rw-r--r--sdext/source/pdfimport/test/pdfunzip.cxx4
-rw-r--r--sdext/source/pdfimport/tree/treevisitorfactory.cxx4
-rw-r--r--sdext/source/pdfimport/wrapper/wrapper.cxx4
-rw-r--r--sdext/source/presenter/PresenterAccessibility.cxx8
-rw-r--r--sfx2/source/appl/appcfg.cxx2
-rw-r--r--sfx2/source/appl/appinit.cxx4
-rw-r--r--sfx2/source/appl/appopen.cxx2
-rw-r--r--sfx2/source/appl/childwin.cxx2
-rw-r--r--sfx2/source/appl/impldde.cxx4
-rw-r--r--sfx2/source/appl/linkmgr2.cxx4
-rw-r--r--sfx2/source/appl/linksrc.cxx6
-rw-r--r--sfx2/source/appl/lnkbase2.cxx5
-rw-r--r--sfx2/source/appl/newhelp.cxx4
-rw-r--r--sfx2/source/appl/openuriexternally.cxx4
-rw-r--r--sfx2/source/appl/sfxhelp.cxx12
-rw-r--r--sfx2/source/appl/workwin.cxx4
-rw-r--r--sfx2/source/bastyp/fltlst.cxx3
-rw-r--r--sfx2/source/control/dispatch.cxx4
-rw-r--r--sfx2/source/control/objface.cxx4
-rw-r--r--sfx2/source/dialog/backingwindow.cxx4
-rw-r--r--sfx2/source/dialog/dinfdlg.cxx4
-rw-r--r--sfx2/source/dialog/dockwin.cxx4
-rw-r--r--sfx2/source/dialog/filtergrouping.cxx22
-rw-r--r--sfx2/source/dialog/mailmodel.cxx4
-rw-r--r--sfx2/source/dialog/tabdlg.cxx4
-rw-r--r--sfx2/source/dialog/templdlg.cxx8
-rw-r--r--sfx2/source/doc/Metadatable.cxx15
-rw-r--r--sfx2/source/doc/doctempl.cxx13
-rw-r--r--sfx2/source/doc/docundomanager.cxx3
-rw-r--r--sfx2/source/doc/objcont.cxx4
-rw-r--r--sfx2/source/doc/objmisc.cxx3
-rw-r--r--sfx2/source/doc/objserv.cxx7
-rw-r--r--sfx2/source/doc/objxtor.cxx7
-rw-r--r--sfx2/source/doc/oleprops.cxx3
-rw-r--r--sfx2/source/doc/printhelper.cxx6
-rw-r--r--sfx2/source/doc/sfxbasemodel.cxx15
-rw-r--r--sfx2/source/doc/sfxmodelfactory.cxx4
-rw-r--r--sfx2/source/doc/templatedlg.cxx4
-rw-r--r--sfx2/source/explorer/nochaos.cxx2
-rw-r--r--sfx2/source/notebookbar/NotebookbarTabControl.cxx4
-rw-r--r--sfx2/source/notebookbar/PriorityMergedHBox.cxx3
-rw-r--r--sfx2/source/sidebar/SidebarToolBox.cxx4
-rw-r--r--sfx2/source/view/classificationcontroller.cxx14
-rw-r--r--sfx2/source/view/ipclient.cxx2
-rw-r--r--sfx2/source/view/sfxbasecontroller.cxx7
-rw-r--r--sfx2/source/view/viewprn.cxx4
-rw-r--r--slideshow/source/engine/animationnodes/animationaudionode.cxx4
-rw-r--r--slideshow/source/engine/eventmultiplexer.cxx6
-rw-r--r--slideshow/source/engine/shapes/appletshape.cxx4
-rw-r--r--slideshow/source/engine/shapes/backgroundshape.cxx3
-rw-r--r--slideshow/source/engine/shapes/intrinsicanimationactivity.cxx3
-rw-r--r--slideshow/source/engine/shapes/mediashape.cxx3
-rw-r--r--slideshow/source/engine/usereventqueue.cxx4
-rw-r--r--slideshow/test/testshape.cxx4
-rw-r--r--slideshow/test/testview.cxx4
-rw-r--r--sot/source/base/exchange.cxx4
-rw-r--r--sot/source/base/formats.cxx4
-rw-r--r--sot/source/sdstor/stgio.cxx7
-rw-r--r--sot/source/sdstor/ucbstorage.cxx4
-rw-r--r--starmath/source/dialog.cxx12
-rw-r--r--starmath/source/mathmlimport.cxx65
-rw-r--r--starmath/source/unofilter.cxx4
-rw-r--r--stoc/source/corereflection/crcomp.cxx3
-rw-r--r--stoc/source/corereflection/crenum.cxx3
-rw-r--r--stoc/source/corereflection/criface.cxx6
-rw-r--r--stoc/source/implementationregistration/mergekeys.cxx5
-rw-r--r--stoc/source/invocation/invocation.cxx8
-rw-r--r--stoc/source/invocation_adapterfactory/iafactory.cxx8
-rw-r--r--stoc/source/javaloader/javaloader.cxx4
-rw-r--r--stoc/source/namingservice/namingservice.cxx2
-rw-r--r--stoc/source/security/permissions.cxx9
-rw-r--r--stoc/source/typeconv/convert.cxx3
-rw-r--r--store/source/lockbyte.cxx16
-rw-r--r--store/source/storbios.cxx4
-rw-r--r--store/source/store.cxx6
-rw-r--r--svgio/source/svgreader/svgcharacternode.cxx4
-rw-r--r--svgio/source/svgreader/svgtextpathnode.cxx4
-rw-r--r--svgio/source/svguno/xsvgparser.cxx4
-rw-r--r--svl/qa/unit/items/test_IndexedStyleSheets.cxx4
-rw-r--r--svl/qa/unit/notify/test_SfxBroadcaster.cxx4
-rw-r--r--svl/source/items/style.cxx4
-rw-r--r--svl/source/misc/gridprinter.cxx4
-rw-r--r--svl/source/undo/undo.cxx4
-rw-r--r--svl/source/uno/pathservice.cxx3
-rw-r--r--svtools/source/control/ctrltool.cxx6
-rw-r--r--svtools/source/control/tabbar.cxx4
-rw-r--r--svtools/source/dialogs/addresstemplate.cxx9
-rw-r--r--svtools/source/dialogs/insdlg.cxx3
-rw-r--r--svtools/source/misc/acceleratorexecute.cxx3
-rw-r--r--svtools/source/misc/embedhlp.cxx4
-rw-r--r--svtools/source/misc/imagemgr.cxx8
-rw-r--r--svtools/source/misc/imageresourceaccess.cxx4
-rw-r--r--svtools/source/misc/langhelp.cxx4
-rw-r--r--svtools/source/misc/langtab.cxx3
-rw-r--r--svtools/source/misc/templatefoldercache.cxx10
-rw-r--r--svtools/source/svhtml/htmlkywd.cxx5
-rw-r--r--svtools/source/svrtf/rtfkeywd.cxx4
-rw-r--r--svtools/source/table/cellvalueconversion.cxx10
-rw-r--r--svtools/source/table/gridtablerenderer.cxx4
-rw-r--r--svtools/source/table/tablecontrol_impl.cxx4
-rw-r--r--svtools/source/uno/generictoolboxcontroller.cxx4
-rw-r--r--svtools/source/uno/popupmenucontrollerbase.cxx4
-rw-r--r--svtools/source/uno/treecontrolpeer.cxx9
-rw-r--r--svtools/source/uno/unoimap.cxx7
-rw-r--r--svx/source/accessibility/AccessibleEmptyEditSource.cxx2
-rw-r--r--svx/source/accessibility/AccessibleShape.cxx3
-rw-r--r--svx/source/accessibility/AccessibleTextHelper.cxx16
-rw-r--r--svx/source/core/extedit.cxx4
-rw-r--r--svx/source/customshapes/EnhancedCustomShapeFontWork.cxx3
-rw-r--r--svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx10
-rw-r--r--svx/source/dialog/framelinkarray.cxx7
-rw-r--r--svx/source/dialog/weldeditview.cxx7
-rw-r--r--svx/source/engine3d/helperhittest3d.cxx2
-rw-r--r--svx/source/engine3d/helperminimaldepth3d.cxx4
-rw-r--r--svx/source/engine3d/scene3d.cxx3
-rw-r--r--svx/source/engine3d/view3d.cxx4
-rw-r--r--svx/source/form/filtnav.cxx12
-rw-r--r--svx/source/form/fmscriptingenv.cxx11
-rw-r--r--svx/source/form/fmsrccfg.cxx4
-rw-r--r--svx/source/form/fmundo.cxx4
-rw-r--r--svx/source/form/formcontroller.cxx13
-rw-r--r--svx/source/form/legacyformcontroller.cxx4
-rw-r--r--svx/source/gengal/gengal.cxx4
-rw-r--r--svx/source/mnuctrls/smarttagmenu.cxx4
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx21
-rw-r--r--svx/source/sidebar/nbdtmg.cxx12
-rw-r--r--svx/source/stbctrls/pszctrl.cxx4
-rw-r--r--svx/source/stbctrls/selctrl.cxx4
-rw-r--r--svx/source/stbctrls/zoomctrl.cxx4
-rw-r--r--svx/source/svdraw/sdrpaintwindow.cxx4
-rw-r--r--svx/source/svdraw/svdedtv2.cxx4
-rw-r--r--svx/source/svdraw/svdhdl.cxx6
-rw-r--r--svx/source/svdraw/svdocirc.cxx4
-rw-r--r--svx/source/svdraw/svdomeas.cxx4
-rw-r--r--svx/source/svdraw/svdoole2.cxx4
-rw-r--r--svx/source/svdraw/svdopath.cxx8
-rw-r--r--svx/source/svdraw/svdpdf.cxx3
-rw-r--r--svx/source/table/svdotable.cxx8
-rw-r--r--svx/source/table/tablecontroller.cxx3
-rw-r--r--svx/source/table/tabledesign.cxx8
-rw-r--r--svx/source/table/tablehandles.cxx2
-rw-r--r--svx/source/table/tablertfimporter.cxx8
-rw-r--r--svx/source/table/viewcontactoftableobj.cxx4
-rw-r--r--svx/source/tbxctrls/bulletsnumbering.cxx4
-rw-r--r--svx/source/tbxctrls/colrctrl.cxx3
-rw-r--r--svx/source/tbxctrls/fontworkgallery.cxx14
-rw-r--r--svx/source/tbxctrls/grafctrl.cxx16
-rw-r--r--svx/source/tbxctrls/layctrl.cxx7
-rw-r--r--svx/source/tbxctrls/linectrl.cxx8
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx20
-rw-r--r--svx/source/unodraw/UnoNamespaceMap.cxx7
-rw-r--r--svx/source/unodraw/XPropertyTable.cxx22
-rw-r--r--svx/source/unodraw/gluepts.cxx4
-rw-r--r--svx/source/unodraw/unobtabl.cxx4
-rw-r--r--svx/source/unodraw/unodtabl.cxx4
-rw-r--r--svx/source/unodraw/unogtabl.cxx4
-rw-r--r--svx/source/unodraw/unohtabl.cxx4
-rw-r--r--svx/source/unodraw/unomtabl.cxx4
-rw-r--r--svx/source/unodraw/unoprov.cxx4
-rw-r--r--svx/source/unodraw/unoshap3.cxx3
-rw-r--r--svx/source/unodraw/unoshape.cxx4
-rw-r--r--svx/source/unodraw/unottabl.cxx4
-rw-r--r--svx/source/xml/xmlxtexp.cxx3
-rw-r--r--svx/source/xml/xmlxtimp.cxx3
-rw-r--r--sw/qa/core/test_ToxLinkProcessor.cxx4
-rw-r--r--sw/qa/core/test_ToxTextGenerator.cxx8
-rw-r--r--sw/qa/extras/accessibility/accessible_relation_set.cxx3
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport2.cxx4
-rw-r--r--sw/qa/extras/tiledrendering/tiledrendering.cxx4
-rw-r--r--sw/qa/extras/uiwriter/uiwriter.cxx8
-rw-r--r--sw/source/core/access/accmap.cxx24
-rw-r--r--sw/source/core/access/accpara.cxx8
-rw-r--r--sw/source/core/access/acctable.cxx12
-rw-r--r--sw/source/core/crsr/DateFormFieldButton.cxx3
-rw-r--r--sw/source/core/crsr/DropDownFormFieldButton.cxx3
-rw-r--r--sw/source/core/crsr/crsrsh.cxx4
-rw-r--r--sw/source/core/crsr/findattr.cxx8
-rw-r--r--sw/source/core/crsr/findcoll.cxx4
-rw-r--r--sw/source/core/crsr/findtxt.cxx8
-rw-r--r--sw/source/core/crsr/swcrsr.cxx4
-rw-r--r--sw/source/core/doc/doc.cxx4
-rw-r--r--sw/source/core/doc/docbm.cxx4
-rw-r--r--sw/source/core/doc/doccomp.cxx9
-rw-r--r--sw/source/core/doc/docedt.cxx4
-rw-r--r--sw/source/core/doc/doctxm.cxx4
-rw-r--r--sw/source/core/doc/gctable.cxx4
-rw-r--r--sw/source/core/doc/htmltbl.cxx4
-rw-r--r--sw/source/core/doc/number.cxx8
-rw-r--r--sw/source/core/doc/swstylemanager.cxx8
-rw-r--r--sw/source/core/doc/tblrwcl.cxx16
-rw-r--r--sw/source/core/docnode/ndcopy.cxx7
-rw-r--r--sw/source/core/docnode/ndtbl.cxx16
-rw-r--r--sw/source/core/docnode/ndtbl1.cxx8
-rw-r--r--sw/source/core/docnode/nodes.cxx4
-rw-r--r--sw/source/core/docnode/section.cxx3
-rw-r--r--sw/source/core/docnode/swthreadmanager.cxx4
-rw-r--r--sw/source/core/draw/dcontact.cxx4
-rw-r--r--sw/source/core/draw/dflyobj.cxx12
-rw-r--r--sw/source/core/draw/dview.cxx4
-rw-r--r--sw/source/core/edit/acorrect.cxx4
-rw-r--r--sw/source/core/edit/edlingu.cxx8
-rw-r--r--sw/source/core/fields/ddefld.cxx4
-rw-r--r--sw/source/core/fields/reffld.cxx4
-rw-r--r--sw/source/core/frmedt/fetab.cxx4
-rw-r--r--sw/source/core/frmedt/tblsel.cxx7
-rw-r--r--sw/source/core/layout/anchoreddrawobject.cxx8
-rw-r--r--sw/source/core/layout/dbg_lay.cxx4
-rw-r--r--sw/source/core/layout/flycnt.cxx8
-rw-r--r--sw/source/core/layout/frmtool.cxx4
-rw-r--r--sw/source/core/layout/laycache.cxx4
-rw-r--r--sw/source/core/layout/objectformattertxtfrm.cxx4
-rw-r--r--sw/source/core/layout/paintfrm.cxx44
-rw-r--r--sw/source/core/layout/sectfrm.cxx4
-rw-r--r--sw/source/core/layout/sortedobjs.cxx3
-rw-r--r--sw/source/core/layout/trvlfrm.cxx4
-rw-r--r--sw/source/core/ole/ndole.cxx4
-rw-r--r--sw/source/core/swg/SwXMLBlockImport.cxx4
-rw-r--r--sw/source/core/swg/SwXMLSectionList.cxx3
-rw-r--r--sw/source/core/table/swnewtable.cxx4
-rw-r--r--sw/source/core/text/frmcrsr.cxx4
-rw-r--r--sw/source/core/text/frmform.cxx5
-rw-r--r--sw/source/core/text/frmpaint.cxx4
-rw-r--r--sw/source/core/text/itratr.cxx8
-rw-r--r--sw/source/core/text/itrform2.cxx4
-rw-r--r--sw/source/core/text/porfld.cxx4
-rw-r--r--sw/source/core/text/pormulti.cxx7
-rw-r--r--sw/source/core/text/txtdrop.cxx4
-rw-r--r--sw/source/core/text/txtftn.cxx4
-rw-r--r--sw/source/core/text/xmldump.cxx4
-rw-r--r--sw/source/core/txtnode/SwGrammarContact.cxx4
-rw-r--r--sw/source/core/txtnode/fmtatr2.cxx4
-rw-r--r--sw/source/core/txtnode/fntcache.cxx4
-rw-r--r--sw/source/core/txtnode/fntcap.cxx24
-rw-r--r--sw/source/core/txtnode/modeltoviewhelper.cxx8
-rw-r--r--sw/source/core/txtnode/thints.cxx4
-rw-r--r--sw/source/core/undo/docundo.cxx4
-rw-r--r--sw/source/core/undo/undobj.cxx4
-rw-r--r--sw/source/core/undo/unsect.cxx4
-rw-r--r--sw/source/core/undo/untbl.cxx18
-rw-r--r--sw/source/core/unocore/unocoll.cxx12
-rw-r--r--sw/source/core/unocore/unofield.cxx8
-rw-r--r--sw/source/core/unocore/unoframe.cxx12
-rw-r--r--sw/source/core/unocore/unoidx.cxx12
-rw-r--r--sw/source/core/unocore/unoobj2.cxx15
-rw-r--r--sw/source/core/unocore/unoparagraph.cxx3
-rw-r--r--sw/source/core/unocore/unoportenum.cxx8
-rw-r--r--sw/source/core/unocore/unorefmk.cxx8
-rw-r--r--sw/source/core/unocore/unosect.cxx4
-rw-r--r--sw/source/core/unocore/unostyle.cxx18
-rw-r--r--sw/source/core/unocore/unotbl.cxx4
-rw-r--r--sw/source/core/unocore/unotext.cxx4
-rw-r--r--sw/source/core/view/pagepreviewlayout.cxx8
-rw-r--r--sw/source/core/view/vprint.cxx4
-rw-r--r--sw/source/filter/ascii/ascatr.cxx8
-rw-r--r--sw/source/filter/ascii/parasc.cxx4
-rw-r--r--sw/source/filter/html/css1atr.cxx4
-rw-r--r--sw/source/filter/html/htmlatr.cxx12
-rw-r--r--sw/source/filter/html/htmlfld.cxx4
-rw-r--r--sw/source/filter/html/htmlform.cxx4
-rw-r--r--sw/source/filter/html/htmltab.cxx24
-rw-r--r--sw/source/filter/html/htmltabw.cxx4
-rw-r--r--sw/source/filter/html/svxcss1.cxx8
-rw-r--r--sw/source/filter/rtf/swparrtf.cxx3
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx9
-rw-r--r--sw/source/filter/ww8/rtfexport.cxx3
-rw-r--r--sw/source/filter/ww8/writerhelper.cxx4
-rw-r--r--sw/source/filter/ww8/writerwordglue.cxx4
-rw-r--r--sw/source/filter/ww8/wrtw8nds.cxx8
-rw-r--r--sw/source/filter/ww8/wrtw8sty.cxx4
-rw-r--r--sw/source/filter/ww8/wrtww8.cxx4
-rw-r--r--sw/source/filter/ww8/ww8atr.cxx4
-rw-r--r--sw/source/filter/ww8/ww8graf.cxx4
-rw-r--r--sw/source/filter/ww8/ww8par.cxx12
-rw-r--r--sw/source/filter/ww8/ww8par3.cxx12
-rw-r--r--sw/source/filter/ww8/ww8par4.cxx4
-rw-r--r--sw/source/filter/ww8/ww8scan.cxx7
-rw-r--r--sw/source/filter/ww8/ww8toolbar.cxx4
-rw-r--r--sw/source/filter/xml/XMLRedlineImportHelper.cxx4
-rw-r--r--sw/source/filter/xml/xmlfmt.cxx22
-rw-r--r--sw/source/filter/xml/xmlfmte.cxx4
-rw-r--r--sw/source/filter/xml/xmlfonte.cxx4
-rw-r--r--sw/source/filter/xml/xmlimp.cxx20
-rw-r--r--sw/source/filter/xml/xmlimpit.cxx4
-rw-r--r--sw/source/filter/xml/xmliteme.cxx4
-rw-r--r--sw/source/filter/xml/xmlitemi.cxx8
-rw-r--r--sw/source/filter/xml/xmlmeta.cxx4
-rw-r--r--sw/source/filter/xml/xmltble.cxx4
-rw-r--r--sw/source/filter/xml/xmltbli.cxx20
-rw-r--r--sw/source/filter/xml/xmltext.cxx4
-rw-r--r--sw/source/filter/xml/xmltexti.cxx4
-rw-r--r--sw/source/ui/config/mailconfigpage.cxx4
-rw-r--r--sw/source/ui/config/optpage.cxx4
-rw-r--r--sw/source/ui/dbui/createaddresslistdialog.cxx4
-rw-r--r--sw/source/ui/dbui/dbinsdlg.cxx4
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.cxx4
-rw-r--r--sw/source/ui/dbui/mmoutputtypepage.cxx8
-rw-r--r--sw/source/ui/dbui/mmresultdialogs.cxx8
-rw-r--r--sw/source/ui/frmdlg/cption.cxx4
-rw-r--r--sw/source/ui/frmdlg/frmpage.cxx8
-rw-r--r--sw/source/ui/index/cnttab.cxx12
-rw-r--r--sw/source/ui/index/swuiidxmrk.cxx8
-rw-r--r--sw/source/ui/misc/outline.cxx4
-rw-r--r--sw/source/ui/table/tautofmt.cxx4
-rw-r--r--sw/source/ui/vba/vbaapplication.cxx4
-rw-r--r--sw/source/ui/vba/vbabookmarks.cxx4
-rw-r--r--sw/source/ui/vba/vbaborders.cxx8
-rw-r--r--sw/source/ui/vba/vbacells.cxx4
-rw-r--r--sw/source/ui/vba/vbacolumns.cxx4
-rw-r--r--sw/source/ui/vba/vbadialog.cxx4
-rw-r--r--sw/source/ui/vba/vbadocument.cxx4
-rw-r--r--sw/source/ui/vba/vbadocumentproperties.cxx24
-rw-r--r--sw/source/ui/vba/vbadocuments.cxx4
-rw-r--r--sw/source/ui/vba/vbafield.cxx12
-rw-r--r--sw/source/ui/vba/vbafont.cxx9
-rw-r--r--sw/source/ui/vba/vbaframes.cxx4
-rw-r--r--sw/source/ui/vba/vbaheadersfooters.cxx4
-rw-r--r--sw/source/ui/vba/vbalistgalleries.cxx4
-rw-r--r--sw/source/ui/vba/vbalistlevels.cxx4
-rw-r--r--sw/source/ui/vba/vbalisttemplates.cxx4
-rw-r--r--sw/source/ui/vba/vbapalette.cxx4
-rw-r--r--sw/source/ui/vba/vbapanes.cxx4
-rw-r--r--sw/source/ui/vba/vbaparagraph.cxx4
-rw-r--r--sw/source/ui/vba/vbarevisions.cxx9
-rw-r--r--sw/source/ui/vba/vbarows.cxx4
-rw-r--r--sw/source/ui/vba/vbasections.cxx4
-rw-r--r--sw/source/ui/vba/vbastyles.cxx12
-rw-r--r--sw/source/ui/vba/vbatables.cxx4
-rw-r--r--sw/source/ui/vba/vbatablesofcontents.cxx4
-rw-r--r--sw/source/ui/vba/vbatabstops.cxx4
-rw-r--r--sw/source/uibase/app/docsh2.cxx4
-rw-r--r--sw/source/uibase/app/docst.cxx4
-rw-r--r--sw/source/uibase/app/docstyle.cxx4
-rw-r--r--sw/source/uibase/app/mainwn.cxx4
-rw-r--r--sw/source/uibase/config/StoredChapterNumbering.cxx4
-rw-r--r--sw/source/uibase/dbui/dbmgr.cxx4
-rw-r--r--sw/source/uibase/dbui/mmconfigitem.cxx8
-rw-r--r--sw/source/uibase/dochdl/gloshdl.cxx4
-rw-r--r--sw/source/uibase/dochdl/swdtflvr.cxx8
-rw-r--r--sw/source/uibase/docvw/AnchorOverlayObject.cxx4
-rw-r--r--sw/source/uibase/docvw/PostItMgr.cxx4
-rw-r--r--sw/source/uibase/docvw/ShadowOverlayObject.cxx4
-rw-r--r--sw/source/uibase/docvw/SidebarTxtControlAcc.cxx8
-rw-r--r--sw/source/uibase/docvw/SidebarWinAcc.cxx4
-rw-r--r--sw/source/uibase/fldui/fldmgr.cxx4
-rw-r--r--sw/source/uibase/lingu/hhcwrp.cxx4
-rw-r--r--sw/source/uibase/ribbar/workctrl.cxx16
-rw-r--r--sw/source/uibase/uiview/pview.cxx4
-rw-r--r--sw/source/uibase/uiview/viewling.cxx4
-rw-r--r--sw/source/uibase/uno/unotxdoc.cxx4
-rw-r--r--sw/source/uibase/utlui/bookctrl.cxx4
-rw-r--r--sw/source/uibase/utlui/content.cxx4
-rw-r--r--sw/source/uibase/utlui/glbltree.cxx4
-rw-r--r--sw/source/uibase/utlui/gloslst.cxx4
-rw-r--r--sw/source/uibase/utlui/tmplctrl.cxx4
-rw-r--r--sw/source/uibase/wrtsh/move.cxx4
-rw-r--r--sw/source/uibase/wrtsh/wrtsh2.cxx4
-rw-r--r--test/source/beans/xpropertyset.cxx3
-rw-r--r--test/source/chart/xchartdata.cxx3
-rw-r--r--test/source/diff/diff.cxx2
-rw-r--r--test/source/sheet/xactivationbroadcaster.cxx3
-rw-r--r--test/source/util/xrefreshable.cxx3
-rw-r--r--testtools/source/bridgetest/bridgetest.cxx10
-rw-r--r--testtools/source/bridgetest/cppobj.cxx3
-rw-r--r--toolkit/source/awt/animatedimagespeer.cxx4
-rw-r--r--toolkit/source/awt/stylesettings.cxx3
-rw-r--r--toolkit/source/controls/controlmodelcontainerbase.cxx3
-rw-r--r--toolkit/source/controls/dialogcontrol.cxx4
-rw-r--r--toolkit/source/controls/geometrycontrolmodel.cxx4
-rw-r--r--toolkit/source/controls/stdtabcontroller.cxx4
-rw-r--r--toolkit/source/controls/unocontrol.cxx7
-rw-r--r--toolkit/source/controls/unocontrolcontainer.cxx8
-rw-r--r--toolkit/source/controls/unocontrols.cxx8
-rw-r--r--toolkit/source/helper/accessibilityclient.cxx3
-rw-r--r--toolkit/source/helper/property.cxx7
-rw-r--r--tools/source/debug/debug.cxx4
-rw-r--r--tools/source/generic/config.cxx4
-rw-r--r--tools/source/generic/poly.cxx13
-rw-r--r--tools/source/reversemap/bestreversemap.cxx4
-rw-r--r--ucb/source/core/ucbstore.cxx3
-rw-r--r--ucb/source/ucp/ext/ucpext_datasupplier.cxx4
-rw-r--r--ucb/source/ucp/file/prov.cxx3
-rw-r--r--ucb/source/ucp/ftp/ftpcontent.cxx2
-rw-r--r--ucb/source/ucp/ftp/ftpresultsetbase.cxx2
-rw-r--r--ucb/source/ucp/gio/gio_content.cxx4
-rw-r--r--ucb/source/ucp/hierarchy/hierarchydatasource.cxx3
-rw-r--r--ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx2
-rw-r--r--ucb/source/ucp/package/pkgdatasupplier.cxx3
-rw-r--r--ucb/source/ucp/package/pkgprovider.cxx4
-rw-r--r--ucb/source/ucp/tdoc/tdoc_datasupplier.cxx2
-rw-r--r--ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx4
-rw-r--r--ucb/source/ucp/webdav-neon/LinkSequence.cxx3
-rw-r--r--ucb/source/ucp/webdav-neon/LockEntrySequence.cxx3
-rw-r--r--ucb/source/ucp/webdav-neon/LockSequence.cxx4
-rw-r--r--ucb/source/ucp/webdav-neon/NeonSession.cxx8
-rw-r--r--ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx3
-rw-r--r--ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx2
-rw-r--r--ucbhelper/source/client/content.cxx8
-rw-r--r--ucbhelper/source/client/proxydecider.cxx6
-rw-r--r--ucbhelper/source/provider/contenthelper.cxx8
-rw-r--r--ucbhelper/source/provider/resultset.cxx11
-rw-r--r--unotools/source/config/cmdoptions.cxx4
-rw-r--r--unotools/source/config/configitem.cxx4
-rw-r--r--unotools/source/config/configvaluecontainer.cxx4
-rw-r--r--unotools/source/config/defaultoptions.cxx4
-rw-r--r--unotools/source/config/dynamicmenuoptions.cxx8
-rw-r--r--unotools/source/config/fltrcfg.cxx12
-rw-r--r--unotools/source/config/fontcfg.cxx20
-rw-r--r--unotools/source/config/lingucfg.cxx10
-rw-r--r--unotools/source/config/moduleoptions.cxx4
-rw-r--r--unotools/source/config/pathoptions.cxx4
-rw-r--r--unotools/source/config/saveopt.cxx12
-rw-r--r--unotools/source/misc/closeveto.cxx5
-rw-r--r--unotools/source/misc/fontcvt.cxx8
-rw-r--r--unotools/source/misc/fontdefs.cxx4
-rw-r--r--unotools/source/ucbhelper/tempfile.cxx4
-rw-r--r--unotools/source/ucbhelper/ucblockbytes.cxx12
-rw-r--r--unoxml/source/dom/document.cxx4
-rw-r--r--unoxml/source/dom/documentbuilder.cxx7
-rw-r--r--uui/source/fltdlg.cxx4
-rw-r--r--vbahelper/source/msforms/vbacontrol.cxx11
-rw-r--r--vbahelper/source/msforms/vbacontrols.cxx3
-rw-r--r--vbahelper/source/msforms/vbalistcontrolhelper.cxx4
-rw-r--r--vbahelper/source/msforms/vbamultipage.cxx4
-rw-r--r--vbahelper/source/vbahelper/vbaapplicationbase.cxx8
-rw-r--r--vbahelper/source/vbahelper/vbacommandbarcontrols.cxx6
-rw-r--r--vbahelper/source/vbahelper/vbacommandbarhelper.cxx4
-rw-r--r--vbahelper/source/vbahelper/vbacommandbars.cxx3
-rw-r--r--vbahelper/source/vbahelper/vbadocumentsbase.cxx8
-rw-r--r--vbahelper/source/vbahelper/vbashaperange.cxx4
-rw-r--r--vbahelper/source/vbahelper/vbashapes.cxx4
-rw-r--r--vcl/backendtest/VisualBackendTest.cxx8
-rw-r--r--vcl/headless/svpdata.cxx4
-rw-r--r--vcl/headless/svpgdi.cxx4
-rw-r--r--vcl/headless/svpinst.cxx4
-rw-r--r--vcl/opengl/PackedTextureAtlas.cxx4
-rw-r--r--vcl/opengl/x11/gdiimpl.cxx5
-rw-r--r--vcl/qa/cppunit/errorhandler.cxx7
-rw-r--r--vcl/qa/cppunit/lifecycle.cxx12
-rw-r--r--vcl/qa/cppunit/timer.cxx32
-rw-r--r--vcl/qt5/Qt5Graphics_Text.cxx3
-rw-r--r--vcl/qt5/Qt5Instance.cxx3
-rw-r--r--vcl/source/app/salvtables.cxx109
-rw-r--r--vcl/source/app/session.cxx4
-rw-r--r--vcl/source/app/svmain.cxx8
-rw-r--r--vcl/source/components/dtranscomp.cxx16
-rw-r--r--vcl/source/components/fontident.cxx4
-rw-r--r--vcl/source/control/combobox.cxx4
-rw-r--r--vcl/source/control/imp_listbox.cxx4
-rw-r--r--vcl/source/control/roadmap.cxx4
-rw-r--r--vcl/source/filter/graphicfilter.cxx16
-rw-r--r--vcl/source/filter/igif/gifread.cxx4
-rw-r--r--vcl/source/filter/ipdf/pdfdocument.cxx6
-rw-r--r--vcl/source/filter/ixbm/xbmread.cxx4
-rw-r--r--vcl/source/filter/ixpm/xpmread.cxx4
-rw-r--r--vcl/source/filter/jpeg/JpegWriter.cxx4
-rw-r--r--vcl/source/filter/jpeg/jpegc.cxx8
-rw-r--r--vcl/source/fontsubset/cff.cxx8
-rw-r--r--vcl/source/fontsubset/list.cxx4
-rw-r--r--vcl/source/fontsubset/sft.cxx8
-rw-r--r--vcl/source/fontsubset/ttcr.cxx8
-rw-r--r--vcl/source/gdi/CommonSalLayout.cxx8
-rw-r--r--vcl/source/gdi/bmpfast.cxx4
-rw-r--r--vcl/source/gdi/gdimtf.cxx4
-rw-r--r--vcl/source/gdi/impvect.cxx24
-rw-r--r--vcl/source/gdi/jobset.cxx4
-rw-r--r--vcl/source/gdi/oldprintadaptor.cxx4
-rw-r--r--vcl/source/gdi/pdfextoutdevdata.cxx4
-rw-r--r--vcl/source/gdi/pdfwriter_impl.cxx4
-rw-r--r--vcl/source/gdi/pdfwriter_impl2.cxx4
-rw-r--r--vcl/source/gdi/print2.cxx4
-rw-r--r--vcl/source/gdi/print3.cxx8
-rw-r--r--vcl/source/image/ImplImageTree.cxx4
-rw-r--r--vcl/source/treelist/transfer.cxx3
-rw-r--r--vcl/source/treelist/transfer2.cxx2
-rw-r--r--vcl/source/treelist/treelistbox.cxx4
-rw-r--r--vcl/source/uipreviewer/previewer.cxx4
-rw-r--r--vcl/source/uitest/uno/uitest_uno.cxx3
-rw-r--r--vcl/source/window/builder.cxx4
-rw-r--r--vcl/source/window/dockmgr.cxx4
-rw-r--r--vcl/source/window/dockwin.cxx4
-rw-r--r--vcl/source/window/errinf.cxx5
-rw-r--r--vcl/source/window/layout.cxx12
-rw-r--r--vcl/source/window/splitwin.cxx3
-rw-r--r--vcl/source/window/taskpanelist.cxx4
-rw-r--r--vcl/source/window/winproc.cxx32
-rw-r--r--vcl/unx/generic/app/i18n_im.cxx4
-rw-r--r--vcl/unx/generic/app/i18n_keysym.cxx4
-rw-r--r--vcl/unx/generic/app/keysymnames.cxx4
-rw-r--r--vcl/unx/generic/app/saldata.cxx4
-rw-r--r--vcl/unx/generic/app/salinst.cxx4
-rw-r--r--vcl/unx/generic/app/wmadaptor.cxx4
-rw-r--r--vcl/unx/generic/dtrans/X11_selection.cxx4
-rw-r--r--vcl/unx/generic/dtrans/config.cxx4
-rw-r--r--vcl/unx/generic/fontmanager/fontconfig.cxx3
-rw-r--r--vcl/unx/generic/fontmanager/fontsubst.cxx4
-rw-r--r--vcl/unx/generic/gdi/gdiimpl.cxx4
-rw-r--r--vcl/unx/generic/glyphs/freetype_glyphcache.cxx4
-rw-r--r--vcl/unx/generic/print/bitmap_gfx.cxx16
-rw-r--r--vcl/unx/generic/print/genprnpsp.cxx8
-rw-r--r--vcl/unx/generic/print/genpspgraphics.cxx12
-rw-r--r--vcl/unx/generic/print/glyphset.cxx4
-rw-r--r--vcl/unx/generic/print/printerjob.cxx4
-rw-r--r--vcl/unx/generic/printer/cupsmgr.cxx8
-rw-r--r--vcl/unx/generic/printer/ppdparser.cxx3
-rw-r--r--vcl/unx/generic/printer/printerinfomanager.cxx9
-rw-r--r--vcl/unx/generic/window/salframe.cxx4
-rw-r--r--vcl/unx/gtk3/a11y/gtk3atkhypertext.cxx4
-rw-r--r--vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx4
-rw-r--r--vcl/unx/gtk3/gtk3glomenu.cxx4
-rw-r--r--vcl/unx/gtk3/gtk3gtkframe.cxx11
-rw-r--r--vcl/unx/gtk3/gtk3hudawareness.cxx4
-rw-r--r--vcl/unx/gtk3/gtk3salprn-gtk.cxx4
-rw-r--r--vcl/workben/icontest.cxx8
-rw-r--r--vcl/workben/mtfdemo.cxx7
-rw-r--r--vcl/workben/svdem.cxx4
-rw-r--r--vcl/workben/svpclient.cxx4
-rw-r--r--vcl/workben/svptest.cxx4
-rw-r--r--vcl/workben/vcldemo.cxx22
-rw-r--r--writerfilter/source/dmapper/DomainMapper_Impl.cxx4
-rw-r--r--writerfilter/source/dmapper/GraphicImport.cxx7
-rw-r--r--writerfilter/source/dmapper/PropertyMap.cxx4
-rw-r--r--writerfilter/source/dmapper/SettingsTable.cxx4
-rw-r--r--writerfilter/source/dmapper/StyleSheetTable.cxx8
-rw-r--r--writerfilter/source/dmapper/TagLogger.cxx4
-rw-r--r--writerfilter/source/filter/RtfFilter.cxx4
-rw-r--r--writerfilter/source/filter/WriterFilter.cxx4
-rw-r--r--writerperfect/source/calc/MSWorksCalcImportFilter.cxx3
-rw-r--r--writerperfect/source/writer/exp/XMLFootnoteImportContext.cxx6
-rw-r--r--writerperfect/source/writer/exp/XMLTextFrameContext.cxx6
-rw-r--r--writerperfect/source/writer/exp/txtparai.cxx27
-rw-r--r--writerperfect/source/writer/exp/txtstyli.cxx24
-rw-r--r--writerperfect/source/writer/exp/xmlfmt.cxx3
-rw-r--r--writerperfect/source/writer/exp/xmlimp.cxx5
-rw-r--r--writerperfect/source/writer/exp/xmlmetai.cxx15
-rw-r--r--writerperfect/source/writer/exp/xmltbli.cxx6
-rw-r--r--xmlhelp/source/cxxhelp/provider/content.cxx4
-rw-r--r--xmlhelp/source/cxxhelp/provider/resultsetbase.cxx2
-rw-r--r--xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx4
-rw-r--r--xmlhelp/source/cxxhelp/provider/urlparameter.cxx6
-rw-r--r--xmloff/source/chart/SchXMLAxisContext.cxx4
-rw-r--r--xmloff/source/chart/SchXMLExport.cxx4
-rw-r--r--xmloff/source/chart/SchXMLSeries2Context.cxx4
-rw-r--r--xmloff/source/chart/SchXMLTableContext.cxx4
-rw-r--r--xmloff/source/chart/SchXMLTextListContext.cxx4
-rw-r--r--xmloff/source/chart/contexts.cxx4
-rw-r--r--xmloff/source/core/DocumentSettingsContext.cxx8
-rw-r--r--xmloff/source/core/DomExport.cxx6
-rw-r--r--xmloff/source/core/PropertySetMerger.cxx4
-rw-r--r--xmloff/source/core/RDFaImportHelper.cxx4
-rw-r--r--xmloff/source/core/XMLEmbeddedObjectImportContext.cxx3
-rw-r--r--xmloff/source/core/attrlist.cxx4
-rw-r--r--xmloff/source/core/xmlexp.cxx8
-rw-r--r--xmloff/source/core/xmlimp.cxx4
-rw-r--r--xmloff/source/draw/EnhancedCustomShapeToken.cxx4
-rw-r--r--xmloff/source/draw/XMLGraphicsDefaultStyle.cxx4
-rw-r--r--xmloff/source/draw/XMLImageMapContext.cxx9
-rw-r--r--xmloff/source/draw/XMLNumberStyles.cxx7
-rw-r--r--xmloff/source/draw/animationimport.cxx4
-rw-r--r--xmloff/source/draw/animexp.cxx12
-rw-r--r--xmloff/source/draw/animimp.cxx3
-rw-r--r--xmloff/source/draw/eventimp.cxx3
-rw-r--r--xmloff/source/draw/layerimp.cxx4
-rw-r--r--xmloff/source/draw/sdpropls.cxx19
-rw-r--r--xmloff/source/draw/sdxmlimp.cxx12
-rw-r--r--xmloff/source/draw/shapeimport.cxx12
-rw-r--r--xmloff/source/draw/xexptran.cxx8
-rw-r--r--xmloff/source/draw/ximppage.cxx8
-rw-r--r--xmloff/source/draw/ximpstyl.cxx6
-rw-r--r--xmloff/source/forms/elementimport.cxx12
-rw-r--r--xmloff/source/meta/MetaImportComponent.cxx4
-rw-r--r--xmloff/source/meta/xmlmetai.cxx4
-rw-r--r--xmloff/source/script/xmlscripti.cxx4
-rw-r--r--xmloff/source/style/PageMasterExportPropMapper.cxx4
-rw-r--r--xmloff/source/style/XMLFontAutoStylePool.cxx7
-rw-r--r--xmloff/source/style/impastpl.cxx4
-rw-r--r--xmloff/source/style/prstylecond.cxx10
-rw-r--r--xmloff/source/style/weighhdl.cxx4
-rw-r--r--xmloff/source/style/xmlimppr.cxx4
-rw-r--r--xmloff/source/style/xmlnumfe.cxx4
-rw-r--r--xmloff/source/style/xmlnumfi.cxx12
-rw-r--r--xmloff/source/style/xmlnumi.cxx6
-rw-r--r--xmloff/source/style/xmlprmap.cxx4
-rw-r--r--xmloff/source/style/xmlstyle.cxx4
-rw-r--r--xmloff/source/table/XMLTableExport.cxx4
-rw-r--r--xmloff/source/table/XMLTableImport.cxx8
-rw-r--r--xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx2
-rw-r--r--xmloff/source/text/XMLTextFrameContext.cxx14
-rw-r--r--xmloff/source/text/XMLTextListAutoStylePool.cxx5
-rw-r--r--xmloff/source/text/XMLTextShapeStyleContext.cxx4
-rw-r--r--xmloff/source/text/txtparai.cxx36
-rw-r--r--xmloff/source/text/txtprhdl.cxx61
-rw-r--r--xmloff/source/transform/ChartPlotAreaOASISTContext.cxx4
-rw-r--r--xmloff/source/transform/MergeElemTContext.cxx8
-rw-r--r--xmloff/source/transform/OOo2Oasis.cxx20
-rw-r--r--xmloff/source/transform/Oasis2OOo.cxx20
-rw-r--r--xmloff/source/transform/PersMixedContentTContext.cxx4
-rw-r--r--xmloff/source/transform/StyleOOoTContext.cxx8
-rw-r--r--xmloff/source/xforms/xformsexport.cxx6
-rw-r--r--xmlscript/source/xml_helper/xml_byteseq.cxx8
-rw-r--r--xmlscript/source/xml_helper/xml_impctx.cxx12
-rw-r--r--xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx5
-rw-r--r--xmlsecurity/qa/unit/signing/signing.cxx3
-rw-r--r--xmlsecurity/source/component/certificatecontainer.cxx4
-rw-r--r--xmlsecurity/source/component/documentdigitalsignatures.cxx4
-rw-r--r--xmlsecurity/source/xmlsec/nss/secerror.cxx3
-rw-r--r--xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx2
-rw-r--r--xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx4
-rw-r--r--xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx4
-rw-r--r--xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx4
1151 files changed, 6970 insertions, 252 deletions
diff --git a/animations/source/animcore/animcore.cxx b/animations/source/animcore/animcore.cxx
index b7e28dc15c6d..3a2c0256a06a 100644
--- a/animations/source/animcore/animcore.cxx
+++ b/animations/source/animcore/animcore.cxx
@@ -101,6 +101,8 @@ using namespace ::com::sun::star::animations::AnimationNodeType;
namespace animcore
{
+namespace {
+
class AnimationNodeBase : public XAnimateMotion,
public XAnimateColor,
public XTransitionFilter,
@@ -365,6 +367,8 @@ private:
Mutex maMutex;
};
+}
+
TimeContainerEnumeration::TimeContainerEnumeration( const std::vector< Reference< XAnimationNode > > &rChildren )
: maChildren( rChildren )
{
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 6bf425a65c8b..25633088e9eb 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1670,6 +1670,8 @@ void WatchWindow::Resize()
Invalidate();
}
+namespace {
+
struct WatchItem
{
OUString maName;
@@ -1700,6 +1702,8 @@ struct WatchItem
SbxDimArray* GetRootArray();
};
+}
+
WatchItem* WatchItem::GetRootItem()
{
WatchItem* pItem = mpArrayParentItem;
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index f495e362a371..4e59686119bd 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -789,6 +789,7 @@ static std::vector< lang::Locale > implGetLanguagesOnlyContainedInFirstSeq
return avRet;
}
+namespace {
class NameClashQueryBox
{
@@ -827,6 +828,8 @@ public:
short run() { return m_xQueryBox->run(); }
};
+}
+
bool implImportDialog(weld::Window* pWin, const OUString& rCurPath, const ScriptDocument& rDocument, const OUString& aLibName)
{
bool bDone = false;
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 34db6905702f..0783d697b1ba 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -970,6 +970,8 @@ void LibPage::implExportLib( const OUString& aLibName, const OUString& aTargetUR
// Implementation XCommandEnvironment
+namespace {
+
class OLibCommandEnvironment : public cppu::WeakImplHelper< XCommandEnvironment >
{
Reference< task::XInteractionHandler > mxInteraction;
@@ -984,6 +986,8 @@ public:
virtual Reference< XProgressHandler > SAL_CALL getProgressHandler() override;
};
+}
+
Reference< task::XInteractionHandler > OLibCommandEnvironment::getInteractionHandler()
{
return mxInteraction;
diff --git a/basegfx/source/polygon/b2dpolygon.cxx b/basegfx/source/polygon/b2dpolygon.cxx
index 87343028ecfe..4cf280cd5b91 100644
--- a/basegfx/source/polygon/b2dpolygon.cxx
+++ b/basegfx/source/polygon/b2dpolygon.cxx
@@ -29,6 +29,8 @@
#include <memory>
#include <vector>
+namespace {
+
struct CoordinateData2D : public basegfx::B2DPoint
{
public:
@@ -552,6 +554,8 @@ public:
}
};
+}
+
class ImplB2DPolygon
{
private:
diff --git a/basegfx/source/polygon/b2dpolygonclipper.cxx b/basegfx/source/polygon/b2dpolygonclipper.cxx
index 9d672b4397c0..043f2c9bdfe3 100644
--- a/basegfx/source/polygon/b2dpolygonclipper.cxx
+++ b/basegfx/source/polygon/b2dpolygonclipper.cxx
@@ -510,6 +510,8 @@ namespace basegfx
return aRetval;
}
+ namespace {
+
/*
* let a plane be defined as
*
@@ -536,6 +538,8 @@ namespace basegfx
sal_uInt32 clipmask; // clipping mask, e.g. 1000 1000
};
+ }
+
/*
*
* polygon clipping rules (straight out of Foley and Van Dam)
diff --git a/basegfx/source/polygon/b2dtrapezoid.cxx b/basegfx/source/polygon/b2dtrapezoid.cxx
index ec3d037e6aa8..8bba58f8106e 100644
--- a/basegfx/source/polygon/b2dtrapezoid.cxx
+++ b/basegfx/source/polygon/b2dtrapezoid.cxx
@@ -36,6 +36,8 @@ namespace basegfx
// class for this since holding the pointers is more effective and also can be
// used as baseclass for the traversing edges
+ namespace {
+
class TrDeSimpleEdge
{
protected:
@@ -58,6 +60,8 @@ namespace basegfx
const B2DPoint& getEnd() const { return *mpEnd; }
};
+ }
+
// define vector of simple edges
typedef std::vector< TrDeSimpleEdge > TrDeSimpleEdges;
@@ -67,6 +71,8 @@ namespace basegfx
// hold and used in SortValue to allow sorting traversing edges by Y, X and slope
// (in that order)
+ namespace {
+
class TrDeEdgeEntry : public TrDeSimpleEdge
{
private:
@@ -179,6 +185,8 @@ namespace basegfx
}
};
+ }
+
// define double linked list of edges (for fast random insert)
typedef std::list< TrDeEdgeEntry > TrDeEdgeEntries;
@@ -192,6 +200,8 @@ namespace basegfx
{
// FIXME: templatize this and use it for TrDeEdgeEntries too ...
+ namespace {
+
/// Class to allow efficient allocation and release of B2DPoints
class PointBlockAllocator
{
@@ -883,6 +893,8 @@ namespace basegfx
}
}
};
+
+ }
} // end of anonymous namespace
} // end of namespace basegfx
diff --git a/basegfx/source/polygon/b3dpolygon.cxx b/basegfx/source/polygon/b3dpolygon.cxx
index 5d23be90562c..422353fba8ad 100644
--- a/basegfx/source/polygon/b3dpolygon.cxx
+++ b/basegfx/source/polygon/b3dpolygon.cxx
@@ -27,6 +27,8 @@
#include <vector>
#include <algorithm>
+namespace {
+
class CoordinateData3D
{
basegfx::B3DPoint maPoint;
@@ -672,6 +674,8 @@ public:
}
};
+}
+
class ImplB3DPolygon
{
// The point vector. This vector exists always and defines the
diff --git a/basic/source/basmgr/basicmanagerrepository.cxx b/basic/source/basmgr/basicmanagerrepository.cxx
index edc73fed8c4a..296e59327d8f 100644
--- a/basic/source/basmgr/basicmanagerrepository.cxx
+++ b/basic/source/basmgr/basicmanagerrepository.cxx
@@ -64,10 +64,16 @@ namespace basic
typedef std::vector< BasicManagerCreationListener* > CreationListeners;
+ namespace {
+
+ struct CreateImplRepository;
+
+ }
+
class ImplRepository : public ::utl::OEventListenerAdapter, public SfxListener
{
private:
- friend struct CreateImplRepository;
+ friend CreateImplRepository;
ImplRepository();
private:
@@ -192,6 +198,7 @@ namespace basic
StarBASIC* impl_getDefaultAppBasicLibrary();
};
+ namespace {
struct CreateImplRepository
{
@@ -202,6 +209,7 @@ namespace basic
}
};
+ }
ImplRepository::ImplRepository()
{
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 46fa3740777a..8adc59a9e874 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -1586,6 +1586,7 @@ ErrCode BasicManager::ExecuteMacro( OUString const& i_fullyQualifiedName, OUStri
return SbxBase::GetError();
}
+namespace {
class ModuleInfo_Impl : public ModuleInfoHelper
{
@@ -1692,6 +1693,8 @@ public:
virtual void SAL_CALL removeByName( const OUString& Name ) override;
};
+}
+
// Methods XElementAccess
uno::Type ModuleContainer_Impl::getElementType()
{
@@ -1794,6 +1797,7 @@ static SbxObject* implCreateDialog( const uno::Sequence< sal_Int8 >& aData )
// which we can't include here, we have to use the value directly
#define SBXID_DIALOG 101
+namespace {
class DialogContainer_Impl : public NameContainerHelper
{
@@ -1820,6 +1824,8 @@ public:
virtual void SAL_CALL removeByName( const OUString& Name ) override;
};
+}
+
// Methods XElementAccess
uno::Type DialogContainer_Impl::getElementType()
{
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 3ee34bc7e2fb..00454a759ef0 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -268,6 +268,8 @@ SbxVariable* StarBASIC::VBAFind( const OUString& rName, SbxClassType t )
return nullptr;
}
+namespace {
+
// Create array for conversion SFX <-> VB error code
struct SFX_VB_ErrorItem
{
@@ -275,6 +277,8 @@ struct SFX_VB_ErrorItem
ErrCode nErrorSFX;
};
+}
+
const SFX_VB_ErrorItem SFX_VB_ErrorTab[] =
{
{ 1, ERRCODE_BASIC_EXCEPTION }, // #87844 Map exception to error code 1
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 8fbb3dd66c03..c8d9b7ec16fb 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -433,6 +433,8 @@ static void implHandleAnyException( const Any& _rCaughtException )
}
}
+namespace {
+
// NativeObjectWrapper handling
struct ObjectItem
{
@@ -443,9 +445,16 @@ struct ObjectItem
{}
};
+}
+
typedef std::vector< ObjectItem > NativeObjectWrapperVector;
+
+namespace {
+
class GaNativeObjectWrapperVector : public rtl::Static<NativeObjectWrapperVector, GaNativeObjectWrapperVector> {};
+}
+
void clearNativeObjectWrapperVector()
{
GaNativeObjectWrapperVector::get().clear();
@@ -3770,6 +3779,7 @@ void SbUnoSingleton::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
}
}
+namespace {
// Implementation of an EventAttacher-drawn AllListener, which
// solely transmits several events to a general AllListener
@@ -3791,6 +3801,7 @@ public:
virtual void SAL_CALL disposing(const EventObject& Source) override;
};
+}
BasicAllListener_Impl::BasicAllListener_Impl(const OUString& aPrefixName_)
: aPrefixName( aPrefixName_ )
@@ -3872,6 +3883,8 @@ void BasicAllListener_Impl ::disposing(const EventObject& )
// class InvocationToAllListenerMapper
// helper class to map XInvocation to XAllListener (also in project eventattacher!)
+namespace {
+
class InvocationToAllListenerMapper : public WeakImplHelper< XInvocation >
{
public:
@@ -3892,6 +3905,7 @@ private:
Any m_Helper;
};
+}
// Function to replace AllListenerAdapterService::createAllListerAdapter
static Reference< XInterface > createAllListenerAdapter
@@ -4158,6 +4172,7 @@ void RTL_Impl_CreateUnoValue( SbxArray& rPar )
refVar->PutObject( xUnoAnyObject.get() );
}
+namespace {
class ModuleInvocationProxy : public WeakImplHelper< XInvocation, XComponent >
{
@@ -4189,6 +4204,8 @@ public:
virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& aListener ) override;
};
+}
+
ModuleInvocationProxy::ModuleInvocationProxy( OUString const & aPrefix, SbxObjectRef const & xScopeObj )
: m_aMutex()
, m_aPrefix( aPrefix + "_" )
@@ -4400,6 +4417,8 @@ Reference< XInterface > createComListener( const Any& aControlAny, const OUStrin
typedef std::vector< WeakReference< XComponent > > ComponentRefVector;
+namespace {
+
struct StarBasicDisposeItem
{
StarBASIC* m_pBasic;
@@ -4413,6 +4432,8 @@ struct StarBasicDisposeItem
}
};
+}
+
typedef std::vector< StarBasicDisposeItem* > DisposeItemVector;
static DisposeItemVector GaDisposeItemVector;
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index c837105a4dfe..f288f0ec99ae 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -83,6 +83,8 @@ using namespace com::sun::star::uno;
typedef ::cppu::WeakImplHelper< XInvocation > DocObjectWrapper_BASE;
typedef std::map< sal_Int16, Any > OutParamMap;
+namespace {
+
class DocObjectWrapper : public DocObjectWrapper_BASE
{
Reference< XAggregation > m_xAggProxy;
@@ -115,6 +117,8 @@ public:
virtual Sequence< Type > SAL_CALL getTypes() override;
};
+}
+
DocObjectWrapper::DocObjectWrapper( SbModule* pVar ) : m_pMod( pVar )
{
SbObjModule* pMod = dynamic_cast<SbObjModule*>( pVar );
@@ -1674,6 +1678,8 @@ bool SbModule::ExceedsLegacyModuleSize()
return pImage && pImage->ExceedsLegacyLimits();
}
+namespace {
+
class ErrorHdlResetter
{
Link<StarBASIC*,bool> mErrHandler;
@@ -1695,6 +1701,8 @@ public:
bool HasError() const { return mbError; }
};
+}
+
IMPL_LINK( ErrorHdlResetter, BasicErrorHdl, StarBASIC *, /*pBasic*/, bool)
{
mbError = true;
diff --git a/basic/source/comp/codegen.cxx b/basic/source/comp/codegen.cxx
index bebedd8f852d..569824648fc1 100644
--- a/basic/source/comp/codegen.cxx
+++ b/basic/source/comp/codegen.cxx
@@ -386,6 +386,8 @@ void SbiCodeGen::Save()
rMod.EndDefinitions();
}
+namespace {
+
template < class T >
class PCodeVisitor
{
@@ -399,9 +401,13 @@ public:
virtual bool processParams() = 0;
};
+}
+
template <class T> PCodeVisitor< T >::~PCodeVisitor()
{}
+namespace {
+
template <class T>
class PCodeBufferWalker
{
@@ -544,6 +550,8 @@ public:
}
};
+}
+
sal_uInt32
SbiCodeGen::calcNewOffSet( sal_uInt8 const * pCode, sal_uInt16 nOffset )
{
diff --git a/basic/source/comp/exprgen.cxx b/basic/source/comp/exprgen.cxx
index 01da0420fd5e..d1ebb48c4c09 100644
--- a/basic/source/comp/exprgen.cxx
+++ b/basic/source/comp/exprgen.cxx
@@ -25,11 +25,15 @@
// Transform table for token operators and opcodes
+namespace {
+
struct OpTable {
SbiToken eTok; // Token
SbiOpcode eOp; // Opcode
};
+}
+
static const OpTable aOpTable [] = {
{ EXPON,SbiOpcode::EXP_ },
{ MUL, SbiOpcode::MUL_ },
diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx
index 1de38c9c8541..45cf7e358fe6 100644
--- a/basic/source/comp/parser.cxx
+++ b/basic/source/comp/parser.cxx
@@ -33,6 +33,8 @@ struct SbiParseStack { // "Stack" for statement-blocks
sal_uInt32 nChain; // JUMP-Chain
};
+namespace {
+
struct SbiStatement {
SbiToken eTok;
void( SbiParser::*Func )();
@@ -40,6 +42,8 @@ struct SbiStatement {
bool bSubr; // true: OK inside the SUB
};
+}
+
#define Y true
#define N false
diff --git a/basic/source/comp/token.cxx b/basic/source/comp/token.cxx
index 2e0141827858..92fabfe98ddd 100644
--- a/basic/source/comp/token.cxx
+++ b/basic/source/comp/token.cxx
@@ -26,8 +26,12 @@
#include <basiccharclass.hxx>
#include <token.hxx>
+namespace {
+
struct TokenTable { SbiToken t; const char *s; };
+}
+
static const TokenTable aTokTable_Basic [] = {
{ CAT, "&" },
{ MUL, "*" },
@@ -174,6 +178,8 @@ static const TokenTable aTokTable_Basic [] = {
{ XOR, "Xor" },
};
+namespace {
+
// #i109076
class TokenLabelInfo
{
@@ -188,6 +194,8 @@ public:
class StaticTokenLabelInfo: public ::rtl::Static< TokenLabelInfo, StaticTokenLabelInfo >{};
+}
+
// #i109076
TokenLabelInfo::TokenLabelInfo()
{
diff --git a/basic/source/runtime/inputbox.cxx b/basic/source/runtime/inputbox.cxx
index 24a71850607b..296063d9534e 100644
--- a/basic/source/runtime/inputbox.cxx
+++ b/basic/source/runtime/inputbox.cxx
@@ -25,6 +25,8 @@
#include <rtlproto.hxx>
#include <memory>
+namespace {
+
class SvRTLInputBox : public weld::GenericDialogController
{
std::unique_ptr<weld::Entry> m_xEdit;
@@ -45,6 +47,8 @@ public:
OUString const & GetText() const { return m_aText; }
};
+}
+
SvRTLInputBox::SvRTLInputBox(weld::Window* pParent, const OUString& rPrompt,
const OUString& rTitle, const OUString& rDefault,
long nXTwips, long nYTwips)
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index e58c0a060df2..533ee4f4d6a4 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -47,6 +47,7 @@ using namespace com::sun::star::bridge;
#include <iosys.hxx>
+namespace {
class SbiInputDialog : public weld::GenericDialogController
{
@@ -62,6 +63,8 @@ public:
const OUString& GetInput() const { return m_aText; }
};
+}
+
SbiInputDialog::SbiInputDialog(weld::Window* pParent, const OUString& rPrompt)
: GenericDialogController(pParent, "svt/ui/inputbox.ui", "InputBox")
, m_xInput(m_xBuilder->weld_entry("entry"))
@@ -156,6 +159,7 @@ bool hasUno()
return bRetVal;
}
+namespace {
class OslStream : public SvStream
{
@@ -171,6 +175,8 @@ public:
virtual void SetSize( sal_uInt64 nSize) override;
};
+}
+
OslStream::OslStream( const OUString& rName, StreamMode nStrmMode )
: maFile( rName )
{
@@ -251,6 +257,7 @@ void OslStream::SetSize( sal_uInt64 nSize )
maFile.setSize( nSize );
}
+namespace {
class UCBStream : public SvStream
{
@@ -268,6 +275,8 @@ public:
virtual void SetSize( sal_uInt64 nSize ) override;
};
+}
+
UCBStream::UCBStream( Reference< XInputStream > const & rStm )
: xIS( rStm )
, xSeek( rStm, UNO_QUERY )
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index ea65461ff73c..ad782bc8ef38 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -1787,8 +1787,6 @@ enum Interval
INTERVAL_S
};
-}
-
struct IntervalInfo
{
Interval meInterval;
@@ -1797,6 +1795,8 @@ struct IntervalInfo
bool mbSimple;
};
+}
+
static IntervalInfo const * getIntervalInfo( const OUString& rStringCode )
{
static IntervalInfo const aIntervalTable[] =
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 033285d8f7fe..8451455fbe89 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -1695,6 +1695,7 @@ void SbiRuntime::StepPUT()
refVar->SetFlags( n );
}
+namespace {
// VBA Dim As New behavior handling, save init object information
struct DimAsNewRecoverItem
@@ -1726,11 +1727,17 @@ struct SbxVariablePtrHash
{ return reinterpret_cast<size_t>(pVar); }
};
+}
+
typedef std::unordered_map< SbxVariable*, DimAsNewRecoverItem,
SbxVariablePtrHash > DimAsNewRecoverHash;
+namespace {
+
class GaDimAsNewRecoverHash : public rtl::Static<DimAsNewRecoverHash, GaDimAsNewRecoverHash> {};
+}
+
void removeDimAsNewRecoverItem( SbxVariable* pVar )
{
DimAsNewRecoverHash &rDimAsNewRecoverHash = GaDimAsNewRecoverHash::get();
diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx
index 234deed57ea0..c8138e34ac60 100644
--- a/basic/source/runtime/stdobj.cxx
+++ b/basic/source/runtime/stdobj.cxx
@@ -55,6 +55,8 @@
#define RWPROP_ 0x4300 // mask Read/Write-Property
#define CPROP_ 0x4900 // mask for constant
+namespace {
+
struct Methods {
const char* pName;
SbxDataType eType;
@@ -63,6 +65,8 @@ struct Methods {
sal_uInt16 nHash;
};
+}
+
static Methods aMethods[] = {
{ "Abs", SbxDOUBLE, 1 | FUNCTION_, RTLNAME(Abs),0 },
diff --git a/bridges/source/jni_uno/jni_java2uno.cxx b/bridges/source/jni_uno/jni_java2uno.cxx
index 4092933be49f..b6c4c6ea9b35 100644
--- a/bridges/source/jni_uno/jni_java2uno.cxx
+++ b/bridges/source/jni_uno/jni_java2uno.cxx
@@ -144,6 +144,8 @@ void Bridge::handle_uno_exc( JNI_context const & jni, uno_Any * uno_exc ) const
}
}
+namespace {
+
union largest
{
sal_Int64 n;
@@ -152,6 +154,7 @@ union largest
uno_Any a;
};
+}
jobject Bridge::call_uno(
JNI_context const & jni,
diff --git a/bridges/source/jni_uno/jni_uno2java.cxx b/bridges/source/jni_uno/jni_uno2java.cxx
index 9b7c45c6185b..eb152c110ec7 100644
--- a/bridges/source/jni_uno/jni_uno2java.cxx
+++ b/bridges/source/jni_uno/jni_uno2java.cxx
@@ -383,6 +383,8 @@ void Bridge::call_java(
}
}
+namespace {
+
// a UNO proxy wrapping a Java interface
struct UNO_proxy : public uno_Interface
{
@@ -405,6 +407,7 @@ struct UNO_proxy : public uno_Interface
JNI_interface_type_info const * info );
};
+}
inline UNO_proxy::UNO_proxy(
JNI_context const & jni, Bridge const * bridge,
diff --git a/canvas/source/cairo/cairo_canvashelper_text.cxx b/canvas/source/cairo/cairo_canvashelper_text.cxx
index bed807ed4f1c..386c922f4397 100644
--- a/canvas/source/cairo/cairo_canvashelper_text.cxx
+++ b/canvas/source/cairo/cairo_canvashelper_text.cxx
@@ -143,6 +143,8 @@ namespace cairocanvas
return nTransparency;
}
+ namespace {
+
class DeviceSettingsGuard
{
private:
@@ -168,6 +170,8 @@ namespace cairocanvas
}
};
+ }
+
static bool setupTextOutput( OutputDevice& rOutDev,
const rendering::XCanvas* pOwner,
::Point& o_rOutPos,
diff --git a/canvas/source/tools/surfaceproxymanager.cxx b/canvas/source/tools/surfaceproxymanager.cxx
index d0ddfff51f66..ef70b824e9e0 100644
--- a/canvas/source/tools/surfaceproxymanager.cxx
+++ b/canvas/source/tools/surfaceproxymanager.cxx
@@ -26,6 +26,8 @@
namespace canvas
{
+ namespace {
+
class SurfaceProxyManager : public ISurfaceProxyManager
{
public:
@@ -60,6 +62,8 @@ namespace canvas
PageManagerSharedPtr mpPageManager;
};
+ }
+
std::shared_ptr<ISurfaceProxyManager> createSurfaceProxyManager( const std::shared_ptr<IRenderModule>& rRenderModule )
{
return std::shared_ptr<ISurfaceProxyManager>(
diff --git a/canvas/workben/canvasdemo.cxx b/canvas/workben/canvasdemo.cxx
index 3e768f5ef118..00acbe9a5d82 100644
--- a/canvas/workben/canvasdemo.cxx
+++ b/canvas/workben/canvasdemo.cxx
@@ -53,6 +53,8 @@ static void PrintHelp()
fprintf( stdout, "canvasdemo - Exercise the new canvas impl\n" );
}
+namespace {
+
class TestWindow : public WorkWindow
{
public:
@@ -533,6 +535,7 @@ class DemoRenderer
}
};
+}
void TestWindow::Paint(vcl::RenderContext&, const tools::Rectangle&)
{
@@ -595,6 +598,8 @@ void TestWindow::Paint(vcl::RenderContext&, const tools::Rectangle&)
}
}
+namespace {
+
class DemoApp : public Application
{
public:
@@ -606,6 +611,8 @@ protected:
void DeInit() override;
};
+}
+
int DemoApp::Main()
{
bool bHelp = false;
diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
index 5696d6b5c3f4..73811542998d 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
@@ -106,6 +106,8 @@ struct lcl_Operator
}
};
+namespace {
+
struct lcl_AllOperator : public lcl_Operator
{
explicit lcl_AllOperator( const Reference< XChartData >& xDataToApply )
@@ -365,6 +367,8 @@ struct lcl_DateCategoriesOperator : public lcl_Operator
const Sequence< double >& m_rDates;
};
+}
+
ChartDataWrapper::ChartDataWrapper(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
: m_spChart2ModelContact(spChart2ModelContact)
, m_aEventListenerContainer(m_aMutex)
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index 406df92db13a..cb3c49687f82 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -248,6 +248,8 @@ namespace chart
namespace wrapper
{
+namespace {
+
//PROP_DOCUMENT_LABELS_IN_FIRST_ROW
class WrappedDataSourceLabelsInFirstRowProperty : public WrappedProperty
{
@@ -265,6 +267,8 @@ private: //member
mutable Any m_aOuterValue;
};
+}
+
WrappedDataSourceLabelsInFirstRowProperty::WrappedDataSourceLabelsInFirstRowProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
: WrappedProperty("DataSourceLabelsInFirstRow",OUString())
, m_spChart2ModelContact( spChart2ModelContact )
@@ -335,6 +339,8 @@ Any WrappedDataSourceLabelsInFirstRowProperty::getPropertyDefault( const Referen
return aRet;
}
+namespace {
+
//PROP_DOCUMENT_LABELS_IN_FIRST_COLUMN
class WrappedDataSourceLabelsInFirstColumnProperty : public WrappedProperty
{
@@ -352,6 +358,8 @@ private: //member
mutable Any m_aOuterValue;
};
+}
+
WrappedDataSourceLabelsInFirstColumnProperty::WrappedDataSourceLabelsInFirstColumnProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
: WrappedProperty("DataSourceLabelsInFirstColumn",OUString())
, m_spChart2ModelContact( spChart2ModelContact )
@@ -422,6 +430,8 @@ Any WrappedDataSourceLabelsInFirstColumnProperty::getPropertyDefault( const Refe
return aRet;
}
+namespace {
+
//PROP_DOCUMENT_HAS_LEGEND
class WrappedHasLegendProperty : public WrappedProperty
{
@@ -438,6 +448,8 @@ private: //member
std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
};
+}
+
WrappedHasLegendProperty::WrappedHasLegendProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
: WrappedProperty("HasLegend",OUString())
, m_spChart2ModelContact( spChart2ModelContact )
@@ -495,6 +507,8 @@ Any WrappedHasLegendProperty::getPropertyDefault( const Reference< beans::XPrope
return aRet;
}
+namespace {
+
//PROP_DOCUMENT_HAS_MAIN_TITLE
class WrappedHasMainTitleProperty : public WrappedProperty
{
@@ -511,6 +525,8 @@ private: //member
std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
};
+}
+
WrappedHasMainTitleProperty::WrappedHasMainTitleProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
: WrappedProperty("HasMainTitle",OUString())
, m_spChart2ModelContact( spChart2ModelContact )
@@ -557,6 +573,8 @@ Any WrappedHasMainTitleProperty::getPropertyDefault( const Reference< beans::XPr
return aRet;
}
+namespace {
+
//PROP_DOCUMENT_HAS_SUB_TITLE
class WrappedHasSubTitleProperty : public WrappedProperty
{
@@ -573,6 +591,8 @@ private: //member
std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
};
+}
+
WrappedHasSubTitleProperty::WrappedHasSubTitleProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
: WrappedProperty("HasSubTitle",OUString())
, m_spChart2ModelContact( spChart2ModelContact )
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index 3ba2fe5323db..07d48ff4eb9d 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -1096,6 +1096,8 @@ void SAL_CALL DiagramWrapper::removeEventListener(
m_aEventListenerContainer.removeInterface( aListener );
}
+namespace {
+
//PROP_DIAGRAM_DATAROW_SOURCE
class WrappedDataRowSourceProperty : public WrappedProperty
{
@@ -1113,6 +1115,8 @@ private: //member
mutable Any m_aOuterValue;
};
+}
+
WrappedDataRowSourceProperty::WrappedDataRowSourceProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
: WrappedProperty("DataRowSource",OUString())
, m_spChart2ModelContact( spChart2ModelContact )
@@ -1184,6 +1188,8 @@ Any WrappedDataRowSourceProperty::getPropertyDefault( const Reference< beans::XP
return aRet;
}
+namespace {
+
//PROP_DIAGRAM_STACKED
//PROP_DIAGRAM_DEEP
//PROP_DIAGRAM_PERCENT_STACKED
@@ -1207,6 +1213,8 @@ std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
mutable Any m_aOuterValue;
};
+}
+
WrappedStackingProperty::WrappedStackingProperty(StackMode eStackMode, const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
: WrappedProperty(OUString(),OUString())
, m_spChart2ModelContact( spChart2ModelContact )
@@ -1285,6 +1293,8 @@ Any WrappedStackingProperty::getPropertyDefault( const Reference< beans::XProper
return aRet;
}
+namespace {
+
//PROP_DIAGRAM_THREE_D
class WrappedDim3DProperty : public WrappedProperty
{
@@ -1302,6 +1312,8 @@ private: //member
mutable Any m_aOuterValue;
};
+}
+
WrappedDim3DProperty::WrappedDim3DProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
: WrappedProperty("Dim3D",OUString())
, m_spChart2ModelContact( spChart2ModelContact )
@@ -1345,6 +1357,8 @@ Any WrappedDim3DProperty::getPropertyDefault( const Reference< beans::XPropertyS
return aRet;
}
+namespace {
+
//PROP_DIAGRAM_VERTICAL
class WrappedVerticalProperty : public WrappedProperty
{
@@ -1362,6 +1376,8 @@ private: //member
mutable Any m_aOuterValue;
};
+}
+
WrappedVerticalProperty::WrappedVerticalProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
: WrappedProperty("Vertical",OUString())
, m_spChart2ModelContact( spChart2ModelContact )
@@ -1410,6 +1426,8 @@ Any WrappedVerticalProperty::getPropertyDefault( const Reference< beans::XProper
return aRet;
}
+namespace {
+
//PROP_DIAGRAM_NUMBER_OF_LINES
class WrappedNumberOfLinesProperty : public WrappedProperty
{
@@ -1430,6 +1448,8 @@ private: //member
mutable Any m_aOuterValue;
};
+}
+
WrappedNumberOfLinesProperty::WrappedNumberOfLinesProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
: WrappedProperty("NumberOfLines",OUString())
, m_spChart2ModelContact( spChart2ModelContact )
@@ -1553,6 +1573,8 @@ Any WrappedNumberOfLinesProperty::getPropertyDefault( const Reference< beans::XP
return aRet;
}
+namespace {
+
//PROP_DIAGRAM_ATTRIBUTED_DATA_POINTS
class WrappedAttributedDataPointsProperty : public WrappedProperty
{
@@ -1570,6 +1592,8 @@ private: //member
mutable Any m_aOuterValue;
};
+}
+
WrappedAttributedDataPointsProperty::WrappedAttributedDataPointsProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
: WrappedProperty("AttributedDataPoints",OUString())
, m_spChart2ModelContact( spChart2ModelContact )
@@ -1654,6 +1678,8 @@ Any WrappedAttributedDataPointsProperty::getPropertyDefault( const Reference< be
return aRet;
}
+namespace {
+
//PROP_DIAGRAM_SOLIDTYPE
class WrappedSolidTypeProperty : public WrappedProperty
{
@@ -1671,6 +1697,8 @@ private: //member
mutable Any m_aOuterValue;
};
+}
+
WrappedSolidTypeProperty::WrappedSolidTypeProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
: WrappedProperty( "SolidType", OUString() )
, m_spChart2ModelContact( spChart2ModelContact )
@@ -1717,6 +1745,8 @@ Any WrappedSolidTypeProperty::getPropertyDefault( const Reference< beans::XPrope
return uno::Any( css::chart::ChartSolidType::RECTANGULAR_SOLID );
}
+namespace {
+
class WrappedAutomaticSizeProperty : public WrappedProperty
{
public:
@@ -1729,6 +1759,8 @@ public:
virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
};
+}
+
WrappedAutomaticSizeProperty::WrappedAutomaticSizeProperty()
: WrappedProperty( "AutomaticSize", OUString() )
{
@@ -1777,6 +1809,8 @@ Any WrappedAutomaticSizeProperty::getPropertyDefault( const Reference< beans::XP
return aRet;
}
+namespace {
+
//PROP_DIAGRAM_INCLUDE_HIDDEN_CELLS
class WrappedIncludeHiddenCellsProperty : public WrappedProperty
{
@@ -1790,6 +1824,8 @@ private: //member
std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
};
+}
+
WrappedIncludeHiddenCellsProperty::WrappedIncludeHiddenCellsProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
: WrappedProperty("IncludeHiddenCells","IncludeHiddenCells")
, m_spChart2ModelContact( spChart2ModelContact )
diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
index 994dfcd034e4..21da1f1c6ceb 100644
--- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
@@ -49,6 +49,8 @@ using ::com::sun::star::uno::Sequence;
namespace chart
{
+namespace {
+
class WrappedLegendAlignmentProperty : public WrappedProperty
{
public:
@@ -62,6 +64,8 @@ protected:
virtual Any convertOuterToInnerValue( const Any& rOuterValue ) const override;
};
+}
+
WrappedLegendAlignmentProperty::WrappedLegendAlignmentProperty()
: ::chart::WrappedProperty( "Alignment", "AnchorPosition" )
{
diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
index 8a30633ac935..20495fc8e7e5 100644
--- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
@@ -50,6 +50,8 @@ using ::com::sun::star::uno::Sequence;
namespace chart
{
+namespace {
+
class WrappedTitleStringProperty : public WrappedProperty
{
public:
@@ -63,6 +65,8 @@ protected:
Reference< uno::XComponentContext > m_xContext;
};
+}
+
WrappedTitleStringProperty::WrappedTitleStringProperty( const Reference< uno::XComponentContext >& xContext )
: ::chart::WrappedProperty( "String", OUString() )
, m_xContext( xContext )
@@ -101,12 +105,16 @@ Any WrappedTitleStringProperty::getPropertyDefault( const Reference< beans::XPro
return uno::Any( OUString() );//default title is an empty String
}
+namespace {
+
class WrappedStackedTextProperty : public WrappedProperty
{
public:
WrappedStackedTextProperty();
};
+}
+
WrappedStackedTextProperty::WrappedStackedTextProperty()
: ::chart::WrappedProperty( "StackedText", "StackCharacters" )
{
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
index 8ac56ce8c446..58e89e439b00 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
@@ -35,6 +35,8 @@ namespace chart
namespace wrapper
{
+namespace {
+
class WrappedAutomaticPositionProperty : public WrappedProperty
{
public:
@@ -45,6 +47,8 @@ public:
virtual Any getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const override;
};
+}
+
WrappedAutomaticPositionProperty::WrappedAutomaticPositionProperty()
: ::chart::WrappedProperty( "AutomaticPosition" , OUString() )
{
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
index ad349fa0275a..3949037a8a93 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
@@ -34,6 +34,8 @@ namespace chart
namespace wrapper
{
+namespace {
+
class WrappedAxisAndGridExistenceProperty : public WrappedProperty
{
public:
@@ -53,6 +55,8 @@ private: //member
sal_Int32 m_nDimensionIndex;
};
+}
+
void WrappedAxisAndGridExistenceProperties::addWrappedProperties( std::vector< std::unique_ptr<WrappedProperty> >& rList
, const std::shared_ptr< Chart2ModelContact >& spChart2ModelContact )
{
@@ -190,6 +194,8 @@ Any WrappedAxisAndGridExistenceProperty::getPropertyDefault( const Reference< be
return aRet;
}
+namespace {
+
class WrappedAxisTitleExistenceProperty : public WrappedProperty
{
public:
@@ -207,6 +213,8 @@ private: //member
TitleHelper::eTitleType m_eTitleType;
};
+}
+
void WrappedAxisTitleExistenceProperties::addWrappedProperties( std::vector< std::unique_ptr<WrappedProperty> >& rList
, const std::shared_ptr< Chart2ModelContact >& spChart2ModelContact )
{
@@ -292,6 +300,8 @@ Any WrappedAxisTitleExistenceProperty::getPropertyDefault( const Reference< bean
return aRet;
}
+namespace {
+
class WrappedAxisLabelExistenceProperty : public WrappedProperty
{
public:
@@ -310,6 +320,8 @@ private: //member
sal_Int32 m_nDimensionIndex;
};
+}
+
void WrappedAxisLabelExistenceProperties::addWrappedProperties( std::vector< std::unique_ptr<WrappedProperty> >& rList
, const std::shared_ptr< Chart2ModelContact >& spChart2ModelContact )
{
diff --git a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
index 6468d64acec8..4d9b77f29eb3 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
@@ -36,6 +36,9 @@ namespace chart
namespace wrapper
{
+namespace
+{
+
class WrappedDataCaptionProperty : public WrappedSeriesOrDiagramProperty< sal_Int32 >
{
public:
@@ -46,8 +49,6 @@ public:
tSeriesOrDiagramPropertyType ePropertyType );
};
-namespace
-{
enum
{
//data caption properties
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
index 003c3b877514..047ad10740f1 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
@@ -37,6 +37,8 @@ namespace chart
namespace wrapper
{
+namespace {
+
class WrappedScaleTextProperty : public WrappedProperty
{
public:
@@ -50,6 +52,8 @@ private:
std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
};
+}
+
WrappedScaleTextProperty::WrappedScaleTextProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
: ::chart::WrappedProperty( "ScaleText" , OUString() )
, m_spChart2ModelContact( spChart2ModelContact )
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
index ae114a30ea64..15645fa0c174 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
@@ -40,6 +40,9 @@ namespace chart
namespace wrapper
{
+namespace
+{
+
//PROPERTYTYPE is the type of the outer property
template< typename PROPERTYTYPE >
@@ -167,8 +170,6 @@ public:
virtual css::uno::Any convertOuterToInnerValue( const css::uno::Any& rOuterValue ) const override;
};
-namespace
-{
enum
{
//spline properties
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
index 954c61aba2ff..d5508eccef44 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
@@ -168,8 +168,6 @@ void lcl_ConvertRangeToXML(
}
}
-}//anonymous namespace
-
template< typename PROPERTYTYPE >
class WrappedStatisticProperty : public WrappedSeriesOrDiagramProperty< PROPERTYTYPE >
{
@@ -217,6 +215,8 @@ private:
mutable Any m_aOuterValue;
};
+}//anonymous namespace
+
WrappedConstantErrorLowProperty::WrappedConstantErrorLowProperty(
std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
@@ -253,6 +253,8 @@ void WrappedConstantErrorLowProperty::setValueToSeries( const Reference< beans::
}
}
+namespace {
+
//PROP_CHART_STATISTIC_CONST_ERROR_HIGH
class WrappedConstantErrorHighProperty : public WrappedStatisticProperty< double >
{
@@ -267,6 +269,8 @@ private:
mutable Any m_aOuterValue;
};
+}
+
WrappedConstantErrorHighProperty::WrappedConstantErrorHighProperty(
std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
@@ -303,6 +307,8 @@ void WrappedConstantErrorHighProperty::setValueToSeries( const Reference< beans:
}
}
+namespace {
+
//PROP_CHART_STATISTIC_MEAN_VALUE
class WrappedMeanValueProperty : public WrappedStatisticProperty< bool >
{
@@ -314,6 +320,8 @@ public:
tSeriesOrDiagramPropertyType ePropertyType );
};
+}
+
WrappedMeanValueProperty::WrappedMeanValueProperty(
std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
@@ -342,6 +350,8 @@ void WrappedMeanValueProperty::setValueToSeries( const Reference< beans::XProper
}
}
+namespace {
+
//PROP_CHART_STATISTIC_ERROR_CATEGORY
// deprecated, replaced by ErrorBarStyle
class WrappedErrorCategoryProperty : public WrappedStatisticProperty< css::chart::ChartErrorCategory >
@@ -354,6 +364,8 @@ public:
tSeriesOrDiagramPropertyType ePropertyType );
};
+}
+
WrappedErrorCategoryProperty::WrappedErrorCategoryProperty(
std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
@@ -437,6 +449,8 @@ void WrappedErrorCategoryProperty::setValueToSeries( const Reference< beans::XPr
}
}
+namespace {
+
//PROP_CHART_STATISTIC_PERCENT_ERROR
class WrappedPercentageErrorProperty : public WrappedStatisticProperty< double >
{
@@ -451,6 +465,8 @@ private:
mutable Any m_aOuterValue;
};
+}
+
WrappedPercentageErrorProperty::WrappedPercentageErrorProperty(
std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
@@ -487,6 +503,8 @@ void WrappedPercentageErrorProperty::setValueToSeries( const Reference< beans::X
}
}
+namespace {
+
//PROP_CHART_STATISTIC_ERROR_MARGIN
class WrappedErrorMarginProperty : public WrappedStatisticProperty< double >
{
@@ -501,6 +519,8 @@ private:
mutable Any m_aOuterValue;
};
+}
+
WrappedErrorMarginProperty::WrappedErrorMarginProperty(
std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
@@ -537,6 +557,8 @@ void WrappedErrorMarginProperty::setValueToSeries( const Reference< beans::XProp
}
}
+namespace {
+
//PROP_CHART_STATISTIC_ERROR_INDICATOR
class WrappedErrorIndicatorProperty : public WrappedStatisticProperty< css::chart::ChartErrorIndicatorType >
{
@@ -548,6 +570,8 @@ public:
tSeriesOrDiagramPropertyType ePropertyType );
};
+}
+
WrappedErrorIndicatorProperty::WrappedErrorIndicatorProperty(
std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
@@ -605,6 +629,8 @@ void WrappedErrorIndicatorProperty::setValueToSeries( const Reference< beans::XP
}
}
+namespace {
+
//PROP_CHART_STATISTIC_ERROR_BAR_STYLE
// this is the new constant group that replaces the deprecated enum ChartErrorCategory
class WrappedErrorBarStyleProperty : public WrappedStatisticProperty< sal_Int32 >
@@ -617,6 +643,8 @@ public:
tSeriesOrDiagramPropertyType ePropertyType );
};
+}
+
WrappedErrorBarStyleProperty::WrappedErrorBarStyleProperty(
std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
@@ -648,6 +676,8 @@ void WrappedErrorBarStyleProperty::setValueToSeries( const Reference< beans::XPr
}
}
+namespace {
+
//PROP_CHART_STATISTIC_ERROR_RANGE_POSITIVE
class WrappedErrorBarRangePositiveProperty : public WrappedStatisticProperty< OUString >
{
@@ -659,6 +689,8 @@ public:
tSeriesOrDiagramPropertyType ePropertyType );
};
+}
+
WrappedErrorBarRangePositiveProperty::WrappedErrorBarRangePositiveProperty(
std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
@@ -708,6 +740,8 @@ void WrappedErrorBarRangePositiveProperty::setValueToSeries( const Reference< be
}
}
+namespace {
+
//PROP_CHART_STATISTIC_ERROR_RANGE_NEGATIVE
class WrappedErrorBarRangeNegativeProperty : public WrappedStatisticProperty< OUString >
{
@@ -719,6 +753,8 @@ public:
tSeriesOrDiagramPropertyType ePropertyType );
};
+}
+
WrappedErrorBarRangeNegativeProperty::WrappedErrorBarRangeNegativeProperty(
std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
@@ -768,6 +804,8 @@ void WrappedErrorBarRangeNegativeProperty::setValueToSeries( const Reference< be
}
}
+namespace {
+
//PROP_CHART_STATISTIC_REGRESSION_CURVES
class WrappedRegressionCurvesProperty : public WrappedStatisticProperty< css::chart::ChartRegressionCurveType >
{
@@ -779,6 +817,8 @@ public:
tSeriesOrDiagramPropertyType ePropertyType );
};
+}
+
WrappedRegressionCurvesProperty::WrappedRegressionCurvesProperty(
std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
@@ -815,6 +855,8 @@ void WrappedRegressionCurvesProperty::setValueToSeries( const Reference< beans::
}
}
+namespace {
+
//PROP_CHART_STATISTIC_REGRESSION_PROPERTIES
//PROP_CHART_STATISTIC_ERROR_PROPERTIES
//PROP_CHART_STATISTIC_MEAN_VALUE_PROPERTIES
@@ -840,6 +882,8 @@ private:
PropertySetType m_eType;
};
+}
+
WrappedStatisticPropertySetProperty::WrappedStatisticPropertySetProperty(
PropertySetType ePropertySetType
, std::shared_ptr< Chart2ModelContact > spChart2ModelContact
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
index 9123543d9036..3155a969102f 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
@@ -37,6 +37,8 @@ namespace chart
namespace wrapper
{
+namespace {
+
class WrappedStockProperty : public WrappedProperty
{
public:
@@ -56,6 +58,8 @@ protected:
css::uno::Any m_aDefaultValue;
};
+}
+
WrappedStockProperty::WrappedStockProperty( const OUString& rOuterName
, const css::uno::Any& rDefaulValue
, const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact )
@@ -107,6 +111,8 @@ css::uno::Any WrappedStockProperty::getPropertyDefault( const css::uno::Referenc
return m_aDefaultValue;
}
+namespace {
+
class WrappedVolumeProperty : public WrappedStockProperty
{
public:
@@ -117,6 +123,8 @@ public:
uno::Reference< chart2::XChartTypeTemplate > getNewTemplate( bool bNewValue, const OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const override;
};
+}
+
WrappedVolumeProperty::WrappedVolumeProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
: WrappedStockProperty( "Volume", uno::Any(false) , spChart2ModelContact )
{
@@ -172,6 +180,8 @@ uno::Reference< chart2::XChartTypeTemplate > WrappedVolumeProperty::getNewTempla
return xTemplate;
}
+namespace {
+
class WrappedUpDownProperty : public WrappedStockProperty
{
public:
@@ -182,6 +192,8 @@ public:
uno::Reference< chart2::XChartTypeTemplate > getNewTemplate( bool bNewValue, const OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const override;
};
+}
+
WrappedUpDownProperty::WrappedUpDownProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
: WrappedStockProperty( "UpDown", uno::Any(false) , spChart2ModelContact )
{
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
index 20f9da101be9..79ed7047331c 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
@@ -43,6 +43,9 @@ namespace chart
namespace wrapper
{
+namespace
+{
+
class WrappedSymbolTypeProperty : public WrappedSeriesOrDiagramProperty< sal_Int32 >
{
public:
@@ -98,8 +101,6 @@ public:
tSeriesOrDiagramPropertyType ePropertyType);
};
-namespace
-{
enum
{
//symbol properties
diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx
index 283357686553..7d5c4670b81c 100644
--- a/chart2/source/controller/dialogs/dlg_DataSource.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx
@@ -37,6 +37,8 @@ using ::com::sun::star::uno::Reference;
namespace chart
{
+namespace {
+
class DocumentChartTypeTemplateProvider : public ChartTypeTemplateProvider
{
public:
@@ -50,6 +52,8 @@ private:
Reference< chart2::XChartTypeTemplate > m_xTemplate;
};
+}
+
DocumentChartTypeTemplateProvider::DocumentChartTypeTemplateProvider(
const Reference< chart2::XChartDocument > & xDoc )
{
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index 8bb45729b6f4..39000a96949a 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -57,6 +57,8 @@ void LightButton::switchLightOn(bool bOn)
m_xButton->set_from_icon_name(RID_SVXBMP_LAMP_OFF);
}
+namespace {
+
struct LightSource
{
Color nDiffuseColor;
@@ -70,6 +72,8 @@ struct LightSource
{}
};
+}
+
struct LightSourceInfo
{
LightButton* pButton;
diff --git a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
index 9a5d60ed3afd..bbe54492cbd9 100644
--- a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
@@ -44,8 +44,6 @@ ItemPropertyMapType & lcl_GetTitlePropertyMap()
return aTitlePropertyMap;
};
-} // anonymous namespace
-
class FormattedStringsConverter : public MultipleItemConverter
{
public:
@@ -59,6 +57,8 @@ protected:
virtual const sal_uInt16 * GetWhichPairs() const override;
};
+} // anonymous namespace
+
FormattedStringsConverter::FormattedStringsConverter(
const uno::Sequence< uno::Reference< chart2::XFormattedString > > & aStrings,
SfxItemPool & rItemPool,
diff --git a/chart2/source/controller/main/ConfigurationAccess.cxx b/chart2/source/controller/main/ConfigurationAccess.cxx
index dc1ba9f657a6..2d1dcfcf9b6e 100644
--- a/chart2/source/controller/main/ConfigurationAccess.cxx
+++ b/chart2/source/controller/main/ConfigurationAccess.cxx
@@ -38,7 +38,6 @@ bool lcl_IsMetric()
return ( eSys == MeasurementSystem::Metric );
}
-}//end anonymous namespace
class CalcConfigItem : public ::utl::ConfigItem
{
@@ -52,6 +51,8 @@ public:
virtual void Notify( const uno::Sequence<OUString>& aPropertyNames) override;
};
+}//end anonymous namespace
+
CalcConfigItem::CalcConfigItem()
: ConfigItem( "Office.Calc/Layout" )
{
diff --git a/chart2/source/model/main/UndoManager.cxx b/chart2/source/model/main/UndoManager.cxx
index 023ab553b345..f295bc288eb2 100644
--- a/chart2/source/model/main/UndoManager.cxx
+++ b/chart2/source/model/main/UndoManager.cxx
@@ -122,6 +122,8 @@ namespace chart
throw DisposedException( OUString(), getThis() );
}
+ namespace {
+
/** guard for public UNO methods of the UndoManager
The only purpose of this guard is to check for the instance being disposed already. Everything else,
@@ -155,6 +157,8 @@ namespace chart
virtual void release() override { }
};
+ }
+
::framework::IMutex& UndoManagerMethodGuard::getGuardedMutex()
{
static DummyMutex s_aDummyMutex;
diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx b/chart2/source/tools/ExplicitCategoriesProvider.cxx
index b6652e25f11d..46036e5b9d3f 100644
--- a/chart2/source/tools/ExplicitCategoriesProvider.cxx
+++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx
@@ -208,6 +208,8 @@ SplitCategoriesProvider::~SplitCategoriesProvider()
{
}
+namespace {
+
class SplitCategoriesProvider_ForLabeledDataSequences : public SplitCategoriesProvider
{
public:
@@ -230,6 +232,8 @@ private:
ChartModel& mrModel;
};
+}
+
sal_Int32 SplitCategoriesProvider_ForLabeledDataSequences::getLevelCount() const
{
return m_rSplitCategoriesList.getLength();
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx
index efb87de74026..7257a6432605 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -230,6 +230,8 @@ static void removeShapesAtWrongRhythm( TickIter& rIter
}
}
+namespace {
+
/**
* If the labels are staggered and bInnerLine is true we iterate through
* only those labels that are closer to the diagram.
@@ -255,6 +257,8 @@ private: //member
bool m_bInnerLine;
};
+}
+
LabelIterator::LabelIterator( TickInfoArrayType& rTickInfoVector
, const AxisLabelStaggering eAxisLabelStaggering
, bool bInnerLine )
@@ -448,6 +452,8 @@ static void getAxisLabelProperties(
rPropValues, rPropNames, rAxisProp.maLabelAlignment.meAlignment);
}
+namespace {
+
/**
* Iterate through only 3 ticks including the one that has the longest text
* length. When the first tick has the longest text, it iterates through
@@ -468,6 +474,8 @@ private:
size_t m_nCurrentIndex;
};
+}
+
MaxLabelTickIter::MaxLabelTickIter(
TickInfoArrayType& rTickInfoVector, size_t nLongestLabelIndex ) :
m_rTickInfoVector(rTickInfoVector), m_nCurrentIndex(0)
@@ -1152,6 +1160,9 @@ VCartesianAxis::ScreenPosAndLogicPos VCartesianAxis::getScreenPosAndLogicPos( do
}
typedef std::vector< VCartesianAxis::ScreenPosAndLogicPos > tScreenPosAndLogicPosList;
+
+namespace {
+
struct lcl_LessXPos
{
bool operator() ( const VCartesianAxis::ScreenPosAndLogicPos& rPos1, const VCartesianAxis::ScreenPosAndLogicPos& rPos2 )
@@ -1168,6 +1179,8 @@ struct lcl_GreaterYPos
}
};
+}
+
void VCartesianAxis::get2DAxisMainLine(
B2DVector& rStart, B2DVector& rEnd, AxisLabelAlignment& rAlignment, double fCrossesOtherAxis ) const
{
diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
index f8cfe828d0ae..61050a12500f 100644
--- a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
@@ -34,6 +34,8 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
using ::com::sun::star::uno::Reference;
+namespace {
+
class TextualDataProvider : public ::cppu::WeakImplHelper<
css::chart2::data::XTextualDataSequence
>
@@ -54,6 +56,8 @@ private: //member
uno::Sequence< OUString > m_aTextSequence;
};
+}
+
VCartesianCoordinateSystem::VCartesianCoordinateSystem( const Reference< XCoordinateSystem >& xCooSys )
: VCoordinateSystem(xCooSys)
{
diff --git a/chart2/source/view/axes/VCartesianGrid.cxx b/chart2/source/view/axes/VCartesianGrid.cxx
index 45df4131faff..36a143df4545 100644
--- a/chart2/source/view/axes/VCartesianGrid.cxx
+++ b/chart2/source/view/axes/VCartesianGrid.cxx
@@ -39,6 +39,8 @@ using namespace ::com::sun::star::chart2;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
+namespace {
+
struct GridLinePoints
{
Sequence< double > P0;
@@ -54,6 +56,8 @@ struct GridLinePoints
sal_Int32 m_nDimensionIndex;
};
+}
+
GridLinePoints::GridLinePoints( const PlottingPositionHelper* pPosHelper, sal_Int32 nDimensionIndex
, CuboidPlanePosition eLeftWallPos
, CuboidPlanePosition eBackWallPos
diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx
index e9c54add6c0f..ca2218087a43 100644
--- a/chart2/source/view/charttypes/AreaChart.cxx
+++ b/chart2/source/view/charttypes/AreaChart.cxx
@@ -581,8 +581,6 @@ void lcl_reorderSeries( std::vector< std::vector< VDataSeriesGroup > >& rZSlots
rZSlots = std::move(aRet);
}
-}//anonymous namespace
-
//better performance for big data
struct FormerPoint
{
@@ -601,6 +599,8 @@ struct FormerPoint
double m_fZ;
};
+}//anonymous namespace
+
void AreaChart::createShapes()
{
if( m_aZSlots.empty() ) //no series
diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx
index 47c137b32ab4..e50fbe36ff74 100644
--- a/chart2/source/view/charttypes/BarChart.cxx
+++ b/chart2/source/view/charttypes/BarChart.cxx
@@ -385,6 +385,8 @@ void BarChart::addSeries( std::unique_ptr<VDataSeries> pSeries, sal_Int32 zSlot,
VSeriesPlotter::addSeries( std::move(pSeries), zSlot, xSlot, ySlot );
}
+namespace {
+
//better performance for big data
struct FormerBarPoint
{
@@ -405,6 +407,8 @@ struct FormerBarPoint
double m_fZ;
};
+}
+
void BarChart::adaptOverlapAndGapwidthForGroupBarsPerAxis()
{
//adapt m_aOverlapSequence and m_aGapwidthSequence for the groupBarsPerAxis feature
diff --git a/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx
index 1a0123f0c094..ef2a75934dfb 100644
--- a/chart2/source/view/charttypes/BubbleChart.cxx
+++ b/chart2/source/view/charttypes/BubbleChart.cxx
@@ -136,6 +136,8 @@ drawing::Direction3D BubbleChart::getPreferredDiagramAspectRatio() const
return drawing::Direction3D(-1,-1,-1);
}
+namespace {
+
//better performance for big data
struct FormerPoint
{
@@ -154,6 +156,8 @@ struct FormerPoint
double m_fZ;
};
+}
+
void BubbleChart::createShapes()
{
if( m_aZSlots.empty() ) //no series
diff --git a/chart2/source/view/charttypes/ConfigAccess.cxx b/chart2/source/view/charttypes/ConfigAccess.cxx
index 2e6e507408b4..964e58ce43f7 100644
--- a/chart2/source/view/charttypes/ConfigAccess.cxx
+++ b/chart2/source/view/charttypes/ConfigAccess.cxx
@@ -28,6 +28,8 @@ namespace chart
{
using namespace ::com::sun::star;
+namespace
+{
class ChartConfigItem : public ::utl::ConfigItem
{
private:
@@ -39,6 +41,7 @@ public:
bool getUseErrorRectangle();
virtual void Notify(const uno::Sequence<OUString>& aPropertyNames) override;
};
+}
ChartConfigItem::ChartConfigItem()
: ConfigItem("Office.Chart/ErrorProperties")
diff --git a/chart2/source/view/charttypes/NetChart.cxx b/chart2/source/view/charttypes/NetChart.cxx
index 823004d2091a..2f99bece1cfc 100644
--- a/chart2/source/view/charttypes/NetChart.cxx
+++ b/chart2/source/view/charttypes/NetChart.cxx
@@ -293,8 +293,6 @@ void lcl_reorderSeries( std::vector< std::vector< VDataSeriesGroup > >& rZSlots
rZSlots = std::move(aRet);
}
-}//anonymous namespace
-
//better performance for big data
struct FormerPoint
{
@@ -313,6 +311,8 @@ struct FormerPoint
double m_fZ;
};
+}//anonymous namespace
+
void NetChart::createShapes()
{
if( m_aZSlots.empty() ) //no series
diff --git a/comphelper/qa/container/comphelper_ifcontainer.cxx b/comphelper/qa/container/comphelper_ifcontainer.cxx
index 8bd9bf75f660..4d28c496fe2e 100644
--- a/comphelper/qa/container/comphelper_ifcontainer.cxx
+++ b/comphelper/qa/container/comphelper_ifcontainer.cxx
@@ -31,6 +31,8 @@ using namespace com::sun::star;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
+namespace {
+
struct ContainerStats {
int m_nAlive;
int m_nDisposed;
@@ -50,6 +52,8 @@ public:
}
};
+}
+
namespace comphelper_ifcontainer
{
static const int nTests = 10;
diff --git a/comphelper/source/compare/AnyCompareFactory.cxx b/comphelper/source/compare/AnyCompareFactory.cxx
index e4cec19feeed..7a31f10f1f71 100644
--- a/comphelper/source/compare/AnyCompareFactory.cxx
+++ b/comphelper/source/compare/AnyCompareFactory.cxx
@@ -31,6 +31,8 @@ using namespace com::sun::star::ucb;
using namespace com::sun::star::lang;
using namespace com::sun::star::i18n;
+namespace {
+
class AnyCompare : public ::cppu::WeakImplHelper< XAnyCompare >
{
Reference< XCollator > m_xCollator;
@@ -68,6 +70,8 @@ public:
virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
};
+}
+
sal_Int16 SAL_CALL AnyCompare::compare( const Any& any1, const Any& any2 )
{
sal_Int16 aResult = 0;
diff --git a/comphelper/source/container/IndexedPropertyValuesContainer.cxx b/comphelper/source/container/IndexedPropertyValuesContainer.cxx
index 0053cc8e4374..ecd1c2dbb2f8 100644
--- a/comphelper/source/container/IndexedPropertyValuesContainer.cxx
+++ b/comphelper/source/container/IndexedPropertyValuesContainer.cxx
@@ -34,6 +34,8 @@ using namespace com::sun::star;
typedef std::vector < uno::Sequence< beans::PropertyValue > > IndexedPropertyValues;
+namespace {
+
class IndexedPropertyValuesContainer : public cppu::WeakImplHelper< container::XIndexContainer, lang::XServiceInfo >
{
public:
@@ -63,6 +65,8 @@ private:
IndexedPropertyValues maProperties;
};
+}
+
IndexedPropertyValuesContainer::IndexedPropertyValuesContainer() throw()
{
}
diff --git a/comphelper/source/container/NamedPropertyValuesContainer.cxx b/comphelper/source/container/NamedPropertyValuesContainer.cxx
index 13b8f855866f..79a7d714b5e6 100644
--- a/comphelper/source/container/NamedPropertyValuesContainer.cxx
+++ b/comphelper/source/container/NamedPropertyValuesContainer.cxx
@@ -32,6 +32,8 @@ using namespace com::sun::star;
typedef std::map< OUString, uno::Sequence<beans::PropertyValue> > NamedPropertyValues;
+namespace {
+
class NamedPropertyValuesContainer : public cppu::WeakImplHelper< container::XNameContainer, lang::XServiceInfo >
{
public:
@@ -62,6 +64,8 @@ private:
NamedPropertyValues maProperties;
};
+}
+
NamedPropertyValuesContainer::NamedPropertyValuesContainer() throw()
{
}
diff --git a/comphelper/source/container/enumerablemap.cxx b/comphelper/source/container/enumerablemap.cxx
index bee5d03963b2..f9e5cfa8989a 100644
--- a/comphelper/source/container/enumerablemap.cxx
+++ b/comphelper/source/container/enumerablemap.cxx
@@ -76,9 +76,16 @@ namespace comphelper
using ::com::sun::star::uno::TypeDescription;
using ::com::sun::star::lang::DisposedException;
+ namespace {
+
class MapEnumerator;
+ }
+
typedef std::map< Any, Any, LessPredicateAdapter > KeyedValues;
+
+ namespace {
+
struct MapData
{
Type m_aKeyType;
@@ -106,6 +113,7 @@ namespace comphelper
MapData& operator=( const MapData& _source ) = delete;
};
+ }
static void lcl_registerMapModificationListener( MapData& _mapData, MapEnumerator& _listener )
{
@@ -141,6 +149,8 @@ namespace comphelper
, XServiceInfo
> Map_IFace;
+ namespace {
+
class EnumerableMap: public Map_IFace, public ComponentBase
{
protected:
@@ -194,15 +204,11 @@ namespace comphelper
MapData m_aData;
};
- namespace {
-
enum EnumerationType
{
eKeys, eValues, eBoth
};
- }
-
class MapEnumerator final
{
public:
@@ -249,6 +255,8 @@ namespace comphelper
bool m_disposed;
};
+ }
+
static void lcl_notifyMapDataListeners_nothrow( const MapData& _mapData )
{
for ( MapEnumerator* loop : _mapData.m_aModListeners )
@@ -259,6 +267,9 @@ namespace comphelper
typedef ::cppu::WeakImplHelper < XEnumeration
> MapEnumeration_Base;
+
+ namespace {
+
class MapEnumeration :public ComponentBase
,public MapEnumeration_Base
{
@@ -294,6 +305,7 @@ namespace comphelper
MapEnumerator m_aEnumerator;
};
+ }
EnumerableMap::EnumerableMap()
:Map_IFace( m_aMutex )
diff --git a/comphelper/source/container/namecontainer.cxx b/comphelper/source/container/namecontainer.cxx
index 0f905fac9124..bed257ca50c7 100644
--- a/comphelper/source/container/namecontainer.cxx
+++ b/comphelper/source/container/namecontainer.cxx
@@ -31,6 +31,8 @@ typedef std::map<OUString, css::uno::Any> SvGenericNameContainerMapImpl;
namespace comphelper
{
+ namespace {
+
/** this is the base helper class for NameContainer that's also declared in this header. */
class NameContainer : public ::cppu::WeakImplHelper< css::container::XNameContainer >
{
@@ -58,6 +60,8 @@ namespace comphelper
const css::uno::Type maType;
osl::Mutex maMutex;
};
+
+ }
}
using namespace ::comphelper;
diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx
index 209d0ac6deb6..6651c6033bb6 100644
--- a/comphelper/source/eventattachermgr/eventattachermgr.cxx
+++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx
@@ -62,6 +62,7 @@ using namespace osl;
namespace comphelper
{
+namespace {
struct AttachedObject_Impl
{
@@ -149,6 +150,7 @@ public:
virtual void SAL_CALL disposing(const EventObject& Source) override;
};
+}
AttacherAllListener_Impl::AttacherAllListener_Impl
(
diff --git a/comphelper/source/misc/anycompare.cxx b/comphelper/source/misc/anycompare.cxx
index f4d2a8b5d260..bb77544c957e 100644
--- a/comphelper/source/misc/anycompare.cxx
+++ b/comphelper/source/misc/anycompare.cxx
@@ -49,6 +49,8 @@ namespace comphelper
using ::com::sun::star::util::Time;
using ::com::sun::star::util::DateTime;
+ namespace {
+
class DatePredicateLess : public IKeyPredicateLess
{
public:
@@ -158,6 +160,7 @@ namespace comphelper
}
};
+ }
std::unique_ptr< IKeyPredicateLess > getStandardLessPredicate( Type const & i_type, Reference< XCollator > const & i_collator )
{
diff --git a/comphelper/source/misc/asyncnotification.cxx b/comphelper/source/misc/asyncnotification.cxx
index c73bd22cf163..a360b7207fe4 100644
--- a/comphelper/source/misc/asyncnotification.cxx
+++ b/comphelper/source/misc/asyncnotification.cxx
@@ -38,6 +38,8 @@ namespace comphelper
{
}
+ namespace {
+
struct ProcessableEvent
{
AnyEventRef aEvent;
@@ -54,9 +56,11 @@ namespace comphelper
}
};
+ }
typedef std::deque< ProcessableEvent > EventQueue;
+ namespace {
struct EqualProcessor
{
@@ -69,6 +73,8 @@ namespace comphelper
}
};
+ }
+
struct EventNotifierImpl
{
::osl::Mutex aMutex;
@@ -178,7 +184,12 @@ namespace comphelper
return AsyncEventNotifierBase::terminate();
}
+ namespace {
+
struct theNotifiersMutex : public rtl::Static<osl::Mutex, theNotifiersMutex> {};
+
+ }
+
static std::vector<std::weak_ptr<AsyncEventNotifierAutoJoin>> g_Notifiers;
void JoinAsyncEventNotifiers()
diff --git a/comphelper/source/misc/docpasswordrequest.cxx b/comphelper/source/misc/docpasswordrequest.cxx
index e1092df36f0b..56644d4d6e59 100644
--- a/comphelper/source/misc/docpasswordrequest.cxx
+++ b/comphelper/source/misc/docpasswordrequest.cxx
@@ -41,6 +41,7 @@ using ::com::sun::star::task::XInteractionPassword2;
namespace comphelper {
+namespace {
class AbortContinuation : public ::cppu::WeakImplHelper< XInteractionAbort >
{
@@ -48,6 +49,7 @@ public:
virtual void SAL_CALL select() override {}
};
+}
class PasswordContinuation : public ::cppu::WeakImplHelper< XInteractionPassword2 >
{
diff --git a/comphelper/source/misc/random.cxx b/comphelper/source/misc/random.cxx
index ddc970efe321..f001b06195d6 100644
--- a/comphelper/source/misc/random.cxx
+++ b/comphelper/source/misc/random.cxx
@@ -38,6 +38,8 @@ namespace rng
// http://en.wikipedia.org/wiki/Mersenne_twister
#define STD_RNG_ALGO std::mt19937
+namespace {
+
struct RandomNumberGenerator
{
std::mutex mutex;
@@ -77,6 +79,8 @@ struct RandomNumberGenerator
class theRandomNumberGenerator : public rtl::Static<RandomNumberGenerator, theRandomNumberGenerator> {};
+}
+
// uniform ints [a,b] distribution
int uniform_int_distribution(int a, int b)
{
diff --git a/comphelper/source/misc/threadpool.cxx b/comphelper/source/misc/threadpool.cxx
index 95b6f2dff091..9b1991b7f3a1 100644
--- a/comphelper/source/misc/threadpool.cxx
+++ b/comphelper/source/misc/threadpool.cxx
@@ -105,6 +105,8 @@ ThreadPool::~ThreadPool()
assert(maTasks.empty());
}
+namespace {
+
struct ThreadPoolStatic : public rtl::StaticWithInit< std::shared_ptr< ThreadPool >,
ThreadPoolStatic >
{
@@ -114,6 +116,8 @@ struct ThreadPoolStatic : public rtl::StaticWithInit< std::shared_ptr< ThreadPoo
};
};
+}
+
ThreadPool& ThreadPool::getSharedOptimalPool()
{
return *ThreadPoolStatic::get();
diff --git a/comphelper/source/property/MasterPropertySet.cxx b/comphelper/source/property/MasterPropertySet.cxx
index 61e6f84ecdd5..82f9d85d7525 100644
--- a/comphelper/source/property/MasterPropertySet.cxx
+++ b/comphelper/source/property/MasterPropertySet.cxx
@@ -28,6 +28,8 @@
#include <memory>
#include <vector>
+namespace {
+
class AutoOGuardArray
{
std::vector<std::unique_ptr< osl::Guard< comphelper::SolarMutex > >> maGuardArray;
@@ -38,6 +40,8 @@ public:
std::unique_ptr< osl::Guard< comphelper::SolarMutex > > & operator[] ( sal_Int32 i ) { return maGuardArray[i]; }
};
+}
+
AutoOGuardArray::AutoOGuardArray( sal_Int32 nNumElements ) : maGuardArray(nNumElements)
{
}
diff --git a/comphelper/source/property/genericpropertyset.cxx b/comphelper/source/property/genericpropertyset.cxx
index b5414b5c52d8..72cec45e2992 100644
--- a/comphelper/source/property/genericpropertyset.cxx
+++ b/comphelper/source/property/genericpropertyset.cxx
@@ -42,6 +42,8 @@ using namespace ::com::sun::star::lang;
namespace comphelper
{
+ namespace {
+
struct IMPL_GenericPropertySet_MutexContainer
{
Mutex maMutex;
@@ -84,6 +86,7 @@ namespace comphelper
virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
};
+ }
}
diff --git a/comphelper/source/streaming/memorystream.cxx b/comphelper/source/streaming/memorystream.cxx
index 8d120989eec6..940c9012f149 100644
--- a/comphelper/source/streaming/memorystream.cxx
+++ b/comphelper/source/streaming/memorystream.cxx
@@ -45,6 +45,8 @@ using namespace ::osl;
namespace comphelper
{
+namespace {
+
class UNOMemoryStream : public WeakImplHelper<XServiceInfo, XStream, XSeekableInputStream, XOutputStream, XTruncate>
{
public:
@@ -84,6 +86,8 @@ private:
sal_Int32 mnCursor;
};
+}
+
UNOMemoryStream::UNOMemoryStream()
: mnCursor(0)
{
diff --git a/comphelper/source/xml/ofopxmlhelper.cxx b/comphelper/source/xml/ofopxmlhelper.cxx
index 21f097531363..46785b35cbba 100644
--- a/comphelper/source/xml/ofopxmlhelper.cxx
+++ b/comphelper/source/xml/ofopxmlhelper.cxx
@@ -39,6 +39,8 @@ using namespace ::com::sun::star;
namespace comphelper {
+namespace {
+
// this helper class is designed to allow to parse ContentType- and Relationship-related information from OfficeOpenXML format
class OFOPXMLHelper_Impl
: public cppu::WeakImplHelper< css::xml::sax::XDocumentHandler >
@@ -65,6 +67,7 @@ public:
virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) override;
};
+}
namespace OFOPXMLHelper {
diff --git a/compilerplugins/clang/badstatics.cxx b/compilerplugins/clang/badstatics.cxx
index 737330dd10c0..60abc11c222b 100644
--- a/compilerplugins/clang/badstatics.cxx
+++ b/compilerplugins/clang/badstatics.cxx
@@ -117,7 +117,7 @@ public:
|| type.Class("weak_ptr").StdNamespace() // not owning
|| type.Class("ImplWallpaper").GlobalNamespace() // very odd static instance here
|| type.Class("Application").GlobalNamespace() // numerous odd subclasses in vclmain::createApplication()
- || type.Class("DemoMtfApp").GlobalNamespace() // one of these Application with own VclPtr
+ || type.Class("DemoMtfApp").AnonymousNamespace().GlobalNamespace() // one of these Application with own VclPtr
)
{
return std::make_pair(false, std::vector<FieldDecl const*>());
diff --git a/compilerplugins/clang/external.cxx b/compilerplugins/clang/external.cxx
index 64da725cfff9..b31f620cf5ef 100644
--- a/compilerplugins/clang/external.cxx
+++ b/compilerplugins/clang/external.cxx
@@ -133,9 +133,6 @@ public:
bool VisitTagDecl(TagDecl* decl)
{
- /*TODO:*/
- if (!isa<EnumDecl>(decl))
- return true; // in general, moving classes into an unnamed namespace can break ADL
if (isa<ClassTemplateSpecializationDecl>(decl))
{
return true;
@@ -266,8 +263,6 @@ public:
bool VisitClassTemplateDecl(ClassTemplateDecl* decl)
{
- /*TODO:*/
- return true; // in general, moving classes or enumerations into an unnamed namespace can break ADL
if (!decl->isThisDeclarationADefinition())
{
return true;
@@ -329,6 +324,7 @@ private:
}
else
{
+ //TODO: Derived types are also affected!
CXXRecordDecl const* rec;
if (auto const d = dyn_cast<ClassTemplateDecl>(decl))
{
@@ -400,6 +396,10 @@ private:
if (auto const d1 = dyn_cast<FriendDecl>(d))
{
d = d1->getFriendDecl();
+ if (d == nullptr) // happens for 'friend struct S;'
+ {
+ continue;
+ }
}
FunctionDecl const* f;
if (auto const d1 = dyn_cast<FunctionTemplateDecl>(d))
diff --git a/compilerplugins/clang/refcounting.cxx b/compilerplugins/clang/refcounting.cxx
index c002a1499977..168d775b28d2 100644
--- a/compilerplugins/clang/refcounting.cxx
+++ b/compilerplugins/clang/refcounting.cxx
@@ -256,7 +256,7 @@ bool containsSalhelperReferenceObjectSubclass(const clang::Type* pType0) {
if (pTemplate) {
auto const dc = loplugin::DeclCheck(pTemplate);
if (dc.Class("Reference").Namespace("rtl").GlobalNamespace()
- || (dc.Class("OStoreHandle").Namespace("store")
+ || (dc.Class("OStoreHandle").AnonymousNamespace().Namespace("store")
.GlobalNamespace()))
{
return false;
diff --git a/compilerplugins/clang/staticmethods.cxx b/compilerplugins/clang/staticmethods.cxx
index 25e4d2c77473..6070ce860d82 100644
--- a/compilerplugins/clang/staticmethods.cxx
+++ b/compilerplugins/clang/staticmethods.cxx
@@ -173,7 +173,7 @@ bool StaticMethods::TraverseCXXMethodDecl(const CXXMethodDecl * pCXXMethodDecl)
// used in a function-pointer-table
if ((cdc.Class("SbiRuntime").GlobalNamespace()
&& startsWith(pCXXMethodDecl->getNameAsString(), "Step"))
- || (cdc.Class("OoxFormulaParserImpl").Namespace("xls").Namespace("oox")
+ || (cdc.Class("OoxFormulaParserImpl").AnonymousNamespace().Namespace("xls").Namespace("oox")
.GlobalNamespace())
|| cdc.Class("SwTableFormula").GlobalNamespace()
|| (cdc.Class("BiffFormulaParserImpl").Namespace("xls").Namespace("oox")
diff --git a/compilerplugins/clang/test/external.cxx b/compilerplugins/clang/test/external.cxx
index 28b7c6df01b7..6eb486a57fc1 100644
--- a/compilerplugins/clang/test/external.cxx
+++ b/compilerplugins/clang/test/external.cxx
@@ -20,6 +20,7 @@ int const n2 = 0; // no warning, internal linkage
constexpr int n3 = 0; // no warning, internal linkage
+// expected-error@+1 {{externally available entity 'S1' is not previously declared in an included file (if it is only used in this translation unit, put it in an unnamed namespace; otherwise, provide a declaration of it in an included file) [loplugin:external]}}
struct S1
{
friend void f1() {} // no warning for injected function (no place where to mark it `static`)
@@ -28,6 +29,7 @@ struct S1
friend void f2() {}
};
+// expected-error@+1 {{externally available entity 'S2' is not previously declared in an included file (if it is only used in this translation unit, put it in an unnamed namespace; otherwise, provide a declaration of it in an included file) [loplugin:external]}}
struct S2
{
friend void f1();
@@ -76,11 +78,21 @@ extern "C++" {
void fc(E const*);
}
+// expected-error@+1 {{externally available entity 'S1' is not previously declared in an included file (if it is only used in this translation unit, put it in an unnamed namespace; otherwise, provide a declaration of it in an included file) [loplugin:external]}}
struct S1
{
struct S2;
// No note about associating function; injected friend function not found by ADL:
friend void f2(E const*);
+ // expected-note@+1 {{a function associating 'N::S1' is declared here [loplugin:external]}}
+ friend void h(S1);
+};
+
+// expected-error@+1 {{externally available entity 'S3' is not previously declared in an included file (if it is only used in this translation unit, put it in an unnamed namespace; otherwise, provide a declaration of it in an included file) [loplugin:external]}}
+struct S3
+{
+ // expected-note@+1 {{another declaration is here [loplugin:external]}}
+ friend void h(S1);
};
inline namespace I2
diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx
index bf79ffd5ac7b..69f0933ef7cb 100644
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -2131,6 +2131,8 @@ namespace detail
virtual ~IValueSource() { }
};
+ namespace {
+
class RowValue : public IValueSource
{
public:
@@ -2192,6 +2194,8 @@ namespace detail
private:
const Reference< XColumn > m_xColumn;
};
+
+ }
}
diff --git a/connectivity/source/commontools/TSortIndex.cxx b/connectivity/source/commontools/TSortIndex.cxx
index 0658c517a07d..76bbafaeb13a 100644
--- a/connectivity/source/commontools/TSortIndex.cxx
+++ b/connectivity/source/commontools/TSortIndex.cxx
@@ -24,6 +24,8 @@
using namespace connectivity;
+namespace {
+
/// Functor object for class OSortIndex::TIntValuePairVector::value_type returntype is bool
struct TKeyValueFunc
{
@@ -76,6 +78,7 @@ struct TKeyValueFunc
}
};
+}
::rtl::Reference<OKeySet> OSortIndex::CreateKeySet()
{
diff --git a/connectivity/source/cpool/ZConnectionPool.cxx b/connectivity/source/cpool/ZConnectionPool.cxx
index 7ac1845911a1..c347e5ad84c9 100644
--- a/connectivity/source/cpool/ZConnectionPool.cxx
+++ b/connectivity/source/cpool/ZConnectionPool.cxx
@@ -75,6 +75,8 @@ OConnectionPool::~OConnectionPool()
clear(false);
}
+namespace {
+
struct TRemoveEventListenerFunctor
{
OConnectionPool* m_pConnectionPool;
@@ -125,6 +127,8 @@ struct TConnectionPoolFunctor
}
};
+}
+
void OConnectionPool::clear(bool _bDispose)
{
MutexGuard aGuard(m_aMutex);
diff --git a/connectivity/source/drivers/calc/Cservices.cxx b/connectivity/source/drivers/calc/Cservices.cxx
index 343c9fcb6305..91f58219cac3 100644
--- a/connectivity/source/drivers/calc/Cservices.cxx
+++ b/connectivity/source/drivers/calc/Cservices.cxx
@@ -36,6 +36,7 @@ typedef Reference< XSingleServiceFactory > (*createFactoryFunc)
rtl_ModuleCount*
);
+namespace {
struct ProviderRequest
{
@@ -75,6 +76,7 @@ struct ProviderRequest
void* getProvider() const { return xRet.get(); }
};
+}
extern "C" SAL_DLLPUBLIC_EXPORT void* connectivity_calc_component_getFactory(
const sal_Char* pImplementationName,
diff --git a/connectivity/source/drivers/dbase/Dservices.cxx b/connectivity/source/drivers/dbase/Dservices.cxx
index c269ddf997f0..9e24128912b2 100644
--- a/connectivity/source/drivers/dbase/Dservices.cxx
+++ b/connectivity/source/drivers/dbase/Dservices.cxx
@@ -36,6 +36,7 @@ typedef Reference< XSingleServiceFactory > (*createFactoryFunc)
rtl_ModuleCount*
);
+namespace {
struct ProviderRequest
{
@@ -75,6 +76,7 @@ struct ProviderRequest
void* getProvider() const { return xRet.get(); }
};
+}
extern "C" SAL_DLLPUBLIC_EXPORT void* dbase_component_getFactory(
const sal_Char* pImplementationName,
diff --git a/connectivity/source/drivers/evoab2/EApi.cxx b/connectivity/source/drivers/evoab2/EApi.cxx
index c802778cff2e..12096bdade87 100644
--- a/connectivity/source/drivers/evoab2/EApi.cxx
+++ b/connectivity/source/drivers/evoab2/EApi.cxx
@@ -38,12 +38,17 @@ static const char *eBookLibNames[] = {
typedef void (*SymbolFunc) ();
#define SYM_MAP(a) { #a, reinterpret_cast<SymbolFunc *>(&a) }
+
+namespace {
+
struct ApiMap
{
const char *sym_name;
SymbolFunc *ref_value;
};
+}
+
static const ApiMap aCommonApiMap[] =
{
SYM_MAP( eds_check_version ),
diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx
index d6d55c272bfa..1341e5a33c68 100644
--- a/connectivity/source/drivers/evoab2/NResultSet.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.cxx
@@ -375,8 +375,6 @@ bool isBookBackend( EBookClient *pBook, const char *backendname)
return isSourceBackend(pSource, backendname);
}
-}
-
class OEvoabVersion36Helper : public OEvoabVersionHelper
{
private:
@@ -490,8 +488,6 @@ protected:
}
};
-namespace {
-
ESource * findSource( const char *id )
{
ESourceList *pSourceList = nullptr;
@@ -519,8 +515,6 @@ bool isAuthRequired( EBook *pBook )
"auth" ) != nullptr;
}
-}
-
class OEvoabVersion35Helper : public OEvoabVersionHelper
{
private:
@@ -610,6 +604,8 @@ public:
}
};
+}
+
OEvoabResultSet::OEvoabResultSet( OCommonStatement* pStmt, OEvoabConnection *pConnection )
:OResultSet_BASE(m_aMutex)
,::comphelper::OPropertyContainer( OResultSet_BASE::rBHelper )
diff --git a/connectivity/source/drivers/evoab2/NServices.cxx b/connectivity/source/drivers/evoab2/NServices.cxx
index 94b6f7867438..afc6291307cb 100644
--- a/connectivity/source/drivers/evoab2/NServices.cxx
+++ b/connectivity/source/drivers/evoab2/NServices.cxx
@@ -37,6 +37,7 @@ typedef Reference< XSingleServiceFactory > (*createFactoryFunc)
rtl_ModuleCount*
);
+namespace {
struct ProviderRequest
{
@@ -77,6 +78,7 @@ struct ProviderRequest
void* getProvider() const { return xRet.get(); }
};
+}
extern "C" SAL_DLLPUBLIC_EXPORT void* evoab2_component_getFactory(
const sal_Char* pImplementationName,
diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx
index dd4917634dab..b3b5ac9ee1da 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -109,6 +109,8 @@ Connection::~Connection()
close();
}
+namespace {
+
struct ConnectionGuard
{
oslInterlockedCount& m_refCount;
@@ -123,6 +125,8 @@ struct ConnectionGuard
}
};
+}
+
void Connection::construct(const OUString& url, const Sequence< PropertyValue >& info)
{
ConnectionGuard aGuard(m_refCount);
diff --git a/connectivity/source/drivers/firebird/Services.cxx b/connectivity/source/drivers/firebird/Services.cxx
index 69b05e471263..f85d5dbb48d5 100644
--- a/connectivity/source/drivers/firebird/Services.cxx
+++ b/connectivity/source/drivers/firebird/Services.cxx
@@ -38,6 +38,8 @@ typedef Reference< XSingleServiceFactory > (*createFactoryFunc)
rtl_ModuleCount* _pTemp
);
+namespace {
+
struct ProviderRequest
{
Reference< XSingleServiceFactory > xRet;
@@ -76,6 +78,7 @@ struct ProviderRequest
void* getProvider() const { return xRet.get(); }
};
+}
extern "C" SAL_DLLPUBLIC_EXPORT void* firebird_sdbc_component_getFactory(
const sal_Char* pImplementationName,
diff --git a/connectivity/source/drivers/flat/Eservices.cxx b/connectivity/source/drivers/flat/Eservices.cxx
index 62884acef137..4b8b6c4b2879 100644
--- a/connectivity/source/drivers/flat/Eservices.cxx
+++ b/connectivity/source/drivers/flat/Eservices.cxx
@@ -36,6 +36,7 @@ typedef Reference< XSingleServiceFactory > (*createFactoryFunc)
rtl_ModuleCount*
);
+namespace {
struct ProviderRequest
{
@@ -75,6 +76,7 @@ struct ProviderRequest
void* getProvider() const { return xRet.get(); }
};
+}
extern "C" SAL_DLLPUBLIC_EXPORT void* flat_component_getFactory(
const sal_Char* pImplementationName,
diff --git a/connectivity/source/drivers/hsqldb/Hservices.cxx b/connectivity/source/drivers/hsqldb/Hservices.cxx
index a7ce2346374a..b41389a6d118 100644
--- a/connectivity/source/drivers/hsqldb/Hservices.cxx
+++ b/connectivity/source/drivers/hsqldb/Hservices.cxx
@@ -37,6 +37,7 @@ typedef Reference< XSingleServiceFactory > (*createFactoryFunc)
rtl_ModuleCount*
);
+namespace {
struct ProviderRequest
{
@@ -76,6 +77,7 @@ struct ProviderRequest
void* getProvider() const { return xRet.get(); }
};
+}
extern "C" SAL_DLLPUBLIC_EXPORT void* hsqldb_component_getFactory(
const sal_Char* pImplementationName,
diff --git a/connectivity/source/drivers/jdbc/jservices.cxx b/connectivity/source/drivers/jdbc/jservices.cxx
index 281d8936d488..3044724735db 100644
--- a/connectivity/source/drivers/jdbc/jservices.cxx
+++ b/connectivity/source/drivers/jdbc/jservices.cxx
@@ -36,6 +36,7 @@ typedef Reference< XSingleServiceFactory > (*createFactoryFunc)
rtl_ModuleCount*
);
+namespace {
struct ProviderRequest
{
@@ -75,6 +76,8 @@ struct ProviderRequest
void* getProvider() const { return xRet.get(); }
};
+}
+
extern "C" SAL_DLLPUBLIC_EXPORT void* jdbc_component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
diff --git a/connectivity/source/drivers/mysql_jdbc/YTable.cxx b/connectivity/source/drivers/mysql_jdbc/YTable.cxx
index 6eeaf3a23897..0db740478993 100644
--- a/connectivity/source/drivers/mysql_jdbc/YTable.cxx
+++ b/connectivity/source/drivers/mysql_jdbc/YTable.cxx
@@ -55,6 +55,8 @@ namespace connectivity
{
namespace mysql
{
+namespace
+{
class OMySQLKeysHelper : public OKeysHelper
{
protected:
@@ -69,6 +71,7 @@ public:
};
}
}
+}
OMySQLTable::OMySQLTable(sdbcx::OCollection* _pTables, const Reference<XConnection>& _xConnection)
: OTableHelper(_pTables, _xConnection, true)
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_services.cxx b/connectivity/source/drivers/mysqlc/mysqlc_services.cxx
index d23cf66aba06..56a2242e5e50 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_services.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_services.cxx
@@ -35,6 +35,8 @@ typedef Reference<XSingleServiceFactory> (*createFactoryFunc)(
::cppu::ComponentInstantiation pCreateFunction, const Sequence<OUString>& rServiceNames,
rtl_ModuleCount*);
+namespace
+{
struct ProviderRequest
{
Reference<XSingleServiceFactory> xRet;
@@ -65,6 +67,7 @@ struct ProviderRequest
void* getProvider() const { return xRet.get(); }
};
+}
extern "C" SAL_DLLPUBLIC_EXPORT void* component_getFactory(const sal_Char* pImplementationName,
void* pServiceManager,
diff --git a/connectivity/source/drivers/odbc/ORealDriver.cxx b/connectivity/source/drivers/odbc/ORealDriver.cxx
index 8b76f4cf1cc6..1c7bc80ae203 100644
--- a/connectivity/source/drivers/odbc/ORealDriver.cxx
+++ b/connectivity/source/drivers/odbc/ORealDriver.cxx
@@ -26,6 +26,8 @@ namespace connectivity
{
namespace odbc
{
+ namespace {
+
class ORealObdcDriver : public ODBCDriver
{
protected:
@@ -35,6 +37,7 @@ namespace connectivity
explicit ORealObdcDriver(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) : ODBCDriver(_rxFactory) {}
};
+ }
oslGenericFunction ORealObdcDriver::getOdbcFunction(ODBC3SQLFunctionId _nIndex) const
{
diff --git a/connectivity/source/drivers/odbc/oservices.cxx b/connectivity/source/drivers/odbc/oservices.cxx
index 71fd857ec19e..9c4994172422 100644
--- a/connectivity/source/drivers/odbc/oservices.cxx
+++ b/connectivity/source/drivers/odbc/oservices.cxx
@@ -37,6 +37,7 @@ typedef Reference< XSingleServiceFactory > (*createFactoryFunc)
rtl_ModuleCount*
);
+namespace {
struct ProviderRequest
{
@@ -76,6 +77,7 @@ struct ProviderRequest
void* getProvider() const { return xRet.get(); }
};
+}
extern "C" SAL_DLLPUBLIC_EXPORT void* odbc_component_getFactory(
const sal_Char* pImplementationName,
diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx
index 56670cef1aa5..868a011584c5 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.cxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.cxx
@@ -94,6 +94,7 @@ using com::sun::star::sdbc::XDatabaseMetaData;
namespace pq_sdbc_driver
{
+namespace {
// Helper class for statement lifetime management
class ClosableReference : public cppu::WeakImplHelper< css::uno::XReference >
@@ -116,6 +117,8 @@ public:
}
};
+}
+
static OUString ConnectionGetImplementationName()
{
return "org.openoffice.comp.connectivity.pq.Connection.noext";
@@ -393,6 +396,8 @@ void Connection::clearWarnings()
{
}
+namespace {
+
class cstr_vector
{
std::vector<char*> values;
@@ -426,6 +431,8 @@ public:
char const** c_array() const { return const_cast <const char**>(values.data()); }
};
+}
+
static void properties2arrays( const Sequence< PropertyValue > & args,
const Reference< XTypeConverter> &tc,
rtl_TextEncoding enc,
diff --git a/connectivity/source/drivers/postgresql/pq_driver.cxx b/connectivity/source/drivers/postgresql/pq_driver.cxx
index b11dc491d016..a8e915a5cc67 100644
--- a/connectivity/source/drivers/postgresql/pq_driver.cxx
+++ b/connectivity/source/drivers/postgresql/pq_driver.cxx
@@ -158,6 +158,7 @@ static Reference< XInterface > DriverCreateInstance( const Reference < XComponen
return ret;
}
+namespace {
class OOneInstanceComponentFactory :
public MutexHolder,
@@ -212,6 +213,8 @@ private:
Reference< XComponentContext > m_defaultContext;
};
+}
+
Reference< XInterface > OOneInstanceComponentFactory::createInstanceWithArgumentsAndContext(
Sequence< Any > const &, const Reference< XComponentContext > & ctx )
{
diff --git a/connectivity/source/drivers/postgresql/pq_statics.cxx b/connectivity/source/drivers/postgresql/pq_statics.cxx
index 564ab7910567..1b8c1cc116e3 100644
--- a/connectivity/source/drivers/postgresql/pq_statics.cxx
+++ b/connectivity/source/drivers/postgresql/pq_statics.cxx
@@ -51,6 +51,8 @@ using com::sun::star::beans::Property;
namespace pq_sdbc_driver
{
+namespace {
+
struct DefColumnMetaData
{
const sal_Char * columnName;
@@ -83,6 +85,8 @@ struct PropertyDefEx : public PropertyDef
sal_Int32 attribute;
};
+}
+
static cppu::IPropertyArrayHelper * createPropertyArrayHelper(
PropertyDef const *props, int count , sal_Int16 attr )
{
diff --git a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
index 2082816813fd..147f5c17a465 100644
--- a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
@@ -66,6 +66,8 @@ using com::sun::star::lang::XEventListener;
namespace pq_sdbc_driver
{
+namespace {
+
class ReplacedBroadcaster : public EventBroadcastHelper
{
ContainerEvent m_event;
@@ -131,6 +133,8 @@ public:
}
};
+}
+
Container::Container(
const ::rtl::Reference< comphelper::RefCountedMutex > & refMutex,
const css::uno::Reference< css::sdbc::XConnection > & origin,
@@ -201,6 +205,7 @@ sal_Int32 Container::getCount()
return m_values.size();
}
+namespace {
class ContainerEnumeration : public ::cppu::WeakImplHelper< XEnumeration >
{
@@ -219,6 +224,8 @@ public:
};
+}
+
sal_Bool ContainerEnumeration::hasMoreElements()
{
return static_cast<int>(m_vec.size()) > m_index +1;
diff --git a/connectivity/source/drivers/writer/Wservices.cxx b/connectivity/source/drivers/writer/Wservices.cxx
index 10e0e3ef32e7..69f88016231d 100644
--- a/connectivity/source/drivers/writer/Wservices.cxx
+++ b/connectivity/source/drivers/writer/Wservices.cxx
@@ -28,6 +28,8 @@ using createFactoryFunc = uno::Reference<lang::XSingleServiceFactory> (*)(
const OUString& rComponentName, ::cppu::ComponentInstantiation pCreateFunction,
const uno::Sequence<OUString>& rServiceNames, rtl_ModuleCount*);
+namespace
+{
struct ProviderRequest
{
private:
@@ -60,6 +62,7 @@ public:
uno::XInterface* getProvider() const { return xRet.get(); }
};
+}
extern "C" SAL_DLLPUBLIC_EXPORT void*
connectivity_writer_component_getFactory(const sal_Char* pImplementationName, void* pServiceManager,
diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx
index c88e117414fa..b3291cf89f5f 100644
--- a/connectivity/source/manager/mdrivermanager.cxx
+++ b/connectivity/source/manager/mdrivermanager.cxx
@@ -102,6 +102,7 @@ Any SAL_CALL ODriverEnumeration::nextElement( )
return makeAny( *m_aPos++ );
}
+ namespace {
/// an STL functor which ensures that a SdbcDriver described by a DriverAccess is loaded
struct EnsureDriver
@@ -173,6 +174,8 @@ Any SAL_CALL ODriverEnumeration::nextElement( )
}
};
+ }
+
static sal_Int32 lcl_getDriverPrecedence( const Reference<XComponentContext>& _rContext, Sequence< OUString >& _rPrecedence )
{
_rPrecedence.realloc( 0 );
@@ -208,6 +211,8 @@ Any SAL_CALL ODriverEnumeration::nextElement( )
return _rPrecedence.getLength();
}
+ namespace {
+
/// an STL argorithm compatible predicate comparing two DriverAccess instances by their implementation names
struct CompareDriverAccessByName
{
@@ -230,6 +235,7 @@ Any SAL_CALL ODriverEnumeration::nextElement( )
}
};
+ }
OSDBCDriverManager::OSDBCDriverManager( const Reference< XComponentContext >& _rxContext )
:m_xContext( _rxContext )
diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx
index 4cb00394faa3..2c928216707c 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -109,6 +109,7 @@ namespace connectivity
}
};
+ namespace {
/** helper class for temporarily adding a query name to a list of forbidden query names
*/
@@ -132,6 +133,8 @@ namespace connectivity
m_rpAllForbiddenNames->erase( m_sForbiddenQueryName );
}
};
+
+ }
}
OSQLParseTreeIterator::OSQLParseTreeIterator(const Reference< XConnection >& _rxConnection,
diff --git a/connectivity/source/resource/sharedresources.cxx b/connectivity/source/resource/sharedresources.cxx
index 87185d66b83a..bab95793452d 100644
--- a/connectivity/source/resource/sharedresources.cxx
+++ b/connectivity/source/resource/sharedresources.cxx
@@ -29,7 +29,7 @@
namespace connectivity
{
-
+ namespace {
class SharedResources_Impl
{
@@ -59,6 +59,8 @@ namespace connectivity
}
};
+ }
+
SharedResources_Impl* SharedResources_Impl::s_pInstance( nullptr );
oslInterlockedCount SharedResources_Impl::s_nClients( 0 );
diff --git a/cppu/source/AffineBridge/AffineBridge.cxx b/cppu/source/AffineBridge/AffineBridge.cxx
index 1e2a45ac84cf..156d6eb9c7a0 100644
--- a/cppu/source/AffineBridge/AffineBridge.cxx
+++ b/cppu/source/AffineBridge/AffineBridge.cxx
@@ -29,6 +29,7 @@
#include <cppu/helper/purpenv/Mapping.hxx>
#include <memory>
+namespace {
class InnerThread;
class OuterThread;
@@ -86,6 +87,8 @@ public:
}
};
+}
+
void InnerThread::run()
{
osl_setThreadName("UNO AffineBridge InnerThread");
@@ -95,6 +98,8 @@ void InnerThread::run()
m_pAffineBridge->leave();
}
+namespace {
+
class OuterThread : public osl::Thread
{
virtual void SAL_CALL run() override;
@@ -105,6 +110,8 @@ public:
explicit OuterThread(AffineBridge * threadEnvironment);
};
+}
+
OuterThread::OuterThread(AffineBridge * threadEnvironment)
: m_pAffineBridge(threadEnvironment)
{
diff --git a/cppu/source/UnsafeBridge/UnsafeBridge.cxx b/cppu/source/UnsafeBridge/UnsafeBridge.cxx
index 7cf945d44391..491a888c3921 100644
--- a/cppu/source/UnsafeBridge/UnsafeBridge.cxx
+++ b/cppu/source/UnsafeBridge/UnsafeBridge.cxx
@@ -26,6 +26,8 @@
#include <cppu/helper/purpenv/Environment.hxx>
#include <cppu/helper/purpenv/Mapping.hxx>
+namespace {
+
class UnsafeBridge : public cppu::Enterable
{
osl::Mutex m_mutex;
@@ -46,6 +48,8 @@ public:
virtual bool v_isValid(OUString * pReason) override;
};
+}
+
UnsafeBridge::UnsafeBridge()
: m_count (0),
m_threadId(0)
diff --git a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
index ceeee6eb0deb..bb8af537c4b8 100644
--- a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
+++ b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
@@ -59,6 +59,8 @@ typedef void ExtEnv_releaseInterface (uno_ExtEnvironment *
void * pInterface);
}
+namespace {
+
class Base : public cppu::Enterable
{
public:
@@ -117,6 +119,8 @@ protected:
virtual ~Base() override;
};
+}
+
extern "C" {
static void s_acquire(uno_Environment * pEnv) //SAL_THROW_EXTERN_C()
{
diff --git a/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx b/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx
index 19c341f15d34..6255b2f0b52a 100644
--- a/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx
+++ b/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx
@@ -29,6 +29,8 @@
using namespace com::sun::star;
+namespace {
+
class Mapping : public uno_Mapping
{
uno::Environment m_from;
@@ -55,6 +57,8 @@ public:
void release();
};
+}
+
static void s_mapInterface(
uno_Mapping * puno_Mapping,
void ** ppOut,
diff --git a/cppu/source/threadpool/current.cxx b/cppu/source/threadpool/current.cxx
index f788e005a031..665f1b7c636e 100644
--- a/cppu/source/threadpool/current.cxx
+++ b/cppu/source/threadpool/current.cxx
@@ -81,6 +81,7 @@ static typelib_InterfaceTypeDescription * get_type_XCurrentContext()
return s_type_XCurrentContext;
}
+namespace {
class ThreadKey
{
@@ -119,6 +120,8 @@ public:
}
};
+}
+
extern "C" {
static void delete_IdContainer( void * p )
diff --git a/cppu/source/threadpool/threadpool.cxx b/cppu/source/threadpool/threadpool.cxx
index 40b031c85732..d11268b85784 100644
--- a/cppu/source/threadpool/threadpool.cxx
+++ b/cppu/source/threadpool/threadpool.cxx
@@ -44,6 +44,8 @@ namespace cppu_threadpool
rtl::Reference<ORequestThread> const & theThread): thread(theThread)
{}
+ namespace {
+
struct theDisposedCallerAdmin :
public rtl::StaticWithInit< DisposedCallerAdminHolder, theDisposedCallerAdmin >
{
@@ -52,6 +54,8 @@ namespace cppu_threadpool
}
};
+ }
+
DisposedCallerAdminHolder const & DisposedCallerAdmin::getInstance()
{
return theDisposedCallerAdmin::get();
@@ -328,6 +332,8 @@ namespace cppu_threadpool
using namespace cppu_threadpool;
+namespace {
+
struct uno_ThreadPool_Equal
{
bool operator () ( const uno_ThreadPool &a , const uno_ThreadPool &b ) const
@@ -344,6 +350,7 @@ struct uno_ThreadPool_Hash
}
};
+}
typedef std::unordered_map< uno_ThreadPool, ThreadPoolHolder, uno_ThreadPool_Hash, uno_ThreadPool_Equal > ThreadpoolHashSet;
diff --git a/cppu/source/typelib/static_types.cxx b/cppu/source/typelib/static_types.cxx
index 5a400817115d..b2638979936a 100644
--- a/cppu/source/typelib/static_types.cxx
+++ b/cppu/source/typelib/static_types.cxx
@@ -40,6 +40,8 @@ extern "C"
#pragma pack(push, 8)
#endif
+namespace {
+
/**
* The double member determines the alignment.
* Under OS2 and MS-Windows the Alignment is min( 8, sizeof( type ) ).
@@ -59,6 +61,8 @@ struct AlignSize_Impl
#endif
};
+}
+
#ifdef _WIN32
#pragma pack(pop)
#endif
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index 1604cf7b7997..c94ee1a80ec2 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -46,6 +46,8 @@ using namespace osl;
#pragma pack(push, 8)
#endif
+namespace {
+
/**
* The double member determines the alignment.
* Under OS2 and MS-Windows the Alignment is min( 8, sizeof( type ) ).
@@ -65,6 +67,8 @@ struct AlignSize_Impl
#endif
};
+}
+
#ifdef _WIN32
#pragma pack(pop)
#endif
@@ -138,6 +142,7 @@ static sal_Int32 getDescriptionSize( typelib_TypeClass eTypeClass )
return nSize;
}
+namespace {
struct equalStr_Impl
{
@@ -152,6 +157,7 @@ struct hashStr_Impl
{ return rtl_ustr_hashCode( s ); }
};
+}
// Heavy hack, the const sal_Unicode * is hold by the typedescription reference
typedef std::unordered_map< const sal_Unicode *, typelib_TypeDescriptionReference *,
@@ -164,6 +170,8 @@ typedef list< typelib_TypeDescription * > TypeDescriptionList_Impl;
// # of cached elements
static sal_Int32 nCacheSize = 256;
+namespace {
+
struct TypeDescriptor_Init_Impl
{
//sal_Bool bDesctructorCalled;
@@ -206,6 +214,8 @@ struct TypeDescriptor_Init_Impl
~TypeDescriptor_Init_Impl();
};
+}
+
inline Mutex & TypeDescriptor_Init_Impl::getMutex()
{
if( !pMutex )
diff --git a/cppu/source/uno/EnvStack.cxx b/cppu/source/uno/EnvStack.cxx
index 71c87bec7c37..f6b11352cf14 100644
--- a/cppu/source/uno/EnvStack.cxx
+++ b/cppu/source/uno/EnvStack.cxx
@@ -33,12 +33,15 @@
using namespace com::sun::star;
+namespace {
struct oslThreadIdentifier_equal
{
bool operator()(oslThreadIdentifier s1, oslThreadIdentifier s2) const;
};
+}
+
bool oslThreadIdentifier_equal::operator()(oslThreadIdentifier s1, oslThreadIdentifier s2) const
{
bool result = s1 == s2;
@@ -46,12 +49,15 @@ bool oslThreadIdentifier_equal::operator()(oslThreadIdentifier s1, oslThreadIden
return result;
}
+namespace {
struct oslThreadIdentifier_hash
{
size_t operator()(oslThreadIdentifier s1) const;
};
+}
+
size_t oslThreadIdentifier_hash::operator()(oslThreadIdentifier s1) const
{
return s1;
diff --git a/cppu/source/uno/IdentityMapping.cxx b/cppu/source/uno/IdentityMapping.cxx
index 6b7ad09f98c6..c6dab40cefe8 100644
--- a/cppu/source/uno/IdentityMapping.cxx
+++ b/cppu/source/uno/IdentityMapping.cxx
@@ -28,6 +28,8 @@
using namespace ::com::sun::star;
+namespace {
+
struct IdentityMapping : public uno_Mapping
{
sal_Int32 m_nRef;
@@ -36,6 +38,8 @@ struct IdentityMapping : public uno_Mapping
explicit IdentityMapping(uno::Environment const & rEnv);
};
+}
+
extern "C"
{
diff --git a/cppu/source/uno/cascade_mapping.cxx b/cppu/source/uno/cascade_mapping.cxx
index 13df4d8814e7..f57f7dc0ac87 100644
--- a/cppu/source/uno/cascade_mapping.cxx
+++ b/cppu/source/uno/cascade_mapping.cxx
@@ -30,6 +30,8 @@
using namespace com::sun::star;
+namespace {
+
class MediatorMapping : public uno_Mapping
{
oslInterlockedCount m_refCount;
@@ -53,6 +55,8 @@ public:
uno_Environment * pTo);
};
+}
+
extern "C" {
static void s_acquire(uno_Mapping * mapping)
{
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index a97d2a0dc829..ad27087b9b02 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -53,6 +53,8 @@ using namespace com::sun::star::uno;
namespace cppu
{
+namespace {
+
class Mapping
{
uno_Mapping * _pMapping;
@@ -80,6 +82,8 @@ public:
{ return (_pMapping != nullptr); }
};
+}
+
inline Mapping::Mapping( uno_Mapping * pMapping )
: _pMapping( pMapping )
{
@@ -110,6 +114,7 @@ inline Mapping & Mapping::operator = ( uno_Mapping * pMapping )
return *this;
}
+namespace {
struct MappingEntry
{
@@ -134,6 +139,8 @@ struct FctPtrHash
{ return reinterpret_cast<size_t>(pKey); }
};
+}
+
typedef std::unordered_map<
OUString, MappingEntry * > t_OUString2Entry;
typedef std::unordered_map<
@@ -141,6 +148,7 @@ typedef std::unordered_map<
typedef set< uno_getMappingFunc > t_CallbackSet;
+namespace {
struct MappingsData
{
@@ -155,6 +163,8 @@ struct MappingsData
set<OUString> aNegativeLibs;
};
+}
+
static MappingsData & getMappingsData()
{
//TODO This memory is leaked; see #i63473# for when this should be
@@ -164,6 +174,8 @@ static MappingsData & getMappingsData()
return *s_p;
}
+namespace {
+
/**
* This class mediates two different mapping via uno, e.g. form any language to uno,
* then from uno to any other language.
@@ -185,6 +197,9 @@ struct uno_Mediate_Mapping : public uno_Mapping
const Mapping & rFrom2Uno_, const Mapping & rUno2To_,
const OUString & rAddPurpose );
};
+
+}
+
extern "C"
{
diff --git a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
index 43a9d87df927..0dcebbbac16a 100644
--- a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
+++ b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
@@ -32,6 +32,8 @@ using namespace com::sun::star;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
+namespace {
+
struct ContainerStats {
int m_nAlive;
int m_nDisposed;
@@ -51,6 +53,8 @@ public:
}
};
+}
+
namespace cppu_ifcontainer
{
class IfTest : public CppUnit::TestFixture
diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx
index 5d6294704f7f..6d70b7817fa7 100644
--- a/cppuhelper/source/component_context.cxx
+++ b/cppuhelper/source/component_context.cxx
@@ -72,6 +72,8 @@ static void try_dispose( Reference< lang::XComponent > const & xComp )
}
}
+namespace {
+
class DisposingForwarder
: public WeakImplHelper< lang::XEventListener >
{
@@ -91,6 +93,8 @@ public:
virtual void SAL_CALL disposing( lang::EventObject const & rSource ) override;
};
+}
+
inline void DisposingForwarder::listen(
Reference< lang::XComponent > const & xSource,
Reference< lang::XComponent > const & xTarget )
@@ -107,6 +111,7 @@ void DisposingForwarder::disposing( lang::EventObject const & )
m_xTarget.clear();
}
+namespace {
struct MutexHolder
{
@@ -167,6 +172,8 @@ public:
virtual sal_Bool SAL_CALL hasElements() override;
};
+}
+
// XNameContainer
void ComponentContext::insertByName(
diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx
index d61639566110..8a951033cc08 100644
--- a/cppuhelper/source/factory.cxx
+++ b/cppuhelper/source/factory.cxx
@@ -54,6 +54,8 @@ using namespace com::sun::star::registry;
namespace cppu
{
+namespace {
+
class OSingleFactoryHelper
: public XServiceInfo
, public XSingleServiceFactory
@@ -113,6 +115,9 @@ protected:
Sequence< OUString > aServiceNames;
OUString aImplementationName;
};
+
+}
+
OSingleFactoryHelper::~OSingleFactoryHelper()
{
}
@@ -222,6 +227,8 @@ Sequence< OUString > OSingleFactoryHelper::getSupportedServiceNames()
return aServiceNames;
}
+namespace {
+
struct OFactoryComponentHelper_Mutex
{
Mutex aMutex;
@@ -285,6 +292,7 @@ protected:
bool isInstance() const {return xTheInstance.is();}
};
+}
Any SAL_CALL OFactoryComponentHelper::queryInterface( const Type & rType )
{
@@ -426,6 +434,8 @@ sal_Bool SAL_CALL OFactoryComponentHelper::releaseOnNotification()
return true;
}
+namespace {
+
class ORegistryFactoryHelper : public OFactoryComponentHelper,
public OPropertySetHelper
@@ -495,6 +505,8 @@ protected:
using OPropertySetHelper::getTypes;
};
+}
+
// XInterface
Any SAL_CALL ORegistryFactoryHelper::queryInterface(
@@ -800,6 +812,8 @@ sal_Bool SAL_CALL ORegistryFactoryHelper::releaseOnNotification()
return retVal;
}
+namespace {
+
class OFactoryProxyHelper : public WeakImplHelper< XServiceInfo, XSingleServiceFactory,
XUnloadingPreference >
{
@@ -824,6 +838,8 @@ public:
};
+}
+
// XSingleServiceFactory
Reference<XInterface > OFactoryProxyHelper::createInstance()
{
diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx
index 3f39522b008c..53aeb8f4d4b1 100644
--- a/cppuhelper/source/propshlp.cxx
+++ b/cppuhelper/source/propshlp.cxx
@@ -67,6 +67,8 @@ static int compare_OUString_Property_Impl( const void *arg1, const void *arg2 )
* The class which implements the PropertySetInfo interface.
*/
+namespace {
+
class OPropertySetHelperInfo_Impl
: public WeakImplHelper< css::beans::XPropertySetInfo >
{
@@ -81,6 +83,7 @@ public:
virtual sal_Bool SAL_CALL hasPropertyByName(const OUString& PropertyName) override;
};
+}
/**
* Create an object that implements XPropertySetInfo IPropertyArrayHelper.
diff --git a/cppuhelper/source/tdmgr.cxx b/cppuhelper/source/tdmgr.cxx
index 8666fadc6554..970688d736b6 100644
--- a/cppuhelper/source/tdmgr.cxx
+++ b/cppuhelper/source/tdmgr.cxx
@@ -597,6 +597,7 @@ static void typelib_callback(
}
}
+namespace {
class EventListenerImpl
: public WeakImplHelper< lang::XEventListener >
@@ -613,6 +614,8 @@ public:
virtual void SAL_CALL disposing( lang::EventObject const & rEvt ) override;
};
+}
+
void EventListenerImpl::disposing( lang::EventObject const & rEvt )
{
if (rEvt.Source != m_xTDMgr) {
diff --git a/cpputools/source/unoexe/unoexe.cxx b/cpputools/source/unoexe/unoexe.cxx
index 3dbfdfa843d6..98f437482d94 100644
--- a/cpputools/source/unoexe/unoexe.cxx
+++ b/cpputools/source/unoexe/unoexe.cxx
@@ -223,6 +223,8 @@ static Reference< XInterface > loadComponent(
return xInstance;
}
+namespace {
+
class OInstanceProvider
: public WeakImplHelper< XInstanceProvider >
{
@@ -260,6 +262,8 @@ public:
virtual Reference< XInterface > SAL_CALL getInstance( const OUString & rName ) override;
};
+}
+
inline Reference< XInterface > OInstanceProvider::createInstance()
{
Reference< XInterface > xRet;
@@ -318,6 +322,8 @@ Reference< XInterface > OInstanceProvider::getInstance( const OUString & rName )
"no such element \"" + rName + "\"!" );
}
+namespace {
+
struct ODisposingListener : public WeakImplHelper< XEventListener >
{
Condition cDisposed;
@@ -328,6 +334,8 @@ struct ODisposingListener : public WeakImplHelper< XEventListener >
static void waitFor( const Reference< XComponent > & xComp );
};
+}
+
void ODisposingListener::disposing( const EventObject & )
{
cDisposed.set();
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 9c65d47cf6da..44bca8f89a5b 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -1805,6 +1805,8 @@ void SentenceEditWindow_Impl::SetText( const OUString& rStr )
m_xEditEngine->SetText(rStr);
}
+namespace {
+
struct LanguagePosition_Impl
{
sal_Int32 nPosition;
@@ -1815,6 +1817,9 @@ struct LanguagePosition_Impl
eLanguage(eLang)
{}
};
+
+}
+
typedef std::vector<LanguagePosition_Impl> LanguagePositions_Impl;
static void lcl_InsertBreakPosition_Impl(
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx
index e3b46bcdec87..565c3ca2c8b1 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -144,6 +144,8 @@ static void RGBtoCMYK( double dR, double dG, double dB, double& fCyan, double& f
}
}
+namespace {
+
class ColorPreviewControl : public weld::CustomWidgetController
{
private:
@@ -172,6 +174,8 @@ public:
}
};
+}
+
void ColorPreviewControl::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&)
{
rRenderContext.SetFillColor(m_aColor);
@@ -187,6 +191,8 @@ enum ColorMode { HUE, SATURATION, BRIGHTNESS, RED, GREEN, BLUE };
const ColorMode DefaultMode = HUE;
+namespace {
+
class ColorFieldControl : public weld::CustomWidgetController
{
public:
@@ -243,6 +249,8 @@ private:
std::vector<sal_uInt16> maPercent_Vert;
};
+}
+
void ColorFieldControl::UpdateBitmap()
{
const Size aSize(GetOutputSizePixel());
@@ -506,6 +514,8 @@ void ColorFieldControl::UpdatePosition()
ShowPosition(Point(static_cast<long>(mdX * aSize.Width()), static_cast<long>((1.0 - mdY) * aSize.Height())), false);
}
+namespace {
+
class ColorSliderControl : public weld::CustomWidgetController
{
public:
@@ -540,6 +550,8 @@ private:
double mdValue;
};
+}
+
ColorSliderControl::ColorSliderControl()
: meMode( DefaultMode )
, mnLevel( 0 )
@@ -714,6 +726,8 @@ void ColorSliderControl::SetValue(const Color& rColor, ColorMode eMode, double d
}
}
+namespace {
+
class ColorPickerDialog : public weld::GenericDialogController
{
private:
@@ -774,6 +788,8 @@ private:
double mdCyan, mdMagenta, mdYellow, mdKey;
};
+}
+
ColorPickerDialog::ColorPickerDialog(weld::Window* pParent, Color nColor, sal_Int16 nDialogMode)
: GenericDialogController(pParent, "cui/ui/colorpickerdialog.ui", "ColorPicker")
, m_xColorField(new weld::CustomWeld(*m_xBuilder, "colorField", m_aColorField))
@@ -1192,6 +1208,8 @@ void ColorPickerDialog::setColorComponent( ColorComponent nComp, double dValue )
typedef ::cppu::WeakComponentImplHelper< XServiceInfo, XExecutableDialog, XInitialization, XPropertyAccess > ColorPickerBase;
+namespace {
+
class ColorPicker : protected ::cppu::BaseMutex, // Struct for right initialization of mutex member! Must be first of baseclasses.
public ColorPickerBase
{
@@ -1220,6 +1238,8 @@ private:
Reference<css::awt::XWindow> mxParent;
};
+}
+
OUString ColorPicker_getImplementationName()
{
return "com.sun.star.cui.ColorPicker";
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index e3b0b2e5d592..a90d1725a50d 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -76,7 +76,6 @@ namespace svx
m_rDev.Pop();
}
};
- }
/** a class which allows to draw two texts in a pseudo-ruby way (which basically
means one text above or below the other, and a little bit smaller)
@@ -105,6 +104,8 @@ namespace svx
::tools::Rectangle* _pPrimaryLocation, ::tools::Rectangle* _pSecondaryLocation );
};
+ }
+
PseudoRubyText::PseudoRubyText()
: m_ePosition(eAbove)
{
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index 3e875bef1994..a68388d83031 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -55,6 +55,8 @@ using namespace ::com::sun::star;
|*
|************************************************************************/
+namespace {
+
struct DocumentTypeData
{
OUString aStrURL;
@@ -63,6 +65,8 @@ struct DocumentTypeData
{}
};
+}
+
bool SvxHyperlinkNewDocTp::ImplGetURLObject( const OUString& rPath, const OUString& rBase, INetURLObject& aURLObject ) const
{
bool bIsValidURL = !rPath.isEmpty();
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index 08d1798b42e5..3b985b2b0d40 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -41,6 +41,8 @@
using namespace ::com::sun::star;
+namespace {
+
// Userdata-struct for tree-entries
struct TargetData
{
@@ -55,6 +57,8 @@ struct TargetData
}
};
+}
+
//*** Window-Class ***
// Constructor / Destructor
SvxHlinkDlgMarkWnd::SvxHlinkDlgMarkWnd(weld::Window* pParentDialog, SvxHyperlinkTabPageBase *pParentPage)
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index f8388ece411c..c70fa676a315 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -46,6 +46,8 @@
using namespace sfx2;
using namespace ::com::sun::star;
+namespace {
+
class SvBaseLinkMemberList {
private:
std::vector<SvBaseLink*> mLinks;
@@ -71,6 +73,8 @@ public:
}
};
+}
+
SvBaseLinksDlg::SvBaseLinksDlg(weld::Window * pParent, LinkManager* pMgr, bool bHtmlMode)
: GenericDialogController(pParent, "cui/ui/baselinksdialog.ui", "BaseLinksDialog")
, aStrAutolink( CuiResId( STR_AUTOLINK ) )
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 80e28b271b63..039f713d2279 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -1375,6 +1375,8 @@ VclPtr<AbstractSvxPostItDialog> AbstractDialogFactory_Impl::CreateSvxPostItDialo
return VclPtr<AbstractSvxPostItDialog_Impl>::Create(std::make_unique<SvxPostItDialog>(pParent, rCoreSet, bPrevNext));
}
+namespace {
+
class SvxMacroAssignDialog : public VclAbstractDialog
{
public:
@@ -1393,6 +1395,8 @@ private:
std::unique_ptr<SvxMacroAssignDlg> m_xDialog;
};
+}
+
short SvxMacroAssignDialog::Execute()
{
return m_xDialog->run();
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index 89feb5760f41..07d68df2dd65 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -44,12 +44,16 @@ using namespace com::sun::star::beans;
const sal_Char cIsKernAsianPunctuation[] = "IsKernAsianPunctuation";
const sal_Char cCharacterCompressionType[] = "CharacterCompressionType";
+namespace {
+
struct SvxForbiddenChars_Impl
{
bool bRemoved;
std::unique_ptr<ForbiddenCharacters> pCharacters;
};
+}
+
struct SvxAsianLayoutPage_Impl
{
SvxAsianConfig aConfig;
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 56e75fecd969..244cbbbf0dea 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -159,8 +159,6 @@ const vEntryInfo[] =
#undef IDS
};
-} // namespace
-
// ColorConfigWindow_Impl
class ColorConfigWindow_Impl
@@ -260,6 +258,8 @@ private:
bool IsGroupVisible (Group) const;
};
+} // namespace
+
// ColorConfigWindow_Impl::Chapter
// ctor for default groups
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 5e394e9753e3..dca1b491932f 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -113,6 +113,8 @@ static bool KillFile_Impl( const OUString& rURL )
#define TYPE_HYPH sal_uInt8(3)
#define TYPE_THES sal_uInt8(4)
+namespace {
+
class ModuleUserData_Impl
{
bool bParent;
@@ -156,6 +158,7 @@ public:
bool IsDeletable() const { return static_cast<bool>((nVal >> 10) & 0x01); }
};
+}
DicUserData::DicUserData(
sal_uInt16 nEID,
@@ -212,6 +215,8 @@ static OUString lcl_GetPropertyName( EID_OPTIONS eEntryId )
return OUString::createFromAscii( aEidToPropName[ static_cast<int>(eEntryId) ] );
}
+namespace {
+
class OptionsBreakSet : public weld::GenericDialogController
{
std::unique_ptr<weld::Widget> m_xBeforeFrame;
@@ -273,6 +278,8 @@ public:
void SetNumericValue( sal_uInt8 nNumVal );
};
+}
+
OptionsUserData::OptionsUserData( sal_uInt16 nEID,
bool bHasNV, sal_uInt16 nNumVal,
bool bCheckable, bool bChecked )
@@ -298,6 +305,8 @@ void OptionsUserData::SetNumericValue( sal_uInt8 nNumVal )
// ServiceInfo_Impl ----------------------------------------------------
+namespace {
+
struct ServiceInfo_Impl
{
OUString sDisplayName;
@@ -314,6 +323,8 @@ struct ServiceInfo_Impl
ServiceInfo_Impl() : bConfigured(false) {}
};
+}
+
typedef std::vector< ServiceInfo_Impl > ServiceInfoArr;
typedef std::map< LanguageType, Sequence< OUString > > LangImplNameTable;
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index b287852f2329..a35f98ec3248 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -74,6 +74,8 @@ struct OptPath_Impl
}
};
+namespace {
+
struct PathUserData_Impl
{
sal_uInt16 nRealId;
@@ -96,6 +98,8 @@ struct Handle2CfgNameMapping_Impl
const char* m_pCfgName;
};
+}
+
static Handle2CfgNameMapping_Impl const Hdl2CfgMap_Impl[] =
{
{ SvtPathOptions::PATH_AUTOCORRECT, "AutoCorrect" },
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index f36a8ab76029..8b7c32b051bd 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -130,6 +130,8 @@ static OUString GetViewOptUserItem( const SvtViewOptions& rOpt )
return aUserData;
}
+namespace {
+
struct ModuleToGroupNameMap_Impl
{
const char* m_pModule;
@@ -137,6 +139,8 @@ struct ModuleToGroupNameMap_Impl
sal_uInt16 m_nNodeId;
};
+}
+
static ModuleToGroupNameMap_Impl ModuleMap[] =
{
{ "ProductName", OUString(), SID_GENERAL_OPTIONS },
@@ -232,6 +236,8 @@ static sal_uInt16 getGroupNodeId( const OUString& rModule )
return nNodeId;
}
+namespace {
+
class MailMergeCfg_Impl : public utl::ConfigItem
{
private:
@@ -250,6 +256,8 @@ public:
};
+}
+
MailMergeCfg_Impl::MailMergeCfg_Impl() :
utl::ConfigItem("Office.Writer/MailMergeWizard"),
bIsEmailSupported(false)
@@ -314,6 +322,8 @@ static std::unique_ptr<SfxTabPage> CreateGeneralTabPage(sal_uInt16 nId, weld::Co
return fnCreate ? (*fnCreate)( pPage, pController, &rSet ) : nullptr;
}
+namespace {
+
struct OptionsMapping_Impl
{
const char* m_pGroupName;
@@ -321,6 +331,8 @@ struct OptionsMapping_Impl
sal_uInt16 m_nPageId;
};
+}
+
static OptionsMapping_Impl const OptionsMap_Impl[] =
{
// GROUP PAGE PAGE-ID
@@ -450,6 +462,8 @@ struct OptionsPageInfo
explicit OptionsPageInfo( sal_uInt16 nId ) : m_nPageId( nId ) {}
};
+namespace {
+
struct OptionsGroupInfo
{
std::unique_ptr<SfxItemSet> m_pInItemSet;
@@ -463,6 +477,8 @@ struct OptionsGroupInfo
m_pModule( pMod ), m_nDialogId( nId ) {}
};
+}
+
#define INI_LIST() \
, m_pParent ( pParent )\
, sTitle ( m_xDialog->get_title() )\
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index edb129d8c227..4952e7b8203c 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -283,6 +283,8 @@ void OfaAutocorrOptionsPage::Reset( const SfxItemSet* )
/* */
/*********************************************************************/
+namespace {
+
struct ImpUserData
{
OUString *pString;
@@ -321,8 +323,6 @@ public:
/* */
/*********************************************************************/
-namespace {
-
enum OfaAutoFmtOptions
{
USE_REPLACE_TABLE,
@@ -2139,6 +2139,8 @@ std::unique_ptr<SfxTabPage> OfaSmartTagOptionsTabPage::Create(weld::Container* p
return std::make_unique<OfaSmartTagOptionsTabPage>(pPage, pController, *rSet);
}
+namespace {
+
/** This struct is used to associate list box entries with smart tag data
*/
struct ImplSmartTagLBUserData
@@ -2155,6 +2157,8 @@ struct ImplSmartTagLBUserData
mnSmartTagIdx( nSmartTagIdx ) {}
};
+}
+
/** Clears m_xSmartTagTypesLB
*/
void OfaSmartTagOptionsTabPage::ClearListBox()
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index 33a0649d21e6..24251a1800c1 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -55,6 +55,8 @@ struct FrmMap
LB nLBRelations;
};
+namespace {
+
struct RelationMap
{
SvxSwFramePosString::StringId eStrId;
@@ -68,8 +70,6 @@ struct StringIdPair_Impl
SvxSwFramePosString::StringId eVert;
};
-namespace {
-
enum class LB {
NONE = 0x000000,
Frame = 0x000001, // paragraph text area
diff --git a/dbaccess/qa/unit/tdf119625.cxx b/dbaccess/qa/unit/tdf119625.cxx
index e1bb46b087f7..bbbe232a292d 100644
--- a/dbaccess/qa/unit/tdf119625.cxx
+++ b/dbaccess/qa/unit/tdf119625.cxx
@@ -44,11 +44,14 @@ void Tdf119625Test::setUp()
osl_setEnvironment(OUString{ "DBACCESS_HSQL_MIGRATION" }.pData, OUString{ "1" }.pData);
}
+namespace
+{
struct expect_t
{
sal_Int16 id;
sal_Int16 h, m, s;
};
+}
/* The values here assume that our results are in UTC. However,
tdf#119675 "Firebird: Migration: User dialog to set treatment of
diff --git a/dbaccess/qa/unit/tdf126268.cxx b/dbaccess/qa/unit/tdf126268.cxx
index 9d41b95809aa..45b386ed1901 100644
--- a/dbaccess/qa/unit/tdf126268.cxx
+++ b/dbaccess/qa/unit/tdf126268.cxx
@@ -43,11 +43,14 @@ void Tdf126268Test::setUp()
osl_setEnvironment(OUString{ "DBACCESS_HSQL_MIGRATION" }.pData, OUString{ "1" }.pData);
}
+namespace
+{
struct expect_t
{
sal_Int16 id;
OUString number;
};
+}
static const expect_t expect[] = {
{ 1, "0.00" }, { 2, "25.00" }, { 3, "26.00" }, { 4, "30.4" }, { 5, "45.8" },
diff --git a/dbaccess/source/core/api/FilteredContainer.cxx b/dbaccess/source/core/api/FilteredContainer.cxx
index c69cc4158a14..3cc33cfe323b 100644
--- a/dbaccess/source/core/api/FilteredContainer.cxx
+++ b/dbaccess/source/core/api/FilteredContainer.cxx
@@ -100,6 +100,9 @@ static sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, std::
}
typedef ::boost::optional< OUString > OptionalString;
+
+ namespace {
+
struct TableInfo
{
OptionalString sComposedName;
@@ -123,6 +126,9 @@ static sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, std::
{
}
};
+
+ }
+
typedef std::vector< TableInfo > TableInfos;
static void lcl_ensureComposedName( TableInfo& _io_tableInfo, const Reference< XDatabaseMetaData >& _metaData )
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 30ffe0cfadda..c8a287cde253 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -2031,6 +2031,8 @@ Reference< XInterface > ODatabaseDocument::getThis() const
return *const_cast< ODatabaseDocument* >( this );
}
+namespace {
+
struct CreateAny
{
Any operator() (const Reference<XController>& lhs) const
@@ -2039,6 +2041,8 @@ struct CreateAny
}
};
+}
+
// XModel2
Reference< XEnumeration > SAL_CALL ODatabaseDocument::getControllers( )
{
diff --git a/dbaccess/source/core/dataaccess/databaseregistrations.cxx b/dbaccess/source/core/dataaccess/databaseregistrations.cxx
index 9178e60efd85..516873746d7a 100644
--- a/dbaccess/source/core/dataaccess/databaseregistrations.cxx
+++ b/dbaccess/source/core/dataaccess/databaseregistrations.cxx
@@ -70,6 +70,9 @@ namespace dbaccess
// DatabaseRegistrations - declaration
typedef ::cppu::WeakAggImplHelper1 < XDatabaseRegistrations
> DatabaseRegistrations_Base;
+
+ namespace {
+
class DatabaseRegistrations :public ::cppu::BaseMutex
,public DatabaseRegistrations_Base
{
@@ -137,6 +140,8 @@ namespace dbaccess
::comphelper::OInterfaceContainerHelper2 m_aRegistrationListeners;
};
+ }
+
// DatabaseRegistrations - implementation
DatabaseRegistrations::DatabaseRegistrations( const Reference<XComponentContext> & _rxContext )
:m_aContext( _rxContext )
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx
index 95aef3c1a236..a605b2e0c907 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -98,6 +98,8 @@ using namespace ::comphelper;
namespace dbaccess
{
+namespace {
+
/** helper class which implements a XFlushListener, and forwards all
notification events to another XFlushListener
@@ -133,6 +135,8 @@ protected:
virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
};
+}
+
FlushNotificationAdapter::FlushNotificationAdapter( const Reference< XFlushable >& _rxBroadcaster, const Reference< XFlushListener >& _rxListener )
:m_aBroadcaster( _rxBroadcaster )
,m_aListener( _rxListener )
@@ -255,6 +259,8 @@ void SAL_CALL OAuthenticationContinuation::setRememberAccount( RememberAuthentic
SAL_WARN("dbaccess","OAuthenticationContinuation::setRememberAccount: not supported!");
}
+namespace {
+
/** The class OSharedConnectionManager implements a structure to share connections.
It owns the master connections which will be disposed when the last connection proxy is gone.
*/
@@ -269,6 +275,8 @@ struct TDigestHolder
};
+}
+
class OSharedConnectionManager : public ::cppu::WeakImplHelper< XEventListener >
{
diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx
index c30f15000323..05f0da16f474 100644
--- a/dbaccess/source/core/dataaccess/documentcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx
@@ -59,6 +59,8 @@ using namespace ::cppu;
namespace dbaccess
{
+namespace {
+
// LocalNameApproval
class LocalNameApproval : public IContainerApprove
{
@@ -68,6 +70,8 @@ public:
void approveElement( const OUString& _rName ) override;
};
+}
+
void LocalNameApproval::approveElement( const OUString& _rName )
{
if ( _rName.indexOf( '/' ) != -1 )
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index 9c89e4da2b8a..511cc0147775 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -156,6 +156,9 @@ namespace dbaccess
// OEmbedObjectHolder
typedef ::cppu::WeakComponentImplHelper< embed::XStateChangeListener > TEmbedObjectHolder;
+
+ namespace {
+
class OEmbedObjectHolder : public ::cppu::BaseMutex
,public TEmbedObjectHolder
{
@@ -184,6 +187,8 @@ namespace dbaccess
virtual void SAL_CALL disposing( const lang::EventObject& Source ) override;
};
+ }
+
void SAL_CALL OEmbedObjectHolder::disposing()
{
if ( m_xBroadCaster.is() )
@@ -235,6 +240,8 @@ namespace dbaccess
}
};
+ namespace {
+
// LockModifiable
class LockModifiable
{
@@ -267,9 +274,14 @@ namespace dbaccess
Reference< XModifiable2 > m_xModifiable;
};
+ }
+
// LifetimeCoupler
typedef ::cppu::WeakImplHelper< css::lang::XEventListener
> LifetimeCoupler_Base;
+
+ namespace {
+
/** helper class which couples the lifetime of a component to the lifetime
of another component
@@ -309,11 +321,15 @@ namespace dbaccess
protected:
};
+ }
+
void SAL_CALL LifetimeCoupler::disposing( const css::lang::EventObject& /*Source*/ )
{
m_xClient.clear();
}
+ namespace {
+
// ODocumentSaveContinuation
class ODocumentSaveContinuation : public OInteraction< XInteractionDocumentSave >
{
@@ -330,6 +346,8 @@ namespace dbaccess
virtual void SAL_CALL setName( const OUString& _sName,const Reference<XContent>& _xParent) override;
};
+ }
+
void SAL_CALL ODocumentSaveContinuation::setName( const OUString& _sName,const Reference<XContent>& _xParent)
{
m_sName = _sName;
@@ -531,6 +549,8 @@ IPropertyArrayHelper* ODocumentDefinition::createArrayHelper( ) const
return new OPropertyArrayHelper( ::comphelper::concatSequences( aProps, aManualProps ) );
}
+namespace {
+
class OExecuteImpl
{
bool& m_rbSet;
@@ -539,8 +559,6 @@ public:
~OExecuteImpl(){ m_rbSet = false; }
};
-namespace
-{
bool lcl_extractOpenMode( const Any& _rValue, sal_Int32& _out_rMode )
{
OpenCommandArgument aOpenCommand;
diff --git a/dbaccess/source/core/dataaccess/documentevents.cxx b/dbaccess/source/core/dataaccess/documentevents.cxx
index 418d466ad816..a6705d850161 100644
--- a/dbaccess/source/core/dataaccess/documentevents.cxx
+++ b/dbaccess/source/core/dataaccess/documentevents.cxx
@@ -56,6 +56,8 @@ namespace dbaccess
const DocumentEvents_Data& operator=(const DocumentEvents_Data&) = delete;
};
+ namespace {
+
// helper
struct DocumentEventData
{
@@ -63,8 +65,6 @@ namespace dbaccess
bool bNeedsSyncNotify;
};
- namespace
- {
const DocumentEventData* lcl_getDocumentEventData()
{
static const DocumentEventData s_aData[] = {
diff --git a/dbaccess/source/core/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx
index 7a567de02326..b0143978df73 100644
--- a/dbaccess/source/core/dataaccess/intercept.cxx
+++ b/dbaccess/source/core/dataaccess/intercept.cxx
@@ -89,12 +89,16 @@ OInterceptor::~OInterceptor()
{
}
+namespace {
+
struct DispatchHelper
{
URL aURL;
Sequence<PropertyValue > aArguments;
};
+}
+
//XDispatch
void SAL_CALL OInterceptor::dispatch( const URL& URL,const Sequence<PropertyValue >& Arguments )
{
diff --git a/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx b/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx
index f1d03b10e915..04db3216cef0 100644
--- a/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx
+++ b/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx
@@ -42,6 +42,8 @@ using namespace dbaccess;
namespace dbaccess
{
+namespace {
+
// struct ResultListEntry.
struct ResultListEntry
{
@@ -54,6 +56,8 @@ struct ResultListEntry
explicit ResultListEntry(const ContentProperties& rEntry) : rData( rEntry ) {}
};
+}
+
// struct DataSupplier_Impl.
struct DataSupplier_Impl
{
diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
index 41020966602b..f569307fdf3a 100644
--- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx
+++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
@@ -165,6 +165,8 @@ namespace dbaccess
static const char sCurrentQueryDesignName[] = "ooo:current-query-design";
}
+ namespace {
+
// SettingsExportContext
class SettingsExportContext : public ::xmloff::XMLSettingsExportContext
{
@@ -202,6 +204,8 @@ namespace dbaccess
const OUString m_aNamespace;
};
+ }
+
void SettingsExportContext::AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName, const OUString& i_rValue )
{
m_rDelegator.addAttribute( impl_prefix( i_eName ), i_rValue );
@@ -239,6 +243,9 @@ namespace dbaccess
// SettingsDocumentHandler
typedef ::cppu::WeakImplHelper< XDocumentHandler
> SettingsDocumentHandler_Base;
+
+ namespace {
+
class SettingsDocumentHandler : public SettingsDocumentHandler_Base
{
public:
@@ -269,6 +276,8 @@ namespace dbaccess
::comphelper::NamedValueCollection m_aSettings;
};
+ }
+
void SAL_CALL SettingsDocumentHandler::startDocument( )
{
}
diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx
index ee3478412a81..0116f8691986 100644
--- a/dbaccess/source/filter/xml/dbloader2.cxx
+++ b/dbaccess/source/filter/xml/dbloader2.cxx
@@ -90,6 +90,8 @@ using ::com::sun::star::sdb::application::NamedDatabaseObject;
namespace dbaxml
{
+namespace {
+
class DBTypeDetection : public ::cppu::WeakImplHelper< XExtendedFilterDetection, XServiceInfo>
{
const Reference< XComponentContext > m_aContext;
@@ -114,6 +116,8 @@ public:
virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& Descriptor ) override;
};
+}
+
DBTypeDetection::DBTypeDetection(const Reference< XComponentContext >& _rxContext)
:m_aContext( _rxContext )
{
@@ -220,6 +224,8 @@ extern "C" void createRegistryInfo_DBTypeDetection()
namespace dbaxml
{
+namespace {
+
class DBContentLoader : public ::cppu::WeakImplHelper< XFrameLoader, XServiceInfo>
{
private:
@@ -256,6 +262,7 @@ private:
bool impl_executeNewDatabaseWizard( Reference< XModel > const & _rxModel, bool& _bShouldStartTableWizard );
};
+}
DBContentLoader::DBContentLoader(const Reference< XComponentContext >& _rxFactory)
:m_aContext( _rxFactory )
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index cf9f3a75dff7..43a199f2b91e 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -67,6 +67,8 @@ using namespace ::com::sun::star;
namespace dbaxml
{
+ namespace {
+
class ODBExportHelper
{
public:
@@ -85,6 +87,8 @@ namespace dbaxml
static Sequence< OUString > getSupportedServiceNames_Static( );
static Reference< XInterface > Create(const Reference< css::lang::XMultiServiceFactory >&);
};
+
+ }
}
extern "C" void createRegistryInfo_ODBFilterExport( )
@@ -165,6 +169,8 @@ namespace dbaxml
}
}
+ namespace {
+
class OSpecialHandleXMLExportPropertyMapper : public SvXMLExportPropertyMapper
{
public:
@@ -184,6 +190,9 @@ namespace dbaxml
// nothing to do here
}
};
+
+ }
+
ODBExport::ODBExport(const Reference< XComponentContext >& _rxContext, OUString const & implementationName, SvXMLExportFlags nExportFlag)
: SvXMLExport( util::MeasureUnit::MM_10TH, _rxContext, implementationName, XML_DATABASE,
SvXMLExportFlags::OASIS | nExportFlag)
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index 80faab524164..2d5733dfee07 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -408,6 +408,8 @@ bool ODBFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
return bRet;
}
+namespace {
+
class DBXMLDocumentSettingsContext : public SvXMLImportContext
{
public:
@@ -541,6 +543,8 @@ public:
}
};
+}
+
SvXMLImportContext* ODBFilter::CreateDocumentContext(sal_uInt16 const nPrefix,
const OUString& rLocalName,
const uno::Reference< css::xml::sax::XAttributeList >& xAttrList )
diff --git a/dbaccess/source/sdbtools/connection/objectnames.cxx b/dbaccess/source/sdbtools/connection/objectnames.cxx
index f5b8455b037d..d067a042afa8 100644
--- a/dbaccess/source/sdbtools/connection/objectnames.cxx
+++ b/dbaccess/source/sdbtools/connection/objectnames.cxx
@@ -55,6 +55,8 @@ namespace sdbtools
namespace CommandType = ::com::sun::star::sdb::CommandType;
namespace ErrorCondition = ::com::sun::star::sdb::ErrorCondition;
+ namespace {
+
// INameValidation
class INameValidation
{
@@ -64,8 +66,13 @@ namespace sdbtools
virtual ~INameValidation() { }
};
+
+ }
+
typedef std::shared_ptr< INameValidation > PNameValidation;
+ namespace {
+
// PlainExistenceCheck
class PlainExistenceCheck : public INameValidation
{
@@ -263,6 +270,8 @@ namespace sdbtools
static void verifyCommandType( sal_Int32 _nCommandType );
};
+ }
+
void NameCheckFactory::verifyCommandType( sal_Int32 _nCommandType )
{
if ( ( _nCommandType != CommandType::TABLE )
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index f79c6d3e030f..df35c9a36111 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -179,6 +179,12 @@ Reference< XInterface > OApplicationController::Create(const Reference<XMultiSer
return *(new OApplicationController( comphelper::getComponentContext(_rxFactory)));
}
+namespace {
+
+class SelectionGuard;
+
+}
+
// OApplicationController
class SelectionNotifier
{
@@ -214,7 +220,7 @@ public:
m_aSelectionListeners.disposeAndClear( aEvent );
}
- struct SelectionGuardAccess { friend class SelectionGuard; private: SelectionGuardAccess() { } };
+ struct SelectionGuardAccess { friend SelectionGuard; private: SelectionGuardAccess() { } };
/** enters a block which modifies the selection of our owner.
@@ -243,6 +249,8 @@ public:
}
};
+namespace {
+
class SelectionGuard
{
public:
@@ -264,6 +272,8 @@ private:
SelectionNotifier& m_rNotifier;
};
+}
+
// OApplicationController
OApplicationController::OApplicationController(const Reference< XComponentContext >& _rxORB)
:OGenericUnoController( _rxORB )
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index 803f00f56e5a..818b423a205b 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -133,6 +133,8 @@ using namespace ::svt;
namespace dbaui
{
+namespace {
+
// OParameterContinuation
class OParameterContinuation : public OInteraction< XInteractionSupplyParameters >
{
@@ -147,6 +149,8 @@ public:
virtual void SAL_CALL setParameters( const Sequence< PropertyValue >& _rValues ) override;
};
+}
+
void SAL_CALL OParameterContinuation::setParameters( const Sequence< PropertyValue >& _rValues )
{
m_aValues = _rValues;
diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx
index 35df7976f0d6..5a5c46048f0a 100644
--- a/dbaccess/source/ui/browser/dbloader.cxx
+++ b/dbaccess/source/ui/browser/dbloader.cxx
@@ -62,6 +62,8 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::registry;
using namespace dbaui;
+namespace {
+
class DBContentLoader : public ::cppu::WeakImplHelper< XFrameLoader, XServiceInfo>
{
private:
@@ -92,6 +94,7 @@ public:
virtual void SAL_CALL cancel() override;
};
+}
DBContentLoader::DBContentLoader(const Reference< XComponentContext >& _rxContext)
:m_xContext(_rxContext)
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index 644c3417065e..a5dc5e061720 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -87,6 +87,8 @@ typedef std::unordered_map< sal_Int16, sal_Int16 > CommandHashMap;
namespace dbaui
{
+namespace {
+
// UserDefinedFeatures
class UserDefinedFeatures
{
@@ -99,6 +101,8 @@ private:
css::uno::WeakReference< XController > m_aController;
};
+}
+
UserDefinedFeatures::UserDefinedFeatures( const Reference< XController >& _rxController )
:m_aController( _rxController )
{
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 42ed0377446c..43655259bc06 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -1188,6 +1188,8 @@ void SbaGridControl::DoFieldDrag(sal_uInt16 nColumnPos, sal_Int16 nRowPos)
}
+ namespace {
+
/// unary_function Functor object for class ZZ returntype is void
struct SbaGridControlPrec
{
@@ -1204,6 +1206,9 @@ void SbaGridControl::DoFieldDrag(sal_uInt16 nColumnPos, sal_Int16 nRowPos)
return false;
}
};
+
+ }
+
sal_Int8 SbaGridControl::AcceptDrop( const BrowserAcceptDropEvent& rEvt )
{
sal_Int8 nAction = DND_ACTION_NONE;
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index c5cb06c6c645..40efd0d7485b 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -543,12 +543,16 @@ OUString ODbDataSourceAdministrationHelper::getConnectionURL() const
return sNewUrl;
}
+namespace {
+
struct PropertyValueLess
{
bool operator() (const PropertyValue& x, const PropertyValue& y) const
{ return x.Name < y.Name; } // construct prevents a MSVC6 warning
};
+}
+
typedef std::set<PropertyValue, PropertyValueLess> PropertyValueSet;
void ODbDataSourceAdministrationHelper::translateProperties(const Reference< XPropertySet >& _rxSource, SfxItemSet& _rDest)
diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx
index 0310967fa290..3a2804b3ac32 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.cxx
+++ b/dbaccess/source/ui/dlg/UserAdmin.cxx
@@ -50,6 +50,8 @@ using namespace dbaui;
using namespace ucbhelper;
using namespace comphelper;
+namespace {
+
class OPasswordDialog : public weld::GenericDialogController
{
std::unique_ptr<weld::Frame> m_xUser;
@@ -68,6 +70,8 @@ public:
OUString GetNewPassword() const { return m_xEDPassword->get_text(); }
};
+}
+
OPasswordDialog::OPasswordDialog(weld::Window* _pParent,const OUString& rUserName)
: GenericDialogController(_pParent, "dbaccess/ui/password.ui", "PasswordDialog")
, m_xUser(m_xBuilder->weld_frame("userframe"))
diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx
index e69987042145..04dceaa09259 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.cxx
+++ b/dbaccess/source/ui/dlg/adtabdlg.cxx
@@ -54,6 +54,8 @@ TableObjectListFacade::~TableObjectListFacade()
{
}
+namespace {
+
class TableListFacade : public ::cppu::BaseMutex
, public TableObjectListFacade
, public ::comphelper::OContainerListener
@@ -84,6 +86,8 @@ private:
virtual void _elementReplaced( const css::container::ContainerEvent& _rEvent ) override;
};
+}
+
TableListFacade::~TableListFacade()
{
if ( m_pContainerListener.is() )
@@ -233,6 +237,8 @@ bool TableListFacade::isLeafSelected() const
return bEntry && !rTableList.iter_has_child(*xEntry);
}
+namespace {
+
class QueryListFacade : public ::cppu::BaseMutex
, public TableObjectListFacade
, public ::comphelper::OContainerListener
@@ -261,6 +267,8 @@ private:
virtual void _elementReplaced( const css::container::ContainerEvent& _rEvent ) override;
};
+}
+
QueryListFacade::~QueryListFacade()
{
if ( m_pContainerListener.is() )
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx
index c48c4c224c12..047758341b58 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -260,6 +260,8 @@ namespace
}
}
+namespace {
+
class OExceptionChainDialog : public weld::GenericDialogController
{
std::unique_ptr<weld::TreeView> m_xExceptionList;
@@ -277,6 +279,8 @@ protected:
DECL_LINK(OnExceptionSelected, weld::TreeView&, void);
};
+}
+
OExceptionChainDialog::OExceptionChainDialog(weld::Window* pParent, const ExceptionDisplayChain& rExceptions)
: GenericDialogController(pParent, "dbaccess/ui/sqlexception.ui", "SQLExceptionDialog")
, m_xExceptionList(m_xBuilder->weld_tree_view("list"))
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index 98ec40a808b6..6be2d87fa9a9 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -387,6 +387,8 @@ OUString NamedTableCopySource::getSelectStatement() const
return const_cast< NamedTableCopySource* >( this )->impl_ensureStatement_throw();
}
+namespace {
+
// DummyCopySource
class DummyCopySource : public ICopyTableSourceObject
{
@@ -410,6 +412,8 @@ public:
getPreparedSelectStatement() const override;
};
+}
+
const DummyCopySource& DummyCopySource::Instance()
{
static DummyCopySource s_aTheInstance;
diff --git a/dbaccess/source/ui/misc/asyncmodaldialog.cxx b/dbaccess/source/ui/misc/asyncmodaldialog.cxx
index 2f1b3e27b194..3c59a58f8b85 100644
--- a/dbaccess/source/ui/misc/asyncmodaldialog.cxx
+++ b/dbaccess/source/ui/misc/asyncmodaldialog.cxx
@@ -32,6 +32,8 @@ namespace dbaui
using ::com::sun::star::lang::IllegalArgumentException;
using ::com::sun::star::uno::Exception;
+ namespace {
+
// AsyncDialogExecutor
class DialogExecutor_Impl
{
@@ -57,6 +59,8 @@ namespace dbaui
DECL_LINK( onExecute, void*, void );
};
+ }
+
IMPL_LINK_NOARG( DialogExecutor_Impl, onExecute, void*, void )
{
try
diff --git a/dbaccess/source/ui/misc/controllerframe.cxx b/dbaccess/source/ui/misc/controllerframe.cxx
index 4bd0c9e4426d..599398e5d00f 100644
--- a/dbaccess/source/ui/misc/controllerframe.cxx
+++ b/dbaccess/source/ui/misc/controllerframe.cxx
@@ -64,6 +64,9 @@ namespace dbaui
// FrameWindowActivationListener
typedef ::cppu::WeakImplHelper< XTopWindowListener
> FrameWindowActivationListener_Base;
+
+ namespace {
+
class FrameWindowActivationListener : public FrameWindowActivationListener_Base
{
public:
@@ -94,6 +97,8 @@ namespace dbaui
ControllerFrame_Data* m_pData;
};
+ }
+
// ControllerFrame_Data
struct ControllerFrame_Data
{
diff --git a/dbaccess/source/ui/misc/dbaundomanager.cxx b/dbaccess/source/ui/misc/dbaundomanager.cxx
index 0ee8e9985590..d8659ce6157d 100644
--- a/dbaccess/source/ui/misc/dbaundomanager.cxx
+++ b/dbaccess/source/ui/misc/dbaundomanager.cxx
@@ -78,6 +78,8 @@ namespace dbaui
return static_cast< XUndoManager* >( &rAntiImpl );
}
+ namespace {
+
// OslMutexFacade
class OslMutexFacade : public ::framework::IMutex
{
@@ -96,6 +98,8 @@ namespace dbaui
::osl::Mutex& m_rMutex;
};
+ }
+
void OslMutexFacade::acquire()
{
m_rMutex.acquire();
@@ -106,6 +110,8 @@ namespace dbaui
m_rMutex.release();
}
+ namespace {
+
// UndoManagerMethodGuard
/** guard for public UNO methods of the UndoManager
*/
@@ -133,6 +139,8 @@ namespace dbaui
OslMutexFacade m_aMutexFacade;
};
+ }
+
::framework::IMutex& UndoManagerMethodGuard::getGuardedMutex()
{
return m_aMutexFacade;
diff --git a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
index 505391d7cdb8..eb3331d6fe88 100644
--- a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
+++ b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
@@ -81,6 +81,8 @@ namespace dbaui
using ::com::sun::star::uno::UNO_QUERY_THROW;
using ::com::sun::star::frame::XUntitledNumbers;
+ namespace {
+
class DataSourceHolder
{
public:
@@ -116,6 +118,8 @@ namespace dbaui
Reference< XOfficeDatabaseDocument > m_xDocument;
};
+ }
+
struct DBSubComponentController_Impl
{
private:
diff --git a/dbaccess/source/ui/misc/dsmeta.cxx b/dbaccess/source/ui/misc/dsmeta.cxx
index 82ccab986fd6..045f5b10bcdc 100644
--- a/dbaccess/source/ui/misc/dsmeta.cxx
+++ b/dbaccess/source/ui/misc/dsmeta.cxx
@@ -31,6 +31,8 @@ namespace dbaui
using namespace dbaccess;
using namespace ::com::sun::star;
+ namespace {
+
struct FeatureSupport
{
// authentication mode of the data source
@@ -54,6 +56,8 @@ namespace dbaui
const sal_Char* pAsciiFeatureName;
};
+ }
+
// global tables
static const FeatureMapping* lcl_getFeatureMappings()
{
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index 1d6694c5bf99..3937c3d09d0d 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -96,6 +96,8 @@ namespace dbaui
using namespace ::com::sun::star::util;
using namespace ::com::sun::star::lang;
+ namespace {
+
class OViewController : public OQueryController
{
virtual OUString SAL_CALL getImplementationName() override
@@ -127,6 +129,8 @@ namespace dbaui
return *(new OViewController(comphelper::getComponentContext(_rM)));
}
};
+
+ }
}
extern "C" void createRegistryInfo_OViewControl()
diff --git a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
index bd8e33d436dc..9a2d0e652176 100644
--- a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
+++ b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
@@ -35,6 +35,8 @@ namespace dbaui
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::beans;
+ namespace {
+
// OAdvancedSettingsDialog
class OAdvancedSettingsDialog
:public ODatabaseAdministrationDialog
@@ -71,6 +73,8 @@ namespace dbaui
virtual std::unique_ptr<weld::DialogController> createDialog(const css::uno::Reference<css::awt::XWindow>& rParent) override;
};
+ }
+
OAdvancedSettingsDialog::OAdvancedSettingsDialog(const Reference< XComponentContext >& _rxORB)
:ODatabaseAdministrationDialog(_rxORB)
{
diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx
index edb6805853eb..90fb3cc95b4f 100644
--- a/dbaccess/source/ui/uno/copytablewizard.cxx
+++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@@ -142,6 +142,9 @@ namespace dbaui
typedef ::cppu::ImplInheritanceHelper< CopyTableWizard_DialogBase
, XCopyTableWizard
> CopyTableWizard_Base;
+
+ namespace {
+
class CopyTableWizard
:public CopyTableWizard_Base
,public ::comphelper::OPropertyArrayUsageHelper< CopyTableWizard >
@@ -372,6 +375,8 @@ private:
CopyTableWizard& m_rWizard;
};
+}
+
CopyTableWizard::CopyTableWizard( const Reference< XComponentContext >& _rxORB )
:CopyTableWizard_Base( _rxORB )
,m_xContext( _rxORB )
diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
index ff9e8a3dee0a..879a633cc00e 100644
--- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
+++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
@@ -51,12 +51,19 @@ namespace dbaui
// OTextConnectionSettingsDialog
+ namespace {
+
class OTextConnectionSettingsDialog;
+
+ }
+
typedef ::cppu::ImplInheritanceHelper< ODatabaseAdministrationDialog
, css::sdb::XTextConnectionSettings
> OTextConnectionSettingsDialog_BASE;
typedef ::comphelper::OPropertyArrayUsageHelper< OTextConnectionSettingsDialog > OTextConnectionSettingsDialog_PBASE;
+ namespace {
+
class OTextConnectionSettingsDialog
:public OTextConnectionSettingsDialog_BASE
,public OTextConnectionSettingsDialog_PBASE
@@ -108,6 +115,8 @@ namespace dbaui
using OTextConnectionSettingsDialog_BASE::getFastPropertyValue;
};
+ }
+
// OTextConnectionSettingsDialog
OTextConnectionSettingsDialog::OTextConnectionSettingsDialog( const Reference<XComponentContext>& _rContext )
:OTextConnectionSettingsDialog_BASE( _rContext )
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 2c2d03b967ea..242a539cf08e 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -1794,6 +1794,8 @@ void DesktopLOKTest::testRedlineCalc()
CPPUNIT_ASSERT_EQUAL(std::string("Cell B4 changed from '5' to 't'"), rRedline.second.get<std::string>("description"));
}
+namespace {
+
class ViewCallback
{
LibLODocument_Impl* mpDocument;
@@ -1864,6 +1866,8 @@ public:
}
};
+}
+
void DesktopLOKTest::testPaintPartTile()
{
// Load an impress doc of 2 slides.
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 82422c835210..f448d6e7e507 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1207,6 +1207,8 @@ void Desktop::AppEvent( const ApplicationEvent& rAppEvent )
HandleAppEvent( rAppEvent );
}
+namespace {
+
struct ExecuteGlobals
{
Reference < css::document::XDocumentEventListener > xGlobalBroadcaster;
@@ -1221,6 +1223,8 @@ struct ExecuteGlobals
{}
};
+}
+
static ExecuteGlobals* pExecGlobals = nullptr;
int Desktop::Main()
@@ -1888,6 +1892,7 @@ void Desktop::OverrideSystemSettings( AllSettings& rSettings )
rSettings.SetStyleSettings ( hStyleSettings );
}
+namespace {
class ExitTimer : public Timer
{
@@ -1903,6 +1908,8 @@ class ExitTimer : public Timer
}
};
+}
+
IMPL_LINK_NOARG(Desktop, OpenClients_Impl, void*, void)
{
try {
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index 642733efceb2..dc2095a14af5 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -175,6 +175,8 @@ void Desktop::createAcceptor(const OUString& aAcceptString)
}
}
+namespace {
+
class enable
{
private:
@@ -190,6 +192,8 @@ class enable
}
};
+}
+
// enable acceptors
IMPL_STATIC_LINK_NOARG(Desktop, EnableAcceptors_Impl, void*, void)
{
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index f3857d8cff57..ade5ad25acc8 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -83,6 +83,8 @@ namespace document = ::com::sun::star::document;
namespace desktop
{
+namespace {
+
struct DispatchHolder
{
DispatchHolder( const URL& rURL, Reference< XDispatch > const & rDispatch ) :
@@ -92,9 +94,6 @@ struct DispatchHolder
Reference< XDispatch > xDispatch;
};
-namespace
-{
-
std::shared_ptr<const SfxFilter> impl_lookupExportFilterForUrl( const OUString& rUrl, const OUString& rFactory )
{
// create the list of filters
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index e375c17f683c..5a79206c96ee 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -266,6 +266,8 @@ static OUString CreateMD5FromString( const OUString& aMsg )
return OUString();
}
+namespace {
+
class ProcessEventsClass_Impl
{
public:
@@ -273,6 +275,8 @@ public:
DECL_STATIC_LINK( ProcessEventsClass_Impl, ProcessDocumentsEvent, void*, void );
};
+}
+
IMPL_STATIC_LINK( ProcessEventsClass_Impl, CallEvent, void*, pEvent, void )
{
// Application events are processed by the Desktop::HandleAppEvent implementation.
@@ -1300,6 +1304,8 @@ static void AddConversionsToDispatchList(
}
}
+namespace {
+
struct ConditionSetGuard
{
osl::Condition* m_pCondition;
@@ -1307,6 +1313,8 @@ struct ConditionSetGuard
~ConditionSetGuard() { if (m_pCondition) m_pCondition->set(); }
};
+}
+
bool RequestHandler::ExecuteCmdLineRequests(
ProcessDocumentsRequest& aRequest, bool noTerminate)
{
diff --git a/desktop/source/deployment/dp_log.cxx b/desktop/source/deployment/dp_log.cxx
index 3cfdb338d9b7..000dc46b347c 100644
--- a/desktop/source/deployment/dp_log.cxx
+++ b/desktop/source/deployment/dp_log.cxx
@@ -46,6 +46,7 @@ namespace dp_log {
typedef ::cppu::WeakComponentImplHelper<ucb::XProgressHandler> t_log_helper;
+namespace {
class ProgressLogImpl : public ::dp_misc::MutexHolder, public t_log_helper
{
@@ -65,6 +66,7 @@ public:
virtual void SAL_CALL pop() override;
};
+}
ProgressLogImpl::~ProgressLogImpl()
{
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index e48bb2d0912d..5fb33529c395 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -87,6 +87,7 @@ namespace dp_gui {
#define SHARED_PACKAGE_MANAGER "shared"
#define BUNDLED_PACKAGE_MANAGER "bundled"
+namespace {
struct StrAllFiles : public rtl::StaticWithInit< OUString, StrAllFiles >
{
@@ -97,6 +98,8 @@ struct StrAllFiles : public rtl::StaticWithInit< OUString, StrAllFiles >
}
};
+}
+
// ExtBoxWithBtns_Impl
class ExtBoxWithBtns_Impl : public ExtensionBox_Impl
{
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index 31f29368708e..179304795611 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -109,6 +109,7 @@ OUString getVersion( const uno::Reference< deployment::XPackage > &rPackage )
namespace dp_gui {
+namespace {
class ProgressCmdEnv
: public ::cppu::WeakImplHelper< ucb::XCommandEnvironment,
@@ -199,6 +200,8 @@ struct ExtensionCmd
m_vExtensionList( vExtensionList ) {};
};
+}
+
typedef std::shared_ptr< ExtensionCmd > TExtensionCmd;
diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx
index 10325631d6a2..fbcb4ed13232 100644
--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_service.cxx
@@ -49,6 +49,7 @@ namespace sdecl = comphelper::service_decl;
namespace dp_gui {
+namespace {
class MyApp : public Application
{
@@ -63,6 +64,8 @@ public:
virtual void DeInit() override;
};
+}
+
MyApp::MyApp()
{
}
@@ -133,6 +136,7 @@ static OUString ReplaceProductNameHookProc( const OUString& rStr )
return sRet;
}
+namespace {
class ServiceImpl
: public ::cppu::WeakImplHelper<ui::dialogs::XAsynchronousExecutableDialog,
@@ -157,6 +161,7 @@ public:
virtual void SAL_CALL trigger( OUString const & event ) override;
};
+}
ServiceImpl::ServiceImpl( Sequence<Any> const& args,
Reference<XComponentContext> const& xComponentContext)
diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx
index 9ab343730d89..7f7f14402278 100644
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@@ -41,6 +41,8 @@ using namespace ::com::sun::star::uno;
namespace dp_gui {
+namespace {
+
struct LicenseDialogImpl : public weld::GenericDialogController
{
bool m_bLicenseRead;
@@ -74,6 +76,8 @@ struct LicenseDialogImpl : public weld::GenericDialogController
bool IsEndReached() const;
};
+}
+
LicenseDialogImpl::LicenseDialogImpl(
weld::Window * pParent,
const OUString & sExtensionName,
diff --git a/desktop/source/deployment/manager/dp_informationprovider.cxx b/desktop/source/deployment/manager/dp_informationprovider.cxx
index 5eafb605c91a..2866d0dccac3 100644
--- a/desktop/source/deployment/manager/dp_informationprovider.cxx
+++ b/desktop/source/deployment/manager/dp_informationprovider.cxx
@@ -61,6 +61,8 @@ namespace xml = com::sun::star::xml ;
namespace dp_info {
+namespace {
+
class PackageInformationProvider :
public ::cppu::WeakImplHelper< deployment::XPackageInformationProvider >
@@ -83,6 +85,7 @@ private:
uno::Reference< deployment::XUpdateInformationProvider > mxUpdateInformation;
};
+}
PackageInformationProvider::PackageInformationProvider( uno::Reference< uno::XComponentContext > const& xContext) :
mxContext( xContext ),
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index ac814592daf8..7c79ab43405e 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -90,6 +90,8 @@ extern comphelper::service_decl::ServiceDecl const serviceDecl;
namespace dp_manager {
+namespace {
+
struct MatchTempDir
{
OUString m_str;
@@ -99,8 +101,6 @@ struct MatchTempDir
}
};
-
-namespace {
OUString getExtensionFolder(OUString const & parentFolder,
Reference<ucb::XCommandEnvironment> const & xCmdEnv,
Reference<uno::XComponentContext> const & xContext)
diff --git a/desktop/source/deployment/manager/dp_managerfac.cxx b/desktop/source/deployment/manager/dp_managerfac.cxx
index 5b7c7e11a3f0..f284c7e3cceb 100644
--- a/desktop/source/deployment/manager/dp_managerfac.cxx
+++ b/desktop/source/deployment/manager/dp_managerfac.cxx
@@ -36,6 +36,7 @@ namespace factory {
typedef ::cppu::WeakComponentImplHelper<
deployment::XPackageManagerFactory > t_pmfac_helper;
+namespace {
class PackageManagerFactoryImpl : private MutexHolder, public t_pmfac_helper
{
@@ -63,6 +64,7 @@ public:
OUString const & context ) override;
};
+}
namespace sdecl = comphelper::service_decl;
sdecl::class_<PackageManagerFactoryImpl> const servicePMFI;
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
index 0701a3492e86..4b66e51ede80 100644
--- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
+++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
@@ -48,6 +48,7 @@ namespace backend
namespace sfwk
{
+namespace {
class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
{
@@ -103,6 +104,8 @@ public:
virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) override;
};
+}
+
BackendImpl * BackendImpl::PackageImpl::getMyBackend() const
{
BackendImpl * pBackend = static_cast<BackendImpl *>(m_myBackend.get());
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 1e97c1aecc4b..9298be14c0dc 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -177,12 +177,16 @@ static void SetLastExceptionMsg(const OUString& s = OUString())
gImpl->maLastExceptionMsg = s;
}
+namespace {
+
struct ExtensionMap
{
const char *extn;
const char *filterName;
};
+}
+
static const ExtensionMap aWriterExtensionMap[] =
{
{ "doc", "MS Word 97" },
@@ -3237,6 +3241,8 @@ static size_t doc_renderShapeSelection(LibreOfficeKitDocument* pThis, char** pOu
return 0;
}
+namespace {
+
/** Class to react on finishing of a dispatched command.
This will call a LOK_COMMAND_FINISHED callback when postUnoCommand was
@@ -3279,6 +3285,8 @@ public:
virtual void SAL_CALL disposing(const css::lang::EventObject&) override {}
};
+}
+
static void doc_sendDialogEvent(LibreOfficeKitDocument* /*pThis*/, unsigned nWindowId, const char* pArguments)
{
SolarMutexGuard aGuard;
@@ -5410,6 +5418,8 @@ static void preloadData()
rtl::Bootstrap::set("UserInstallation", sUserPath);
}
+namespace {
+
class ProfileZoneDumper : public AutoTimer
{
static const int dumpTimeoutMS = 5000;
@@ -5435,6 +5445,8 @@ public:
}
};
+}
+
static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char* pUserProfileUrl)
{
enum {
diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx
index 034a526a810f..e0c13c7767ee 100644
--- a/desktop/source/migration/services/jvmfwk.cxx
+++ b/desktop/source/migration/services/jvmfwk.cxx
@@ -58,6 +58,8 @@ using namespace com::sun::star::configuration::backend;
namespace migration
{
+namespace {
+
class JavaMigration : public ::cppu::WeakImplHelper<
css::lang::XServiceInfo,
css::lang::XInitialization,
@@ -140,6 +142,8 @@ private:
};
+}
+
JavaMigration::~JavaMigration()
{
OSL_ASSERT(m_aStack.empty());
diff --git a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
index a6f53af028fa..b47ffc6cda69 100644
--- a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
+++ b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
@@ -44,6 +44,8 @@ namespace drawinglayer
{
namespace unorenderer
{
+ namespace {
+
class XPrimitive2DRenderer:
public cppu::WeakAggImplHelper2<
css::graphic::XPrimitive2DRenderer, css::lang::XServiceInfo>
@@ -68,6 +70,8 @@ namespace drawinglayer
virtual sal_Bool SAL_CALL supportsService(const OUString&) override;
virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
};
+
+ }
} // end of namespace unorenderer
} // end of namespace drawinglayer
diff --git a/drawinglayer/source/primitive2d/baseprimitive2d.cxx b/drawinglayer/source/primitive2d/baseprimitive2d.cxx
index b19d90783744..4db80991dd93 100644
--- a/drawinglayer/source/primitive2d/baseprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/baseprimitive2d.cxx
@@ -52,6 +52,8 @@ namespace drawinglayer
return (getPrimitive2DID() == rPrimitive.getPrimitive2DID());
}
+ namespace {
+
// Visitor class to get the B2D range from a tree of Primitive2DReference's
//
class B2DRangeVisitor : public Primitive2DDecompositionVisitor {
@@ -69,6 +71,9 @@ namespace drawinglayer
maRetval.expand(r.getB2DRange(mrViewInformation));
}
};
+
+ }
+
basegfx::B2DRange BasePrimitive2D::getB2DRange(const geometry::ViewInformation2D& rViewInformation) const
{
B2DRangeVisitor aVisitor(rViewInformation);
diff --git a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
index 421e1a5a19e2..75de37a701c6 100644
--- a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
+++ b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
@@ -45,6 +45,8 @@ namespace drawinglayer
{
namespace primitive2d
{
+ namespace {
+
class AnimatedGraphicPrimitive2D : public AnimatedSwitchPrimitive2D
{
private:
@@ -339,6 +341,8 @@ namespace drawinglayer
virtual void get2DDecomposition(Primitive2DDecompositionVisitor& rVisitor, const geometry::ViewInformation2D& rViewInformation) const override;
};
+ }
+
AnimatedGraphicPrimitive2D::AnimatedGraphicPrimitive2D(
const Graphic& rGraphic,
const basegfx::B2DHomMatrix& rTransform)
diff --git a/drawinglayer/source/tools/wmfemfhelper.cxx b/drawinglayer/source/tools/wmfemfhelper.cxx
index 88755d2e9d2e..485000f3cf76 100644
--- a/drawinglayer/source/tools/wmfemfhelper.cxx
+++ b/drawinglayer/source/tools/wmfemfhelper.cxx
@@ -58,6 +58,8 @@ namespace drawinglayer
{
namespace primitive2d
{
+ namespace {
+
/** NonOverlappingFillGradientPrimitive2D class
This is a special version of the FillGradientPrimitive2D which decomposes
@@ -85,6 +87,8 @@ namespace drawinglayer
}
};
+ }
+
void NonOverlappingFillGradientPrimitive2D::create2DDecomposition(
Primitive2DContainer& rContainer,
const geometry::ViewInformation2D& /*rViewInformation*/) const
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index c68c79ebea8f..62ba3b0f7905 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -837,6 +837,8 @@ namespace accessibility
return aNames;
}
+ namespace {
+
struct IndexCompare
{
const PropertyValue* pValues;
@@ -846,6 +848,8 @@ namespace accessibility
return pValues[a].Name < pValues[b].Name;
}
};
+
+ }
}
namespace
diff --git a/editeng/source/accessibility/AccessibleParaManager.cxx b/editeng/source/accessibility/AccessibleParaManager.cxx
index 8a7ce274e5d0..5d6be4dd60b5 100644
--- a/editeng/source/accessibility/AccessibleParaManager.cxx
+++ b/editeng/source/accessibility/AccessibleParaManager.cxx
@@ -267,6 +267,8 @@ namespace accessibility
nStateId ) );
}
+ namespace {
+
// not generic yet, no arguments...
class AccessibleParaManager_DisposeChildren
{
@@ -278,6 +280,8 @@ namespace accessibility
}
};
+ }
+
void AccessibleParaManager::Dispose()
{
AccessibleParaManager_DisposeChildren aFunctor;
@@ -286,6 +290,8 @@ namespace accessibility
WeakChildAdapter< AccessibleParaManager_DisposeChildren > (aFunctor) );
}
+ namespace {
+
// not generic yet, too many method arguments...
class StateChangeEvent
{
@@ -308,6 +314,8 @@ namespace accessibility
const uno::Any& mrOldValue;
};
+ }
+
void AccessibleParaManager::FireEvent( sal_Int32 nStartPara,
sal_Int32 nEndPara,
const sal_Int16 nEventId,
@@ -337,6 +345,8 @@ namespace accessibility
}
}
+ namespace {
+
class ReleaseChild
{
public:
@@ -349,6 +359,8 @@ namespace accessibility
}
};
+ }
+
void AccessibleParaManager::Release( sal_Int32 nStartPara, sal_Int32 nEndPara )
{
DBG_ASSERT( 0 <= nStartPara && 0 <= nEndPara &&
diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
index c85cc3c9a589..8cef86269d1d 100644
--- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx
+++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
@@ -64,6 +64,8 @@ namespace accessibility
{
typedef std::vector< beans::PropertyValue > PropertyValueVector;
+ namespace {
+
class PropertyValueEqualFunctor
{
const beans::PropertyValue& m_rPValue;
@@ -77,6 +79,9 @@ namespace accessibility
return ( m_rPValue.Name == rhs.Name && m_rPValue.Value == rhs.Value );
}
};
+
+ }
+
sal_Unicode const cNewLine(0x0a);
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index ad09f1d543dc..2128434ed05d 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -88,6 +88,8 @@ using namespace ::com::sun::star::linguistic2;
#define WRONG_SHOW_MIN 5
+namespace {
+
struct TabInfo
{
bool bValid;
@@ -106,6 +108,8 @@ struct TabInfo
};
+}
+
Point Rotate( const Point& rPoint, short nOrientation, const Point& rOrigin )
{
double nRealOrientation = nOrientation*F_PI1800;
diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx
index 2f9119a0f143..58cc0ddab5da 100644
--- a/editeng/source/items/svxfont.cxx
+++ b/editeng/source/items/svxfont.cxx
@@ -571,6 +571,8 @@ SvxFont& SvxFont::operator=( const SvxFont& rFont )
return *this;
}
+namespace {
+
class SvxDoGetCapitalSize : public SvxDoCapitals
{
protected:
@@ -592,6 +594,8 @@ public:
const Size &GetSize() const { return aTxtSize; };
};
+}
+
void SvxDoGetCapitalSize::Do( const OUString &_rTxt, const sal_Int32 _nIdx,
const sal_Int32 _nLen, const bool bUpper )
{
@@ -633,6 +637,8 @@ Size SvxFont::GetCapitalSize( const OutputDevice *pOut, const OUString &rTxt,
return aTxtSize;
}
+namespace {
+
class SvxDoDrawCapital : public SvxDoCapitals
{
protected:
@@ -656,6 +662,8 @@ public:
const sal_Int32 nLen, const bool bUpper ) override;
};
+}
+
void SvxDoDrawCapital::DoSpace( const bool bDraw )
{
if ( bDraw || pFont->IsWordLineMode() )
diff --git a/editeng/source/misc/txtrange.cxx b/editeng/source/misc/txtrange.cxx
index 2158e48b0cc6..712eea464024 100644
--- a/editeng/source/misc/txtrange.cxx
+++ b/editeng/source/misc/txtrange.cxx
@@ -88,6 +88,8 @@ void TextRanger::SetVertical( bool bNew )
}
}
+namespace {
+
//! SvxBoundArgs is used to perform temporary calculations on a range array.
//! Temporary instances are created in TextRanger::GetTextRanges()
class SvxBoundArgs
@@ -140,6 +142,8 @@ public:
bool IsConcat() const { return bConcat; }
};
+}
+
SvxBoundArgs::SvxBoundArgs( TextRanger* pRanger, LongDqPtr pLong,
const Range& rRange )
: pLongArr(pLong)
diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index 10c184aaa2f7..8aa7a229bc64 100644
--- a/editeng/source/misc/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -72,6 +72,8 @@ static uno::Reference< XLinguServiceManager2 > GetLngSvcMgr_Impl()
return xRes;
}
+namespace {
+
//! Dummy implementation in order to avoid loading of lingu DLL
//! when only the XSupportedLocales interface is used.
//! The dummy accesses the real implementation (and thus loading the DLL)
@@ -103,6 +105,7 @@ public:
const css::uno::Sequence< css::beans::PropertyValue >& rProperties ) override;
};
+}
void ThesDummy_Impl::GetCfgLocales()
{
@@ -186,6 +189,7 @@ uno::Sequence< uno::Reference< linguistic2::XMeaning > > SAL_CALL
return aRes;
}
+namespace {
//! Dummy implementation in order to avoid loading of lingu DLL.
//! The dummy accesses the real implementation (and thus loading the DLL)
@@ -214,6 +218,7 @@ public:
const css::uno::Sequence< css::beans::PropertyValue >& rProperties ) override;
};
+}
void SpellDummy_Impl::GetSpell_Impl()
{
@@ -270,6 +275,7 @@ uno::Reference< linguistic2::XSpellAlternatives > SAL_CALL
return xRes;
}
+namespace {
//! Dummy implementation in order to avoid loading of lingu DLL.
//! The dummy accesses the real implementation (and thus loading the DLL)
@@ -311,6 +317,7 @@ public:
const css::uno::Sequence< css::beans::PropertyValue >& rProperties ) override;
};
+}
void HyphDummy_Impl::GetHyph_Impl()
{
diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx
index 915fe7193eaa..c7ac1bc3786b 100644
--- a/editeng/source/uno/unoedprx.cxx
+++ b/editeng/source/uno/unoedprx.cxx
@@ -45,6 +45,7 @@
using namespace ::com::sun::star;
+namespace {
class SvxAccessibleTextIndex
{
@@ -120,6 +121,8 @@ private:
bool mbInBullet;
};
+}
+
static ESelection MakeEESelection( const SvxAccessibleTextIndex& rStart, const SvxAccessibleTextIndex& rEnd )
{
// deal with field special case: to really get a field contained
diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx
index 3742a02a1db5..dea25ce79a08 100644
--- a/editeng/source/uno/unonrule.cxx
+++ b/editeng/source/uno/unonrule.cxx
@@ -494,12 +494,16 @@ css::uno::Reference< css::container::XIndexReplace > SvxCreateNumRule(const SvxN
}
}
+namespace {
+
class SvxUnoNumberingRulesCompare : public ::cppu::WeakAggImplHelper1< XAnyCompare >
{
public:
virtual sal_Int16 SAL_CALL compare( const Any& Any1, const Any& Any2 ) override;
};
+}
+
sal_Int16 SAL_CALL SvxUnoNumberingRulesCompare::compare( const Any& Any1, const Any& Any2 )
{
return SvxUnoNumberingRules::Compare( Any1, Any2 );
diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx
index 646d6819b1d3..89ab645e3283 100644
--- a/editeng/source/xml/xmltxtexp.cxx
+++ b/editeng/source/xml/xmltxtexp.cxx
@@ -248,6 +248,7 @@ void SAL_CALL SvxSimpleUnoModel::removeEventListener( const css::uno::Reference<
{
}
+namespace {
class SvxXMLTextExportComponent : public SvXMLExport
{
@@ -268,6 +269,7 @@ private:
css::uno::Reference< css::text::XText > mxText;
};
+}
SvxXMLTextExportComponent::SvxXMLTextExportComponent(
const css::uno::Reference< css::uno::XComponentContext >& xContext,
diff --git a/editeng/source/xml/xmltxtimp.cxx b/editeng/source/xml/xmltxtimp.cxx
index b3e40380fba0..ac28c0d6b457 100644
--- a/editeng/source/xml/xmltxtimp.cxx
+++ b/editeng/source/xml/xmltxtimp.cxx
@@ -55,6 +55,7 @@ using namespace com::sun::star::text;
using namespace cppu;
using namespace xmloff::token;
+namespace {
class SvxXMLTextImportContext : public SvXMLImportContext
{
@@ -67,6 +68,7 @@ private:
const uno::Reference< XText > mxText;
};
+}
SvxXMLTextImportContext::SvxXMLTextImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< XText >& xText )
: SvXMLImportContext( rImport, nPrfx, rLName ), mxText( xText )
@@ -97,6 +99,7 @@ SvXMLImportContextRef SvxXMLTextImportContext::CreateChildContext( sal_uInt16 nP
return pContext;
}
+namespace {
class SvxXMLXTextImportComponent : public SvXMLImport
{
@@ -112,6 +115,8 @@ private:
const uno::Reference< XText > mxText;
};
+}
+
SvXMLImportContext *SvxXMLXTextImportComponent::CreateDocumentContext(
sal_uInt16 const nPrefix, const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList >& /*xAttrList*/)
diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx
index 6b9bb85ea5e0..4c35ffc156e6 100644
--- a/embeddedobj/source/general/docholder.cxx
+++ b/embeddedobj/source/general/docholder.cxx
@@ -73,6 +73,8 @@
using namespace ::com::sun::star;
+namespace {
+
class IntCounterGuard
{
sal_Int32& m_rFlag;
@@ -90,6 +92,8 @@ public:
}
};
+}
+
static void InsertMenu_Impl( const uno::Reference< container::XIndexContainer >& xTargetMenu,
sal_Int32 nTargetIndex,
const uno::Reference< container::XIndexAccess >& xSourceMenu,
diff --git a/embeddedobj/source/msole/ownview.cxx b/embeddedobj/source/msole/ownview.cxx
index 7d938cfd15ba..3344bc6804ed 100644
--- a/embeddedobj/source/msole/ownview.cxx
+++ b/embeddedobj/source/msole/ownview.cxx
@@ -49,6 +49,8 @@
using namespace ::com::sun::star;
using namespace ::comphelper;
+namespace {
+
class DummyHandler_Impl : public ::cppu::WeakImplHelper< task::XInteractionHandler >
{
public:
@@ -57,6 +59,7 @@ public:
virtual void SAL_CALL handle( const uno::Reference< task::XInteractionRequest >& xRequest ) override;
};
+}
void SAL_CALL DummyHandler_Impl::handle( const uno::Reference< task::XInteractionRequest >& )
{
diff --git a/emfio/source/emfuno/xemfparser.cxx b/emfio/source/emfuno/xemfparser.cxx
index f28633a73446..c5aad2411b2b 100644
--- a/emfio/source/emfuno/xemfparser.cxx
+++ b/emfio/source/emfuno/xemfparser.cxx
@@ -55,6 +55,8 @@ namespace emfio
{
namespace emfreader
{
+ namespace {
+
class XEmfParser : public ::cppu::WeakAggImplHelper2< graphic::XEmfParser, lang::XServiceInfo >
{
private:
@@ -78,6 +80,8 @@ namespace emfio
virtual sal_Bool SAL_CALL supportsService(const OUString&) override;
virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
};
+
+ }
} // end of namespace emfreader
} // end of namespace emfio
diff --git a/eventattacher/source/eventattacher.cxx b/eventattacher/source/eventattacher.cxx
index 2ade05a1fd25..1a8af4411fd4 100644
--- a/eventattacher/source/eventattacher.cxx
+++ b/eventattacher/source/eventattacher.cxx
@@ -62,6 +62,8 @@ namespace comp_EventAttacher {
// class InvocationToAllListenerMapper
// helper class to map XInvocation to XAllListener
+namespace {
+
class InvocationToAllListenerMapper : public WeakImplHelper< XInvocation >
{
public:
@@ -82,6 +84,7 @@ private:
Any m_Helper;
};
+}
// Function to replace AllListenerAdapterService::createAllListerAdapter
static Reference< XInterface > createAllListenerAdapter
@@ -199,6 +202,8 @@ sal_Bool SAL_CALL InvocationToAllListenerMapper::hasProperty(const OUString& Nam
// class EventAttacherImpl
// represents an implementation of the EventAttacher service
+namespace {
+
class EventAttacherImpl : public WeakImplHelper < XEventAttacher2, XInitialization, XServiceInfo >
{
public:
@@ -269,6 +274,7 @@ private:
Reference< XInvocationAdapterFactory2 > getInvocationAdapterService();
};
+}
EventAttacherImpl::EventAttacherImpl( const Reference< XComponentContext >& rxContext )
: m_xContext( rxContext )
@@ -403,6 +409,7 @@ Reference< XTypeConverter > EventAttacherImpl::getConverter()
return m_xConverter;
}
+namespace {
// Implementation of an EventAttacher-related AllListeners, which brings
// a few Events to a general AllListener
@@ -430,6 +437,7 @@ private:
Reference< XAllListener > m_AllListener;
};
+}
FilterAllListenerImpl::FilterAllListenerImpl( EventAttacherImpl * pEA_, const OUString& EventMethod_,
const Reference< XAllListener >& AllListener_ )
diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
index dc861bbeb3e3..6edbddd3c744 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -75,6 +75,8 @@ using namespace ::com::sun::star::frame;
static Reference< XInterface > BibliographyLoader_CreateInstance( const Reference< XMultiServiceFactory > & rSMgr );
+namespace {
+
class BibliographyLoader : public cppu::WeakImplHelper
< XServiceInfo, XNameAccess, XPropertySet, XFrameLoader >
{
@@ -130,7 +132,7 @@ public:
static Sequence<OUString> getSupportedServiceNames_Static() throw( );
/// @throws Exception
- friend Reference< XInterface > BibliographyLoader_CreateInstance( const Reference< XMultiServiceFactory > & rSMgr );
+ friend Reference< XInterface > (::BibliographyLoader_CreateInstance)( const Reference< XMultiServiceFactory > & rSMgr );
// XLoader
virtual void SAL_CALL load(const Reference< XFrame > & aFrame, const OUString& aURL,
@@ -139,6 +141,8 @@ public:
virtual void SAL_CALL cancel() override;
};
+}
+
BibliographyLoader::BibliographyLoader() :
m_pBibMod(nullptr)
{
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 8364deb9e657..c9ccfc133919 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -179,6 +179,8 @@ static Reference< XNameAccess > getColumns(const Reference< XForm > & _rxForm)
return xReturn;
}
+namespace {
+
class MappingDialog_Impl : public weld::GenericDialogController
{
BibDataManager* pDatMan;
@@ -227,6 +229,8 @@ public:
MappingDialog_Impl(weld::Window* pParent, BibDataManager* pDatMan);
};
+}
+
static sal_uInt16 lcl_FindLogicalName(BibConfig const * pConfig ,
const OUString& rLogicalColumnName)
{
@@ -397,6 +401,8 @@ IMPL_LINK_NOARG(MappingDialog_Impl, OkHdl, weld::Button&, void)
m_xDialog->response(bModified ? RET_OK : RET_CANCEL);
}
+namespace {
+
class DBChangeDialog_Impl : public weld::GenericDialogController
{
DBChangeDialogConfig_Impl aConfig;
@@ -411,6 +417,8 @@ public:
OUString GetCurrentURL()const;
};
+}
+
DBChangeDialog_Impl::DBChangeDialog_Impl(weld::Window* pParent, BibDataManager* pMan )
: GenericDialogController(pParent, "modules/sbibliography/ui/choosedatasourcedialog.ui", "ChooseDataSourceDialog")
, pDatMan(pMan)
diff --git a/extensions/source/bibliography/formcontrolcontainer.cxx b/extensions/source/bibliography/formcontrolcontainer.cxx
index fcb4851d91bc..4a9c23d0c97d 100644
--- a/extensions/source/bibliography/formcontrolcontainer.cxx
+++ b/extensions/source/bibliography/formcontrolcontainer.cxx
@@ -71,6 +71,8 @@ namespace bib
m_xForm = _rxForm;
}
+ namespace {
+
struct ControlModeSwitch
{
bool bDesign;
@@ -83,6 +85,8 @@ namespace bib
}
};
+ }
+
void FormControlContainer::implSetDesignMode( bool _bDesign )
{
try
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index a36efe9b550a..80d2ae7b8f52 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -60,6 +60,7 @@ using namespace com::sun::star::frame;
using namespace com::sun::star::uno;
using namespace com::sun::star;
+namespace {
struct DispatchInfo
{
@@ -74,6 +75,8 @@ struct CacheDispatchInfo
bool bActiveConnection;
};
+}
+
// Attention: commands must be sorted by command groups. Implementation is dependent
// on this!!
static const DispatchInfo SupportedCommandsArray[] =
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx
index 11163a1227be..450bcc9ef882 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -70,6 +70,8 @@ static OUString lcl_GetColumnName( const Mapping* pMapping, sal_uInt16 nIndexPos
return sRet;
}
+namespace {
+
class BibPosListener :public cppu::WeakImplHelper <sdbc::XRowSetListener>
{
VclPtr<BibGeneralPage> pParentPage;
@@ -86,6 +88,8 @@ public:
};
+}
+
BibPosListener::BibPosListener(BibGeneralPage* pParent) :
pParentPage(pParent)
{
diff --git a/extensions/source/logging/consolehandler.cxx b/extensions/source/logging/consolehandler.cxx
index a241126cc7d6..d1455baa3178 100644
--- a/extensions/source/logging/consolehandler.cxx
+++ b/extensions/source/logging/consolehandler.cxx
@@ -50,6 +50,9 @@ namespace logging
typedef ::cppu::WeakComponentImplHelper < XConsoleHandler
, XServiceInfo
> ConsoleHandler_Base;
+
+ namespace {
+
class ConsoleHandler :public ::cppu::BaseMutex
,public ConsoleHandler_Base
{
@@ -91,6 +94,8 @@ namespace logging
void leaveMethod( MethodGuard::Access );
};
+ }
+
ConsoleHandler::ConsoleHandler(const Reference<XComponentContext> &context,
const css::uno::Sequence<css::uno::Any> &arguments)
:ConsoleHandler_Base( m_aMutex )
diff --git a/extensions/source/logging/csvformatter.cxx b/extensions/source/logging/csvformatter.cxx
index bce6922dcb62..42c51a348701 100644
--- a/extensions/source/logging/csvformatter.cxx
+++ b/extensions/source/logging/csvformatter.cxx
@@ -39,6 +39,8 @@ namespace logging
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::logging::LogRecord;
+ namespace {
+
// formats for csv files as defined by RFC4180
class CsvFormatter : public cppu::WeakImplHelper<css::logging::XCsvLogFormatter, css::lang::XServiceInfo>
{
@@ -79,6 +81,8 @@ namespace logging
bool m_MultiColumn;
css::uno::Sequence< OUString > m_Columnnames;
};
+
+ }
} // namespace logging
// private helpers
diff --git a/extensions/source/logging/filehandler.cxx b/extensions/source/logging/filehandler.cxx
index bec33521418c..cd62535ad15c 100644
--- a/extensions/source/logging/filehandler.cxx
+++ b/extensions/source/logging/filehandler.cxx
@@ -60,6 +60,9 @@ namespace logging
typedef ::cppu::WeakComponentImplHelper < XLogHandler
, XServiceInfo
> FileHandler_Base;
+
+ namespace {
+
class FileHandler :public ::cppu::BaseMutex
,public FileHandler_Base
{
@@ -122,6 +125,8 @@ namespace logging
void impl_doStringsubstitution_nothrow( OUString& _inout_rURL );
};
+ }
+
FileHandler::FileHandler(const css::uno::Reference<XComponentContext> &context,
const css::uno::Sequence<css::uno::Any> &arguments)
:FileHandler_Base( m_aMutex )
diff --git a/extensions/source/logging/logger.cxx b/extensions/source/logging/logger.cxx
index 43dbe1a3a2a2..1770ca377175 100644
--- a/extensions/source/logging/logger.cxx
+++ b/extensions/source/logging/logger.cxx
@@ -49,6 +49,8 @@ namespace logging
using ::com::sun::star::logging::XLogHandler;
using ::com::sun::star::logging::LogRecord;
+ namespace {
+
class EventLogger : public cppu::BaseMutex,
public cppu::WeakImplHelper<css::logging::XLogger>
{
@@ -110,6 +112,8 @@ namespace logging
virtual Reference< XLogger > SAL_CALL getDefaultLogger( ) override;
};
+ }
+
EventLogger::EventLogger( const Reference< XComponentContext >& _rxContext, const OUString& _rName )
:m_aHandlers( m_aMutex )
,m_nEventNumber( 0 )
diff --git a/extensions/source/logging/plaintextformatter.cxx b/extensions/source/logging/plaintextformatter.cxx
index 58884a36512c..23392b61c491 100644
--- a/extensions/source/logging/plaintextformatter.cxx
+++ b/extensions/source/logging/plaintextformatter.cxx
@@ -38,6 +38,8 @@ namespace logging
using ::com::sun::star::logging::LogRecord;
using ::com::sun::star::uno::XInterface;
+ namespace {
+
class PlainTextFormatter : public cppu::WeakImplHelper<css::logging::XLogFormatter, css::lang::XServiceInfo>
{
public:
@@ -55,6 +57,8 @@ namespace logging
virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
};
+ }
+
PlainTextFormatter::PlainTextFormatter()
{
}
diff --git a/extensions/source/logging/simpletextformatter.cxx b/extensions/source/logging/simpletextformatter.cxx
index 003c978233b1..542f696e5d34 100644
--- a/extensions/source/logging/simpletextformatter.cxx
+++ b/extensions/source/logging/simpletextformatter.cxx
@@ -37,6 +37,8 @@ namespace logging
using css::logging::LogRecord;
using namespace css::uno;
+namespace
+{
class SimpleTextFormatter
: public cppu::WeakImplHelper<css::logging::XLogFormatter, css::lang::XServiceInfo>
{
@@ -54,6 +56,7 @@ private:
virtual sal_Bool SAL_CALL supportsService(const OUString& _rServiceName) override;
virtual Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
};
+}
SimpleTextFormatter::SimpleTextFormatter() {}
diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx
index 1e77361f9400..b98f3c1e25c0 100644
--- a/extensions/source/propctrlr/browserlistbox.cxx
+++ b/extensions/source/propctrlr/browserlistbox.cxx
@@ -68,8 +68,6 @@ namespace pcr
ACTIVATE_NEXT
};
- }
-
struct ControlEvent : public ::comphelper::AnyEvent
{
Reference< XPropertyControl > xControl;
@@ -95,6 +93,7 @@ namespace pcr
getNotifier();
};
+ }
::rtl::Reference< ::comphelper::AsyncEventNotifier > SharedNotifier::s_pNotifier;
diff --git a/extensions/source/propctrlr/composeduiupdate.cxx b/extensions/source/propctrlr/composeduiupdate.cxx
index 679a894795ee..4d59e51f9544 100644
--- a/extensions/source/propctrlr/composeduiupdate.cxx
+++ b/extensions/source/propctrlr/composeduiupdate.cxx
@@ -66,6 +66,9 @@ namespace pcr
typedef ::cppu::WeakImplHelper < css::inspection::XObjectInspectorUI
> CachedInspectorUI_Base;
+
+ namespace {
+
struct CachedInspectorUI : public CachedInspectorUI_Base
{
private:
@@ -167,6 +170,7 @@ namespace pcr
};
};
+ }
CachedInspectorUI::CachedInspectorUI( ComposedPropertyUIUpdate& _rMaster, FNotifySingleUIChange _pUIChangeNotification )
:m_bDisposed( false )
diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx
index e368bdf5f100..646e4feec6f0 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -296,6 +296,9 @@ namespace pcr
typedef ::cppu::WeakImplHelper < css::container::XNameReplace
> EventHolder_Base;
+
+ namespace {
+
/* A UNO component holding assigned event descriptions, for use with a SvxMacroAssignDlg */
class EventHolder : public EventHolder_Base
{
@@ -331,6 +334,7 @@ namespace pcr
ScriptEventDescriptor const & impl_getDescriptor_throw( const OUString& _rEventName ) const;
};
+ }
EventHolder::EventHolder()
{
diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx
index d065e7b63429..43ad19ce294a 100644
--- a/extensions/source/propctrlr/fontdialog.cxx
+++ b/extensions/source/propctrlr/fontdialog.cxx
@@ -69,6 +69,8 @@ namespace pcr
//= OFontPropertyExtractor
+ namespace {
+
class OFontPropertyExtractor
{
protected:
@@ -95,6 +97,7 @@ namespace pcr
bool _bForceInvalidation = false);
};
+ }
OFontPropertyExtractor::OFontPropertyExtractor(const Reference< XPropertySet >& _rxProps)
:m_xPropValueAccess(_rxProps)
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 7feca01b5a55..833359fdb583 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -173,6 +173,7 @@ namespace pcr
return aSupported;
}
+ namespace {
// TODO: -> export from toolkit
struct LanguageDependentProp
@@ -181,6 +182,8 @@ namespace pcr
sal_Int32 nPropNameLength;
};
+ }
+
static const LanguageDependentProp aLanguageDependentProp[] =
{
{ "Text", 4 },
diff --git a/extensions/source/propctrlr/formgeometryhandler.cxx b/extensions/source/propctrlr/formgeometryhandler.cxx
index 8ea36b02a7bb..f6a2d7a15d31 100644
--- a/extensions/source/propctrlr/formgeometryhandler.cxx
+++ b/extensions/source/propctrlr/formgeometryhandler.cxx
@@ -96,6 +96,8 @@ namespace pcr
//= BroadcastHelperBase
+ namespace {
+
class BroadcastHelperBase
{
protected:
@@ -111,6 +113,7 @@ namespace pcr
::cppu::OBroadcastHelper maBHelper;
};
+ }
//= ShapeGeometryChangeNotifier - declaration
@@ -121,6 +124,8 @@ namespace pcr
typedef ::cppu::WeakImplHelper < css::beans::XPropertyChangeListener
> ShapeGeometryChangeNotifier_IBase;
+ namespace {
+
class ShapeGeometryChangeNotifier :public BroadcastHelperBase
,public ShapeGeometryChangeNotifier_CBase
,public ShapeGeometryChangeNotifier_IBase
@@ -195,13 +200,22 @@ namespace pcr
Reference< XShape > m_xShape;
};
+ }
//= FormGeometryHandler - declaration
+ namespace {
+
class FormGeometryHandler;
+
+ }
+
typedef HandlerComponentBase< FormGeometryHandler > FormGeometryHandler_Base;
/** a property handler for any virtual string properties
*/
+
+ namespace {
+
class FormGeometryHandler : public FormGeometryHandler_Base
{
public:
@@ -247,6 +261,7 @@ namespace pcr
::rtl::Reference< ShapeGeometryChangeNotifier > m_xChangeNotifier;
};
+ }
//= FormGeometryHandler - implementation
diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx
index 2592c47c57eb..f2e3c0328c84 100644
--- a/extensions/source/propctrlr/formmetadata.cxx
+++ b/extensions/source/propctrlr/formmetadata.cxx
@@ -66,6 +66,7 @@ namespace pcr
{
}
+ namespace {
// Compare PropertyInfo
struct PropertyInfoLessByName
@@ -76,6 +77,7 @@ namespace pcr
}
};
+ }
//= OPropertyInfoService
diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx
index c393e3921137..d30d80918077 100644
--- a/extensions/source/propctrlr/genericpropertyhandler.cxx
+++ b/extensions/source/propctrlr/genericpropertyhandler.cxx
@@ -63,6 +63,8 @@ namespace pcr
using ::com::sun::star::awt::XActionListener;
using ::com::sun::star::awt::ActionEvent;
+ namespace {
+
class EnumRepresentation : public IPropertyEnumRepresentation
{
private:
@@ -84,6 +86,8 @@ namespace pcr
void impl_getValues( Sequence< sal_Int32 >& _out_rValues ) const;
};
+ }
+
EnumRepresentation::EnumRepresentation( const Reference< XComponentContext >& _rxContext, const Type& _rEnumType )
:m_aEnumType( _rEnumType )
{
@@ -177,6 +181,9 @@ namespace pcr
typedef ::cppu::WeakImplHelper < XActionListener
> UrlClickHandler_Base;
+
+ namespace {
+
class UrlClickHandler : public UrlClickHandler_Base
{
Reference<XComponentContext> m_xContext;
@@ -196,6 +203,7 @@ namespace pcr
void impl_dispatch_throw( const OUString& _rURL );
};
+ }
UrlClickHandler::UrlClickHandler( const Reference<XComponentContext>& _rContext, const Reference< XHyperlinkControl >& _rxControl )
:m_xContext( _rContext )
diff --git a/extensions/source/propctrlr/objectinspectormodel.cxx b/extensions/source/propctrlr/objectinspectormodel.cxx
index aa0628555e59..00520029b490 100644
--- a/extensions/source/propctrlr/objectinspectormodel.cxx
+++ b/extensions/source/propctrlr/objectinspectormodel.cxx
@@ -42,6 +42,8 @@ namespace pcr
//= ObjectInspectorModel
+ namespace {
+
class ObjectInspectorModel : public ImplInspectorModel
{
private:
@@ -81,6 +83,7 @@ namespace pcr
void impl_verifyArgument_throw( bool _bCondition, sal_Int16 _nArgumentPosition );
};
+ }
//= ObjectInspectorModel
diff --git a/extensions/source/propctrlr/stringrepresentation.cxx b/extensions/source/propctrlr/stringrepresentation.cxx
index 42d638c2f9e5..c16565028355 100644
--- a/extensions/source/propctrlr/stringrepresentation.cxx
+++ b/extensions/source/propctrlr/stringrepresentation.cxx
@@ -66,6 +66,8 @@ namespace pcr{
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
+namespace {
+
class StringRepresentation:
public ::cppu::WeakImplHelper<
lang::XServiceInfo,
@@ -141,6 +143,8 @@ private:
};
+}
+
StringRepresentation::StringRepresentation(uno::Reference< uno::XComponentContext > const & context) :
m_xContext(context)
{}
diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx
index 3fc08b9599a5..90d28f8794bc 100644
--- a/extensions/source/propctrlr/taborder.cxx
+++ b/extensions/source/propctrlr/taborder.cxx
@@ -79,8 +79,6 @@ namespace pcr
return sImageId;
}
- }
-
//= OSimpleTabModel
class OSimpleTabModel : public ::cppu::WeakImplHelper< XTabControllerModel>
@@ -104,6 +102,8 @@ namespace pcr
virtual void SAL_CALL setGroupControl(sal_Bool /*GroupControl*/) override {};
};
+ }
+
//= TabOrderDialog
TabOrderDialog::TabOrderDialog(weld::Window* _pParent, const Reference< XTabControllerModel >& _rxTabModel,
const Reference< XControlContainer >& _rxControlCont, const Reference< XComponentContext >& _rxORB)
diff --git a/extensions/source/scanner/scanunx.cxx b/extensions/source/scanner/scanunx.cxx
index a9ee05e5164e..83df6c32d5d2 100644
--- a/extensions/source/scanner/scanunx.cxx
+++ b/extensions/source/scanner/scanunx.cxx
@@ -76,6 +76,7 @@ Sequence< sal_Int8 > BitmapTransporter::getDIB()
return aValue;
}
+namespace {
struct SaneHolder
{
@@ -88,9 +89,6 @@ struct SaneHolder
SaneHolder() : m_nError(ScanError_ScanErrorNone), m_bBusy(false) {}
};
-
-namespace
-{
typedef std::vector< std::shared_ptr<SaneHolder> > sanevec;
class allSanes
{
@@ -119,8 +117,6 @@ namespace
struct theSaneProtector : public rtl::Static<osl::Mutex, theSaneProtector> {};
struct theSanes : public rtl::Static<allSanes, theSanes> {};
-}
-
class ScannerThread : public osl::Thread
{
@@ -138,6 +134,7 @@ public:
virtual ~ScannerThread() override;
};
+}
ScannerThread::ScannerThread(const std::shared_ptr<SaneHolder>& pHolder,
const Reference< css::lang::XEventListener >& listener,
diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx
index 06d273f2cbd3..a012b5542a8a 100644
--- a/filter/source/config/cache/filterfactory.cxx
+++ b/filter/source/config/cache/filterfactory.cxx
@@ -320,6 +320,7 @@ std::vector<OUString> FilterFactory::impl_queryMatchByDocumentService(const Quer
return lResult;
}
+namespace {
class stlcomp_removeIfMatchFlags
{
@@ -361,6 +362,7 @@ class stlcomp_removeIfMatchFlags
}
};
+}
std::vector<OUString> FilterFactory::impl_getSortedFilterList(const QueryTokenizer& lTokens) const
{
diff --git a/filter/source/flash/swffilter.cxx b/filter/source/flash/swffilter.cxx
index eac3e9385ad9..a0cae19a890f 100644
--- a/filter/source/flash/swffilter.cxx
+++ b/filter/source/flash/swffilter.cxx
@@ -59,6 +59,8 @@ using ::com::sun::star::container::XIndexAccess;
namespace swf {
+namespace {
+
class OslOutputStreamWrapper : public ::cppu::WeakImplHelper<css::io::XOutputStream>
{
osl::File maFile;
@@ -76,6 +78,8 @@ public:
virtual void SAL_CALL closeOutput( ) override;
};
+}
+
void SAL_CALL OslOutputStreamWrapper::writeBytes( const css::uno::Sequence< sal_Int8 >& aData )
{
sal_uInt64 uBytesToWrite = aData.getLength();
@@ -132,6 +136,7 @@ void SAL_CALL OslOutputStreamWrapper::closeOutput( )
}
}
+namespace {
class FlashExportFilter : public cppu::WeakImplHelper
<
@@ -173,6 +178,8 @@ public:
virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
};
+}
+
FlashExportFilter::FlashExportFilter(const Reference< XComponentContext > &rxContext)
: mxDoc()
, mxContext(rxContext)
diff --git a/filter/source/flash/swfwriter2.cxx b/filter/source/flash/swfwriter2.cxx
index 428c807c50ca..3b6e57d2974e 100644
--- a/filter/source/flash/swfwriter2.cxx
+++ b/filter/source/flash/swfwriter2.cxx
@@ -531,6 +531,7 @@ void FillStyle::addTo( Tag* pTag ) const
}
}
+namespace {
struct GradRecord
{
@@ -540,6 +541,8 @@ struct GradRecord
GradRecord( sal_uInt8 nRatio, const Color& rColor ) : mnRatio( nRatio ), maColor( rColor ) {}
};
+}
+
// TODO: better emulation of our gradients
void FillStyle::Impl_addGradient( Tag* pTag ) const
{
diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx
index 42ad6ce71a64..b7e4ac40fe06 100644
--- a/filter/source/graphicfilter/egif/egif.cxx
+++ b/filter/source/graphicfilter/egif/egif.cxx
@@ -30,6 +30,7 @@
#include "giflzwc.hxx"
#include <memory>
+namespace {
class GIFWriter
{
@@ -72,6 +73,7 @@ public:
bool WriteGIF( const Graphic& rGraphic, FilterConfigItem* pConfigItem );
};
+}
GIFWriter::GIFWriter(SvStream &rStream)
: m_rGIF(rStream)
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index cac944a1ec64..e933763c9140 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -64,6 +64,8 @@ using namespace ::com::sun::star::uno;
// -----------------------------field-types------------------------------
+namespace {
+
struct StackMember
{
struct StackMember * pSucc;
@@ -231,6 +233,8 @@ public:
PSWriter();
};
+}
+
//========================== methods from PSWriter ==========================
diff --git a/filter/source/graphicfilter/etiff/etiff.cxx b/filter/source/graphicfilter/etiff/etiff.cxx
index 8e70295203e7..456088d0c234 100644
--- a/filter/source/graphicfilter/etiff/etiff.cxx
+++ b/filter/source/graphicfilter/etiff/etiff.cxx
@@ -44,6 +44,7 @@
#define ResolutionUnit 296
#define ColorMap 320
+namespace {
struct TIFFLZWCTreeNode
{
@@ -112,6 +113,7 @@ public:
bool WriteTIFF( const Graphic& rGraphic, FilterConfigItem const * pFilterConfigItem );
};
+}
TIFFWriter::TIFFWriter(SvStream &rStream)
: m_rOStm(rStream)
diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx
index 39c2d1fe784d..b8942d13e48c 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -269,6 +269,8 @@ static bool RenderAsEMF(const sal_uInt8* pBuf, sal_uInt32 nBytesRead, Graphic &r
return bRet;
}
+namespace {
+
struct WriteData
{
oslFileHandle m_pFile;
@@ -276,6 +278,8 @@ struct WriteData
sal_uInt32 m_nBytesToWrite;
};
+}
+
extern "C" {
static void WriteFileInThread(void *wData)
diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx
index b0426d5c47d3..1ec1754d0d71 100644
--- a/filter/source/graphicfilter/ios2met/ios2met.cxx
+++ b/filter/source/graphicfilter/ios2met/ios2met.cxx
@@ -213,6 +213,8 @@ enum PenStyle { PEN_NULL, PEN_SOLID, PEN_DOT, PEN_DASH, PEN_DASHDOT };
//============================ OS2METReader ==================================
+namespace {
+
struct OSPalette {
OSPalette * pSucc;
sal_uInt32 * p0RGB; // May be NULL!
@@ -420,6 +422,8 @@ public:
};
+}
+
//=================== Methods of OS2METReader ==============================
OS2METReader::OS2METReader()
diff --git a/filter/source/graphicfilter/ipbm/ipbm.cxx b/filter/source/graphicfilter/ipbm/ipbm.cxx
index f192c847ab5e..3e882aa3c884 100644
--- a/filter/source/graphicfilter/ipbm/ipbm.cxx
+++ b/filter/source/graphicfilter/ipbm/ipbm.cxx
@@ -26,6 +26,8 @@
//============================ PBMReader ==================================
+namespace {
+
class PBMReader {
private:
@@ -49,6 +51,8 @@ public:
bool ReadPBM(Graphic & rGraphic );
};
+}
+
//=================== Methods of PBMReader ==============================
PBMReader::PBMReader(SvStream & rPBM)
diff --git a/filter/source/graphicfilter/ipcd/ipcd.cxx b/filter/source/graphicfilter/ipcd/ipcd.cxx
index c1b3f0061201..9c9fc0983f30 100644
--- a/filter/source/graphicfilter/ipcd/ipcd.cxx
+++ b/filter/source/graphicfilter/ipcd/ipcd.cxx
@@ -42,8 +42,6 @@ enum PCDResolution {
PCDRES_16BASE // 3072 x 3072
};
-}
-
class PCDReader {
private:
@@ -95,6 +93,8 @@ public:
bool ReadPCD( Graphic & rGraphic, FilterConfigItem* pConfigItem );
};
+}
+
//=================== Methods of PCDReader ==============================
bool PCDReader::ReadPCD( Graphic & rGraphic, FilterConfigItem* pConfigItem )
diff --git a/filter/source/graphicfilter/ipcx/ipcx.cxx b/filter/source/graphicfilter/ipcx/ipcx.cxx
index 93cebc1e6dce..e4e4575618cd 100644
--- a/filter/source/graphicfilter/ipcx/ipcx.cxx
+++ b/filter/source/graphicfilter/ipcx/ipcx.cxx
@@ -27,6 +27,8 @@ class FilterConfigItem;
//============================ PCXReader ==================================
+namespace {
+
class PCXReader {
private:
@@ -59,6 +61,8 @@ public:
// Reads a PCX file from the stream and fills the GDIMetaFile
};
+}
+
//=================== methods of PCXReader ==============================
PCXReader::PCXReader(SvStream &rStream)
diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx
index 8fc618bc3b10..a916f090ea4c 100644
--- a/filter/source/graphicfilter/ipict/ipict.cxx
+++ b/filter/source/graphicfilter/ipict/ipict.cxx
@@ -37,6 +37,8 @@
// complete FilterConfigItem for GraphicImport under -fsanitize=function
namespace PictReaderInternal {
+ namespace {
+
//! utilitary class to store a pattern, ...
class Pattern {
public:
@@ -86,6 +88,8 @@ namespace PictReaderInternal {
bool isRead;
};
+ }
+
sal_uLong Pattern::read(SvStream &stream) {
unsigned char nbyte[8];
sal_uLong nHiBytes, nLoBytes;
@@ -145,8 +149,6 @@ enum class PictDrawingMethod {
TEXT, UNDEFINED
};
-}
-
class PictReader {
typedef class PictReaderInternal::Pattern Pattern;
private:
@@ -266,6 +268,8 @@ public:
};
+}
+
static void SetByte(sal_uInt16& nx, sal_uInt16 ny, vcl::bitmap::RawBitmap& rBitmap, sal_uInt16 nPixelSize, sal_uInt8 nDat, sal_uInt16 nWidth, std::vector<Color> const & rvPalette)
{
switch (nPixelSize)
diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx b/filter/source/graphicfilter/ipsd/ipsd.cxx
index a404e6f63b45..0f8f0dfa3b04 100644
--- a/filter/source/graphicfilter/ipsd/ipsd.cxx
+++ b/filter/source/graphicfilter/ipsd/ipsd.cxx
@@ -40,6 +40,8 @@ class FilterConfigItem;
#define PSD_DUOTONE 8
#define PSD_LAB 9
+namespace {
+
struct PSDFileHeader
{
sal_uInt32 nSignature;
@@ -82,6 +84,8 @@ public:
bool ReadPSD(Graphic & rGraphic);
};
+}
+
//=================== Methods of PSDReader ==============================
PSDReader::PSDReader(SvStream &rStream)
diff --git a/filter/source/graphicfilter/iras/iras.cxx b/filter/source/graphicfilter/iras/iras.cxx
index f2fca2cdf960..4bafe0fe8e9c 100644
--- a/filter/source/graphicfilter/iras/iras.cxx
+++ b/filter/source/graphicfilter/iras/iras.cxx
@@ -38,6 +38,8 @@ class FilterConfigItem;
//============================ RASReader ==================================
+namespace {
+
class RASReader {
private:
@@ -61,6 +63,8 @@ public:
bool ReadRAS(Graphic & rGraphic);
};
+}
+
//=================== Methods of RASReader ==============================
RASReader::RASReader(SvStream &rRAS)
diff --git a/filter/source/graphicfilter/itga/itga.cxx b/filter/source/graphicfilter/itga/itga.cxx
index 1408bf5ff4cc..f7748022fadb 100644
--- a/filter/source/graphicfilter/itga/itga.cxx
+++ b/filter/source/graphicfilter/itga/itga.cxx
@@ -27,6 +27,8 @@ class FilterConfigItem;
//============================ TGAReader ==================================
+namespace {
+
struct TGAFileHeader
{
sal_uInt8 nImageIDLength;
@@ -110,6 +112,8 @@ public:
bool ReadTGA(Graphic &rGraphic);
};
+}
+
//=================== Methods of TGAReader ==============================
TGAReader::TGAReader(SvStream &rTGA)
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx
index 0d1bf7ae059d..d81cc2d7b073 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -40,8 +40,6 @@ template< typename T > T BYTESWAP(T nByte) {
( ( nByte & 128 ) >> 7 );
}
-}
-
//============================ TIFFReader ==================================
class TIFFReader
@@ -188,6 +186,8 @@ public:
bool ReadTIFF( SvStream & rTIFF, Graphic & rGraphic );
};
+}
+
//=================== Methods of TIFFReader ==============================
sal_uInt32 TIFFReader::DataTypeSize()
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 0279bc6684e7..69559fbc98b0 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -4403,6 +4403,8 @@ sal_uInt32 EscherGraphicProvider::GetBlibID( SvStream& rPicOutStrm, GraphicObjec
return nBlibId;
}
+namespace {
+
struct EscherConnectorRule
{
sal_uInt32 nRuleId;
@@ -4413,6 +4415,8 @@ struct EscherConnectorRule
sal_uInt32 ncptiB; // Connection site Index of shape B
};
+}
+
struct EscherShapeListEntry
{
uno::Reference<drawing::XShape>aXShape;
@@ -4892,6 +4896,8 @@ SvStream* EscherExGlobal::ImplQueryPictureStream()
return nullptr;
}
+namespace {
+
// Implementation of an empty stream that silently succeeds, but does nothing.
//
// In fact, this is a hack. The right solution is to abstract EscherEx to be
@@ -4910,6 +4916,8 @@ public:
SvNullStream() : SvStream() {}
};
+}
+
EscherEx::EscherEx(const std::shared_ptr<EscherExGlobal>& rxGlobal, SvStream* pOutStrm, bool bOOXML)
: mxGlobal(rxGlobal)
, mpOutStrm(pOutStrm)
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 10a0ca1f6382..3d791bbb9bc8 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -191,6 +191,8 @@ using namespace container ;
static sal_uInt32 nMSOleObjCntr = 0;
#define MSO_OLE_Obj "MSO_OLE_Obj"
+namespace {
+
struct SvxMSDffBLIPInfo
{
sal_uLong nFilePos; ///< offset of the BLIP in data stream
@@ -200,6 +202,8 @@ struct SvxMSDffBLIPInfo
}
};
+}
+
/// the following will be sorted by the order of their appearance:
struct SvxMSDffBLIPInfos : public std::vector<SvxMSDffBLIPInfo> {};
@@ -1123,6 +1127,8 @@ void DffPropertyReader::ApplyLineAttributes( SfxItemSet& rSet, const MSO_SPT eSh
rSet.Put( XLineStyleItem( drawing::LineStyle_NONE ) );
}
+namespace {
+
struct ShadeColor
{
Color aColor;
@@ -1131,6 +1137,8 @@ struct ShadeColor
ShadeColor( const Color& rC, double fR ) : aColor( rC ), fDist( fR ) {};
};
+}
+
static void GetShadeColors( const SvxMSDffManager& rManager, const DffPropertyReader& rProperties, SvStream& rIn, std::vector< ShadeColor >& rShadeColors )
{
sal_uInt32 nPos = rIn.Tell();
@@ -6800,11 +6808,16 @@ bool SvxMSDffManager::MakeContentStream( SotStorage * pStor, const GDIMetaFile &
return xStm->GetError() == ERRCODE_NONE;
}
+namespace {
+
struct ClsIDs {
sal_uInt32 nId;
const sal_Char* pSvrName;
const sal_Char* pDspName;
};
+
+}
+
static const ClsIDs aClsIDs[] = {
{ 0x000212F0, "MSWordArt", "Microsoft Word Art" },
diff --git a/filter/source/msfilter/msvbahelper.cxx b/filter/source/msfilter/msvbahelper.cxx
index ffebbaaf70e4..736f65887764 100644
--- a/filter/source/msfilter/msvbahelper.cxx
+++ b/filter/source/msfilter/msvbahelper.cxx
@@ -643,12 +643,16 @@ static sal_uInt16 parseChar( sal_Unicode c )
return nVclKey;
}
+namespace {
+
struct KeyCodeEntry
{
const char* sName;
sal_uInt16 nCode;
};
+}
+
KeyCodeEntry const aMSKeyCodesData[] = {
{ "BACKSPACE", KEY_BACKSPACE },
{ "BS", KEY_BACKSPACE },
diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx
index a007c709b66a..8654458b98cf 100644
--- a/filter/source/msfilter/util.cxx
+++ b/filter/source/msfilter/util.cxx
@@ -558,12 +558,16 @@ EquationResult ParseCombinedChars(const OUString& rStr)
return aResult;
}
+namespace {
+
struct CustomShapeTypeTranslationTable
{
const char* sOOo;
const char* sMSO;
};
+}
+
static const CustomShapeTypeTranslationTable pCustomShapeTypeTranslationTable[] =
{
// { "non-primitive", mso_sptMin },
diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx b/filter/source/odfflatxml/OdfFlatXml.cxx
index 8e0a4beb076e..cf7f37b9f993 100644
--- a/filter/source/odfflatxml/OdfFlatXml.cxx
+++ b/filter/source/odfflatxml/OdfFlatXml.cxx
@@ -52,6 +52,8 @@ using namespace ::com::sun::star::xml::sax;
namespace filter {