basctl/source/basicide/documentenumeration.cxx
| 4 -
desktop/source/deployment/manager/dp_managerfac.cxx
| 2
desktop/source/deployment/registry/component/dp_compbackenddb.cxx
| 2
desktop/source/deployment/registry/component/dp_component.cxx
| 2
desktop/source/deployment/registry/configuration/dp_configuration.cxx
| 2
desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx
| 2
desktop/source/deployment/registry/dp_backenddb.cxx
| 2
desktop/source/deployment/registry/executable/dp_executable.cxx
| 2
desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx
| 2
desktop/source/deployment/registry/help/dp_help.cxx
| 2
desktop/source/deployment/registry/help/dp_helpbackenddb.cxx
| 2
desktop/source/deployment/registry/package/dp_extbackenddb.cxx
| 2
desktop/source/deployment/registry/package/dp_package.cxx
| 2
desktop/source/deployment/registry/script/dp_script.cxx
| 2
desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx
| 2
desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
| 2
drawinglayer/source/primitive2d/polygonprimitive2d.cxx
| 5 -
drawinglayer/source/primitive2d/primitivetools2d.cxx
| 3 +
drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx
| 1
drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
| 3 -
emfio/source/emfuno/xemfparser.cxx
| 21 ++------
extensions/source/config/ldap/ldapaccess.cxx
| 4 -
extensions/source/config/ldap/ldapuserprofilebe.cxx
| 4 -
filter/source/config/cache/basecontainer.cxx
| 6 --
filter/source/config/cache/cacheitem.cxx
| 6 --
filter/source/config/cache/cacheupdatelistener.cxx
| 6 --
filter/source/config/cache/configflush.cxx
| 6 --
filter/source/config/cache/contenthandlerfactory.cxx
| 6 --
filter/source/config/cache/filtercache.cxx
| 4 -
filter/source/config/cache/filterfactory.cxx
| 4 -
filter/source/config/cache/frameloaderfactory.cxx
| 6 --
filter/source/config/cache/querytokenizer.cxx
| 6 --
filter/source/config/cache/registration.cxx
| 6 --
filter/source/config/cache/typedetection.cxx
| 4 -
filter/source/msfilter/msvbahelper.cxx
| 4 -
filter/source/msfilter/rtfutil.cxx
| 5 -
filter/source/msfilter/util.cxx
| 4 -
filter/source/odfflatxml/OdfFlatXml.cxx
| 4 -
forms/source/resource/frm_resource.cxx
| 5 -
forms/source/xforms/xformsevent.cxx
| 7 --
forms/source/xforms/xpathlib/extension.cxx
| 4 -
registry/tools/fileurl.cxx
| 7 --
registry/tools/options.cxx
| 7 --
sal/osl/unx/file_url.cxx
| 4 -
sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx
| 4 -
sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx
| 4 -
sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx
| 4 -
sal/qa/rtl/strings/test_ostring_concat.cxx
| 4 -
sal/qa/rtl/strings/test_ostring_stringliterals.cxx
| 4 -
sal/qa/rtl/strings/test_oustring_compare.cxx
| 4 -
sal/qa/rtl/strings/test_oustring_concat.cxx
| 4 -
sal/qa/rtl/strings/test_oustring_convert.cxx
| 4 -
sal/qa/rtl/strings/test_oustring_endswith.cxx
| 4 -
sal/qa/rtl/strings/test_oustring_startswith.cxx
| 4 -
sal/qa/rtl/strings/test_oustring_stringliterals.cxx
| 4 -
sal/qa/rtl/strings/test_strings_valuex.cxx
| 4 -
scaddins/source/analysis/analysishelper.cxx
| 4 -
scaddins/source/analysis/bessel.cxx
| 6 --
scaddins/source/pricing/black_scholes.cxx
| 8 ---
sdext/source/presenter/PresenterAccessibility.cxx
| 4 -
sdext/source/presenter/PresenterBitmapContainer.cxx
| 4 -
sdext/source/presenter/PresenterButton.cxx
| 4 -
sdext/source/presenter/PresenterCanvasHelper.cxx
| 4 -
sdext/source/presenter/PresenterComponent.cxx
| 4 -
sdext/source/presenter/PresenterConfigurationAccess.cxx
| 4 -
sdext/source/presenter/PresenterController.cxx
| 4 -
sdext/source/presenter/PresenterCurrentSlideObserver.cxx
| 4 -
sdext/source/presenter/PresenterFrameworkObserver.cxx
| 4 -
sdext/source/presenter/PresenterGeometryHelper.cxx
| 4 -
sdext/source/presenter/PresenterHelpView.cxx
| 4 -
sdext/source/presenter/PresenterHelper.cxx
| 4 -
sdext/source/presenter/PresenterNotesView.cxx
| 4 -
sdext/source/presenter/PresenterPaintManager.cxx
| 4 -
sdext/source/presenter/PresenterPane.cxx
| 4 -
sdext/source/presenter/PresenterPaneBase.cxx
| 4 -
sdext/source/presenter/PresenterPaneBorderPainter.cxx
| 4 -
sdext/source/presenter/PresenterPaneContainer.cxx
| 4 -
sdext/source/presenter/PresenterPaneFactory.cxx
| 4 -
sdext/source/presenter/PresenterProtocolHandler.cxx
| 4 -
sdext/source/presenter/PresenterScreen.cxx
| 4 -
sdext/source/presenter/PresenterScrollBar.cxx
| 4 -
sdext/source/presenter/PresenterSlidePreview.cxx
| 4 -
sdext/source/presenter/PresenterSlideShowView.cxx
| 4 -
sdext/source/presenter/PresenterSlideSorter.cxx
| 4 -
sdext/source/presenter/PresenterSprite.cxx
| 4 -
sdext/source/presenter/PresenterSpritePane.cxx
| 4 -
sdext/source/presenter/PresenterTextView.cxx
| 4 -
sdext/source/presenter/PresenterTheme.cxx
| 4 -
sdext/source/presenter/PresenterTimer.cxx
| 4 -
sdext/source/presenter/PresenterToolBar.cxx
| 4 -
sdext/source/presenter/PresenterUIPainter.cxx
| 4 -
sdext/source/presenter/PresenterViewFactory.cxx
| 4 -
sdext/source/presenter/PresenterWindowManager.cxx
| 4 -
sfx2/source/doc/sfxbasemodel.cxx
| 4 -
sfx2/source/sidebar/Accessible.cxx
| 4 -
sfx2/source/sidebar/AccessibleTitleBar.cxx
| 4 -
sfx2/source/sidebar/AsynchronousCall.cxx
| 4 -
sfx2/source/sidebar/Context.cxx
| 4 -
sfx2/source/sidebar/ContextChangeBroadcaster.cxx
| 4 -
sfx2/source/sidebar/ContextList.cxx
| 4 -
sfx2/source/sidebar/ControlFactory.cxx
| 4 -
sfx2/source/sidebar/ControllerFactory.cxx
| 4 -
sfx2/source/sidebar/ControllerItem.cxx
| 4 -
sfx2/source/sidebar/Deck.cxx
| 4 -
sfx2/source/sidebar/DeckDescriptor.cxx
| 4 -
sfx2/source/sidebar/DeckLayouter.cxx
| 4 -
sfx2/source/sidebar/DeckTitleBar.cxx
| 4 -
sfx2/source/sidebar/DrawHelper.cxx
| 4 -
sfx2/source/sidebar/FocusManager.cxx
| 4 -
sfx2/source/sidebar/IContextChangeReceiver.cxx
| 4 -
sfx2/source/sidebar/ILayoutableWindow.cxx
| 4 -
sfx2/source/sidebar/MenuButton.cxx
| 4 -
sfx2/source/sidebar/Paint.cxx
| 4 -
sfx2/source/sidebar/Panel.cxx
| 4 -
sfx2/source/sidebar/PanelDescriptor.cxx
| 4 -
sfx2/source/sidebar/PanelTitleBar.cxx
| 4 -
sfx2/source/sidebar/ResourceManager.cxx
| 4 -
sfx2/source/sidebar/Sidebar.cxx
| 4 -
sfx2/source/sidebar/SidebarChildWindow.cxx
| 4 -
sfx2/source/sidebar/SidebarController.cxx
| 4 -
sfx2/source/sidebar/SidebarDockingWindow.cxx
| 4 -
sfx2/source/sidebar/SidebarModelUpdate.cxx
| 4 -
sfx2/source/sidebar/SidebarPanelBase.cxx
| 4 -
sfx2/source/sidebar/SidebarToolBox.cxx
| 4 -
sfx2/source/sidebar/TabBar.cxx
| 4 -
sfx2/source/sidebar/TabItem.cxx
| 4 -
sfx2/source/sidebar/Theme.cxx
| 4 -
sfx2/source/sidebar/TitleBar.cxx
| 4 -
sfx2/source/sidebar/Tools.cxx
| 4 -
shell/source/sessioninstall/SyncDbusSessionHelper.cxx
| 4 -
slideshow/source/engine/activities/activitiesfactory.cxx
| 4 -
slideshow/source/engine/activities/activitybase.cxx
| 5 -
slideshow/source/engine/activities/continuousactivitybase.cxx
| 5 -
slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx
| 5 -
slideshow/source/engine/activities/discreteactivitybase.cxx
| 5 -
slideshow/source/engine/activities/simplecontinuousactivitybase.cxx
| 5 -
slideshow/source/engine/activitiesqueue.cxx
| 5 -
slideshow/source/engine/animatedsprite.cxx
| 5 -
slideshow/source/engine/animationfactory.cxx
| 5 -
slideshow/source/engine/animationnodes/animationaudionode.cxx
| 6 --
slideshow/source/engine/animationnodes/animationbasenode.cxx
| 4 -
slideshow/source/engine/animationnodes/animationcolornode.cxx
| 6 --
slideshow/source/engine/animationnodes/animationcommandnode.cxx
| 6 --
slideshow/source/engine/animationnodes/animationnodefactory.cxx
| 4 -
slideshow/source/engine/animationnodes/animationpathmotionnode.cxx
| 6 --
slideshow/source/engine/animationnodes/animationsetnode.cxx
| 6 --
slideshow/source/engine/animationnodes/animationtransformnode.cxx
| 6 --
slideshow/source/engine/animationnodes/animationtransitionfilternode.cxx
| 6 --
slideshow/source/engine/animationnodes/basecontainernode.cxx
| 6 --
slideshow/source/engine/animationnodes/basenode.cxx
| 4 -
slideshow/source/engine/animationnodes/generateevent.cxx
| 6 --
slideshow/source/engine/animationnodes/nodetools.cxx
| 5 -
slideshow/source/engine/animationnodes/paralleltimecontainer.cxx
| 6 --
slideshow/source/engine/animationnodes/propertyanimationnode.cxx
| 6 --
slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx
| 6 --
slideshow/source/engine/attributemap.cxx
| 5 -
slideshow/source/engine/color.cxx
| 5 -
slideshow/source/engine/delayevent.cxx
| 6 --
slideshow/source/engine/effectrewinder.cxx
| 4 -
slideshow/source/engine/eventmultiplexer.cxx
| 4 -
slideshow/source/engine/eventqueue.cxx
| 5 -
slideshow/source/engine/expressionnodefactory.cxx
| 5 -
slideshow/source/engine/pointersymbol.cxx
| 6 --
slideshow/source/engine/rehearsetimingsactivity.cxx
| 4 -
slideshow/source/engine/screenupdater.cxx
| 7 --
slideshow/source/engine/shapeattributelayer.cxx
| 5 -
slideshow/source/engine/shapes/appletshape.cxx
| 5 -
slideshow/source/engine/shapes/backgroundshape.cxx
| 5 -
slideshow/source/engine/shapes/drawinglayeranimation.cxx
| 4 -
slideshow/source/engine/shapes/drawshape.cxx
| 5 -
slideshow/source/engine/shapes/drawshapesubsetting.cxx
| 5 -
slideshow/source/engine/shapes/externalshapebase.cxx
| 5 -
slideshow/source/engine/shapes/gdimtftools.cxx
| 5 -
slideshow/source/engine/shapes/intrinsicanimationactivity.cxx
| 5 -
slideshow/source/engine/shapes/mediashape.cxx
| 5 -
slideshow/source/engine/shapes/shapeimporter.cxx
| 4 -
slideshow/source/engine/shapes/viewappletshape.cxx
| 5 -
slideshow/source/engine/shapes/viewbackgroundshape.cxx
| 5 -
slideshow/source/engine/shapes/viewmediashape.cxx
| 5 -
slideshow/source/engine/shapes/viewshape.cxx
| 5 -
slideshow/source/engine/shapesubset.cxx
| 5 -
slideshow/source/engine/slide/layer.cxx
| 5 -
slideshow/source/engine/slide/layermanager.cxx
| 5 -
slideshow/source/engine/slide/shapemanagerimpl.cxx
| 6 --
slideshow/source/engine/slide/slideanimations.cxx
| 5 -
slideshow/source/engine/slide/slideimpl.cxx
| 5 -
slideshow/source/engine/slide/targetpropertiescreator.cxx
| 7 --
slideshow/source/engine/slide/userpaintoverlay.cxx
| 5 -
slideshow/source/engine/slidebitmap.cxx
| 5 -
slideshow/source/engine/slideshowcontext.cxx
| 7 --
slideshow/source/engine/slideview.cxx
| 4 -
slideshow/source/engine/smilfunctionparser.cxx
| 5 -
slideshow/source/engine/soundplayer.cxx
| 5 -
slideshow/source/engine/tools.cxx
| 5 -
slideshow/source/engine/transitions/barndoorwipe.cxx
| 4 -
slideshow/source/engine/transitions/barwipepolypolygon.cxx
| 4 -
slideshow/source/engine/transitions/boxwipe.cxx
| 4 -
slideshow/source/engine/transitions/checkerboardwipe.cxx
| 4 -
slideshow/source/engine/transitions/clippingfunctor.cxx
| 5 -
slideshow/source/engine/transitions/clockwipe.cxx
| 4 -
slideshow/source/engine/transitions/combtransition.cxx
| 6 --
slideshow/source/engine/transitions/doublediamondwipe.cxx
| 4 -
slideshow/source/engine/transitions/ellipsewipe.cxx
| 4 -
slideshow/source/engine/transitions/fanwipe.cxx
| 4 -
slideshow/source/engine/transitions/figurewipe.cxx
| 4 -
slideshow/source/engine/transitions/fourboxwipe.cxx
| 4 -
slideshow/source/engine/transitions/iriswipe.cxx
| 4 -
slideshow/source/engine/transitions/parametricpolypolygonfactory.cxx
| 5 -
slideshow/source/engine/transitions/pinwheelwipe.cxx
| 4 -
slideshow/source/engine/transitions/randomwipe.cxx
| 4 -
slideshow/source/engine/transitions/shapetransitionfactory.cxx
| 4 -
slideshow/source/engine/transitions/slidechangebase.cxx
| 4 -
slideshow/source/engine/transitions/slidetransitionfactory.cxx
| 4 -
slideshow/source/engine/transitions/snakewipe.cxx
| 4 -
slideshow/source/engine/transitions/spiralwipe.cxx
| 4 -
slideshow/source/engine/transitions/sweepwipe.cxx
| 4 -
slideshow/source/engine/transitions/transitionfactorytab.cxx
| 4 -
slideshow/source/engine/transitions/transitiontools.cxx
| 4 -
slideshow/source/engine/transitions/veewipe.cxx
| 4 -
slideshow/source/engine/transitions/waterfallwipe.cxx
| 4 -
slideshow/source/engine/transitions/zigzagwipe.cxx
| 4 -
slideshow/source/engine/unoviewcontainer.cxx
| 5 -
slideshow/source/engine/usereventqueue.cxx
| 4 -
slideshow/source/engine/waitsymbol.cxx
| 6 --
slideshow/source/engine/wakeupevent.cxx
| 5 -
stoc/source/typeconv/convert.cxx
| 2
svgio/source/svgreader/svganode.cxx
| 7 --
svgio/source/svgreader/svgcharacternode.cxx
| 26 ++--------
svgio/source/svgreader/svgcirclenode.cxx
| 7 --
svgio/source/svgreader/svgclippathnode.cxx
| 7 --
svgio/source/svgreader/svgdocument.cxx
| 7 --
svgio/source/svgreader/svgdocumenthandler.cxx
| 5 -
svgio/source/svgreader/svgellipsenode.cxx
| 7 --
svgio/source/svgreader/svggnode.cxx
| 7 --
svgio/source/svgreader/svggradientnode.cxx
| 7 --
svgio/source/svgreader/svggradientstopnode.cxx
| 7 --
svgio/source/svgreader/svgimagenode.cxx
| 7 --
svgio/source/svgreader/svglinenode.cxx
| 7 --
svgio/source/svgreader/svgmarkernode.cxx
| 7 --
svgio/source/svgreader/svgmasknode.cxx
| 7 --
svgio/source/svgreader/svgnode.cxx
| 5 -
svgio/source/svgreader/svgpathnode.cxx
| 7 --
svgio/source/svgreader/svgpatternnode.cxx
| 7 --
svgio/source/svgreader/svgpolynode.cxx
| 7 --
svgio/source/svgreader/svgrectnode.cxx
| 7 --
svgio/source/svgreader/svgstyleattributes.cxx
| 5 -
svgio/source/svgreader/svgstylenode.cxx
| 7 --
svgio/source/svgreader/svgsvgnode.cxx
| 5 -
svgio/source/svgreader/svgsymbolnode.cxx
| 7 --
svgio/source/svgreader/svgtextnode.cxx
| 7 --
svgio/source/svgreader/svgtextpathnode.cxx
| 12 +---
svgio/source/svgreader/svgtitledescnode.cxx
| 7 --
svgio/source/svgreader/svgtoken.cxx
| 5 -
svgio/source/svgreader/svgtools.cxx
| 7 --
svgio/source/svgreader/svgtrefnode.cxx
| 7 --
svgio/source/svgreader/svgtspannode.cxx
| 7 --
svgio/source/svgreader/svgusenode.cxx
| 7 --
svgio/source/svgreader/svgvisitor.cxx
| 5 -
svgio/source/svguno/xsvgparser.cxx
| 21 ++------
svl/qa/unit/test_URIHelper.cxx
| 4 -
svl/source/crypto/cryptosign.cxx
| 6 --
svl/source/undo/undo.cxx
| 4 -
svl/source/uno/pathservice.cxx
| 4 -
svtools/source/misc/imageresourceaccess.cxx
| 7 --
svtools/source/table/defaultinputhandler.cxx
| 4 -
svtools/source/table/gridtablerenderer.cxx
| 4 -
svtools/source/table/mousefunction.cxx
| 4 -
svtools/source/table/tablecontrol.cxx
| 4 -
svtools/source/table/tablecontrol_impl.cxx
| 4 -
svtools/source/table/tabledatawindow.cxx
| 4 -
svtools/source/table/tablegeometry.cxx
| 4 -
svtools/source/uno/unocontroltablemodel.cxx
| 4 -
svtools/source/uno/unogridcolumnfacade.cxx
| 4 -
svtools/source/uno/wizard/wizardpagecontroller.cxx
| 4 -
svtools/source/uno/wizard/wizardshell.cxx
| 4 -
svx/source/table/cell.cxx
| 4 -
test/source/helper/form.cxx
| 10 ---
test/source/helper/shape.cxx
| 10 ---
test/source/helper/transferable.cxx
| 10 ---
testtools/source/bridgetest/multi.cxx
| 4 -
ucb/source/ucp/ext/ucpext_content.cxx
| 4 -
ucb/source/ucp/ext/ucpext_datasupplier.cxx
| 4 -
ucb/source/ucp/ext/ucpext_provider.cxx
| 4 -
ucb/source/ucp/ext/ucpext_resultset.cxx
| 4 -
ucb/source/ucp/ext/ucpext_services.cxx
| 4 -
ucb/source/ucp/tdoc/tdoc_contentcaps.cxx
| 4 -
unodevtools/source/skeletonmaker/cppcompskeleton.cxx
| 4 -
unodevtools/source/skeletonmaker/cpptypemaker.cxx
| 4 -
unodevtools/source/skeletonmaker/javacompskeleton.cxx
| 4 -
unodevtools/source/skeletonmaker/javatypemaker.cxx
| 4 -
unoidl/source/legacyprovider.cxx
| 4 -
unoidl/source/sourcefileprovider.cxx
| 4 -
unoidl/source/sourcetreeprovider.cxx
| 4 -
unoidl/source/unoidlprovider.cxx
| 4 -
unotest/source/cpp/getargument.cxx
| 6 --
unoxml/source/events/event.cxx
| 4 -
unoxml/source/events/eventdispatcher.cxx
| 4 -
unoxml/source/events/mouseevent.cxx
| 4 -
unoxml/source/events/mutationevent.cxx
| 4 -
unoxml/source/events/uievent.cxx
| 4 -
vbahelper/source/vbahelper/vbahelper.cxx
| 5 -
vcl/backendtest/outputdevice/bitmap.cxx
| 5 -
vcl/backendtest/outputdevice/common.cxx
| 5 -
vcl/backendtest/outputdevice/gradient.cxx
| 5 -
vcl/backendtest/outputdevice/line.cxx
| 5 -
vcl/backendtest/outputdevice/outputdevice.cxx
| 5 -
vcl/backendtest/outputdevice/pixel.cxx
| 5 -
vcl/backendtest/outputdevice/polygon.cxx
| 5 -
vcl/backendtest/outputdevice/polyline.cxx
| 5 -
vcl/backendtest/outputdevice/polyline_b2d.cxx
| 5 -
vcl/backendtest/outputdevice/polypolygon.cxx
| 5 -
vcl/backendtest/outputdevice/polypolygon_b2d.cxx
| 5 -
vcl/backendtest/outputdevice/rectangle.cxx
| 5 -
vcl/qa/cppunit/canvasbitmaptest.cxx
| 4 -
vcl/source/app/svapp.cxx
| 4 -
vcl/source/app/unohelp2.cxx
| 4 -
vcl/source/bitmap/BitmapTools.cxx
| 7 --
vcl/source/filter/ipdf/pdfdocument.cxx
| 5 -
vcl/source/font/Feature.cxx
| 7 --
vcl/source/font/FeatureCollector.cxx
| 7 --
vcl/source/font/FeatureParser.cxx
| 8 ---
vcl/source/font/OpenTypeFeatureDefinitonList.cxx
| 7 --
vcl/source/gdi/pdfbuildin_fonts.cxx
| 5 -
vcl/source/graphic/GraphicLoader.cxx
| 5 -
vcl/source/graphic/GraphicObject.cxx
| 6 --
vcl/source/graphic/Manager.cxx
| 5 -
vcl/source/helper/canvastools.cxx
| 6 --
vcl/source/helper/commandinfoprovider.cxx
| 4 -
vcl/unx/gtk3/gtk3gtkprintwrapper.cxx
| 5 -
writerfilter/source/dmapper/BorderHandler.cxx
| 7 --
writerfilter/source/dmapper/CellColorHandler.cxx
| 4 -
writerfilter/source/dmapper/CellMarginHandler.cxx
| 6 --
writerfilter/source/dmapper/ConversionHelper.cxx
| 6 --
writerfilter/source/dmapper/DomainMapper.cxx
| 5 -
writerfilter/source/dmapper/DomainMapperTableHandler.cxx
| 5 -
writerfilter/source/dmapper/DomainMapperTableManager.cxx
| 5 -
writerfilter/source/dmapper/DomainMapper_Impl.cxx
| 5 -
writerfilter/source/dmapper/FFDataHandler.cxx
| 5 -
writerfilter/source/dmapper/FontTable.cxx
| 6 --
writerfilter/source/dmapper/FormControlHelper.cxx
| 5 -
writerfilter/source/dmapper/GraphicHelpers.cxx
| 5 -
writerfilter/source/dmapper/GraphicImport.cxx
| 5 -
writerfilter/source/dmapper/LatentStyleHandler.cxx
| 7 --
writerfilter/source/dmapper/MeasureHandler.cxx
| 6 --
writerfilter/source/dmapper/ModelEventListener.cxx
| 6 --
writerfilter/source/dmapper/NumberingManager.cxx
| 4 -
writerfilter/source/dmapper/OLEHandler.cxx
| 6 --
writerfilter/source/dmapper/PageBordersHandler.cxx
| 5 -
writerfilter/source/dmapper/PropertyIds.cxx
| 4 -
writerfilter/source/dmapper/PropertyMap.cxx
| 4 -
writerfilter/source/dmapper/PropertyMapHelper.cxx
| 5 -
writerfilter/source/dmapper/SdtHelper.cxx
| 7 --
writerfilter/source/dmapper/SectionColumnHandler.cxx
| 6 --
writerfilter/source/dmapper/SmartTagHandler.cxx
| 7 --
writerfilter/source/dmapper/StyleSheetTable.cxx
| 4 -
writerfilter/source/dmapper/TDefTableHandler.cxx
| 4 -
writerfilter/source/dmapper/TableManager.cxx
| 6 --
writerfilter/source/dmapper/TablePositionHandler.cxx
| 7 --
writerfilter/source/dmapper/TablePropertiesHandler.cxx
| 5 -
writerfilter/source/dmapper/TblStylePrHandler.cxx
| 5 -
writerfilter/source/dmapper/TextEffectsHandler.cxx
| 6 --
writerfilter/source/dmapper/ThemeTable.cxx
| 4 -
writerfilter/source/dmapper/TrackChangesHandler.cxx
| 6 --
writerfilter/source/dmapper/domainmapperfactory.cxx
| 7 --
writerfilter/source/dmapper/util.cxx
| 6 --
writerfilter/source/ooxml/Handler.cxx
| 5 -
writerfilter/source/ooxml/OOXMLBinaryObjectReference.cxx
| 5 -
writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
| 4 -
writerfilter/source/ooxml/OOXMLFactory.cxx
| 4 -
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
| 5 -
writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
| 5 -
writerfilter/source/ooxml/OOXMLParserState.cxx
| 5 -
writerfilter/source/ooxml/OOXMLPropertySet.cxx
| 5 -
writerfilter/source/ooxml/OOXMLStreamImpl.cxx
| 5 -
writerfilter/source/rtftok/rtfcharsets.cxx
| 7 --
writerfilter/source/rtftok/rtfcontrolwords.cxx
| 5 -
writerfilter/source/rtftok/rtfdispatchdestination.cxx
| 5 -
writerfilter/source/rtftok/rtfdispatchflag.cxx
| 5 -
writerfilter/source/rtftok/rtfdispatchsymbol.cxx
| 7 --
writerfilter/source/rtftok/rtfdocumentfactory.cxx
| 7 --
writerfilter/source/rtftok/rtfdocumentimpl.cxx
| 5 -
writerfilter/source/rtftok/rtflookahead.cxx
| 18 +-----
writerfilter/source/rtftok/rtfreferenceproperties.cxx
| 7 --
writerfilter/source/rtftok/rtfreferencetable.cxx
| 7 --
writerfilter/source/rtftok/rtfsdrimport.cxx
| 5 -
writerfilter/source/rtftok/rtfskipdestination.cxx
| 7 --
writerfilter/source/rtftok/rtfsprm.cxx
| 7 --
writerfilter/source/rtftok/rtftokenizer.cxx
| 7 --
writerfilter/source/rtftok/rtfvalue.cxx
| 7 --
writerperfect/qa/unit/WpftFilterFixture.cxx
| 5 -
writerperfect/qa/unit/WpftFilterTestBase.cxx
| 5 -
writerperfect/qa/unit/WpftLoader.cxx
| 5 -
writerperfect/source/writer/exp/XMLBase64ImportContext.cxx
| 7 --
writerperfect/source/writer/exp/XMLFootnoteImportContext.cxx
| 7 --
writerperfect/source/writer/exp/XMLSectionContext.cxx
| 7 --
writerperfect/source/writer/exp/XMLTextFrameContext.cxx
| 7 --
writerperfect/source/writer/exp/XMLTextListContext.cxx
| 7 --
writerperfect/source/writer/exp/XMLTextListItemContext.cxx
| 7 --
writerperfect/source/writer/exp/txtparai.cxx
| 5 -
writerperfect/source/writer/exp/txtstyli.cxx
| 7 --
writerperfect/source/writer/exp/xmlfmt.cxx
| 7 --
writerperfect/source/writer/exp/xmlictxt.cxx
| 7 --
writerperfect/source/writer/exp/xmlimp.cxx
| 5 -
writerperfect/source/writer/exp/xmlmetai.cxx
| 7 --
writerperfect/source/writer/exp/xmltbli.cxx
| 7 --
writerperfect/source/writer/exp/xmltext.cxx
| 7 --
xmloff/source/chart/ColorPropertySet.cxx
| 7 --
xmloff/source/core/xmltoken.cxx
| 3 -
xmloff/source/draw/EnhancedCustomShapeToken.cxx
| 3 -
xmloff/source/forms/property_meta_data.cxx
| 4 -
xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx
| 4 -
xmlsecurity/source/pdfio/pdfdocument.cxx
| 7 --
412 files changed, 692 insertions(+), 1391 deletions(-)
New commits:
commit c82efb610bf556ea12cbe4f94568ac619897799f
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon Jan 13 19:48:37 2020 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Jan 31 18:36:09 2020 +0100
clang-tidy modernize-concat-nested-namespace
Change-Id: Iab35a8b85b3ba1df791c774f40b037f9420a071a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86708
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/basctl/source/basicide/documentenumeration.cxx
b/basctl/source/basicide/documentenumeration.cxx
index 9d00474efa00..e3acf9d4587a 100644
--- a/basctl/source/basicide/documentenumeration.cxx
+++ b/basctl/source/basicide/documentenumeration.cxx
@@ -29,7 +29,7 @@
#include <tools/diagnose_ex.h>
-namespace basctl { namespace docs {
+namespace basctl::docs {
using ::com::sun::star::uno::Exception;
using ::com::sun::star::uno::Reference;
@@ -164,6 +164,6 @@ namespace basctl { namespace docs {
}
}
-} } // namespace basctl::docs
+} // namespace basctl::docs
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/manager/dp_managerfac.cxx
b/desktop/source/deployment/manager/dp_managerfac.cxx
index f7feac323c90..6263922d7997 100644
--- a/desktop/source/deployment/manager/dp_managerfac.cxx
+++ b/desktop/source/deployment/manager/dp_managerfac.cxx
@@ -160,6 +160,6 @@ PackageManagerFactoryImpl::getPackageManager( OUString
const & context )
return xRet;
}
-} // namespace
+} // namespace dp_manager::factory
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/component/dp_compbackenddb.cxx
b/desktop/source/deployment/registry/component/dp_compbackenddb.cxx
index b00b9f0c6fc8..05f265404f55 100644
--- a/desktop/source/deployment/registry/component/dp_compbackenddb.cxx
+++ b/desktop/source/deployment/registry/component/dp_compbackenddb.cxx
@@ -126,6 +126,6 @@ ComponentBackendDb::Data
ComponentBackendDb::getEntry(OUString const & url)
}
-} // namespace
+} // namespace dp_registry::backend::component
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx
b/desktop/source/deployment/registry/component/dp_component.cxx
index 7709d1c48eae..997eb4106c8b 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -1699,7 +1699,7 @@ sdecl::ServiceDecl const serviceDecl(
IMPLEMENTATION_NAME,
BACKEND_SERVICE_NAME );
-} // namespace
+} // namespace dp_registry
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git
a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index d95a8c5f0766..68f11e41ea3b 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
@@ -794,6 +794,6 @@ sdecl::ServiceDecl const serviceDecl(
"com.sun.star.comp.deployment.configuration.PackageRegistryBackend",
BACKEND_SERVICE_NAME );
-} // namespace
+} // namespace dp_registry
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git
a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx
b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx
index 9c9feabf5884..eb8775be9efa 100644
---
a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx
+++
b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx
@@ -156,6 +156,6 @@ std::vector<OUString>
ConfigurationBackendDb::getAllDataUrls()
}
}
-} // namespace
+} // namespace dp_registry::backend::configuration
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/dp_backenddb.cxx
b/desktop/source/deployment/registry/dp_backenddb.cxx
index bb47161ec846..8ee51be6bc28 100644
--- a/desktop/source/deployment/registry/dp_backenddb.cxx
+++ b/desktop/source/deployment/registry/dp_backenddb.cxx
@@ -651,6 +651,6 @@ void RegisteredDb::addEntry(OUString const & url)
}
}
-} // namespace
+} // namespace dp_registry
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx
b/desktop/source/deployment/registry/executable/dp_executable.cxx
index ca403d8d113a..9769051afaca 100644
--- a/desktop/source/deployment/registry/executable/dp_executable.cxx
+++ b/desktop/source/deployment/registry/executable/dp_executable.cxx
@@ -308,7 +308,7 @@ sdecl::ServiceDecl const serviceDecl(
"com.sun.star.comp.deployment.executable.PackageRegistryBackend",
BACKEND_SERVICE_NAME );
-} // namespace
+} // namespace dp_registry::backend::executable
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git
a/desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx
b/desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx
index 16d7ed865720..19790e9bc110 100644
--- a/desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx
+++ b/desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx
@@ -59,6 +59,6 @@ OUString ExecutableBackendDb::getKeyElementName()
}
-} // namespace
+} // namespace dp_registry::backend::executable
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx
b/desktop/source/deployment/registry/help/dp_help.cxx
index cb76be1d987c..013c0648a49e 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -596,6 +596,6 @@ sdecl::ServiceDecl const serviceDecl(
"com.sun.star.comp.deployment.help.PackageRegistryBackend",
BACKEND_SERVICE_NAME );
-} // namespace
+} // namespace dp_registry
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx
b/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx
index 937609e7bd7a..cd8f65b749c0 100644
--- a/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx
+++ b/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx
@@ -121,6 +121,6 @@ std::vector<OUString> HelpBackendDb::getAllDataUrls()
return getOneChildFromAllEntries("data-url");
}
-} // namespace
+} // namespace dp_registry::backend::help
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/package/dp_extbackenddb.cxx
b/desktop/source/deployment/registry/package/dp_extbackenddb.cxx
index 95904470fcce..c96d1466b51f 100644
--- a/desktop/source/deployment/registry/package/dp_extbackenddb.cxx
+++ b/desktop/source/deployment/registry/package/dp_extbackenddb.cxx
@@ -106,6 +106,6 @@ ExtensionBackendDb::Data
ExtensionBackendDb::getEntry(OUString const & url)
}
}
-} // namespace
+} // namespace dp_registry::backend::bundle
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx
b/desktop/source/deployment/registry/package/dp_package.cxx
index d55ea3319ffd..013955e0f168 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -1591,6 +1591,6 @@ Reference<deployment::XPackageRegistry> create(
return new BackendImpl( args, xComponentContext, xRootRegistry );
}
-} // namespace
+} // namespace dp_registry
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/script/dp_script.cxx
b/desktop/source/deployment/registry/script/dp_script.cxx
index 48b0c15fd507..39de39f2b624 100644
--- a/desktop/source/deployment/registry/script/dp_script.cxx
+++ b/desktop/source/deployment/registry/script/dp_script.cxx
@@ -454,6 +454,6 @@ sdecl::ServiceDecl const serviceDecl(
"com.sun.star.comp.deployment.script.PackageRegistryBackend",
BACKEND_SERVICE_NAME );
-} // namespace
+} // namespace dp_registry::backend::script
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx
b/desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx
index 1f9c7fad19a5..a669f1b58b60 100644
--- a/desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx
+++ b/desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx
@@ -59,6 +59,6 @@ OUString ScriptBackendDb::getKeyElementName()
}
-} // namespace
+} // namespace dp_registry::backend::script
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
index 5268bdf4c042..58c72b6ca943 100644
--- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
+++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
@@ -353,6 +353,6 @@ sdecl::ServiceDecl const serviceDecl(
"com.sun.star.comp.deployment.sfwk.PackageRegistryBackend",
BACKEND_SERVICE_NAME );
-} // namespace
+} // namespace dp_registry::backend::sfwk
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
index 2769bf23eb03..2410f2158555 100644
--- a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
@@ -379,12 +379,8 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(PolygonStrokePrimitive2D,
PRIMITIVE2D_ID_POLYGONSTROKEPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
-namespace drawinglayer::primitive2d
-{
void
PolygonWavePrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer,
const geometry::ViewInformation2D& /*rViewInformation*/) const
{
if(getB2DPolygon().count())
@@ -604,6 +600,7 @@ namespace drawinglayer::primitive2d
// provide unique ID
ImplPrimitive2DIDBlock(PolygonStrokeArrowPrimitive2D,
PRIMITIVE2D_ID_POLYGONSTROKEARROWPRIMITIVE2D)
+ }
} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/primitivetools2d.cxx
b/drawinglayer/source/primitive2d/primitivetools2d.cxx
index 54c4efcd0a27..da0a378a0089 100644
--- a/drawinglayer/source/primitive2d/primitivetools2d.cxx
+++ b/drawinglayer/source/primitive2d/primitivetools2d.cxx
@@ -48,6 +48,9 @@ namespace drawinglayer::primitive2d
BufferedDecompositionPrimitive2D::get2DDecomposition(rVisitor,
rViewInformation);
}
+
+
+
void
ViewportDependentPrimitive2D::get2DDecomposition(Primitive2DDecompositionVisitor&
rVisitor, const geometry::ViewInformation2D& rViewInformation) const
{
::osl::MutexGuard aGuard( m_aMutex );
diff --git a/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx
b/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx
index 16e3974c941f..77f7f659739c 100644
--- a/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx
@@ -59,6 +59,7 @@ namespace drawinglayer::primitive2d
ImplPrimitive2DIDBlock(TextHierarchyParagraphPrimitive2D,
PRIMITIVE2D_ID_TEXTHIERARCHYPARAGRAPHPRIMITIVE2D)
+
TextHierarchyBulletPrimitive2D::TextHierarchyBulletPrimitive2D(const
Primitive2DContainer& rChildren)
: GroupPrimitive2D(rChildren)
{
diff --git a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
index e6907e77de9d..3c7d945a8491 100644
--- a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
@@ -782,6 +782,5 @@ using namespace com::sun::star;
// provide unique ID
ImplPrimitive3DIDBlock(PolygonTubePrimitive3D,
PRIMITIVE3D_ID_POLYGONTUBEPRIMITIVE3D)
-} // end of namespace
-
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/emfio/source/emfuno/xemfparser.cxx
b/emfio/source/emfuno/xemfparser.cxx
index e80dc5631dbd..3297dea8f30a 100644
--- a/emfio/source/emfuno/xemfparser.cxx
+++ b/emfio/source/emfuno/xemfparser.cxx
@@ -40,10 +40,8 @@
using namespace ::com::sun::star;
-namespace emfio
+namespace emfio::emfreader
{
- namespace emfreader
- {
namespace {
class XEmfParser : public ::cppu::WeakAggImplHelper2<
graphic::XEmfParser, lang::XServiceInfo >
@@ -71,14 +69,11 @@ namespace emfio
};
}
- } // end of namespace emfreader
-} // end of namespace emfio
+} // end of namespace emfio::emfreader
// uno functions
-namespace emfio
+namespace emfio::emfreader
{
- namespace emfreader
- {
uno::Sequence< OUString > XEmfParser_getSupportedServiceNames()
{
return uno::Sequence< OUString > { "com.sun.star.graphic.EmfTools"
};
@@ -93,13 +88,10 @@ namespace emfio
{
return static_cast< ::cppu::OWeakObject* >(new
XEmfParser(context));
}
- } // end of namespace emfreader
-} // end of namespace emfio
+} // end of namespace emfio::emfreader
-namespace emfio
+namespace emfio::emfreader
{
- namespace emfreader
- {
XEmfParser::XEmfParser(
uno::Reference< uno::XComponentContext > const & context):
context_(context)
@@ -229,7 +221,6 @@ namespace emfio
return XEmfParser_getSupportedServiceNames();
}
- } // end of namespace emfreader
-} // end of namespace emfio
+} // end of namespace emfio::emfreader
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/config/ldap/ldapaccess.cxx
b/extensions/source/config/ldap/ldapaccess.cxx
index 5f9c6820b6cc..afc36c106b11 100644
--- a/extensions/source/config/ldap/ldapaccess.cxx
+++ b/extensions/source/config/ldap/ldapaccess.cxx
@@ -26,7 +26,7 @@
#include <o3tl/char16_t2wchar_t.hxx>
-namespace extensions { namespace config { namespace ldap {
+namespace extensions::config::ldap {
typedef int LdapErrCode;
@@ -284,6 +284,6 @@ void LdapConnection::initConnection()
}
-} } } // extensions.config.ldap
+} // extensions::config::ldap
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/config/ldap/ldapuserprofilebe.cxx
b/extensions/source/config/ldap/ldapuserprofilebe.cxx
index ccec13a6365e..a6baa51b0505 100644
--- a/extensions/source/config/ldap/ldapuserprofilebe.cxx
+++ b/extensions/source/config/ldap/ldapuserprofilebe.cxx
@@ -37,7 +37,7 @@
#include <osl/security.hxx>
-namespace extensions { namespace config { namespace ldap {
+namespace extensions::config::ldap {
LdapUserProfileBe::LdapUserProfileBe( const
uno::Reference<uno::XComponentContext>& xContext)
: LdapProfileMutexHolder(),
@@ -230,7 +230,7 @@ SAL_CALL LdapUserProfileBe::getSupportedServiceNames()
return getLdapUserProfileBeServiceNames() ;
}
-}}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/config/cache/basecontainer.cxx
b/filter/source/config/cache/basecontainer.cxx
index 31fb9e89c149..60b8332314c2 100644
--- a/filter/source/config/cache/basecontainer.cxx
+++ b/filter/source/config/cache/basecontainer.cxx
@@ -30,8 +30,7 @@
#define LOAD_IMPLICIT
-namespace filter{
- namespace config{
+namespace filter::config{
BaseContainer::BaseContainer()
: BaseLock ( )
@@ -493,7 +492,6 @@ void SAL_CALL BaseContainer::removeFlushListener(const
css::uno::Reference< css:
m_lListener.removeInterface(cppu::UnoType<css::util::XFlushListener>::get(),
xListener);
}
- } // namespace config
-} // namespace filter
+} // namespace filter::config
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/config/cache/cacheitem.cxx
b/filter/source/config/cache/cacheitem.cxx
index b77b3af760b1..fd8af23fe3ce 100644
--- a/filter/source/config/cache/cacheitem.cxx
+++ b/filter/source/config/cache/cacheitem.cxx
@@ -30,8 +30,7 @@
#include <comphelper/sequence.hxx>
-namespace filter{
- namespace config{
+namespace filter::config{
CacheItem::CacheItem()
: SequenceAsHashMap()
@@ -331,7 +330,6 @@ bool CacheItem::dontHaveProps(const CacheItem& lProps) const
FlatDetectionInfo::FlatDetectionInfo() :
bMatchByExtension(false), bMatchByPattern(false),
bPreselectedByDocumentService(false) {}
- } // namespace config
-} // namespace filter
+} // namespace filter::config
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/config/cache/cacheupdatelistener.cxx
b/filter/source/config/cache/cacheupdatelistener.cxx
index 22d7b1bae25c..4a20d29dcb14 100644
--- a/filter/source/config/cache/cacheupdatelistener.cxx
+++ b/filter/source/config/cache/cacheupdatelistener.cxx
@@ -28,8 +28,7 @@
#include <comphelper/processfactory.hxx>
-namespace filter{
- namespace config{
+namespace filter::config{
CacheUpdateListener::CacheUpdateListener(FilterCache &rFilterCache,
const css::uno::Reference<
css::uno::XInterface >& xConfigAccess,
@@ -180,7 +179,6 @@ void SAL_CALL CacheUpdateListener::disposing(const
css::lang::EventObject& aEven
// <- SAFE
}
- } // namespace config
-} // namespace filter
+} // namespace filter::config
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/config/cache/configflush.cxx
b/filter/source/config/cache/configflush.cxx
index 03cb95442abd..f9193712c7dd 100644
--- a/filter/source/config/cache/configflush.cxx
+++ b/filter/source/config/cache/configflush.cxx
@@ -21,8 +21,7 @@
#include <cppuhelper/supportsservice.hxx>
-namespace filter{
- namespace config{
+namespace filter::config{
ConfigFlush::ConfigFlush()
: BaseLock ( )
@@ -118,7 +117,6 @@ css::uno::Reference< css::uno::XInterface >
ConfigFlush::impl_createInstance(con
return css::uno::Reference< css::uno::XInterface >(static_cast<
css::util::XRefreshable* >(pNew), css::uno::UNO_QUERY);
}
- } // namespace config
-} // namespace filter
+} // namespace filter::config
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/config/cache/contenthandlerfactory.cxx
b/filter/source/config/cache/contenthandlerfactory.cxx
index 8a4a1e7e5993..0a17930e7828 100644
--- a/filter/source/config/cache/contenthandlerfactory.cxx
+++ b/filter/source/config/cache/contenthandlerfactory.cxx
@@ -25,8 +25,7 @@
#include <comphelper/sequence.hxx>
-namespace filter{
- namespace config{
+namespace filter::config{
ContentHandlerFactory::ContentHandlerFactory(const css::uno::Reference<
css::uno::XComponentContext >& rxContext)
: m_xContext(rxContext)
@@ -112,7 +111,6 @@ css::uno::Reference< css::uno::XInterface >
ContentHandlerFactory::impl_createIn
return css::uno::Reference< css::uno::XInterface >(static_cast<
css::lang::XMultiServiceFactory* >(pNew), css::uno::UNO_QUERY);
}
- } // namespace config
-} // namespace filter
+} // namespace filter::config
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/config/cache/filtercache.cxx
b/filter/source/config/cache/filtercache.cxx
index 28d0826fb51d..bb928a784c37 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -53,8 +53,7 @@
#include <officecfg/Setup.hxx>
-namespace filter{
- namespace config{
+namespace filter::config{
FilterCache::FilterCache()
: BaseLock ( )
@@ -2213,7 +2212,6 @@ bool FilterCache::impl_isModuleInstalled(const OUString&
sModule)
return false;
}
- } // namespace config
} // namespace filter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/config/cache/filterfactory.cxx
b/filter/source/config/cache/filterfactory.cxx
index 2473dc537949..80ec0225a94a 100644
--- a/filter/source/config/cache/filterfactory.cxx
+++ b/filter/source/config/cache/filterfactory.cxx
@@ -29,8 +29,7 @@
#include <officecfg/TypeDetection/UISort.hxx>
-namespace filter{
- namespace config{
+namespace filter::config{
/** @short define all possible parts of a filter query.
@@ -518,7 +517,6 @@ css::uno::Reference< css::uno::XInterface >
FilterFactory::impl_createInstance(c
return css::uno::Reference< css::uno::XInterface >(static_cast<
css::lang::XMultiServiceFactory* >(pNew), css::uno::UNO_QUERY);
}
- } // namespace config
} // namespace filter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/config/cache/frameloaderfactory.cxx
b/filter/source/config/cache/frameloaderfactory.cxx
index 8f34feed7cd4..00924aa22638 100644
--- a/filter/source/config/cache/frameloaderfactory.cxx
+++ b/filter/source/config/cache/frameloaderfactory.cxx
@@ -25,8 +25,7 @@
#include <comphelper/sequence.hxx>
-namespace filter{
- namespace config{
+namespace filter::config{
FrameLoaderFactory::FrameLoaderFactory(const css::uno::Reference<
css::uno::XComponentContext >& rxContext)
: m_xContext(rxContext)
@@ -110,7 +109,6 @@ css::uno::Reference< css::uno::XInterface >
FrameLoaderFactory::impl_createInsta
return css::uno::Reference< css::uno::XInterface >(static_cast<
css::lang::XMultiServiceFactory* >(pNew), css::uno::UNO_QUERY);
}
- } // namespace config
-} // namespace filter
+} // namespace filter::config
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/config/cache/querytokenizer.cxx
b/filter/source/config/cache/querytokenizer.cxx
index 6d6e9d5e504a..9b64f68fe6d8 100644
--- a/filter/source/config/cache/querytokenizer.cxx
+++ b/filter/source/config/cache/querytokenizer.cxx
@@ -22,8 +22,7 @@
#include <osl/diagnose.h>
-namespace filter{
- namespace config{
+namespace filter::config{
QueryTokenizer::QueryTokenizer(const OUString& sQuery)
@@ -64,7 +63,6 @@ bool QueryTokenizer::valid() const
return m_bValid;
}
- } // namespace config
-} // namespace filter
+} // namespace filter::config
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/config/cache/registration.cxx
b/filter/source/config/cache/registration.cxx
index edc79b52081e..cd5c1ccad8a6 100644
--- a/filter/source/config/cache/registration.cxx
+++ b/filter/source/config/cache/registration.cxx
@@ -29,8 +29,7 @@
#include "configflush.hxx"
-namespace filter{
- namespace config{
+namespace filter::config{
extern "C" SAL_DLLPUBLIC_EXPORT void*
@@ -86,7 +85,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void*
return nullptr;
}
- } // namespace config
-} // namespace filter
+} // namespace filter::config
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/config/cache/typedetection.cxx
b/filter/source/config/cache/typedetection.cxx
index 38e010dc47d9..b552483e22c2 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -47,8 +47,7 @@ using std::endl;
using namespace com::sun::star;
-namespace filter{
- namespace config{
+namespace filter::config{
TypeDetection::TypeDetection(const css::uno::Reference<
css::uno::XComponentContext >& rxContext)
: m_xContext(rxContext)
@@ -1218,7 +1217,6 @@ css::uno::Reference< css::uno::XInterface >
TypeDetection::impl_createInstance(c
return css::uno::Reference< css::uno::XInterface >(static_cast<
css::document::XTypeDetection* >(pNew), css::uno::UNO_QUERY);
}
- } // namespace config
} // namespace filter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/msfilter/msvbahelper.cxx
b/filter/source/msfilter/msvbahelper.cxx
index 8abe76511549..92e53386fcb3 100644
--- a/filter/source/msfilter/msvbahelper.cxx
+++ b/filter/source/msfilter/msvbahelper.cxx
@@ -46,8 +46,7 @@
using namespace ::com::sun::star;
-namespace ooo {
-namespace vba {
+namespace ooo::vba {
const OUString sUrlPart0( "vnd.sun.star.script:" );
const OUString sUrlPart1( "?language=Basic&location=document" );
@@ -775,7 +774,6 @@ void applyShortCutKeyBinding ( const uno::Reference<
frame::XModel >& rxModel, c
}
-} // namespace vba
} // namespace ooo
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/msfilter/rtfutil.cxx
b/filter/source/msfilter/rtfutil.cxx
index 63f6476597a4..ccce7609820c 100644
--- a/filter/source/msfilter/rtfutil.cxx
+++ b/filter/source/msfilter/rtfutil.cxx
@@ -15,9 +15,7 @@
#include <rtl/character.hxx>
#include <tools/stream.hxx>
-namespace msfilter
-{
-namespace rtfutil
+namespace msfilter::rtfutil
{
OString OutHex(sal_uLong nHex, sal_uInt8 nLen)
{
@@ -305,6 +303,5 @@ bool StripMetafileHeader(const sal_uInt8*& rpGraphicAry,
sal_uInt64& rSize)
return false;
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx
index b80056658924..d5bee1968f88 100644
--- a/filter/source/msfilter/util.cxx
+++ b/filter/source/msfilter/util.cxx
@@ -18,8 +18,7 @@
#include <memory>
#include <unordered_map>
-namespace msfilter {
-namespace util {
+namespace msfilter::util {
rtl_TextEncoding getBestTextEncodingFromLocale(const css::lang::Locale
&rLocale)
{
@@ -1324,7 +1323,6 @@ sal_uInt8 TransColToIco( const Color& rCol )
return nCol;
}
-}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx
b/filter/source/odfflatxml/OdfFlatXml.cxx
index e385099c7049..3ac579fc087a 100644
--- a/filter/source/odfflatxml/OdfFlatXml.cxx
+++ b/filter/source/odfflatxml/OdfFlatXml.cxx
@@ -47,8 +47,7 @@ using namespace ::com::sun::star::registry;
using namespace ::com::sun::star::xml;
using namespace ::com::sun::star::xml::sax;
-namespace filter {
- namespace odfflatxml {
+namespace filter::odfflatxml {
namespace {
/*
@@ -103,7 +102,6 @@ namespace filter {
};
}
- }
}
using namespace ::filter::odfflatxml;
diff --git a/forms/source/resource/frm_resource.cxx
b/forms/source/resource/frm_resource.cxx
index 3375ce4ceae6..362c41974192 100644
--- a/forms/source/resource/frm_resource.cxx
+++ b/forms/source/resource/frm_resource.cxx
@@ -20,15 +20,12 @@
#include <frm_resource.hxx>
#include <unotools/resmgr.hxx>
-namespace frm
+namespace frm::ResourceManager
{
- namespace ResourceManager
- {
OUString loadString(const char* pResId)
{
return Translate::get(pResId, Translate::Create("frm"));
}
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/xforms/xformsevent.cxx
b/forms/source/xforms/xformsevent.cxx
index a3943d945dbd..fb9758f1ff54 100644
--- a/forms/source/xforms/xformsevent.cxx
+++ b/forms/source/xforms/xformsevent.cxx
@@ -20,10 +20,7 @@
#include "xformsevent.hxx"
-namespace com {
-namespace sun {
-namespace star {
-namespace xforms {
+namespace com::sun::star::xforms {
void SAL_CALL XFormsEventConcrete::initXFormsEvent(const OUString& typeArg,
sal_Bool canBubbleArg, sal_Bool cancelableArg)
@@ -81,6 +78,6 @@ void SAL_CALL XFormsEventConcrete::initEvent(const OUString&
eventTypeArg, sal_B
m_cancelable = cancelableArg;
}
-} } } }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/xforms/xpathlib/extension.cxx
b/forms/source/xforms/xpathlib/extension.cxx
index 914e3b8010e7..10725ae3a990 100644
--- a/forms/source/xforms/xpathlib/extension.cxx
+++ b/forms/source/xforms/xpathlib/extension.cxx
@@ -24,9 +24,9 @@
#include "xpathlib.hxx"
#include <services.hxx>
-namespace com { namespace sun { namespace star { namespace uno {
+namespace com::sun::star::uno {
class XComponentContext;
-} } } }
+}
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
diff --git a/registry/tools/fileurl.cxx b/registry/tools/fileurl.cxx
index 8495b1fce226..dec3be5e5b0d 100644
--- a/registry/tools/fileurl.cxx
+++ b/registry/tools/fileurl.cxx
@@ -34,9 +34,7 @@
using osl::FileBase;
-namespace registry
-{
-namespace tools
+namespace registry::tools
{
OUString convertToFileUrl(char const * filename, sal_Int32 length)
@@ -76,7 +74,6 @@ OUString convertToFileUrl(char const * filename, sal_Int32
length)
return uFileUrl;
}
-} // namespace tools
-} // namespace registry
+} // namespace registry::tools
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/tools/options.cxx b/registry/tools/options.cxx
index e9b9c23950bf..81d1131f75c2 100644
--- a/registry/tools/options.cxx
+++ b/registry/tools/options.cxx
@@ -23,9 +23,7 @@
#include <stdio.h>
-namespace registry
-{
-namespace tools
+namespace registry::tools
{
Options::Options (char const * program)
@@ -141,7 +139,6 @@ bool Options::printUsage() const
return false;
}
-} // namespace tools
-} // namespace registry
+} // namespace registry::tools
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/file_url.cxx b/sal/osl/unx/file_url.cxx
index 011998838db2..9dade1c3f09a 100644
--- a/sal/osl/unx/file_url.cxx
+++ b/sal/osl/unx/file_url.cxx
@@ -743,8 +743,7 @@ oslFileError osl_getAbsoluteFileURL(
return rc;
}
-namespace osl {
-namespace detail {
+namespace osl::detail {
/**
No separate error code if unicode to text conversion or getenv fails
because for the
@@ -762,7 +761,6 @@ namespace detail {
return bfound;
}
}
-}
namespace
{
diff --git a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx
b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx
index 80ce83b1d2d0..f5168b60da89 100644
--- a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx
+++ b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx
@@ -16,7 +16,7 @@
#include <cppunit/extensions/HelperMacros.h>
#include <rtl/ustrbuf.hxx>
-namespace test { namespace oustringbuffer {
+namespace test::oustringbuffer {
class AppendChar: public CppUnit::TestFixture {
private:
@@ -36,7 +36,7 @@ void AppendChar::testAppendChar() {
CPPUNIT_ASSERT_EQUAL(u'a', s[0]);
}
-} }
+}
CPPUNIT_TEST_SUITE_REGISTRATION(test::oustringbuffer::AppendChar);
diff --git a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx
b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx
index 139b87bd4295..66231d8b856f 100644
--- a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx
+++ b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx
@@ -24,7 +24,7 @@
#include <rtl/ustrbuf.hxx>
#include <rtl/ustring.hxx>
-namespace test { namespace oustringbuffer {
+namespace test::oustringbuffer {
class ToString: public CppUnit::TestFixture {
private:
@@ -35,7 +35,7 @@ private:
CPPUNIT_TEST_SUITE_END();
};
-} }
+}
CPPUNIT_TEST_SUITE_REGISTRATION(test::oustringbuffer::ToString);
diff --git a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx
b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx
index 53f738285761..80643df2eba0 100644
--- a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx
+++ b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx
@@ -26,7 +26,7 @@
#include <rtl/ustring.h>
#include <rtl/ustring.hxx>
-namespace test { namespace oustringbuffer {
+namespace test::oustringbuffer {
class Utf32: public CppUnit::TestFixture {
private:
@@ -40,7 +40,7 @@ private:
CPPUNIT_TEST_SUITE_END();
};
-} }
+}
CPPUNIT_TEST_SUITE_REGISTRATION(test::oustringbuffer::Utf32);
diff --git a/sal/qa/rtl/strings/test_ostring_concat.cxx
b/sal/qa/rtl/strings/test_ostring_concat.cxx
index fc310dbb58bd..bcb4a3e3bb23 100644
--- a/sal/qa/rtl/strings/test_ostring_concat.cxx
+++ b/sal/qa/rtl/strings/test_ostring_concat.cxx
@@ -37,7 +37,7 @@ template<> struct assertion_traits<std::type_info>
};
} // namespace
-namespace test { namespace ostring {
+namespace test::ostring {
class StringConcat : public CppUnit::TestFixture
{
@@ -176,7 +176,7 @@ void test::ostring::StringConcat::checkInvalid()
#endif
}
-}} // namespace
+} // namespace
CPPUNIT_TEST_SUITE_REGISTRATION(test::ostring::StringConcat);
diff --git a/sal/qa/rtl/strings/test_ostring_stringliterals.cxx
b/sal/qa/rtl/strings/test_ostring_stringliterals.cxx
index 96272cdc9844..e513d56a5d8f 100644
--- a/sal/qa/rtl/strings/test_ostring_stringliterals.cxx
+++ b/sal/qa/rtl/strings/test_ostring_stringliterals.cxx
@@ -21,7 +21,7 @@ bool rtl_string_unittest_const_literal;
bool rtl_string_unittest_const_literal_function;
static bool rtl_string_unittest_non_const_literal_function;
-namespace test { namespace ostring {
+namespace test::ostring {
class StringLiterals: public CppUnit::TestFixture
{
@@ -256,7 +256,7 @@ void test::ostring::StringLiterals::checkBuffer()
#undef CONST_CTOR_USED
-}} // namespace
+} // namespace
CPPUNIT_TEST_SUITE_REGISTRATION(test::ostring::StringLiterals);
diff --git a/sal/qa/rtl/strings/test_oustring_compare.cxx
b/sal/qa/rtl/strings/test_oustring_compare.cxx
index 2f4172e51493..c06d40c4d653 100644
--- a/sal/qa/rtl/strings/test_oustring_compare.cxx
+++ b/sal/qa/rtl/strings/test_oustring_compare.cxx
@@ -23,7 +23,7 @@
#include <rtl/string.h>
#include <rtl/ustring.hxx>
-namespace test { namespace oustring {
+namespace test::oustring {
class Compare: public CppUnit::TestFixture
{
@@ -39,7 +39,7 @@ CPPUNIT_TEST(compareTo);
CPPUNIT_TEST_SUITE_END();
};
-} }
+}
CPPUNIT_TEST_SUITE_REGISTRATION(test::oustring::Compare);
diff --git a/sal/qa/rtl/strings/test_oustring_concat.cxx
b/sal/qa/rtl/strings/test_oustring_concat.cxx
index b67a2938ea36..bae7b65bee7e 100644
--- a/sal/qa/rtl/strings/test_oustring_concat.cxx
+++ b/sal/qa/rtl/strings/test_oustring_concat.cxx
@@ -36,7 +36,7 @@ template<> struct assertion_traits<std::type_info>
};
} // namespace
-namespace test { namespace oustring {
+namespace test::oustring {
class StringConcat : public CppUnit::TestFixture
{
@@ -187,7 +187,7 @@ void test::oustring::StringConcat::checkInvalid()
#endif
}
-}} // namespace
+} // namespace
CPPUNIT_TEST_SUITE_REGISTRATION(test::oustring::StringConcat);
diff --git a/sal/qa/rtl/strings/test_oustring_convert.cxx
b/sal/qa/rtl/strings/test_oustring_convert.cxx
index 20d3a9221c79..cfae69f0012a 100644
--- a/sal/qa/rtl/strings/test_oustring_convert.cxx
+++ b/sal/qa/rtl/strings/test_oustring_convert.cxx
@@ -25,7 +25,7 @@
#include <rtl/ustring.hxx>
#include <sal/macros.h>
-namespace test { namespace oustring {
+namespace test::oustring {
class Convert: public CppUnit::TestFixture
{
@@ -37,7 +37,7 @@ private:
CPPUNIT_TEST_SUITE_END();
};
-} }
+}
CPPUNIT_TEST_SUITE_REGISTRATION(test::oustring::Convert);
diff --git a/sal/qa/rtl/strings/test_oustring_endswith.cxx
b/sal/qa/rtl/strings/test_oustring_endswith.cxx
index 33858e12ae23..7649de312f81 100644
--- a/sal/qa/rtl/strings/test_oustring_endswith.cxx
+++ b/sal/qa/rtl/strings/test_oustring_endswith.cxx
@@ -27,7 +27,7 @@
#include <rtl/ustring.hxx>
#include <sal/macros.h>
-namespace test { namespace oustring {
+namespace test::oustring {
class EndsWith: public CppUnit::TestFixture
{
@@ -39,7 +39,7 @@ private:
CPPUNIT_TEST_SUITE_END();
};
-} }
+}
CPPUNIT_TEST_SUITE_REGISTRATION(test::oustring::EndsWith);
diff --git a/sal/qa/rtl/strings/test_oustring_startswith.cxx
b/sal/qa/rtl/strings/test_oustring_startswith.cxx
index 43d4c9e921c4..a74671e6eef1 100644
--- a/sal/qa/rtl/strings/test_oustring_startswith.cxx
+++ b/sal/qa/rtl/strings/test_oustring_startswith.cxx
@@ -12,7 +12,7 @@
#include <cppunit/extensions/HelperMacros.h>
#include <rtl/ustring.hxx>
-namespace test { namespace oustring {
+namespace test::oustring {
class StartsWith: public CppUnit::TestFixture
{
@@ -24,7 +24,7 @@ private:
CPPUNIT_TEST_SUITE_END();
};
-} }
+}
CPPUNIT_TEST_SUITE_REGISTRATION(test::oustring::StartsWith);
diff --git a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
index 9c7116ef5edb..9a014557ff59 100644
--- a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
+++ b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
@@ -26,7 +26,7 @@
extern bool rtl_string_unittest_const_literal;
bool rtl_string_unittest_invalid_conversion;
-namespace test { namespace oustring {
+namespace test::oustring {
class StringLiterals: public CppUnit::TestFixture
{
@@ -424,7 +424,7 @@ void test::oustring::StringLiterals::checkUtf16() {
CPPUNIT_ASSERT_EQUAL(sal_Int32(5), b.lastIndexOf(u"ab"));
}
-}} // namespace
+} // namespace
CPPUNIT_TEST_SUITE_REGISTRATION(test::oustring::StringLiterals);
diff --git a/sal/qa/rtl/strings/test_strings_valuex.cxx
b/sal/qa/rtl/strings/test_strings_valuex.cxx
index 85fee5f00dd8..6c9c836442e1 100644
--- a/sal/qa/rtl/strings/test_strings_valuex.cxx
+++ b/sal/qa/rtl/strings/test_strings_valuex.cxx
@@ -13,7 +13,7 @@
#include <rtl/ustring.hxx>
#include <iostream>
-namespace test { namespace strings {
+namespace test::strings {
class valueX : public CppUnit::TestFixture {
public:
@@ -34,7 +34,7 @@ public:
CPPUNIT_TEST_SUITE_END();
};
-} }
+}
CPPUNIT_TEST_SUITE_REGISTRATION(test::strings::valueX);
diff --git a/scaddins/source/analysis/analysishelper.cxx
b/scaddins/source/analysis/analysishelper.cxx
index 55520469728c..3206b650b30b 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -156,7 +156,7 @@ const FuncDataBase pFuncDatas[] =
};
#undef FUNCDATA
-namespace sca { namespace analysis {
+namespace sca::analysis {
sal_uInt16 DaysInMonth( sal_uInt16 nMonth, sal_uInt16 nYear )
{
@@ -2808,6 +2808,6 @@ sal_Int32 ScaAnyConverter::getInt32(
return nResult;
}
-} }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/scaddins/source/analysis/bessel.cxx
b/scaddins/source/analysis/bessel.cxx
index ab87ca0e10ce..bb6023a4f2f9 100644
--- a/scaddins/source/analysis/bessel.cxx
+++ b/scaddins/source/analysis/bessel.cxx
@@ -27,8 +27,7 @@
using ::com::sun::star::lang::IllegalArgumentException;
using ::com::sun::star::sheet::NoConvergenceException;
-namespace sca {
-namespace analysis {
+namespace sca::analysis {
const double f_PI = 3.1415926535897932385;
const double f_PI_DIV_2 = f_PI / 2.0;
@@ -452,7 +451,6 @@ double BesselY( double fNum, sal_Int32 nOrder )
}
}
-} // namespace analysis
-} // namespace sca
+} // namespace sca::analysis
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/scaddins/source/pricing/black_scholes.cxx
b/scaddins/source/pricing/black_scholes.cxx
index 126901ad5c20..57344d85cbec 100644
--- a/scaddins/source/pricing/black_scholes.cxx
+++ b/scaddins/source/pricing/black_scholes.cxx
@@ -78,10 +78,7 @@
// underruns, accuracy, etc
-namespace sca {
-namespace pricing {
-
-namespace bs {
+namespace sca::pricing::bs {
// helper functions
@@ -937,9 +934,6 @@ double prob_in_money(double S, double vol, double mu,
return val;
}
-} // namespace bs
-
-} // namespace pricing
} // namespace sca
diff --git a/sdext/source/presenter/PresenterAccessibility.cxx
b/sdext/source/presenter/PresenterAccessibility.cxx
index 59397990458e..35d094d8bf87 100644
--- a/sdext/source/presenter/PresenterAccessibility.cxx
+++ b/sdext/source/presenter/PresenterAccessibility.cxx
@@ -51,7 +51,7 @@ using namespace ::com::sun::star::drawing::framework;
//===== PresenterAccessibleObject =============================================
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
namespace {
typedef ::cppu::WeakComponentImplHelper <
@@ -1837,6 +1837,6 @@ void AccessibleFocusManager::FocusObject (
rpObject->SetIsFocused(true);
}
-} } // end of namespace ::sd::presenter
+} // end of namespace ::sd::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterBitmapContainer.cxx
b/sdext/source/presenter/PresenterBitmapContainer.cxx
index 5fecfe01ca1b..1ddaaff8e671 100644
--- a/sdext/source/presenter/PresenterBitmapContainer.cxx
+++ b/sdext/source/presenter/PresenterBitmapContainer.cxx
@@ -28,7 +28,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::std;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
//===== PresenterBitmapContainer ==============================================
@@ -406,6 +406,6 @@ void PresenterBitmapContainer::BitmapDescriptor::SetBitmap (
}
}
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterButton.cxx
b/sdext/source/presenter/PresenterButton.cxx
index 099a99411d47..f663e97e943c 100644
--- a/sdext/source/presenter/PresenterButton.cxx
+++ b/sdext/source/presenter/PresenterButton.cxx
@@ -32,7 +32,7 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
const static double gnHorizontalBorder (15);
const static double gnVerticalBorder (5);
@@ -448,6 +448,6 @@ void PresenterButton::ThrowIfDisposed() const
}
}
-} } // end of namespace sdext::presenter
+} // end of namespace sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterCanvasHelper.cxx
b/sdext/source/presenter/PresenterCanvasHelper.cxx
index 115f8304ecd1..d2dbf5741dd8 100644
--- a/sdext/source/presenter/PresenterCanvasHelper.cxx
+++ b/sdext/source/presenter/PresenterCanvasHelper.cxx
@@ -26,7 +26,7 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
PresenterCanvasHelper::PresenterCanvasHelper()
: maDefaultViewState(
@@ -283,6 +283,6 @@ css::geometry::RealSize2D
PresenterCanvasHelper::GetTextSize (
return css::geometry::RealSize2D(aTextBBox.X2 - aTextBBox.X1, aTextBBox.Y2
- aTextBBox.Y1);
}
-} } // end of namespace sdext::presenter
+} // end of namespace sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterComponent.cxx
b/sdext/source/presenter/PresenterComponent.cxx
index 2d8fb4ce6353..943270928d9e 100644
--- a/sdext/source/presenter/PresenterComponent.cxx
+++ b/sdext/source/presenter/PresenterComponent.cxx
@@ -28,7 +28,7 @@ using namespace ::com::sun::star::uno;
using namespace cppu;
using namespace osl;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
static const struct ImplementationEntry gServiceEntries[] =
{
@@ -53,6 +53,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void *
presenter_component_getFactory(
return component_getFactoryHelper( pImplName, pServiceManager,
pRegistryKey , gServiceEntries);
}
-} } // end of namespace sdext::presenter
+} // end of namespace sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterConfigurationAccess.cxx
b/sdext/source/presenter/PresenterConfigurationAccess.cxx
index c83376fab5a8..b5f063eb7778 100644
--- a/sdext/source/presenter/PresenterConfigurationAccess.cxx
+++ b/sdext/source/presenter/PresenterConfigurationAccess.cxx
@@ -31,7 +31,7 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
const OUString PresenterConfigurationAccess::msPresenterScreenRootName =
"/org.openoffice.Office.PresenterScreen/";
@@ -274,6 +274,6 @@ Any PresenterConfigurationAccess::GetProperty (
return Any();
}
-} } // end of namespace sdext::tools
+} // end of namespace sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterController.cxx
b/sdext/source/presenter/PresenterController.cxx
index 7012e0ae177a..8d378d15f2f7 100644
--- a/sdext/source/presenter/PresenterController.cxx
+++ b/sdext/source/presenter/PresenterController.cxx
@@ -65,7 +65,7 @@ namespace {
const sal_Int32 ConfigurationUpdateEndEventType = 2;
}
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
IPresentationTime::~IPresentationTime()
{
@@ -1157,6 +1157,6 @@ void PresenterController::SwitchMonitors()
pScreen->SwitchMonitors();
}
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.cxx
b/sdext/source/presenter/PresenterCurrentSlideObserver.cxx
index 4e74e070113c..b7769219c7fe 100644
--- a/sdext/source/presenter/PresenterCurrentSlideObserver.cxx
+++ b/sdext/source/presenter/PresenterCurrentSlideObserver.cxx
@@ -22,7 +22,7 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
//===== PresenterCurrentSlideObserver =========================================
@@ -122,6 +122,6 @@ void SAL_CALL PresenterCurrentSlideObserver::disposing (
mxSlideShowController = nullptr;
}
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterFrameworkObserver.cxx
b/sdext/source/presenter/PresenterFrameworkObserver.cxx
index 1bdfd979eaf0..0f56da0b0566 100644
--- a/sdext/source/presenter/PresenterFrameworkObserver.cxx
+++ b/sdext/source/presenter/PresenterFrameworkObserver.cxx
@@ -25,7 +25,7 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::drawing::framework;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
PresenterFrameworkObserver::PresenterFrameworkObserver (
const
css::uno::Reference<css::drawing::framework::XConfigurationController>&rxController,
@@ -104,6 +104,6 @@ void SAL_CALL
PresenterFrameworkObserver::notifyConfigurationChange (
dispose();
}
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterGeometryHelper.cxx
b/sdext/source/presenter/PresenterGeometryHelper.cxx
index afa401988c8a..3d59f259ea7b 100644
--- a/sdext/source/presenter/PresenterGeometryHelper.cxx
+++ b/sdext/source/presenter/PresenterGeometryHelper.cxx
@@ -49,7 +49,7 @@ sal_Int32 Height (const sal_Int32 nTop, const sal_Int32
nBottom)
} // end of anonymous namespace
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
sal_Int32 PresenterGeometryHelper::Floor (const double nValue)
{
@@ -246,6 +246,6 @@ Reference<rendering::XPolyPolygon2D>
PresenterGeometryHelper::CreatePolygon(
return xPolygon;
}
-} }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterHelpView.cxx
b/sdext/source/presenter/PresenterHelpView.cxx
index b9e2c45f8651..9f0a55de4068 100644
--- a/sdext/source/presenter/PresenterHelpView.cxx
+++ b/sdext/source/presenter/PresenterHelpView.cxx
@@ -38,7 +38,7 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::drawing::framework;
using ::std::vector;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
namespace {
const static sal_Int32 gnHorizontalGap (20);
@@ -749,6 +749,6 @@ void Block::Update (
} // end of anonymous namespace
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterHelper.cxx
b/sdext/source/presenter/PresenterHelper.cxx
index a177811f6b0f..889739da0ac6 100644
--- a/sdext/source/presenter/PresenterHelper.cxx
+++ b/sdext/source/presenter/PresenterHelper.cxx
@@ -26,7 +26,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::presentation;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
const OUString PresenterHelper::msPaneURLPrefix( "private:resource/pane/");
const OUString PresenterHelper::msCenterPaneURL( msPaneURLPrefix +
"CenterPane");
@@ -62,6 +62,6 @@ Reference<presentation::XSlideShowController>
PresenterHelper::GetSlideShowContr
return xSlideShowController;
}
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterNotesView.cxx
b/sdext/source/presenter/PresenterNotesView.cxx
index 62e054c4e94d..c271875fe14a 100644
--- a/sdext/source/presenter/PresenterNotesView.cxx
+++ b/sdext/source/presenter/PresenterNotesView.cxx
@@ -46,7 +46,7 @@ static const sal_Int32 gnSpaceBelowSeparator (10);
static const sal_Int32 gnSpaceAboveSeparator (10);
static const double gnLineScrollFactor (1.2);
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
//===== PresenterNotesView ====================================================
@@ -656,6 +656,6 @@ void PresenterNotesView::UpdateScrollBar()
mpScrollBar->CheckValues();
}
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterPaintManager.cxx
b/sdext/source/presenter/PresenterPaintManager.cxx
index b7b55fb1ddbd..812b7249aea2 100644
--- a/sdext/source/presenter/PresenterPaintManager.cxx
+++ b/sdext/source/presenter/PresenterPaintManager.cxx
@@ -26,7 +26,7 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
PresenterPaintManager::PresenterPaintManager (
const css::uno::Reference<css::awt::XWindow>& rxParentWindow,
@@ -136,6 +136,6 @@ void PresenterPaintManager::Invalidate (
}
}
-} }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterPane.cxx
b/sdext/source/presenter/PresenterPane.cxx
index b7e0436294b8..88628e72cd5e 100644
--- a/sdext/source/presenter/PresenterPane.cxx
+++ b/sdext/source/presenter/PresenterPane.cxx
@@ -26,7 +26,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::drawing::framework;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
//===== PresenterPane =========================================================
@@ -165,6 +165,6 @@ void PresenterPane::UpdateBoundingBox()
maBoundingBox = awt::Rectangle();
}
-} } // end of namespace ::sd::presenter
+} // end of namespace ::sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterPaneBase.cxx
b/sdext/source/presenter/PresenterPaneBase.cxx
index dcd7a651688b..29e7e4b046d8 100644
--- a/sdext/source/presenter/PresenterPaneBase.cxx
+++ b/sdext/source/presenter/PresenterPaneBase.cxx
@@ -27,7 +27,7 @@ using namespace css;
using namespace css::uno;
using namespace css::drawing::framework;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
//===== PresenterPaneBase =====================================================
@@ -346,6 +346,6 @@ void PresenterPaneBase::ThrowIfDisposed()
}
}
-} } // end of namespace ::sd::presenter
+} // end of namespace ::sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.cxx
b/sdext/source/presenter/PresenterPaneBorderPainter.cxx
index 34565b7343ea..966306268a0b 100644
--- a/sdext/source/presenter/PresenterPaneBorderPainter.cxx
+++ b/sdext/source/presenter/PresenterPaneBorderPainter.cxx
@@ -35,7 +35,7 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
namespace {
class BorderSize
@@ -895,6 +895,6 @@ SharedBitmapDescriptor RendererPaneStyle::GetBitmap(
} // end of anonymous namespace
-} } // end of namespace ::sd::presenter
+} // end of namespace ::sd::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterPaneContainer.cxx
b/sdext/source/presenter/PresenterPaneContainer.cxx
index e7f91f879a6a..7c9c1a5fc2e9 100644
--- a/sdext/source/presenter/PresenterPaneContainer.cxx
+++ b/sdext/source/presenter/PresenterPaneContainer.cxx
@@ -24,7 +24,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::drawing::framework;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
PresenterPaneContainer::PresenterPaneContainer (
const Reference<XComponentContext>& rxContext)
@@ -328,6 +328,6 @@ void
PresenterPaneContainer::PaneDescriptor::SetActivationState (const bool bIsA
mbIsActive = bIsActive;
}
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterPaneFactory.cxx
b/sdext/source/presenter/PresenterPaneFactory.cxx
index f7e6d3b0106f..a22bfa246c1b 100644
--- a/sdext/source/presenter/PresenterPaneFactory.cxx
+++ b/sdext/source/presenter/PresenterPaneFactory.cxx
@@ -31,7 +31,7 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::drawing::framework;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
const OUString PresenterPaneFactory::msCurrentSlidePreviewPaneURL(
"private:resource/pane/Presenter/Pane1");
@@ -299,6 +299,6 @@ void PresenterPaneFactory::ThrowIfDisposed() const
}
}
-} } // end of namespace sdext::presenter
+} // end of namespace sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx
b/sdext/source/presenter/PresenterProtocolHandler.cxx
index fc07441e673f..4cf211598811 100644
--- a/sdext/source/presenter/PresenterProtocolHandler.cxx
+++ b/sdext/source/presenter/PresenterProtocolHandler.cxx
@@ -32,7 +32,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::drawing::framework;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
namespace {
class Command
@@ -730,6 +730,6 @@ Any NotesFontSizeCommand::GetState() const
return Any();
}
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterScreen.cxx
b/sdext/source/presenter/PresenterScreen.cxx
index a0ddd7fe9b4d..bbb754050e8f 100644
--- a/sdext/source/presenter/PresenterScreen.cxx
+++ b/sdext/source/presenter/PresenterScreen.cxx
@@ -45,7 +45,7 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::presentation;
using namespace ::com::sun::star::drawing::framework;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
namespace {
typedef ::cppu::WeakComponentImplHelper <
@@ -794,6 +794,6 @@ void PresenterScreen::SetupView(
rViewInitialization);
}
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterScrollBar.cxx
b/sdext/source/presenter/PresenterScrollBar.cxx
index cf54dee57562..58a34d0f73f7 100644
--- a/sdext/source/presenter/PresenterScrollBar.cxx
+++ b/sdext/source/presenter/PresenterScrollBar.cxx
@@ -38,7 +38,7 @@ using namespace ::com::sun::star::uno;
const static double gnScrollBarGap (10);
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
//===== PresenterScrollBar::MousePressRepeater ================================
@@ -833,6 +833,6 @@ void PresenterScrollBar::MousePressRepeater::Execute()
}
}
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterSlidePreview.cxx
b/sdext/source/presenter/PresenterSlidePreview.cxx
index 106b2ac265df..9e22850de7cc 100644
--- a/sdext/source/presenter/PresenterSlidePreview.cxx
+++ b/sdext/source/presenter/PresenterSlidePreview.cxx
@@ -36,7 +36,7 @@ namespace
const sal_Int16 gnSuperSampleFactor = 2;
}
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
//===== PresenterSlidePreview =================================================
@@ -352,6 +352,6 @@ void PresenterSlidePreview::ThrowIfDisposed()
}
}
-} } // end of namespace ::sd::presenter
+} // end of namespace ::sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx
b/sdext/source/presenter/PresenterSlideShowView.cxx
index 2a74192875b8..609b2d8566eb 100644
--- a/sdext/source/presenter/PresenterSlideShowView.cxx
+++ b/sdext/source/presenter/PresenterSlideShowView.cxx
@@ -42,7 +42,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::drawing::framework;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
//===== PresenterSlideShowView ================================================
@@ -964,6 +964,6 @@ void PresenterSlideShowView::impl_addAndConfigureView()
mxSlideShow->setProperty(aProperty);
}
-} } // end of namespace ::sd::presenter
+} // end of namespace ::sd::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx
b/sdext/source/presenter/PresenterSlideSorter.cxx
index 41ad2304c4f0..681eb55a1cc6 100644
--- a/sdext/source/presenter/PresenterSlideSorter.cxx
+++ b/sdext/source/presenter/PresenterSlideSorter.cxx
@@ -61,7 +61,7 @@ namespace {
const static sal_Int32 gnVerticalButtonPadding (gnVerticalGap);
}
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
namespace {
sal_Int32 round (const double nValue) { return
sal::static_int_cast<sal_Int32>(0.5 + nValue); }
@@ -1955,6 +1955,6 @@ void
PresenterSlideSorter::CurrentSlideFrameRenderer::PaintBitmapTiled(
}
}
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterSprite.cxx
b/sdext/source/presenter/PresenterSprite.cxx
index 819fb82daa90..d58eefd21412 100644
--- a/sdext/source/presenter/PresenterSprite.cxx
+++ b/sdext/source/presenter/PresenterSprite.cxx
@@ -28,7 +28,7 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::UNO_QUERY;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
PresenterSprite::PresenterSprite()
: mxSpriteFactory(),
@@ -160,6 +160,6 @@ void PresenterSprite::DisposeSprite()
}
}
-} } //end of namespace sdext::presenter
+} //end of namespace sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterSpritePane.cxx
b/sdext/source/presenter/PresenterSpritePane.cxx
index 719224997b90..8ce72a66a3f7 100644
--- a/sdext/source/presenter/PresenterSpritePane.cxx
+++ b/sdext/source/presenter/PresenterSpritePane.cxx
@@ -24,7 +24,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::drawing::framework;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
//===== PresenterSpritePane
=========================================================
@@ -168,6 +168,6 @@ void PresenterSpritePane::CreateCanvases (
UpdateCanvases();
}
-} } // end of namespace ::sd::presenter
+} // end of namespace ::sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterTextView.cxx
b/sdext/source/presenter/PresenterTextView.cxx
index f56c5ed812d2..c6ef1a0c08bc 100644
--- a/sdext/source/presenter/PresenterTextView.cxx
+++ b/sdext/source/presenter/PresenterTextView.cxx
@@ -58,7 +58,7 @@ namespace {
}
}
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
//===== PresenterTextView =====================================================
@@ -1199,6 +1199,6 @@ void PresenterTextParagraph::Line::ProvideLayoutedLine (
}
}
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterTheme.cxx
b/sdext/source/presenter/PresenterTheme.cxx
index 23cf19e515b7..282cdbf8a2e5 100644
--- a/sdext/source/presenter/PresenterTheme.cxx
+++ b/sdext/source/presenter/PresenterTheme.cxx
@@ -31,7 +31,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::std;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
namespace {
@@ -1075,6 +1075,6 @@ void StyleAssociationContainer::ProcessStyleAssociation(
} // end of anonymous namespace
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterTimer.cxx
b/sdext/source/presenter/PresenterTimer.cxx
index 55916b1bae38..a08c3e6b8275 100644
--- a/sdext/source/presenter/PresenterTimer.cxx
+++ b/sdext/source/presenter/PresenterTimer.cxx
@@ -34,7 +34,7 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
namespace {
class TimerTask
@@ -575,6 +575,6 @@ void SAL_CALL PresenterClockTimer::notify (const
css::uno::Any&)
}
}
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterToolBar.cxx
b/sdext/source/presenter/PresenterToolBar.cxx
index 226c8283afaf..206034c7ee7e 100644
--- a/sdext/source/presenter/PresenterToolBar.cxx
+++ b/sdext/source/presenter/PresenterToolBar.cxx
@@ -45,7 +45,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::drawing::framework;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
static const sal_Int32 gnGapSize (20);
@@ -1924,6 +1924,6 @@ bool HorizontalSeparator::IsFilling() const
} // end of anonymous namespace
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterUIPainter.cxx
b/sdext/source/presenter/PresenterUIPainter.cxx
index 75ef2838879a..7b37736ff39d 100644
--- a/sdext/source/presenter/PresenterUIPainter.cxx
+++ b/sdext/source/presenter/PresenterUIPainter.cxx
@@ -29,7 +29,7 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
void PresenterUIPainter::PaintHorizontalBitmapComposite (
const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
@@ -236,6 +236,6 @@ void PresenterUIPainter::PaintVerticalBitmapComposite (
}
}
-} } // end of namespace sdext::presenter
+} // end of namespace sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterViewFactory.cxx
b/sdext/source/presenter/PresenterViewFactory.cxx
index 71b3a24e0625..bed41bddc978 100644
--- a/sdext/source/presenter/PresenterViewFactory.cxx
+++ b/sdext/source/presenter/PresenterViewFactory.cxx
@@ -31,7 +31,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::drawing::framework;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
const OUString PresenterViewFactory::msCurrentSlidePreviewViewURL(
"private:resource/view/Presenter/CurrentSlidePreview");
@@ -514,6 +514,6 @@ void CachablePresenterView::ReleaseView()
{
}
-} }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterWindowManager.cxx
b/sdext/source/presenter/PresenterWindowManager.cxx
index b4b262c1f761..0a4479882050 100644
--- a/sdext/source/presenter/PresenterWindowManager.cxx
+++ b/sdext/source/presenter/PresenterWindowManager.cxx
@@ -42,7 +42,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::drawing::framework;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
//===== PresenterWindowManager ================================================
@@ -1034,6 +1034,6 @@ void PresenterWindowManager::ThrowIfDisposed() const
}
}
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 2767c5d0d9d2..5e363821be93 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -4090,7 +4090,7 @@ Reference< frame::XController2 > SAL_CALL
SfxBaseModel::createDefaultViewControl
}
-namespace sfx { namespace intern {
+namespace sfx::intern {
/** a class which, in its dtor, cleans up various objects (well, at the
moment only the frame) collected during
the creation of a document view, unless the creation was successful.
@@ -4128,7 +4128,7 @@ namespace sfx { namespace intern {
bool m_bSuccess;
SfxFrameWeakRef m_aWeakFrame;
};
-} }
+}
SfxViewFrame* SfxBaseModel::FindOrCreateViewFrame_Impl( const Reference<
XFrame >& i_rFrame, ::sfx::intern::ViewCreationGuard& i_rGuard ) const
diff --git a/sfx2/source/sidebar/Accessible.cxx
b/sfx2/source/sidebar/Accessible.cxx
index 6cb4dd4a87a5..bae5ac590cd6 100644
--- a/sfx2/source/sidebar/Accessible.cxx
+++ b/sfx2/source/sidebar/Accessible.cxx
@@ -22,7 +22,7 @@
using namespace css;
using namespace css::uno;
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
Accessible::Accessible (
const Reference<accessibility::XAccessibleContext>& rxContext)
@@ -47,6 +47,6 @@ Reference<accessibility::XAccessibleContext> SAL_CALL
Accessible::getAccessibleC
return mxContext;
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/AccessibleTitleBar.cxx
b/sfx2/source/sidebar/AccessibleTitleBar.cxx
index c827194054c9..f6343d1c795b 100644
--- a/sfx2/source/sidebar/AccessibleTitleBar.cxx
+++ b/sfx2/source/sidebar/AccessibleTitleBar.cxx
@@ -28,7 +28,7 @@
using namespace css;
using namespace css::uno;
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
Reference<accessibility::XAccessible> AccessibleTitleBar::Create (TitleBar&
rTitleBar)
{
@@ -55,6 +55,6 @@ void AccessibleTitleBar::FillAccessibleStateSet
(utl::AccessibleStateSetHelper&
rStateSet.AddState(accessibility::AccessibleStateType::FOCUSABLE);
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/AsynchronousCall.cxx
b/sfx2/source/sidebar/AsynchronousCall.cxx
index 0013ea5e5ceb..151accc5d543 100644
--- a/sfx2/source/sidebar/AsynchronousCall.cxx
+++ b/sfx2/source/sidebar/AsynchronousCall.cxx
@@ -20,7 +20,7 @@
#include <sfx2/sidebar/AsynchronousCall.hxx>
#include <vcl/svapp.hxx>
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
AsynchronousCall::AsynchronousCall()
: maAction(),
@@ -72,6 +72,6 @@ IMPL_LINK_NOARG(AsynchronousCall, HandleUserCall, void*, void
)
maAction();
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/Context.cxx b/sfx2/source/sidebar/Context.cxx
index 2452dd63aeb0..b2bfd68a3791 100644
--- a/sfx2/source/sidebar/Context.cxx
+++ b/sfx2/source/sidebar/Context.cxx
@@ -22,7 +22,7 @@
#define AnyApplicationName "any"
#define AnyContextName "any"
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
const sal_Int32 Context::NoMatch = 4;
const sal_Int32 Context::ApplicationWildcardMatch = 1;
@@ -80,6 +80,6 @@ bool Context::operator!= (const Context& rOther) const
|| ( msContext != rOther.msContext);
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/ContextChangeBroadcaster.cxx
b/sfx2/source/sidebar/ContextChangeBroadcaster.cxx
index 3a182d14f368..8e213e68b71b 100644
--- a/sfx2/source/sidebar/ContextChangeBroadcaster.cxx
+++ b/sfx2/source/sidebar/ContextChangeBroadcaster.cxx
@@ -30,7 +30,7 @@
using namespace css;
using namespace css::uno;
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
ContextChangeBroadcaster::ContextChangeBroadcaster()
: msContextName(),
@@ -125,6 +125,6 @@ OUString ContextChangeBroadcaster::GetModuleName (const
css::uno::Reference<css:
return OUString();
}
-} } // end of namespace ::sd::sidebar
+} // end of namespace ::sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/ContextList.cxx
b/sfx2/source/sidebar/ContextList.cxx
index 8f0c82783f60..2d77cd7a4c47 100644
--- a/sfx2/source/sidebar/ContextList.cxx
+++ b/sfx2/source/sidebar/ContextList.cxx
@@ -19,7 +19,7 @@
#include <sfx2/sidebar/ContextList.hxx>
#include <sfx2/sidebar/Context.hxx>
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
ContextList::ContextList()
: maEntries()
@@ -99,6 +99,6 @@ void ContextList::ToggleVisibilityForContext( const Context
&rContext, const boo
pEntry->mbIsInitiallyVisible = bVisible;
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/ControlFactory.cxx
b/sfx2/source/sidebar/ControlFactory.cxx
index 317f552fe438..b65f0b9c1779 100644
--- a/sfx2/source/sidebar/ControlFactory.cxx
+++ b/sfx2/source/sidebar/ControlFactory.cxx
@@ -21,7 +21,7 @@
#include <sfx2/sidebar/MenuButton.hxx>
#include <sfx2/sidebar/TabItem.hxx>
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
VclPtr<CheckBox> ControlFactory::CreateMenuButton (vcl::Window* pParentWindow)
{
@@ -33,6 +33,6 @@ VclPtr<ImageRadioButton> ControlFactory::CreateTabItem
(vcl::Window* pParentWind
return VclPtr<TabItem>::Create(pParentWindow);
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/ControllerFactory.cxx
b/sfx2/source/sidebar/ControllerFactory.cxx
index 49b67cbf6e07..98d39395d26b 100644
--- a/sfx2/source/sidebar/ControllerFactory.cxx
+++ b/sfx2/source/sidebar/ControllerFactory.cxx
@@ -35,7 +35,7 @@
using namespace css;
using namespace css::uno;
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
Reference<frame::XToolbarController>
ControllerFactory::CreateToolBoxController(
ToolBox* pToolBox,
@@ -258,6 +258,6 @@ Reference<frame::XToolbarController>
ControllerFactory::CreateToolBarController(
return nullptr;
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/ControllerItem.cxx
b/sfx2/source/sidebar/ControllerItem.cxx
index 7e1a0ae88925..1459d154689c 100644
--- a/sfx2/source/sidebar/ControllerItem.cxx
+++ b/sfx2/source/sidebar/ControllerItem.cxx
@@ -26,7 +26,7 @@
using namespace css;
using namespace css::uno;
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
ControllerItem::ControllerItem (
const sal_uInt16 nSlotId,
@@ -61,6 +61,6 @@
ControllerItem::ItemUpdateReceiverInterface::~ItemUpdateReceiverInterface()
{
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index 520a39418a91..0967468e3879 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -41,7 +41,7 @@
using namespace css;
using namespace css::uno;
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
Deck::Deck(const DeckDescriptor& rDeckDescriptor, vcl::Window* pParentWindow,
const std::function<void()>& rCloserAction)
@@ -439,6 +439,6 @@ void Deck::ScrollContainerWindow::SetSeparators (const
::std::vector<sal_Int32>&
Invalidate();
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/DeckDescriptor.cxx
b/sfx2/source/sidebar/DeckDescriptor.cxx
index 6a55dfbd202c..0f38e335dca2 100644
--- a/sfx2/source/sidebar/DeckDescriptor.cxx
+++ b/sfx2/source/sidebar/DeckDescriptor.cxx
@@ -19,7 +19,7 @@
#include <sfx2/sidebar/DeckDescriptor.hxx>
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
DeckDescriptor::DeckDescriptor()
: msTitle(),
@@ -57,6 +57,6 @@ DeckDescriptor::~DeckDescriptor()
{
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/DeckLayouter.cxx
b/sfx2/source/sidebar/DeckLayouter.cxx
index bc1bf6e93986..e96a068a2b5f 100644
--- a/sfx2/source/sidebar/DeckLayouter.cxx
+++ b/sfx2/source/sidebar/DeckLayouter.cxx
@@ -38,7 +38,7 @@
using namespace css;
using namespace css::uno;
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
namespace {
static const sal_Int32 MinimalPanelHeight (25);
@@ -629,6 +629,6 @@ void UpdateFiller (
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/DeckTitleBar.cxx
b/sfx2/source/sidebar/DeckTitleBar.cxx
index a3bad46ff40b..8ba8c95bd627 100644
--- a/sfx2/source/sidebar/DeckTitleBar.cxx
+++ b/sfx2/source/sidebar/DeckTitleBar.cxx
@@ -30,7 +30,7 @@
#include <sfx2/sidebar/Tools.hxx>
#endif
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
namespace
{
@@ -140,6 +140,6 @@ void DeckTitleBar::MouseMove (const MouseEvent& rMouseEvent)
Window::MouseMove( rMouseEvent );
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/DrawHelper.cxx
b/sfx2/source/sidebar/DrawHelper.cxx
index 17c352a3d76c..9b5c16bc6c3f 100644
--- a/sfx2/source/sidebar/DrawHelper.cxx
+++ b/sfx2/source/sidebar/DrawHelper.cxx
@@ -22,7 +22,7 @@
#include <tools/svborder.hxx>
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
void DrawHelper::DrawBorder(vcl::RenderContext& rRenderContext, const
tools::Rectangle& rBox, const SvBorder& rBorderSize,
const Paint& rHorizontalPaint, const Paint&
rVerticalPaint)
@@ -122,6 +122,6 @@ void DrawHelper::DrawRoundedRectangle(vcl::RenderContext&
rRenderContext, const
}
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/FocusManager.cxx
b/sfx2/source/sidebar/FocusManager.cxx
index 2b478e918d89..d39c26d70820 100644
--- a/sfx2/source/sidebar/FocusManager.cxx
+++ b/sfx2/source/sidebar/FocusManager.cxx
@@ -28,7 +28,7 @@
#include <vcl/svapp.hxx>
#include <toolkit/helper/vclunohelper.hxx>
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
FocusManager::FocusLocation::FocusLocation (const PanelComponent eComponent,
const sal_Int32 nIndex)
: meComponent(eComponent),
@@ -628,6 +628,6 @@ IMPL_LINK(FocusManager, ChildEventListener,
VclWindowEvent&, rEvent, void)
}
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/IContextChangeReceiver.cxx
b/sfx2/source/sidebar/IContextChangeReceiver.cxx
index 8a4ad0f6701d..6fc053921b1a 100644
--- a/sfx2/source/sidebar/IContextChangeReceiver.cxx
+++ b/sfx2/source/sidebar/IContextChangeReceiver.cxx
@@ -18,12 +18,12 @@
*/
#include <sfx2/sidebar/IContextChangeReceiver.hxx>
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
IContextChangeReceiver::~IContextChangeReceiver()
{
}
-} } // end of namespace ::sd::sidebar
+} // end of namespace ::sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/ILayoutableWindow.cxx
b/sfx2/source/sidebar/ILayoutableWindow.cxx
index c8d740947d2f..6a24cadbfacb 100644
--- a/sfx2/source/sidebar/ILayoutableWindow.cxx
+++ b/sfx2/source/sidebar/ILayoutableWindow.cxx
@@ -18,12 +18,12 @@
*/
#include <sfx2/sidebar/ILayoutableWindow.hxx>
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
ILayoutableWindow::~ILayoutableWindow()
{
}
-} } // end of namespace ::sd::sidebar
+} // end of namespace ::sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/MenuButton.cxx
b/sfx2/source/sidebar/MenuButton.cxx
index 7b5b7bedd677..76ab0dc162e0 100644
--- a/sfx2/source/sidebar/MenuButton.cxx
+++ b/sfx2/source/sidebar/MenuButton.cxx
@@ -26,7 +26,7 @@
using namespace css;
using namespace css::uno;
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
MenuButton::MenuButton (vcl::Window* pParentWindow)
: CheckBox(pParentWindow),
@@ -97,6 +97,6 @@ void MenuButton::MouseButtonUp (const MouseEvent& rMouseEvent)
}
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/Paint.cxx b/sfx2/source/sidebar/Paint.cxx
index 817bd0e54f00..9c6e7344c96b 100644
--- a/sfx2/source/sidebar/Paint.cxx
+++ b/sfx2/source/sidebar/Paint.cxx
@@ -22,7 +22,7 @@
using namespace css;
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
Paint::Paint()
: meType(NoPaint)
@@ -97,6 +97,6 @@ Wallpaper Paint::GetWallpaper() const
}
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/Panel.cxx b/sfx2/source/sidebar/Panel.cxx
index d83f2d16af04..c1d98be5f36f 100644
--- a/sfx2/source/sidebar/Panel.cxx
+++ b/sfx2/source/sidebar/Panel.cxx
@@ -42,7 +42,7 @@
using namespace css;
using namespace css::uno;
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
Panel::Panel(const PanelDescriptor& rPanelDescriptor,
vcl::Window* pParentWindow,
@@ -186,6 +186,6 @@ Reference<awt::XWindow> Panel::GetElementWindow()
return nullptr;
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/PanelDescriptor.cxx
b/sfx2/source/sidebar/PanelDescriptor.cxx
index 90d4183ae4b2..853d2c445ff5 100644
--- a/sfx2/source/sidebar/PanelDescriptor.cxx
+++ b/sfx2/source/sidebar/PanelDescriptor.cxx
@@ -19,7 +19,7 @@
#include <sfx2/sidebar/PanelDescriptor.hxx>
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
PanelDescriptor::PanelDescriptor()
: msTitle(),
@@ -57,6 +57,6 @@ PanelDescriptor::~PanelDescriptor()
{
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx
b/sfx2/source/sidebar/PanelTitleBar.cxx
index 5b3a3d63dbf2..deb501e43d07 100644
--- a/sfx2/source/sidebar/PanelTitleBar.cxx
+++ b/sfx2/source/sidebar/PanelTitleBar.cxx
@@ -35,7 +35,7 @@
using namespace css;
using namespace css::uno;
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
static const sal_Int32 gaLeftIconPadding (5);
static const sal_Int32 gaRightIconPadding (5);
@@ -202,6 +202,6 @@ void PanelTitleBar::DataChanged (const DataChangedEvent&
rEvent)
TitleBar::DataChanged(rEvent);
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/ResourceManager.cxx
b/sfx2/source/sidebar/ResourceManager.cxx
index aa1422dffef3..455ddcf14fb4 100644
--- a/sfx2/source/sidebar/ResourceManager.cxx
+++ b/sfx2/source/sidebar/ResourceManager.cxx
@@ -42,7 +42,7 @@
using namespace css;
using namespace css::uno;
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
namespace
{
@@ -783,6 +783,6 @@ void ResourceManager::disposeDecks()
}
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/Sidebar.cxx b/sfx2/source/sidebar/Sidebar.cxx
index ed12c0829302..eea91f9b9dad 100644
--- a/sfx2/source/sidebar/Sidebar.cxx
+++ b/sfx2/source/sidebar/Sidebar.cxx
@@ -24,7 +24,7 @@
using namespace css;
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
void Sidebar::ShowPanel (
const OUString& rsPanelId,
@@ -88,6 +88,6 @@ bool Sidebar::IsPanelVisible(
return pController->IsDeckVisible(xPanelDescriptor->msDeckId);
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/SidebarChildWindow.cxx
b/sfx2/source/sidebar/SidebarChildWindow.cxx
index 14078245e0ef..e75687dfea43 100644
--- a/sfx2/source/sidebar/SidebarChildWindow.cxx
+++ b/sfx2/source/sidebar/SidebarChildWindow.cxx
@@ -25,7 +25,7 @@
#include <helpids.h>
#include <comphelper/lok.hxx>
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
SFX_IMPL_DOCKINGWINDOW_WITHID(SidebarChildWindow, SID_SIDEBAR);
@@ -90,6 +90,6 @@ sal_Int32 SidebarChildWindow::GetDefaultWidth(vcl::Window
const* pWindow)
return 0;
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/SidebarController.cxx
b/sfx2/source/sidebar/SidebarController.cxx
index bc33163c64f8..9ce9193fa6f3 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -98,7 +98,7 @@ namespace
}
}
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
namespace {
enum MenuId
@@ -1616,6 +1616,6 @@ void SidebarController::saveDeckState()
}
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx
b/sfx2/source/sidebar/SidebarDockingWindow.cxx
index e8172495ffed..fe4548655c81 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.cxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx
@@ -37,7 +37,7 @@
using namespace css;
using namespace css::uno;
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
class SidebarNotifyIdle : public Idle
{
@@ -307,6 +307,6 @@ bool SidebarDockingWindow::EventNotify(NotifyEvent& rEvent)
return SfxDockingWindow::EventNotify(rEvent);
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/SidebarModelUpdate.cxx
b/sfx2/source/sidebar/SidebarModelUpdate.cxx
index 91c423b1020f..2f81b01f6cc7 100644
--- a/sfx2/source/sidebar/SidebarModelUpdate.cxx
+++ b/sfx2/source/sidebar/SidebarModelUpdate.cxx
@@ -9,12 +9,12 @@
#include <sfx2/sidebar/SidebarModelUpdate.hxx>
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
SidebarModelUpdate::~SidebarModelUpdate()
{
}
-} }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/SidebarPanelBase.cxx
b/sfx2/source/sidebar/SidebarPanelBase.cxx
index 0321b9bca3e5..0ada01c391cb 100644
--- a/sfx2/source/sidebar/SidebarPanelBase.cxx
+++ b/sfx2/source/sidebar/SidebarPanelBase.cxx
@@ -30,7 +30,7 @@
using namespace css;
using namespace css::uno;
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
Reference<ui::XUIElement> SidebarPanelBase::Create (
const OUString& rsResourceURL,
@@ -195,6 +195,6 @@ void SAL_CALL SidebarPanelBase::updateModel(const
css::uno::Reference<css::frame
pModelUpdate->updateModel(xModel);
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx
b/sfx2/source/sidebar/SidebarToolBox.cxx
index 03f66a98c0f8..70be2424f276 100644
--- a/sfx2/source/sidebar/SidebarToolBox.cxx
+++ b/sfx2/source/sidebar/SidebarToolBox.cxx
@@ -53,7 +53,7 @@ namespace {
}
}
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
SidebarToolBox::SidebarToolBox (vcl::Window* pParentWindow)
: ToolBox(pParentWindow, 0),
@@ -344,6 +344,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void
makeNotebookbarToolBox(VclPtr<vcl::Window>
rRet = pBox;
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx
index 1acd7e10f619..61b2f6559b46 100644
--- a/sfx2/source/sidebar/TabBar.cxx
+++ b/sfx2/source/sidebar/TabBar.cxx
@@ -41,7 +41,7 @@
using namespace css;
using namespace css::uno;
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
TabBar::TabBar(vcl::Window* pParentWindow,
const Reference<frame::XFrame>& rxFrame,
@@ -411,6 +411,6 @@ void TabBar::EnableMenuButton(const bool bEnable)
mpMenuButton->Enable(bEnable);
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/TabItem.cxx b/sfx2/source/sidebar/TabItem.cxx
index d2535b583acf..160bec8a2075 100644
--- a/sfx2/source/sidebar/TabItem.cxx
+++ b/sfx2/source/sidebar/TabItem.cxx
@@ -28,7 +28,7 @@
using namespace css;
using namespace css::uno;
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
TabItem::TabItem (vcl::Window* pParentWindow)
: ImageRadioButton(pParentWindow),
@@ -104,6 +104,6 @@ void TabItem::MouseButtonUp(const MouseEvent& rMouseEvent)
}
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx
index 9f5b067d9f8e..51d55f067fc1 100644
--- a/sfx2/source/sidebar/Theme.cxx
+++ b/sfx2/source/sidebar/Theme.cxx
@@ -31,7 +31,7 @@
using namespace css;
using namespace css::uno;
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
Theme& Theme::GetCurrentTheme()
{
@@ -1042,6 +1042,6 @@ void Theme::ProcessNewValue (
}
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/TitleBar.cxx b/sfx2/source/sidebar/TitleBar.cxx
index df58d0d346ff..b793d3a879fd 100644
--- a/sfx2/source/sidebar/TitleBar.cxx
+++ b/sfx2/source/sidebar/TitleBar.cxx
@@ -29,7 +29,7 @@ namespace
const static sal_Int32 gnRightIconSpace (3);
}
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
TitleBar::TitleBar(const OUString& rsTitle,
vcl::Window* pParentWindow,
@@ -167,6 +167,6 @@ IMPL_LINK(TitleBar, SelectionHandler, ToolBox*, pToolBox,
void)
HandleToolBoxItemClick(nItemId);
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/Tools.cxx b/sfx2/source/sidebar/Tools.cxx
index 191b9b047035..27064e58af85 100644
--- a/sfx2/source/sidebar/Tools.cxx
+++ b/sfx2/source/sidebar/Tools.cxx
@@ -32,7 +32,7 @@
using namespace css;
using namespace css::uno;
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
Image Tools::GetImage (
const OUString& rsImageURL,
@@ -135,6 +135,6 @@ OUString Tools::GetModuleName (
return OUString();
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
b/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
index cfe971af958b..acd6ecacd8eb 100644
--- a/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
+++ b/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
@@ -90,7 +90,7 @@ void request(
}
-namespace shell { namespace sessioninstall
+namespace shell::sessioninstall
{
SyncDbusSessionHelper::SyncDbusSessionHelper(Reference<XComponentContext>
const&)
{
@@ -181,6 +181,6 @@ void SAL_CALL SyncDbusSessionHelper::IsInstalled( const
OUString& sPackagename,
o_isInstalled =
bool(g_variant_get_boolean(g_variant_get_child_value(result.get(),0)));
}
-}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/activities/activitiesfactory.cxx
b/slideshow/source/engine/activities/activitiesfactory.cxx
index 63b39d2d23d5..6f5a05b197cb 100644
--- a/slideshow/source/engine/activities/activitiesfactory.cxx
+++ b/slideshow/source/engine/activities/activitiesfactory.cxx
@@ -43,8 +43,7 @@
using namespace com::sun::star;
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
namespace {
@@ -1011,7 +1010,6 @@ AnimationActivitySharedPtr
ActivitiesFactory::createSimpleActivity(
return std::make_shared<SimpleActivity<0>>( aActivityParms, rAnim );
}
-} // namespace internal
} // namespace presentation
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/activities/activitybase.cxx
b/slideshow/source/engine/activities/activitybase.cxx
index e256b269611c..82a117f8a6d2 100644
--- a/slideshow/source/engine/activities/activitybase.cxx
+++ b/slideshow/source/engine/activities/activitybase.cxx
@@ -26,10 +26,8 @@
#include "activitybase.hxx"
-namespace slideshow
+namespace slideshow::internal
{
- namespace internal
- {
// TODO(P1): Elide some virtual function calls, by templifying this
// static hierarchy
@@ -231,7 +229,6 @@ namespace slideshow
return nT;
}
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/activities/continuousactivitybase.cxx
b/slideshow/source/engine/activities/continuousactivitybase.cxx
index 0928fd1bdd03..64e2377f9ab6 100644
--- a/slideshow/source/engine/activities/continuousactivitybase.cxx
+++ b/slideshow/source/engine/activities/continuousactivitybase.cxx
@@ -21,10 +21,8 @@
#include "continuousactivitybase.hxx"
-namespace slideshow
+namespace slideshow::internal
{
- namespace internal
- {
ContinuousActivityBase::ContinuousActivityBase( const
ActivityParameters& rParms ) :
SimpleContinuousActivityBase( rParms )
{
@@ -36,7 +34,6 @@ namespace slideshow
perform( calcAcceleratedTime( nSimpleTime ),
nRepeatCount );
}
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git
a/slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx
b/slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx
index 0369c22851ca..38d3590da3b6 100644
--- a/slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx
+++ b/slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx
@@ -24,10 +24,8 @@
#include <tuple>
-namespace slideshow
+namespace slideshow::internal
{
- namespace internal
- {
ContinuousKeyTimeActivityBase::ContinuousKeyTimeActivityBase( const
ActivityParameters& rParms ) :
SimpleContinuousActivityBase( rParms ),
maLerper( rParms.maDiscreteTimes )
@@ -56,7 +54,6 @@ namespace slideshow
fAlpha,
nRepeatCount );
}
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/activities/discreteactivitybase.cxx
b/slideshow/source/engine/activities/discreteactivitybase.cxx
index 2ce8286767d9..2fe0935b698a 100644
--- a/slideshow/source/engine/activities/discreteactivitybase.cxx
+++ b/slideshow/source/engine/activities/discreteactivitybase.cxx
@@ -23,10 +23,8 @@
#include "discreteactivitybase.hxx"
-namespace slideshow
+namespace slideshow::internal
{
- namespace internal
- {
DiscreteActivityBase::DiscreteActivityBase( const ActivityParameters&
rParms ) :
ActivityBase( rParms ),
mpWakeupEvent( rParms.mpWakeupEvent ),
@@ -189,7 +187,6 @@ namespace slideshow
ActivityBase::dispose();
}
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git
a/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx
b/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx
index 5566b5883f78..9e23fc2c76c8 100644
--- a/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx
+++ b/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx
@@ -24,10 +24,8 @@
#include <sal/log.hxx>
-namespace slideshow
+namespace slideshow::internal
{
- namespace internal
- {
SimpleContinuousActivityBase::SimpleContinuousActivityBase(
const ActivityParameters& rParms ) :
ActivityBase( rParms ),
@@ -244,7 +242,6 @@ namespace slideshow
return isActive();
}
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/activitiesqueue.cxx
b/slideshow/source/engine/activitiesqueue.cxx
index 3181e92175ff..ba982385356e 100644
--- a/slideshow/source/engine/activitiesqueue.cxx
+++ b/slideshow/source/engine/activitiesqueue.cxx
@@ -32,10 +32,8 @@
using namespace ::com::sun::star;
-namespace slideshow
+namespace slideshow::internal
{
- namespace internal
- {
ActivitiesQueue::ActivitiesQueue(
const std::shared_ptr< ::canvas::tools::ElapsedTime >& pPresTimer ) :
mpTimer( pPresTimer ),
@@ -178,7 +176,6 @@ namespace slideshow
pActivity->dequeued();
ActivityQueue().swap( maCurrentActivitiesReinsert );
}
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/animatedsprite.cxx
b/slideshow/source/engine/animatedsprite.cxx
index 82d5e5e4624b..94ee9e313ec9 100644
--- a/slideshow/source/engine/animatedsprite.cxx
+++ b/slideshow/source/engine/animatedsprite.cxx
@@ -34,10 +34,8 @@
using namespace ::com::sun::star;
-namespace slideshow
+namespace slideshow::internal
{
- namespace internal
- {
AnimatedSprite::AnimatedSprite( const ViewLayerSharedPtr& rViewLayer,
const ::basegfx::B2DSize&
rSpriteSizePixel,
double
nSpritePrio ) :
@@ -196,7 +194,6 @@ namespace slideshow
mpSprite->show();
}
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/animationfactory.cxx
b/slideshow/source/engine/animationfactory.cxx
index ce831d2a4aaf..9996924880ac 100644
--- a/slideshow/source/engine/animationfactory.cxx
+++ b/slideshow/source/engine/animationfactory.cxx
@@ -39,10 +39,8 @@
using namespace ::com::sun::star;
-namespace slideshow
+namespace slideshow::internal
{
- namespace internal
- {
namespace
{
// attention, there is a similar implementation of Animation in
@@ -1233,7 +1231,6 @@ namespace slideshow
nFlags );
}
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/animationnodes/animationaudionode.cxx
b/slideshow/source/engine/animationnodes/animationaudionode.cxx
index f407456b35ef..c6eb61d17e3c 100644
--- a/slideshow/source/engine/animationnodes/animationaudionode.cxx
+++ b/slideshow/source/engine/animationnodes/animationaudionode.cxx
@@ -27,8 +27,7 @@
using namespace com::sun::star;
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
AnimationAudioNode::AnimationAudioNode(
const uno::Reference< animations::XAnimationNode >& xNode,
@@ -199,7 +198,6 @@ void AnimationAudioNode::checkPlayingStatus()
"AnimationAudioNode::deactivate with delay") );
}
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/animationnodes/animationbasenode.cxx
b/slideshow/source/engine/animationnodes/animationbasenode.cxx
index ef12aa97e104..01059ec39b77 100644
--- a/slideshow/source/engine/animationnodes/animationbasenode.cxx
+++ b/slideshow/source/engine/animationnodes/animationbasenode.cxx
@@ -35,8 +35,7 @@
using namespace com::sun::star;
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
AnimationBaseNode::AnimationBaseNode(
const uno::Reference< animations::XAnimationNode >& xNode,
@@ -485,7 +484,6 @@ AttributableShapeSharedPtr const &
AnimationBaseNode::getShape() const
return mpShape; // nope, plain shape always
}
-} // namespace internal
} // namespace slideshow
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/animationnodes/animationcolornode.cxx
b/slideshow/source/engine/animationnodes/animationcolornode.cxx
index ac3450ea55e3..39ca961c478f 100644
--- a/slideshow/source/engine/animationnodes/animationcolornode.cxx
+++ b/slideshow/source/engine/animationnodes/animationcolornode.cxx
@@ -28,8 +28,7 @@
using namespace com::sun::star;
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
namespace {
/** Little wrapper for HSL to RGB mapping.
@@ -117,7 +116,6 @@ AnimationActivitySharedPtr
AnimationColorNode::createActivity() const
return AnimationActivitySharedPtr();
}
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/animationnodes/animationcommandnode.cxx
b/slideshow/source/engine/animationnodes/animationcommandnode.cxx
index 9d8e476e091b..2e8507e3a5f5 100644
--- a/slideshow/source/engine/animationnodes/animationcommandnode.cxx
+++ b/slideshow/source/engine/animationnodes/animationcommandnode.cxx
@@ -28,8 +28,7 @@
using namespace com::sun::star;
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
namespace EffectCommands = css::presentation::EffectCommands;
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
