diff options
Diffstat (limited to 'vcl')
28 files changed, 48 insertions, 101 deletions
diff --git a/vcl/backendtest/outputdevice/bitmap.cxx b/vcl/backendtest/outputdevice/bitmap.cxx index 2e7e0713294a..79cd3d3795cd 100644 --- a/vcl/backendtest/outputdevice/bitmap.cxx +++ b/vcl/backendtest/outputdevice/bitmap.cxx @@ -13,8 +13,7 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <bitmapwriteaccess.hxx> -namespace vcl { -namespace test { +namespace vcl::test { Bitmap OutputDeviceTestBitmap::setupDrawTransformedBitmap() { @@ -189,6 +188,6 @@ TestResult OutputDeviceTestBitmap::checkBlend(BitmapEx& rBitmapEx) return checkRectangles(aBitmap, aExpected); } -}} // end namespace vcl::test +} // end namespace vcl::test /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/backendtest/outputdevice/common.cxx b/vcl/backendtest/outputdevice/common.cxx index a7e857ffd1fd..e76150c49c1f 100644 --- a/vcl/backendtest/outputdevice/common.cxx +++ b/vcl/backendtest/outputdevice/common.cxx @@ -12,8 +12,7 @@ #include <bitmapwriteaccess.hxx> #include <salgdi.hxx> -namespace vcl { -namespace test { +namespace vcl::test { namespace { @@ -469,6 +468,6 @@ TestResult OutputDeviceTestCommon::checkBezier(Bitmap& rBitmap) return checkRectangles(rBitmap, aExpected); } -}} // end namespace vcl::test +} // end namespace vcl::test /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/backendtest/outputdevice/gradient.cxx b/vcl/backendtest/outputdevice/gradient.cxx index 58e20e5d6092..9880fedd1e4c 100644 --- a/vcl/backendtest/outputdevice/gradient.cxx +++ b/vcl/backendtest/outputdevice/gradient.cxx @@ -11,8 +11,7 @@ #include <test/outputdevice.hxx> #include <vcl/gradient.hxx> -namespace vcl { -namespace test { +namespace vcl::test { Bitmap OutputDeviceTestGradient::setupLinearGradient() { @@ -39,6 +38,6 @@ Bitmap OutputDeviceTestGradient::setupRadialGradient() return mpVirtualDevice->GetBitmap(maVDRectangle.TopLeft(), maVDRectangle.GetSize()); } -}} // end namespace vcl::test +} // end namespace vcl::test /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/backendtest/outputdevice/line.cxx b/vcl/backendtest/outputdevice/line.cxx index a43c72a62dc0..b9236dcc210d 100644 --- a/vcl/backendtest/outputdevice/line.cxx +++ b/vcl/backendtest/outputdevice/line.cxx @@ -10,8 +10,7 @@ #include <test/outputdevice.hxx> -namespace vcl { -namespace test { +namespace vcl::test { namespace { @@ -109,6 +108,6 @@ Bitmap OutputDeviceTestLine::setupAALines() return mpVirtualDevice->GetBitmap(maVDRectangle.TopLeft(), maVDRectangle.GetSize()); } -}} // end namespace vcl::test +} // end namespace vcl::test /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/backendtest/outputdevice/outputdevice.cxx b/vcl/backendtest/outputdevice/outputdevice.cxx index 4f31501b6f3b..c05c03e06a3a 100644 --- a/vcl/backendtest/outputdevice/outputdevice.cxx +++ b/vcl/backendtest/outputdevice/outputdevice.cxx @@ -10,8 +10,7 @@ #include <test/outputdevice.hxx> -namespace vcl { -namespace test { +namespace vcl::test { Bitmap OutputDeviceTestAnotherOutDev::setupDrawOutDev() { @@ -75,6 +74,6 @@ TestResult OutputDeviceTestAnotherOutDev::checkXOR(Bitmap& rBitmap) return checkRectangles(rBitmap, aExpected); } -}} // end namespace vcl::test +} // end namespace vcl::test /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/backendtest/outputdevice/pixel.cxx b/vcl/backendtest/outputdevice/pixel.cxx index b231396ab7ff..71997868fdf6 100644 --- a/vcl/backendtest/outputdevice/pixel.cxx +++ b/vcl/backendtest/outputdevice/pixel.cxx @@ -10,8 +10,7 @@ #include <test/outputdevice.hxx> -namespace vcl { -namespace test { +namespace vcl::test { namespace { @@ -52,6 +51,6 @@ Bitmap OutputDeviceTestPixel::setupRectangle(bool bEnableAA) return mpVirtualDevice->GetBitmap(maVDRectangle.TopLeft(), maVDRectangle.GetSize()); } -}} // end namespace vcl::test +} // end namespace vcl::test /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/backendtest/outputdevice/polygon.cxx b/vcl/backendtest/outputdevice/polygon.cxx index f0977abfb5f6..8d207ade9b64 100644 --- a/vcl/backendtest/outputdevice/polygon.cxx +++ b/vcl/backendtest/outputdevice/polygon.cxx @@ -10,8 +10,7 @@ #include <test/outputdevice.hxx> -namespace vcl { -namespace test { +namespace vcl::test { namespace { @@ -153,6 +152,6 @@ Bitmap OutputDeviceTestPolygon::setupAALines() return mpVirtualDevice->GetBitmap(maVDRectangle.TopLeft(), maVDRectangle.GetSize()); } -}} // end namespace vcl::test +} // end namespace vcl::test /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/backendtest/outputdevice/polyline.cxx b/vcl/backendtest/outputdevice/polyline.cxx index 53a9edab9d11..e1d1fd9e0ae0 100644 --- a/vcl/backendtest/outputdevice/polyline.cxx +++ b/vcl/backendtest/outputdevice/polyline.cxx @@ -10,8 +10,7 @@ #include <test/outputdevice.hxx> -namespace vcl { -namespace test { +namespace vcl::test { namespace { @@ -135,6 +134,6 @@ Bitmap OutputDeviceTestPolyLine::setupAALines() return mpVirtualDevice->GetBitmap(maVDRectangle.TopLeft(), maVDRectangle.GetSize()); } -}} // end namespace vcl::test +} // end namespace vcl::test /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/backendtest/outputdevice/polyline_b2d.cxx b/vcl/backendtest/outputdevice/polyline_b2d.cxx index 3674fa5d172c..65658d7aeb1d 100644 --- a/vcl/backendtest/outputdevice/polyline_b2d.cxx +++ b/vcl/backendtest/outputdevice/polyline_b2d.cxx @@ -11,9 +11,7 @@ #include <test/outputdevice.hxx> #include <vcl/bitmapex.hxx> -namespace vcl -{ -namespace test +namespace vcl::test { namespace { @@ -124,7 +122,6 @@ Bitmap OutputDeviceTestPolyLineB2D::setupAABezier() return mpVirtualDevice->GetBitmap(maVDRectangle.TopLeft(), maVDRectangle.GetSize()); } -} } // end namespace vcl::test /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/backendtest/outputdevice/polypolygon.cxx b/vcl/backendtest/outputdevice/polypolygon.cxx index e5a527042bdc..a53acbaf72be 100644 --- a/vcl/backendtest/outputdevice/polypolygon.cxx +++ b/vcl/backendtest/outputdevice/polypolygon.cxx @@ -11,8 +11,7 @@ #include <test/outputdevice.hxx> -namespace vcl { -namespace test { +namespace vcl::test { namespace { @@ -68,6 +67,6 @@ Bitmap OutputDeviceTestPolyPolygon::setupFilledRectangle(bool useLineColor) return mpVirtualDevice->GetBitmap(maVDRectangle.TopLeft(), maVDRectangle.GetSize()); } -}} // end namespace vcl::test +} // end namespace vcl::test /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/backendtest/outputdevice/polypolygon_b2d.cxx b/vcl/backendtest/outputdevice/polypolygon_b2d.cxx index 977f73dcc1f4..737cfae195f2 100644 --- a/vcl/backendtest/outputdevice/polypolygon_b2d.cxx +++ b/vcl/backendtest/outputdevice/polypolygon_b2d.cxx @@ -10,9 +10,7 @@ #include <test/outputdevice.hxx> -namespace vcl -{ -namespace test +namespace vcl::test { namespace { @@ -67,7 +65,6 @@ Bitmap OutputDeviceTestPolyPolygonB2D::setupFilledRectangle(bool useLineColor) return mpVirtualDevice->GetBitmap(maVDRectangle.TopLeft(), maVDRectangle.GetSize()); } -} } // end namespace vcl::test /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/backendtest/outputdevice/rectangle.cxx b/vcl/backendtest/outputdevice/rectangle.cxx index 033ebb3c54ae..8e7c0ba861aa 100644 --- a/vcl/backendtest/outputdevice/rectangle.cxx +++ b/vcl/backendtest/outputdevice/rectangle.cxx @@ -10,8 +10,7 @@ #include <test/outputdevice.hxx> -namespace vcl { -namespace test { +namespace vcl::test { namespace { @@ -110,6 +109,6 @@ Bitmap OutputDeviceTestRect::setupInvert_TrackFrame() return mpVirtualDevice->GetBitmap(maVDRectangle.TopLeft(), maVDRectangle.GetSize()); } -}} // end namespace vcl::test +} // end namespace vcl::test /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx b/vcl/qa/cppunit/canvasbitmaptest.cxx index 69971210db92..34ddd8825e60 100644 --- a/vcl/qa/cppunit/canvasbitmaptest.cxx +++ b/vcl/qa/cppunit/canvasbitmaptest.cxx @@ -43,7 +43,7 @@ using namespace ::com::sun::star; using namespace vcl::unotools; -namespace com { namespace sun { namespace star { namespace rendering +namespace com::sun::star::rendering { static bool operator==( const RGBColor& rLHS, const ARGBColor& rRHS ) @@ -51,7 +51,7 @@ static bool operator==( const RGBColor& rLHS, const ARGBColor& rRHS ) return rLHS.Red == rRHS.Red && rLHS.Green == rRHS.Green && rLHS.Blue == rRHS.Blue; } -} } } } +} namespace { diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index dcb35069e0cd..a5aefbbf2f2f 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -1634,7 +1634,7 @@ void Application::setDeInitHook(Link<LinkParamNone*,void> const & hook) { pSVData->maAppData.mbInAppMain = true; } -namespace vcl { namespace lok { +namespace vcl::lok { void registerPollCallbacks( LibreOfficeKitPollCallback pPollCallback, @@ -1674,6 +1674,6 @@ bool isUnipoll() return pSVData && pSVData->mpPollCallback != nullptr; } -} } // namespace lok, namespace vcl +} // namespace lok, namespace vcl /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/app/unohelp2.cxx b/vcl/source/app/unohelp2.cxx index 832156788215..9005467d90e4 100644 --- a/vcl/source/app/unohelp2.cxx +++ b/vcl/source/app/unohelp2.cxx @@ -29,7 +29,7 @@ using namespace ::com::sun::star; -namespace vcl { namespace unohelper { +namespace vcl::unohelper { TextDataObject::TextDataObject( const OUString& rText ) : maText( rText ) { @@ -93,6 +93,6 @@ namespace vcl { namespace unohelper { return ( nT == SotClipboardFormatId::STRING ); } -}} // namespace vcl::unohelper +} // namespace vcl::unohelper /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/bitmap/BitmapTools.cxx b/vcl/source/bitmap/BitmapTools.cxx index 119781aca94d..7786ce516424 100644 --- a/vcl/source/bitmap/BitmapTools.cxx +++ b/vcl/source/bitmap/BitmapTools.cxx @@ -41,10 +41,7 @@ using namespace css; using drawinglayer::primitive2d::Primitive2DSequence; using drawinglayer::primitive2d::Primitive2DReference; -namespace vcl -{ - -namespace bitmap +namespace vcl::bitmap { BitmapEx loadFromName(const OUString& rFileName, const ImageLoadFlags eFlags) @@ -1120,6 +1117,6 @@ bool convertBitmap32To24Plus8(BitmapEx const & rInput, BitmapEx & rResult) return true; } -}} // end vcl::bitmap +} // end vcl::bitmap /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/filter/ipdf/pdfdocument.cxx b/vcl/source/filter/ipdf/pdfdocument.cxx index aeeb91104c92..73d7f452688d 100644 --- a/vcl/source/filter/ipdf/pdfdocument.cxx +++ b/vcl/source/filter/ipdf/pdfdocument.cxx @@ -29,9 +29,7 @@ using namespace com::sun::star; -namespace vcl -{ -namespace filter +namespace vcl::filter { const int MAX_SIGNATURE_CONTENT_LENGTH = 50000; @@ -3007,7 +3005,6 @@ bool PDFEndArrayElement::Read(SvStream& rStream) sal_uInt64 PDFEndArrayElement::GetOffset() const { return m_nOffset; } -} // namespace filter } // namespace vcl /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/font/Feature.cxx b/vcl/source/font/Feature.cxx index bace78ec4377..99a3910b81fb 100644 --- a/vcl/source/font/Feature.cxx +++ b/vcl/source/font/Feature.cxx @@ -14,9 +14,7 @@ #include <hb.h> -namespace vcl -{ -namespace font +namespace vcl::font { OUString featureCodeAsString(uint32_t nFeature) { @@ -162,7 +160,6 @@ FeatureParameterType FeatureDefinition::getType() const { return m_eType; } FeatureDefinition::operator bool() const { return m_nCode != 0; } uint32_t FeatureDefinition::getDefault() const { return m_nDefault; } -} // end font namespace -} // end vcl namespace +} // end vcl::font namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/font/FeatureCollector.cxx b/vcl/source/font/FeatureCollector.cxx index ed110ccbf073..a606d629aa6c 100644 --- a/vcl/source/font/FeatureCollector.cxx +++ b/vcl/source/font/FeatureCollector.cxx @@ -13,9 +13,7 @@ #include <hb-ot.h> #include <hb-graphite2.h> -namespace vcl -{ -namespace font +namespace vcl::font { bool FeatureCollector::collectGraphite() { @@ -154,7 +152,6 @@ bool FeatureCollector::collect() } } -} // end namespace font -} // end namespace vcl +} // end namespace vcl::font /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/font/FeatureParser.cxx b/vcl/source/font/FeatureParser.cxx index b8afe2f36b06..c886482dfd96 100644 --- a/vcl/source/font/FeatureParser.cxx +++ b/vcl/source/font/FeatureParser.cxx @@ -11,9 +11,7 @@ #include <vcl/font/FeatureParser.hxx> #include <vcl/font/Feature.hxx> -namespace vcl -{ -namespace font +namespace vcl::font { OUString trimFontNameFeatures(OUString const& rFontName) { @@ -66,8 +64,6 @@ std::unordered_map<uint32_t, uint32_t> FeatureParser::getFeaturesMap() const return aResultMap; } -} // end font namespace - -} // end vcl namespace +} // end vcl::font namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/font/OpenTypeFeatureDefinitonList.cxx b/vcl/source/font/OpenTypeFeatureDefinitonList.cxx index 7b9aadfc01d2..6b9584bb73d8 100644 --- a/vcl/source/font/OpenTypeFeatureDefinitonList.cxx +++ b/vcl/source/font/OpenTypeFeatureDefinitonList.cxx @@ -15,9 +15,7 @@ #include <algorithm> -namespace vcl -{ -namespace font +namespace vcl::font { OpenTypeFeatureDefinitonListPrivate::OpenTypeFeatureDefinitonListPrivate() { init(); } @@ -193,7 +191,6 @@ bool OpenTypeFeatureDefinitonListPrivate::isRequired(sal_uInt32 nFeatureCode) != m_aRequiredFeatures.end(); } -} // end font namespace -} // end vcl namespace +} // end vcl::font namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/gdi/pdfbuildin_fonts.cxx b/vcl/source/gdi/pdfbuildin_fonts.cxx index ddf7e3bcb145..41c208b93b67 100644 --- a/vcl/source/gdi/pdfbuildin_fonts.cxx +++ b/vcl/source/gdi/pdfbuildin_fonts.cxx @@ -23,9 +23,7 @@ using namespace vcl; -namespace vcl -{ -namespace pdf +namespace vcl::pdf { OString BuildinFont::getNameObject() const { @@ -737,7 +735,6 @@ BuildinFontFace::CreateFontInstance(const FontSelectPattern& rFSP) const return new BuildinFontInstance(*this, rFSP); } -} // namespace pdf } // namespace vcl /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/graphic/GraphicLoader.cxx b/vcl/source/graphic/GraphicLoader.cxx index b1127f541515..c26b2b9d0cfe 100644 --- a/vcl/source/graphic/GraphicLoader.cxx +++ b/vcl/source/graphic/GraphicLoader.cxx @@ -16,9 +16,7 @@ using namespace css; -namespace vcl -{ -namespace graphic +namespace vcl::graphic { Graphic loadFromURL(OUString const& rURL, weld::Window* pParentWin) { @@ -41,7 +39,6 @@ Graphic loadFromURL(OUString const& rURL, weld::Window* pParentWin) return aGraphic; } -} } // end vcl::graphic /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/graphic/GraphicObject.cxx b/vcl/source/graphic/GraphicObject.cxx index 1cf7ccd8bb0f..40f1033b372b 100644 --- a/vcl/source/graphic/GraphicObject.cxx +++ b/vcl/source/graphic/GraphicObject.cxx @@ -47,9 +47,7 @@ using com::sun::star::beans::XPropertySet; #define WATERMARK_LUM_OFFSET 50 #define WATERMARK_CON_OFFSET -70 -namespace vcl -{ -namespace graphic +namespace vcl::graphic { void SearchForGraphics(uno::Reference<uno::XInterface> const & xInterface, @@ -93,7 +91,7 @@ void SearchForGraphics(uno::Reference<uno::XInterface> const & xInterface, } } -}} // end namespace vcl::graphic +} // end namespace vcl::graphic namespace { diff --git a/vcl/source/graphic/Manager.cxx b/vcl/source/graphic/Manager.cxx index 5942b5cb8784..5107ff19ffc6 100644 --- a/vcl/source/graphic/Manager.cxx +++ b/vcl/source/graphic/Manager.cxx @@ -26,9 +26,7 @@ using namespace css; -namespace vcl -{ -namespace graphic +namespace vcl::graphic { namespace { @@ -238,7 +236,6 @@ void Manager::changeExisting(const ImpGraphic* pImpGraphic, sal_Int64 nOldSizeBy mnUsedSize -= nOldSizeBytes; mnUsedSize += getGraphicSizeBytes(pImpGraphic); } -} } // end vcl::graphic /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/helper/canvastools.cxx b/vcl/source/helper/canvastools.cxx index d9f6a9923a0c..18f923d50016 100644 --- a/vcl/source/helper/canvastools.cxx +++ b/vcl/source/helper/canvastools.cxx @@ -46,10 +46,8 @@ using namespace ::com::sun::star; -namespace vcl +namespace vcl::unotools { - namespace unotools - { uno::Reference< rendering::XBitmap > xBitmapFromBitmapEx(const ::BitmapEx& inputBitmap ) { SAL_INFO( "vcl.helper", "vcl::unotools::xBitmapFromBitmapEx()" ); @@ -620,8 +618,6 @@ namespace vcl toByteColor(aARGBColor.Blue) ); } - } // namespace vcltools - } // namespace canvas /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/helper/commandinfoprovider.cxx b/vcl/source/helper/commandinfoprovider.cxx index 075fd4e7ced1..1b010a9d50fc 100644 --- a/vcl/source/helper/commandinfoprovider.cxx +++ b/vcl/source/helper/commandinfoprovider.cxx @@ -38,7 +38,7 @@ using namespace css; using namespace css::uno; -namespace vcl { namespace CommandInfoProvider { +namespace vcl::CommandInfoProvider { static Reference<container::XNameAccess> GetCommandDescription() { @@ -467,6 +467,6 @@ OUString GetModuleIdentifier(const Reference<frame::XFrame>& rxFrame) return OUString(); } -} } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/gtk3/gtk3gtkprintwrapper.cxx b/vcl/unx/gtk3/gtk3gtkprintwrapper.cxx index 04a9533e6d10..0066fa004cbf 100644 --- a/vcl/unx/gtk3/gtk3gtkprintwrapper.cxx +++ b/vcl/unx/gtk3/gtk3gtkprintwrapper.cxx @@ -9,9 +9,7 @@ #include <unx/gtk/gtkprintwrapper.hxx> -namespace vcl -{ -namespace unx +namespace vcl::unx { GtkPrintWrapper::GtkPrintWrapper() @@ -151,6 +149,5 @@ void GtkPrintWrapper::print_unix_dialog_set_has_selection(GtkPrintUnixDialog* di } } -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |