diff options
Diffstat (limited to 'framework/inc/classes')
21 files changed, 82 insertions, 41 deletions
diff --git a/framework/inc/classes/actiontriggercontainer.hxx b/framework/inc/classes/actiontriggercontainer.hxx index 936f6cf0cdbb..8c4f1611b4f3 100644..100755 --- a/framework/inc/classes/actiontriggercontainer.hxx +++ b/framework/inc/classes/actiontriggercontainer.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. @@ -77,3 +78,5 @@ class FWE_DLLPUBLIC ActionTriggerContainer : public PropertySetContainer, } #endif // __FRAMEWORK_CLASSES_ACTIONTRIGGERCONTAINER_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/inc/classes/actiontriggerpropertyset.hxx b/framework/inc/classes/actiontriggerpropertyset.hxx index 3f373f272afd..16a0522a777e 100644..100755 --- a/framework/inc/classes/actiontriggerpropertyset.hxx +++ b/framework/inc/classes/actiontriggerpropertyset.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,9 +35,7 @@ #include <osl/mutex.hxx> #include <rtl/ustring.hxx> -#ifndef __COM_SUN_STAR_AWT_XBITMAP_HPP_ #include <com/sun/star/awt/XBitmap.hpp> -#endif #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> @@ -132,3 +131,5 @@ class ActionTriggerPropertySet : public ThreadHelpBase , } #endif // __FRAMEWORK_CLASSES_ACTIONTRIGGERPROPERTYSET_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx index f3579e98fcc1..c1090b7ab648 100644..100755 --- a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx +++ b/framework/inc/classes/actiontriggerseparatorpropertyset.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. @@ -115,3 +116,5 @@ class ActionTriggerSeparatorPropertySet : public ThreadHelpBase } #endif // __FRAMEWORK_CLASSES_ACTIONTRIGGERSEPARATORPROPERTYSET_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/inc/classes/checkediterator.hxx b/framework/inc/classes/checkediterator.hxx index 7c337b023ba3..4ae7d17eddb2 100644..100755 --- a/framework/inc/classes/checkediterator.hxx +++ b/framework/inc/classes/checkediterator.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,9 +44,7 @@ //_________________________________________________________________________________________________________________ #include <sal/types.h> -#ifndef __SGI_STL_ITERATOR #include <iterator> -#endif //_________________________________________________________________________________________________________________ // namespace @@ -343,3 +342,5 @@ class CheckedIterator } // namespace framework #endif // #ifndef __FRAMEWORK_CLASSES_CHECKEDITERATOR_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/inc/classes/converter.hxx b/framework/inc/classes/converter.hxx index 43972eeefa1b..71f817bf8fb7 100644..100755 --- a/framework/inc/classes/converter.hxx +++ b/framework/inc/classes/converter.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,3 +91,5 @@ class FWI_DLLPUBLIC Converter } // namespace framework #endif // #ifndef __FRAMEWORK_CLASSES_CONVERTER_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/inc/classes/droptargetlistener.hxx b/framework/inc/classes/droptargetlistener.hxx index 34442c2e2a67..60447c3a13fd 100644..100755 --- a/framework/inc/classes/droptargetlistener.hxx +++ b/framework/inc/classes/droptargetlistener.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. @@ -39,9 +40,7 @@ // interface includes //_________________________________________________________________________________________________________________ -#ifndef _COM_SUN_STAR_DATATRANSFER_DND_XDROPTARGETELISTENER_HPP_ #include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp> -#endif #include <com/sun/star/frame/XFrame.hpp> //_________________________________________________________________________________________________________________ @@ -49,9 +48,7 @@ //_________________________________________________________________________________________________________________ #include <cppuhelper/implbase1.hxx> -#ifndef _SOT_EXCHANGE_HXX_ #include <sot/exchange.hxx> -#endif namespace framework { @@ -106,3 +103,5 @@ class DropTargetListener : private ThreadHelpBase } // namespace framework #endif // __FRAMEWORK_CLASSES_DROPTARGETLISTENER_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/inc/classes/filtercache.hxx b/framework/inc/classes/filtercache.hxx index 516c50a1141a..328272204b56 100644..100755 --- a/framework/inc/classes/filtercache.hxx +++ b/framework/inc/classes/filtercache.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. @@ -42,9 +43,7 @@ #include <classes/filtercachedata.hxx> #include <threadhelp/threadhelpbase.hxx> -#ifndef __FRAMEWORK_THREADHELP_TRANSACTIONBASE_HXX_ #include <threadhelp/transactionbase.hxx> -#endif #include <general.h> #include <queries.h> @@ -445,3 +444,5 @@ class FilterCache : private ThreadHelpBase } // namespace framework #endif // #ifndef __FRAMEWORK_CLASSES_FILTERCACHE_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx index e6ac179fee50..f92da9cae2d1 100644..100755 --- a/framework/inc/classes/filtercachedata.hxx +++ b/framework/inc/classes/filtercachedata.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,7 +32,7 @@ /** Attention: stl headers must(!) be included at first. Otherwhise it can make trouble with solaris headers ... */ -#include <hash_map> +#include <boost/unordered_map.hpp> #include <vector> #include <iterator> @@ -469,7 +470,7 @@ struct ContentHandler // and could be used in a generic way //***************************************************************************************************************** template< class HashType > -class SetNodeHash : public ::std::hash_map< ::rtl::OUString , +class SetNodeHash : public ::boost::unordered_map< ::rtl::OUString , HashType , OUStringHashCode , ::std::equal_to< ::rtl::OUString > > @@ -510,7 +511,7 @@ class SetNodeHash : public ::std::hash_map< ::rtl::OUString , // It's an optimism to find registered services faster! // The preferred hash maps file extensions to preferred types to find these ones faster. //***************************************************************************************************************** -class PerformanceHash : public ::std::hash_map< ::rtl::OUString , +class PerformanceHash : public ::boost::unordered_map< ::rtl::OUString , OUStringList , OUStringHashCode , ::std::equal_to< ::rtl::OUString > > @@ -857,3 +858,5 @@ class FilterCFGListener : public css::util::XChangesListener } // namespace framework #endif // #ifndef __FRAMEWORK_CLASSES_FILTERCACHEDATA_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/inc/classes/framecontainer.hxx b/framework/inc/classes/framecontainer.hxx index bd3aee81694b..1ac62b8278ef 100644..100755 --- a/framework/inc/classes/framecontainer.hxx +++ b/framework/inc/classes/framecontainer.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. @@ -40,9 +41,7 @@ //_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> -#ifndef __FRAMEWORK_THREADHELP_TRANSACTIONBASE_HXX_ #include <threadhelp/transactionbase.hxx> -#endif #include <macros/debug.hxx> #include <general.h> @@ -57,7 +56,6 @@ // other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/weakref.hxx> -#include <vos/ref.hxx> #include <rtl/ustring.hxx> #include <vcl/evntpost.hxx> @@ -149,3 +147,5 @@ class FrameContainer : private ThreadHelpBase } // namespace framework #endif // #ifndef __FRAMEWORK_CLASSES_FRAMECONTAINER_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/inc/classes/fwkresid.hxx b/framework/inc/classes/fwkresid.hxx index e8a9da8d6d6c..c726ed213a23 100644..100755 --- a/framework/inc/classes/fwkresid.hxx +++ b/framework/inc/classes/fwkresid.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,3 +46,5 @@ class FWE_DLLPUBLIC FwkResId : public ResId } #endif // __FRAMEWORK_CLASSES_FWKRESID + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/inc/classes/fwktabwindow.hxx b/framework/inc/classes/fwktabwindow.hxx index 7d01b3c6f9d8..9ddbe9bbfaf4 100644..100755 --- a/framework/inc/classes/fwktabwindow.hxx +++ b/framework/inc/classes/fwktabwindow.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. @@ -133,3 +134,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/inc/classes/fwlresid.hxx b/framework/inc/classes/fwlresid.hxx index 673a110a5097..70f126c229dc 100755 --- a/framework/inc/classes/fwlresid.hxx +++ b/framework/inc/classes/fwlresid.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. @@ -44,3 +45,5 @@ class FwlResId : public ResId } #endif // __FRAMEWORK_CLASSES_FwlResId + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/inc/classes/imagewrapper.hxx b/framework/inc/classes/imagewrapper.hxx index 2001314e9edb..aae6d3f0e075 100644..100755 --- a/framework/inc/classes/imagewrapper.hxx +++ b/framework/inc/classes/imagewrapper.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. @@ -69,3 +70,5 @@ class FWE_DLLPUBLIC ImageWrapper : public ThreadHelpBase } #endif // __FRAMEWORK_CLASSES_IMAGEWRAPPER_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/inc/classes/menumanager.hxx b/framework/inc/classes/menumanager.hxx index 11e56a7b522e..62432f05543b 100644..100755 --- a/framework/inc/classes/menumanager.hxx +++ b/framework/inc/classes/menumanager.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,14 +83,6 @@ class MenuManager : public ThreadHelpBase , Menu* pMenu, sal_Bool bDelete, sal_Bool bDeleteChildren ); -#if 0 - MenuManager( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, - REFERENCE< XFRAME >& rFrame, - AddonMenu* pAddonMenu, - sal_Bool bDelete, - sal_Bool bDeleteChildren ); -#endif virtual ~MenuManager(); @@ -109,7 +102,11 @@ class MenuManager : public ThreadHelpBase , const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& getServiceFactory(); static void UpdateSpecialWindowMenu( Menu* pMenu ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,IMutex& _rMutex); - static void FillMenuImages(::com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& xFrame,Menu* _pMenu,sal_Bool bIsHiContrast,sal_Bool bShowMenuImages); + static void FillMenuImages( + ::com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& xFrame, + Menu* _pMenu, + sal_Bool bShowMenuImages + ); protected: DECL_LINK( Highlight, Menu * ); @@ -151,7 +148,6 @@ class MenuManager : public ThreadHelpBase , sal_Bool m_bDeleteChildren; sal_Bool m_bActive; sal_Bool m_bIsBookmarkMenu; - sal_Bool m_bWasHiContrast; sal_Bool m_bShowMenuImages; ::rtl::OUString m_aMenuItemCommand; Menu* m_pVCLMenu; @@ -166,3 +162,5 @@ class MenuManager : public ThreadHelpBase , } // namespace #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/inc/classes/propertysethelper.hxx b/framework/inc/classes/propertysethelper.hxx index d62debc5b2a2..4018353c32ac 100644..100755 --- a/framework/inc/classes/propertysethelper.hxx +++ b/framework/inc/classes/propertysethelper.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. @@ -256,3 +257,5 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet } // namespace framework #endif // #ifndef __FRAMEWORK_CLASSES_PROPERTYSETHELPER_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/inc/classes/protocolhandlercache.hxx b/framework/inc/classes/protocolhandlercache.hxx index ffdcaa1f253b..52a53a9b5179 100644..100755 --- a/framework/inc/classes/protocolhandlercache.hxx +++ b/framework/inc/classes/protocolhandlercache.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. @@ -198,3 +199,5 @@ class FWI_DLLPUBLIC HandlerCFGAccess : public ::utl::ConfigItem } // namespace framework #endif // #ifndef __FRAMEWORK_CLASSES_PROTOCOLHANDLERCACHE_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/inc/classes/resource.hrc b/framework/inc/classes/resource.hrc index 8c9bd2e854b0..22fd6740c397 100644..100755 --- a/framework/inc/classes/resource.hrc +++ b/framework/inc/classes/resource.hrc @@ -69,19 +69,19 @@ #define RID_IMAGE_STATUSBAR_LOGO (RID_IMAGE_START+0) // License Dialog -#define DLG_LICENSE (RID_FWK_DIALOG_START+256) -#define ML_LICENSE (RID_FWK_DIALOG_START+11) -#define FT_INFO1 (RID_FWK_DIALOG_START+12) -#define FT_INFO2 (RID_FWK_DIALOG_START+13) -#define FT_INFO3 (RID_FWK_DIALOG_START+14) -#define FT_INFO2_1 (RID_FWK_DIALOG_START+15) -#define FT_INFO3_1 (RID_FWK_DIALOG_START+16) -#define FL_DIVIDE (RID_FWK_DIALOG_START+17) -#define PB_PAGEDOWN (RID_FWK_DIALOG_START+18) -#define IMG_ARROW (RID_FWK_DIALOG_START+19) -#define LICENSE_ACCEPT (RID_FWK_DIALOG_START+20) -#define LICENSE_NOTACCEPT (RID_FWK_DIALOG_START+21) -#define PB_DECLINE (RID_FWK_DIALOG_START+22) -#define PB_ACCEPT (RID_FWK_DIALOG_START+23) +#define DLG_LICENSE (RID_FWK_DIALOG_START+256) +#define ML_LICENSE (RID_FWK_DIALOG_START+11) +#define FT_INFO1 (RID_FWK_DIALOG_START+12) +#define FT_INFO2 (RID_FWK_DIALOG_START+13) +#define FT_INFO3 (RID_FWK_DIALOG_START+14) +#define FT_INFO2_1 (RID_FWK_DIALOG_START+15) +#define FT_INFO3_1 (RID_FWK_DIALOG_START+16) +#define FL_DIVIDE (RID_FWK_DIALOG_START+17) +#define PB_PAGEDOWN (RID_FWK_DIALOG_START+18) +#define IMG_ARROW (RID_FWK_DIALOG_START+19) +#define LICENSE_ACCEPT (RID_FWK_DIALOG_START+20) +#define LICENSE_NOTACCEPT (RID_FWK_DIALOG_START+21) +#define PB_DECLINE (RID_FWK_DIALOG_START+22) +#define PB_ACCEPT (RID_FWK_DIALOG_START+23) #endif diff --git a/framework/inc/classes/rootactiontriggercontainer.hxx b/framework/inc/classes/rootactiontriggercontainer.hxx index e3c26d190ce9..406c8bb3275c 100644..100755 --- a/framework/inc/classes/rootactiontriggercontainer.hxx +++ b/framework/inc/classes/rootactiontriggercontainer.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. @@ -126,3 +127,5 @@ class FWE_DLLPUBLIC RootActionTriggerContainer : public PropertySetContainer, } #endif // __FRAMEWORK_CLASSES_ROOTACTIONTRIGGERCONTAINER_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/inc/classes/servicemanager.hxx b/framework/inc/classes/servicemanager.hxx index 233987768b82..369cf544427f 100644..100755 --- a/framework/inc/classes/servicemanager.hxx +++ b/framework/inc/classes/servicemanager.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. @@ -228,7 +229,7 @@ class ServiceManager @param "sRegistryFile", file name of user registry. @return A reference to a new initialized servicemanager with a valid registry. - It can be NULL, if an error occured. + It can be NULL, if an error occurred. @onerror Return a NULL-reference. *//*-*****************************************************************************************************/ @@ -278,3 +279,5 @@ class ServiceManager } // namespace framework #endif // #ifndef __FRAMEWORK_CLASSES_SERVICEMANAGER_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/inc/classes/taskcreator.hxx b/framework/inc/classes/taskcreator.hxx index 19c68d6a332c..f42e3c84c434 100644..100755 --- a/framework/inc/classes/taskcreator.hxx +++ b/framework/inc/classes/taskcreator.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. @@ -100,3 +101,5 @@ class TaskCreator : private ThreadHelpBase } // namespace framework #endif // #ifndef __FRAMEWORK_CLASSES_TASKCREATOR_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/inc/classes/wildcard.hxx b/framework/inc/classes/wildcard.hxx index bc4d770a0c1c..192f37e06728 100644..100755 --- a/framework/inc/classes/wildcard.hxx +++ b/framework/inc/classes/wildcard.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. @@ -182,3 +183,5 @@ class Wildcard } // namespace framework #endif // #ifndef __FRAMEWORK_CLASSES_WILDCARD_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |