diff options
| -rw-r--r-- | solenv/clang-format/excludelist | 6 | ||||
| -rw-r--r-- | svtools/qa/unit/GraphicObjectTest.cxx | 9 | ||||
| -rw-r--r-- | svtools/qa/unit/svtools-dialogs-test.cxx | 4 | ||||
| -rw-r--r-- | svtools/qa/unit/testHtmlWriter.cxx | 4 | ||||
| -rw-r--r-- | svtools/source/control/collatorres.cxx | 3 | ||||
| -rw-r--r-- | svtools/source/inc/unoiface.hxx | 7 | ||||
| -rw-r--r-- | svtools/source/misc/svtresid.cxx | 10 |
7 files changed, 11 insertions, 32 deletions
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index d4ff0c061160..a8d77900a676 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -12520,9 +12520,6 @@ svtools/inc/table/tablerenderer.hxx svtools/inc/table/tablesort.hxx svtools/inc/table/tabletypes.hxx svtools/langsupport/langsupport.cxx -svtools/qa/unit/GraphicObjectTest.cxx -svtools/qa/unit/svtools-dialogs-test.cxx -svtools/qa/unit/testHtmlWriter.cxx svtools/source/brwbox/brwbox1.cxx svtools/source/brwbox/brwbox2.cxx svtools/source/brwbox/brwbox3.cxx @@ -12552,7 +12549,6 @@ svtools/source/config/test/test.cxx svtools/source/control/accessibleruler.cxx svtools/source/control/accessibleruler.hxx svtools/source/control/asynclink.cxx -svtools/source/control/collatorres.cxx svtools/source/control/ctrlbox.cxx svtools/source/control/ctrltool.cxx svtools/source/control/indexentryres.cxx @@ -12584,7 +12580,6 @@ svtools/source/hatchwindow/hatchwindowfactory.cxx svtools/source/hatchwindow/ipwin.cxx svtools/source/hatchwindow/ipwin.hxx svtools/source/inc/hatchwindow.hxx -svtools/source/inc/unoiface.hxx svtools/source/java/javacontext.cxx svtools/source/java/javainteractionhandler.cxx svtools/source/misc/acceleratorexecute.cxx @@ -12602,7 +12597,6 @@ svtools/source/misc/langtab.cxx svtools/source/misc/openfiledroptargetlistener.cxx svtools/source/misc/sampletext.cxx svtools/source/misc/stringtransfer.cxx -svtools/source/misc/svtresid.cxx svtools/source/misc/templatefoldercache.cxx svtools/source/misc/unitconv.cxx svtools/source/svhtml/HtmlWriter.cxx diff --git a/svtools/qa/unit/GraphicObjectTest.cxx b/svtools/qa/unit/GraphicObjectTest.cxx index 849dea550606..766baea6b1cb 100644 --- a/svtools/qa/unit/GraphicObjectTest.cxx +++ b/svtools/qa/unit/GraphicObjectTest.cxx @@ -21,10 +21,8 @@ using namespace css; namespace { - -class GraphicObjectTest: public test::BootstrapFixture, public unotest::MacrosTest +class GraphicObjectTest : public test::BootstrapFixture, public unotest::MacrosTest { - public: void testTdf88836(); @@ -32,7 +30,8 @@ public: { test::BootstrapFixture::setUp(); - mxDesktop.set(css::frame::Desktop::create(comphelper::getComponentContext(getMultiServiceFactory()))); + mxDesktop.set( + css::frame::Desktop::create(comphelper::getComponentContext(getMultiServiceFactory()))); } private: @@ -41,7 +40,6 @@ private: CPPUNIT_TEST_SUITE_END(); }; - void GraphicObjectTest::testTdf88836() { // Construction with empty bitmap -> type should be GraphicType::NONE @@ -52,7 +50,6 @@ void GraphicObjectTest::testTdf88836() } CPPUNIT_TEST_SUITE_REGISTRATION(GraphicObjectTest); - } CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/svtools/qa/unit/svtools-dialogs-test.cxx b/svtools/qa/unit/svtools-dialogs-test.cxx index be79168bb051..2dc921a7bb8e 100644 --- a/svtools/qa/unit/svtools-dialogs-test.cxx +++ b/svtools/qa/unit/svtools-dialogs-test.cxx @@ -39,9 +39,7 @@ public: CPPUNIT_TEST_SUITE_END(); }; -SvtoolsDialogsTest::SvtoolsDialogsTest() -{ -} +SvtoolsDialogsTest::SvtoolsDialogsTest() {} void SvtoolsDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/) { diff --git a/svtools/qa/unit/testHtmlWriter.cxx b/svtools/qa/unit/testHtmlWriter.cxx index 773da64c4891..a041c24b8567 100644 --- a/svtools/qa/unit/testHtmlWriter.cxx +++ b/svtools/qa/unit/testHtmlWriter.cxx @@ -17,7 +17,6 @@ namespace { - OString extractFromStream(SvMemoryStream& rStream) { rStream.WriteChar('\0'); @@ -25,10 +24,9 @@ OString extractFromStream(SvMemoryStream& rStream) rStream.Seek(STREAM_SEEK_TO_BEGIN); return static_cast<const char*>(rStream.GetData()); } - } -class Test: public CppUnit::TestFixture +class Test : public CppUnit::TestFixture { }; diff --git a/svtools/source/control/collatorres.cxx b/svtools/source/control/collatorres.cxx index c2db6b4e9570..d88113998d7d 100644 --- a/svtools/source/control/collatorres.cxx +++ b/svtools/source/control/collatorres.cxx @@ -38,8 +38,7 @@ CollatorResource::CollatorResource() m_aData.emplace_back("phonetic (alphanumeric last)", SvtResId(STR_SVT_COLLATE_PHONETIC_L)); } -const OUString& -CollatorResource::GetTranslation(const OUString &r_Algorithm) +const OUString& CollatorResource::GetTranslation(const OUString& r_Algorithm) { sal_Int32 nIndex = r_Algorithm.indexOf('.'); OUString aLocaleFreeAlgorithm; diff --git a/svtools/source/inc/unoiface.hxx b/svtools/source/inc/unoiface.hxx index 8134bb5ddfc3..8bd6cbd38cee 100644 --- a/svtools/source/inc/unoiface.hxx +++ b/svtools/source/inc/unoiface.hxx @@ -23,12 +23,11 @@ #include <toolkit/awt/vclxwindows.hxx> #include <toolkit/helper/listenermultiplexer.hxx> -namespace com::sun::star::util { - class XNumberFormatsSupplier; +namespace com::sun::star::util +{ +class XNumberFormatsSupplier; } class SvNumberFormatsSupplierObj; - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/misc/svtresid.cxx b/svtools/source/misc/svtresid.cxx index cc03beeb1dd3..5271d218f5f4 100644 --- a/svtools/source/misc/svtresid.cxx +++ b/svtools/source/misc/svtresid.cxx @@ -20,14 +20,8 @@ #include <unotools/resmgr.hxx> #include <svtools/svtresid.hxx> -std::locale SvtResLocale() -{ - return Translate::Create("svt"); -} +std::locale SvtResLocale() { return Translate::Create("svt"); } -OUString SvtResId(const char* pId) -{ - return Translate::get(pId, SvtResLocale()); -} +OUString SvtResId(const char* pId) { return Translate::get(pId, SvtResLocale()); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |