diff options
Diffstat (limited to 'cppuhelper')
107 files changed, 653 insertions, 173 deletions
diff --git a/cppuhelper/inc/cppuhelper/access_control.hxx b/cppuhelper/inc/cppuhelper/access_control.hxx index 92de0499e964..7b177c9e8ea4 100755..100644 --- a/cppuhelper/inc/cppuhelper/access_control.hxx +++ b/cppuhelper/inc/cppuhelper/access_control.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -122,3 +123,5 @@ public: } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/basemutex.hxx b/cppuhelper/inc/cppuhelper/basemutex.hxx index e07a41aa1f71..f145709095fb 100644 --- a/cppuhelper/inc/cppuhelper/basemutex.hxx +++ b/cppuhelper/inc/cppuhelper/basemutex.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47,3 +48,5 @@ namespace cppu }; } #endif // _CPPUHELPER_BASEMUTEX_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/bootstrap.hxx b/cppuhelper/inc/cppuhelper/bootstrap.hxx index 0101214af3fc..253d3fa53b40 100644 --- a/cppuhelper/inc/cppuhelper/bootstrap.hxx +++ b/cppuhelper/inc/cppuhelper/bootstrap.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -221,3 +222,5 @@ SAL_CALL bootstrap_expandUri(::rtl::OUString const & uri); } // end namespace cppu #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/compbase.hxx b/cppuhelper/inc/cppuhelper/compbase.hxx index 91a53a7cdcf2..5827c630da23 100644 --- a/cppuhelper/inc/cppuhelper/compbase.hxx +++ b/cppuhelper/inc/cppuhelper/compbase.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -113,3 +114,5 @@ __DEF_COMPIMPLHELPER_B( N ) \ __DEF_COMPIMPLHELPER_C( N ) #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/compbase1.hxx b/cppuhelper/inc/cppuhelper/compbase1.hxx index 24037d98d58a..b968c3278eb1 100644 --- a/cppuhelper/inc/cppuhelper/compbase1.hxx +++ b/cppuhelper/inc/cppuhelper/compbase1.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -135,3 +136,5 @@ namespace cppu } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/compbase10.hxx b/cppuhelper/inc/cppuhelper/compbase10.hxx index c55c7a46c12b..0dd725b35a16 100644 --- a/cppuhelper/inc/cppuhelper/compbase10.hxx +++ b/cppuhelper/inc/cppuhelper/compbase10.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -135,3 +136,5 @@ namespace cppu } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/compbase11.hxx b/cppuhelper/inc/cppuhelper/compbase11.hxx index d2f3a7a68d63..5b88983ac6fd 100644 --- a/cppuhelper/inc/cppuhelper/compbase11.hxx +++ b/cppuhelper/inc/cppuhelper/compbase11.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -135,3 +136,5 @@ namespace cppu } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/compbase12.hxx b/cppuhelper/inc/cppuhelper/compbase12.hxx index 50b02ba748f3..f79af5223571 100644 --- a/cppuhelper/inc/cppuhelper/compbase12.hxx +++ b/cppuhelper/inc/cppuhelper/compbase12.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -135,3 +136,5 @@ namespace cppu } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/compbase2.hxx b/cppuhelper/inc/cppuhelper/compbase2.hxx index 2c8adf8864bf..9518c01f85fd 100644 --- a/cppuhelper/inc/cppuhelper/compbase2.hxx +++ b/cppuhelper/inc/cppuhelper/compbase2.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -135,3 +136,5 @@ namespace cppu } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/compbase3.hxx b/cppuhelper/inc/cppuhelper/compbase3.hxx index c9958e8d14b9..04bac81f9e2a 100644 --- a/cppuhelper/inc/cppuhelper/compbase3.hxx +++ b/cppuhelper/inc/cppuhelper/compbase3.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -135,3 +136,5 @@ namespace cppu } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/compbase4.hxx b/cppuhelper/inc/cppuhelper/compbase4.hxx index be6257cd0823..a482e4bf0be7 100644 --- a/cppuhelper/inc/cppuhelper/compbase4.hxx +++ b/cppuhelper/inc/cppuhelper/compbase4.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -135,3 +136,5 @@ namespace cppu } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/compbase5.hxx b/cppuhelper/inc/cppuhelper/compbase5.hxx index 26d6af679922..2fdaf471aa73 100644 --- a/cppuhelper/inc/cppuhelper/compbase5.hxx +++ b/cppuhelper/inc/cppuhelper/compbase5.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -135,3 +136,5 @@ namespace cppu } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/compbase6.hxx b/cppuhelper/inc/cppuhelper/compbase6.hxx index b5b709495cb0..3c80d59169fe 100644 --- a/cppuhelper/inc/cppuhelper/compbase6.hxx +++ b/cppuhelper/inc/cppuhelper/compbase6.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -135,3 +136,5 @@ namespace cppu } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/compbase7.hxx b/cppuhelper/inc/cppuhelper/compbase7.hxx index dd9ffcdb059f..43d4de7d787a 100644 --- a/cppuhelper/inc/cppuhelper/compbase7.hxx +++ b/cppuhelper/inc/cppuhelper/compbase7.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -135,3 +136,5 @@ namespace cppu } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/compbase8.hxx b/cppuhelper/inc/cppuhelper/compbase8.hxx index c5e49796d9bf..8df9b4fb5eff 100644 --- a/cppuhelper/inc/cppuhelper/compbase8.hxx +++ b/cppuhelper/inc/cppuhelper/compbase8.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -135,3 +136,5 @@ namespace cppu } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/compbase9.hxx b/cppuhelper/inc/cppuhelper/compbase9.hxx index c943241f27e9..a2f90b45dae6 100644 --- a/cppuhelper/inc/cppuhelper/compbase9.hxx +++ b/cppuhelper/inc/cppuhelper/compbase9.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -134,3 +135,5 @@ namespace cppu } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/compbase_ex.hxx b/cppuhelper/inc/cppuhelper/compbase_ex.hxx index 130cd7fb5489..121927b3320c 100644 --- a/cppuhelper/inc/cppuhelper/compbase_ex.hxx +++ b/cppuhelper/inc/cppuhelper/compbase_ex.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -45,7 +46,7 @@ class SAL_NO_VTABLE WeakComponentImplHelperBase , public ::com::sun::star::lang::XComponent { protected: - /** boradcast helper for disposing events + /** broadcast helper for disposing events */ ::cppu::OBroadcastHelper rBHelper; @@ -174,3 +175,5 @@ public: } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/component.hxx b/cppuhelper/inc/cppuhelper/component.hxx index 244e111510c5..76f74d402ab5 100644 --- a/cppuhelper/inc/cppuhelper/component.hxx +++ b/cppuhelper/inc/cppuhelper/component.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,9 +32,7 @@ #include <cppuhelper/weakagg.hxx> #include <cppuhelper/interfacecontainer.hxx> -#ifndef _CPPUHELPER_IMPLBASE1_HXX #include <cppuhelper/implbase1.hxx> -#endif #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XEventListener.hpp> @@ -118,3 +117,5 @@ private: } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/component_context.hxx b/cppuhelper/inc/cppuhelper/component_context.hxx index 34c26fe3dfeb..10ecc2a885c4 100644 --- a/cppuhelper/inc/cppuhelper/component_context.hxx +++ b/cppuhelper/inc/cppuhelper/component_context.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -94,3 +95,5 @@ SAL_CALL createComponentContext( } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/exc_hlp.hxx b/cppuhelper/inc/cppuhelper/exc_hlp.hxx index 3de6c3bf64ef..5b07c05d9edc 100644 --- a/cppuhelper/inc/cppuhelper/exc_hlp.hxx +++ b/cppuhelper/inc/cppuhelper/exc_hlp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -96,3 +97,4 @@ void SAL_CALL throwException( const ::com::sun::star::uno::Any & rExc ) #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/factory.hxx b/cppuhelper/inc/cppuhelper/factory.hxx index 2f1afcab1726..9348fa0a52ba 100644 --- a/cppuhelper/inc/cppuhelper/factory.hxx +++ b/cppuhelper/inc/cppuhelper/factory.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -276,3 +277,5 @@ createOneInstanceFactory( } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/findsofficepath.h b/cppuhelper/inc/cppuhelper/findsofficepath.h index 1624762341d8..b1bbc50e3340 100644 --- a/cppuhelper/inc/cppuhelper/findsofficepath.h +++ b/cppuhelper/inc/cppuhelper/findsofficepath.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,3 +44,5 @@ char const* cppuhelper_detail_findSofficePath(void); #endif #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/implbase.hxx b/cppuhelper/inc/cppuhelper/implbase.hxx index 1620b1d1efdb..a6ba29d7d3e0 100644 --- a/cppuhelper/inc/cppuhelper/implbase.hxx +++ b/cppuhelper/inc/cppuhelper/implbase.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,7 +44,7 @@ namespace cppu { /** Struct used for inline template implementation helpers: type entries. - Not for plublic use. + Not for public use. @internal */ struct Type_Offset @@ -56,7 +57,7 @@ struct Type_Offset typelib_InterfaceTypeDescription * pTD; }; /** Struct used for inline template implementation helpers: class data of implementation. - Not for plublic use. + Not for public use. @internal */ struct ClassDataBase @@ -101,7 +102,7 @@ struct ClassDataBase There will be versions of this struct with varying arType2Offset[] array sizes, each of which is binary compatible with this one to be casted and used uniform. The size of the varying array is set in ClassDataBase::nType2Offset (base class). - Not for plublic use. + Not for public use. @internal */ struct ClassData : public ClassDataBase @@ -136,7 +137,7 @@ struct ClassData : public ClassDataBase */ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() SAL_THROW( () ); - /** Gets the class id of implemtation supporting com.sun.star.lang.XTypeProvider + /** Gets the class id of implementation supporting com.sun.star.lang.XTypeProvider @return class identifier (sequence< byte >) */ @@ -178,8 +179,8 @@ namespace cppu \ struct ClassData##N : public ClassDataBase \ { \ Type_Offset arType2Offset[ N ]; \ - ClassData##N( sal_Int32 nClassCode ) SAL_THROW( () ) \ - : ClassDataBase( nClassCode ) \ + ClassData##N( sal_Int32 nInClassCode ) SAL_THROW( () ) \ + : ClassDataBase( nInClassCode ) \ {} \ }; \ template< __CLASS_IFC##N > \ @@ -296,3 +297,4 @@ __DEF_IMPLHELPER_POST_B( N ) \ __DEF_IMPLHELPER_POST_C( N ) #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/implbase1.hxx b/cppuhelper/inc/cppuhelper/implbase1.hxx index bf42186f061e..6974c4c57507 100644 --- a/cppuhelper/inc/cppuhelper/implbase1.hxx +++ b/cppuhelper/inc/cppuhelper/implbase1.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -90,6 +91,10 @@ namespace cppu @derive Inherit from this class giving your interface(s) to be implemented as template argument(s). Your sub class defines method implementations for these interface(s). + + These classes are used when you implement your UNO component. + WeakImplHelper1 till WeakImplHelper12 can be used when you want + to implement 1 till 12 interfaces in your component. */ template< class Ifc1 > class SAL_NO_VTABLE WeakImplHelper1 @@ -293,3 +298,5 @@ namespace cppu } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/implbase10.hxx b/cppuhelper/inc/cppuhelper/implbase10.hxx index 2f060bcc63e4..972de4544fe9 100644 --- a/cppuhelper/inc/cppuhelper/implbase10.hxx +++ b/cppuhelper/inc/cppuhelper/implbase10.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -298,3 +299,5 @@ namespace cppu } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/implbase11.hxx b/cppuhelper/inc/cppuhelper/implbase11.hxx index b27c668194b6..49a1149b68fa 100644 --- a/cppuhelper/inc/cppuhelper/implbase11.hxx +++ b/cppuhelper/inc/cppuhelper/implbase11.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -299,3 +300,5 @@ namespace cppu } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/implbase12.hxx b/cppuhelper/inc/cppuhelper/implbase12.hxx index 8abf410dca62..0005abf07f3d 100644 --- a/cppuhelper/inc/cppuhelper/implbase12.hxx +++ b/cppuhelper/inc/cppuhelper/implbase12.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -300,3 +301,5 @@ namespace cppu } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/implbase2.hxx b/cppuhelper/inc/cppuhelper/implbase2.hxx index 9fbf2261d261..99282f6a0a16 100644 --- a/cppuhelper/inc/cppuhelper/implbase2.hxx +++ b/cppuhelper/inc/cppuhelper/implbase2.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -289,3 +290,5 @@ namespace cppu } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/implbase3.hxx b/cppuhelper/inc/cppuhelper/implbase3.hxx index 9748832ec258..1aad6ce7b940 100644 --- a/cppuhelper/inc/cppuhelper/implbase3.hxx +++ b/cppuhelper/inc/cppuhelper/implbase3.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -291,3 +292,5 @@ namespace cppu } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/implbase4.hxx b/cppuhelper/inc/cppuhelper/implbase4.hxx index 1952ccd31b1c..ad00b829ee88 100644 --- a/cppuhelper/inc/cppuhelper/implbase4.hxx +++ b/cppuhelper/inc/cppuhelper/implbase4.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -292,3 +293,5 @@ namespace cppu } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/implbase5.hxx b/cppuhelper/inc/cppuhelper/implbase5.hxx index 3d41b1b5a81c..8d4e216e0b00 100644 --- a/cppuhelper/inc/cppuhelper/implbase5.hxx +++ b/cppuhelper/inc/cppuhelper/implbase5.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -293,3 +294,5 @@ namespace cppu } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/implbase6.hxx b/cppuhelper/inc/cppuhelper/implbase6.hxx index 67295a4a6dc7..c545284145e6 100644 --- a/cppuhelper/inc/cppuhelper/implbase6.hxx +++ b/cppuhelper/inc/cppuhelper/implbase6.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -294,3 +295,5 @@ namespace cppu } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/implbase7.hxx b/cppuhelper/inc/cppuhelper/implbase7.hxx index bc82debf8e7c..9a254f40f731 100644 --- a/cppuhelper/inc/cppuhelper/implbase7.hxx +++ b/cppuhelper/inc/cppuhelper/implbase7.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -296,3 +297,5 @@ namespace cppu } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/implbase8.hxx b/cppuhelper/inc/cppuhelper/implbase8.hxx index 6e4800d1c08a..e817dc388e8a 100644 --- a/cppuhelper/inc/cppuhelper/implbase8.hxx +++ b/cppuhelper/inc/cppuhelper/implbase8.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -296,3 +297,5 @@ namespace cppu } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/implbase9.hxx b/cppuhelper/inc/cppuhelper/implbase9.hxx index cf8af96873f2..a070c71cab3e 100644 --- a/cppuhelper/inc/cppuhelper/implbase9.hxx +++ b/cppuhelper/inc/cppuhelper/implbase9.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -298,3 +299,5 @@ namespace cppu } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/implbase_ex.hxx b/cppuhelper/inc/cppuhelper/implbase_ex.hxx index cf4b064e130c..267bdf6b04cc 100644 --- a/cppuhelper/inc/cppuhelper/implbase_ex.hxx +++ b/cppuhelper/inc/cppuhelper/implbase_ex.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -172,3 +173,5 @@ struct class_data } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/implbase_ex_post.hxx b/cppuhelper/inc/cppuhelper/implbase_ex_post.hxx index 70cc9c677b40..83849e5e6cab 100644 --- a/cppuhelper/inc/cppuhelper/implbase_ex_post.hxx +++ b/cppuhelper/inc/cppuhelper/implbase_ex_post.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -229,3 +230,5 @@ __DEF_CLASS_DATA_INIT_EX( N, (WeakAggComponentImplHelper##N< __IFC##N > *) ); \ } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/implbase_ex_pre.hxx b/cppuhelper/inc/cppuhelper/implbase_ex_pre.hxx index 49a188f4b68f..337fa1ecdc9a 100644 --- a/cppuhelper/inc/cppuhelper/implbase_ex_pre.hxx +++ b/cppuhelper/inc/cppuhelper/implbase_ex_pre.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,3 +35,5 @@ #define __IFC_EX_TYPE_INIT( class_cast, N ) __IFC_EX_TYPE_INIT_NAME( class_cast, Ifc##N ) #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/implementationentry.hxx b/cppuhelper/inc/cppuhelper/implementationentry.hxx index e432a6186482..2561811fba1b 100644 --- a/cppuhelper/inc/cppuhelper/implementationentry.hxx +++ b/cppuhelper/inc/cppuhelper/implementationentry.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -24,8 +25,8 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#ifndef _CPPUHELPER_IMPLEMENATIONENTRY_HXX_ -#define _CPPUHELPER_IMPLEMENATIONENTRY_HXX_ +#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_ +#define _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_ #include <cppuhelper/factory.hxx> @@ -36,21 +37,21 @@ namespace cppu */ struct ImplementationEntry { - /** Function, that creates an instance of the implemenation + /** Function that creates an instance of the implementation */ ComponentFactoryFunc create; - /** Function, that returns the implemenation-name of the implemenation + /** Function that returns the implementation-name of the implementation (same as XServiceInfo.getImplementationName() ). */ rtl::OUString ( SAL_CALL * getImplementationName )(); - /** Function, that returns all supported servicenames of the implemenation + /** Function that returns all supported servicenames of the implementation ( same as XServiceInfo.getSupportedServiceNames() ). */ com::sun::star::uno::Sequence< rtl::OUString > ( SAL_CALL * getSupportedServiceNames ) (); - /** Function, that creates a SingleComponentFactory. + /** Function that creates a SingleComponentFactory. */ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory > ( SAL_CALL * createFactory )( @@ -59,7 +60,7 @@ struct ImplementationEntry ::com::sun::star::uno::Sequence< ::rtl::OUString > const & rServiceNames, rtl_ModuleCount * pModCount ); - /** The shared-library module-counter of the implemenation. Maybe 0. The module-counter + /** The shared-library module-counter of the implementation. Maybe 0. The module-counter is used during by the createFactory()-function. */ rtl_ModuleCount * moduleCounter; @@ -80,7 +81,7 @@ struct ImplementationEntry This is a reference to the registry key, into which the implementation data shall be written to. @param entries Each element of the entries-array must contains a function pointer - table for registering an implemenation. The end of the array + table for registering an implementation. The end of the array must be marked with a 0 entry in the create-function. @return sal_True, if all implementations could be registered, otherwise sal_False. */ @@ -111,3 +112,5 @@ void *component_getFactoryHelper( } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/interfacecontainer.h b/cppuhelper/inc/cppuhelper/interfacecontainer.h index ee57127a4fca..ae3c2adf1457 100644 --- a/cppuhelper/inc/cppuhelper/interfacecontainer.h +++ b/cppuhelper/inc/cppuhelper/interfacecontainer.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -615,3 +616,4 @@ typedef OBroadcastHelperVar< OMultiTypeInterfaceContainerHelper , OMultiTypeInte #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/interfacecontainer.hxx b/cppuhelper/inc/cppuhelper/interfacecontainer.hxx index 15f93640dc51..d9c347ecc0cf 100644 --- a/cppuhelper/inc/cppuhelper/interfacecontainer.hxx +++ b/cppuhelper/inc/cppuhelper/interfacecontainer.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -157,7 +158,6 @@ void OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::dispos { typedef OInterfaceContainerHelper* ppp; ppListenerContainers = new ppp[nSize]; - //ppListenerContainers = new (ListenerContainer*)[nSize]; typename InterfaceMap::iterator iter = m_pMap->begin(); typename InterfaceMap::iterator end = m_pMap->end(); @@ -201,3 +201,4 @@ void OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::clear( #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/propertysetmixin.hxx b/cppuhelper/inc/cppuhelper/propertysetmixin.hxx index 743ea384a693..6ab242f111a0 100644 --- a/cppuhelper/inc/cppuhelper/propertysetmixin.hxx +++ b/cppuhelper/inc/cppuhelper/propertysetmixin.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -486,3 +487,5 @@ private: } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/propshlp.hxx b/cppuhelper/inc/cppuhelper/propshlp.hxx index 82bbd2bdcdbe..89a2fa7dc72f 100644 --- a/cppuhelper/inc/cppuhelper/propshlp.hxx +++ b/cppuhelper/inc/cppuhelper/propshlp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -202,7 +203,7 @@ protected: private: void init( sal_Bool bSorted ) SAL_THROW( () ); - /** The sequence generstet from the pProperties array. */ + /** The sequence generated from the pProperties array. */ ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > aInfos; /** @@ -293,8 +294,8 @@ public: SAL_THROW( () ); /** - Call disposing on all object in the container that - support XEventListener. Than clear the container. + Call disposing on all objects in the container that + support XEventListener. Then clear the container. */ void SAL_CALL disposeAndClear( const ::com::sun::star::lang::EventObject & rEvt ) SAL_THROW( () ); /** @@ -671,3 +672,4 @@ public: +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/proptypehlp.h b/cppuhelper/inc/cppuhelper/proptypehlp.h index 60cb7908a7b2..e36e9d897dee 100644 --- a/cppuhelper/inc/cppuhelper/proptypehlp.h +++ b/cppuhelper/inc/cppuhelper/proptypehlp.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -74,3 +75,5 @@ inline void SAL_CALL convertPropertyValue( ::rtl::OUString &target , const ::co #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/proptypehlp.hxx b/cppuhelper/inc/cppuhelper/proptypehlp.hxx index 87fa8600a863..b1c50389dc83 100644 --- a/cppuhelper/inc/cppuhelper/proptypehlp.hxx +++ b/cppuhelper/inc/cppuhelper/proptypehlp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -528,3 +529,4 @@ inline void SAL_CALL convertPropertyValue( ::rtl::OUString &ow , const ::com::su #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/queryinterface.hxx b/cppuhelper/inc/cppuhelper/queryinterface.hxx index 2eb5e171e965..e67e9f9b9342 100644 --- a/cppuhelper/inc/cppuhelper/queryinterface.hxx +++ b/cppuhelper/inc/cppuhelper/queryinterface.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -539,3 +540,4 @@ inline ::com::sun::star::uno::Any SAL_CALL queryInterface( #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/servicefactory.hxx b/cppuhelper/inc/cppuhelper/servicefactory.hxx index 03c52363fb4c..366b7dd35e06 100644 --- a/cppuhelper/inc/cppuhelper/servicefactory.hxx +++ b/cppuhelper/inc/cppuhelper/servicefactory.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -120,3 +121,4 @@ createServiceFactory( #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/shlib.hxx b/cppuhelper/inc/cppuhelper/shlib.hxx index ee7ae8ff4fda..7bfdc97ea75e 100644 --- a/cppuhelper/inc/cppuhelper/shlib.hxx +++ b/cppuhelper/inc/cppuhelper/shlib.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -82,3 +83,5 @@ SAL_CALL writeSharedLibComponentInfo( } // end namespace cppu #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/stdidlclass.hxx b/cppuhelper/inc/cppuhelper/stdidlclass.hxx index f4147bb86ca3..e7c8443ef0f3 100644 --- a/cppuhelper/inc/cppuhelper/stdidlclass.hxx +++ b/cppuhelper/inc/cppuhelper/stdidlclass.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46,10 +47,10 @@ namespace cppu { /** - Standardfunction to create an XIdlClass for a component. + Standard function to create an XIdlClass for a component. There is a function for each number of supported interfaces up to 10. - Since the switch to the final component model, there are no use cases anymore, where + Since the switch to the final component model, there are no use cases anymore where these functions should be used. Instead use the implementation helpers directly (see cppuhelper/implbase1.hxx). @@ -387,3 +388,5 @@ createStandardClass( const ::com::sun::star::uno::Reference < ::com::sun::sta } // end namespace cppu #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/typeprovider.hxx b/cppuhelper/inc/cppuhelper/typeprovider.hxx index 355f7edc1071..c434d54a7071 100644 --- a/cppuhelper/inc/cppuhelper/typeprovider.hxx +++ b/cppuhelper/inc/cppuhelper/typeprovider.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -240,3 +241,5 @@ public: } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/unourl.hxx b/cppuhelper/inc/cppuhelper/unourl.hxx index 95633e87e59b..c0d70dee8e9b 100644 --- a/cppuhelper/inc/cppuhelper/unourl.hxx +++ b/cppuhelper/inc/cppuhelper/unourl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -190,3 +191,5 @@ private: } #endif // INCLUDED_RTL_UNOURL_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/weak.hxx b/cppuhelper/inc/cppuhelper/weak.hxx index 701b8f102f91..14236d992310 100644 --- a/cppuhelper/inc/cppuhelper/weak.hxx +++ b/cppuhelper/inc/cppuhelper/weak.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,9 +32,7 @@ #include <rtl/alloc.h> #include <cppuhelper/weakref.hxx> #include <cppuhelper/queryinterface.hxx> -#ifndef _COM_SUN_STAR_UNO_WEAK_HPP_ #include <com/sun/star/uno/XWeak.hpp> -#endif namespace cppu @@ -170,3 +169,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/weakagg.hxx b/cppuhelper/inc/cppuhelper/weakagg.hxx index 51d0341f9b99..adc3b7987d04 100644 --- a/cppuhelper/inc/cppuhelper/weakagg.hxx +++ b/cppuhelper/inc/cppuhelper/weakagg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -109,3 +110,5 @@ private: } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/cppuhelper/weakref.hxx b/cppuhelper/inc/cppuhelper/weakref.hxx index b459024b8c27..f138a8aeaf10 100644 --- a/cppuhelper/inc/cppuhelper/weakref.hxx +++ b/cppuhelper/inc/cppuhelper/weakref.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -167,3 +168,5 @@ public: } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/pch/precompiled_cppuhelper.cxx b/cppuhelper/inc/pch/precompiled_cppuhelper.cxx index f194f77cd13f..28a0019ac80e 100644 --- a/cppuhelper/inc/pch/precompiled_cppuhelper.cxx +++ b/cppuhelper/inc/pch/precompiled_cppuhelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,3 +28,4 @@ #include "precompiled_cppuhelper.hxx" +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/inc/pch/precompiled_cppuhelper.hxx b/cppuhelper/inc/pch/precompiled_cppuhelper.hxx index 69ec5293407c..9a601079de5b 100644 --- a/cppuhelper/inc/pch/precompiled_cppuhelper.hxx +++ b/cppuhelper/inc/pch/precompiled_cppuhelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,3 +31,4 @@ #ifdef PRECOMPILED_HEADERS #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx index 2e87e80452c5..039586462ba2 100644 --- a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx +++ b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -128,7 +129,7 @@ namespace cppu_ifcontainer for (i = 0; i < nTests; i++) { Reference<XEventListener> xRef = new ContainerListener(&aStats); - int nNewLen = pContainer->addInterface(xRef); + pContainer->addInterface(xRef); aListeners.push_back(xRef); } Sequence< Reference< XInterface > > aElements; @@ -281,3 +282,5 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(cppu_ifcontainer::IfTest, "cppu_ifcontainer"); NOADDITIONAL; + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/qa/ifcontainer/makefile.mk b/cppuhelper/qa/ifcontainer/makefile.mk index 3277b4c204ea..6f3476aa48c7 100644 --- a/cppuhelper/qa/ifcontainer/makefile.mk +++ b/cppuhelper/qa/ifcontainer/makefile.mk @@ -46,7 +46,6 @@ SHL1STDLIBS=\ $(CPPUHELPERLIB) \ $(SALLIB) \ $(CPPULIB) \ - $(TESTSHL2LIB)\ $(CPPUNITLIB) SHL1IMPLIB= i$(SHL1TARGET) DEF1NAME =$(SHL1TARGET) diff --git a/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx b/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx index 1ed996617ce5..674652a24d11 100644 --- a/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx +++ b/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -427,3 +428,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( { *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } + + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file diff --git a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx index e4f1a4a78c3b..49b8cd07a6fd 100644 --- a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx +++ b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -650,3 +651,5 @@ CPPUNIT_TEST_SUITE_REGISTRATION(Test); } CPPUNIT_PLUGIN_IMPLEMENT(); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/qa/unourl/cppu_unourl.cxx b/cppuhelper/qa/unourl/cppu_unourl.cxx index e5eb359e3485..be2626910534 100644 --- a/cppuhelper/qa/unourl/cppu_unourl.cxx +++ b/cppuhelper/qa/unourl/cppu_unourl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -125,7 +126,6 @@ namespace cppu_unourl { "abc,def=%22", "abc,def=%22" }, { "abc,def=\"", "abc,def=\"" }, { "abc,def=%ed%a0%80", "abc,def=%ed%a0%80" } }; - bool bResult = true; for (int i = 0; i < sizeof aTests / sizeof (Test); ++i) { bool bValid = false; @@ -479,3 +479,4 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(cppu_unourl::UrlTest, NOADDITIONAL; +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/qa/unourl/makefile.mk b/cppuhelper/qa/unourl/makefile.mk index de2c05d40bc1..4e46dd088b93 100644 --- a/cppuhelper/qa/unourl/makefile.mk +++ b/cppuhelper/qa/unourl/makefile.mk @@ -46,7 +46,6 @@ SHL1STDLIBS=\ $(CPPUHELPERLIB) \ $(SALLIB) \ $(CPPULIB) \ - $(TESTSHL2LIB)\ $(CPPUNITLIB) SHL1IMPLIB= i$(SHL1TARGET) DEF1NAME =$(SHL1TARGET) diff --git a/cppuhelper/qa/weak/makefile.mk b/cppuhelper/qa/weak/makefile.mk index 543e87118a75..5116886b671c 100644 --- a/cppuhelper/qa/weak/makefile.mk +++ b/cppuhelper/qa/weak/makefile.mk @@ -38,7 +38,7 @@ DLLPRE = # no leading "lib" on .so files SHL1TARGET = $(TARGET) SHL1OBJS = $(SLO)$/test_weak.obj -SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(SALLIB) $(TESTSHL2LIB) +SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(SALLIB) SHL1VERSIONMAP = version.map SHL1IMPLIB = i$(SHL1TARGET) DEF1NAME = $(SHL1TARGET) diff --git a/cppuhelper/qa/weak/test_weak.cxx b/cppuhelper/qa/weak/test_weak.cxx index dffca9d97d97..eb93659e1e64 100644 --- a/cppuhelper/qa/weak/test_weak.cxx +++ b/cppuhelper/qa/weak/test_weak.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -107,3 +108,5 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, "alltests"); } NOADDITIONAL; + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/source/access_control.cxx b/cppuhelper/source/access_control.cxx index f3ef9f81fc0d..b3c8e0c0b16d 100644 --- a/cppuhelper/source/access_control.cxx +++ b/cppuhelper/source/access_control.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -147,3 +148,5 @@ void AccessControl::checkSocketPermission( } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/source/bootstrap.cxx b/cppuhelper/source/bootstrap.cxx index f892cdcab0f3..4f9ba819b19c 100644 --- a/cppuhelper/source/bootstrap.cxx +++ b/cppuhelper/source/bootstrap.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -272,7 +273,7 @@ OUString findBoostrapArgument( } Reference< registry::XSimpleRegistry > nestRegistries( - const OUString baseDir, + const OUString &baseDir, const Reference< lang::XSingleServiceFactory > & xSimRegFac, const Reference< lang::XSingleServiceFactory > & xNesRegFac, OUString csl_rdbs, @@ -608,7 +609,7 @@ Reference< XComponentContext > SAL_CALL bootstrap() case osl_Process_E_NotFound: throw BootstrapException( OUSTR( "image not found!" ) ); case osl_Process_E_TimedOut: - throw BootstrapException( OUSTR( "timout occured!" ) ); + throw BootstrapException( OUSTR( "timout occurred!" ) ); case osl_Process_E_NoPermission: throw BootstrapException( OUSTR( "permission denied!" ) ); case osl_Process_E_Unknown: @@ -668,3 +669,5 @@ OUString bootstrap_expandUri(OUString const & uri) { } } // namespace cppu + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/source/component.cxx b/cppuhelper/source/component.cxx index b152a8f13f49..ffafbe5bcbeb 100644 --- a/cppuhelper/source/component.cxx +++ b/cppuhelper/source/component.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,11 +36,14 @@ #include "com/sun/star/uno/RuntimeException.hpp" using namespace osl; -using namespace rtl; using namespace com::sun::star; using namespace com::sun::star::uno; using namespace com::sun::star::lang; +using ::rtl::OUString; +using ::rtl::OString; +using ::rtl::OUStringToOString; + namespace cppu { @@ -211,7 +215,7 @@ void OComponentHelper::dispose() } else { - // in a multithreaded environment, it can't be avoided, + // in a multithreaded environment, it can't be avoided // that dispose is called twice. // However this condition is traced, because it MAY indicate an error. OSL_TRACE( "OComponentHelper::dispose() - dispose called twice" ); @@ -246,3 +250,4 @@ void OComponentHelper::removeEventListener( } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx index 05b4f30205ef..74a6f9b2e305 100644 --- a/cppuhelper/source/component_context.cxx +++ b/cppuhelper/source/component_context.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -37,7 +38,7 @@ #endif #include <vector> -#include <hash_map> +#include <boost/unordered_map.hpp> #ifdef CONTEXT_DIAG #include <map> #endif @@ -63,7 +64,6 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include "com/sun/star/uno/RuntimeException.hpp" -#include <hash_map> #include <memory> #define SMGR_SINGLETON "/singletons/com.sun.star.lang.theServiceManager" @@ -362,7 +362,7 @@ protected: , lateInit( lateInit_ ) {} }; - typedef ::std::hash_map< OUString, ContextEntry * , OUStringHash > t_map; + typedef ::boost::unordered_map< OUString, ContextEntry * , OUStringHash > t_map; t_map m_map; Reference< lang::XMultiComponentFactory > m_xSMgr; @@ -615,7 +615,7 @@ Any ComponentContext::lookupMap( OUString const & rName ) Any caught( getCaughtException() ); OUStringBuffer buf; buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( - "exception occured raising singleton \"") ); + "exception occurred raising singleton \"") ); buf.append( rName ); buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\": ") ); buf.append( exc.Message ); @@ -897,3 +897,5 @@ Reference< XComponentContext > SAL_CALL createComponentContext( } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/source/exc_thrower.cxx b/cppuhelper/source/exc_thrower.cxx index c23873bda831..234e57569a73 100644 --- a/cppuhelper/source/exc_thrower.cxx +++ b/cppuhelper/source/exc_thrower.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -296,3 +297,5 @@ Any SAL_CALL getCaughtException() } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx index 20adf05391b9..4c203c3ef07f 100644 --- a/cppuhelper/source/factory.cxx +++ b/cppuhelper/source/factory.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,9 +33,7 @@ #include <cppuhelper/weak.hxx> #include <cppuhelper/component.hxx> #include <cppuhelper/factory.hxx> -#ifndef _CPPUHELPER_IMPLBASE3_HXX #include <cppuhelper/implbase3.hxx> -#endif #include <cppuhelper/typeprovider.hxx> #include <rtl/unload.h> @@ -56,19 +55,17 @@ using namespace osl; -using namespace rtl; using namespace com::sun::star; using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::loader; using namespace com::sun::star::registry; +using ::rtl::OUString; + namespace cppu { -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- class OSingleFactoryHelper : public XServiceInfo , public XSingleServiceFactory @@ -276,10 +273,6 @@ Sequence< OUString > OSingleFactoryHelper::getSupportedServiceNames(void) return aServiceNames; } - -//---------------------------------------------------------------------- -//---------------------------------------------------------------------- -//---------------------------------------------------------------------- struct OFactoryComponentHelper_Mutex { Mutex aMutex; @@ -552,10 +545,6 @@ sal_Bool SAL_CALL OFactoryComponentHelper::releaseOnNotification() throw(::com:: return sal_True; } - -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- class ORegistryFactoryHelper : public OFactoryComponentHelper, public OPropertySetHelper @@ -874,7 +863,7 @@ Reference< XInterface > ORegistryFactoryHelper::createModuleFactory() // one implementation found -> try to activate aLocation = xLocationKey->getAsciiValue(); - // search protocol delemitter + // search protocol delimiter sal_Int32 nPos = aLocation.indexOf( OUString( RTL_CONSTASCII_USTRINGPARAM("://") ) ); if( nPos != -1 ) @@ -963,10 +952,6 @@ sal_Bool SAL_CALL ORegistryFactoryHelper::releaseOnNotification() throw(::com::s return retVal; } -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- - class OFactoryProxyHelper : public WeakImplHelper3< XServiceInfo, XSingleServiceFactory, XUnloadingPreference > { @@ -1056,10 +1041,6 @@ sal_Bool SAL_CALL OFactoryProxyHelper::releaseOnNotification() throw(::com::sun: return sal_True; } - -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- // global function Reference<XSingleServiceFactory > SAL_CALL createSingleFactory( const Reference<XMultiServiceFactory > & rServiceManager, @@ -1094,8 +1075,6 @@ Reference<XSingleServiceFactory > SAL_CALL createOneInstanceFactory( { return new OFactoryComponentHelper( rServiceManager, rImplementationName, pCreateFunction, 0, &rServiceNames, pModCount, sal_True ); -// return new OFactoryUnloadableComponentHelper( -// rServiceManager, rImplementationName, pCreateFunction, 0, &rServiceNames, pModCount, sal_True ); } // global function @@ -1146,3 +1125,4 @@ Reference< lang::XSingleComponentFactory > SAL_CALL createOneInstanceComponentFa } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/source/findsofficepath.c b/cppuhelper/source/findsofficepath.c index e325f077711b..0d97de89304b 100644 --- a/cppuhelper/source/findsofficepath.c +++ b/cppuhelper/source/findsofficepath.c @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -44,7 +45,7 @@ * @param subKeyName name of the subkey to open * * @return the installation path or NULL, if no installation was found or - * if an error occured + * if an error occurred */ static char* getPathFromRegistryKey( HKEY hroot, const char* subKeyName ) { @@ -86,11 +87,11 @@ static char* getPathFromRegistryKey( HKEY hroot, const char* subKeyName ) * Gets the installation path from the Windows Registry. * * @return the installation path or NULL, if no installation was found or - * if an error occured + * if an error occurred */ static char* platformSpecific() { - const char* SUBKEYNAME = "Software\\OpenOffice.org\\UNO\\InstallPath"; + const char* SUBKEYNAME = "Software\\LibreOffice\\UNO\\InstallPath"; char* path = NULL; @@ -118,14 +119,14 @@ static char* platformSpecific() * is in one of the directories listed in the PATH environment variable.</p> * * @return the installation path or NULL, if no installation was found or - * if an error occured + * if an error occurred */ static char* platformSpecific() { const int SEPARATOR = '/'; const char* PATHSEPARATOR = ":"; const char* PATHVARNAME = "PATH"; - const char* APPENDIX = "/soffice"; + const char* APPENDIX = "/libreoffice"; char* path = NULL; char* env = NULL; @@ -196,10 +197,10 @@ char const* cppuhelper_detail_findSofficePath() /* get the installation path from the UNO_PATH environment variable */ path = getenv( UNOPATHVARNAME ); - if ( path == NULL || strlen( path ) == 0 ) - { + if (!path || !path[0]) path = platformSpecific(); - } return path; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/source/implbase.cxx b/cppuhelper/source/implbase.cxx index 0c25a082cb27..60f153194bef 100644 --- a/cppuhelper/source/implbase.cxx +++ b/cppuhelper/source/implbase.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -469,3 +470,5 @@ void WeakAggComponentImplHelperBase::removeEventListener( } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/source/implbase_ex.cxx b/cppuhelper/source/implbase_ex.cxx index 6d89bca96d6e..fdd5ab9665bd 100644 --- a/cppuhelper/source/implbase_ex.cxx +++ b/cppuhelper/source/implbase_ex.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -467,3 +468,5 @@ Sequence< Type > SAL_CALL WeakAggComponentImplHelper_getTypes( } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/source/implementationentry.cxx b/cppuhelper/source/implementationentry.cxx index 967a1095fce4..9277a1f7d7b4 100644 --- a/cppuhelper/source/implementationentry.cxx +++ b/cppuhelper/source/implementationentry.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -100,3 +101,5 @@ void * component_getFactoryHelper( } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/source/interfacecontainer.cxx b/cppuhelper/source/interfacecontainer.cxx index b0c8d687a0a8..b88b48495ce9 100644 --- a/cppuhelper/source/interfacecontainer.cxx +++ b/cppuhelper/source/interfacecontainer.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,7 +36,7 @@ #include <osl/diagnose.h> #include <osl/mutex.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <com/sun/star/lang/XEventListener.hpp> @@ -46,10 +47,6 @@ using namespace com::sun::star::lang; namespace cppu { - -//=================================================================== -//=================================================================== -//=================================================================== /** * Reallocate the sequence. */ @@ -79,17 +76,10 @@ static void sequenceRemoveElementAt( Sequence< Reference< XInterface > > & rSeq, rSeq = aDestSeq; } - -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- - #ifdef _MSC_VER #pragma warning( disable: 4786 ) #endif -//=================================================================== -//=================================================================== -//=================================================================== OInterfaceIteratorHelper::OInterfaceIteratorHelper( OInterfaceContainerHelper & rCont_ ) SAL_THROW( () ) : rCont( rCont_ ) @@ -170,11 +160,6 @@ void OInterfaceIteratorHelper::remove() SAL_THROW( () ) } } -//=================================================================== -//=================================================================== -//=================================================================== - - OInterfaceContainerHelper::OInterfaceContainerHelper( Mutex & rMutex_ ) SAL_THROW( () ) : rMutex( rMutex_ ) , bInUse( sal_False ) @@ -324,11 +309,11 @@ void OInterfaceContainerHelper::disposeAndClear( const EventObject & rEvt ) SAL_ { ClearableMutexGuard aGuard( rMutex ); OInterfaceIteratorHelper aIt( *this ); - // Container freigeben, falls im disposing neue Eintrge kommen + // Release container, in case new entries come while disposing OSL_ENSURE( !bIsList || bInUse, "OInterfaceContainerHelper not in use" ); if( !bIsList && aData.pAsInterface ) aData.pAsInterface->release(); - // set the member to null, the iterator delete the values + // set the member to null, use the iterator to delete the values aData.pAsInterface = NULL; bIsList = sal_False; bInUse = sal_False; @@ -344,7 +329,7 @@ void OInterfaceContainerHelper::disposeAndClear( const EventObject & rEvt ) SAL_ catch ( RuntimeException & ) { // be robust, if e.g. a remote bridge has disposed already. - // there is no way, to delegate the error to the caller :o(. + // there is no way to delegate the error to the caller :o(. } } } @@ -354,11 +339,11 @@ void OInterfaceContainerHelper::clear() SAL_THROW( () ) { ClearableMutexGuard aGuard( rMutex ); OInterfaceIteratorHelper aIt( *this ); - // Container freigeben, falls im disposing neue Eintrge kommen + // Release container, in case new entries come while disposing OSL_ENSURE( !bIsList || bInUse, "OInterfaceContainerHelper not in use" ); if( !bIsList && aData.pAsInterface ) aData.pAsInterface->release(); - // set the member to null, the iterator delete the values + // set the member to null, use the iterator to delete the values aData.pAsInterface = 0; bIsList = sal_False; bInUse = sal_False; @@ -366,10 +351,6 @@ void OInterfaceContainerHelper::clear() SAL_THROW( () ) aGuard.clear(); } -//################################################################################################## -//################################################################################################## -//################################################################################################## - // specialized class for type typedef ::std::vector< std::pair < Type , void* > > t_type2ptr; @@ -538,11 +519,6 @@ void OMultiTypeInterfaceContainerHelper::clear() } } - -//################################################################################################## -//################################################################################################## -//################################################################################################## - // specialized class for long typedef ::std::vector< std::pair < sal_Int32 , void* > > t_long2ptr; @@ -684,7 +660,6 @@ void OMultiTypeInterfaceContainerHelperInt32::disposeAndClear( const EventObject { typedef OInterfaceContainerHelper* ppp; ppListenerContainers = new ppp[nSize]; - //ppListenerContainers = new (ListenerContainer*)[nSize]; t_long2ptr::iterator iter = pMap->begin(); t_long2ptr::iterator end = pMap->end(); @@ -727,3 +702,4 @@ void OMultiTypeInterfaceContainerHelperInt32::clear() } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/source/macro_expander.cxx b/cppuhelper/source/macro_expander.cxx index 936487618ace..4bbebbd21105 100644 --- a/cppuhelper/source/macro_expander.cxx +++ b/cppuhelper/source/macro_expander.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -196,3 +197,5 @@ Reference< lang::XSingleComponentFactory > create_boostrap_macro_expander_factor } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/source/macro_expander.hxx b/cppuhelper/source/macro_expander.hxx index a692f63abc39..24e3ffcd5b80 100644 --- a/cppuhelper/source/macro_expander.hxx +++ b/cppuhelper/source/macro_expander.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,3 +59,5 @@ namespace detail { } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/source/makefile.mk b/cppuhelper/source/makefile.mk index 5755ed77631c..cd742b9a0856 100644..100755 --- a/cppuhelper/source/makefile.mk +++ b/cppuhelper/source/makefile.mk @@ -175,6 +175,8 @@ DEF1NAME=$(SHL1TARGET) .IF "$(COMNAME)"=="msci" SHL1VERSIONMAP=msvc_win32_intel.map +.ELIF "$(COMNAME)"=="mscx" +SHL1VERSIONMAP=msvc_win32_x86_64.map .ELIF "$(COMNAME)"=="sunpro5" SHL1VERSIONMAP=cc5_solaris_sparc.map .ELIF "$(GUI)$(COMNAME)"=="OS2gcc3" diff --git a/cppuhelper/source/msvc_win32_x86_64.map b/cppuhelper/source/msvc_win32_x86_64.map new file mode 100644 index 000000000000..40a6c0d314f8 --- /dev/null +++ b/cppuhelper/source/msvc_win32_x86_64.map @@ -0,0 +1,280 @@ +UDK_3_0_0 { + global: +GetVersionInfo; +??0OComponentHelper@cppu@@QEAA@AEAVMutex@osl@@@Z; +??1OComponentHelper@cppu@@UEAA@XZ; +??BOWeakObject@cppu@@QEAA?AV?$Reference@VXInterface@uno@star@sun@com@@@uno@star@sun@com@@XZ; +??BWeakReferenceHelper@uno@star@sun@com@@QEBA?AV?$Reference@VXInterface@uno@star@sun@com@@@1234@XZ; +??_7OComponentHelper@cppu@@6BOWeakObject@1@@; +??_7OComponentHelper@cppu@@6BXAggregation@uno@star@sun@com@@@; +??_7OComponentHelper@cppu@@6BXComponent@lang@star@sun@com@@@; +??_7OComponentHelper@cppu@@6BXTypeProvider@lang@star@sun@com@@@; +??_7OWeakAggObject@cppu@@6BOWeakObject@1@@; +??_7OWeakAggObject@cppu@@6BXAggregation@uno@star@sun@com@@@; +??_7OWeakObject@cppu@@6B@; +??_GOComponentHelper@cppu@@UEAAPEAXI@Z; +??_GOWeakAggObject@cppu@@MEAAPEAXI@Z; +??_GOWeakObject@cppu@@MEAAPEAXI@Z; +?addEventListener@OComponentHelper@cppu@@UEAAXAEBV?$Reference@VXEventListener@lang@star@sun@com@@@uno@star@sun@com@@@Z; +?dispose@OComponentHelper@cppu@@UEAAXXZ; +?disposing@OComponentHelper@cppu@@MEAAXXZ; +?release@OComponentHelper@cppu@@UEAAXXZ; +?removeEventListener@OComponentHelper@cppu@@UEAAXAEBV?$Reference@VXEventListener@lang@star@sun@com@@@uno@star@sun@com@@@Z; +??1OTypeCollection@cppu@@QEAA@XZ; +?createFactoryProxy@cppu@@YA?AV?$Reference@VXSingleServiceFactory@lang@star@sun@com@@@uno@star@sun@com@@AEBV?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@3456@AEBV23456@@Z; +?createOneInstanceRegistryFactory@cppu@@YA?AV?$Reference@VXSingleServiceFactory@lang@star@sun@com@@@uno@star@sun@com@@AEBV?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@3456@AEBVOUString@rtl@@AEBV?$Reference@VXRegistryKey@registry@star@sun@com@@@3456@@Z; +?createSingleRegistryFactory@cppu@@YA?AV?$Reference@VXSingleServiceFactory@lang@star@sun@com@@@uno@star@sun@com@@AEBV?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@3456@AEBVOUString@rtl@@AEBV?$Reference@VXRegistryKey@registry@star@sun@com@@@3456@@Z; +?getTypes@OTypeCollection@cppu@@QEAA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@XZ; +?createStandardClassWithSequence@cppu@@YAPEAVXIdlClass@reflection@star@sun@com@@AEBV?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@uno@456@AEBVOUString@rtl@@AEBV?$Reference@VXIdlClass@reflection@star@sun@com@@@8456@AEBV?$Sequence@VOUString@rtl@@@8456@@Z; +??0OInterfaceContainerHelper@cppu@@QEAA@AEAVMutex@osl@@@Z; +??0OInterfaceIteratorHelper@cppu@@QEAA@AEAVOInterfaceContainerHelper@1@@Z; +??1OInterfaceContainerHelper@cppu@@QEAA@XZ; +??1OInterfaceIteratorHelper@cppu@@QEAA@XZ; +?addInterface@OInterfaceContainerHelper@cppu@@QEAAJAEBV?$Reference@VXInterface@uno@star@sun@com@@@uno@star@sun@com@@@Z; +?clear@OInterfaceContainerHelper@cppu@@QEAAXXZ; +?copyAndResetInUse@OInterfaceContainerHelper@cppu@@AEAAXXZ; +?disposeAndClear@OInterfaceContainerHelper@cppu@@QEAAXAEBUEventObject@lang@star@sun@com@@@Z; +?getElements@OInterfaceContainerHelper@cppu@@QEBA?AV?$Sequence@V?$Reference@VXInterface@uno@star@sun@com@@@uno@star@sun@com@@@uno@star@sun@com@@XZ; +?getLength@OInterfaceContainerHelper@cppu@@QEBAJXZ; +?next@OInterfaceIteratorHelper@cppu@@QEAAPEAVXInterface@uno@star@sun@com@@XZ; +?removeInterface@OInterfaceContainerHelper@cppu@@QEAAJAEBV?$Reference@VXInterface@uno@star@sun@com@@@uno@star@sun@com@@@Z; +??0WeakReferenceHelper@uno@star@sun@com@@QEAA@AEBV01234@@Z; +??0WeakReferenceHelper@uno@star@sun@com@@QEAA@AEBV?$Reference@VXInterface@uno@star@sun@com@@@1234@@Z; +??1OWeakAggObject@cppu@@MEAA@XZ; +??1OWeakObject@cppu@@MEAA@XZ; +??1WeakReferenceHelper@uno@star@sun@com@@QEAA@XZ; +??4WeakReferenceHelper@uno@star@sun@com@@QEAAAEAV01234@AEBV01234@@Z; +??4WeakReferenceHelper@uno@star@sun@com@@QEAAAEAV01234@AEBV?$Reference@VXInterface@uno@star@sun@com@@@1234@@Z; +?acquire@OWeakAggObject@cppu@@UEAAXXZ; +?acquire@OWeakObject@cppu@@UEAAXXZ; +?get@WeakReferenceHelper@uno@star@sun@com@@QEBA?AV?$Reference@VXInterface@uno@star@sun@com@@@2345@XZ; +?queryAdapter@OWeakObject@cppu@@UEAA?AV?$Reference@VXAdapter@uno@star@sun@com@@@uno@star@sun@com@@XZ; +?queryAggregation@OWeakAggObject@cppu@@UEAA?AVAny@uno@star@sun@com@@AEBVType@4567@@Z; +?queryInterface@OWeakAggObject@cppu@@UEAA?AVAny@uno@star@sun@com@@AEBVType@4567@@Z; +?queryInterface@OWeakObject@cppu@@UEAA?AVAny@uno@star@sun@com@@AEBVType@4567@@Z; +?release@OWeakAggObject@cppu@@UEAAXXZ; +?release@OWeakObject@cppu@@UEAAXXZ; +?setDelegator@OWeakAggObject@cppu@@UEAAXAEBV?$Reference@VXInterface@uno@star@sun@com@@@uno@star@sun@com@@@Z; +??0OPropertyArrayHelper@cppu@@QEAA@AEBV?$Sequence@UProperty@beans@star@sun@com@@@uno@star@sun@com@@E@Z; +??0OPropertyArrayHelper@cppu@@QEAA@PEAUProperty@beans@star@sun@com@@JE@Z; +??1IPropertyArrayHelper@cppu@@UEAA@XZ; +??1OPropertyArrayHelper@cppu@@UEAA@XZ; +??1OPropertySetHelper@cppu@@QEAA@XZ; +??_7IPropertyArrayHelper@cppu@@6B@; +??_7OPropertyArrayHelper@cppu@@6B@; +??_7OPropertySetHelper@cppu@@6BXFastPropertySet@beans@star@sun@com@@@; +??_7OPropertySetHelper@cppu@@6BXMultiPropertySet@beans@star@sun@com@@@; +??_7OPropertySetHelper@cppu@@6BXPropertySet@beans@star@sun@com@@@; +??_GIPropertyArrayHelper@cppu@@UEAAPEAXI@Z; +??_GOPropertyArrayHelper@cppu@@UEAAPEAXI@Z; +?addPropertiesChangeListener@OPropertySetHelper@cppu@@UEAAXAEBV?$Sequence@VOUString@rtl@@@uno@star@sun@com@@AEBV?$Reference@VXPropertiesChangeListener@beans@star@sun@com@@@4567@@Z; +?addPropertyChangeListener@OPropertySetHelper@cppu@@UEAAXAEBVOUString@rtl@@AEBV?$Reference@VXPropertyChangeListener@beans@star@sun@com@@@uno@star@sun@com@@@Z; +?addVetoableChangeListener@OPropertySetHelper@cppu@@UEAAXAEBVOUString@rtl@@AEBV?$Reference@VXVetoableChangeListener@beans@star@sun@com@@@uno@star@sun@com@@@Z; +?createPropertySetInfo@OPropertySetHelper@cppu@@SA?AV?$Reference@VXPropertySetInfo@beans@star@sun@com@@@uno@star@sun@com@@AEAVIPropertyArrayHelper@2@@Z; +?disposing@OPropertySetHelper@cppu@@QEAAXXZ; +?fillHandles@OPropertyArrayHelper@cppu@@UEAAJPEAJAEBV?$Sequence@VOUString@rtl@@@uno@star@sun@com@@@Z; +?fillPropertyMembersByHandle@OPropertyArrayHelper@cppu@@UEAAEPEAVOUString@rtl@@PEAFJ@Z; +?fire@OPropertySetHelper@cppu@@IEAAXPEAJPEBVAny@uno@star@sun@com@@1JE@Z; +?firePropertiesChangeEvent@OPropertySetHelper@cppu@@UEAAXAEBV?$Sequence@VOUString@rtl@@@uno@star@sun@com@@AEBV?$Reference@VXPropertiesChangeListener@beans@star@sun@com@@@4567@@Z; +?getCount@OPropertyArrayHelper@cppu@@QEBAJXZ; +?getFastPropertyValue@OPropertySetHelper@cppu@@UEAA?AVAny@uno@star@sun@com@@J@Z; +?getHandleByName@OPropertyArrayHelper@cppu@@UEAAJAEBVOUString@rtl@@@Z; +?getProperties@OPropertyArrayHelper@cppu@@UEAA?AV?$Sequence@UProperty@beans@star@sun@com@@@uno@star@sun@com@@XZ; +?getPropertyByName@OPropertyArrayHelper@cppu@@UEAA?AUProperty@beans@star@sun@com@@AEBVOUString@rtl@@@Z; +?getPropertyValue@OPropertySetHelper@cppu@@UEAA?AVAny@uno@star@sun@com@@AEBVOUString@rtl@@@Z; +?getPropertyValues@OPropertySetHelper@cppu@@UEAA?AV?$Sequence@VAny@uno@star@sun@com@@@uno@star@sun@com@@AEBV?$Sequence@VOUString@rtl@@@4567@@Z; +?hasPropertyByName@OPropertyArrayHelper@cppu@@UEAAEAEBVOUString@rtl@@@Z; +?init@OPropertyArrayHelper@cppu@@AEAAXE@Z; +?queryInterface@OPropertySetHelper@cppu@@UEAA?AVAny@uno@star@sun@com@@AEBVType@4567@@Z; +?queryInterface@OPropertySetHelper@cppu@@W7EAA?AVAny@uno@star@sun@com@@AEBVType@4567@@Z; +?queryInterface@OPropertySetHelper@cppu@@WBA@EAA?AVAny@uno@star@sun@com@@AEBVType@4567@@Z; +?removePropertiesChangeListener@OPropertySetHelper@cppu@@UEAAXAEBV?$Reference@VXPropertiesChangeListener@beans@star@sun@com@@@uno@star@sun@com@@@Z; +?removePropertyChangeListener@OPropertySetHelper@cppu@@UEAAXAEBVOUString@rtl@@AEBV?$Reference@VXPropertyChangeListener@beans@star@sun@com@@@uno@star@sun@com@@@Z; +?removeVetoableChangeListener@OPropertySetHelper@cppu@@UEAAXAEBVOUString@rtl@@AEBV?$Reference@VXVetoableChangeListener@beans@star@sun@com@@@uno@star@sun@com@@@Z; +?setFastPropertyValue@OPropertySetHelper@cppu@@UEAAXJAEBVAny@uno@star@sun@com@@@Z; +?setFastPropertyValues@OPropertySetHelper@cppu@@IEAAXJPEAJPEBVAny@uno@star@sun@com@@J@Z; +?setPropertyValue@OPropertySetHelper@cppu@@UEAAXAEBVOUString@rtl@@AEBVAny@uno@star@sun@com@@@Z; +?setPropertyValues@OPropertySetHelper@cppu@@UEAAXAEBV?$Sequence@VOUString@rtl@@@uno@star@sun@com@@AEBV?$Sequence@VAny@uno@star@sun@com@@@4567@@Z; +??0ClassDataBase@cppu@@QEAA@J@Z; +??0ClassDataBase@cppu@@QEAA@XZ; +??1ClassDataBase@cppu@@QEAA@XZ; +?getImplHelperInitMutex@cppu@@YAAEAVMutex@osl@@XZ; +?getImplementationId@ClassData@cppu@@QEAA?AV?$Sequence@C@uno@star@sun@com@@XZ; +?getTypes@ClassData@cppu@@QEAA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@XZ; +?initTypeProvider@ClassData@cppu@@QEAAXXZ; +?query@ClassData@cppu@@QEAA?AVAny@uno@star@sun@com@@AEBVType@4567@PEAVXTypeProvider@lang@567@@Z; +?writeTypeOffset@ClassData@cppu@@QEAAXAEBVType@uno@star@sun@com@@J@Z; +?createRegistryServiceFactory@cppu@@YA?AV?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@uno@star@sun@com@@AEBVOUString@rtl@@0E0@Z; +?throwException@cppu@@YAXAEBVAny@uno@star@sun@com@@@Z; +??0OTypeCollection@cppu@@QEAA@AEBVType@uno@star@sun@com@@00000000000AEBV?$Sequence@VType@uno@star@sun@com@@@3456@@Z; +??0OTypeCollection@cppu@@QEAA@AEBVType@uno@star@sun@com@@0000000000AEBV?$Sequence@VType@uno@star@sun@com@@@3456@@Z; +??0OTypeCollection@cppu@@QEAA@AEBVType@uno@star@sun@com@@000000000AEBV?$Sequence@VType@uno@star@sun@com@@@3456@@Z; +??0OTypeCollection@cppu@@QEAA@AEBVType@uno@star@sun@com@@00000000AEBV?$Sequence@VType@uno@star@sun@com@@@3456@@Z; +??0OTypeCollection@cppu@@QEAA@AEBVType@uno@star@sun@com@@0000000AEBV?$Sequence@VType@uno@star@sun@com@@@3456@@Z; +??0OTypeCollection@cppu@@QEAA@AEBVType@uno@star@sun@com@@000000AEBV?$Sequence@VType@uno@star@sun@com@@@3456@@Z; +??0OTypeCollection@cppu@@QEAA@AEBVType@uno@star@sun@com@@00000AEBV?$Sequence@VType@uno@star@sun@com@@@3456@@Z; +??0OTypeCollection@cppu@@QEAA@AEBVType@uno@star@sun@com@@0000AEBV?$Sequence@VType@uno@star@sun@com@@@3456@@Z; +??0OTypeCollection@cppu@@QEAA@AEBVType@uno@star@sun@com@@000AEBV?$Sequence@VType@uno@star@sun@com@@@3456@@Z; +??0OTypeCollection@cppu@@QEAA@AEBVType@uno@star@sun@com@@00AEBV?$Sequence@VType@uno@star@sun@com@@@3456@@Z; +??0OTypeCollection@cppu@@QEAA@AEBVType@uno@star@sun@com@@0AEBV?$Sequence@VType@uno@star@sun@com@@@3456@@Z; +??0OTypeCollection@cppu@@QEAA@AEBVType@uno@star@sun@com@@AEBV?$Sequence@VType@uno@star@sun@com@@@3456@@Z; +??1OImplementationId@cppu@@QEAA@XZ; +?getImplementationId@OImplementationId@cppu@@QEBA?AV?$Sequence@C@uno@star@sun@com@@XZ; +?writeSharedLibComponentInfo@cppu@@YAXAEBVOUString@rtl@@0AEBV?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@uno@star@sun@com@@AEBV?$Reference@VXRegistryKey@registry@star@sun@com@@@5678@@Z; +?remove@OInterfaceIteratorHelper@cppu@@QEAAXXZ; +??0OWeakObject@cppu@@QEAA@XZ; +?installTypeDescriptionManager@cppu@@YAEAEBV?$Reference@VXHierarchicalNameAccess@container@star@sun@com@@@uno@star@sun@com@@@Z; +?loadSharedLibComponentFactory@cppu@@YA?AV?$Reference@VXInterface@uno@star@sun@com@@@uno@star@sun@com@@AEBVOUString@rtl@@00AEBV?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@3456@AEBV?$Reference@VXRegistryKey@registry@star@sun@com@@@3456@@Z; +?createComponentContext@cppu@@YA?AV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@PEBUContextEntry_Init@1@JAEBV23456@@Z; +?bootstrap_InitialComponentContext@cppu@@YA?AV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@AEBV?$Reference@VXSimpleRegistry@registry@star@sun@com@@@3456@AEBVOUString@rtl@@@Z; +?createNestedRegistry@cppu@@YA?AV?$Reference@VXSimpleRegistry@registry@star@sun@com@@@uno@star@sun@com@@AEBVOUString@rtl@@@Z; +?createSimpleRegistry@cppu@@YA?AV?$Reference@VXSimpleRegistry@registry@star@sun@com@@@uno@star@sun@com@@AEBVOUString@rtl@@@Z; +??0WeakAggComponentImplHelperBase@cppu@@IEAA@AEAVMutex@osl@@@Z; +??0WeakComponentImplHelperBase@cppu@@IEAA@AEAVMutex@osl@@@Z; +?acquire@WeakAggComponentImplHelperBase@cppu@@UEAAXXZ; +?acquire@WeakComponentImplHelperBase@cppu@@UEAAXXZ; +?addEventListener@WeakAggComponentImplHelperBase@cppu@@UEAAXAEBV?$Reference@VXEventListener@lang@star@sun@com@@@uno@star@sun@com@@@Z; +?addEventListener@WeakComponentImplHelperBase@cppu@@UEAAXAEBV?$Reference@VXEventListener@lang@star@sun@com@@@uno@star@sun@com@@@Z; +?dispose@WeakAggComponentImplHelperBase@cppu@@UEAAXXZ; +?dispose@WeakComponentImplHelperBase@cppu@@UEAAXXZ; +?queryAggregation@WeakAggComponentImplHelperBase@cppu@@UEAA?AVAny@uno@star@sun@com@@AEBVType@4567@@Z; +?queryInterface@WeakAggComponentImplHelperBase@cppu@@UEAA?AVAny@uno@star@sun@com@@AEBVType@4567@@Z; +?queryInterface@WeakComponentImplHelperBase@cppu@@UEAA?AVAny@uno@star@sun@com@@AEBVType@4567@@Z; +?release@WeakAggComponentImplHelperBase@cppu@@UEAAXXZ; +?release@WeakComponentImplHelperBase@cppu@@UEAAXXZ; +?removeEventListener@WeakAggComponentImplHelperBase@cppu@@UEAAXAEBV?$Reference@VXEventListener@lang@star@sun@com@@@uno@star@sun@com@@@Z; +?removeEventListener@WeakComponentImplHelperBase@cppu@@UEAAXAEBV?$Reference@VXEventListener@lang@star@sun@com@@@uno@star@sun@com@@@Z; +??1WeakAggComponentImplHelperBase@cppu@@UEAA@XZ; +??1WeakComponentImplHelperBase@cppu@@UEAA@XZ; +?disposing@WeakAggComponentImplHelperBase@cppu@@MEAAXXZ; +?disposing@WeakComponentImplHelperBase@cppu@@MEAAXXZ; +?createOneInstanceFactory@cppu@@YA?AV?$Reference@VXSingleServiceFactory@lang@star@sun@com@@@uno@star@sun@com@@AEBV?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@3456@AEBVOUString@rtl@@P6A?AV?$Reference@VXInterface@uno@star@sun@com@@@3456@0@ZAEBV?$Sequence@VOUString@rtl@@@3456@PEAU_rtl_ModuleCount@@@Z; +?createSingleComponentFactory@cppu@@YA?AV?$Reference@VXSingleComponentFactory@lang@star@sun@com@@@uno@star@sun@com@@P6A?AV?$Reference@VXInterface@uno@star@sun@com@@@3456@AEBV?$Reference@VXComponentContext@uno@star@sun@com@@@3456@@ZAEBVOUString@rtl@@AEBV?$Sequence@VOUString@rtl@@@3456@PEAU_rtl_ModuleCount@@@Z; +?createSingleFactory@cppu@@YA?AV?$Reference@VXSingleServiceFactory@lang@star@sun@com@@@uno@star@sun@com@@AEBV?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@3456@AEBVOUString@rtl@@P6A?AV?$Reference@VXInterface@uno@star@sun@com@@@3456@0@ZAEBV?$Sequence@VOUString@rtl@@@3456@PEAU_rtl_ModuleCount@@@Z; +?defaultBootstrap_InitialComponentContext@cppu@@YA?AV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@XZ; +?acquire@OComponentHelper@cppu@@UEAAXXZ; +?getTypes@OComponentHelper@cppu@@UEAA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@XZ; +?queryAggregation@OComponentHelper@cppu@@UEAA?AVAny@uno@star@sun@com@@AEBVType@4567@@Z; +?queryInterface@OComponentHelper@cppu@@UEAA?AVAny@uno@star@sun@com@@AEBVType@4567@@Z; +?removeListener@?$OBroadcastHelperVar@VOMultiTypeInterfaceContainerHelper@cppu@@VType@uno@star@sun@com@@@cppu@@QEAAXAEBVType@uno@star@sun@com@@AEBV?$Reference@VXInterface@uno@star@sun@com@@@4567@@Z; +??0OMultiTypeInterfaceContainerHelper@cppu@@QEAA@AEAVMutex@osl@@@Z; +??0OMultiTypeInterfaceContainerHelperInt32@cppu@@QEAA@AEAVMutex@osl@@@Z; +??1OMultiTypeInterfaceContainerHelper@cppu@@QEAA@XZ; +??1OMultiTypeInterfaceContainerHelperInt32@cppu@@QEAA@XZ; +?addInterface@OMultiTypeInterfaceContainerHelper@cppu@@QEAAJAEBVType@uno@star@sun@com@@AEBV?$Reference@VXInterface@uno@star@sun@com@@@4567@@Z; +?addInterface@OMultiTypeInterfaceContainerHelperInt32@cppu@@QEAAJAEBJAEBV?$Reference@VXInterface@uno@star@sun@com@@@uno@star@sun@com@@@Z; +?clear@OMultiTypeInterfaceContainerHelper@cppu@@QEAAXXZ; +?clear@OMultiTypeInterfaceContainerHelperInt32@cppu@@QEAAXXZ; +?disposeAndClear@OMultiTypeInterfaceContainerHelper@cppu@@QEAAXAEBUEventObject@lang@star@sun@com@@@Z; +?disposeAndClear@OMultiTypeInterfaceContainerHelperInt32@cppu@@QEAAXAEBUEventObject@lang@star@sun@com@@@Z; +?getContainedTypes@OMultiTypeInterfaceContainerHelper@cppu@@QEBA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@XZ; +?getContainedTypes@OMultiTypeInterfaceContainerHelperInt32@cppu@@QEBA?AV?$Sequence@J@uno@star@sun@com@@XZ; +?getContainer@OMultiTypeInterfaceContainerHelper@cppu@@QEBAPEAVOInterfaceContainerHelper@2@AEBVType@uno@star@sun@com@@@Z; +?getContainer@OMultiTypeInterfaceContainerHelperInt32@cppu@@QEBAPEAVOInterfaceContainerHelper@2@AEBJ@Z; +?removeInterface@OMultiTypeInterfaceContainerHelper@cppu@@QEAAJAEBVType@uno@star@sun@com@@AEBV?$Reference@VXInterface@uno@star@sun@com@@@4567@@Z; +?removeInterface@OMultiTypeInterfaceContainerHelperInt32@cppu@@QEAAJAEBJAEBV?$Reference@VXInterface@uno@star@sun@com@@@uno@star@sun@com@@@Z; +??0OPropertySetHelper@cppu@@QEAA@AEAU?$OBroadcastHelperVar@VOMultiTypeInterfaceContainerHelper@cppu@@VType@uno@star@sun@com@@@1@@Z; +?addListener@?$OBroadcastHelperVar@VOMultiTypeInterfaceContainerHelper@cppu@@VType@uno@star@sun@com@@@cppu@@QEAAXAEBVType@uno@star@sun@com@@AEBV?$Reference@VXInterface@uno@star@sun@com@@@4567@@Z; +?component_writeInfoHelper@cppu@@YAEPEAX0QEBUImplementationEntry@1@@Z; +?component_getFactoryHelper@cppu@@YAPEAXPEBDPEAX1QEBUImplementationEntry@1@@Z; +?ImplHelper_query@cppu@@YA?AVAny@uno@star@sun@com@@AEBVType@3456@PEAUclass_data@1@PEAX@Z; +?ImplHelper_queryNoXInterface@cppu@@YA?AVAny@uno@star@sun@com@@AEBVType@3456@PEAUclass_data@1@PEAX@Z; +?ImplHelper_getTypes@cppu@@YA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@PEAUclass_data@1@@Z; +?ImplInhHelper_getTypes@cppu@@YA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@PEAUclass_data@1@AEBV23456@@Z; +?ImplHelper_getImplementationId@cppu@@YA?AV?$Sequence@C@uno@star@sun@com@@PEAUclass_data@1@@Z; +?WeakImplHelper_query@cppu@@YA?AVAny@uno@star@sun@com@@AEBVType@3456@PEAUclass_data@1@PEAXPEAVOWeakObject@1@@Z; +?WeakImplHelper_getTypes@cppu@@YA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@PEAUclass_data@1@@Z; +?WeakAggImplHelper_queryAgg@cppu@@YA?AVAny@uno@star@sun@com@@AEBVType@3456@PEAUclass_data@1@PEAXPEAVOWeakAggObject@1@@Z; +?WeakAggComponentImplHelper_getTypes@cppu@@YA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@PEAUclass_data@1@@Z; +?WeakComponentImplHelper_query@cppu@@YA?AVAny@uno@star@sun@com@@AEBVType@3456@PEAUclass_data@1@PEAXPEAVWeakComponentImplHelperBase@1@@Z; +?WeakAggImplHelper_getTypes@cppu@@YA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@PEAUclass_data@1@@Z; +?WeakAggComponentImplHelper_queryAgg@cppu@@YA?AVAny@uno@star@sun@com@@AEBVType@3456@PEAUclass_data@1@PEAXPEAVWeakAggComponentImplHelperBase@1@@Z; +?WeakComponentImplHelper_getTypes@cppu@@YA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@PEAUclass_data@1@@Z; +?defaultBootstrap_InitialComponentContext@cppu@@YA?AV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@AEBVOUString@rtl@@@Z; + +??0AccessControl@cppu@@QEAA@AEBV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@@Z; +??0AccessControl@cppu@@QEAA@AEBV?$Reference@VXAccessController@security@star@sun@com@@@uno@star@sun@com@@@Z; +??0AccessControl@cppu@@QEAA@AEBV01@@Z; +?checkRuntimePermission@AccessControl@cppu@@QEAAXAEBVOUString@rtl@@@Z; +?checkFilePermission@AccessControl@cppu@@QEAAXAEBVOUString@rtl@@0@Z; +?checkSocketPermission@AccessControl@cppu@@QEAAXAEBVOUString@rtl@@0@Z; + +??0UnoUrl@cppu@@QEAA@AEBV01@@Z; +??0UnoUrl@cppu@@QEAA@AEBVOUString@rtl@@@Z; +??0UnoUrlDescriptor@cppu@@QEAA@AEBV01@@Z; +??0UnoUrlDescriptor@cppu@@QEAA@AEBVOUString@rtl@@@Z; +??1UnoUrl@cppu@@QEAA@XZ; +??1UnoUrlDescriptor@cppu@@QEAA@XZ; +??4UnoUrl@cppu@@QEAAAEAV01@AEBV01@@Z; +??4UnoUrlDescriptor@cppu@@QEAAAEAV01@AEBV01@@Z; +?getConnection@UnoUrl@cppu@@QEBAAEBVUnoUrlDescriptor@2@XZ; +?getDescriptor@UnoUrlDescriptor@cppu@@QEBAAEBVOUString@rtl@@XZ; +?getName@UnoUrlDescriptor@cppu@@QEBAAEBVOUString@rtl@@XZ; +?getObjectName@UnoUrl@cppu@@QEBAAEBVOUString@rtl@@XZ; +?getParameter@UnoUrlDescriptor@cppu@@QEBA?AVOUString@rtl@@AEBV34@@Z; +?getProtocol@UnoUrl@cppu@@QEBAAEBVUnoUrlDescriptor@2@XZ; +?hasParameter@UnoUrlDescriptor@cppu@@QEBA_NAEBVOUString@rtl@@@Z; + + local: + *; +}; + +UDK_3.1 { + global: + ?getCaughtException@cppu@@YA?AVAny@uno@star@sun@com@@XZ; + + ??0OPropertySetHelper@cppu@@QEAA@AEAU?$OBroadcastHelperVar@VOMultiTypeInterfaceContainerHelper@cppu@@VType@uno@star@sun@com@@@1@_N@Z; + + ?bootstrap@cppu@@YA?AV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@XZ; + ??0BootstrapException@cppu@@QEAA@XZ; + ??0BootstrapException@cppu@@QEAA@AEBVOUString@rtl@@@Z; + ??0BootstrapException@cppu@@QEAA@AEBV01@@Z; + ??1BootstrapException@cppu@@UEAA@XZ; + ??4BootstrapException@cppu@@QEAAAEAV01@AEBV01@@Z; + ?getMessage@BootstrapException@cppu@@QEBAAEBVOUString@rtl@@XZ; +} UDK_3_0_0; + +UDK_3.2 { + global: + ??1PropertySetMixinImpl@cppu@@AEAA@XZ; + ?queryInterface@PropertySetMixinImpl@cppu@@MEAA?AVAny@uno@star@sun@com@@AEBVType@4567@@Z; + ?getPropertySetInfo@PropertySetMixinImpl@cppu@@MEAA?AV?$Reference@VXPropertySetInfo@beans@star@sun@com@@@uno@star@sun@com@@XZ; + ?notify@BoundListeners@PropertySetMixinImpl@cppu@@QEBAXXZ; + ?setPropertyValue@PropertySetMixinImpl@cppu@@MEAAXAEBVOUString@rtl@@AEBVAny@uno@star@sun@com@@@Z; + ?getPropertyValue@PropertySetMixinImpl@cppu@@MEAA?AVAny@uno@star@sun@com@@AEBVOUString@rtl@@@Z; + ?removePropertyChangeListener@PropertySetMixinImpl@cppu@@MEAAXAEBVOUString@rtl@@AEBV?$Reference@VXPropertyChangeListener@beans@star@sun@com@@@uno@star@sun@com@@@Z; + ?removeVetoableChangeListener@PropertySetMixinImpl@cppu@@MEAAXAEBVOUString@rtl@@AEBV?$Reference@VXVetoableChangeListener@beans@star@sun@com@@@uno@star@sun@com@@@Z; + ?setFastPropertyValue@PropertySetMixinImpl@cppu@@MEAAXJAEBVAny@uno@star@sun@com@@@Z; + ?getFastPropertyValue@PropertySetMixinImpl@cppu@@MEAA?AVAny@uno@star@sun@com@@J@Z; + ?getPropertyValues@PropertySetMixinImpl@cppu@@MEAA?AV?$Sequence@UPropertyValue@beans@star@sun@com@@@uno@star@sun@com@@XZ; + ?setPropertyValues@PropertySetMixinImpl@cppu@@MEAAXAEBV?$Sequence@UPropertyValue@beans@star@sun@com@@@uno@star@sun@com@@@Z; + ?prepareSet@PropertySetMixinImpl@cppu@@IEAAXAEBVOUString@rtl@@AEBVAny@uno@star@sun@com@@1PEAVBoundListeners@12@@Z; + ??0BoundListeners@PropertySetMixinImpl@cppu@@QEAA@XZ; + ??1BoundListeners@PropertySetMixinImpl@cppu@@QEAA@XZ; + ??0PropertySetMixinImpl@cppu@@AEAA@AEBV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@W4Implements@01@AEBV?$Sequence@VOUString@rtl@@@3456@AEBVType@3456@@Z; + ?dispose@PropertySetMixinImpl@cppu@@IEAAXXZ; + ?addPropertyChangeListener@PropertySetMixinImpl@cppu@@MEAAXAEBVOUString@rtl@@AEBV?$Reference@VXPropertyChangeListener@beans@star@sun@com@@@uno@star@sun@com@@@Z; + ?addVetoableChangeListener@PropertySetMixinImpl@cppu@@MEAAXAEBVOUString@rtl@@AEBV?$Reference@VXVetoableChangeListener@beans@star@sun@com@@@uno@star@sun@com@@@Z; +} UDK_3.1; + +UDK_3.3 { + global: + ?getTypes@OPropertySetHelper@cppu@@QEAA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@XZ; +} UDK_3.2; + +UDK_3.4 { # OOo 2.4 + global: + ?bootstrap_expandUri@cppu@@YA?AVOUString@rtl@@AEBV23@@Z; # rtl::OUString cppu::bootstrap_expandUri(rtl::OUString const &) +} UDK_3.3; + +UDK_3.5 { # OOo 3.0 + global: + ??0OPropertySetHelper@cppu@@QEAA@AEAU?$OBroadcastHelperVar@VOMultiTypeInterfaceContainerHelper@cppu@@VType@uno@star@sun@com@@@1@PEAVIEventNotificationHook@1@_N@Z; +} UDK_3.4; + +UDK_3.6 { # OOo 3.3 + global: + ?disposeWeakConnectionPoint@OWeakObject@cppu@@IEAAXXZ; + ?clear@WeakReferenceHelper@uno@star@sun@com@@QEAAXXZ; + ?createOneInstanceComponentFactory@cppu@@YA?AV?$Reference@VXSingleComponentFactory@lang@star@sun@com@@@uno@star@sun@com@@P6A?AV?$Reference@VXInterface@uno@star@sun@com@@@3456@AEBV?$Reference@VXComponentContext@uno@star@sun@com@@@3456@@ZAEBVOUString@rtl@@AEBV?$Sequence@VOUString@rtl@@@3456@PEAU_rtl_ModuleCount@@@Z; +} UDK_3.5; diff --git a/cppuhelper/source/propertysetmixin.cxx b/cppuhelper/source/propertysetmixin.cxx index d12fd408f035..ec7125b448d8 100644 --- a/cppuhelper/source/propertysetmixin.cxx +++ b/cppuhelper/source/propertysetmixin.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -1426,3 +1427,5 @@ void PropertySetMixinImpl::setPropertyValues( rtl::OUString(), static_cast< css::beans::XPropertySet * >(this)); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx index e43f93272e16..5782da7a40d8 100644 --- a/cppuhelper/source/propshlp.cxx +++ b/cppuhelper/source/propshlp.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -41,9 +42,11 @@ using namespace osl; using namespace com::sun::star::uno; using namespace com::sun::star::beans; using namespace com::sun::star::lang; -using namespace rtl; using namespace cppu; +using ::rtl::OUString; +using ::rtl::OUStringToOString; + namespace cppu { IPropertyArrayHelper::~IPropertyArrayHelper() @@ -237,8 +240,8 @@ void OPropertySetHelper::disposing() SAL_THROW( () ) EventObject aEvt; aEvt.Source = rSource; - // inform all listeners to reelease this object - // The listener container are automaticly cleared + // inform all listeners to release this object + // The listener containers are automatically cleared aBoundLC.disposeAndClear( aEvt ); aVetoableLC.disposeAndClear( aEvt ); } @@ -1001,11 +1004,11 @@ void OPropertySetHelper::firePropertiesChangeEvent( Sequence<PropertyChangeEvent> aChanges( nFireLen ); PropertyChangeEvent* pChanges = aChanges.getArray(); - sal_Int32 nFirePos = 0; { // must lock the mutex outside the loop. So all values are consistent. MutexGuard aGuard( rBHelper.rMutex ); Reference < XInterface > xSource( (XPropertySet *)this, UNO_QUERY ); + sal_Int32 nFirePos = 0; for( i = 0; i < nLen; i++ ) { if( pHandles[i] != -1 ) @@ -1038,7 +1041,6 @@ PropertyState OPropertySetHelper::getPropertyState( const OUString& PropertyName Sequence< PropertyState > OPropertySetHelper::getPropertyStates( const Sequence< OUString >& PropertyNames ) { ULONG nNames = PropertyNames.getLength(); - const OUString* pNames = PropertyNames.getConstArray(); Sequence< PropertyState > aStates( nNames ); return aStates; @@ -1261,7 +1263,7 @@ sal_Int32 OPropertyArrayHelper::fillHandles( sal_Int32 * pHandles, const Sequenc for( sal_Int32 i = 0; i < nReqLen; i++ ) { - // Logarithmus ermitteln + // Calculate logarithm sal_Int32 n = (sal_Int32)(pEnd - pCur); sal_Int32 nLog = 0; while( n ) @@ -1270,8 +1272,8 @@ sal_Int32 OPropertyArrayHelper::fillHandles( sal_Int32 * pHandles, const Sequenc n = n >> 1; } - // Anzahl der noch zu suchenden Properties * dem Log2 der verbleibenden - // zu dursuchenden Properties. + // Number of properties to search for * Log2 of the number of remaining + // properties to search in. if( (nReqLen - i) * nLog >= pEnd - pCur ) { // linear search is better @@ -1332,3 +1334,4 @@ sal_Int32 OPropertyArrayHelper::fillHandles( sal_Int32 * pHandles, const Sequenc +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/source/servicefactory.cxx b/cppuhelper/source/servicefactory.cxx index bcc58b74af59..742f94ac5f97 100644 --- a/cppuhelper/source/servicefactory.cxx +++ b/cppuhelper/source/servicefactory.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -129,7 +130,7 @@ Reference< registry::XSimpleRegistry > SAL_CALL createSimpleRegistry( #if OSL_DEBUG_LEVEL > 0 OString cstr_msg( OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ) ); - OSL_ENSURE( !"### exception occured:", cstr_msg.getStr() ); + OSL_ENSURE( !"### exception occurred:", cstr_msg.getStr() ); #else (void) exc; // avoid warning about unused variable #endif @@ -160,7 +161,7 @@ Reference< registry::XSimpleRegistry > SAL_CALL createNestedRegistry( #if OSL_DEBUG_LEVEL > 0 OString cstr_msg( OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ) ); - OSL_ENSURE( !"### exception occured:", cstr_msg.getStr() ); + OSL_ENSURE( !"### exception occurred:", cstr_msg.getStr() ); #else (void) exc; // avoid warning about unused variable #endif @@ -659,3 +660,5 @@ Reference< XComponentContext > SAL_CALL bootstrap_InitialComponentContext( } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx index d9cf79396090..8866240187d2 100644 --- a/cppuhelper/source/shlib.cxx +++ b/cppuhelper/source/shlib.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -61,7 +62,7 @@ namespace cppu //------------------------------------------------------------------------------ static inline void out( const char * p ) SAL_THROW( () ) { - printf( p ); + printf( "%c\n", p ); } static inline void out( const OUString & r ) throw () { @@ -241,15 +242,6 @@ static OUString makeComponentPath( sal_Int32 nEnd = endsWith( rLibName, OUSTR(SAL_DLLEXTENSION) ); if (nEnd < 0) // !endsWith { -#ifndef OS2 -//this is always triggered with .uno components -#if (OSL_DEBUG_LEVEL >= 2) - OSL_ENSURE( - !"### library name has no proper extension!", - OUStringToOString( rLibName, RTL_TEXTENCODING_ASCII_US ).getStr() ); -#endif -#endif // OS2 - #if defined SAL_DLLPREFIX nEnd = endsWith( rLibName, OUSTR(".uno") ); if (nEnd < 0) // !endsWith @@ -607,3 +599,5 @@ void SAL_CALL writeSharedLibComponentInfo( } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/source/stdidlclass.cxx b/cppuhelper/source/stdidlclass.cxx index fdfc9bc34a65..1c617da22f24 100644 --- a/cppuhelper/source/stdidlclass.cxx +++ b/cppuhelper/source/stdidlclass.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -44,7 +45,8 @@ using namespace com::sun::star; using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::reflection; -using namespace rtl; + +using ::rtl::OUString; namespace cppu { @@ -257,3 +259,5 @@ XIdlClass * SAL_CALL createStandardClassWithSequence( } } //end namespace cppu + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/source/tdmgr.cxx b/cppuhelper/source/tdmgr.cxx index 4a8a88f2093a..7090adbe90d3 100644 --- a/cppuhelper/source/tdmgr.cxx +++ b/cppuhelper/source/tdmgr.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -523,8 +524,7 @@ inline static typelib_TypeDescription * createCTD( 0, 0 ); // cleanup - if (pRefType) - typelib_typedescription_release( pRefType ); + typelib_typedescription_release( pRefType ); } return pRet; } @@ -782,3 +782,4 @@ sal_Bool SAL_CALL installTypeDescriptionManager( } // end namespace cppu +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/source/typeprovider.cxx b/cppuhelper/source/typeprovider.cxx index 1df32079b052..fd403f9d2beb 100644 --- a/cppuhelper/source/typeprovider.cxx +++ b/cppuhelper/source/typeprovider.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -324,3 +325,4 @@ OTypeCollection::OTypeCollection( } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/source/unourl.cxx b/cppuhelper/source/unourl.cxx index 6abf86d29845..eff9f8a0be2a 100644 --- a/cppuhelper/source/unourl.cxx +++ b/cppuhelper/source/unourl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -296,3 +297,5 @@ rtl::OUString const & UnoUrl::getObjectName() const { return m_xImpl->m_aObjectName; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/source/weak.cxx b/cppuhelper/source/weak.cxx index 27b94f6a4c34..1dd76d26758e 100644 --- a/cppuhelper/source/weak.cxx +++ b/cppuhelper/source/weak.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,12 +29,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_cppuhelper.hxx" #include <osl/mutex.hxx> -#ifndef _CPPU_WEAKAGG_HXX_ #include <cppuhelper/weakagg.hxx> -#endif -#ifndef _CPPU_HELPER_INTERFACECONTAINER_HXX_ #include <cppuhelper/interfacecontainer.hxx> -#endif #include "cppuhelper/exc_hlp.hxx" using namespace osl; @@ -293,16 +290,6 @@ Any OWeakAggObject::queryInterface( const Type & rType ) throw(::com::sun::star: { Reference< XInterface > x( xDelegator ); // harden ref return (x.is() ? x->queryInterface( rType ) : queryAggregation( rType )); - -// // set rOut to zero, if failed -// if( !xDelegator.queryHardRef( aUik, rOut ) ) -// { -// XInterfaceRef x; -// if( !xDelegator.queryHardRef( ((XInterface*)0)->getSmartUik(), x ) ) -// // reference is not valid -// queryAggregation( aUik, rOut ); -// } -// return rOut.is(); } // XAggregation @@ -551,3 +538,4 @@ Reference< XInterface > WeakReferenceHelper::get() const SAL_THROW( () ) } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/test/bootstrap/TestEnv.cxx b/cppuhelper/test/bootstrap/TestEnv.cxx index 3bf3533b619e..578378ee2898 100644 --- a/cppuhelper/test/bootstrap/TestEnv.cxx +++ b/cppuhelper/test/bootstrap/TestEnv.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -126,3 +127,4 @@ extern "C" void uno_ext_getMapping(uno_Mapping ** ppMapping, cppu::helper::purpenv::createMapping(ppMapping, pFrom, pTo); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/test/bootstrap/bootstrap.test.cxx b/cppuhelper/test/bootstrap/bootstrap.test.cxx index 07b0d6a50c70..b0eadb6946a1 100644 --- a/cppuhelper/test/bootstrap/bootstrap.test.cxx +++ b/cppuhelper/test/bootstrap/bootstrap.test.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -318,3 +319,5 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(/*argc*/, argv) return ret; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/test/cfg_data/template/uno/components.xml b/cppuhelper/test/cfg_data/template/uno/components.xml index 6ff26a5b9cec..5ab04d030fb3 100644 --- a/cppuhelper/test/cfg_data/template/uno/components.xml +++ b/cppuhelper/test/cfg_data/template/uno/components.xml @@ -5,7 +5,7 @@ xmlns:cfg="http://openoffice.org/2000/registry/instance"> <service> - <available-implementations cfg:type="string" cfg:derivedBy=="list"/> + <available-implementations cfg:type="string" cfg:derivedBy="list"/> <context-properties cfg:type="set" cfg:element-type="cfg:any"/> </service> diff --git a/cppuhelper/test/cfg_test.cxx b/cppuhelper/test/cfg_test.cxx index 9141b8373090..dfee341e5109 100644 --- a/cppuhelper/test/cfg_test.cxx +++ b/cppuhelper/test/cfg_test.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -262,7 +263,7 @@ SAL_IMPLEMENT_MAIN() // show what is in context xContext->getValueByName( OUSTR("dump_maps") ); - sal_Int32 n; + sal_Int32 n(0); OSL_VERIFY( xContext->getValueByName( OUSTR("/global-context-properties/TestValue") ) >>= n ); ::fprintf( stderr, "> n=%d\n", n ); @@ -271,7 +272,7 @@ SAL_IMPLEMENT_MAIN() OSL_VERIFY( xContext->getValueByName( OUSTR("/singletons/com.sun.star.script.theConverter") ) >>= x ); OSL_VERIFY( xContext->getValueByName( OUSTR("/singletons/com.sun.star.bootstrap.theTestComponent0") ) >>= x ); - ::fprintf( stderr, "> registering service...\n", n ); + ::fprintf( stderr, "> registering service...\n"); #if defined(SAL_W32) || defined(SAL_OS2) OUString libName( OUSTR("cfg_test.dll") ); #elif defined(SAL_UNX) @@ -301,3 +302,5 @@ SAL_IMPLEMENT_MAIN() return 1; } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/test/loader/loader.test.cxx b/cppuhelper/test/loader/loader.test.cxx index dcd6b34ced68..53d5d96ac175 100644 --- a/cppuhelper/test/loader/loader.test.cxx +++ b/cppuhelper/test/loader/loader.test.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -203,3 +204,5 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(/*argc*/, argv) return result; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/test/loader/makefile.mk b/cppuhelper/test/loader/makefile.mk index dc1b5662bd43..4816dcb47e36 100644 --- a/cppuhelper/test/loader/makefile.mk +++ b/cppuhelper/test/loader/makefile.mk @@ -34,15 +34,8 @@ ENABLE_EXCEPTIONS := TRUE NO_BSYMBOLIC := TRUE USE_DEFFILE := TRUE - .INCLUDE : settings.mk - -.IF "$(COM)" == "GCC" -#LINKFLAGS += -rdynamic -.ENDIF - - ENVINCPRE := -I$(OUT)$/inc$/$(TARGET) APP1TARGET := $(TARGET) diff --git a/cppuhelper/test/makefile.mk b/cppuhelper/test/makefile.mk index 26e1cb394d3e..2746b3f07c1c 100644 --- a/cppuhelper/test/makefile.mk +++ b/cppuhelper/test/makefile.mk @@ -141,15 +141,15 @@ $(UNO_OUT)$/%$(EXT_SO): $(UNO_PATH)$/%$(EXT_SO) $(COPY) $^ $@ $(BIN)$/cpputest.rdb: $(ALLIDLFILES) $(UNO_OUT)$/invocadapt.uno$(EXT_SO) $(UNO_OUT)$/bootstrap.uno$(EXT_SO) - idlc -I$(PRJ) -I$(SOLARIDLDIR) -O$(BIN) $(ALLIDLFILES) - regmerge $@ /UCR $(BIN)$/{$(?:f:s/.idl/.urd/)} - regmerge $@ / $(UNOUCRRDB) - regcomp -register -r $@ -c reflection.uno$(DLLPOST) - touch $@ + $(IDLC) -I$(PRJ) -I$(SOLARIDLDIR) -O$(BIN) $(ALLIDLFILES) + $(REGMERGE) $@ /UCR $(BIN)$/{$(?:f:s/.idl/.urd/)} + $(REGMERGE) $@ / $(UNOUCRRDB) + $(REGCOMP) -register -r $@ -c reflection.uno$(DLLPOST) + $(TOUCH) $@ unoheader: $(BIN)$/cpputest.rdb - cppumaker $(CPPUMAKERFLAGS) -BUCR -O$(UNOUCROUT) -T"$(TYPES);$(HELPERTYPES)" $(BIN)$/cpputest.rdb - cppumaker $(CPPUMAKERFLAGS) -BUCR -O$(UNOUCROUT) -T"$(FACTORYTYPES)" $(BIN)$/cpputest.rdb + $(CPPUMAKER) $(CPPUMAKERFLAGS) -BUCR -O$(UNOUCROUT) -T"$(TYPES);$(HELPERTYPES)" $(BIN)$/cpputest.rdb + $(CPPUMAKER) $(CPPUMAKERFLAGS) -BUCR -O$(UNOUCROUT) -T"$(FACTORYTYPES)" $(BIN)$/cpputest.rdb $(BIN)$/testdefaultbootstrapping.pl: testdefaultbootstrapping.pl diff --git a/cppuhelper/test/testcmp/TestComponent.cxx b/cppuhelper/test/testcmp/TestComponent.cxx index 4a47e503cb9e..83bdac1a47a2 100644 --- a/cppuhelper/test/testcmp/TestComponent.cxx +++ b/cppuhelper/test/testcmp/TestComponent.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -245,3 +246,5 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnviro *envTypeName = strdup(buff); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/test/testcmp/TestComponent.hxx b/cppuhelper/test/testcmp/TestComponent.hxx index b73ee6300072..7499628148f4 100644 --- a/cppuhelper/test/testcmp/TestComponent.hxx +++ b/cppuhelper/test/testcmp/TestComponent.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -54,3 +55,5 @@ CPPUHELPER_TEST_COMPONENT_EXPORT rtl::OUString g_envDcp; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/test/testcontainer.cxx b/cppuhelper/test/testcontainer.cxx index d15dbd18c159..5665a762eaa0 100644 --- a/cppuhelper/test/testcontainer.cxx +++ b/cppuhelper/test/testcontainer.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,6 +44,7 @@ using namespace ::com::sun::star::uno; class TestListener : public WeakImplHelper1< XVetoableChangeListener > { +public: // Methods virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& /*Source*/ ) throw(::com::sun::star::uno::RuntimeException) { @@ -54,7 +56,6 @@ class TestListener : public WeakImplHelper1< XVetoableChangeListener > { } - }; void test_interfacecontainer() @@ -151,3 +152,5 @@ void test_interfacecontainer() helper.disposeAndClear( EventObject() ); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/test/testdefaultbootstrapping.cxx b/cppuhelper/test/testdefaultbootstrapping.cxx index 664ff6dc422a..82172c26d838 100644 --- a/cppuhelper/test/testdefaultbootstrapping.cxx +++ b/cppuhelper/test/testdefaultbootstrapping.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,6 +39,7 @@ #include <cppuhelper/bootstrap.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> using namespace ::cppu; using namespace ::com::sun::star::lang; @@ -82,3 +84,5 @@ SAL_IMPLEMENT_MAIN() return result; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/test/testhelper.cxx b/cppuhelper/test/testhelper.cxx index a50d78aed18a..431c3cb16251 100644 --- a/cppuhelper/test/testhelper.cxx +++ b/cppuhelper/test/testhelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,13 +50,16 @@ #include "testhelper.hxx" -using namespace rtl; using namespace cppu; using namespace com::sun::star::uno; using namespace com::sun::star; using namespace com::sun::star::lang; using namespace com::sun::star::registry; +using ::rtl::OUString; +using ::rtl::OString; +using ::rtl::OUStringToOString; + SAL_IMPLEMENT_MAIN() { try @@ -96,9 +100,11 @@ SAL_IMPLEMENT_MAIN() catch (Exception & exc) { OString cstr_msg( OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ) ); - OSL_ENSURE( ! "exception occured: ", cstr_msg.getStr() ); + OSL_ENSURE( ! "exception occurred: ", cstr_msg.getStr() ); } printf( "Test finished\n" ); return 0; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/test/testhelper.hxx b/cppuhelper/test/testhelper.hxx index 77119c05f0f4..a164c1c6b9f4 100644 --- a/cppuhelper/test/testhelper.hxx +++ b/cppuhelper/test/testhelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,3 +30,5 @@ void testPropertyTypeHelper(); void test_PropertySetHelper(); void test_ImplHelper( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > & xSF ); void test_interfacecontainer(); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/test/testidlclass.cxx b/cppuhelper/test/testidlclass.cxx index 6ae238e47319..48ee84ed9101 100644 --- a/cppuhelper/test/testidlclass.cxx +++ b/cppuhelper/test/testidlclass.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -225,3 +226,5 @@ void testidlclass( const Reference < XMultiServiceFactory > &rSMgr) (XServiceInfo * ) 0 ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/test/testimplhelper.cxx b/cppuhelper/test/testimplhelper.cxx index 0a79158ff705..6a5e741c4975 100644 --- a/cppuhelper/test/testimplhelper.cxx +++ b/cppuhelper/test/testimplhelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -80,12 +81,15 @@ #include <com/sun/star/lang/IllegalAccessException.hpp> using namespace test; -using namespace rtl; using namespace osl; using namespace cppu; using namespace com::sun::star; using namespace com::sun::star::uno; +using ::rtl::OUString; +using ::rtl::OUStringToOString; +using ::rtl::OString; + //================================================================================================== struct TestImpl : public ImplHelper4< CA, DBA, FE, G > { @@ -579,3 +583,4 @@ void test_ImplHelper( const Reference< lang::XMultiServiceFactory > & /*xSF*/ ) OSL_ENSURE( sal_False, "### exception test failed!" ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/test/testlib/defbootstrap_lib.cxx b/cppuhelper/test/testlib/defbootstrap_lib.cxx index c9656924e9cf..64c28766a5f3 100644 --- a/cppuhelper/test/testlib/defbootstrap_lib.cxx +++ b/cppuhelper/test/testlib/defbootstrap_lib.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -115,3 +116,5 @@ XS(boot_UNO) } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/test/testlib/makefile.mk b/cppuhelper/test/testlib/makefile.mk index edaba0c6532c..b53f6ebab71b 100755 --- a/cppuhelper/test/testlib/makefile.mk +++ b/cppuhelper/test/testlib/makefile.mk @@ -24,6 +24,7 @@ # for a copy of the LGPLv3 License. # #************************************************************************* + LINKFLAGSDEFS="" PRJ=..$/.. @@ -56,9 +57,6 @@ LIB!:=$(LIB);$(PERLLIBS) # --- Files -------------------------------------------------------- -#CFLAGS += -DVERSION=\"0.01\" -DXS_VERSION=\"0.01\" -fPIC -I/develop6/update/dev/solenv/unxlngi3/lib/perl5/5.6.0/i686-linux/CORE/ -#CFLAGS += -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DVERSION=\"0.01\" -DXS_VERSION=\"0.01\" -KPIC -I/develop6/update/dev/solenv/unxsols2/lib/perl5/5.6.0/sun4-solaris/CORE - SLOFILES= $(SLO)$/defbootstrap_lib.obj SHL1TARGET=$(TARGET) diff --git a/cppuhelper/test/testpropshlp.cxx b/cppuhelper/test/testpropshlp.cxx index 37c8613bb6b3..de5624bc90b1 100644 --- a/cppuhelper/test/testpropshlp.cxx +++ b/cppuhelper/test/testpropshlp.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -460,7 +461,7 @@ public: { } - sal_Int32 getRefCount() + sal_Int32 getRefCount() const { return m_refCount; } // XEventListener @@ -494,7 +495,7 @@ public: OSL_ENSURE( pExceptedListenerValues[nCurrent].getValueType().getTypeClass() == TypeClass_SHORT , "PropertySetHelper: wrong data type" ); - sal_Int16 nInt16, nOldInt16; + sal_Int16 nInt16(0), nOldInt16(0); pExceptedListenerValues[nCurrent] >>= nInt16; evt.OldValue >>= nOldInt16; OSL_ENSURE( nInt16 == nOldInt16, "PropertySetHelper: wrong old value" ); @@ -510,7 +511,7 @@ public: { OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") ), "PropertySetHelper: wrong name" ); - sal_Int32 nInt32,nOldInt32; + sal_Int32 nInt32(0),nOldInt32(0); pExceptedListenerValues[nCurrent] >>= nInt32; evt.OldValue >>= nOldInt32; @@ -549,7 +550,7 @@ public: { OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), "PropertySetHelper: wrong name" ); - sal_Int16 nInt16, nOldInt16; + sal_Int16 nInt16(0), nOldInt16(0); pExceptedListenerValues[nCurrent] >>= nInt16; evt.OldValue >>= nOldInt16; @@ -571,7 +572,7 @@ public: { OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") ), "PropertySetHelper: wrong name" ); - sal_Int32 nInt32,nOldInt32; + sal_Int32 nInt32(0),nOldInt32(0); pExceptedListenerValues[nCurrent] >>= nInt32; evt.OldValue >>= nOldInt32; OSL_ENSURE( nInt32 == nOldInt32 , "PropertySetHelper: wrong old value" ); @@ -612,7 +613,7 @@ public: { OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), "PropertySetHelper: wrong name" ); - sal_Int16 nInt16, nOldInt16; + sal_Int16 nInt16(0), nOldInt16(0); pExceptedListenerValues[nCurrent] >>= nInt16; evt.OldValue >>= nOldInt16; OSL_ENSURE( nInt16 == nOldInt16 , "PropertySetHelper: wrong old value" ); @@ -629,7 +630,7 @@ public: OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") ), "PropertySetHelper: wrong name" ); - sal_Int32 nInt32,nOldInt32; + sal_Int32 nInt32(0),nOldInt32(0); pExceptedListenerValues[nCurrent] >>= nInt32; evt.OldValue >>= nOldInt32; OSL_ENSURE( nInt32 == nOldInt32 , "PropertySetHelper: wrong old value" ); @@ -1010,7 +1011,7 @@ void test_PropertySetHelper() b = *((sal_Bool*)aValue.getValue()); OSL_ENSURE( !b, "PropertySetHelper: wrong BOOL value" ); - sal_Int16 n16; + sal_Int16 n16(0); aValue <<=(sal_Int16)22; xPS->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), aValue ); aValue = xPS->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ) ); @@ -1027,7 +1028,7 @@ void test_PropertySetHelper() aValue <<= (sal_Int16)55; xPS->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") ), aValue ); aValue = xPS->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") ) ); - sal_Int32 n32; + sal_Int32 n32(0); aValue >>= n32; OSL_ENSURE( 55 == n32 , "PropertySetHelper: wrong INT32 value" ); aValue <<= (sal_Int16)66; @@ -1179,3 +1180,5 @@ void test_PropertySetHelper() } } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/test/testproptyphlp.cxx b/cppuhelper/test/testproptyphlp.cxx index 70dae1a93a49..d913c7879b60 100644 --- a/cppuhelper/test/testproptyphlp.cxx +++ b/cppuhelper/test/testproptyphlp.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -82,3 +83,5 @@ void testPropertyTypeHelper() convertPropertyValue( ow , a ); OSL_ASSERT( ow == prop.Name ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |