diff options
| -rw-r--r-- | salhelper/test/Symbols/samplelib.hxx | 11 | ||||
| -rw-r--r-- | salhelper/test/dynamicloader/samplelib.hxx | 11 | ||||
| -rw-r--r-- | salhelper/test/rtti/rttitest.cxx | 6 | ||||
| -rw-r--r-- | salhelper/test/rtti/samplelibrtti.hxx | 17 | ||||
| -rw-r--r-- | solenv/clang-format/excludelist | 4 |
5 files changed, 20 insertions, 29 deletions
diff --git a/salhelper/test/Symbols/samplelib.hxx b/salhelper/test/Symbols/samplelib.hxx index d1213f6dea8b..99dc0f6f774a 100644 --- a/salhelper/test/Symbols/samplelib.hxx +++ b/salhelper/test/Symbols/samplelib.hxx @@ -24,19 +24,16 @@ struct SampleLib_Api { - sal_Int32 (*funcA)( sal_Int32 ); - double (*funcB)( double ); + sal_Int32 (*funcA)(sal_Int32); + double (*funcB)(double); }; - typedef SampleLib_Api* (*InitSampleLib_Api)(void); #define SAMPLELIB_INIT_FUNCTION_NAME "initSampleLibApi" - -sal_Int32 funcA( sal_Int32 a); -double funcB( double a); - +sal_Int32 funcA(sal_Int32 a); +double funcB(double a); #endif diff --git a/salhelper/test/dynamicloader/samplelib.hxx b/salhelper/test/dynamicloader/samplelib.hxx index 7b65a0ceb182..c254470fbbb6 100644 --- a/salhelper/test/dynamicloader/samplelib.hxx +++ b/salhelper/test/dynamicloader/samplelib.hxx @@ -24,19 +24,16 @@ struct SampleLib_Api { - sal_Int32 (*funcA)( sal_Int32 ); - double (*funcB)( double ); + sal_Int32 (*funcA)(sal_Int32); + double (*funcB)(double); }; - typedef SampleLib_Api* (*InitSampleLib_Api)(void); #define SAMPLELIB_INIT_FUNCTION_NAME "initSampleLibApi" - -sal_Int32 SAL_CALL funcA( sal_Int32 a); -double SAL_CALL funcB( double a); - +sal_Int32 SAL_CALL funcA(sal_Int32 a); +double SAL_CALL funcB(double a); #endif diff --git a/salhelper/test/rtti/rttitest.cxx b/salhelper/test/rtti/rttitest.cxx index 7e753d3a6f43..0e06650034cc 100644 --- a/salhelper/test/rtti/rttitest.cxx +++ b/salhelper/test/rtti/rttitest.cxx @@ -23,14 +23,14 @@ int main() { MyClassB b; - MyClassA* pA= &b; + MyClassA* pA = &b; // test the virtual function pA->funcA(); - if( typeid( b) == typeid( pA)) + if (typeid(b) == typeid(pA)) printf("\nsame types"); - MyClassB* pB= dynamic_cast<MyClassB* >( pA); + MyClassB* pB = dynamic_cast<MyClassB*>(pA); pB->funcA(); return 0; } diff --git a/salhelper/test/rtti/samplelibrtti.hxx b/salhelper/test/rtti/samplelibrtti.hxx index ae7e984a943d..b6bbe62224eb 100644 --- a/salhelper/test/rtti/samplelibrtti.hxx +++ b/salhelper/test/rtti/samplelibrtti.hxx @@ -23,20 +23,21 @@ class MyClassA { public: - virtual void funcA(); - virtual void funcB(); + virtual void funcA(); + virtual void funcB(); + protected: - virtual void funcC(); + virtual void funcC(); }; - -class MyClassB: public MyClassA +class MyClassB : public MyClassA { public: - virtual void funcA(); - virtual void funcB(); + virtual void funcA(); + virtual void funcB(); + protected: - virtual void funcC(); + virtual void funcC(); }; #endif diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 3de0a580b7e4..ee1544646f0d 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -8437,13 +8437,9 @@ salhelper/source/thread.cxx salhelper/source/timer.cxx salhelper/test/Symbols/loader.cxx salhelper/test/Symbols/samplelib.cxx -salhelper/test/Symbols/samplelib.hxx salhelper/test/dynamicloader/loader.cxx salhelper/test/dynamicloader/samplelib.cxx -salhelper/test/dynamicloader/samplelib.hxx -salhelper/test/rtti/rttitest.cxx salhelper/test/rtti/samplelibrtti.cxx -salhelper/test/rtti/samplelibrtti.hxx sax/inc/xml2utf.hxx sax/qa/cppunit/attributes.cxx sax/qa/cppunit/parser.cxx |