diff options
Diffstat (limited to 'framework')
503 files changed, 13560 insertions, 13569 deletions
diff --git a/framework/inc/acceleratorconst.h b/framework/inc/acceleratorconst.h index aba67e1b4a9d..f17f8c1e1cbb 100644 --- a/framework/inc/acceleratorconst.h +++ b/framework/inc/acceleratorconst.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,13 +40,13 @@ // other includes namespace framework{ - + #define DOCTYPE_ACCELERATORS DECLARE_ASCII("<!DOCTYPE accel:acceleratorlist PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"accelerator.dtd\">") - -#define ATTRIBUTE_TYPE_CDATA DECLARE_ASCII("CDATA") + +#define ATTRIBUTE_TYPE_CDATA DECLARE_ASCII("CDATA") #define XMLNS_ACCEL DECLARE_ASCII("accel") -#define XMLNS_XLINK DECLARE_ASCII("xlink") +#define XMLNS_XLINK DECLARE_ASCII("xlink") #define ATTRIBUTE_URL DECLARE_ASCII("href" ) #define ATTRIBUTE_KEYCODE DECLARE_ASCII("code" ) @@ -57,10 +57,10 @@ namespace framework{ // same items with a name space alias #define AL_ELEMENT_ACCELERATORLIST DECLARE_ASCII("accel:acceleratorlist") -#define AL_ELEMENT_ITEM DECLARE_ASCII("accel:item" ) +#define AL_ELEMENT_ITEM DECLARE_ASCII("accel:item" ) #define AL_XMLNS_ACCEL DECLARE_ASCII("xmlns:accel") -#define AL_XMLNS_XLINK DECLARE_ASCII("xmlns:xlink") +#define AL_XMLNS_XLINK DECLARE_ASCII("xmlns:xlink") #define AL_ATTRIBUTE_URL DECLARE_ASCII("xlink:href" ) #define AL_ATTRIBUTE_KEYCODE DECLARE_ASCII("accel:code" ) @@ -72,9 +72,9 @@ namespace framework{ // same items with full qualified name space #define NS_ELEMENT_ACCELERATORLIST DECLARE_ASCII("http://openoffice.org/2001/accel^acceleratorlist") #define NS_ELEMENT_ITEM DECLARE_ASCII("http://openoffice.org/2001/accel^item" ) - -#define NS_XMLNS_ACCEL DECLARE_ASCII("http://openoffice.org/2001/accel") -#define NS_XMLNS_XLINK DECLARE_ASCII("http://www.w3.org/1999/xlink" ) + +#define NS_XMLNS_ACCEL DECLARE_ASCII("http://openoffice.org/2001/accel") +#define NS_XMLNS_XLINK DECLARE_ASCII("http://www.w3.org/1999/xlink" ) #define NS_ATTRIBUTE_URL DECLARE_ASCII("http://www.w3.org/1999/xlink^href" ) #define NS_ATTRIBUTE_KEYCODE DECLARE_ASCII("http://openoffice.org/2001/accel^code" ) diff --git a/framework/inc/arguments.h b/framework/inc/arguments.h index 5dc4668da783..6b395d1e6e98 100644 --- a/framework/inc/arguments.h +++ b/framework/inc/arguments.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,19 +29,19 @@ #define __FRAMEWORK_ARGUMENTS_H_ //_________________________________________________________________________________________________________________ -// includes +// includes //_________________________________________________________________________________________________________________ #include <macros/generic.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ /*-************************************************************************************************************//** - @short These arguments are included in given parameter lists - e.g. at dispatch calls at Sequence< PropertyValue >. + @short These arguments are included in given parameter lists - e.g. at dispatch calls at Sequence< PropertyValue >. You can use class ArgumentAnalyzer to set/get it from a given list! *//*-*************************************************************************************************************/ diff --git a/framework/inc/classes/actiontriggercontainer.hxx b/framework/inc/classes/actiontriggercontainer.hxx index f53ddac4709e..034252c2ae63 100644 --- a/framework/inc/classes/actiontriggercontainer.hxx +++ b/framework/inc/classes/actiontriggercontainer.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,13 +33,13 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> -#define SERVICENAME_ACTIONTRIGGERCONTAINER "com.sun.star.ui.ActionTriggerContainer" -#define IMPLEMENTATIONNAME_ACTIONTRIGGERCONTAINER "com.sun.star.comp.ui.ActionTriggerContainer" +#define SERVICENAME_ACTIONTRIGGERCONTAINER "com.sun.star.ui.ActionTriggerContainer" +#define IMPLEMENTATIONNAME_ACTIONTRIGGERCONTAINER "com.sun.star.comp.ui.ActionTriggerContainer" namespace framework { -class ActionTriggerContainer : public PropertySetContainer, +class ActionTriggerContainer : public PropertySetContainer, public com::sun::star::lang::XMultiServiceFactory, public com::sun::star::lang::XServiceInfo, public com::sun::star::lang::XTypeProvider @@ -49,17 +49,17 @@ class ActionTriggerContainer : public PropertySetContainer, virtual ~ActionTriggerContainer(); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL acquire() throw (); virtual void SAL_CALL release() throw (); // XMultiServiceFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier ) + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames() + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames() throw (::com::sun::star::uno::RuntimeException); // XServiceInfo @@ -71,7 +71,7 @@ class ActionTriggerContainer : public PropertySetContainer, virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException); }; - + } #endif // __FRAMEWORK_CLASSES_ACTIONTRIGGERCONTAINER_HXX_ diff --git a/framework/inc/classes/actiontriggerpropertyset.hxx b/framework/inc/classes/actiontriggerpropertyset.hxx index 020aafddf254..203fa6eb67eb 100644 --- a/framework/inc/classes/actiontriggerpropertyset.hxx +++ b/framework/inc/classes/actiontriggerpropertyset.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,11 +48,11 @@ namespace framework { -class ActionTriggerPropertySet : public ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. - public ::com::sun::star::lang::XServiceInfo , +class ActionTriggerPropertySet : public ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. + public ::com::sun::star::lang::XServiceInfo , public ::com::sun::star::lang::XTypeProvider, - public ::cppu::OBroadcastHelper , - public ::cppu::OPropertySetHelper , // -> XPropertySet, XFastPropertySet, XMultiPropertySet + public ::cppu::OBroadcastHelper , + public ::cppu::OPropertySetHelper , // -> XPropertySet, XFastPropertySet, XMultiPropertySet public ::cppu::OWeakObject { public: @@ -60,7 +60,7 @@ class ActionTriggerPropertySet : public ThreadHelpBase , // Struct for righ virtual ~ActionTriggerPropertySet(); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL acquire() throw (); virtual void SAL_CALL release() throw (); @@ -76,49 +76,49 @@ class ActionTriggerPropertySet : public ThreadHelpBase , // Struct for righ private: //--------------------------------------------------------------------------------------------------------- - // OPropertySetHelper + // OPropertySetHelper //--------------------------------------------------------------------------------------------------------- - virtual sal_Bool SAL_CALL convertFastPropertyValue( com::sun::star::uno::Any& aConvertedValue, - com::sun::star::uno::Any& aOldValue, - sal_Int32 nHandle, - const com::sun::star::uno::Any& aValue ) + virtual sal_Bool SAL_CALL convertFastPropertyValue( com::sun::star::uno::Any& aConvertedValue, + com::sun::star::uno::Any& aOldValue, + sal_Int32 nHandle, + const com::sun::star::uno::Any& aValue ) throw( com::sun::star::lang::IllegalArgumentException ); - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const com::sun::star::uno::Any& aValue ) + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const com::sun::star::uno::Any& aValue ) throw( com::sun::star::uno::Exception ); using cppu::OPropertySetHelper::getFastPropertyValue; - virtual void SAL_CALL getFastPropertyValue( com::sun::star::uno::Any& aValue, sal_Int32 nHandle ) const; + virtual void SAL_CALL getFastPropertyValue( com::sun::star::uno::Any& aValue, sal_Int32 nHandle ) const; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); - virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() + virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); static const com::sun::star::uno::Sequence< com::sun::star::beans::Property > impl_getStaticPropertyDescriptor(); //--------------------------------------------------------------------------------------------------------- - // helper + // helper //--------------------------------------------------------------------------------------------------------- - sal_Bool impl_tryToChangeProperty( const rtl::OUString& aCurrentValue , - const com::sun::star::uno::Any& aNewValue , - com::sun::star::uno::Any& aOldValue , - com::sun::star::uno::Any& aConvertedValue ) throw( com::sun::star::lang::IllegalArgumentException ); + sal_Bool impl_tryToChangeProperty( const rtl::OUString& aCurrentValue , + const com::sun::star::uno::Any& aNewValue , + com::sun::star::uno::Any& aOldValue , + com::sun::star::uno::Any& aConvertedValue ) throw( com::sun::star::lang::IllegalArgumentException ); - sal_Bool impl_tryToChangeProperty( const com::sun::star::uno::Reference< com::sun::star::awt::XBitmap > xBitmap, - const com::sun::star::uno::Any& aNewValue , - com::sun::star::uno::Any& aOldValue , - com::sun::star::uno::Any& aConvertedValue ) throw( com::sun::star::lang::IllegalArgumentException ); + sal_Bool impl_tryToChangeProperty( const com::sun::star::uno::Reference< com::sun::star::awt::XBitmap > xBitmap, + const com::sun::star::uno::Any& aNewValue , + com::sun::star::uno::Any& aOldValue , + com::sun::star::uno::Any& aConvertedValue ) throw( com::sun::star::lang::IllegalArgumentException ); - sal_Bool impl_tryToChangeProperty( const com::sun::star::uno::Reference< com::sun::star::uno::XInterface > xInterface, - const com::sun::star::uno::Any& aNewValue , - com::sun::star::uno::Any& aOldValue , - com::sun::star::uno::Any& aConvertedValue ) throw( com::sun::star::lang::IllegalArgumentException ); + sal_Bool impl_tryToChangeProperty( const com::sun::star::uno::Reference< com::sun::star::uno::XInterface > xInterface, + const com::sun::star::uno::Any& aNewValue , + com::sun::star::uno::Any& aOldValue , + com::sun::star::uno::Any& aConvertedValue ) throw( com::sun::star::lang::IllegalArgumentException ); //--------------------------------------------------------------------------------------------------------- - // members + // members //--------------------------------------------------------------------------------------------------------- rtl::OUString m_aCommandURL; diff --git a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx index ce85a5d527c3..7cb1488c1112 100644 --- a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx +++ b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,17 +38,17 @@ #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> -#define SERVICENAME_ACTIONTRIGGERSEPARATOR "com.sun.star.ui.ActionTriggerSeparator" -#define IMPLEMENTATIONNAME_ACTIONTRIGGERSEPARATOR "com.sun.star.comp.ui.ActionTriggerSeparator" +#define SERVICENAME_ACTIONTRIGGERSEPARATOR "com.sun.star.ui.ActionTriggerSeparator" +#define IMPLEMENTATIONNAME_ACTIONTRIGGERSEPARATOR "com.sun.star.comp.ui.ActionTriggerSeparator" namespace framework { -class ActionTriggerSeparatorPropertySet : public ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. - public ::com::sun::star::lang::XServiceInfo , +class ActionTriggerSeparatorPropertySet : public ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. + public ::com::sun::star::lang::XServiceInfo , public ::com::sun::star::lang::XTypeProvider, - public ::cppu::OBroadcastHelper , - public ::cppu::OPropertySetHelper , // -> XPropertySet, XFastPropertySet, XMultiPropertySet + public ::cppu::OBroadcastHelper , + public ::cppu::OPropertySetHelper , // -> XPropertySet, XFastPropertySet, XMultiPropertySet public ::cppu::OWeakObject { public: @@ -56,7 +56,7 @@ class ActionTriggerSeparatorPropertySet : public ThreadHelpBase , // Struct virtual ~ActionTriggerSeparatorPropertySet(); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL acquire() throw (); virtual void SAL_CALL release() throw (); @@ -72,42 +72,42 @@ class ActionTriggerSeparatorPropertySet : public ThreadHelpBase , // Struct private: //--------------------------------------------------------------------------------------------------------- - // OPropertySetHelper + // OPropertySetHelper //--------------------------------------------------------------------------------------------------------- - virtual sal_Bool SAL_CALL convertFastPropertyValue( com::sun::star::uno::Any& aConvertedValue, - com::sun::star::uno::Any& aOldValue, - sal_Int32 nHandle, - const com::sun::star::uno::Any& aValue ) + virtual sal_Bool SAL_CALL convertFastPropertyValue( com::sun::star::uno::Any& aConvertedValue, + com::sun::star::uno::Any& aOldValue, + sal_Int32 nHandle, + const com::sun::star::uno::Any& aValue ) throw( com::sun::star::lang::IllegalArgumentException ); - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const com::sun::star::uno::Any& aValue ) + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const com::sun::star::uno::Any& aValue ) throw( com::sun::star::uno::Exception ); using cppu::OPropertySetHelper::getFastPropertyValue; - virtual void SAL_CALL getFastPropertyValue( com::sun::star::uno::Any& aValue, sal_Int32 nHandle ) const; + virtual void SAL_CALL getFastPropertyValue( com::sun::star::uno::Any& aValue, sal_Int32 nHandle ) const; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); - virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() + virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); static const com::sun::star::uno::Sequence< com::sun::star::beans::Property > impl_getStaticPropertyDescriptor(); //--------------------------------------------------------------------------------------------------------- - // helper + // helper //--------------------------------------------------------------------------------------------------------- - sal_Bool impl_tryToChangeProperty( sal_Int16 aCurrentValue , - const com::sun::star::uno::Any& aNewValue , - com::sun::star::uno::Any& aOldValue , - com::sun::star::uno::Any& aConvertedValue ) throw( com::sun::star::lang::IllegalArgumentException ); + sal_Bool impl_tryToChangeProperty( sal_Int16 aCurrentValue , + const com::sun::star::uno::Any& aNewValue , + com::sun::star::uno::Any& aOldValue , + com::sun::star::uno::Any& aConvertedValue ) throw( com::sun::star::lang::IllegalArgumentException ); //--------------------------------------------------------------------------------------------------------- - // members + // members //--------------------------------------------------------------------------------------------------------- - sal_Int16 m_nSeparatorType; + sal_Int16 m_nSeparatorType; }; } diff --git a/framework/inc/classes/addonmenu.hxx b/framework/inc/classes/addonmenu.hxx index c02b7822eba5..4bc5bb8f5990 100644 --- a/framework/inc/classes/addonmenu.hxx +++ b/framework/inc/classes/addonmenu.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,7 +28,7 @@ #define __FRAMEWORK_CLASSES_ADDONMENU_HXX_ //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/frame/XFrame.hpp> @@ -36,7 +36,7 @@ #include <com/sun/star/uno/Sequence.hxx> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <vcl/menu.hxx> @@ -62,21 +62,21 @@ class AddonPopupMenu : public AddonMenu { public: ~AddonPopupMenu(); - + // Check if command URL string has the unique prefix to identify addon popup menus - static sal_Bool IsCommandURLPrefix( const rtl::OUString& aCmdURL ); - + static sal_Bool IsCommandURLPrefix( const rtl::OUString& aCmdURL ); + void SetCommandURL( const rtl::OUString& aCmdURL ) { m_aCommandURL = aCmdURL; } const rtl::OUString& GetCommandURL() const { return m_aCommandURL; } protected: - void Initialize( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rAddonPopupMenuDefinition ); - + void Initialize( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rAddonPopupMenuDefinition ); + private: AddonPopupMenu( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame ); rtl::OUString m_aCommandURL; - + friend class AddonMenuManager; }; @@ -91,37 +91,37 @@ class AddonMenuManager static sal_Bool HasAddonMenuElements(); static sal_Bool HasAddonHelpMenuElements(); - + static sal_Bool IsAddonMenuId( USHORT nId ) { return (( nId >= ADDONMENU_ITEMID_START ) && ( nId < ADDONMENU_ITEMID_END )); } - + // Check if the context string matches the provided xModel context - static sal_Bool IsCorrectContext( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rModel, const rtl::OUString& aContext ); + static sal_Bool IsCorrectContext( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rModel, const rtl::OUString& aContext ); // Factory method to create different Add-On menu types static PopupMenu* CreatePopupMenuType( MenuType eMenuType, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame ); // Create the Add-Ons menu static AddonMenu* CreateAddonMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); - + // Merge the Add-Ons help menu items into the given menu bar at a defined pos - static void MergeAddonHelpMenu( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, + static void MergeAddonHelpMenu( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, MenuBar* pMergeMenuBar ); // Merge the addon popup menus into the given menu bar at the provided pos. static void MergeAddonPopupMenus( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rModel, - USHORT nMergeAtPos, + USHORT nMergeAtPos, MenuBar* pMergeMenuBar ); - + // Returns the next position to insert a menu item/sub menu static USHORT GetNextPos( USHORT nPos ); - + // Build up the menu item and sub menu into the provided pCurrentMenu. The sub menus should be of type nSubMenuType. static void BuildMenu( PopupMenu* pCurrentMenu, MenuType nSubMenuType, USHORT nInsPos, USHORT& nUniqueMenuId, - com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > > aAddonMenuDefinition, + com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > > aAddonMenuDefinition, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rModel ); @@ -132,7 +132,7 @@ class AddonMenuManager ::rtl::OUString& rTarget, ::rtl::OUString& rImageId, ::rtl::OUString& rContext, - com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > >& rAddonSubMenu ); + com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > >& rAddonSubMenu ); }; } // namespace framework diff --git a/framework/inc/classes/addonsoptions.hxx b/framework/inc/classes/addonsoptions.hxx index 040b357add05..1824dd7b3f45 100644 --- a/framework/inc/classes/addonsoptions.hxx +++ b/framework/inc/classes/addonsoptions.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,7 +28,7 @@ #define __FRAMEWORK_CLASSES_ADDONSOPTIONS_HXX_ //_________________________________________________________________________________________________________________ -// includes +// includes //_________________________________________________________________________________________________________________ #include <sal/types.h> @@ -40,11 +40,11 @@ #include <com/sun/star/beans/PropertyValue.hpp> //_________________________________________________________________________________________________________________ -// types, enums, ... +// types, enums, ... //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** - @descr The method GetAddonsMenu() returns a list of property values. + @descr The method GetAddonsMenu() returns a list of property values. Use follow defines to seperate values by names. *//*-*************************************************************************************************************/ #define ADDONSMENUITEM_STRING_URL "URL" @@ -63,18 +63,18 @@ #define ADDONSMENUITEM_CONTEXT_LEN 7 #define ADDONSMENUITEM_IMAGEIDENTIFIER_LEN 15 -#define ADDONSMENUITEM_PROPERTYNAME_URL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_URL )) -#define ADDONSMENUITEM_PROPERTYNAME_TITLE ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_TITLE )) -#define ADDONSMENUITEM_PROPERTYNAME_TARGET ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_TARGET )) -#define ADDONSMENUITEM_PROPERTYNAME_IMAGEIDENTIFIER ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_IMAGEIDENTIFIER )) -#define ADDONSMENUITEM_PROPERTYNAME_CONTEXT ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_CONTEXT )) -#define ADDONSMENUITEM_PROPERTYNAME_SUBMENU ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_SUBMENU )) -#define ADDONSMENUITEM_PROPERTYNAME_CONTROLTYPE ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_CONTROLTYPE )) -#define ADDONSMENUITEM_PROPERTYNAME_WIDTH ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_WIDTH )) +#define ADDONSMENUITEM_PROPERTYNAME_URL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_URL )) +#define ADDONSMENUITEM_PROPERTYNAME_TITLE ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_TITLE )) +#define ADDONSMENUITEM_PROPERTYNAME_TARGET ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_TARGET )) +#define ADDONSMENUITEM_PROPERTYNAME_IMAGEIDENTIFIER ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_IMAGEIDENTIFIER )) +#define ADDONSMENUITEM_PROPERTYNAME_CONTEXT ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_CONTEXT )) +#define ADDONSMENUITEM_PROPERTYNAME_SUBMENU ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_SUBMENU )) +#define ADDONSMENUITEM_PROPERTYNAME_CONTROLTYPE ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_CONTROLTYPE )) +#define ADDONSMENUITEM_PROPERTYNAME_WIDTH ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ADDONSMENUITEM_STRING_WIDTH )) -#define ADDONSPOPUPMENU_URL_PREFIX_STR "private:menu/Addon" +#define ADDONSPOPUPMENU_URL_PREFIX_STR "private:menu/Addon" -#define ADDONSPOPUPMENU_URL_PREFIX ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ADDONSPOPUPMENU_URL_PREFIX_STR )) +#define ADDONSPOPUPMENU_URL_PREFIX ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ADDONSPOPUPMENU_URL_PREFIX_STR )) namespace framework { @@ -106,12 +106,12 @@ struct MergeToolbarInstruction typedef ::std::vector< MergeToolbarInstruction > MergeToolbarInstructionContainer; //_________________________________________________________________________________________________________________ -// forward declarations +// forward declarations //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** - @short forward declaration to our private date container implementation - @descr We use these class as internal member to support small memory requirements. + @short forward declaration to our private date container implementation + @descr We use these class as internal member to support small memory requirements. You can create the container if it is neccessary. The class which use these mechanism is faster and smaller then a complete implementation! *//*-*************************************************************************************************************/ @@ -119,103 +119,103 @@ typedef ::std::vector< MergeToolbarInstruction > MergeToolbarInstructionContaine class AddonsOptions_Impl; //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** - @short collect informations about menu features + @short collect informations about menu features @descr - - @implements - - @base - + @implements - + @base - - @devstatus ready to use + @devstatus ready to use *//*-*************************************************************************************************************/ class AddonsOptions { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: //--------------------------------------------------------------------------------------------------------- - // constructor / destructor + // constructor / destructor //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short standard constructor and destructor - @descr This will initialize an instance with default values. + @short standard constructor and destructor + @descr This will initialize an instance with default values. We implement these class with a refcount mechanism! Every instance of this class increase it at create and decrease it at delete time - but all instances use the same data container! He is implemented as a static member ... - @seealso member m_nRefCount - @seealso member m_pDataContainer + @seealso member m_nRefCount + @seealso member m_pDataContainer - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ AddonsOptions(); ~AddonsOptions(); //--------------------------------------------------------------------------------------------------------- - // interface + // interface //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short clears completely the addons menu + @short clears completely the addons menu @descr Call this methods to clear the addons menu To fill it again use AppendItem(). - @seealso - + @seealso - @param "eMenu" select right menu to clear. - @return - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ void Clear(); /*-****************************************************************************************************//** - @short returns if an addons menu is available + @short returns if an addons menu is available @descr Call to retrieve if a addons menu is available - @return sal_True if there is a menu otherwise sal_False + @return sal_True if there is a menu otherwise sal_False *//*-*****************************************************************************************************/ - sal_Bool HasAddonsMenu() const; - + sal_Bool HasAddonsMenu() const; + /*-****************************************************************************************************//** - @short returns if an addons help menu is available + @short returns if an addons help menu is available @descr Call to retrieve if a addons menu is available - @return sal_True if there is a menu otherwise sal_False + @return sal_True if there is a menu otherwise sal_False *//*-*****************************************************************************************************/ - sal_Bool HasAddonsHelpMenu() const; + sal_Bool HasAddonsHelpMenu() const; /*-****************************************************************************************************//** - @short returns number of addons toolbars + @short returns number of addons toolbars @descr Call to retrieve the number of addons toolbars - @return number of addons toolbars + @return number of addons toolbars *//*-*****************************************************************************************************/ sal_Int32 GetAddonsToolBarCount() const ; - + /*-****************************************************************************************************//** @short returns the complete addons menu @descr Call it to get all entries of the addon menu. We return a list of all nodes with his names and properties. - @seealso - + @seealso - @return A list of menu items is returned. @@ -223,12 +223,12 @@ class AddonsOptions *//*-*****************************************************************************************************/ const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& GetAddonsMenu() const; - + /*-****************************************************************************************************//** - @short Gets the menu bar part of all addon components registered + @short Gets the menu bar part of all addon components registered @descr - - @seealso - + @seealso - @return A complete @@ -241,7 +241,7 @@ class AddonsOptions @short Gets a toolbar part of an single addon @descr - - @seealso - + @seealso - @return A complete @@ -254,7 +254,7 @@ class AddonsOptions @short Gets a unique toolbar resource name of an single addon @descr - - @seealso - + @seealso - @return A complete @@ -267,32 +267,32 @@ class AddonsOptions @short Retrieves all available merge instructions for the Office menu bar @descr - - @seealso - + @seealso - @return The filled MergeMenuDefinitionContaier @onerror We return sal_False *//*-*****************************************************************************************************/ - + const MergeMenuInstructionContainer& GetMergeMenuInstructions() const; /*-****************************************************************************************************//** @short Retrieves all available merge instructions for a single toolbar @descr - - @seealso - + @seealso - - @return The filled + @return The filled @onerror We return sal_False *//*-*****************************************************************************************************/ bool GetMergeToolbarInstructions( const ::rtl::OUString& rToolbarName, MergeToolbarInstructionContainer& rToolbar ) const; /*-****************************************************************************************************//** - @short Gets the Add-On help menu part of all addon components registered + @short Gets the Add-On help menu part of all addon components registered @descr - - @seealso - + @seealso - @return A complete @@ -304,7 +304,7 @@ class AddonsOptions @short Retrieve an image for a command URL which is defined inside the addon menu configuration @descr Call it to retrieve an image for a command URL which is defined inside the addon menu configuration - @seealso - + @seealso - @return An image which was defined in the configuration for the menu item. The image can be empty no bitmap was defined for the request image properties. @@ -313,45 +313,45 @@ class AddonsOptions *//*-*****************************************************************************************************/ Image GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast, sal_Bool bNoScale ) const; - + Image GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast ) const; //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short return a reference to a static mutex - @descr These class is partially threadsafe (for de-/initialization only). + @short return a reference to a static mutex + @descr These class is partially threadsafe (for de-/initialization only). All access methods are'nt safe! We create a static mutex only for one ime and use at different times. - @seealso - + @seealso - - @param - - @return A reference to a static mutex member. + @param - + @return A reference to a static mutex member. - @onerror - + @onerror - *//*-*****************************************************************************************************/ static ::osl::Mutex& GetOwnStaticMutex(); /*-****************************************************************************************************//** - @short return a reference to a static mutex - @descr These class is partially threadsafe (for de-/initialization only). + @short return a reference to a static mutex + @descr These class is partially threadsafe (for de-/initialization only). All access methods are'nt safe! We create a static mutex only for one ime and use at different times. - @seealso - + @seealso - - @param - - @return A reference to a static mutex member. + @param - + @return A reference to a static mutex member. - @onerror - + @onerror - *//*-*****************************************************************************************************/ DECL_STATIC_LINK( AddonsOptions, Notify, void* ); //------------------------------------------------------------------------------------------------------------- - // private member + // private member //------------------------------------------------------------------------------------------------------------- private: @@ -364,11 +364,11 @@ class AddonsOptions Do it in your source only. */ - static AddonsOptions_Impl* m_pDataContainer ; /// impl. data container as dynamic pointer for smaller memory requirements! - static sal_Int32 m_nRefCount ; /// internal ref count mechanism + static AddonsOptions_Impl* m_pDataContainer ; /// impl. data container as dynamic pointer for smaller memory requirements! + static sal_Int32 m_nRefCount ; /// internal ref count mechanism -}; // class SvtMenuOptions +}; // class SvtMenuOptions } -#endif // #ifndef __FRAMEWORK_CLASSES_ADDONSOPTIONS_HXX_ +#endif // #ifndef __FRAMEWORK_CLASSES_ADDONSOPTIONS_HXX_ diff --git a/framework/inc/classes/bmkmenu.hxx b/framework/inc/classes/bmkmenu.hxx index 5f620a7fbe14..11668d285d69 100644 --- a/framework/inc/classes/bmkmenu.hxx +++ b/framework/inc/classes/bmkmenu.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,13 +29,13 @@ #include "classes/addonmenu.hxx" //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/frame/XFrame.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <vcl/menu.hxx> @@ -54,26 +54,26 @@ class BmkMenu : public AddonMenu { public: enum BmkMenuType - { - BMK_NEWMENU, + { + BMK_NEWMENU, BMK_WIZARDMENU }; - - BmkMenu( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, + + BmkMenu( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, BmkMenuType nType ); ~BmkMenu(); - void Initialize(); // Synchrones Laden der Eintraege + void Initialize(); // Synchrones Laden der Eintraege protected: BmkMenu::BmkMenuType m_nType; - USHORT CreateMenuId(); + USHORT CreateMenuId(); private: - BmkMenu( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, + BmkMenu( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, BmkMenuType, BmkMenu* pRoot ); - BmkMenu_Impl* _pImp; + BmkMenu_Impl* _pImp; }; } // namespace framework diff --git a/framework/inc/classes/checkediterator.hxx b/framework/inc/classes/checkediterator.hxx index a5b5bda11825..7c337b023ba3 100644 --- a/framework/inc/classes/checkediterator.hxx +++ b/framework/inc/classes/checkediterator.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,17 +29,17 @@ #define __FRAMEWORK_CLASSES_CHECKEDITERATOR_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <macros/debug.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <sal/types.h> @@ -48,42 +48,42 @@ #endif //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// exported const +// exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// exported definitions +// exported definitions //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** @short implement a iterator which support 2 end states! - @descr For our search methods we need a "walking" iterator object with special functionality! + @descr For our search methods we need a "walking" iterator object with special functionality! We must check for 3 different states of an iterator - normal position, exact end, after end. It's neccessary to detect if we have not found a entry and must return our default or default already returned and we must break loop! see using in class FilterCache too for further informations! - @Attention If your wish to debug this inline code ... + @Attention If your wish to debug this inline code ... under windows and msdev you can use "set ENVCFLAGS=/Ob0" to do that! - @implements - - @base - + @implements - + @base - - @devstatus ready to use - @threadsafe no + @devstatus ready to use + @threadsafe no *//*-*************************************************************************************************************/ template< class TContainer > class CheckedIterator { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: @@ -93,17 +93,17 @@ class CheckedIterator //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short standard constructor - @descr Set default values on members. + @short standard constructor + @descr Set default values on members. We set it internal to E_UNKNOWN to detect uninitialized instances of this class. If we found one - we know: "We must call initialize first!" - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ inline CheckedIterator() @@ -117,24 +117,24 @@ class CheckedIterator //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short initialize instance with valid container - @descr Set new container at an instance of this class. The other member will set automaticly! + @short initialize instance with valid container + @descr Set new container at an instance of this class. The other member will set automaticly! m_pPosition = first element in container m_eEndState = BEFOREEND - @seealso - + @seealso - @param "rContainer", must be a valid reference to an existing container. - @return - + @return - - @onerror An assertion is thrown. + @onerror An assertion is thrown. *//*-*****************************************************************************************************/ inline void initialize( const TContainer& rContainer ) { // Check incoming parameter. We don't accept all! LOG_ASSERT2( &rContainer==NULL , "CheckedIterator::initialize()", "Invalid parameter detected!" ) - LOG_ASSERT2( m_eEndState!=E_UNKNOWN , "CheckedIterator::initialize()", "Instance already initialized! Don't do it again." ) + LOG_ASSERT2( m_eEndState!=E_UNKNOWN , "CheckedIterator::initialize()", "Instance already initialized! Don't do it again." ) if( m_eEndState == E_UNKNOWN ) { @@ -146,16 +146,16 @@ class CheckedIterator } /*-****************************************************************************************************//** - @short set internal states to E_END - @descr Sometimes we need a "walking" check-iterator which is initialized with the END-state! + @short set internal states to E_END + @descr Sometimes we need a "walking" check-iterator which is initialized with the END-state! We need it to return one default value if no other ones exist ... - @seealso using in class FilterCache! + @seealso using in class FilterCache! - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ inline void setEnd() @@ -165,16 +165,16 @@ class CheckedIterator } /*-****************************************************************************************************//** - @short set internal states to E_AFTEREND - @descr Sometimes we need a "walking" check-iterator which is initialized with AFTEREND-state! + @short set internal states to E_AFTEREND + @descr Sometimes we need a "walking" check-iterator which is initialized with AFTEREND-state! We need it if we don't have a container but must prevent us against further searching! - @seealso using in class FilterCache! + @seealso using in class FilterCache! - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ inline void setAfterEnd() @@ -202,19 +202,19 @@ class CheckedIterator } /*-****************************************************************************************************//** - @short step to next element in container. - @descr If end of container is reached we change our internal "m_eEndState". + @short step to next element in container. + @descr If end of container is reached we change our internal "m_eEndState". If end reached for first time; we set it to E_END; If you step to next element again; we set it to E_AFTEREND. So you have a chance to differ between "exact end" and "after end"! - @seealso method isEnd() - @seealso method isAfterEnd() + @seealso method isEnd() + @seealso method isAfterEnd() - @param - - @return A reference to our changed object himself. + @param - + @return A reference to our changed object himself. - @onerror - + @onerror - *//*-*****************************************************************************************************/ inline CheckedIterator& operator++() @@ -224,7 +224,7 @@ class CheckedIterator // Step to next element if any exist or set our end states. switch( m_eEndState ) { - case E_BEFOREEND: { + case E_BEFOREEND: { ++m_pPosition; // If iterator reaching end ... set right state! if( m_pPosition == m_pContainer->end() ) @@ -233,7 +233,7 @@ class CheckedIterator } } break; - case E_END : { + case E_END : { // Set state only ... iterator already points to end of container! m_eEndState = E_AFTEREND; } @@ -243,15 +243,15 @@ class CheckedIterator } /*-****************************************************************************************************//** - @short return true if internal iterator was not initialized before - @descr These will be true, if use start a new search by using these iterator mechanism! + @short return true if internal iterator was not initialized before + @descr These will be true, if use start a new search by using these iterator mechanism! - @seealso class FilterCache + @seealso class FilterCache - @param - - @return True if internalk state E_UNKNOWN - false otherwise. + @param - + @return True if internalk state E_UNKNOWN - false otherwise. - @onerror - + @onerror - *//*-*****************************************************************************************************/ inline sal_Bool isUninitialized() @@ -260,36 +260,36 @@ class CheckedIterator } /*-****************************************************************************************************//** - @short return true if internal iterator reached end of container - @descr These will be true if you step to the end of internal container. + @short return true if internal iterator reached end of container + @descr These will be true if you step to the end of internal container. - @seealso method isAfterEnd() + @seealso method isAfterEnd() - @param - - @return True if end reached; false otherwise. + @param - + @return True if end reached; false otherwise. - @onerror - + @onerror - *//*-*****************************************************************************************************/ inline sal_Bool isEnd() { // Is true if one end state is set! - return ( - ( m_eEndState == E_END ) || - ( m_eEndState == E_AFTEREND ) + return ( + ( m_eEndState == E_END ) || + ( m_eEndState == E_AFTEREND ) ); } /*-****************************************************************************************************//** - @short return true if you call operator++ again and end already reached - @descr These indicate, that end already reached but you call operator++ again and again! + @short return true if you call operator++ again and end already reached + @descr These indicate, that end already reached but you call operator++ again and again! - @seealso method isEnd() + @seealso method isEnd() - @param - - @return True if end multiple reached; false otherwise. + @param - + @return True if end multiple reached; false otherwise. - @onerror - + @onerror - *//*-*****************************************************************************************************/ inline sal_Bool isAfterEnd() @@ -299,15 +299,15 @@ class CheckedIterator } /*-****************************************************************************************************//** - @short support readonly access to container entry - @descr Use it to get the value of current container item. + @short support readonly access to container entry + @descr Use it to get the value of current container item. - @seealso - + @seealso - - @param - - @return A reference to value of container entry. + @param - + @return A reference to value of container entry. - @onerror - + @onerror - *//*-*****************************************************************************************************/ inline typename TContainer::const_iterator getEntry() @@ -321,7 +321,7 @@ class CheckedIterator } //------------------------------------------------------------------------------------------------------------- - // private member + // private member //------------------------------------------------------------------------------------------------------------- private: @@ -329,9 +329,9 @@ class CheckedIterator // These enum defines our four states for an iterator position in curent container. enum EEndState { - E_UNKNOWN , - E_BEFOREEND , - E_END , + E_UNKNOWN , + E_BEFOREEND , + E_END , E_AFTEREND }; @@ -340,6 +340,6 @@ class CheckedIterator typename TContainer::const_iterator m_pPosition ; // point to actual element in container }; -} // namespace framework +} // namespace framework -#endif // #ifndef __FRAMEWORK_CLASSES_CHECKEDITERATOR_HXX_ +#endif // #ifndef __FRAMEWORK_CLASSES_CHECKEDITERATOR_HXX_ diff --git a/framework/inc/classes/converter.hxx b/framework/inc/classes/converter.hxx index 65c3277c95e3..bd53b127f800 100644 --- a/framework/inc/classes/converter.hxx +++ b/framework/inc/classes/converter.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,18 +29,18 @@ #define __FRAMEWORK_CLASSES_CONVERTER_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <general.h> #include <stdtypes.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Any.hxx> @@ -49,17 +49,17 @@ #include <tools/datetime.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// exported const +// exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// exported definitions +// exported definitions //_________________________________________________________________________________________________________________ class Converter diff --git a/framework/inc/classes/droptargetlistener.hxx b/framework/inc/classes/droptargetlistener.hxx index 6d762042481d..34442c2e2a67 100644 --- a/framework/inc/classes/droptargetlistener.hxx +++ b/framework/inc/classes/droptargetlistener.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,14 +29,14 @@ #define __FRAMEWORK_CLASSES_DROPTARGETLISTENER_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> #include <general.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #ifndef _COM_SUN_STAR_DATATRANSFER_DND_XDROPTARGETELISTENER_HPP_ @@ -45,7 +45,7 @@ #include <com/sun/star/frame/XFrame.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <cppuhelper/implbase1.hxx> diff --git a/framework/inc/classes/filtercache.hxx b/framework/inc/classes/filtercache.hxx index b5f1761f0d07..516c50a1141a 100644 --- a/framework/inc/classes/filtercache.hxx +++ b/framework/inc/classes/filtercache.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ #define __FRAMEWORK_CLASSES_FILTERCACHE_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <classes/filtercachedata.hxx> @@ -49,7 +49,7 @@ #include <queries.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> @@ -60,7 +60,7 @@ #include <com/sun/star/container/NoSuchElementException.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <rtl/ustring.hxx> @@ -71,29 +71,29 @@ #endif //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// exported const +// exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// exported definitions +// exported definitions //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** @short cache for all filter and type information - @descr Frameloader- and filterfactory need some informations about our current registered filters and types. + @descr Frameloader- and filterfactory need some informations about our current registered filters and types. For better performance its neccessary to cache all needed values. - @implements - + @implements - @base ThreadHelpBase TransactionBase - @devstatus ready to use + @devstatus ready to use @threadsafe yes *//*-*************************************************************************************************************/ @@ -103,28 +103,28 @@ class FilterCache : private ThreadHelpBase public: //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: //--------------------------------------------------------------------------------------------------------- - // constructor / destructor + // constructor / destructor //--------------------------------------------------------------------------------------------------------- FilterCache( sal_Int32 nVersion = DEFAULT_FILTERCACHE_VERSION, sal_Int16 nMode = DEFAULT_FILTERCACHE_MODE ); /*-****************************************************************************************************//** - @short standard destructor to delete instance - @descr This will clear the cache if last owner release it. + @short standard destructor to delete instance + @descr This will clear the cache if last owner release it. - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual ~FilterCache(); @@ -132,16 +132,16 @@ class FilterCache : private ThreadHelpBase void flush( DataContainer::ECFGType eType ); /*-****************************************************************************************************//** - @short get the current state of the cache - @descr Call this methods to get information about the state of the current cache. + @short get the current state of the cache + @descr Call this methods to get information about the state of the current cache. - @seealso - + @seealso - - @param - - @return - - @return - + @param - + @return - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ sal_Bool isValidOrRepairable() const; @@ -152,8 +152,8 @@ class FilterCache : private ThreadHelpBase sal_Bool hasContentHandlers () const; /*-****************************************************************************************************//** - @short search routines to find items which match given parameter - @descr Mostly we search for a type first and get all informations about filter, detector and loader + @short search routines to find items which match given parameter + @descr Mostly we search for a type first and get all informations about filter, detector and loader services from the other configuration tables which are registered for this type. These operations support a FindFirst/Next mechanism. If you call search...( ... nStartEntry=0 ... ) we search for @@ -162,18 +162,18 @@ class FilterCache : private ThreadHelpBase DONT'T CHANGE THE VALUE OF "rStartEntry" between two search calls! You can use returned value as parameter for getBy...Name() functions of this implementation too! - @attention returned type name is an internal name + @attention returned type name is an internal name returned filter name is an internal name returned loader name is an implementation name of a service returned detector name is an implementation name of a service - @seealso - + @seealso - @param "sResult", name of found type, filter, ... - @return true, if search was successful, + @return true, if search was successful, false, otherwise. - @onerror We return false. + @onerror We return false. *//*-*****************************************************************************************************/ sal_Bool searchType ( const ::rtl::OUString& sURL , @@ -199,17 +199,17 @@ class FilterCache : private ThreadHelpBase ::rtl::OUString& sResult ) const; /*-****************************************************************************************************//** - @short get all properties of a cache entry by given name - @descr If you need additional informations about our internal cache values + @short get all properties of a cache entry by given name + @descr If you need additional informations about our internal cache values you can use these methods to get a list of all cached config values and subkeys of specified entry. - @seealso - + @seealso - @param "sName", name of suspected entry in cache - @return A structure with valid information if item exists! An empty Any otherwise. + @return A structure with valid information if item exists! An empty Any otherwise. - @onerror We return an empty Any. + @onerror We return an empty Any. *//*-*****************************************************************************************************/ css::uno::Sequence< ::rtl::OUString > getAllTypeNames () const; @@ -240,68 +240,68 @@ class FilterCache : private ThreadHelpBase sal_Bool existsContentHandler ( const ::rtl::OUString& sName ) const; /*-****************************************************************************************************//** - @short support special query modes - @descr Our owner services need sometimes a special mode to query for subsets of our configuration! + @short support special query modes + @descr Our owner services need sometimes a special mode to query for subsets of our configuration! They give us a special query string - we return right values. - @seealso file queries.h - @seealso class FilterFactory - @seealso class FrameLoaderFactory - @seealso class TypeDetection + @seealso file queries.h + @seealso class FilterFactory + @seealso class FrameLoaderFactory + @seealso class TypeDetection @param "sName", name of query - @return A structure with valid information! + @return A structure with valid information! - @onerror We return an empty result set. + @onerror We return an empty result set. *//*-*****************************************************************************************************/ css::uno::Any queryFilters( const ::rtl::OUString& sQuery ) const; /*-****************************************************************************************************//** - @short support registration of elements in current configuration - @descr Use this methods to add or remove items in our configuration files. + @short support registration of elements in current configuration + @descr Use this methods to add or remove items in our configuration files. We use the globale configuration to do that ... in fat office "share/config/registry/..."! *** structure of type properties ********************************************************** - PropertyValue.Name PropertyValue.Value Description + PropertyValue.Name PropertyValue.Value Description --------------------------------------------------------------------------------------- ... *** structure of filter properties ******************************************************** - PropertyValue.Name PropertyValue.Value Description + PropertyValue.Name PropertyValue.Value Description --------------------------------------------------------------------------------------- - "Name" [string] internal name - "Type" [string] registered for these type - "UIName" [string] localized name for UI (valid for current locale at runtime!) - "UINames" [stringlist] assignment of all supported localized names to right locales - "DocumentService" [string] uno servicename of document services - "FilterService" [string] uno servicename of filter implementation - "Flags" [long] describe filter - "UserData" [stringlist] additional user data (format not fixed!) - "FileFormatVersion" [long] version numbher of supported files - "TemplateName" [string] name of template + "Name" [string] internal name + "Type" [string] registered for these type + "UIName" [string] localized name for UI (valid for current locale at runtime!) + "UINames" [stringlist] assignment of all supported localized names to right locales + "DocumentService" [string] uno servicename of document services + "FilterService" [string] uno servicename of filter implementation + "Flags" [long] describe filter + "UserData" [stringlist] additional user data (format not fixed!) + "FileFormatVersion" [long] version numbher of supported files + "TemplateName" [string] name of template *** structure of detector properties ****************************************************** - PropertyValue.Name PropertyValue.Value Description + PropertyValue.Name PropertyValue.Value Description --------------------------------------------------------------------------------------- ... *** structure of loader properties ******************************************************** - PropertyValue.Name PropertyValue.Value Description + PropertyValue.Name PropertyValue.Value Description --------------------------------------------------------------------------------------- ... - @seealso - + @seealso - - @param "sName" , name of type, filter ... - @param "lProperties" , values of new type, filter - @return state of operation as bool + @param "sName" , name of type, filter ... + @param "lProperties" , values of new type, filter + @return state of operation as bool - @onerror We return false then. + @onerror We return false then. *//*-*****************************************************************************************************/ sal_Bool addFilter ( const ::rtl::OUString& sName , @@ -348,79 +348,79 @@ class FilterCache : private ThreadHelpBase sal_Bool validateAndRepairHandler(); //------------------------------------------------------------------------------------------------------------- - // protected methods + // protected methods //------------------------------------------------------------------------------------------------------------- protected: //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: //------------------------------------------------------------------------------------------------------------- - // debug methods + // debug methods //------------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short debug-method to check incoming parameter of some other mehods of this class - @descr The following methods are used to check parameters for other methods + @short debug-method to check incoming parameter of some other mehods of this class + @descr The following methods are used to check parameters for other methods of this class. The return value is used directly for an ASSERT(...). - @seealso ASSERT in implementation! + @seealso ASSERT in implementation! - @param references to checking variables - @return sal_False ,on invalid parameter - @return sal_True ,otherwise + @param references to checking variables + @return sal_False ,on invalid parameter + @return sal_True ,otherwise - @onerror - + @onerror - *//*-*****************************************************************************************************/ #ifdef ENABLE_ASSERTIONS private: - static sal_Bool implcp_searchType ( const ::rtl::OUString& sURL , - const ::rtl::OUString* pMediaType , - const ::rtl::OUString* pClipboardFormat , - const CheckedTypeIterator& aStartEntry , - const ::rtl::OUString& sResult ); - static sal_Bool implcp_searchFilterForType ( const ::rtl::OUString& sInternalTypeName , - const CheckedStringListIterator& aStartEntry , - const ::rtl::OUString& sResult ); - static sal_Bool implcp_searchDetectorForType ( const ::rtl::OUString& sInternalTypeName , - const CheckedStringListIterator& aStartEntry , - const ::rtl::OUString& sResult ); - static sal_Bool implcp_searchLoaderForType ( const ::rtl::OUString& sInternalTypeName , - const CheckedStringListIterator& aStartEntry , - const ::rtl::OUString& sResult ); + static sal_Bool implcp_searchType ( const ::rtl::OUString& sURL , + const ::rtl::OUString* pMediaType , + const ::rtl::OUString* pClipboardFormat , + const CheckedTypeIterator& aStartEntry , + const ::rtl::OUString& sResult ); + static sal_Bool implcp_searchFilterForType ( const ::rtl::OUString& sInternalTypeName , + const CheckedStringListIterator& aStartEntry , + const ::rtl::OUString& sResult ); + static sal_Bool implcp_searchDetectorForType ( const ::rtl::OUString& sInternalTypeName , + const CheckedStringListIterator& aStartEntry , + const ::rtl::OUString& sResult ); + static sal_Bool implcp_searchLoaderForType ( const ::rtl::OUString& sInternalTypeName , + const CheckedStringListIterator& aStartEntry , + const ::rtl::OUString& sResult ); static sal_Bool implcp_searchContentHandlerForType ( const ::rtl::OUString& sInternalTypeName , - const CheckedStringListIterator& aStartEntry , - const ::rtl::OUString& sResult ); - static sal_Bool implcp_getTypeProperties ( const ::rtl::OUString& sName ); - static sal_Bool implcp_getFilterProperties ( const ::rtl::OUString& sName ); - static sal_Bool implcp_getDetectorProperties ( const ::rtl::OUString& sName ); - static sal_Bool implcp_getLoaderProperties ( const ::rtl::OUString& sName ); + const CheckedStringListIterator& aStartEntry , + const ::rtl::OUString& sResult ); + static sal_Bool implcp_getTypeProperties ( const ::rtl::OUString& sName ); + static sal_Bool implcp_getFilterProperties ( const ::rtl::OUString& sName ); + static sal_Bool implcp_getDetectorProperties ( const ::rtl::OUString& sName ); + static sal_Bool implcp_getLoaderProperties ( const ::rtl::OUString& sName ); static sal_Bool implcp_getContentHandlerProperties ( const ::rtl::OUString& sName ); - static sal_Bool implcp_getType ( const ::rtl::OUString& sName ); - static sal_Bool implcp_getFilter ( const ::rtl::OUString& sName ); - static sal_Bool implcp_getDetector ( const ::rtl::OUString& sName ); - static sal_Bool implcp_getLoader ( const ::rtl::OUString& sName ); + static sal_Bool implcp_getType ( const ::rtl::OUString& sName ); + static sal_Bool implcp_getFilter ( const ::rtl::OUString& sName ); + static sal_Bool implcp_getDetector ( const ::rtl::OUString& sName ); + static sal_Bool implcp_getLoader ( const ::rtl::OUString& sName ); static sal_Bool implcp_getContentHandler ( const ::rtl::OUString& sName ); - static sal_Bool implcp_existsType ( const ::rtl::OUString& sName ); - static sal_Bool implcp_existsFilter ( const ::rtl::OUString& sName ); - static sal_Bool implcp_existsDetector ( const ::rtl::OUString& sName ); - static sal_Bool implcp_existsLoader ( const ::rtl::OUString& sName ); + static sal_Bool implcp_existsType ( const ::rtl::OUString& sName ); + static sal_Bool implcp_existsFilter ( const ::rtl::OUString& sName ); + static sal_Bool implcp_existsDetector ( const ::rtl::OUString& sName ); + static sal_Bool implcp_existsLoader ( const ::rtl::OUString& sName ); static sal_Bool implcp_existsContentHandler ( const ::rtl::OUString& sName ); - static sal_Bool implcp_addFilter ( const ::rtl::OUString& sName , - const css::uno::Sequence< css::beans::PropertyValue >& lProperties ); - static sal_Bool implcp_replaceFilter ( const ::rtl::OUString& sName , - const css::uno::Sequence< css::beans::PropertyValue >& lProperties ); - static sal_Bool implcp_removeFilter ( const ::rtl::OUString& sName ); - static sal_Bool implcp_queryFilters ( const ::rtl::OUString& sQuery ); + static sal_Bool implcp_addFilter ( const ::rtl::OUString& sName , + const css::uno::Sequence< css::beans::PropertyValue >& lProperties ); + static sal_Bool implcp_replaceFilter ( const ::rtl::OUString& sName , + const css::uno::Sequence< css::beans::PropertyValue >& lProperties ); + static sal_Bool implcp_removeFilter ( const ::rtl::OUString& sName ); + static sal_Bool implcp_queryFilters ( const ::rtl::OUString& sQuery ); - #endif // #ifdef ENABLE_ASSERTIONS + #endif // #ifdef ENABLE_ASSERTIONS #ifdef ENABLE_COMPONENT_SELF_CHECK @@ -431,7 +431,7 @@ class FilterCache : private ThreadHelpBase #endif // ENABLE_COMPONENT_SELF_CHECK //------------------------------------------------------------------------------------------------------------- - // private variables + // private variables //------------------------------------------------------------------------------------------------------------- private: @@ -440,8 +440,8 @@ class FilterCache : private ThreadHelpBase static sal_Int32 m_nVersion ; static sal_Int16 m_nMode ; -}; // class FilterCache +}; // class FilterCache -} // namespace framework +} // namespace framework -#endif // #ifndef __FRAMEWORK_CLASSES_FILTERCACHE_HXX_ +#endif // #ifndef __FRAMEWORK_CLASSES_FILTERCACHE_HXX_ diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx index 1cb351735b7b..e6ac179fee50 100644 --- a/framework/inc/classes/filtercachedata.hxx +++ b/framework/inc/classes/filtercachedata.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ #include <iterator> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <classes/checkediterator.hxx> #include <classes/wildcard.hxx> @@ -47,7 +47,7 @@ #include <general.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Any.hxx> @@ -58,7 +58,7 @@ #include <com/sun/star/util/XChangesNotifier.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <unotools/configitem.hxx> #include <cppuhelper/weak.hxx> @@ -66,13 +66,13 @@ #include <rtl/logfile.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// exported const +// exported const //_________________________________________________________________________________________________________________ #define PACKAGENAME_TYPEDETECTION_STANDARD DECLARE_ASCII("Office.TypeDetection" ) /// Names of our configuration files. @@ -173,7 +173,7 @@ namespace framework{ #define PROPERTY_UICOMPONENT DECLARE_ASCII("UIComponent" ) //_________________________________________________________________________________________________________________ -// exported definitions +// exported definitions //_________________________________________________________________________________________________________________ enum EModifyState @@ -202,11 +202,11 @@ struct FileType //------------------------------------------------------------------------------------------------------------- public: - inline FileType ( ) { impl_clear(); } - inline FileType ( const FileType& rCopy ) { impl_copy( rCopy ); } - inline ~FileType ( ) { impl_clear(); } - inline FileType& operator= ( const FileType& rCopy ) { return impl_copy( rCopy ); } - inline void free ( ) { impl_clear(); } + inline FileType ( ) { impl_clear(); } + inline FileType ( const FileType& rCopy ) { impl_copy( rCopy ); } + inline ~FileType ( ) { impl_clear(); } + inline FileType& operator= ( const FileType& rCopy ) { return impl_copy( rCopy ); } + inline void free ( ) { impl_clear(); } //------------------------------------------------------------------------------------------------------------- // private methods @@ -216,25 +216,25 @@ struct FileType inline void impl_clear() { bPreferred = sal_False ; - sName = ::rtl::OUString() ; - sMediaType = ::rtl::OUString() ; - sClipboardFormat = ::rtl::OUString() ; - nDocumentIconID = 0 ; - lUINames.free (); + sName = ::rtl::OUString() ; + sMediaType = ::rtl::OUString() ; + sClipboardFormat = ::rtl::OUString() ; + nDocumentIconID = 0 ; + lUINames.free (); lURLPattern.free(); lExtensions.free(); } inline FileType& impl_copy( const FileType& rCopy ) { - bPreferred = rCopy.bPreferred ; - sName = rCopy.sName ; - lUINames = rCopy.lUINames ; - sMediaType = rCopy.sMediaType ; - sClipboardFormat = rCopy.sClipboardFormat; - nDocumentIconID = rCopy.nDocumentIconID ; - lURLPattern = rCopy.lURLPattern ; - lExtensions = rCopy.lExtensions ; + bPreferred = rCopy.bPreferred ; + sName = rCopy.sName ; + lUINames = rCopy.lUINames ; + sMediaType = rCopy.sMediaType ; + sClipboardFormat = rCopy.sClipboardFormat; + nDocumentIconID = rCopy.nDocumentIconID ; + lURLPattern = rCopy.lURLPattern ; + lExtensions = rCopy.lExtensions ; return (*this); } @@ -243,12 +243,12 @@ struct FileType //------------------------------------------------------------------------------------------------------------- public: - sal_Bool bPreferred ; - ::rtl::OUString sName ; + sal_Bool bPreferred ; + ::rtl::OUString sName ; OUStringHash lUINames ; - ::rtl::OUString sMediaType ; - ::rtl::OUString sClipboardFormat ; - sal_Int32 nDocumentIconID ; + ::rtl::OUString sMediaType ; + ::rtl::OUString sClipboardFormat ; + sal_Int32 nDocumentIconID ; OUStringList lURLPattern ; OUStringList lExtensions ; }; @@ -266,11 +266,11 @@ struct Filter //------------------------------------------------------------------------------------------------------------- public: - inline Filter ( ) { impl_clear(); } - inline Filter ( const Filter& rCopy ) { impl_copy( rCopy ); } - inline ~Filter ( ) { impl_clear(); } - inline Filter& operator= ( const Filter& rCopy ) { return impl_copy( rCopy ); } - inline void free ( ) { impl_clear(); } + inline Filter ( ) { impl_clear(); } + inline Filter ( const Filter& rCopy ) { impl_copy( rCopy ); } + inline ~Filter ( ) { impl_clear(); } + inline Filter& operator= ( const Filter& rCopy ) { return impl_copy( rCopy ); } + inline void free ( ) { impl_clear(); } //------------------------------------------------------------------------------------------------------------- // private methods @@ -288,23 +288,23 @@ struct Filter nFlags = 0 ; nFileFormatVersion = 0 ; sTemplateName = ::rtl::OUString(); - lUINames.free (); - lUserData.free (); + lUINames.free (); + lUserData.free (); } inline Filter& impl_copy( const Filter& rCopy ) { nOrder = rCopy.nOrder ; - sName = rCopy.sName ; - sType = rCopy.sType ; - lUINames = rCopy.lUINames ; - sDocumentService = rCopy.sDocumentService ; - sFilterService = rCopy.sFilterService ; + sName = rCopy.sName ; + sType = rCopy.sType ; + lUINames = rCopy.lUINames ; + sDocumentService = rCopy.sDocumentService ; + sFilterService = rCopy.sFilterService ; sUIComponent = rCopy.sUIComponent ; - nFlags = rCopy.nFlags ; - nFileFormatVersion = rCopy.nFileFormatVersion ; - sTemplateName = rCopy.sTemplateName ; - lUserData = rCopy.lUserData ; + nFlags = rCopy.nFlags ; + nFileFormatVersion = rCopy.nFileFormatVersion ; + sTemplateName = rCopy.sTemplateName ; + lUserData = rCopy.lUserData ; return (*this); } @@ -315,15 +315,15 @@ struct Filter sal_Int32 nOrder ; ::rtl::OUString sName ; - ::rtl::OUString sType ; + ::rtl::OUString sType ; OUStringHash lUINames ; - ::rtl::OUString sDocumentService ; - ::rtl::OUString sFilterService ; + ::rtl::OUString sDocumentService ; + ::rtl::OUString sFilterService ; ::rtl::OUString sUIComponent ; - sal_Int32 nFlags ; + sal_Int32 nFlags ; OUStringList lUserData ; - sal_Int32 nFileFormatVersion ; - ::rtl::OUString sTemplateName ; + sal_Int32 nFileFormatVersion ; + ::rtl::OUString sTemplateName ; }; //***************************************************************************************************************** @@ -338,11 +338,11 @@ struct Detector //------------------------------------------------------------------------------------------------------------- public: - inline Detector ( ) { impl_clear(); } - inline Detector ( const Detector& rCopy ) { impl_copy( rCopy ); } - inline ~Detector ( ) { impl_clear(); } - inline Detector& operator= ( const Detector& rCopy ) { return impl_copy( rCopy ); } - inline void free ( ) { impl_clear(); } + inline Detector ( ) { impl_clear(); } + inline Detector ( const Detector& rCopy ) { impl_copy( rCopy ); } + inline ~Detector ( ) { impl_clear(); } + inline Detector& operator= ( const Detector& rCopy ) { return impl_copy( rCopy ); } + inline void free ( ) { impl_clear(); } //------------------------------------------------------------------------------------------------------------- // private methods @@ -383,11 +383,11 @@ struct Loader //------------------------------------------------------------------------------------------------------------- public: - inline Loader ( ) { impl_clear(); } - inline Loader ( const Loader& rCopy ) { impl_copy( rCopy ); } - inline ~Loader ( ) { impl_clear(); } - inline Loader& operator= ( const Loader& rCopy ) { return impl_copy( rCopy ); } - inline void free ( ) { impl_clear(); } + inline Loader ( ) { impl_clear(); } + inline Loader ( const Loader& rCopy ) { impl_copy( rCopy ); } + inline ~Loader ( ) { impl_clear(); } + inline Loader& operator= ( const Loader& rCopy ) { return impl_copy( rCopy ); } + inline void free ( ) { impl_clear(); } //------------------------------------------------------------------------------------------------------------- // private methods @@ -397,15 +397,15 @@ struct Loader inline void impl_clear() { sName = ::rtl::OUString(); - lUINames.free (); - lTypes.free (); + lUINames.free (); + lTypes.free (); } inline Loader& impl_copy( const Loader& rCopy ) { sName = rCopy.sName ; - lUINames = rCopy.lUINames ; - lTypes = rCopy.lTypes ; + lUINames = rCopy.lUINames ; + lTypes = rCopy.lTypes ; return (*this); } @@ -414,7 +414,7 @@ struct Loader //------------------------------------------------------------------------------------------------------------- public: - ::rtl::OUString sName ; + ::rtl::OUString sName ; OUStringHash lUINames ; OUStringList lTypes ; }; @@ -513,7 +513,7 @@ class SetNodeHash : public ::std::hash_map< ::rtl::OUString , class PerformanceHash : public ::std::hash_map< ::rtl::OUString , OUStringList , OUStringHashCode , - ::std::equal_to< ::rtl::OUString > > + ::std::equal_to< ::rtl::OUString > > { public: //--------------------------------------------------------------------------------------------------------- @@ -718,10 +718,10 @@ class DataContainer : private ThreadHelpBase After successfuly calling of read(), we can use filled container directly or merge it with an existing one. After successfuly calling of write() all values of given data container are flushed to our configuration. - @implements - + @implements - @base ConfigItem - @devstatus ready to use + @devstatus ready to use @threadsafe no *//*-*************************************************************************************************************/ class FilterCFGAccess : public ::utl::ConfigItem diff --git a/framework/inc/classes/framecontainer.hxx b/framework/inc/classes/framecontainer.hxx index db8fe774dbb1..bd3aee81694b 100644 --- a/framework/inc/classes/framecontainer.hxx +++ b/framework/inc/classes/framecontainer.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ #include <algorithm> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> @@ -47,14 +47,14 @@ #include <general.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XDesktop.hpp> #include <com/sun/star/uno/Reference.hxx> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/weakref.hxx> #include <vos/ref.hxx> @@ -62,22 +62,22 @@ #include <vcl/evntpost.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// exported const +// exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// exported definitions +// exported definitions //_________________________________________________________________________________________________________________ -typedef ::std::vector< css::uno::Reference< css::frame::XFrame > > TFrameContainer ; -typedef TFrameContainer::iterator TFrameIterator ; -typedef TFrameContainer::const_iterator TConstFrameIterator ; +typedef ::std::vector< css::uno::Reference< css::frame::XFrame > > TFrameContainer ; +typedef TFrameContainer::iterator TFrameIterator ; +typedef TFrameContainer::const_iterator TConstFrameIterator ; /*-************************************************************************************************************//** @short implement a container to hold childs of frame, task or desktop @@ -90,8 +90,8 @@ typedef TFrameContainer::const_iterator TConstFrameIterator ; @base ThreadHelpBase guarantee right initialized lock member during boostrap! - @devstatus ready to use - @threadsafe yes + @devstatus ready to use + @threadsafe yes @modified 01.07.2002 14:39, as96863 *//*-*************************************************************************************************************/ class FrameContainer : private ThreadHelpBase diff --git a/framework/inc/classes/framelistanalyzer.hxx b/framework/inc/classes/framelistanalyzer.hxx index 77f7328b20ab..4ab3c4532cdc 100644 --- a/framework/inc/classes/framelistanalyzer.hxx +++ b/framework/inc/classes/framelistanalyzer.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,22 +29,22 @@ #define __FRAMEWORK_CLASSES_FRAMELISTANALYZER_HXX_ //_______________________________________________ -// interface includes +// interface includes #include <com/sun/star/frame/XFrame.hpp> //_______________________________________________ -// other includes +// other includes //_______________________________________________ -// namespace +// namespace namespace framework{ //_______________________________________________ -// exported const +// exported const //_______________________________________________ -// exported definitions +// exported definitions /** analyze and split the current available frame list of a given frames supplier into different parts. diff --git a/framework/inc/classes/fwkresid.hxx b/framework/inc/classes/fwkresid.hxx index 50c69f9ac13b..c18eef0d77c3 100644 --- a/framework/inc/classes/fwkresid.hxx +++ b/framework/inc/classes/fwkresid.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,8 +37,8 @@ class FwkResId : public ResId { public: FwkResId( USHORT nId ); - - static ResMgr* GetResManager(); + + static ResMgr* GetResManager(); }; } diff --git a/framework/inc/classes/fwktabwindow.hxx b/framework/inc/classes/fwktabwindow.hxx index 346f3d3fefc1..3371fc6bf826 100644 --- a/framework/inc/classes/fwktabwindow.hxx +++ b/framework/inc/classes/fwktabwindow.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -80,7 +80,7 @@ public: virtual void ActivatePage(); virtual void DeactivatePage(); - virtual void Resize(); + virtual void Resize(); }; struct TabEntry diff --git a/framework/inc/classes/fwlresid.hxx b/framework/inc/classes/fwlresid.hxx index 1710989484a0..cd82d4521b21 100755 --- a/framework/inc/classes/fwlresid.hxx +++ b/framework/inc/classes/fwlresid.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,8 +37,8 @@ class FwlResId : public ResId { public: FwlResId( USHORT nId ); - - static ResMgr* GetResManager(); + + static ResMgr* GetResManager(); }; } diff --git a/framework/inc/classes/imagewrapper.hxx b/framework/inc/classes/imagewrapper.hxx index 57c4515124c2..fe4c9f5c9641 100644 --- a/framework/inc/classes/imagewrapper.hxx +++ b/framework/inc/classes/imagewrapper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ namespace framework { -class ImageWrapper : public ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. +class ImageWrapper : public ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. public ::cppu::WeakImplHelper2< ::com::sun::star::awt::XBitmap, ::com::sun::star::lang::XUnoTunnel > { @@ -46,23 +46,23 @@ class ImageWrapper : public ThreadHelpBase , // Struct for right initaliza ImageWrapper( const Image& aImage ); virtual ~ImageWrapper(); - const Image& GetImage() const + const Image& GetImage() const { return m_aImage; } static ::com::sun::star::uno::Sequence< sal_Int8 > GetUnoTunnelId(); - + // XBitmap virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getDIB() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getMaskDIB() throw (::com::sun::star::uno::RuntimeException); - + // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw (::com::sun::star::uno::RuntimeException); private: - Image m_aImage; + Image m_aImage; }; } diff --git a/framework/inc/classes/menuextensionsupplier.hxx b/framework/inc/classes/menuextensionsupplier.hxx index eda9f9eb52bf..04fe3352fa31 100644 --- a/framework/inc/classes/menuextensionsupplier.hxx +++ b/framework/inc/classes/menuextensionsupplier.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/inc/classes/menumanager.hxx b/framework/inc/classes/menumanager.hxx index f42284702dc6..8826716f1d6f 100644 --- a/framework/inc/classes/menumanager.hxx +++ b/framework/inc/classes/menumanager.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ #include <vector> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XDispatch.hpp> @@ -43,7 +43,7 @@ #include <com/sun/star/util/XURLTransformer.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <rtl/ustring.hxx> #include <vcl/menu.hxx> @@ -55,15 +55,15 @@ // #110897# #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#define REFERENCE ::com::sun::star::uno::Reference -#define XFRAME ::com::sun::star::frame::XFrame -#define XDISPATCH ::com::sun::star::frame::XDispatch -#define XDISPATCHPROVIDER ::com::sun::star::frame::XDispatchProvider -#define XSTATUSLISTENER ::com::sun::star::frame::XStatusListener -#define XEVENTLISTENER ::com::sun::star::lang::XEventListener -#define FEATURSTATEEVENT ::com::sun::star::frame::FeatureStateEvent -#define RUNTIMEEXCEPTION ::com::sun::star::uno::RuntimeException -#define EVENTOBJECT ::com::sun::star::lang::EventObject +#define REFERENCE ::com::sun::star::uno::Reference +#define XFRAME ::com::sun::star::frame::XFrame +#define XDISPATCH ::com::sun::star::frame::XDispatch +#define XDISPATCHPROVIDER ::com::sun::star::frame::XDispatchProvider +#define XSTATUSLISTENER ::com::sun::star::frame::XStatusListener +#define XEVENTLISTENER ::com::sun::star::lang::XEventListener +#define FEATURSTATEEVENT ::com::sun::star::frame::FeatureStateEvent +#define RUNTIMEEXCEPTION ::com::sun::star::uno::RuntimeException +#define EVENTOBJECT ::com::sun::star::lang::EventObject namespace framework { @@ -71,24 +71,24 @@ namespace framework class BmkMenu; class AddonMenu; class AddonPopupMenu; -class MenuManager : public ThreadHelpBase , +class MenuManager : public ThreadHelpBase , public ::cppu::WeakImplHelper1< ::com::sun::star::frame::XStatusListener > { public: // #110897# - MenuManager( + MenuManager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, REFERENCE< XFRAME >& rFrame, Menu* pMenu, sal_Bool bDelete, sal_Bool bDeleteChildren ); #if 0 - MenuManager( + MenuManager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, REFERENCE< XFRAME >& rFrame, - AddonMenu* pAddonMenu, - sal_Bool bDelete, - sal_Bool bDeleteChildren ); + AddonMenu* pAddonMenu, + sal_Bool bDelete, + sal_Bool bDeleteChildren ); #endif virtual ~MenuManager(); @@ -101,9 +101,9 @@ class MenuManager : public ThreadHelpBase , DECL_LINK( Select, Menu * ); - Menu* GetMenu() const { return m_pVCLMenu; } + Menu* GetMenu() const { return m_pVCLMenu; } - void RemoveListener(); + void RemoveListener(); // #110897# const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& getServiceFactory(); @@ -130,33 +130,33 @@ class MenuManager : public ThreadHelpBase , MenuItemHandler( USHORT aItemId, MenuManager* pManager, REFERENCE< XDISPATCH >& rDispatch ) : nItemId( aItemId ), pSubMenuManager( pManager ), xMenuItemDispatch( rDispatch ) {} - USHORT nItemId; - ::rtl::OUString aTargetFrame; - ::rtl::OUString aMenuItemURL; - ::rtl::OUString aFilter; - ::rtl::OUString aPassword; - ::rtl::OUString aTitle; - MenuManager* pSubMenuManager; - REFERENCE< XDISPATCH > xMenuItemDispatch; + USHORT nItemId; + ::rtl::OUString aTargetFrame; + ::rtl::OUString aMenuItemURL; + ::rtl::OUString aFilter; + ::rtl::OUString aPassword; + ::rtl::OUString aTitle; + MenuManager* pSubMenuManager; + REFERENCE< XDISPATCH > xMenuItemDispatch; }; - void CreatePicklistArguments( + void CreatePicklistArguments( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgsList, const MenuItemHandler* ); MenuItemHandler* GetMenuItemHandler( USHORT nItemId ); - sal_Bool m_bInitialized; - sal_Bool m_bDeleteMenu; - 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; - REFERENCE< XFRAME > m_xFrame; - ::std::vector< MenuItemHandler* > m_aMenuItemHandlerVector; + sal_Bool m_bInitialized; + sal_Bool m_bDeleteMenu; + 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; + REFERENCE< XFRAME > m_xFrame; + ::std::vector< MenuItemHandler* > m_aMenuItemHandlerVector; // #110897# const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& mxServiceFactory; diff --git a/framework/inc/classes/propertysethelper.hxx b/framework/inc/classes/propertysethelper.hxx index a5de798d77cc..f1c5648470b9 100644 --- a/framework/inc/classes/propertysethelper.hxx +++ b/framework/inc/classes/propertysethelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_CLASSES_PROPERTYSETHELPER_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes #include <threadhelp/threadhelpbase.hxx> #include <threadhelp/transactionbase.hxx> @@ -38,7 +38,7 @@ #include <stdtypes.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertySetInfo.hpp> @@ -46,12 +46,12 @@ #include <com/sun/star/beans/UnknownPropertyException.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes #include <cppuhelper/weakref.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace namespace framework{ diff --git a/framework/inc/classes/protocolhandlercache.hxx b/framework/inc/classes/protocolhandlercache.hxx index d28b79bdd289..77c4ca6a7f93 100644 --- a/framework/inc/classes/protocolhandlercache.hxx +++ b/framework/inc/classes/protocolhandlercache.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_CLASSES_PROTOCOLHANDLERCACHE_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <general.h> @@ -37,25 +37,25 @@ #include <macros/debug.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/util/URL.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <unotools/configitem.hxx> #include <rtl/ustring.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// exported const +// exported const //_________________________________________________________________________________________________________________ #define PACKAGENAME_PROTOCOLHANDLER DECLARE_ASCII("Office.ProtocolHandler" ) /// name of our configuration package @@ -126,7 +126,7 @@ typedef BaseHash< ProtocolHandler > HandlerHash; Because to safe access on static member we must use a static global lock here too. - @devstatus ready to use + @devstatus ready to use @threadsafe yes @modified 30.04.2002 11:19, as96863 @@ -156,7 +156,7 @@ class HandlerCache sal_Bool search( const ::rtl::OUString& sURL, ProtocolHandler* pReturn ) const; sal_Bool search( const css::util::URL& aURL, ProtocolHandler* pReturn ) const; sal_Bool exists( const ::rtl::OUString& sURL ) const; - + void takeOver(HandlerHash* pHandler, PatternHash* pPattern); }; @@ -173,7 +173,7 @@ class HandlerCache @base ::utl::ConfigItem base mechanism for configuration access - @devstatus ready to use + @devstatus ready to use @threadsafe no @modified 30.04.2002 09:58, as96863 diff --git a/framework/inc/classes/resource.hrc b/framework/inc/classes/resource.hrc index 5929b8b34822..8c9bd2e854b0 100644 --- a/framework/inc/classes/resource.hrc +++ b/framework/inc/classes/resource.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,17 +28,17 @@ #ifndef __FRAMEWORK_CLASSES_RESOURCE_HRC_ #define __FRAMEWORK_CLASSES_RESOURCE_HRC_ -#define RID_STR_START 2000 +#define RID_STR_START 2000 #define RID_MENU_START 10000 #define RID_IMAGE_START 15000 #define RID_FWK_DIALOG_START 0 -#define STR_MENU_ADDONS (RID_STR_START+0) -#define STR_MENU_ADDONHELP (RID_STR_START+1) +#define STR_MENU_ADDONS (RID_STR_START+0) +#define STR_MENU_ADDONHELP (RID_STR_START+1) #define STR_MENU_HEADFOOTALL (RID_STR_START+2) #define STR_UPDATEDOC (RID_STR_START+3) #define STR_CLOSEDOC_ANDRETURN (RID_STR_START+4) -#define STR_SAVECOPYDOC (RID_STR_START+5) +#define STR_SAVECOPYDOC (RID_STR_START+5) #define STR_NODOCUMENT (RID_STR_START+6) #define STR_TOOLBAR_TITLE_ADDON (RID_STR_START+7) #define STR_STATUSBAR_LOGOTEXT (RID_STR_START+8) diff --git a/framework/inc/classes/rootactiontriggercontainer.hxx b/framework/inc/classes/rootactiontriggercontainer.hxx index 5c11f41c9fe7..5d7a820983f7 100644 --- a/framework/inc/classes/rootactiontriggercontainer.hxx +++ b/framework/inc/classes/rootactiontriggercontainer.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,13 +36,13 @@ #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> -#define IMPLEMENTATIONNAME_ROOTACTIONTRIGGERCONTAINER "com.sun.star.comp.ui.RootActionTriggerContainer" +#define IMPLEMENTATIONNAME_ROOTACTIONTRIGGERCONTAINER "com.sun.star.comp.ui.RootActionTriggerContainer" namespace framework { -class RootActionTriggerContainer : public PropertySetContainer, +class RootActionTriggerContainer : public PropertySetContainer, public com::sun::star::lang::XMultiServiceFactory, public com::sun::star::lang::XServiceInfo, public com::sun::star::lang::XUnoTunnel, @@ -53,47 +53,47 @@ class RootActionTriggerContainer : public PropertySetContainer, RootActionTriggerContainer( const Menu* pMenu, const ::rtl::OUString* pMenuIdentifier, const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager ); virtual ~RootActionTriggerContainer(); - const Menu* GetMenu(); - + const Menu* GetMenu(); + ::com::sun::star::uno::Sequence< sal_Int8 > GetUnoTunnelId() const; // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL acquire() throw (); virtual void SAL_CALL release() throw (); // XMultiServiceFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier ) + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames() + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames() throw (::com::sun::star::uno::RuntimeException); // XIndexContainer - virtual void SAL_CALL insertByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) + virtual void SAL_CALL insertByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - - virtual void SAL_CALL removeByIndex( sal_Int32 Index ) + + virtual void SAL_CALL removeByIndex( sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XIndexReplace - virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) + virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() + virtual sal_Int32 SAL_CALL getCount() throw (::com::sun::star::uno::RuntimeException); - - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) + + virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() + virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw (::com::sun::star::uno::RuntimeException); - - virtual sal_Bool SAL_CALL hasElements() + + virtual sal_Bool SAL_CALL hasElements() throw (::com::sun::star::uno::RuntimeException); // XServiceInfo @@ -111,17 +111,17 @@ class RootActionTriggerContainer : public PropertySetContainer, // XNamed virtual ::rtl::OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); - + private: void FillContainer(); - sal_Bool m_bContainerCreated; - sal_Bool m_bContainerChanged; - sal_Bool m_bInContainerCreation; - const Menu* m_pMenu; + sal_Bool m_bContainerCreated; + sal_Bool m_bContainerChanged; + sal_Bool m_bInContainerCreation; + const Menu* m_pMenu; const ::rtl::OUString* m_pMenuIdentifier; }; - + } #endif // __FRAMEWORK_CLASSES_ROOTACTIONTRIGGERCONTAINER_HXX_ diff --git a/framework/inc/classes/servicemanager.hxx b/framework/inc/classes/servicemanager.hxx index f4f37efcd9dd..233987768b82 100644 --- a/framework/inc/classes/servicemanager.hxx +++ b/framework/inc/classes/servicemanager.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,252 +29,252 @@ #define __FRAMEWORK_CLASSES_SERVICEMANAGER_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <macros/debug.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XMultiServiceFactory.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <com/sun/star/uno/Reference.hxx> #include <rtl/ustring.hxx> #include <osl/mutex.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ -#define REFERENCE ::com::sun::star::uno::Reference -#define XMULTISERVICEFACTORY ::com::sun::star::lang::XMultiServiceFactory -#define OUSTRING ::rtl::OUString -#define MUTEX ::osl::Mutex +#define REFERENCE ::com::sun::star::uno::Reference +#define XMULTISERVICEFACTORY ::com::sun::star::lang::XMultiServiceFactory +#define OUSTRING ::rtl::OUString +#define MUTEX ::osl::Mutex //_________________________________________________________________________________________________________________ -// exported const +// exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// exported definitions +// exported definitions //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** - @short create a new global servicemanager - @descr A global servicemanager is neccessary to instanciate UNO-services. To do this, you need + @short create a new global servicemanager + @descr A global servicemanager is neccessary to instanciate UNO-services. To do this, you need a factory to create new objects with special type. That's the reason for a servicemanager. - @implements - + @implements - @base - - @devstatus ready to use + @devstatus ready to use *//*-*************************************************************************************************************/ class ServiceManager { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: //--------------------------------------------------------------------------------------------------------- - // constructor / destructor + // constructor / destructor //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short standard constructor - @descr This method don't initialize the new global servicemanager! + @short standard constructor + @descr This method don't initialize the new global servicemanager! But we increase an internal ref count. These is needed in dtor to release all created static references to created service mamanger! - @seealso dtor + @seealso dtor - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ ServiceManager(); /*-****************************************************************************************************//** - @short standard destructor to delete instance - @descr Here is a good place to destroy the global manager instances! + @short standard destructor to delete instance + @descr Here is a good place to destroy the global manager instances! - @seealso ctor + @seealso ctor - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual ~ServiceManager(); /*-****************************************************************************************************//** - @short initialize global uno service manager and return it - @descr This method create a new manager only at first call. We confiscate this with a static + @short initialize global uno service manager and return it + @descr This method create a new manager only at first call. We confiscate this with a static pointer, which will be initialized only, if it NULL! Then you can call this method everytime to get a reference to the manager. If you will initialize an uno application you must set returned reference in ::comphelper::setProcessServiceFactory()! The created manager use "applicat.rdb" and "userXX.rdb" automaticly. - @seealso - + @seealso - - @param - - @return A reference to the global servicemanager. It can be NULL! + @param - + @return A reference to the global servicemanager. It can be NULL! - @onerror We return a null-reference. + @onerror We return a null-reference. *//*-*****************************************************************************************************/ REFERENCE< XMULTISERVICEFACTORY > getGlobalUNOServiceManager(); /*-****************************************************************************************************//** - @short initialize global uno service manager and return it - @descr Do the same like getGlobalUNOServiceManager() before, but use "applicat.rdb" only! + @short initialize global uno service manager and return it + @descr Do the same like getGlobalUNOServiceManager() before, but use "applicat.rdb" only! - @seealso - + @seealso - - @param - - @return A reference to the global servicemanager. It can be NULL! + @param - + @return A reference to the global servicemanager. It can be NULL! - @onerror We return a null-reference. + @onerror We return a null-reference. *//*-*****************************************************************************************************/ REFERENCE< XMULTISERVICEFACTORY > getSimpleGlobalUNOServiceManager(); /*-****************************************************************************************************//** - @short return a reference to a uno servicemanager instance which use your specified user registry file - @descr This do the same like method before - but instead of "userXX.rdb" we use your file. + @short return a reference to a uno servicemanager instance which use your specified user registry file + @descr This do the same like method before - but instead of "userXX.rdb" we use your file. These is neccessary, if you will run more then one uno application at the same time in same environment! All created servicemanager use the same "applicat.rdb" but different user registries. - @ATTENTION Given file name must be a full qualified system file name. If file not already exist we create a new one! + @ATTENTION Given file name must be a full qualified system file name. If file not already exist we create a new one! "applicat.rdb", "userXX.rdb" are not valid values! - @seealso method generateGlobalUNOServiceManager() - @seealso method generatePrivateUNOServiceManager() + @seealso method generateGlobalUNOServiceManager() + @seealso method generatePrivateUNOServiceManager() - @param "sUserRegistryFile", full qualified system file name of user registry - @return A reference to the created servicemanager. It can be NULL! + @param "sUserRegistryFile", full qualified system file name of user registry + @return A reference to the created servicemanager. It can be NULL! - @onerror We return a null-reference. + @onerror We return a null-reference. *//*-*****************************************************************************************************/ REFERENCE< XMULTISERVICEFACTORY > getSharedUNOServiceManager( const OUSTRING& sUserRegistryFile ); /*-****************************************************************************************************//** - @short return a reference to a uno servicemanager instance which use your specified user registry file only - @descr This do the same like methods before - but use your file as the only one registry. + @short return a reference to a uno servicemanager instance which use your specified user registry file only + @descr This do the same like methods before - but use your file as the only one registry. "applicat.rdb" is used here! - @ATTENTION Given file name must be a full qualified system file name. If file not already exist we create a new one! + @ATTENTION Given file name must be a full qualified system file name. If file not already exist we create a new one! "applicat.rdb", "userXX.rdb" are not valid values! If file was new created - you must register services at runtime himself. Otherwise no service could be created by these manager ... - @seealso method generateGlobalUNOServiceManager() - @seealso method generateSharedUNOServiceManager() + @seealso method generateGlobalUNOServiceManager() + @seealso method generateSharedUNOServiceManager() - @param "sUserRegistryFile", full qualified system file name of user registry - @return A reference to the created servicemanager. It can be NULL! + @param "sUserRegistryFile", full qualified system file name of user registry + @return A reference to the created servicemanager. It can be NULL! - @onerror We return a null-reference. + @onerror We return a null-reference. *//*-*****************************************************************************************************/ REFERENCE< XMULTISERVICEFACTORY > getPrivateUNOServiceManager( const OUSTRING& sUserRegistryFile ); //------------------------------------------------------------------------------------------------------------- - // protected methods + // protected methods //------------------------------------------------------------------------------------------------------------- protected: //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: /*-****************************************************************************************************//** - @short create our own global mutex to prevent us against multithreaded problems - @descr We use some static member. For correct access to it we must use the global osl mutex ... + @short create our own global mutex to prevent us against multithreaded problems + @descr We use some static member. For correct access to it we must use the global osl mutex ... but its not fine to do so! These block ALL other operations, which need these mutex too. That's the reason to create our own static mutex. Only first creation is protected by the global mutex, using isn't it! - @seealso using + @seealso using - @param - - @return reference to created static own global mutex + @param - + @return reference to created static own global mutex - @onerror No error should occure. + @onerror No error should occure. *//*-*****************************************************************************************************/ MUTEX& impl_getOwnGlobalMutex(); /*-****************************************************************************************************//** - @short create a new global servicemanager instance - @descr Is a helper-method for getManager(). + @short create a new global servicemanager instance + @descr Is a helper-method for getManager(). - @seealso method getManager() + @seealso method getManager() - @param "sRegistryFile", file name of user registry. - @return A reference to a new initialized servicemanager with a valid registry. + @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. - @onerror Return a NULL-reference. + @onerror Return a NULL-reference. *//*-*****************************************************************************************************/ REFERENCE< XMULTISERVICEFACTORY > impl_createManager( const OUSTRING& sRegistryFile ); //------------------------------------------------------------------------------------------------------------- - // debug methods - // (should be private everyway!) + // debug methods + // (should be private everyway!) //------------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short debug-method to check incoming parameter of some other mehods of this class - @descr The following methods are used to check parameters for other methods + @short debug-method to check incoming parameter of some other mehods of this class + @descr The following methods are used to check parameters for other methods of this class. The return value is used directly for an ASSERT(...). - @seealso ASSERTs in implementation! + @seealso ASSERTs in implementation! - @param references to checking variables - @return sal_False on invalid parameter<BR> + @param references to checking variables + @return sal_False on invalid parameter<BR> sal_True otherway - @onerror - + @onerror - *//*-*****************************************************************************************************/ #ifdef ENABLE_ASSERTIONS private: - #endif // #ifdef ENABLE_ASSERTIONS + #endif // #ifdef ENABLE_ASSERTIONS //------------------------------------------------------------------------------------------------------------- - // private variables - // (should be private everyway!) + // private variables + // (should be private everyway!) //------------------------------------------------------------------------------------------------------------- private: - static REFERENCE< XMULTISERVICEFACTORY >* m_pGlobalServiceManager ; - static REFERENCE< XMULTISERVICEFACTORY >* m_pSimpleGlobalServiceManager ; - static REFERENCE< XMULTISERVICEFACTORY >* m_pSharedServiceManager ; - static REFERENCE< XMULTISERVICEFACTORY >* m_pPrivateServiceManager ; - static sal_Int32 m_nRefCount ; + static REFERENCE< XMULTISERVICEFACTORY >* m_pGlobalServiceManager ; + static REFERENCE< XMULTISERVICEFACTORY >* m_pSimpleGlobalServiceManager ; + static REFERENCE< XMULTISERVICEFACTORY >* m_pSharedServiceManager ; + static REFERENCE< XMULTISERVICEFACTORY >* m_pPrivateServiceManager ; + static sal_Int32 m_nRefCount ; -}; // class ServiceManager +}; // class ServiceManager -} // namespace framework +} // namespace framework -#endif // #ifndef __FRAMEWORK_CLASSES_SERVICEMANAGER_HXX_ +#endif // #ifndef __FRAMEWORK_CLASSES_SERVICEMANAGER_HXX_ diff --git a/framework/inc/classes/sfxhelperfunctions.hxx b/framework/inc/classes/sfxhelperfunctions.hxx index 71194fba9814..ac3fa472f249 100644 --- a/framework/inc/classes/sfxhelperfunctions.hxx +++ b/framework/inc/classes/sfxhelperfunctions.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/inc/classes/taskcreator.hxx b/framework/inc/classes/taskcreator.hxx index fdd98dd2a38a..19c68d6a332c 100644 --- a/framework/inc/classes/taskcreator.hxx +++ b/framework/inc/classes/taskcreator.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_CLASSES_TASKCREATOR_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> @@ -38,29 +38,29 @@ #include <general.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/frame/XFramesSupplier.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <com/sun/star/uno/Reference.hxx> #include <rtl/ustring.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// exported const +// exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// exported definitions +// exported definitions //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** @@ -69,7 +69,7 @@ namespace framework{ Thats the reason for this helper. He capsulate asynchronous/synchronous creation by calling a simple interface. - @devstatus ready to use + @devstatus ready to use @threadsafe yes @modified 20.08.2003 08:37, as96863 *//*-*************************************************************************************************************/ diff --git a/framework/inc/classes/wildcard.hxx b/framework/inc/classes/wildcard.hxx index 8a27a9732d9d..bc4d770a0c1c 100644 --- a/framework/inc/classes/wildcard.hxx +++ b/framework/inc/classes/wildcard.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,145 +29,145 @@ #define __FRAMEWORK_CLASSES_WILDCARD_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <macros/debug.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <rtl/ustring.hxx> //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** - @short implement wildcard-mechanism for unicode - @descr This class can be used to get information about the matching of a pattern to a given text. + @short implement wildcard-mechanism for unicode + @descr This class can be used to get information about the matching of a pattern to a given text. It's suitable for 8-Bit- AND 16-Bit-strings! - @implements - - @base - + @implements - + @base - - @ATTENTION This class is'nt threadsafe! + @ATTENTION This class is'nt threadsafe! - @devstatus deprecated + @devstatus deprecated *//*-*************************************************************************************************************/ class Wildcard { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: //--------------------------------------------------------------------------------------------------------- - // constructor / destructor + // constructor / destructor //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** @short standard ctor - @descr We do nothing here. + @descr We do nothing here. - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ Wildcard(); /*-****************************************************************************************************//** @short standard dtor - @descr We do nothing here. + @descr We do nothing here. - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual ~Wildcard(); //--------------------------------------------------------------------------------------------------------- - // interface + // interface //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** @short try to find an agreement between given text and searchpattern - @descr You can use wildcards in pattern only! + @descr You can use wildcards in pattern only! - @seealso - + @seealso - - @param "sText" is the text, in which we search given pattern. - @param "sPattern" is the searched pattern with includes wildcards. - @return sal_True , if pattern was found. - @return sal_False, if pattern don't match the text. + @param "sText" is the text, in which we search given pattern. + @param "sPattern" is the searched pattern with includes wildcards. + @return sal_True , if pattern was found. + @return sal_False, if pattern don't match the text. - @onerror - + @onerror - *//*-*****************************************************************************************************/ - static sal_Bool match( const ::rtl::OUString& sText , - const ::rtl::OUString& sPattern ); + static sal_Bool match( const ::rtl::OUString& sText , + const ::rtl::OUString& sPattern ); //--------------------------------------------------------------------------------------------------------- - // debug and test methods + // debug and test methods //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short debug-methods to check incoming parameter of some other mehods of this class - @descr The follow methods are used to check parameters for other methods + @short debug-methods to check incoming parameter of some other mehods of this class + @descr The follow methods are used to check parameters for other methods of this class. The return value is used directly for an ASSERT(...). This mechanism is active in debug version only! - @seealso FRAMEWORK_ASSERT in implementation! + @seealso FRAMEWORK_ASSERT in implementation! - @param references to checking variables - @return sal_False on invalid parameter - @return sal_True otherwise + @param references to checking variables + @return sal_False on invalid parameter + @return sal_True otherwise - @onerror - + @onerror - *//*-*****************************************************************************************************/ #ifdef ENABLE_ASSERTIONS - static sal_Bool impldbg_checkParameter_match( const ::rtl::OUString& sText , - const ::rtl::OUString& sPattern ); + static sal_Bool impldbg_checkParameter_match( const ::rtl::OUString& sText , + const ::rtl::OUString& sPattern ); - #endif // #ifdef ENABLE_ASSERTIONS + #endif // #ifdef ENABLE_ASSERTIONS /*-****************************************************************************************************//** @short test implementation of match() with different examples - @descr If TESTMODE activated, you cann call these method to start and log some special examples. + @descr If TESTMODE activated, you cann call these method to start and log some special examples. Do this if you have changed the implementation of method match() to test it. - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror Error-conditions are written to file or show in a messagebox. + @onerror Error-conditions are written to file or show in a messagebox. Thhat depends from current setting of ASSERT_OUTPUTTYPE. (see debug.hxx for further informations.) *//*-*****************************************************************************************************/ @@ -177,8 +177,8 @@ class Wildcard #endif // #ifdef ENABLE_CLASSDEBUG -}; // class Wildcard +}; // class Wildcard -} // namespace framework +} // namespace framework -#endif // #ifndef __FRAMEWORK_CLASSES_WILDCARD_HXX_ +#endif // #ifndef __FRAMEWORK_CLASSES_WILDCARD_HXX_ diff --git a/framework/inc/commands.h b/framework/inc/commands.h index 947f7b10531b..fac23bd26648 100644 --- a/framework/inc/commands.h +++ b/framework/inc/commands.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_COMMANDS_H_ //_________________________________________________________________________________________________________________ -// includes +// includes //_________________________________________________________________________________________________________________ #include <macros/generic.hxx> @@ -37,13 +37,13 @@ #include <rtl/ustring.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ /*-************************************************************************************************************//** - @short These values describe some command line arguments of our office. + @short These values describe some command line arguments of our office. We need it e.g. to detect running mode of it - plugin, headless ... *//*-*************************************************************************************************************/ @@ -51,6 +51,6 @@ namespace framework{ #define COMMAND_HEADLESS DECLARE_ASCII("-headless" ) /// office runs in headless mode for scripting #define COMMAND_INVISIBLE DECLARE_ASCII("-invisible" ) /// office runs in invisible mode which supress splash screen and first empry document #define COMMAND_SERVER DECLARE_ASCII("-server" ) /// office runs as server -} // namespace framework +} // namespace framework -#endif // #ifndef __FRAMEWORK_TARGETS_H_ +#endif // #ifndef __FRAMEWORK_TARGETS_H_ diff --git a/framework/inc/dispatch/basedispatcher.hxx b/framework/inc/dispatch/basedispatcher.hxx index 76c41f97e8f8..0b2f7d547b2e 100644 --- a/framework/inc/dispatch/basedispatcher.hxx +++ b/framework/inc/dispatch/basedispatcher.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_DISPATCH_BASEDISPATCHER_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <classes/taskcreator.hxx> @@ -46,7 +46,7 @@ #include <stdtypes.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/frame/XNotifyingDispatch.hpp> @@ -61,7 +61,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/weak.hxx> #include <cppuhelper/weakref.hxx> @@ -71,17 +71,17 @@ */ //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// exported const +// exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// exported definitions +// exported definitions //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** @@ -242,16 +242,16 @@ class LoaderThreads : private ::std::vector< LoadBinding > "dispatch()" => should be you dispatch algorithm "reactForLoadingState()" => do something depending from loading state ... - @implements XInterface + @implements XInterface XDispatch XLoadEventListener XEventListener - @base ThreadHelpBase + @base ThreadHelpBase TransactionBase OWeakObject - @devstatus ready to use + @devstatus ready to use @threadsafe yes *//*-*************************************************************************************************************/ class BaseDispatcher : // interfaces @@ -265,17 +265,17 @@ class BaseDispatcher : // interfaces public ::cppu::OWeakObject { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: - // constructor / destructor + // constructor / destructor BaseDispatcher( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory , const css::uno::Reference< css::frame::XFrame >& xOwnerFrame ); void dispatchFinished ( const css::frame::DispatchResultEvent& aEvent, const css::uno::Reference < css::frame::XDispatchResultListener >& rListener ); - // XInterface + // XInterface DECLARE_XINTERFACE DECLARE_XTYPEPROVIDER @@ -296,11 +296,11 @@ class BaseDispatcher : // interfaces virtual void SAL_CALL loadFinished ( const css::uno::Reference< css::frame::XFrameLoader >& xLoader ) throw( css::uno::RuntimeException ); virtual void SAL_CALL loadCancelled ( const css::uno::Reference< css::frame::XFrameLoader >& xLoader ) throw( css::uno::RuntimeException ); - // XEventListener + // XEventListener virtual void SAL_CALL disposing ( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException ); //------------------------------------------------------------------------------------------------------------- - // protected methods + // protected methods //------------------------------------------------------------------------------------------------------------- protected: virtual ~BaseDispatcher(); @@ -372,7 +372,7 @@ class BaseDispatcher : // interfaces sal_Bool bLoadState ); //------------------------------------------------------------------------------------------------------------- - // variables + // variables // - should be private normaly ... // - but some super classes need access to some of them => protected! //------------------------------------------------------------------------------------------------------------- @@ -386,6 +386,6 @@ class BaseDispatcher : // interfaces }; // class BaseDispatcher -} // namespace framework +} // namespace framework #endif // #ifndef __FRAMEWORK_DISPATCH_BASEDISPATCHER_HXX_ diff --git a/framework/inc/dispatch/blankdispatcher.hxx b/framework/inc/dispatch/blankdispatcher.hxx index 8586bf0efee7..bd0e5b1d34dd 100644 --- a/framework/inc/dispatch/blankdispatcher.hxx +++ b/framework/inc/dispatch/blankdispatcher.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,39 +29,39 @@ #define __FRAMEWORK_DISPATCH_BLANKDISPATCHER_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <dispatch/basedispatcher.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// exported const +// exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// exported definitions +// exported definitions //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** - @short helper for desktop only(!) to create new tasks on demand for dispatches - @descr Use this class as member only! Never use it as baseclass. + @short helper for desktop only(!) to create new tasks on demand for dispatches + @descr Use this class as member only! Never use it as baseclass. XInterface will be ambigous and we hold a weakreference to ouer OWNER - not to ouer SUPERCLASS! - @implements XInterface + @implements XInterface XDispatch XStatusListener XLoadEventListener @@ -70,7 +70,7 @@ namespace framework{ @base BaseDispatcher OWeakObject - @devstatus ready to use + @devstatus ready to use @threadsafe yes *//*-*************************************************************************************************************/ class BlankDispatcher : // -interfaces ... are supported by our BaseDispatcher! @@ -78,14 +78,14 @@ class BlankDispatcher : // -interfaces ... are supported by our BaseDispatc public BaseDispatcher { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: // ctor BlankDispatcher ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory , const css::uno::Reference< css::frame::XFrame >& xDesktop, sal_Bool bIsDefaultDispatcher ); - // XDispatch + // XDispatch virtual void SAL_CALL dispatch ( const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException ); @@ -117,13 +117,13 @@ class BlankDispatcher : // -interfaces ... are supported by our BaseDispatc const css::uno::Reference< css::frame::XFrame > xDesktop ); //------------------------------------------------------------------------------------------------------------- - // variables - // (should be private everyway!) + // variables + // (should be private everyway!) //------------------------------------------------------------------------------------------------------------- private: sal_Bool m_bIsDefaultDispatcher; }; // class BlankDispatcher -} // namespace framework +} // namespace framework #endif // #ifndef __FRAMEWORK_DISPATCH_BLANKDISPATCHER_HXX_ diff --git a/framework/inc/dispatch/closedispatcher.hxx b/framework/inc/dispatch/closedispatcher.hxx index 42da0205c8d0..c9de9f311d9b 100644 --- a/framework/inc/dispatch/closedispatcher.hxx +++ b/framework/inc/dispatch/closedispatcher.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -151,7 +151,7 @@ class CloseDispatcher : public css::lang::XTypeProvider @param xFrame the frame where the corresponding dispatch was started. - + @param sTarget help us to find the right target for this close operation. */ @@ -295,7 +295,7 @@ class CloseDispatcher : public css::lang::XTypeProvider //--------------------------------------- /** @short try to find the right target frame where this close request must be realy done. - + @descr The problem behind: closing some resources depends sometimes from the context where its dispatched. Sometimes the start frame of the dispatch has to be closed itself (target=_self) ... sometimes it's parent frame @@ -304,14 +304,14 @@ class CloseDispatcher : public css::lang::XTypeProvider not frames containg top level windows. So normaly _magic (which btw does not exists at the moment .-) ) should be used. So we interpret target=<empty> as _magic ! - + @param xFrame start point for search of right dispatch frame. - + @param sTarget give us an idea how this target frame must be searched. */ - + static css::uno::Reference< css::frame::XFrame > static_impl_searchRightTargetFrame(const css::uno::Reference< css::frame::XFrame >& xFrame , const ::rtl::OUString& sTarget); diff --git a/framework/inc/dispatch/createdispatcher.hxx b/framework/inc/dispatch/createdispatcher.hxx index 569acb6f2476..41b448455b0e 100644 --- a/framework/inc/dispatch/createdispatcher.hxx +++ b/framework/inc/dispatch/createdispatcher.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,31 +29,31 @@ #define __FRAMEWORK_DISPATCH_CREATEDISPATCHER_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <dispatch/basedispatcher.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// exported const +// exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// exported definitions +// exported definitions //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** @@ -69,7 +69,7 @@ namespace framework{ @attention Use this class as member only! Never use it as baseclass. XInterface will be ambigous and we hold a weakreference to ouer OWNER - not to ouer SUPERCLASS! - @implements XInterface + @implements XInterface XDispatch XStatusListener XLoadEventListener @@ -77,7 +77,7 @@ namespace framework{ @base BaseDispatcher - @devstatus ready to use + @devstatus ready to use @threadsafe yes *//*-*************************************************************************************************************/ class CreateDispatcher : // -interfaces ... are supported by our BaseDispatcher! @@ -85,14 +85,14 @@ class CreateDispatcher : // -interfaces ... are supported by our BaseDispatc public BaseDispatcher { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: // ctor CreateDispatcher ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory , const css::uno::Reference< css::frame::XFrame >& xParent , const rtl::OUString& sName ); - // XDispatch + // XDispatch virtual void SAL_CALL dispatch ( const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException ); @@ -113,8 +113,8 @@ class CreateDispatcher : // -interfaces ... are supported by our BaseDispatc { LOG_WARNING( "CreateDispatcher::reactForHandlingState()", "Who call this function! It's a non used pure virtual function overload ..." ) } //------------------------------------------------------------------------------------------------------------- - // variables - // (should be private everyway!) + // variables + // (should be private everyway!) //------------------------------------------------------------------------------------------------------------- private: css::uno::WeakReference< css::frame::XFrame > m_xTarget ; /// new created frame (Don't hold hard reference ... target frame couldn't die then!) @@ -122,6 +122,6 @@ class CreateDispatcher : // -interfaces ... are supported by our BaseDispatc }; // class CreateDispatcher -} // namespace framework +} // namespace framework #endif // #ifndef __FRAMEWORK_DISPATCH_CREATEDISPATCHER_HXX_ diff --git a/framework/inc/dispatch/dispatchinformationprovider.hxx b/framework/inc/dispatch/dispatchinformationprovider.hxx index c8d16766d876..124698145340 100644 --- a/framework/inc/dispatch/dispatchinformationprovider.hxx +++ b/framework/inc/dispatch/dispatchinformationprovider.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_DISPATCH_DISPATCHINFORMATIONPROVIDER_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> @@ -39,14 +39,14 @@ #include <general.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XDispatchInformationProvider.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/weakref.hxx> #include <rtl/ustring.hxx> @@ -54,17 +54,17 @@ #include <vcl/svapp.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// exported const +// exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// exported definitions +// exported definitions //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** @@ -87,23 +87,23 @@ class DispatchInformationProvider : public css::frame::XDispatchInformationProv DispatchInformationProvider(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR , const css::uno::Reference< css::frame::XFrame >& xFrame); - + virtual ~DispatchInformationProvider(); FWK_DECLARE_XINTERFACE - + virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedCommandGroups() throw (css::uno::RuntimeException); - + virtual css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation(sal_Int16 nCommandGroup) throw (css::uno::RuntimeException); - + //_______________________ // helper private: css::uno::Sequence< css::uno::Reference< css::frame::XDispatchInformationProvider > > implts_getAllSubProvider(); - + }; // class DispatchInformationProvider } // namespace framework diff --git a/framework/inc/dispatch/dispatchprovider.hxx b/framework/inc/dispatch/dispatchprovider.hxx index 3bb619f810c1..15e2a1df5987 100644 --- a/framework/inc/dispatch/dispatchprovider.hxx +++ b/framework/inc/dispatch/dispatchprovider.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_DISPATCH_DISPATCHPROVIDER_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <services/frame.hxx> @@ -47,7 +47,7 @@ #include <stdtypes.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> @@ -56,13 +56,13 @@ #include <com/sun/star/beans/PropertyValue.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/weak.hxx> #include <cppuhelper/weakref.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ @@ -99,12 +99,12 @@ enum EDispatchHelper @attention Use this class as member only! Never use it as baseclass. XInterface will be ambigous and we hold a weakreference to ouer OWNER - not to ouer SUPERCLASS! - @base ThreadHelpBase + @base ThreadHelpBase supports threadsafe mechanism @base OWeakObject provides ref count and weak mechanism - @devstatus ready to use + @devstatus ready to use @threadsafe yes @modified 17.05.2002 07:56, as96863 */ diff --git a/framework/inc/dispatch/helpagentdispatcher.hxx b/framework/inc/dispatch/helpagentdispatcher.hxx index 7ade8d565834..1a8a0b2425d7 100644 --- a/framework/inc/dispatch/helpagentdispatcher.hxx +++ b/framework/inc/dispatch/helpagentdispatcher.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,9 +50,9 @@ namespace framework #else #define css ::com::sun::star #endif - + //........................................................................ - + class HelpAgentDispatcher : public css::lang::XTypeProvider , public css::frame::XDispatch , public css::awt::XWindowListener // => css::lang::XEventListener @@ -61,15 +61,15 @@ class HelpAgentDispatcher : public css::lang::XTypeProvider , public ::cppu::OWeakObject { private: - + //--------------------------------------- /// @short represent the current active help URL, which must be used to show the right help page ::rtl::OUString m_sCurrentURL; - + //--------------------------------------- /// @short parent of the agent window. css::uno::Reference< css::awt::XWindow > m_xContainerWindow; - + //--------------------------------------- /// @short the agent window itself (implemented in svtools) css::uno::Reference< css::awt::XWindow > m_xAgentWindow; @@ -77,33 +77,33 @@ class HelpAgentDispatcher : public css::lang::XTypeProvider //--------------------------------------- /// @short the timer for showing the agent window Timer m_aTimer; - + //--------------------------------------- /** @short hold this dispatcher alive till the timer was killed or expired! - @descr Because the vcl timer knows us by using a pointer ... and our instance is used + @descr Because the vcl timer knows us by using a pointer ... and our instance is used ref counted normaly it can happen that our reference goes down to 0 ... and the timer runs into some trouble. So we hold us self alive till the timer could be stopped or expired. */ css::uno::Reference< css::uno::XInterface > m_xSelfHold; - + public: - + HelpAgentDispatcher(const css::uno::Reference< css::frame::XFrame >& xParentFrame); FWK_DECLARE_XINTERFACE FWK_DECLARE_XTYPEPROVIDER - + // css::frame::XDispatch - virtual void SAL_CALL dispatch(const css::util::URL& sURL , + virtual void SAL_CALL dispatch(const css::util::URL& sURL , const css::uno::Sequence< css::beans::PropertyValue >& lArgs) throw(css::uno::RuntimeException); virtual void SAL_CALL addStatusListener(const css::uno::Reference< css::frame::XStatusListener >& xListener, - const css::util::URL& aURL ) + const css::util::URL& aURL ) throw(css::uno::RuntimeException); virtual void SAL_CALL removeStatusListener(const css::uno::Reference< css::frame::XStatusListener >& xListener, - const css::util::URL& aURL ) + const css::util::URL& aURL ) throw(css::uno::RuntimeException); - + // css::awt::XWindowListener virtual void SAL_CALL windowResized(const css::awt::WindowEvent& aSource) throw(css::uno::RuntimeException); @@ -113,13 +113,13 @@ class HelpAgentDispatcher : public css::lang::XTypeProvider throw(css::uno::RuntimeException); virtual void SAL_CALL windowHidden(const css::lang::EventObject& aSource) throw(css::uno::RuntimeException); - + // css::lang::XEventListener virtual void SAL_CALL disposing(const css::lang::EventObject& aSource) throw(css::uno::RuntimeException); - + protected: - + ~HelpAgentDispatcher(); protected: @@ -129,66 +129,66 @@ class HelpAgentDispatcher : public css::lang::XTypeProvider virtual void closeAgent(); private: - + //--------------------------------------- /** @short mark the current set URL as "accepted by user" and show the right help window */ void implts_acceptCurrentURL(); - + //--------------------------------------- /** @short mark the current set URL as "ignored by user" */ void implts_ignoreCurrentURL(); - + //--------------------------------------- - /** @short ensures that the agent's window exists - @descr We create the agent window on demand. But afterwards we hold it alive till + /** @short ensures that the agent's window exists + @descr We create the agent window on demand. But afterwards we hold it alive till this helpagent dispatcher dies. The agent window will be made visible/hidden in case a new dispatch occures or in case the timer expired. - - @return [sal_Bool] + + @return [sal_Bool] TRUE in case the member m_xAgentWindow is a valid reference; FALSE otherwise. */ css::uno::Reference< css::awt::XWindow > implts_ensureAgentWindow(); - + //--------------------------------------- /** @short show the agent window. - @descr If the agent window does not exists, it will be created on demand. + @descr If the agent window does not exists, it will be created on demand. (see implts_ensureAgentWindow). Further it's checked if the parent container window is currently visible or not. Only if its visible the agent window will be shown too. */ void implts_showAgentWindow(); - + //--------------------------------------- /** @short hide the agent window. */ void implts_hideAgentWindow(); - + //--------------------------------------- /** @short set the new position and size of the agent window. - @descr If the agent window does not exists, it will be created on demand. + @descr If the agent window does not exists, it will be created on demand. (see implts_ensureAgentWindow). If the agent window exists, its position and size will be calculated and set. */ void implts_positionAgentWindow(); - + //--------------------------------------- /** @short starts the timer for showing the agent window. - @descr The timer wont be started twice ... this method checks the current running state .-) + @descr The timer wont be started twice ... this method checks the current running state .-) */ void implts_startTimer(); - + //--------------------------------------- /** @short stop the timer. - @descr The timer wont be stopped twice ... this method checks the current running state .-) + @descr The timer wont be stopped twice ... this method checks the current running state .-) Further this method marks the current help URL (m_xCurrentURL) as "ignorable". Cause the user ignored it ! */ void implts_stopTimer(); - + //--------------------------------------- /** @short callback of our internal timer. */ @@ -198,7 +198,7 @@ class HelpAgentDispatcher : public css::lang::XTypeProvider #undef css //........................................................................ -} // namespace framework +} // namespace framework //........................................................................ #endif // _FRAMEWORK_DISPATCH_HELPAGENTDISPATCHER_HXX_ diff --git a/framework/inc/dispatch/interaction.hxx b/framework/inc/dispatch/interaction.hxx index 07a10f48f568..28b5d817251b 100644 --- a/framework/inc/dispatch/interaction.hxx +++ b/framework/inc/dispatch/interaction.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,11 +29,11 @@ #define __FRAMEWORK_DISPATCH_INTERACTION_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/task/XInteractionRequest.hpp> @@ -48,7 +48,7 @@ #include <com/sun/star/uno/RuntimeException.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <rtl/ustring.hxx> #include <cppuhelper/implbase1.hxx> @@ -56,21 +56,21 @@ #include <com/sun/star/uno/Sequence.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// non exported const +// non exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// non exported definitions +// non exported definitions //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** @@ -82,13 +82,13 @@ namespace framework{ Superclasses can add additional interfaces or methods to support additional features ... but selection of it is supported here! - @implements XInterface + @implements XInterface XTypeProvider (supported by WeakImplHelper!) XInteractionContinuation @base WeakImplHelper1 - @devstatus ready to use + @devstatus ready to use @threadsafe no (used on once position only!) *//*-*************************************************************************************************************/ template< class TContinuationType > @@ -149,7 +149,7 @@ class ContinuationBase : public ::cppu::WeakImplHelper1< TContinuationType > @base ContinuationBase - @devstatus ready to use + @devstatus ready to use @threadsafe no (used on once position only!) *//*-*************************************************************************************************************/ typedef ContinuationBase< ::com::sun::star::task::XInteractionAbort > ContinuationAbort; @@ -174,7 +174,7 @@ typedef ContinuationBase< ::com::sun::star::task::XInteractionRetry > Continuati @base ImplInheritanceHelper1 ContinuationBase - @devstatus ready to use + @devstatus ready to use @threadsafe no (used on once position only!) *//*-*************************************************************************************************************/ class ContinuationFilterSelect : public ContinuationBase< ::com::sun::star::document::XInteractionFilterSelect > @@ -213,7 +213,7 @@ class ContinuationFilterSelect : public ContinuationBase< ::com::sun::star::docu @base WeakImplHelper1 - @devstatus ready to use + @devstatus ready to use @threadsafe no (used on once position only!) *//*-*************************************************************************************************************/ class RequestFilterSelect : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest > @@ -248,7 +248,7 @@ class RequestFilterSelect : public ::cppu::WeakImplHelper1< ::com::sun::star::ta @base WeakImplHelper1 - @devstatus ready to use + @devstatus ready to use @threadsafe no (used on once position only!) *//*-*************************************************************************************************************/ class RequestAmbigousFilter : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest > diff --git a/framework/inc/dispatch/interceptionhelper.hxx b/framework/inc/dispatch/interceptionhelper.hxx index a48c5da47ee6..e811e9ddec7c 100644 --- a/framework/inc/dispatch/interceptionhelper.hxx +++ b/framework/inc/dispatch/interceptionhelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_HELPER_INTERCEPTIONHELPER_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <services/frame.hxx> @@ -40,7 +40,7 @@ #include <general.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XDispatchProviderInterception.hpp> @@ -51,7 +51,7 @@ #include <com/sun/star/frame/DispatchDescriptor.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <tools/wldcrd.hxx> #include <cppuhelper/weak.hxx> @@ -62,13 +62,13 @@ #endif //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// exported const +// exported const //_________________________________________________________________________________________________________________ //_________________________________________________________ diff --git a/framework/inc/dispatch/mailtodispatcher.hxx b/framework/inc/dispatch/mailtodispatcher.hxx index 5563ef190c89..f1c6dc34d194 100644 --- a/framework/inc/dispatch/mailtodispatcher.hxx +++ b/framework/inc/dispatch/mailtodispatcher.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_DISPATCH_MAILTODISPATCHER_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <macros/generic.hxx> @@ -42,7 +42,7 @@ #include <stdtypes.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/frame/XNotifyingDispatch.hpp> @@ -53,22 +53,22 @@ #include <com/sun/star/frame/XStatusListener.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/weak.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// exported const +// exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// exported definitions +// exported definitions //_________________________________________________________________________________________________________________ /** @@ -81,7 +81,7 @@ namespace framework{ @base OWeakObject provides XWeak and ref count mechanism - @devstatus ready to use + @devstatus ready to use @modified 02.05.2002 08:12, as96863 */ @@ -140,6 +140,6 @@ class MailToDispatcher : // interfaces }; // class MailToDispatcher -} // namespace framework +} // namespace framework #endif // #ifndef __FRAMEWORK_DISPATCH_MAILTODISPATCHER_HXX_ diff --git a/framework/inc/dispatch/menudispatcher.hxx b/framework/inc/dispatch/menudispatcher.hxx index 25375b2649d4..30016a96f499 100644 --- a/framework/inc/dispatch/menudispatcher.hxx +++ b/framework/inc/dispatch/menudispatcher.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_DISPATCH_MENUDISPATCHER_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <classes/taskcreator.hxx> @@ -44,7 +44,7 @@ #include <stdtypes.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/frame/XDispatch.hpp> @@ -59,25 +59,25 @@ #include <com/sun/star/frame/XFrameActionListener.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/weak.hxx> #include <cppuhelper/weakref.hxx> #include <cppuhelper/interfacecontainer.h> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// exported const +// exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// exported definitions +// exported definitions //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** @@ -85,171 +85,171 @@ namespace framework{ We implement this as a hashtable for strings. *//*-*************************************************************************************************************/ -typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< ::rtl::OUString , - OUStringHashCode , +typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< ::rtl::OUString , + OUStringHashCode , std::equal_to< ::rtl::OUString > > IMPL_ListenerHashContainer; /*-************************************************************************************************************//** - @short helper for desktop only(!) to create new tasks on demand for dispatches - @descr Use this class as member only! Never use it as baseclass. + @short helper for desktop only(!) to create new tasks on demand for dispatches + @descr Use this class as member only! Never use it as baseclass. XInterface will be ambigous and we hold a weakcss::uno::Reference to ouer OWNER - not to ouer SUPERCLASS! - @implements XInterface + @implements XInterface XDispatch XLoadEventListener XFrameActionListener XEventListener - @base ThreadHelpBase + @base ThreadHelpBase OWeakObject - @devstatus ready to use + @devstatus ready to use *//*-*************************************************************************************************************/ class MenuDispatcher : // interfaces - public css::lang::XTypeProvider , - public css::frame::XDispatch , - public css::frame::XFrameActionListener , + public css::lang::XTypeProvider , + public css::frame::XDispatch , + public css::frame::XFrameActionListener , // baseclasses // Order is neccessary for right initialization! - public ThreadHelpBase , + public ThreadHelpBase , public cppu::OWeakObject { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: //--------------------------------------------------------------------------------------------------------- - // constructor / destructor + // constructor / destructor //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short standard ctor - @descr These initialize a new instance of ths class with needed informations for work. + @short standard ctor + @descr These initialize a new instance of ths class with needed informations for work. - @seealso using at owner + @seealso using at owner - @param "xFactory" , css::uno::Reference to servicemanager for creation of new services - @param "xOwner" , css::uno::Reference to our owner, the Desktop!!! - @return - + @param "xFactory" , css::uno::Reference to servicemanager for creation of new services + @param "xOwner" , css::uno::Reference to our owner, the Desktop!!! + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ MenuDispatcher( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory , - const css::uno::Reference< css::frame::XFrame >& xOwner ); + const css::uno::Reference< css::frame::XFrame >& xOwner ); //--------------------------------------------------------------------------------------------------------- - // XInterface + // XInterface //--------------------------------------------------------------------------------------------------------- FWK_DECLARE_XINTERFACE FWK_DECLARE_XTYPEPROVIDER //--------------------------------------------------------------------------------------------------------- - // XDispatch + // XDispatch //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** @short dispatch URL with arguments - @descr Every dispatch create a new task. If load of URL failed task will deleted automaticly! + @descr Every dispatch create a new task. If load of URL failed task will deleted automaticly! - @seealso - + @seealso - - @param "aURL" , URL to dispatch. - @param "seqArguments" , list of optional arguments. - @return - + @param "aURL" , URL to dispatch. + @param "seqArguments" , list of optional arguments. + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ - virtual void SAL_CALL dispatch( const css::util::URL& aURL , - const css::uno::Sequence< css::beans::PropertyValue >& seqProperties ) throw( css::uno::RuntimeException ); + virtual void SAL_CALL dispatch( const css::util::URL& aURL , + const css::uno::Sequence< css::beans::PropertyValue >& seqProperties ) throw( css::uno::RuntimeException ); /*-****************************************************************************************************//** @short add listener for state events - @descr You can add a listener to get information about status of dispatch: OK or Failed. + @descr You can add a listener to get information about status of dispatch: OK or Failed. - @seealso method loadFinished() - @seealso method loadCancelled() + @seealso method loadFinished() + @seealso method loadCancelled() - @param "xControl" , css::uno::Reference to a valid listener for state events. - @param "aURL" , URL about listener will be informed, if something occured. - @return - + @param "xControl" , css::uno::Reference to a valid listener for state events. + @param "aURL" , URL about listener will be informed, if something occured. + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ - virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl, - const css::util::URL& aURL ) throw( css::uno::RuntimeException ); + virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl, + const css::util::URL& aURL ) throw( css::uno::RuntimeException ); /*-****************************************************************************************************//** @short remove listener for state events - @descr You can remove a listener if information of dispatch isn't important for you any longer. + @descr You can remove a listener if information of dispatch isn't important for you any longer. - @seealso method loadFinished() - @seealso method loadCancelled() + @seealso method loadFinished() + @seealso method loadCancelled() - @param "xControl" , css::uno::Reference to a valid listener. - @param "aURL" , URL on which listener has registered. - @return - + @param "xControl" , css::uno::Reference to a valid listener. + @param "aURL" , URL on which listener has registered. + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ - virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl, - const css::util::URL& aURL ) throw( css::uno::RuntimeException ); + virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl, + const css::util::URL& aURL ) throw( css::uno::RuntimeException ); //--------------------------------------------------------------------------------------------------------- - // XFrameActionListener + // XFrameActionListener //--------------------------------------------------------------------------------------------------------- virtual void SAL_CALL frameAction( const css::frame::FrameActionEvent& aEvent ) throw ( css::uno::RuntimeException ); //--------------------------------------------------------------------------------------------------------- - // XEventListener + // XEventListener //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short dispose current instance - @descr If service helper isn't required any longer call this method to release all used ressources. + @short dispose current instance + @descr If service helper isn't required any longer call this method to release all used ressources. - @seealso - + @seealso - - @param "aEvent", information about source of this event. - @return - + @param "aEvent", information about source of this event. + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ void SAL_CALL disposing( const EVENTOBJECT& aEvent ) throw( css::uno::RuntimeException ); //------------------------------------------------------------------------------------------------------------- - // protected methods + // protected methods //------------------------------------------------------------------------------------------------------------- protected: /*-****************************************************************************************************//** - @short standard destructor - @descr This method destruct an instance of this class and clear some member. + @short standard destructor + @descr This method destruct an instance of this class and clear some member. This method is protected, because its not allowed to use an instance of this class as a member! You MUST use a pointer. - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual ~MenuDispatcher(); //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: @@ -257,50 +257,50 @@ class MenuDispatcher : // interfaces DECL_LINK( Close_Impl, void* ); /*-****************************************************************************************************//** - @short - - @descr - + @short - + @descr - - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ sal_Bool impl_setMenuBar( MenuBar* pMenuBar, sal_Bool bMenuFromResource = sal_False ); /*-****************************************************************************************************//** - @short - - @descr - + @short - + @descr - - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ void impl_setAccelerators( Menu* pMenu, const Accelerator& aAccel ); //------------------------------------------------------------------------------------------------------------- - // debug methods - // (should be private everyway!) + // debug methods + // (should be private everyway!) //------------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short debug-method to check incoming parameter of some other mehods of this class - @descr The following methods are used to check parameters for other methods + @short debug-method to check incoming parameter of some other mehods of this class + @descr The following methods are used to check parameters for other methods of this class. The return value is used directly for an ASSERT(...). - @seealso ASSERTs in implementation! + @seealso ASSERTs in implementation! - @param css::uno::References to checking variables - @return sal_False on invalid parameter<BR> + @param css::uno::References to checking variables + @return sal_False on invalid parameter<BR> sal_True otherway - @onerror - + @onerror - *//*-*****************************************************************************************************/ #ifdef ENABLE_ASSERTIONS @@ -308,29 +308,29 @@ class MenuDispatcher : // interfaces private: static sal_Bool impldbg_checkParameter_MenuDispatcher ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory , - const css::uno::Reference< css::frame::XFrame >& xOwner ); - static sal_Bool impldbg_checkParameter_addStatusListener ( const css::uno::Reference< css::frame::XStatusListener >& xControl , - const css::util::URL& aURL ); - static sal_Bool impldbg_checkParameter_removeStatusListener ( const css::uno::Reference< css::frame::XStatusListener >& xControl , - const css::util::URL& aURL ); - #endif // #ifdef ENABLE_ASSERTIONS + const css::uno::Reference< css::frame::XFrame >& xOwner ); + static sal_Bool impldbg_checkParameter_addStatusListener ( const css::uno::Reference< css::frame::XStatusListener >& xControl , + const css::util::URL& aURL ); + static sal_Bool impldbg_checkParameter_removeStatusListener ( const css::uno::Reference< css::frame::XStatusListener >& xControl , + const css::util::URL& aURL ); + #endif // #ifdef ENABLE_ASSERTIONS //------------------------------------------------------------------------------------------------------------- - // variables - // (should be private everyway!) + // variables + // (should be private everyway!) //------------------------------------------------------------------------------------------------------------- private: - css::uno::WeakReference< css::frame::XFrame > m_xOwnerWeak ; /// css::uno::WeakReference to owner (Don't use a hard css::uno::Reference. Owner can't delete us then!) - css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory ; /// factory shared with our owner to create new services! - IMPL_ListenerHashContainer m_aListenerContainer; /// hash table for listener at specified URLs - sal_Bool m_bAlreadyDisposed ; /// Protection against multiple disposing calls. - sal_Bool m_bActivateListener ; /// dispatcher is listener for frame activation - MenuManager* m_pMenuManager ; /// menu manager controlling menu dispatches + css::uno::WeakReference< css::frame::XFrame > m_xOwnerWeak ; /// css::uno::WeakReference to owner (Don't use a hard css::uno::Reference. Owner can't delete us then!) + css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory ; /// factory shared with our owner to create new services! + IMPL_ListenerHashContainer m_aListenerContainer; /// hash table for listener at specified URLs + sal_Bool m_bAlreadyDisposed ; /// Protection against multiple disposing calls. + sal_Bool m_bActivateListener ; /// dispatcher is listener for frame activation + MenuManager* m_pMenuManager ; /// menu manager controlling menu dispatches }; // class MenuDispatcher -} // namespace framework +} // namespace framework #endif // #ifndef __FRAMEWORK_DISPATCH_MENUDISPATCHER_HXX_ diff --git a/framework/inc/dispatch/oxt_handler.hxx b/framework/inc/dispatch/oxt_handler.hxx index 33a8af37c8e6..25bb1db58086 100644 --- a/framework/inc/dispatch/oxt_handler.hxx +++ b/framework/inc/dispatch/oxt_handler.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_HANDLER_OXT_HANDLER_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #ifndef __FRAMEWORK_THREADHELP_THREADHELPBASE_HXX_ @@ -69,7 +69,7 @@ #endif //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #ifndef _COM_SUN_STAR_LANG_XTYPEPROVIDER_HPP_ @@ -105,7 +105,7 @@ #endif //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #ifndef _CPPUHELPER_WEAK_HXX_ @@ -113,17 +113,17 @@ #endif //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// exported const +// exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// exported definitions +// exported definitions //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** @@ -148,12 +148,12 @@ class Oxt_Handler : // interfaces , public ::cppu::OWeakObject { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: //--------------------------------------------------------------------------------------------------------- - // constructor / destructor + // constructor / destructor //--------------------------------------------------------------------------------------------------------- Oxt_Handler( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ); virtual ~Oxt_Handler( ); @@ -173,7 +173,7 @@ class Oxt_Handler : // interfaces const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw( css::uno::RuntimeException ); //--------------------------------------------------------------------------------------------------------- - // XDispatch + // XDispatch //--------------------------------------------------------------------------------------------------------- virtual void SAL_CALL dispatch ( const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException ); @@ -189,18 +189,18 @@ class Oxt_Handler : // interfaces virtual ::rtl::OUString SAL_CALL detect ( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException ); //------------------------------------------------------------------------------------------------------------- - // protected methods + // protected methods //------------------------------------------------------------------------------------------------------------- protected: //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: //------------------------------------------------------------------------------------------------------------- - // variables - // (should be private everyway!) + // variables + // (should be private everyway!) //------------------------------------------------------------------------------------------------------------- private: @@ -210,6 +210,6 @@ class Oxt_Handler : // interfaces }; // class Oxt_Handler -} // namespace framework +} // namespace framework #endif // #ifndef __FRAMEWORK_HANDLER_OXT_HANDLER_HXX_ diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx b/framework/inc/dispatch/popupmenudispatcher.hxx index f9feb3538464..e8002834dff9 100644 --- a/framework/inc/dispatch/popupmenudispatcher.hxx +++ b/framework/inc/dispatch/popupmenudispatcher.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_DISPATCH_POPUPMENUDISPATCHER_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <services/frame.hxx> @@ -47,7 +47,7 @@ #include <stdtypes.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/frame/XDispatch.hpp> @@ -71,25 +71,25 @@ #endif //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/weak.hxx> #include <cppuhelper/weakref.hxx> #include <cppuhelper/interfacecontainer.h> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// exported const +// exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// exported definitions +// exported definitions //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** @@ -97,44 +97,44 @@ namespace framework{ We implement this as a hashtable for strings. *//*-*************************************************************************************************************/ -typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< ::rtl::OUString , - OUStringHashCode , +typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< ::rtl::OUString , + OUStringHashCode , std::equal_to< ::rtl::OUString > > IMPL_ListenerHashContainer; /*-************************************************************************************************************//** - @short helper for desktop only(!) to create new tasks on demand for dispatches - @descr Use this class as member only! Never use it as baseclass. + @short helper for desktop only(!) to create new tasks on demand for dispatches + @descr Use this class as member only! Never use it as baseclass. XInterface will be ambigous and we hold a weakcss::uno::Reference to ouer OWNER - not to our SUPERCLASS! - @implements XInterface + @implements XInterface XDispatch XLoadEventListener XFrameActionListener XEventListener - @base ThreadHelpBase + @base ThreadHelpBase OWeakObject - @devstatus ready to use + @devstatus ready to use *//*-*************************************************************************************************************/ class PopupMenuDispatcher : // interfaces - public css::lang::XTypeProvider , + public css::lang::XTypeProvider , public css::lang::XServiceInfo , public css::frame::XDispatchProvider , - public css::frame::XDispatch , - public css::frame::XFrameActionListener , + public css::frame::XDispatch , + public css::frame::XFrameActionListener , public css::lang::XInitialization , // baseclasses // Order is neccessary for right initialization! - public ThreadHelpBase , + public ThreadHelpBase , public cppu::OWeakObject { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: - // constructor / destructor + // constructor / destructor PopupMenuDispatcher( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ); // XInterface, XTypeProvider, XServiceInfo @@ -146,54 +146,54 @@ class PopupMenuDispatcher : // interfaces virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& lArguments ) throw( css::uno::Exception , css::uno::RuntimeException); // XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL , const ::rtl::OUString& sTarget , sal_Int32 nFlags ) throw( ::com::sun::star::uno::RuntimeException ); - - virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( - const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) + + virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( + const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) throw( css::uno::RuntimeException ); - // XDispatch - virtual void SAL_CALL dispatch( const css::util::URL& aURL, + // XDispatch + virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& seqProperties ) throw( css::uno::RuntimeException ); virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl, - const css::util::URL& aURL ) throw( css::uno::RuntimeException ); + const css::util::URL& aURL ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl, - const css::util::URL& aURL ) throw( css::uno::RuntimeException ); + virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl, + const css::util::URL& aURL ) throw( css::uno::RuntimeException ); - // XFrameActionListener + // XFrameActionListener virtual void SAL_CALL frameAction( const css::frame::FrameActionEvent& aEvent ) throw ( css::uno::RuntimeException ); - // XEventListener + // XEventListener void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException ); - // protected methods + // protected methods protected: virtual ~PopupMenuDispatcher(); void impl_RetrievePopupControllerQuery(); void impl_CreateUriRefFactory(); - // private methods + // private methods - // variables + // variables private: - css::uno::WeakReference< css::frame::XFrame > m_xWeakFrame ; /// css::uno::WeakReference to frame (Don't use a hard css::uno::Reference. Owner can't delete us then!) + css::uno::WeakReference< css::frame::XFrame > m_xWeakFrame ; /// css::uno::WeakReference to frame (Don't use a hard css::uno::Reference. Owner can't delete us then!) css::uno::Reference< css::container::XNameAccess > m_xPopupCtrlQuery ; /// reference to query for popup controller css::uno::Reference< css::uri::XUriReferenceFactory > m_xUriRefFactory ; /// reference to the uri reference factory - css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory ; /// factory shared with our owner to create new services! - IMPL_ListenerHashContainer m_aListenerContainer; /// hash table for listener at specified URLs - sal_Bool m_bAlreadyDisposed ; /// Protection against multiple disposing calls. - sal_Bool m_bActivateListener ; /// dispatcher is listener for frame activation + css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory ; /// factory shared with our owner to create new services! + IMPL_ListenerHashContainer m_aListenerContainer; /// hash table for listener at specified URLs + sal_Bool m_bAlreadyDisposed ; /// Protection against multiple disposing calls. + sal_Bool m_bActivateListener ; /// dispatcher is listener for frame activation }; // class PopupMenuDispatcher -} // namespace framework +} // namespace framework #endif // #ifndef __FRAMEWORK_DISPATCH_POPUPMENUDISPATCHER_HXX_ diff --git a/framework/inc/dispatch/selfdispatcher.hxx b/framework/inc/dispatch/selfdispatcher.hxx index 3ac72633c404..1bbca4d20ed5 100644 --- a/framework/inc/dispatch/selfdispatcher.hxx +++ b/framework/inc/dispatch/selfdispatcher.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,31 +29,31 @@ #define __FRAMEWORK_DISPATCH_SELFDISPATCHER_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <dispatch/basedispatcher.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// exported const +// exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// exported definitions +// exported definitions //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** @@ -63,7 +63,7 @@ namespace framework{ Use this class as member only! Never use it as baseclass. XInterface will be ambigous and we hold a weakreference to ouer OWNER - not to ouer SUPERCLASS! - @implements XInterface + @implements XInterface XDispatch XStatusListener XLoadEventListener @@ -72,7 +72,7 @@ namespace framework{ @base BaseDispatcher OWeakObject - @devstatus ready to use + @devstatus ready to use @threadsafe yes *//*-*************************************************************************************************************/ class SelfDispatcher : // -interfaces ... are supported by our BaseDispatcher! @@ -80,13 +80,13 @@ class SelfDispatcher : // -interfaces ... are supported by our BaseDispatch public BaseDispatcher { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: // ctor SelfDispatcher ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory , const css::uno::Reference< css::frame::XFrame >& xTarget ); - // XDispatch + // XDispatch virtual void SAL_CALL dispatch ( const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException ); @@ -107,6 +107,6 @@ class SelfDispatcher : // -interfaces ... are supported by our BaseDispatch }; // class SelfDispatcher -} // namespace framework +} // namespace framework #endif // #ifndef __FRAMEWORK_DISPATCH_SELFDISPATCHER_HXX_ diff --git a/framework/inc/dispatch/servicehandler.hxx b/framework/inc/dispatch/servicehandler.hxx index 8ccdff80a566..8b93b8734265 100644 --- a/framework/inc/dispatch/servicehandler.hxx +++ b/framework/inc/dispatch/servicehandler.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_DISPATCH_SERVICEHANDLER_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <macros/generic.hxx> @@ -42,7 +42,7 @@ #include <stdtypes.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/frame/XNotifyingDispatch.hpp> @@ -53,22 +53,22 @@ #include <com/sun/star/frame/XStatusListener.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/weak.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// exported const +// exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// exported definitions +// exported definitions //_________________________________________________________________________________________________________________ /** @@ -85,7 +85,7 @@ namespace framework{ @base OWeakObject provides XWeak and ref count mechanism - @devstatus ready to use + @devstatus ready to use @modified 02.05.2002 08:13, as96863 */ @@ -144,6 +144,6 @@ class ServiceHandler : // interfaces }; // class ServiceHandler -} // namespace framework +} // namespace framework #endif // #ifndef __FRAMEWORK_DISPATCH_SERVICEHANDLER_HXX_ diff --git a/framework/inc/dispatch/startmoduledispatcher.hxx b/framework/inc/dispatch/startmoduledispatcher.hxx index 254ace4f0444..80ba78972f88 100644 --- a/framework/inc/dispatch/startmoduledispatcher.hxx +++ b/framework/inc/dispatch/startmoduledispatcher.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -86,11 +86,11 @@ class StartModuleDispatcher : public css::lang::XTypeProvider //--------------------------------------- /** @short our "context" frame. */ css::uno::WeakReference< css::frame::XFrame > m_xOwner; - + //--------------------------------------- /** @short the original queryDispatch() target. */ ::rtl::OUString m_sDispatchTarget; - + //--------------------------------------- /** @short list of registered status listener */ ListenerHash m_lStatusListener; @@ -102,7 +102,7 @@ class StartModuleDispatcher : public css::lang::XTypeProvider //--------------------------------------- /** @short connect a new StartModuleDispatcher instance to its "owner frame". - + @descr Such "owner frame" is used as context for all related operations. @param xSMGR @@ -111,7 +111,7 @@ class StartModuleDispatcher : public css::lang::XTypeProvider @param xFrame the frame where the corresponding dispatch was started. - + @param sTarget the original target information used for the related queryDispatch() call. */ @@ -161,7 +161,7 @@ class StartModuleDispatcher : public css::lang::XTypeProvider /** @short check if StartModule can be shown. */ ::sal_Bool implts_isBackingModePossible(); - + //--------------------------------------- /** @short open the special BackingComponent (now StartModule) diff --git a/framework/inc/dispatch/systemexec.hxx b/framework/inc/dispatch/systemexec.hxx index 98084094cbfb..b191ab3e31c5 100644 --- a/framework/inc/dispatch/systemexec.hxx +++ b/framework/inc/dispatch/systemexec.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_DISPATCH_SYSTEMEXEC_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <macros/generic.hxx> @@ -42,7 +42,7 @@ #include <stdtypes.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/frame/XNotifyingDispatch.hpp> @@ -53,22 +53,22 @@ #include <com/sun/star/frame/XStatusListener.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/weak.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// exported const +// exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// exported definitions +// exported definitions //_________________________________________________________________________________________________________________ /** @@ -83,7 +83,7 @@ namespace framework{ @base OWeakObject provides XWeak and ref count mechanism - @devstatus ready to use + @devstatus ready to use */ class SystemExec : // interfaces public css::lang::XTypeProvider , @@ -140,6 +140,6 @@ class SystemExec : // interfaces }; // class SystemExec -} // namespace framework +} // namespace framework #endif // #ifndef __FRAMEWORK_DISPATCH_SYSTEMEXEC_HXX_ diff --git a/framework/inc/dispatchcommands.h b/framework/inc/dispatchcommands.h index 404a13099ff1..97284a7b264b 100644 --- a/framework/inc/dispatchcommands.h +++ b/framework/inc/dispatchcommands.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,13 +29,13 @@ #define __FRAMEWORK_DISPATCHCOMMANDS_H_ //_________________________________________________________________________________________________________________ -// includes +// includes //_________________________________________________________________________________________________________________ #include <macros/generic.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ @@ -47,6 +47,6 @@ static ::rtl::OUString CMD_UNO_CLOSEDOC = ::rtl::OUString::createFromAsci static ::rtl::OUString CMD_UNO_CLOSEWIN = ::rtl::OUString::createFromAscii(".uno:CloseWin" ); static ::rtl::OUString CMD_UNO_CLOSEFRAME = ::rtl::OUString::createFromAscii(".uno:CloseFrame" ); -} // namespace framework +} // namespace framework -#endif // #ifndef __FRAMEWORK_DISPATCHCOMMANDS_H_ +#endif // #ifndef __FRAMEWORK_DISPATCHCOMMANDS_H_ diff --git a/framework/inc/framework.hrc b/framework/inc/framework.hrc index b1abc91caba6..eea91edeaa07 100644 --- a/framework/inc/framework.hrc +++ b/framework/inc/framework.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,19 +30,19 @@ #include "svl/solar.hrc" -#define RID_FWK_START 260 +#define RID_FWK_START 260 #define RID_GROUPS_OFFSET 32000 #define RID_GROUPS_END 32767 #define RID_FWK_DIALOG_START (RID_FWK_START + 2048) -#define DLG_FILTER_SELECT (RID_FWK_DIALOG_START + 0) +#define DLG_FILTER_SELECT (RID_FWK_DIALOG_START + 0) -#define STR_FILTER_DOWNLOAD (RID_FWK_START+0) -#define STR_FILTER_CHOOSER (RID_FWK_START+1) -#define STR_FILTER_OTHERS (RID_FWK_START+2) -#define STR_FILTER_ZIPPED (RID_FWK_START+3) +#define STR_FILTER_DOWNLOAD (RID_FWK_START+0) +#define STR_FILTER_CHOOSER (RID_FWK_START+1) +#define STR_FILTER_OTHERS (RID_FWK_START+2) +#define STR_FILTER_ZIPPED (RID_FWK_START+3) // ResIds for BackingWindow #define DLG_BACKING (RID_FWK_DIALOG_START+100) diff --git a/framework/inc/general.h b/framework/inc/general.h index 029fa602a186..086bfdd2f1dd 100644 --- a/framework/inc/general.h +++ b/framework/inc/general.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ //----------------------------------------------------------------------------- /** will make our code more readable if we can use such short name css instead of typing ::com::sun::star everytimes. - + On the other side we had so many problems with "using namespace" so we dont use it here any longer. */ diff --git a/framework/inc/helper/acceleratorinfo.hxx b/framework/inc/helper/acceleratorinfo.hxx index e4f203c6e680..bb529303df89 100644 --- a/framework/inc/helper/acceleratorinfo.hxx +++ b/framework/inc/helper/acceleratorinfo.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/inc/helper/actiontriggerhelper.hxx b/framework/inc/helper/actiontriggerhelper.hxx index 70dff362963c..4e387a42509a 100644 --- a/framework/inc/helper/actiontriggerhelper.hxx +++ b/framework/inc/helper/actiontriggerhelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,18 +45,18 @@ namespace framework // @param pNewMenu = must be a valid and empty menu // @param rActionTriggerContainer = must be an instance of service "com.sun.star.ui.ActionTriggerContaienr" static void - CreateMenuFromActionTriggerContainer( + CreateMenuFromActionTriggerContainer( Menu* pNewMenu, const com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer >& rActionTriggerContainer ); - + // Creates a "com::sun::star::ui::ActionTriggerContainer" with the structure of the menu // provided as a parameter. The implementation class stores the menu pointer // to optimize the time of creation of a menu from a actiontrigger structure. // IMPORTANT: The caller must ensure that the menu pointer is valid through the - // life time of the XIndexContainer object!!! + // life time of the XIndexContainer object!!! // // @param pNewMenu = Must be a valid menu. Please be aware that this implementation is based on - // the above mentioned restriction!!! + // the above mentioned restriction!!! // #110897# static com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer > CreateActionTriggerContainerFromMenu( @@ -68,7 +68,7 @@ namespace framework // @param rActionTriggerContainer = must be an instance of service "com.sun.star.ui.ActionTriggerContainer" // @param pNewMenu = must be a valid menu static void - FillActionTriggerContainerFromMenu( + FillActionTriggerContainerFromMenu( com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer >& rActionTriggerContainer, const Menu* pMenu ); diff --git a/framework/inc/helper/configimporter.hxx b/framework/inc/helper/configimporter.hxx index 9e4a6f52294f..bbe465d85692 100644 --- a/framework/inc/helper/configimporter.hxx +++ b/framework/inc/helper/configimporter.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ namespace framework class UIConfigurationImporterOOo1x { public: - static sal_Bool ImportCustomToolbars( + static sal_Bool ImportCustomToolbars( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager >& rContainerFactory, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > >& rSeqContainer, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rServiceManager, diff --git a/framework/inc/helper/dockingareadefaultacceptor.hxx b/framework/inc/helper/dockingareadefaultacceptor.hxx index cc46c0a45190..1f11edf755d9 100644 --- a/framework/inc/helper/dockingareadefaultacceptor.hxx +++ b/framework/inc/helper/dockingareadefaultacceptor.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_HELPER_DOCKINGAREADEFAULTACCEPTOR_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <classes/framecontainer.hxx> @@ -40,19 +40,19 @@ #include <macros/debug.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/ui/XDockingAreaAcceptor.hpp> #include <com/sun/star/frame/XFrame.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/implbase1.hxx> #include <cppuhelper/weakref.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ @@ -60,35 +60,35 @@ namespace framework{ //_________________________________________________________________________________________________________________ -class DockingAreaDefaultAcceptor : private ThreadHelpBase , +class DockingAreaDefaultAcceptor : private ThreadHelpBase , public ::cppu::WeakImplHelper1< ::com::sun::star::ui::XDockingAreaAcceptor > { public: //--------------------------------------------------------------------------------------------------------- - // constructor / destructor + // constructor / destructor //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short constructor to initialize this instance - @descr A docking area acceptor + @short constructor to initialize this instance + @descr A docking area acceptor But we need a instance to create more then one enumerations to the same tasklist! - @seealso class Desktop - @seealso class OTasksEnumeration + @seealso class Desktop + @seealso class OTasksEnumeration - @param "xOwner" is a reference to ouer owner and must be the desktop! - @param "pTasks" is a pointer to the taskcontainer of the desktop. We need it to create a new enumeration. - @return - + @param "xOwner" is a reference to ouer owner and must be the desktop! + @param "pTasks" is a pointer to the taskcontainer of the desktop. We need it to create a new enumeration. + @return - - @onerror Do nothing and reset this object to default with an empty list. + @onerror Do nothing and reset this object to default with an empty list. *//*-*****************************************************************************************************/ - DockingAreaDefaultAcceptor( const css::uno::Reference< css::frame::XFrame >& xOwner ); + DockingAreaDefaultAcceptor( const css::uno::Reference< css::frame::XFrame >& xOwner ); virtual ~DockingAreaDefaultAcceptor(); //--------------------------------------------------------------------------------------------------------- - // XDockingAreaAcceptor + // XDockingAreaAcceptor //--------------------------------------------------------------------------------------------------------- virtual css::uno::Reference< css::awt::XWindow > SAL_CALL getContainerWindow() throw (css::uno::RuntimeException); @@ -97,13 +97,13 @@ class DockingAreaDefaultAcceptor : private ThreadHelpBase //------------------------------------------------------------------------------------------------------------- - // variables - // (should be private everyway!) + // variables + // (should be private everyway!) //------------------------------------------------------------------------------------------------------------- private: - css::uno::WeakReference< css::frame::XFrame > m_xOwner ; /// weak reference to our frame object! + css::uno::WeakReference< css::frame::XFrame > m_xOwner ; /// weak reference to our frame object! }; } // namespace framework diff --git a/framework/inc/helper/fixeddocumentproperties.hxx b/framework/inc/helper/fixeddocumentproperties.hxx index aab605b7599c..8d6ef2031d9c 100644 --- a/framework/inc/helper/fixeddocumentproperties.hxx +++ b/framework/inc/helper/fixeddocumentproperties.hxx @@ -1,5 +1,5 @@ -#ifndef __FRAMEWORK_HELPER_FIXEDDOCUMENTPROPERTIES_HXX_ -#define __FRAMEWORK_HELPER_FIXEDDOCUMENTPROPERTIES_HXX_ +#ifndef __FRAMEWORK_HELPER_FIXEDDOCUMENTPROPERTIES_HXX_ +#define __FRAMEWORK_HELPER_FIXEDDOCUMENTPROPERTIES_HXX_ #include <sal/types.h> #include <rtl/ustring.hxx> @@ -12,44 +12,44 @@ namespace framework struct FixedDocumentProperties { // fixed Properties (sort by name and used by OPropertySetHelper) - ::rtl::OUString m_sAuthor ; /// Creator of this document - sal_Bool m_bAutoloadEnabled ; /// Automatic reload enabled/disabled ? - sal_Int32 m_nAutoloadSecs ; /// Time cycle for automatic reload - ::rtl::OUString m_sAutoloadURL ; /// URL for automatic reload - ::rtl::OUString m_sBlindCopiesTo ; /// Adress for BCC - ::rtl::OUString m_sCopiesTo ; /// Adress CC - com::sun::star::util::DateTime m_aCreationDate ; /// Time and date of document creation - ::rtl::OUString m_sDefaultTarget ; /// Name of default target - ::rtl::OUString m_sDescription ; /// Short description and comments - sal_Int16 m_nEditingCycles ; /// Document number - sal_Int32 m_nEditingDuration ; /// Duration since last edit - com::sun::star::uno::Sequence< sal_Int8 > m_seqExtraData ; /// Buffer of bytes for some extra data - ::rtl::OUString m_sInReplyTo ; /// Adress for reply to ... - sal_Bool m_bIsEncrypted ; /// Document is en/decrypted - ::rtl::OUString m_sKeywords ; /// Some keywords - ::rtl::OUString m_sMIMEType ; /// MIME-type of document - ::rtl::OUString m_sModifiedBy ; /// Name of user who has modified as last one - com::sun::star::util::DateTime m_aModifyDate ; /// Date and time of last modification - ::rtl::OUString m_sNewsgroups ; /// Document is a message of newsgroup - ::rtl::OUString m_sOriginal ; /// Message ID - sal_Bool m_bPortableGraphics ; /// Use of portable graphics - com::sun::star::util::DateTime m_aPrintDate ; /// Date and time of last print - ::rtl::OUString m_sPrintedBy ; /// Name of user who has printed as last one - sal_uInt16 m_nPriority ; /// Priority of message, if document a message! - sal_Bool m_bQueryTemplate ; /// Search for template ? - ::rtl::OUString m_sRecipient ; /// Name of recipient - ::rtl::OUString m_sReferences ; /// Some references to other things - ::rtl::OUString m_sReplyTo ; /// Adress to reply - sal_Bool m_bSaveGraphicsCompressed ; /// Compressed/non compressed graphics - sal_Bool m_bSaveOriginalGraphics ; /// Include graphics - sal_Bool m_bSaveVersionOnClose ; /// Save version on close of document ? - ::rtl::OUString m_sTemplate ; /// Name of template - sal_Bool m_bTemplateConfig ; /// Exist template config ? - com::sun::star::util::DateTime m_aTemplateDate ; /// Date and time of template - ::rtl::OUString m_sTemplateFileName ; /// File name of template - ::rtl::OUString m_sTheme ; /// Name of theme - ::rtl::OUString m_sTitle ; /// Title of document - sal_Bool m_bUserData ; /// Exist user data ? + ::rtl::OUString m_sAuthor ; /// Creator of this document + sal_Bool m_bAutoloadEnabled ; /// Automatic reload enabled/disabled ? + sal_Int32 m_nAutoloadSecs ; /// Time cycle for automatic reload + ::rtl::OUString m_sAutoloadURL ; /// URL for automatic reload + ::rtl::OUString m_sBlindCopiesTo ; /// Adress for BCC + ::rtl::OUString m_sCopiesTo ; /// Adress CC + com::sun::star::util::DateTime m_aCreationDate ; /// Time and date of document creation + ::rtl::OUString m_sDefaultTarget ; /// Name of default target + ::rtl::OUString m_sDescription ; /// Short description and comments + sal_Int16 m_nEditingCycles ; /// Document number + sal_Int32 m_nEditingDuration ; /// Duration since last edit + com::sun::star::uno::Sequence< sal_Int8 > m_seqExtraData ; /// Buffer of bytes for some extra data + ::rtl::OUString m_sInReplyTo ; /// Adress for reply to ... + sal_Bool m_bIsEncrypted ; /// Document is en/decrypted + ::rtl::OUString m_sKeywords ; /// Some keywords + ::rtl::OUString m_sMIMEType ; /// MIME-type of document + ::rtl::OUString m_sModifiedBy ; /// Name of user who has modified as last one + com::sun::star::util::DateTime m_aModifyDate ; /// Date and time of last modification + ::rtl::OUString m_sNewsgroups ; /// Document is a message of newsgroup + ::rtl::OUString m_sOriginal ; /// Message ID + sal_Bool m_bPortableGraphics ; /// Use of portable graphics + com::sun::star::util::DateTime m_aPrintDate ; /// Date and time of last print + ::rtl::OUString m_sPrintedBy ; /// Name of user who has printed as last one + sal_uInt16 m_nPriority ; /// Priority of message, if document a message! + sal_Bool m_bQueryTemplate ; /// Search for template ? + ::rtl::OUString m_sRecipient ; /// Name of recipient + ::rtl::OUString m_sReferences ; /// Some references to other things + ::rtl::OUString m_sReplyTo ; /// Adress to reply + sal_Bool m_bSaveGraphicsCompressed ; /// Compressed/non compressed graphics + sal_Bool m_bSaveOriginalGraphics ; /// Include graphics + sal_Bool m_bSaveVersionOnClose ; /// Save version on close of document ? + ::rtl::OUString m_sTemplate ; /// Name of template + sal_Bool m_bTemplateConfig ; /// Exist template config ? + com::sun::star::util::DateTime m_aTemplateDate ; /// Date and time of template + ::rtl::OUString m_sTemplateFileName ; /// File name of template + ::rtl::OUString m_sTheme ; /// Name of theme + ::rtl::OUString m_sTitle ; /// Title of document + sal_Bool m_bUserData ; /// Exist user data ? }; } diff --git a/framework/inc/helper/imageproducer.hxx b/framework/inc/helper/imageproducer.hxx index f3f057e7c74d..dff0ccfd1049 100644 --- a/framework/inc/helper/imageproducer.hxx +++ b/framework/inc/helper/imageproducer.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_HELPER_IMAGEPRODUCER_HXX_ //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <sal/types.h> #include <com/sun/star/frame/XFrame.hpp> diff --git a/framework/inc/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx index 8efbbac090be..6a1886244b54 100755 --- a/framework/inc/helper/mischelper.hxx +++ b/framework/inc/helper/mischelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -82,19 +82,19 @@ enum LangMenuIDs MID_LANG_PARA_RESET, MID_LANG_PARA_MORE, }; - - + + inline bool IsScriptTypeMatchingToLanguage( sal_Int16 nScriptType, LanguageType nLang ) { return 0 != (nScriptType & SvtLanguageOptions::GetScriptTypeOfLanguage( nLang )); } - + class LanguageGuessingHelper { mutable ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLanguageGuessing > m_xLanguageGuesser; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager; - + public: LanguageGuessingHelper(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xServiceManager) : m_xServiceManager(_xServiceManager){} diff --git a/framework/inc/helper/networkdomain.hxx b/framework/inc/helper/networkdomain.hxx index 6cc1c272906c..577b8a2672ad 100644 --- a/framework/inc/helper/networkdomain.hxx +++ b/framework/inc/helper/networkdomain.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/inc/helper/ocomponentaccess.hxx b/framework/inc/helper/ocomponentaccess.hxx index da9be2f8944a..ec5161ef5335 100644 --- a/framework/inc/helper/ocomponentaccess.hxx +++ b/framework/inc/helper/ocomponentaccess.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_HELPER_OCOMPONENTACCESS_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> @@ -40,7 +40,7 @@ #include <general.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/frame/XFramesSupplier.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> @@ -50,33 +50,33 @@ #include <com/sun/star/lang/XComponent.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/implbase1.hxx> #include <cppuhelper/weakref.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// exported const +// exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// exported definitions +// exported definitions //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** - @short implement XEnumerationAccess interface as helper to create many oneway enumeration of components - @descr We share mutex and framecontainer with ouer owner and have full access to his child tasks. + @short implement XEnumerationAccess interface as helper to create many oneway enumeration of components + @descr We share mutex and framecontainer with ouer owner and have full access to his child tasks. (Ouer owner can be the Desktop only!) We create oneway enumerations on demand. These "lists" can be used for one time only. Step during the list from first to last element. (The type of created enumerations is OComponentEnumeration.) - @implements XInterface + @implements XInterface XTypeProvider XEnumerationAccess XElementAccess @@ -84,171 +84,171 @@ namespace framework{ @base ThreadHelpBase OWeakObject - @devstatus ready to use + @devstatus ready to use *//*-*************************************************************************************************************/ -class OComponentAccess : private ThreadHelpBase , // Must be the first of baseclasses - Is neccessary for right initialization of objects! +class OComponentAccess : private ThreadHelpBase , // Must be the first of baseclasses - Is neccessary for right initialization of objects! public ::cppu::WeakImplHelper1< ::com::sun::star::container::XEnumerationAccess > { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: //--------------------------------------------------------------------------------------------------------- - // constructor / destructor + // constructor / destructor //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short constructor to initialize this instance - @descr A desktop will create an enumeration-access-object. An enumeration is a oneway-list and a + @short constructor to initialize this instance + @descr A desktop will create an enumeration-access-object. An enumeration is a oneway-list and a snapshot of the components of current tasks under the desktop. But we need a instance to create more then one enumerations at different times! - @seealso class Desktop - @seealso class OComponentEnumeration + @seealso class Desktop + @seealso class OComponentEnumeration - @param "xOwner" is a reference to ouer owner and must be the desktop! - @return - + @param "xOwner" is a reference to ouer owner and must be the desktop! + @return - - @onerror Do nothing and reset this object to default with an empty list. + @onerror Do nothing and reset this object to default with an empty list. *//*-*****************************************************************************************************/ OComponentAccess( const css::uno::Reference< css::frame::XDesktop >& xOwner ); //--------------------------------------------------------------------------------------------------------- - // XEnumerationAccess + // XEnumerationAccess //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short create a new enumeration of components - @descr You can call this method to get a new snapshot from all components of all tasks of the desktop as an enumeration. + @short create a new enumeration of components + @descr You can call this method to get a new snapshot from all components of all tasks of the desktop as an enumeration. - @seealso interface XEnumerationAccess - @seealso interface XEnumeration - @seealso class Desktop + @seealso interface XEnumerationAccess + @seealso interface XEnumeration + @seealso class Desktop - @param - - @return If the desktop and some components exist => a valid reference to an enumeration<BR> + @param - + @return If the desktop and some components exist => a valid reference to an enumeration<BR> An NULL-reference, other way. - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw( css::uno::RuntimeException ); //--------------------------------------------------------------------------------------------------------- - // XElementAccess + // XElementAccess //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short get the type of elements in enumeration - @descr - + @short get the type of elements in enumeration + @descr - - @seealso interface XElementAccess - @seealso class OComponentEnumeration + @seealso interface XElementAccess + @seealso class OComponentEnumeration - @param - - @return The uno-type XComponent. + @param - + @return The uno-type XComponent. - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual css::uno::Type SAL_CALL getElementType() throw( css::uno::RuntimeException ); /*-****************************************************************************************************//** - @short get state of componentlist of enumeration. - @descr - + @short get state of componentlist of enumeration. + @descr - - @seealso interface XElementAccess + @seealso interface XElementAccess - @param - - @return sal_True ,if more then 0 elements exist. - @return sal_False ,otherwise. + @param - + @return sal_True ,if more then 0 elements exist. + @return sal_False ,otherwise. - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual sal_Bool SAL_CALL hasElements() throw( css::uno::RuntimeException ); //------------------------------------------------------------------------------------------------------------- - // protected methods + // protected methods //------------------------------------------------------------------------------------------------------------- protected: /*-****************************************************************************************************//** - @short standard destructor - @descr This method destruct an instance of this class and clear some member. + @short standard destructor + @descr This method destruct an instance of this class and clear some member. Don't use an instance of this class as normal member. Use it dynamicly with a pointer. We hold a weakreference to ouer owner and not to ouer superclass! Thats the reason for a protected dtor. - @seealso class Desktop + @seealso class Desktop - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ - virtual ~OComponentAccess(); + virtual ~OComponentAccess(); //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: /*-****************************************************************************************************//** - @short recursive method (!) to collect all components of all frames from the subtree of given node - @descr This is neccessary to create the enumeration. + @short recursive method (!) to collect all components of all frames from the subtree of given node + @descr This is neccessary to create the enumeration. - @seealso method createEnumeration + @seealso method createEnumeration - @param "xNode" , root of subtree and start point of search - @param "seqComponents", result list of search. We cant use a return value, we search recursive + @param "xNode" , root of subtree and start point of search + @param "seqComponents", result list of search. We cant use a return value, we search recursive and must collect all informations. - @return - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ - void impl_collectAllChildComponents( const css::uno::Reference< css::frame::XFramesSupplier >& xNode , - css::uno::Sequence< css::uno::Reference< css::lang::XComponent > >& seqComponents ); + void impl_collectAllChildComponents( const css::uno::Reference< css::frame::XFramesSupplier >& xNode , + css::uno::Sequence< css::uno::Reference< css::lang::XComponent > >& seqComponents ); /*-****************************************************************************************************//** - @short get the component of a frame - @descr The component of a frame can be the window, the controller or the model. + @short get the component of a frame + @descr The component of a frame can be the window, the controller or the model. - @seealso method createEnumeration + @seealso method createEnumeration - @param "xFrame", frame which contains the component - @return A reference to the component of given frame. + @param "xFrame", frame which contains the component + @return A reference to the component of given frame. - @onerror A null reference is returned. + @onerror A null reference is returned. *//*-*****************************************************************************************************/ css::uno::Reference< css::lang::XComponent > impl_getFrameComponent( const css::uno::Reference< css::frame::XFrame >& xFrame ) const; //------------------------------------------------------------------------------------------------------------- - // debug methods - // (should be private everyway!) + // debug methods + // (should be private everyway!) //------------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short debug-method to check incoming parameter of some other mehods of this class - @descr The following methods are used to check parameters for other methods + @short debug-method to check incoming parameter of some other mehods of this class + @descr The following methods are used to check parameters for other methods of this class. The return value is used directly for an ASSERT(...). - @seealso ASSERTs in implementation! + @seealso ASSERTs in implementation! - @param references to checking variables - @return sal_False ,on invalid parameter. - @return sal_True ,otherwise + @param references to checking variables + @return sal_False ,on invalid parameter. + @return sal_True ,otherwise - @onerror - + @onerror - *//*-*****************************************************************************************************/ #ifdef ENABLE_ASSERTIONS @@ -257,19 +257,19 @@ class OComponentAccess : private ThreadHelpBase , // Must static sal_Bool impldbg_checkParameter_OComponentAccessCtor( const css::uno::Reference< css::frame::XDesktop >& xOwner ); - #endif // #ifdef ENABLE_ASSERTIONS + #endif // #ifdef ENABLE_ASSERTIONS //------------------------------------------------------------------------------------------------------------- - // variables - // (should be private everyway!) + // variables + // (should be private everyway!) //------------------------------------------------------------------------------------------------------------- private: css::uno::WeakReference< css::frame::XDesktop > m_xOwner ; /// weak reference to the desktop object! -}; // class OComponentAccess +}; // class OComponentAccess -} // namespace framework +} // namespace framework -#endif // #ifndef __FRAMEWORK_HELPER_OCOMPONENTACCESS_HXX_ +#endif // #ifndef __FRAMEWORK_HELPER_OCOMPONENTACCESS_HXX_ diff --git a/framework/inc/helper/ocomponentenumeration.hxx b/framework/inc/helper/ocomponentenumeration.hxx index acd5f68e3527..e3fce4bcac35 100644 --- a/framework/inc/helper/ocomponentenumeration.hxx +++ b/framework/inc/helper/ocomponentenumeration.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_HELPER_OCOMPONENTENUMERATION_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #ifndef __FRAMEWORK_OMUTEXMEMBER_HXX_ @@ -42,221 +42,221 @@ #include <general.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/container/XEnumeration.hpp> #include <com/sun/star/lang/XComponent.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/implbase2.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// exported const +// exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// exported definitions +// exported definitions //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** - @short implement a helper for a oneway enumeration of components - @descr You can step during this list only for one time! Its a snapshot. + @short implement a helper for a oneway enumeration of components + @descr You can step during this list only for one time! Its a snapshot. Don't forget to release the reference. You are the owner of an instance of this implementation. You cant use this as a baseclass. Please use it as a dynamical object for return. - @implements XInterface + @implements XInterface XTypeProvider XEventListener XEnumeration - @base ThreadHelpBase + @base ThreadHelpBase OWeakObject - @devstatus ready to use - @threadsafe yes + @devstatus ready to use + @threadsafe yes *//*-*************************************************************************************************************/ -class OComponentEnumeration : public ThreadHelpBase , +class OComponentEnumeration : public ThreadHelpBase , public ::cppu::WeakImplHelper2< ::com::sun::star::container::XEnumeration,::com::sun::star::lang::XEventListener > { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: //--------------------------------------------------------------------------------------------------------- - // constructor / destructor + // constructor / destructor //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short constructor to initialize this enumeration - @descr An enumeration is a list with oneway-access! You can get every member only for one time. + @short constructor to initialize this enumeration + @descr An enumeration is a list with oneway-access! You can get every member only for one time. This method allow to initialize this oneway list with values. - @seealso - + @seealso - - @param "seqComponents" is a sequence of interfaces, which are components. - @return - + @param "seqComponents" is a sequence of interfaces, which are components. + @return - - @onerror Do nothing and reset this object to default with an empty list. + @onerror Do nothing and reset this object to default with an empty list. *//*-*****************************************************************************************************/ OComponentEnumeration( const css::uno::Sequence< css::uno::Reference< css::lang::XComponent > >& seqComponents ); //--------------------------------------------------------------------------------------------------------- - // XEventListener + // XEventListener //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short last chance to release all references and free memory - @descr This method is called, if the enumeration is used completly and has no more elements. + @short last chance to release all references and free memory + @descr This method is called, if the enumeration is used completly and has no more elements. Then we must destroy ouer list and release all references to other objects. - @seealso interface XEventListener + @seealso interface XEventListener - @param "aEvent" describe the source of this event. - @return - + @param "aEvent" describe the source of this event. + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException ); //--------------------------------------------------------------------------------------------------------- - // XEnumeration + // XEnumeration //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short check count of accessible elements of enumeration - @descr You can call this method to get information about accessible elements in future. + @short check count of accessible elements of enumeration + @descr You can call this method to get information about accessible elements in future. Elements you have already getted are not accessible! - @seealso interface XEnumeration + @seealso interface XEnumeration - @param - - @return sal_True = if more elements accessible<BR> + @param - + @return sal_True = if more elements accessible<BR> sal_False = other way - @onerror sal_False<BR> + @onerror sal_False<BR> (List is emtpy and there no accessible elements ...) *//*-*****************************************************************************************************/ virtual sal_Bool SAL_CALL hasMoreElements() throw( css::uno::RuntimeException ); /*-****************************************************************************************************//** - @short give the next element, if some exist - @descr If a call "hasMoreElements()" return true, you can get the next element of list. + @short give the next element, if some exist + @descr If a call "hasMoreElements()" return true, you can get the next element of list. - @seealso interface XEnumeration + @seealso interface XEnumeration - @param - - @return A Reference to a component, safed in an Any-structure. + @param - + @return A Reference to a component, safed in an Any-structure. - @onerror If end of enumeration is arrived or there are no elements in list => a NoSuchElementException is thrown. + @onerror If end of enumeration is arrived or there are no elements in list => a NoSuchElementException is thrown. *//*-*****************************************************************************************************/ - virtual css::uno::Any SAL_CALL nextElement() throw( css::container::NoSuchElementException , - css::lang::WrappedTargetException , - css::uno::RuntimeException ); + virtual css::uno::Any SAL_CALL nextElement() throw( css::container::NoSuchElementException , + css::lang::WrappedTargetException , + css::uno::RuntimeException ); //------------------------------------------------------------------------------------------------------------- - // protected methods + // protected methods //------------------------------------------------------------------------------------------------------------- protected: /*-****************************************************************************************************//** - @short standard destructor - @descr This method destruct an instance of this class and clear some member. + @short standard destructor + @descr This method destruct an instance of this class and clear some member. We make it protected, because its not supported to use this class as normal instance! You must create it dynamical in memory and use a pointer. - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ - virtual ~OComponentEnumeration(); + virtual ~OComponentEnumeration(); /*-****************************************************************************************************//** - @short reset instance to default values + @short reset instance to default values - @descr There are two ways to delete an instance of this class.<BR> + @descr There are two ways to delete an instance of this class.<BR> 1) delete with destructor<BR> 2) dispose from parent or factory ore ...<BR> This method do the same for both ways! It free used memory and release references ... - @seealso method dispose() - @seealso destructor ~TaskEnumeration() + @seealso method dispose() + @seealso destructor ~TaskEnumeration() - @param - + @param - - @return - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual void impl_resetObject(); //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: //------------------------------------------------------------------------------------------------------------- - // debug methods - // (should be private everyway!) + // debug methods + // (should be private everyway!) //------------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short debug-method to check incoming parameter of some other mehods of this class - @descr The following methods are used to check parameters for other methods + @short debug-method to check incoming parameter of some other mehods of this class + @descr The following methods are used to check parameters for other methods of this class. The return value is used directly for an ASSERT(...). - @seealso ASSERT in implementation! + @seealso ASSERT in implementation! - @param references to checking variables - @return sal_False on invalid parameter<BR> + @param references to checking variables + @return sal_False on invalid parameter<BR> sal_True otherway - @onerror - + @onerror - *//*-*****************************************************************************************************/ #ifdef ENABLE_ASSERTIONS private: - static sal_Bool impldbg_checkParameter_OComponentEnumerationCtor ( const css::uno::Sequence< css::uno::Reference< css::lang::XComponent > >& seqComponents ); - static sal_Bool impldbg_checkParameter_disposing ( const css::lang::EventObject& aEvent ); + static sal_Bool impldbg_checkParameter_OComponentEnumerationCtor ( const css::uno::Sequence< css::uno::Reference< css::lang::XComponent > >& seqComponents ); + static sal_Bool impldbg_checkParameter_disposing ( const css::lang::EventObject& aEvent ); - #endif // #ifdef ENABLE_ASSERTIONS + #endif // #ifdef ENABLE_ASSERTIONS //------------------------------------------------------------------------------------------------------------- - // variables - // (should be private everyway!) + // variables + // (should be private everyway!) //------------------------------------------------------------------------------------------------------------- private: - sal_uInt32 m_nPosition ; /// current position in enumeration - css::uno::Sequence< css::uno::Reference< css::lang::XComponent > > m_seqComponents ; /// list of current components + sal_uInt32 m_nPosition ; /// current position in enumeration + css::uno::Sequence< css::uno::Reference< css::lang::XComponent > > m_seqComponents ; /// list of current components -}; // class OComponentEnumeration +}; // class OComponentEnumeration -} // namespace framework +} // namespace framework -#endif // #ifndef __FRAMEWORK_HELPER_OCOMPONENTENUMERATION_HXX_ +#endif // #ifndef __FRAMEWORK_HELPER_OCOMPONENTENUMERATION_HXX_ diff --git a/framework/inc/helper/oframes.hxx b/framework/inc/helper/oframes.hxx index 82d828dd1735..725b6aeb9394 100644 --- a/framework/inc/helper/oframes.hxx +++ b/framework/inc/helper/oframes.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_HELPER_OFRAMES_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <classes/framecontainer.hxx> @@ -41,315 +41,315 @@ #include <general.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XFrames.hpp> #include <com/sun/star/frame/XFrame.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/implbase1.hxx> #include <cppuhelper/weakref.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// exported const +// exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// exported definitions +// exported definitions //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** @short implement XFrames, XIndexAccess and XElementAccess interfaces as helper for services - @descr Use this class as helper for these interfaces. We share mutex and framecontainer with ouer owner. + @descr Use this class as helper for these interfaces. We share mutex and framecontainer with ouer owner. The framecontainer is a member of it from type "FrameContainer". That means; we have the same information as ouer owner. In current implementation we use mutex and lock-mechanism to prevent against compete access. In future we plan support of semaphore! - @devstatus deprecated - @implements XInterface + @devstatus deprecated + @implements XInterface XFrames XIndexAccess XElementAccess - @base OWeakObject + @base OWeakObject - @ATTENTION Don't use this class as direct member - use it dynamicly. Do not derive from this class. + @ATTENTION Don't use this class as direct member - use it dynamicly. Do not derive from this class. We hold a weakreference to ouer owner not to ouer superclass. - @devstatus deprecated + @devstatus deprecated *//*-*************************************************************************************************************/ class OFrames : private ThreadHelpBase , // Must be the first of baseclasses - Is neccessary for right initialization of objects! public ::cppu::WeakImplHelper1< ::com::sun::star::frame::XFrames > { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: //--------------------------------------------------------------------------------------------------------- - // constructor / destructor + // constructor / destructor //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short standard ctor - @descr These initialize a new instance of this class with all needed informations for work. + @short standard ctor + @descr These initialize a new instance of this class with all needed informations for work. We share framecontainer with owner implementation! It's a threadsafe container. - @seealso - + @seealso - - @param "xFactory" , reference to factory which has created ouer owner(!). We can use these to create new uno-services. - @param "xOwner" , reference to ouer owner. We hold a wekreference to prevent us against cross-references! - @param "pFrameContainer" , pointer to shared framecontainer of owner. It's valid only, if weakreference is valid! - @return - + @param "xFactory" , reference to factory which has created ouer owner(!). We can use these to create new uno-services. + @param "xOwner" , reference to ouer owner. We hold a wekreference to prevent us against cross-references! + @param "pFrameContainer" , pointer to shared framecontainer of owner. It's valid only, if weakreference is valid! + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ - OFrames( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory , - const css::uno::Reference< css::frame::XFrame >& xOwner , - FrameContainer* pFrameContainer ); + OFrames( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory , + const css::uno::Reference< css::frame::XFrame >& xOwner , + FrameContainer* pFrameContainer ); //--------------------------------------------------------------------------------------------------------- - // XFrames + // XFrames //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** @short append frame to container - @descr We share the container with ouer owner. We can do this only, if no lock is set on container. + @descr We share the container with ouer owner. We can do this only, if no lock is set on container. Valid references are accepted only! - @seealso class FrameContainer + @seealso class FrameContainer - @param "xFrame", reference to an existing frame to append. - @return - + @param "xFrame", reference to an existing frame to append. + @return - - @onerror We do nothing in release or throw an assert in debug version. + @onerror We do nothing in release or throw an assert in debug version. *//*-*****************************************************************************************************/ virtual void SAL_CALL append( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException ); /*-****************************************************************************************************//** @short remove frame from container - @descr This is the companion to append(). We only accept valid references and don't work, if + @descr This is the companion to append(). We only accept valid references and don't work, if a lock is set. - @seealso class FrameContainer + @seealso class FrameContainer - @param "xFrame", reference to an existing frame to remove. - @return - + @param "xFrame", reference to an existing frame to remove. + @return - - @onerror We do nothing in release or throw an assert in debug version. + @onerror We do nothing in release or throw an assert in debug version. *//*-*****************************************************************************************************/ virtual void SAL_CALL remove( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException ); /*-****************************************************************************************************//** @short return list of all applicable frames for given flags - @descr Call these to get a list of all frames, which are match with given search flags. + @descr Call these to get a list of all frames, which are match with given search flags. - @seealso - + @seealso - - @param "nSearchFlag", flags to search right frames. - @return A list of founded frames. + @param "nSearchFlag", flags to search right frames. + @return A list of founded frames. - @onerror An empty list is returned. + @onerror An empty list is returned. *//*-*****************************************************************************************************/ virtual css::uno::Sequence< css::uno::Reference< css::frame::XFrame > > SAL_CALL queryFrames( sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException ); //--------------------------------------------------------------------------------------------------------- - // XIndexAccess + // XIndexAccess //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** @short get count of all current frames in container - @descr This is the beginning of full index-access. With a count you can step over all items in container. + @descr This is the beginning of full index-access. With a count you can step over all items in container. Next call shuod be getByIndex(). But these mechanism works only, if no lock in container is set! - @seealso class FrameContainer - @seealso method getByIndex() + @seealso class FrameContainer + @seealso method getByIndex() - @param - - @return Count of current items in container. + @param - + @return Count of current items in container. - @onerror If a lock is set, we return 0 for prevent further access! + @onerror If a lock is set, we return 0 for prevent further access! *//*-*****************************************************************************************************/ virtual sal_Int32 SAL_CALL getCount() throw( css::uno::RuntimeException ); /*-****************************************************************************************************//** - @short get specified container item by index - @descr If you called getCount() successful - this method return the specified element as an Any. + @short get specified container item by index + @descr If you called getCount() successful - this method return the specified element as an Any. You must observe the range from 0 to count-1! Otherwise an IndexOutOfBoundsException is thrown. - @seealso class FrameContainer - @seealso method getCount() + @seealso class FrameContainer + @seealso method getCount() - @param "nIndex", valid index to get container item. - @return A container item (specified by index) wrapped in an Any. + @param "nIndex", valid index to get container item. + @return A container item (specified by index) wrapped in an Any. - @onerror If a lock is set, we return an empty Any! - @onerror If index out of range, an IndexOutOfBoundsException is thrown. + @onerror If a lock is set, we return an empty Any! + @onerror If index out of range, an IndexOutOfBoundsException is thrown. *//*-*****************************************************************************************************/ - virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 nIndex ) throw( css::lang::IndexOutOfBoundsException , - css::lang::WrappedTargetException , - css::uno::RuntimeException ); + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 nIndex ) throw( css::lang::IndexOutOfBoundsException , + css::lang::WrappedTargetException , + css::uno::RuntimeException ); //--------------------------------------------------------------------------------------------------------- - // XElementAccess + // XElementAccess //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** @short get uno-type of all container items - @descr In current implementation type is fixed to XFrame! + @descr In current implementation type is fixed to XFrame! (container-lock is ignored) - @seealso - + @seealso - - @param - - @return A uno-type descriptor. + @param - + @return A uno-type descriptor. - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual css::uno::Type SAL_CALL getElementType() throw( css::uno::RuntimeException ); /*-****************************************************************************************************//** @short get fill state of current container - @descr Call these to get information about, if items exist in container or not. + @descr Call these to get information about, if items exist in container or not. (container-lock is ignored) - @seealso - + @seealso - - @param - - @return sal_True, if container contains some items. - @return sal_False, otherwise. + @param - + @return sal_True, if container contains some items. + @return sal_False, otherwise. - @onerror We return sal_False. + @onerror We return sal_False. *//*-*****************************************************************************************************/ virtual sal_Bool SAL_CALL hasElements() throw( css::uno::RuntimeException ); //------------------------------------------------------------------------------------------------------------- - // protected methods + // protected methods //------------------------------------------------------------------------------------------------------------- protected: /*-****************************************************************************************************//** - @short standard destructor - @descr This method destruct an instance of this class and clear some member. + @short standard destructor + @descr This method destruct an instance of this class and clear some member. This method is protected, because its not allowed to use this class as a member! You MUST use a dynamical instance (pointer). That's the reason for a protected dtor. - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ - virtual ~OFrames(); + virtual ~OFrames(); /*-****************************************************************************************************//** - @short reset instance to default values - @descr There are two ways to delete an instance of this class.<BR> + @short reset instance to default values + @descr There are two ways to delete an instance of this class.<BR> 1) delete with destructor<BR> 2) dispose from parent or factory ore ...<BR> This method do the same for both ways! It free used memory and release references ... - @seealso method dispose() (if it exist!) - @seealso destructor ~TaskEnumeration() + @seealso method dispose() (if it exist!) + @seealso destructor ~TaskEnumeration() - @param - + @param - - @return - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual void impl_resetObject(); //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: /*-****************************************************************************************************//** - @short append one sequence to another - @descr There is no operation to add to sequences! Use this helper-method to do this. + @short append one sequence to another + @descr There is no operation to add to sequences! Use this helper-method to do this. - @seealso class Sequence + @seealso class Sequence - @param "seqDestination", reference to sequence on which operation will append the other sequence. - @param "seqSource" , reference to sequence for append. - @return "seqDestination" is parameter AND return value at the same time. + @param "seqDestination", reference to sequence on which operation will append the other sequence. + @param "seqSource" , reference to sequence for append. + @return "seqDestination" is parameter AND return value at the same time. - @onerror - + @onerror - *//*-*****************************************************************************************************/ - void impl_appendSequence( css::uno::Sequence< css::uno::Reference< css::frame::XFrame > >& seqDestination , - const css::uno::Sequence< css::uno::Reference< css::frame::XFrame > >& seqSource ); + void impl_appendSequence( css::uno::Sequence< css::uno::Reference< css::frame::XFrame > >& seqDestination , + const css::uno::Sequence< css::uno::Reference< css::frame::XFrame > >& seqSource ); //------------------------------------------------------------------------------------------------------------- - // debug methods - // (should be private everyway!) + // debug methods + // (should be private everyway!) //------------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short debug-method to check incoming parameter of some other mehods of this class - @descr The following methods are used to check parameters for other methods + @short debug-method to check incoming parameter of some other mehods of this class + @descr The following methods are used to check parameters for other methods of this class. The return value is used directly for an ASSERT(...). - @seealso ASSERTs in implementation! + @seealso ASSERTs in implementation! - @param references to checking variables - @return sal_False ,on invalid parameter - @return sal_True ,otherwise + @param references to checking variables + @return sal_False ,on invalid parameter + @return sal_True ,otherwise - @onerror - + @onerror - *//*-*****************************************************************************************************/ #ifdef ENABLE_ASSERTIONS private: - static sal_Bool impldbg_checkParameter_OFramesCtor ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory , - const css::uno::Reference< css::frame::XFrame >& xOwner , - FrameContainer* pFrameContainer ); - static sal_Bool impldbg_checkParameter_append ( const css::uno::Reference< css::frame::XFrame >& xFrame ); - static sal_Bool impldbg_checkParameter_remove ( const css::uno::Reference< css::frame::XFrame >& xFrame ); - static sal_Bool impldbg_checkParameter_queryFrames ( sal_Int32 nSearchFlags ); + static sal_Bool impldbg_checkParameter_OFramesCtor ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory , + const css::uno::Reference< css::frame::XFrame >& xOwner , + FrameContainer* pFrameContainer ); + static sal_Bool impldbg_checkParameter_append ( const css::uno::Reference< css::frame::XFrame >& xFrame ); + static sal_Bool impldbg_checkParameter_remove ( const css::uno::Reference< css::frame::XFrame >& xFrame ); + static sal_Bool impldbg_checkParameter_queryFrames ( sal_Int32 nSearchFlags ); - #endif // #ifdef ENABLE_ASSERTIONS + #endif // #ifdef ENABLE_ASSERTIONS //------------------------------------------------------------------------------------------------------------- - // variables - // (should be private everyway!) + // variables + // (should be private everyway!) //------------------------------------------------------------------------------------------------------------- private: - css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory ; /// reference to global servicemanager - css::uno::WeakReference< css::frame::XFrame > m_xOwner ; /// reference to owner of this instance (Hold no hard reference!) - FrameContainer* m_pFrameContainer ; /// with owner shared list to hold all direct childs of an XFramesSupplier - sal_Bool m_bRecursiveSearchProtection ; /// flag to protect against recursive searches of frames at parents + css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory ; /// reference to global servicemanager + css::uno::WeakReference< css::frame::XFrame > m_xOwner ; /// reference to owner of this instance (Hold no hard reference!) + FrameContainer* m_pFrameContainer ; /// with owner shared list to hold all direct childs of an XFramesSupplier + sal_Bool m_bRecursiveSearchProtection ; /// flag to protect against recursive searches of frames at parents -}; // class OFrames +}; // class OFrames -} // namespace framework +} // namespace framework -#endif // #ifndef __FRAMEWORK_HELPER_OFRAMES_HXX_ +#endif // #ifndef __FRAMEWORK_HELPER_OFRAMES_HXX_ diff --git a/framework/inc/helper/otasksaccess.hxx b/framework/inc/helper/otasksaccess.hxx index ad3e5e719143..d81e73d684f1 100644 --- a/framework/inc/helper/otasksaccess.hxx +++ b/framework/inc/helper/otasksaccess.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_HELPER_OTASKSACCESS_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <classes/framecontainer.hxx> @@ -40,7 +40,7 @@ #include <macros/debug.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/container/XElementAccess.hpp> @@ -48,207 +48,207 @@ #include <com/sun/star/frame/XDesktop.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/weak.hxx> #include <cppuhelper/weakref.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// exported const +// exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// exported definitions +// exported definitions //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** - @short implement XEnumerationAccess interface as helper to create many oneway enumeration of tasks - @descr We share mutex and framecontainer with ouer owner and have full access to his child tasks. + @short implement XEnumerationAccess interface as helper to create many oneway enumeration of tasks + @descr We share mutex and framecontainer with ouer owner and have full access to his child tasks. (Ouer owner can be the Desktop only!) We create oneway enumerations on demand. These "lists" can be used for one time only. Step during the list from first to last element. (The type of created enumerations is OTasksEnumeration.) - @implements XInterface + @implements XInterface XEnumerationAccess XElementAccess - @base OWeakObject + @base OWeakObject - @devstatus deprecated + @devstatus deprecated *//*-*************************************************************************************************************/ -class OTasksAccess : public css::lang::XTypeProvider , - public css::container::XEnumerationAccess , // => XElementAccess +class OTasksAccess : public css::lang::XTypeProvider , + public css::container::XEnumerationAccess , // => XElementAccess private ThreadHelpBase , public ::cppu::OWeakObject { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: //--------------------------------------------------------------------------------------------------------- - // constructor / destructor + // constructor / destructor //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short constructor to initialize this instance - @descr A desktop will create an enumeration-access-object. An enumeration is a oneway-list and a + @short constructor to initialize this instance + @descr A desktop will create an enumeration-access-object. An enumeration is a oneway-list and a snapshot of the tasklist of current tasks of desktop. But we need a instance to create more then one enumerations to the same tasklist! - @seealso class Desktop - @seealso class OTasksEnumeration + @seealso class Desktop + @seealso class OTasksEnumeration - @param "xOwner" is a reference to ouer owner and must be the desktop! - @param "pTasks" is a pointer to the taskcontainer of the desktop. We need it to create a new enumeration. - @return - + @param "xOwner" is a reference to ouer owner and must be the desktop! + @param "pTasks" is a pointer to the taskcontainer of the desktop. We need it to create a new enumeration. + @return - - @onerror Do nothing and reset this object to default with an empty list. + @onerror Do nothing and reset this object to default with an empty list. *//*-*****************************************************************************************************/ - OTasksAccess( const css::uno::Reference< css::frame::XDesktop >& xOwner , + OTasksAccess( const css::uno::Reference< css::frame::XDesktop >& xOwner , FrameContainer* pTasks ); //--------------------------------------------------------------------------------------------------------- - // XInterface + // XInterface //--------------------------------------------------------------------------------------------------------- DECLARE_XINTERFACE DECLARE_XTYPEPROVIDER //--------------------------------------------------------------------------------------------------------- - // XEnumerationAccess + // XEnumerationAccess //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short create a new enumeration of tasks - @descr You can call this method to get a new snapshot to all tasks of the desktop as an enumeration. + @short create a new enumeration of tasks + @descr You can call this method to get a new snapshot to all tasks of the desktop as an enumeration. - @seealso interface XEnumerationAccess - @seealso interface XEnumeration - @seealso class Desktop + @seealso interface XEnumerationAccess + @seealso interface XEnumeration + @seealso class Desktop - @param - - @return If the desktop and some tasks exist => a valid reference to an enumeration<BR> + @param - + @return If the desktop and some tasks exist => a valid reference to an enumeration<BR> An NULL-reference, other way. - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw( css::uno::RuntimeException ); //--------------------------------------------------------------------------------------------------------- - // XElementAccess + // XElementAccess //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short get the type of elements in enumeration - @descr - + @short get the type of elements in enumeration + @descr - - @seealso interface XElementAccess - @seealso class TasksEnumeration + @seealso interface XElementAccess + @seealso class TasksEnumeration - @param - - @return The uno-type XTask. + @param - + @return The uno-type XTask. - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual css::uno::Type SAL_CALL getElementType() throw( css::uno::RuntimeException ); /*-****************************************************************************************************//** - @short get state of tasklist of enumeration. - @descr - + @short get state of tasklist of enumeration. + @descr - - @seealso interface XElementAccess + @seealso interface XElementAccess - @param - - @return sal_True ,if more then 0 elements exist. - @return sal_False ,otherwise. + @param - + @return sal_True ,if more then 0 elements exist. + @return sal_False ,otherwise. - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual sal_Bool SAL_CALL hasElements() throw( css::uno::RuntimeException ); //------------------------------------------------------------------------------------------------------------- - // protected methods + // protected methods //------------------------------------------------------------------------------------------------------------- protected: /*-****************************************************************************************************//** - @short standard destructor - @descr This method destruct an instance of this class and clear some member. + @short standard destructor + @descr This method destruct an instance of this class and clear some member. Don't use an instance of this class as normal member. Use it dynamicly with a pointer. We hold a weakreference to ouer owner and not to ouer superclass! Thats the reason for a protected dtor. - @seealso class Desktop + @seealso class Desktop - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ - virtual ~OTasksAccess(); + virtual ~OTasksAccess(); //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: //------------------------------------------------------------------------------------------------------------- - // debug methods - // (should be private everyway!) + // debug methods + // (should be private everyway!) //------------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short debug-method to check incoming parameter of some other mehods of this class - @descr The following methods are used to check parameters for other methods + @short debug-method to check incoming parameter of some other mehods of this class + @descr The following methods are used to check parameters for other methods of this class. The return value is used directly for an ASSERT(...). - @seealso ASSERTs in implementation! + @seealso ASSERTs in implementation! - @param references to checking variables - @return sal_False ,on invalid parameter. - @return sal_True ,otherwise + @param references to checking variables + @return sal_False ,on invalid parameter. + @return sal_True ,otherwise - @onerror - + @onerror - *//*-*****************************************************************************************************/ #ifdef ENABLE_ASSERTIONS private: - static sal_Bool impldbg_checkParameter_OTasksAccessCtor( const css::uno::Reference< css::frame::XDesktop >& xOwner , + static sal_Bool impldbg_checkParameter_OTasksAccessCtor( const css::uno::Reference< css::frame::XDesktop >& xOwner , FrameContainer* pTasks ); - #endif // #ifdef ENABLE_ASSERTIONS + #endif // #ifdef ENABLE_ASSERTIONS //------------------------------------------------------------------------------------------------------------- - // variables - // (should be private everyway!) + // variables + // (should be private everyway!) //------------------------------------------------------------------------------------------------------------- private: - css::uno::WeakReference< css::frame::XDesktop > m_xOwner ; /// weak reference to the desktop object! - FrameContainer* m_pTasks ; /// pointer to list of current tasks on desktop (is a member of class Desktop!) + css::uno::WeakReference< css::frame::XDesktop > m_xOwner ; /// weak reference to the desktop object! + FrameContainer* m_pTasks ; /// pointer to list of current tasks on desktop (is a member of class Desktop!) /// This pointer is valid only, if weakreference can be locked. -}; // class OTasksAccess +}; // class OTasksAccess -} // namespace framework +} // namespace framework -#endif // #ifndef __FRAMEWORK_HELPER_OTASKSACCESS_HXX_ +#endif // #ifndef __FRAMEWORK_HELPER_OTASKSACCESS_HXX_ diff --git a/framework/inc/helper/otasksenumeration.hxx b/framework/inc/helper/otasksenumeration.hxx index 31616bd3e756..acbcb5b3b050 100644 --- a/framework/inc/helper/otasksenumeration.hxx +++ b/framework/inc/helper/otasksenumeration.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_HELPER_OTASKSENUMERATION_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #ifndef __FRAMEWORK_OMUTEXMEMBER_HXX_ @@ -42,7 +42,7 @@ #include <general.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/container/XEnumeration.hpp> @@ -50,223 +50,223 @@ #include <com/sun/star/frame/XFrame.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/weak.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// exported const +// exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// exported definitions +// exported definitions //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** - @short implement a helper for a oneway enumeration of tasks - @descr You can step during this list only for one time! Its a snapshot. + @short implement a helper for a oneway enumeration of tasks + @descr You can step during this list only for one time! Its a snapshot. Don't forget to release the reference. You are the owner of an instance of this implementation. You cant use this as a baseclass. Please use it as a dynamical object for return. - @implements XInterface + @implements XInterface XTypeProvider XEventListener XEnumeration - @base ThreadHelpBase + @base ThreadHelpBase OWeakObject - @devstatus ready to use + @devstatus ready to use *//*-*************************************************************************************************************/ -class OTasksEnumeration : public css::lang::XTypeProvider , - public css::lang::XEventListener , - public css::container::XEnumeration , - public ThreadHelpBase , +class OTasksEnumeration : public css::lang::XTypeProvider , + public css::lang::XEventListener , + public css::container::XEnumeration , + public ThreadHelpBase , public ::cppu::OWeakObject { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: //--------------------------------------------------------------------------------------------------------- - // constructor / destructor + // constructor / destructor //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short constructor to initialize this enumeration - @descr An enumeration is a list with oneway-access! You can get every member only for one time. + @short constructor to initialize this enumeration + @descr An enumeration is a list with oneway-access! You can get every member only for one time. This method allow to initialize this oneway list with values. - @seealso - + @seealso - - @param "seqTasks" is a sequence of interfaces, which are tasks. - @return - + @param "seqTasks" is a sequence of interfaces, which are tasks. + @return - - @onerror Do nothing and reset this object to default with an empty list. + @onerror Do nothing and reset this object to default with an empty list. *//*-*****************************************************************************************************/ OTasksEnumeration( const css::uno::Sequence< css::uno::Reference< css::frame::XFrame > >& seqTasks ); //--------------------------------------------------------------------------------------------------------- - // XInterface + // XInterface //--------------------------------------------------------------------------------------------------------- DECLARE_XINTERFACE DECLARE_XTYPEPROVIDER //--------------------------------------------------------------------------------------------------------- - // XEventListener + // XEventListener //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short last chance to release all references and free memory - @descr This method is called, if the enumeration is used completly and has no more elements. + @short last chance to release all references and free memory + @descr This method is called, if the enumeration is used completly and has no more elements. Then we must destroy ouer list and release all references to other objects. - @seealso interface XEventListener + @seealso interface XEventListener - @param "aEvent" describe the source of this event. - @return - + @param "aEvent" describe the source of this event. + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException ); //--------------------------------------------------------------------------------------------------------- - // XEnumeration + // XEnumeration //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short check count of accessible elements of enumeration - @descr You can call this method to get information about accessible elements in future. + @short check count of accessible elements of enumeration + @descr You can call this method to get information about accessible elements in future. Elements you have already getted are not accessible! - @seealso interface XEnumeration + @seealso interface XEnumeration - @param - - @return sal_True = if more elements accessible<BR> + @param - + @return sal_True = if more elements accessible<BR> sal_False = other way - @onerror sal_False<BR> + @onerror sal_False<BR> (List is emtpy and there no accessible elements ...) *//*-*****************************************************************************************************/ virtual sal_Bool SAL_CALL hasMoreElements() throw( css::uno::RuntimeException ); /*-****************************************************************************************************//** - @short give the next element, if some exist - @descr If a call "hasMoreElements()" return true, you can get the next element of list. + @short give the next element, if some exist + @descr If a call "hasMoreElements()" return true, you can get the next element of list. - @seealso interface XEnumeration + @seealso interface XEnumeration - @param - - @return A Reference to a task, safed in an Any-structure. + @param - + @return A Reference to a task, safed in an Any-structure. - @onerror If end of enumeration is arrived or there are no elements in list => a NoSuchElementException is thrown. + @onerror If end of enumeration is arrived or there are no elements in list => a NoSuchElementException is thrown. *//*-*****************************************************************************************************/ - virtual css::uno::Any SAL_CALL nextElement() throw( css::container::NoSuchElementException , - css::lang::WrappedTargetException , - css::uno::RuntimeException ); + virtual css::uno::Any SAL_CALL nextElement() throw( css::container::NoSuchElementException , + css::lang::WrappedTargetException , + css::uno::RuntimeException ); //------------------------------------------------------------------------------------------------------------- - // protected methods + // protected methods //------------------------------------------------------------------------------------------------------------- protected: /*-****************************************************************************************************//** - @short standard destructor - @descr This method destruct an instance of this class and clear some member. + @short standard destructor + @descr This method destruct an instance of this class and clear some member. We make it protected, because its not supported to use this class as normal instance! You must create it dynamical in memory and use a pointer. - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ - virtual ~OTasksEnumeration(); + virtual ~OTasksEnumeration(); /*-****************************************************************************************************//** - @short reset instance to default values + @short reset instance to default values - @descr There are two ways to delete an instance of this class.<BR> + @descr There are two ways to delete an instance of this class.<BR> 1) delete with destructor<BR> 2) dispose from parent or factory ore ...<BR> This method do the same for both ways! It free used memory and release references ... - @seealso method dispose() - @seealso destructor ~TaskEnumeration() + @seealso method dispose() + @seealso destructor ~TaskEnumeration() - @param - + @param - - @return - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual void impl_resetObject(); //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: //------------------------------------------------------------------------------------------------------------- - // debug methods - // (should be private everyway!) + // debug methods + // (should be private everyway!) //------------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short debug-method to check incoming parameter of some other mehods of this class - @descr The following methods are used to check parameters for other methods + @short debug-method to check incoming parameter of some other mehods of this class + @descr The following methods are used to check parameters for other methods of this class. The return value is used directly for an ASSERT(...). - @seealso ASSERT in implementation! + @seealso ASSERT in implementation! - @param references to checking variables - @return sal_False on invalid parameter<BR> + @param references to checking variables + @return sal_False on invalid parameter<BR> sal_True otherway - @onerror - + @onerror - *//*-*****************************************************************************************************/ #ifdef ENABLE_ASSERTIONS private: - static sal_Bool impldbg_checkParameter_OTasksEnumerationCtor ( const css::uno::Sequence< css::uno::Reference< css::frame::XFrame > >& seqTasks ); - static sal_Bool impldbg_checkParameter_disposing ( const css::lang::EventObject& aEvent ); + static sal_Bool impldbg_checkParameter_OTasksEnumerationCtor ( const css::uno::Sequence< css::uno::Reference< css::frame::XFrame > >& seqTasks ); + static sal_Bool impldbg_checkParameter_disposing ( const css::lang::EventObject& aEvent ); - #endif // #ifdef ENABLE_ASSERTIONS + #endif // #ifdef ENABLE_ASSERTIONS //------------------------------------------------------------------------------------------------------------- - // variables - // (should be private everyway!) + // variables + // (should be private everyway!) //------------------------------------------------------------------------------------------------------------- private: - sal_uInt32 m_nPosition ; /// current position in enumeration - css::uno::Sequence< css::uno::Reference< css::frame::XTask > > m_seqTasks ; /// list of current tasks + sal_uInt32 m_nPosition ; /// current position in enumeration + css::uno::Sequence< css::uno::Reference< css::frame::XTask > > m_seqTasks ; /// list of current tasks -}; // class OTasksEnumeration +}; // class OTasksEnumeration -} // namespace framework +} // namespace framework -#endif // #ifndef __FRAMEWORK_HELPER_OTASKSENUMERATION_HXX_ +#endif // #ifndef __FRAMEWORK_HELPER_OTASKSENUMERATION_HXX_ diff --git a/framework/inc/helper/persistentwindowstate.hxx b/framework/inc/helper/persistentwindowstate.hxx index 87c2cc0d83e2..3d700ee607df 100644 --- a/framework/inc/helper/persistentwindowstate.hxx +++ b/framework/inc/helper/persistentwindowstate.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_HELPER_PERSISTENTWINDOWSTATE_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> @@ -39,7 +39,7 @@ #include <general.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XInitialization.hpp> @@ -48,23 +48,23 @@ #include <com/sun/star/lang/XEventListener.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <unotools/moduleoptions.hxx> #include <cppuhelper/weak.hxx> //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** diff --git a/framework/inc/helper/propertysetcontainer.hxx b/framework/inc/helper/propertysetcontainer.hxx index 29b3beb74255..3420aa58b9c3 100644 --- a/framework/inc/helper/propertysetcontainer.hxx +++ b/framework/inc/helper/propertysetcontainer.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,8 +41,8 @@ namespace framework { -class PropertySetContainer : public com::sun::star::container::XIndexContainer , - public ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. +class PropertySetContainer : public com::sun::star::container::XIndexContainer , + public ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. public ::cppu::OWeakObject { public: @@ -84,11 +84,11 @@ class PropertySetContainer : public com::sun::star::container::XIndexContainer , throw (::com::sun::star::uno::RuntimeException); protected: - com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xServiceManager; + com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xServiceManager; private: typedef std::vector< com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > > PropertySetVector; - PropertySetVector m_aPropertySetVector; + PropertySetVector m_aPropertySetVector; }; diff --git a/framework/inc/helper/shareablemutex.hxx b/framework/inc/helper/shareablemutex.hxx index a551e88776cc..c591bb54d5c9 100644 --- a/framework/inc/helper/shareablemutex.hxx +++ b/framework/inc/helper/shareablemutex.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,12 +52,12 @@ class ShareableMutex { MutexRef() : m_refCount(0) {} void acquire() - { + { osl_incrementInterlockedCount( &m_refCount ); } - + void release() - { + { if ( osl_decrementInterlockedCount( &m_refCount ) == 0 ) delete this; } @@ -77,7 +77,7 @@ class ShareGuard { m_rShareMutex.acquire(); } - + ~ShareGuard() { m_rShareMutex.release(); @@ -89,7 +89,7 @@ class ShareGuard ShareableMutex& m_rShareMutex; }; - + } #endif // #ifndef __FRAMEWORK_HELPER_SHAREABLEMUTEX_HXX_ diff --git a/framework/inc/helper/statusindicator.hxx b/framework/inc/helper/statusindicator.hxx index 2468cc95e1dc..f43dc6d4f778 100644 --- a/framework/inc/helper/statusindicator.hxx +++ b/framework/inc/helper/statusindicator.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,18 +58,18 @@ namespace framework{ //_______________________________________________ /** @short implement a status indicator object - - @descr With this indicator you can show a message and a progress ... + + @descr With this indicator you can show a message and a progress ... but you share the output device with other indicator objects, if this instances was created by the same factory. Then the last created object has full access to device. All others change her internal data structure only. - + All objects of this StatusIndicator class calls a c++ interface on the StatusIndicatorFactory (where they was created). The factory holds all data structures and paints the progress. - @devstatus ready to use + @devstatus ready to use @threadsafe yes */ class StatusIndicator : public css::lang::XTypeProvider @@ -80,7 +80,7 @@ class StatusIndicator : public css::lang::XTypeProvider //------------------------------------------- // member private: - + /** @short weak reference to our factory @descr All our interface calls will be forwarded to a suitable c++ interface on this factory. @@ -90,19 +90,19 @@ class StatusIndicator : public css::lang::XTypeProvider he close our factory too ... */ css::uno::WeakReference< css::task::XStatusIndicatorFactory > m_xFactory; - + //------------------------------------------- // c++ interface public: //---------------------------------------- /** @short initialize new instance of this class. - + @param pFactory pointer to our factory */ StatusIndicator(StatusIndicatorFactory* pFactory); - + //---------------------------------------- /** @short does nothing real .... */ @@ -111,7 +111,7 @@ class StatusIndicator : public css::lang::XTypeProvider //------------------------------------------- // uno interface public: - + //--------------------------------------- // XInterface, XTypeProvider FWK_DECLARE_XINTERFACE @@ -122,16 +122,16 @@ class StatusIndicator : public css::lang::XTypeProvider virtual void SAL_CALL start(const ::rtl::OUString& sText , sal_Int32 nRange) throw(css::uno::RuntimeException); - + virtual void SAL_CALL end() throw(css::uno::RuntimeException); - + virtual void SAL_CALL reset() throw(css::uno::RuntimeException); - + virtual void SAL_CALL setText(const ::rtl::OUString& sText) throw(css::uno::RuntimeException); - + virtual void SAL_CALL setValue(sal_Int32 nValue) throw(css::uno::RuntimeException); diff --git a/framework/inc/helper/statusindicatorfactory.hxx b/framework/inc/helper/statusindicatorfactory.hxx index fc00d9999dbe..b2f2258517af 100644 --- a/framework/inc/helper/statusindicatorfactory.hxx +++ b/framework/inc/helper/statusindicatorfactory.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -163,7 +163,7 @@ typedef ::std::vector< IndicatorInfo > IndicatorStack; //=============================================== /** @short implement a factory service to create new status indicator objects - @descr Internaly it uses: + @descr Internaly it uses: - a vcl based - or an uno based and by the frame layouted progress implementation. @@ -173,7 +173,7 @@ typedef ::std::vector< IndicatorInfo > IndicatorStack; can write his state to this device. All other requests will be cached only. - @devstatus ready to use + @devstatus ready to use @threadsafe yes */ class StatusIndicatorFactory : public css::lang::XTypeProvider @@ -316,7 +316,7 @@ class StatusIndicatorFactory : public css::lang::XTypeProvider layouted by the frame and provided as an uno interface. */ void impl_showProgress(); - + /** @short hides the internal used progress. @descr This factory does not paint the progress itself. It uses helper for that. They can be vcl based or diff --git a/framework/inc/helper/tagwindowasmodified.hxx b/framework/inc/helper/tagwindowasmodified.hxx index 63646821f1ce..2aec417eb375 100644 --- a/framework/inc/helper/tagwindowasmodified.hxx +++ b/framework/inc/helper/tagwindowasmodified.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_HELPER_TAGWINDOWASMODIFIED_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> @@ -39,7 +39,7 @@ #include <general.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XInitialization.hpp> @@ -49,22 +49,22 @@ #include <com/sun/star/frame/XFrameActionListener.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/weak.hxx> //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** @@ -77,7 +77,7 @@ namespace framework{ @base OWeakObject implements ref counting for this class. - + @devstatus draft @threadsafe yes @modified as96863 @@ -98,16 +98,16 @@ class TagWindowAsModified : // interfaces /// may we need an uno service manager to create own services css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR; - + /// reference to the frame, where we listen for new loaded documents for updating our own xModel reference css::uno::WeakReference< css::frame::XFrame > m_xFrame; - + /// reference to the frame container window, where we must set the tag css::uno::WeakReference< css::awt::XWindow > m_xWindow; - + /// we list on the model for modify events css::uno::WeakReference< css::frame::XModel > m_xModel; - + //________________________________ // interface @@ -138,18 +138,18 @@ class TagWindowAsModified : // interfaces // XFrameActionListener virtual void SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent) throw(css::uno::RuntimeException); - + //____________________________ // XEventListener virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException); - + private: - + //____________________________ // @todo document me void impl_update(const css::uno::Reference< css::frame::XFrame >& xFrame); - + }; // class TagWindowAsModified } // namespace framework diff --git a/framework/inc/helper/timerhelper.hxx b/framework/inc/helper/timerhelper.hxx index 58ff489b5146..a37bd5b2ce05 100644 --- a/framework/inc/helper/timerhelper.hxx +++ b/framework/inc/helper/timerhelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,10 +43,10 @@ namespace framework class ITimerListener { public: - virtual void timerExpired() = 0; + virtual void timerExpired() = 0; }; //........................................................................ -} // namespace framework +} // namespace framework //........................................................................ #endif // _FRAMEWORK_HELPER_TIMERHELPER_HXX_ diff --git a/framework/inc/helper/titlebarupdate.hxx b/framework/inc/helper/titlebarupdate.hxx index b1a2b3a40de7..8081f823cc52 100644 --- a/framework/inc/helper/titlebarupdate.hxx +++ b/framework/inc/helper/titlebarupdate.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_HELPER_TITLEBARUPDATE_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #ifndef __FRAMEWORK_THREADHELP_THREADHELPBASE_HXX_ @@ -53,7 +53,7 @@ #endif //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ @@ -85,7 +85,7 @@ #endif //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX @@ -101,17 +101,17 @@ #endif //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** diff --git a/framework/inc/helper/titlehelper.hxx b/framework/inc/helper/titlehelper.hxx index be935a7c56f8..a816b4299539 100644 --- a/framework/inc/helper/titlehelper.hxx +++ b/framework/inc/helper/titlehelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,7 +67,7 @@ namespace framework{ // definitions /** @short can be used as implementation helper of interface css.frame.XTitle - + @threadsafe */ class TitleHelper : private ::cppu::BaseMutex @@ -83,42 +83,42 @@ class TitleHelper : private ::cppu::BaseMutex //--------------------------------------- /** @short lightweight constructor. - */ + */ TitleHelper(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR); - + //--------------------------------------- /** @short free all internaly used resources. - */ + */ virtual ~TitleHelper(); - + //--------------------------------------- /** set an outside component which uses this container and must be set as source of all broadcasted messages, exceptions. - + It's holded weak only so we do not need any complex dispose sessions. - + Note: Passing NULL as parameter will be alloed. It will reset the internal member reference only. - + @param xOwner the new owner of this collection. */ void setOwner (const css::uno::Reference< css::uno::XInterface >& xOwner); - + //--------------------------------------- /** set an outside component which provides the righht string and number for an untitled component. - + It's holded weak only so we do not need any complex dispose sessions. - + Note: Passing NULL as parameter will be alloed. It will reset the internal member reference only. - + @param xNumbers the right numbered collection for this helper. */ void connectWithUntitledNumbers (const css::uno::Reference< css::frame::XUntitledNumbers >& xNumbers); - + //--------------------------------------- /** @see XTitle */ virtual ::rtl::OUString SAL_CALL getTitle() @@ -133,22 +133,22 @@ class TitleHelper : private ::cppu::BaseMutex /** @see XTitleChangeBroadcaster */ virtual void SAL_CALL addTitleChangeListener(const css::uno::Reference< css::frame::XTitleChangeListener >& xListener) throw (css::uno::RuntimeException); - + //--------------------------------------- /** @see XTitleChangeBroadcaster */ virtual void SAL_CALL removeTitleChangeListener(const css::uno::Reference< css::frame::XTitleChangeListener >& xListener) throw (css::uno::RuntimeException); - + //--------------------------------------- /** @see XTitleChangeListener */ virtual void SAL_CALL titleChanged(const css::frame::TitleChangedEvent& aEvent) throw (css::uno::RuntimeException); - + //--------------------------------------- /** @see css.document.XEventListener */ virtual void SAL_CALL notifyEvent(const css::document::EventObject& aEvent) throw (css::uno::RuntimeException); - + //--------------------------------------- /** @see css.lang.XEventListener */ virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) @@ -158,23 +158,23 @@ class TitleHelper : private ::cppu::BaseMutex /** @see css.frame.XFrameActionListener */ virtual void SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent) throw(css::uno::RuntimeException); - + //------------------------------------------- // internal private: void impl_sendTitleChangedEvent (); - + void impl_updateTitle (); void impl_updateTitleForModel (const css::uno::Reference< css::frame::XModel >& xModel); void impl_updateTitleForController (const css::uno::Reference< css::frame::XController >& xController); void impl_updateTitleForFrame (const css::uno::Reference< css::frame::XFrame >& xFrame); - + void impl_startListeningForModel (const css::uno::Reference< css::frame::XModel >& xModel); void impl_startListeningForController (const css::uno::Reference< css::frame::XController >& xController); void impl_startListeningForFrame (const css::uno::Reference< css::frame::XFrame >& xFrame); void impl_updateListeningForFrame (const css::uno::Reference< css::frame::XFrame >& xFrame); - + void impl_appendComponentTitle ( ::rtl::OUStringBuffer& sTitle , const css::uno::Reference< css::uno::XInterface >& xComponent); void impl_appendProductName (::rtl::OUStringBuffer& sTitle); @@ -182,40 +182,40 @@ class TitleHelper : private ::cppu::BaseMutex void impl_appendModuleName (::rtl::OUStringBuffer& sTitle); void impl_appendDebugVersion (::rtl::OUStringBuffer& sTitle); void impl_appendEvalVersion (::rtl::OUStringBuffer& sTitle); - + void impl_setSubTitle (const css::uno::Reference< css::frame::XTitle >& xSubTitle); ::rtl::OUString impl_getSubTitle (); - + ::rtl::OUString impl_convertURL2Title(const ::rtl::OUString& sURL); - + //------------------------------------------- // member private: - + /** points to the global uno service manager. */ css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR; - + /** reference to the outside UNO class using this helper. */ css::uno::WeakReference< css::uno::XInterface > m_xOwner; - + /** used to know how an "Untitled X" string can be created right :-) */ css::uno::WeakReference< css::frame::XUntitledNumbers > m_xUntitledNumbers; - + /** provides parts of our own title and we listen there for changes too. */ css::uno::WeakReference< css::frame::XTitle > m_xSubTitle; - + /** if it's set to TRUE the member m_sTitle has not to be changed internaly. It was set from outside and so outside code has to make sure it will be updated. */ ::sal_Bool m_bExternalTitle; - + /** the actual title value */ ::rtl::OUString m_sTitle; - + /** knows the leased number which must be used for untitled components. */ ::sal_Int32 m_nLeasedNumber; - + /** contains all title change listener */ ::cppu::OMultiTypeInterfaceContainerHelper m_aListener; }; diff --git a/framework/inc/helper/uiconfigelementwrapperbase.hxx b/framework/inc/helper/uiconfigelementwrapperbase.hxx index 69a81ca0f65c..05ab216d6f06 100644 --- a/framework/inc/helper/uiconfigelementwrapperbase.hxx +++ b/framework/inc/helper/uiconfigelementwrapperbase.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_HELPER_UICONFIGELEMENTWRAPPERBASE_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> @@ -38,7 +38,7 @@ #include <macros/xtypeprovider.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/ui/XUIElement.hpp> #include <com/sun/star/ui/XUIElementSettings.hpp> @@ -52,7 +52,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <rtl/ustring.hxx> #include <cppuhelper/propshlp.hxx> @@ -75,14 +75,14 @@ class UIConfigElementWrapperBase : public ::com::sun::star::lang::XTypeProvider public ::cppu::OWeakObject { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: UIConfigElementWrapperBase( sal_Int16 nType,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xServiceFactory ); virtual ~UIConfigElementWrapperBase(); - + //--------------------------------------------------------------------------------------------------------- - // XInterface, XTypeProvider + // XInterface, XTypeProvider //--------------------------------------------------------------------------------------------------------- FWK_DECLARE_XINTERFACE FWK_DECLARE_XTYPEPROVIDER @@ -94,7 +94,7 @@ class UIConfigElementWrapperBase : public ::com::sun::star::lang::XTypeProvider // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - + // XUIElementSettings virtual void SAL_CALL updateSettings() throw (::com::sun::star::uno::RuntimeException) = 0; virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getSettings( sal_Bool bWriteable ) throw (::com::sun::star::uno::RuntimeException); @@ -119,11 +119,11 @@ class UIConfigElementWrapperBase : public ::com::sun::star::lang::XTypeProvider virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException); //------------------------------------------------------------------------------------------------------------- - // protected methods + // protected methods //------------------------------------------------------------------------------------------------------------- protected: - // OPropertySetHelper + // OPropertySetHelper virtual sal_Bool SAL_CALL convertFastPropertyValue ( com::sun::star::uno::Any& aConvertedValue , com::sun::star::uno::Any& aOldValue , sal_Int32 nHandle , diff --git a/framework/inc/helper/uielementwrapperbase.hxx b/framework/inc/helper/uielementwrapperbase.hxx index 7ccf9ac97318..bc83765b09fe 100644 --- a/framework/inc/helper/uielementwrapperbase.hxx +++ b/framework/inc/helper/uielementwrapperbase.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_HELPER_UIELEMENTWRAPPERBASE_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> @@ -38,7 +38,7 @@ #include <macros/xtypeprovider.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/ui/XUIElement.hpp> #include <com/sun/star/lang/XInitialization.hpp> @@ -47,7 +47,7 @@ #include <com/sun/star/util/XUpdatable.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <rtl/ustring.hxx> #include <cppuhelper/propshlp.hxx> @@ -68,14 +68,14 @@ class UIElementWrapperBase : public ::com::sun::star::lang::XTypeProvider public ::cppu::OWeakObject { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: UIElementWrapperBase( sal_Int16 nType ); virtual ~UIElementWrapperBase(); - + //--------------------------------------------------------------------------------------------------------- - // XInterface, XTypeProvider + // XInterface, XTypeProvider //--------------------------------------------------------------------------------------------------------- FWK_DECLARE_XINTERFACE FWK_DECLARE_XTYPEPROVIDER @@ -84,10 +84,10 @@ class UIElementWrapperBase : public ::com::sun::star::lang::XTypeProvider virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException) = 0; virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); - + // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - + // XUpdatable virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException); @@ -98,11 +98,11 @@ class UIElementWrapperBase : public ::com::sun::star::lang::XTypeProvider virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException) = 0; //------------------------------------------------------------------------------------------------------------- - // protected methods + // protected methods //------------------------------------------------------------------------------------------------------------- protected: - // OPropertySetHelper + // OPropertySetHelper virtual sal_Bool SAL_CALL convertFastPropertyValue ( com::sun::star::uno::Any& aConvertedValue , com::sun::star::uno::Any& aOldValue , sal_Int32 nHandle , diff --git a/framework/inc/helper/vclstatusindicator.hxx b/framework/inc/helper/vclstatusindicator.hxx index 5ebb6fed1765..ec2d5ce72bc5 100644 --- a/framework/inc/helper/vclstatusindicator.hxx +++ b/framework/inc/helper/vclstatusindicator.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,69 +61,69 @@ class VCLStatusIndicator : public css::task::XStatusIndicator { //------------------------------------------- // member - + private: - + /** can be used to create own needed uno resources. */ css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR; - + /** points to the parent window of this progress and hold it alive. */ css::uno::Reference< css::awt::XWindow > m_xParentWindow; - + /** shows the progress. - + @attention This member isnt synchronized using our own mutex! Its guarded by the solarmutex only. Otherwhise we have to lock two of them, which can force a deadlock ... */ StatusBar* m_pStatusBar; - + /** knows the current info text of the progress. */ ::rtl::OUString m_sText; - + /** knows the current range of the progress. */ sal_Int32 m_nRange; - + /** knows the current value of the progress. */ sal_Int32 m_nValue; - + //------------------------------------------- // interface - + public: FWK_DECLARE_XINTERFACE - + /// ctor VCLStatusIndicator(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR , const css::uno::Reference< css::awt::XWindow >& xParentWindow); - - /// dtor - virtual ~VCLStatusIndicator(); - + + /// dtor + virtual ~VCLStatusIndicator(); + /// XStatusIndicator virtual void SAL_CALL start(const ::rtl::OUString& sText , sal_Int32 nRange) throw(css::uno::RuntimeException); - + virtual void SAL_CALL reset() throw(css::uno::RuntimeException); - + virtual void SAL_CALL end() throw(css::uno::RuntimeException); - + virtual void SAL_CALL setText(const ::rtl::OUString& sText) throw(css::uno::RuntimeException); - + virtual void SAL_CALL setValue(sal_Int32 nValue) throw(css::uno::RuntimeException); - + //------------------------------------------- // helper - + private: - + static void impl_recalcLayout(Window* pStatusBar , Window* pParentWindow); }; diff --git a/framework/inc/helper/wakeupthread.hxx b/framework/inc/helper/wakeupthread.hxx index e0ec288b0459..7d3ca0539ef8 100644 --- a/framework/inc/helper/wakeupthread.hxx +++ b/framework/inc/helper/wakeupthread.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,31 +68,31 @@ class WakeUpThread : public ThreadHelpBase //------------------------------------------- // member private: - + /** @short this listener will be notified if this thread waked up. */ css::uno::WeakReference< css::util::XUpdatable > m_xListener; - + //------------------------------------------- // interface public: - + /** @short Register a new listener on this thread. - + @descr The listener is holded as a weak reference. If the thread detects, that no listener exists ... he will terminate itself. */ WakeUpThread(const css::uno::Reference< css::util::XUpdatable >& xListener); - + /** @descr The thread waits on a condition using a fix timeout value. If the thread wakes up he notify the internal set listener. The listener can use this "timeout" info for it's own purpose. The thread itself will wait on the condition again. */ virtual void SAL_CALL run(); - - virtual void SAL_CALL onTerminated(); + + virtual void SAL_CALL onTerminated(); }; } // namespace framework diff --git a/framework/inc/helpid.hrc b/framework/inc/helpid.hrc index 4fd3bdfbfde7..f40d5fcaaa2d 100644 --- a/framework/inc/helpid.hrc +++ b/framework/inc/helpid.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ #define HID_BACKINGWINDOW (HID_FRAMEWORK_START + 0) #define HID_LICENSEDIALOG (HID_FRAMEWORK_START + 1) -#define HID_STATUSBAR (HID_FRAMEWORK_START + 2) +#define HID_STATUSBAR (HID_FRAMEWORK_START + 2) #define ACT_FRAMEWORK_HID_END HID_BACKINGWINDOW diff --git a/framework/inc/interaction/preventduplicateinteraction.hxx b/framework/inc/interaction/preventduplicateinteraction.hxx index 8ddb09e45a1d..4ba9554b21f9 100644 --- a/framework/inc/interaction/preventduplicateinteraction.hxx +++ b/framework/inc/interaction/preventduplicateinteraction.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,25 +29,25 @@ #define __FRAMEWORK_INTERACTION_PREVENTDUPLICATEINTERACTION_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <vector> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/task/XInteractionHandler2.hpp> #include <com/sun/star/task/XInteractionRequest.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/implbase1.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ @@ -59,11 +59,11 @@ namespace framework{ #endif //_________________________________________________________________________________________________________________ -// exported const +// exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// exported definitions +// exported definitions //_________________________________________________________________________________________________________________ /** diff --git a/framework/inc/interaction/quietinteraction.hxx b/framework/inc/interaction/quietinteraction.hxx index 23fef608e6ca..0d812774e583 100644 --- a/framework/inc/interaction/quietinteraction.hxx +++ b/framework/inc/interaction/quietinteraction.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_INTERACTION_QUIETINTERACTION_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> @@ -38,28 +38,28 @@ #include <general.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/task/XInteractionHandler.hpp> #include <com/sun/star/task/XInteractionRequest.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/weak.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// exported const +// exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// exported definitions +// exported definitions //_________________________________________________________________________________________________________________ /** diff --git a/framework/inc/jobs/configaccess.hxx b/framework/inc/jobs/configaccess.hxx index 68b76c6ffe5a..4a634f0192e4 100644 --- a/framework/inc/jobs/configaccess.hxx +++ b/framework/inc/jobs/configaccess.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/inc/jobs/helponstartup.hxx b/framework/inc/jobs/helponstartup.hxx index 8041b9e13b39..4649f1d094ad 100644 --- a/framework/inc/jobs/helponstartup.hxx +++ b/framework/inc/jobs/helponstartup.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,7 +73,7 @@ class HelpOnStartup : private ThreadHelpBase //....................................... /** @short reference to an uno service manager. */ css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR; - + //....................................... /** @short such module manager is used to classify new opened documents. */ css::uno::Reference< css::frame::XModuleManager > m_xModuleManager; @@ -87,13 +87,13 @@ class HelpOnStartup : private ThreadHelpBase css::uno::Reference< css::container::XNameAccess > m_xConfig; //....................................... - /** @short knows the current locale of this office session, + /** @short knows the current locale of this office session, which is needed to build complete help URLs. */ ::rtl::OUString m_sLocale; //....................................... - /** @short knows the current operating system of this office session, + /** @short knows the current operating system of this office session, which is needed to build complete help URLs. */ ::rtl::OUString m_sSystem; @@ -127,7 +127,7 @@ class HelpOnStartup : private ThreadHelpBase //--------------------------------------- // css.lang.XServiceInfo DECLARE_XSERVICEINFO - + // css.task.XJob virtual css::uno::Any SAL_CALL execute(const css::uno::Sequence< css::beans::NamedValue >& lArguments) throw(css::lang::IllegalArgumentException, diff --git a/framework/inc/jobs/job.hxx b/framework/inc/jobs/job.hxx index e972ff56e89c..9a4541896e4f 100644 --- a/framework/inc/jobs/job.hxx +++ b/framework/inc/jobs/job.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/inc/jobs/jobconst.hxx b/framework/inc/jobs/jobconst.hxx index 369e02a99a17..56acbb6f182f 100644 --- a/framework/inc/jobs/jobconst.hxx +++ b/framework/inc/jobs/jobconst.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,7 +62,7 @@ namespace framework{ class JobConst { public: - + static const ::rtl::OUString ANSWER_DEACTIVATE_JOB(); static const ::rtl::OUString ANSWER_SAVE_ARGUMENTS(); static const ::rtl::OUString ANSWER_SEND_DISPATCHRESULT(); diff --git a/framework/inc/jobs/jobdata.hxx b/framework/inc/jobs/jobdata.hxx index 95233ef1eb46..21aa027cc874 100644 --- a/framework/inc/jobs/jobdata.hxx +++ b/framework/inc/jobs/jobdata.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -142,13 +142,13 @@ class JobData : private ThreadHelpBase /// this job is used by the global event broadcaster E_DOCUMENTEVENT }; - + /** Some jobs can be registered to "logical events", which are generated on demand if another document event occures. E.g. "onDocumentOpened" in case "OnNew" or "OnLoad" was notified to the JobExecutor instance. And normaly the original event is transported as parameter set to the executed job. But then such job cant differ between e.g. "OnNew" and "onDocumentOpened". That's why we must know, for which type of event the job was realy triggered .-) - + The information "sDocEvent" from this struct must be set on the member JobData::m_sEvent from outside user of such Jobdata structure. */ @@ -156,7 +156,7 @@ class JobData : private ThreadHelpBase { ::rtl::OUString m_sJobName; ::rtl::OUString m_sDocEvent; - + TJob2DocEventBinding(const ::rtl::OUString& sJobName , const ::rtl::OUString& sDocEvent) : m_sJobName (sJobName ) diff --git a/framework/inc/jobs/jobdispatch.hxx b/framework/inc/jobs/jobdispatch.hxx index 1f381a3d6952..85e501e866e1 100644 --- a/framework/inc/jobs/jobdispatch.hxx +++ b/framework/inc/jobs/jobdispatch.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/inc/jobs/jobexecutor.hxx b/framework/inc/jobs/jobexecutor.hxx index 28c1426a5801..ead1022df2ec 100644 --- a/framework/inc/jobs/jobexecutor.hxx +++ b/framework/inc/jobs/jobexecutor.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/inc/jobs/jobresult.hxx b/framework/inc/jobs/jobresult.hxx index bfaa38011701..9d2a7c1419cd 100644 --- a/framework/inc/jobs/jobresult.hxx +++ b/framework/inc/jobs/jobresult.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/inc/jobs/joburl.hxx b/framework/inc/jobs/joburl.hxx index c59e2f79d298..15cc4f37da2e 100644 --- a/framework/inc/jobs/joburl.hxx +++ b/framework/inc/jobs/joburl.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/inc/jobs/shelljob.hxx b/framework/inc/jobs/shelljob.hxx index efe043c50246..64f6226ca58f 100644 --- a/framework/inc/jobs/shelljob.hxx +++ b/framework/inc/jobs/shelljob.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,7 +78,7 @@ class ShellJob : private ThreadHelpBase //....................................... /** @short reference to an uno service manager. */ css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR; - + //------------------------------------------- // native interface public: @@ -108,7 +108,7 @@ class ShellJob : private ThreadHelpBase //--------------------------------------- // css.lang.XServiceInfo DECLARE_XSERVICEINFO - + // css.task.XJob virtual css::uno::Any SAL_CALL execute(const css::uno::Sequence< css::beans::NamedValue >& lArguments) throw(css::lang::IllegalArgumentException, @@ -118,45 +118,45 @@ class ShellJob : private ThreadHelpBase //------------------------------------------- // helper private: - + //--------------------------------------- /** generate a return value for method execute() which will force deactivation of this job for further requests. - + @return an Any following the job protocol for deactivation. */ static css::uno::Any impl_generateAnswer4Deactivation(); - + //--------------------------------------- /** substitute all might existing placeholder variables within the configured command. - + The command is part of the job configuration. These will make changes more easy (no code changes required). Further the command can use placeholder as they are supported by the global substitution service (e.g. $(prog) etcpp) - + @param sCommand the command containing placeholder variables. - + @return the substituted command. */ ::rtl::OUString impl_substituteCommandVariables(const ::rtl::OUString& sCommand); //--------------------------------------- /** executes the command. - + @param sCommand the absolute command as URL or system path (without any argument !). - + @param lArguments the complete list of arguments configured for these job. - + @param bCheckExitCode bind the execution result to the exit code of the started process. If it's set to false we return false only in case executable couldnt be found or couldnt be started. - + @return TRUE if command was executed successfully; FALSE otherwise. */ ::sal_Bool impl_execute(const ::rtl::OUString& sCommand , diff --git a/framework/inc/loadstate.h b/framework/inc/loadstate.h index 49e301d8d25c..6c735282d56f 100644 --- a/framework/inc/loadstate.h +++ b/framework/inc/loadstate.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,14 +29,14 @@ #define __FRAMEWORK_LOADSTATE_H_ //_________________________________________________________________________________________________________________ -// includes +// includes //_________________________________________________________________________________________________________________ #include <com/sun/star/ucb/InteractiveIOException.hpp> #include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ diff --git a/framework/inc/macros/debug.hxx b/framework/inc/macros/debug.hxx index cb6e9a0d39c5..f48d816460d2 100644 --- a/framework/inc/macros/debug.hxx +++ b/framework/inc/macros/debug.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,9 +29,9 @@ #define __FRAMEWORK_MACROS_DEBUG_HXX_ //***************************************************************************************************************** -// Disable all feature of this file in produkt version! -// But enable normal assertion handling (as messagebox) in normal debug version. -// User can overwrite these adjustment with his own values! We will do it only if nothing is set. +// Disable all feature of this file in produkt version! +// But enable normal assertion handling (as messagebox) in normal debug version. +// User can overwrite these adjustment with his own values! We will do it only if nothing is set. //***************************************************************************************************************** //----------------------------------------------------------------------------------------------------------------- @@ -40,14 +40,14 @@ // Enable log mechanism for normal assertion and error handling. // Look for user decisions before! - #ifndef ENABLE_LOGMECHANISM - #define ENABLE_LOGMECHANISM + #ifndef ENABLE_LOGMECHANISM + #define ENABLE_LOGMECHANISM #endif // Enable assertion handling himself AND additional warnings. // The default logtype is MESSAGEBOX. // see "assertion.hxx" for further informations - #ifndef ENABLE_ASSERTIONS - #define ENABLE_ASSERTIONS + #ifndef ENABLE_ASSERTIONS + #define ENABLE_ASSERTIONS #endif #ifndef ENABLE_WARNINGS #define ENABLE_WARNINGS @@ -59,14 +59,14 @@ // Enable log mechanism for normal assertion and error handling. // Look for user decisions before! - #ifndef ENABLE_LOGMECHANISM - #define ENABLE_LOGMECHANISM + #ifndef ENABLE_LOGMECHANISM + #define ENABLE_LOGMECHANISM #endif // Enable assertion handling himself. // The default logtype is MESSAGEBOX. // see "assertion.hxx" for further informations - #ifndef ENABLE_ASSERTIONS - #define ENABLE_ASSERTIONS + #ifndef ENABLE_ASSERTIONS + #define ENABLE_ASSERTIONS #endif //----------------------------------------------------------------------------------------------------------------- @@ -76,9 +76,9 @@ #undef ENABLE_LOGMECHANISM #undef ENABLE_ASSERTIONS #undef ENABLE_WARNINGS - #undef ENABLE_EVENTDEBUG - #undef ENABLE_REGISTRATIONDEBUG - #undef ENABLE_TARGETINGDEBUG + #undef ENABLE_EVENTDEBUG + #undef ENABLE_REGISTRATIONDEBUG + #undef ENABLE_TARGETINGDEBUG #undef ENABLE_MUTEXDEBUG // #undef ENABLE_TIMEMEASURE #undef ENABLE_MEMORYMEASURE @@ -87,28 +87,28 @@ #endif //***************************************************************************************************************** -// generic macros for logging +// generic macros for logging //***************************************************************************************************************** #include <macros/debug/logmechanism.hxx> //***************************************************************************************************************** -// special macros for assertion handling +// special macros for assertion handling //***************************************************************************************************************** #include <macros/debug/assertion.hxx> //***************************************************************************************************************** -// special macros for event handling +// special macros for event handling //***************************************************************************************************************** #include <macros/debug/event.hxx> //***************************************************************************************************************** -// special macros to debug service registration +// special macros to debug service registration //***************************************************************************************************************** #include <macros/debug/registration.hxx> //***************************************************************************************************************** -// special macros to debug targeting of frames +// special macros to debug targeting of frames //***************************************************************************************************************** #include <macros/debug/targeting.hxx> @@ -131,7 +131,7 @@ #include <macros/debug/filterdbg.hxx> //***************************************************************************************************************** -// end of file +// end of file //***************************************************************************************************************** -#endif // #ifndef __FRAMEWORK_MACROS_DEBUG_HXX_ +#endif // #ifndef __FRAMEWORK_MACROS_DEBUG_HXX_ diff --git a/framework/inc/macros/debug/assertion.hxx b/framework/inc/macros/debug/assertion.hxx index bb7b5434e47f..a2e6197a8b91 100644 --- a/framework/inc/macros/debug/assertion.hxx +++ b/framework/inc/macros/debug/assertion.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ #endif //***************************************************************************************************************** -// special macros for assertion handling +// special macros for assertion handling // 1) LOGTYPE use it to define the output of all assertions, errors, exception infos // 2) LOGFILE_ASSERTIONS use it to define the file name to log assertions if LOGTYPE=LOGTYPE_FILE... // 3) LOGFILE_WARNINGS use it to define the file name to log warnings if LOGTYPE=LOGTYPE_FILE... @@ -71,7 +71,7 @@ For follow macros we need a special log file. If user forget to specify anyone, we must do it for him! _____________________________________________________________________________________________________________*/ - #ifndef LOGFILE_ASSERTIONS + #ifndef LOGFILE_ASSERTIONS #define LOGFILE_ASSERTIONS "_framework_assertions.log" #endif @@ -83,24 +83,24 @@ Set LOGTYPE to LOGTYPE_FILECONTINUE to do this. BCONDITION is inserted in "(...)" because user can call this macro with an complex expression! _____________________________________________________________________________________________________________*/ - #if LOGTYPE==LOGTYPE_FILECONTINUE + #if LOGTYPE==LOGTYPE_FILECONTINUE - #define LOG_ASSERT( BCONDITION, STEXT ) \ - if ( ( BCONDITION ) == sal_False ) \ - { \ - WRITE_LOGFILE( LOGFILE_ASSERTIONS, STEXT ) \ + #define LOG_ASSERT( BCONDITION, STEXT ) \ + if ( ( BCONDITION ) == sal_False ) \ + { \ + WRITE_LOGFILE( LOGFILE_ASSERTIONS, STEXT ) \ } - #define LOG_ASSERT2( BCONDITION, SMETHOD, STEXT ) \ - if ( ( BCONDITION ) == sal_True ) \ - { \ - ::rtl::OStringBuffer _sAssertBuffer( 256 ); \ - _sAssertBuffer.append( "ASSERT:\n\t" ); \ - _sAssertBuffer.append( SMETHOD ); \ - _sAssertBuffer.append( "\n\t\"" ); \ - _sAssertBuffer.append( STEXT ); \ - _sAssertBuffer.append( "\"\n" ); \ - WRITE_LOGFILE( LOGFILE_ASSERTIONS, _sAssertBuffer.makeStringAndClear() ) \ + #define LOG_ASSERT2( BCONDITION, SMETHOD, STEXT ) \ + if ( ( BCONDITION ) == sal_True ) \ + { \ + ::rtl::OStringBuffer _sAssertBuffer( 256 ); \ + _sAssertBuffer.append( "ASSERT:\n\t" ); \ + _sAssertBuffer.append( SMETHOD ); \ + _sAssertBuffer.append( "\n\t\"" ); \ + _sAssertBuffer.append( STEXT ); \ + _sAssertBuffer.append( "\"\n" ); \ + WRITE_LOGFILE( LOGFILE_ASSERTIONS, _sAssertBuffer.makeStringAndClear() ) \ } #endif @@ -113,26 +113,26 @@ Set LOGTYPE to LOGTYPE_FILEEXIT to do this. BCONDITION is inserted in "(...)" because user can call this macro with an complex expression! _____________________________________________________________________________________________________________*/ - #if LOGTYPE==LOGTYPE_FILEEXIT + #if LOGTYPE==LOGTYPE_FILEEXIT - #define LOG_ASSERT( BCONDITION, STEXT ) \ - if ( ( BCONDITION ) == sal_False ) \ - { \ - WRITE_LOGFILE( LOGFILE_ASSERTIONS, STEXT ) \ - exit(-1); \ + #define LOG_ASSERT( BCONDITION, STEXT ) \ + if ( ( BCONDITION ) == sal_False ) \ + { \ + WRITE_LOGFILE( LOGFILE_ASSERTIONS, STEXT ) \ + exit(-1); \ } - #define LOG_ASSERT2( BCONDITION, SMETHODE, STEXT ) \ - if ( ( BCONDITION ) == sal_True ) \ - { \ - ::rtl::OStringBuffer _sAssertBuffer( 256 ); \ - _sAssertBuffer.append( "ASSERT:\n\t" ); \ - _sAssertBuffer.append( SMETHOD ); \ - _sAssertBuffer.append( "\n\t\"" ); \ - _sAssertBuffer.append( STEXT ); \ - _sAssertBuffer.append( "\"\n" ); \ - WRITE_LOGFILE( LOGFILE_ASSERTIONS, _sAssertBuffer.makeStringAndClear() ) \ - exit(-1); \ + #define LOG_ASSERT2( BCONDITION, SMETHODE, STEXT ) \ + if ( ( BCONDITION ) == sal_True ) \ + { \ + ::rtl::OStringBuffer _sAssertBuffer( 256 ); \ + _sAssertBuffer.append( "ASSERT:\n\t" ); \ + _sAssertBuffer.append( SMETHOD ); \ + _sAssertBuffer.append( "\n\t\"" ); \ + _sAssertBuffer.append( STEXT ); \ + _sAssertBuffer.append( "\"\n" ); \ + WRITE_LOGFILE( LOGFILE_ASSERTIONS, _sAssertBuffer.makeStringAndClear() ) \ + exit(-1); \ } #endif @@ -145,20 +145,20 @@ Set LOGTYPE to LOGTYPE_MESSAGEBOX to do this. BCONDITION is inserted in "(...)" because user can call this macro with an complex expression! _____________________________________________________________________________________________________________*/ - #if LOGTYPE==LOGTYPE_MESSAGEBOX + #if LOGTYPE==LOGTYPE_MESSAGEBOX - #define LOG_ASSERT( BCONDITION, STEXT ) \ + #define LOG_ASSERT( BCONDITION, STEXT ) \ OSL_ENSURE( ( BCONDITION ), STEXT ); - #define LOG_ASSERT2( BCONDITION, SMETHOD, STEXT ) \ - { \ - ::rtl::OStringBuffer _sAssertBuffer( 256 ); \ - _sAssertBuffer.append( "ASSERT:\n\t" ); \ - _sAssertBuffer.append( SMETHOD ); \ - _sAssertBuffer.append( "\n\t\"" ); \ - _sAssertBuffer.append( STEXT ); \ - _sAssertBuffer.append( "\"\n" ); \ - OSL_ENSURE( !( BCONDITION ), _sAssertBuffer.makeStringAndClear() ); \ + #define LOG_ASSERT2( BCONDITION, SMETHOD, STEXT ) \ + { \ + ::rtl::OStringBuffer _sAssertBuffer( 256 ); \ + _sAssertBuffer.append( "ASSERT:\n\t" ); \ + _sAssertBuffer.append( SMETHOD ); \ + _sAssertBuffer.append( "\n\t\"" ); \ + _sAssertBuffer.append( STEXT ); \ + _sAssertBuffer.append( "\"\n" ); \ + OSL_ENSURE( !( BCONDITION ), _sAssertBuffer.makeStringAndClear() ); \ } #endif @@ -169,16 +169,16 @@ Show an error by using current set output mode by define LOGTYPE! _____________________________________________________________________________________________________________*/ - #define LOG_ERROR( SMETHOD, STEXT ) \ + #define LOG_ERROR( SMETHOD, STEXT ) \ LOG_ASSERT2( sal_True, SMETHOD, STEXT ) #else // If right testmode is'nt set - implements these macros empty! #undef LOGFILE_ASSERTIONS - #define LOG_ASSERT( BCONDITION, STEXT ) - #define LOG_ASSERT2( BCONDITION, SMETHOD, STEXT ) - #define LOG_ERROR( SMETHOD, STEXT ) + #define LOG_ASSERT( BCONDITION, STEXT ) + #define LOG_ASSERT2( BCONDITION, SMETHOD, STEXT ) + #define LOG_ERROR( SMETHOD, STEXT ) #endif // ENABLE_ASSERTIONS @@ -202,13 +202,13 @@ We use a seperated scope {} do protect us against multiple variable definitions. _____________________________________________________________________________________________________________*/ - #define LOG_EXCEPTION( SMETHOD, SOWNMESSAGE, SEXCEPTIONMESSAGE ) \ - { \ - ::rtl::OStringBuffer _sAssertBuffer2( 256 ); \ - _sAssertBuffer2.append( SOWNMESSAGE ); \ - _sAssertBuffer2.append( "\n" ); \ - _sAssertBuffer2.append( U2B(SEXCEPTIONMESSAGE) ); \ - LOG_ERROR( SMETHOD, _sAssertBuffer2.makeStringAndClear() ) \ + #define LOG_EXCEPTION( SMETHOD, SOWNMESSAGE, SEXCEPTIONMESSAGE ) \ + { \ + ::rtl::OStringBuffer _sAssertBuffer2( 256 ); \ + _sAssertBuffer2.append( SOWNMESSAGE ); \ + _sAssertBuffer2.append( "\n" ); \ + _sAssertBuffer2.append( U2B(SEXCEPTIONMESSAGE) ); \ + LOG_ERROR( SMETHOD, _sAssertBuffer2.makeStringAndClear() ) \ } /*_____________________________________________________________________________________________________________ @@ -232,4 +232,4 @@ #endif // ENABLE_WARNINGS -#endif // #ifndef __FRAMEWORK_MACROS_DEBUG_ASSERTION_HXX_ +#endif // #ifndef __FRAMEWORK_MACROS_DEBUG_ASSERTION_HXX_ diff --git a/framework/inc/macros/debug/event.hxx b/framework/inc/macros/debug/event.hxx index 275becfc37ab..794057100766 100644 --- a/framework/inc/macros/debug/event.hxx +++ b/framework/inc/macros/debug/event.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,13 +29,13 @@ #define __FRAMEWORK_MACROS_DEBUG_EVENT_HXX_ //************************************************************************************************************* -// special macros for event handling +// special macros for event handling //************************************************************************************************************* -#ifdef ENABLE_EVENTDEBUG +#ifdef ENABLE_EVENTDEBUG //_________________________________________________________________________________________________________________ - // includes + // includes //_________________________________________________________________________________________________________________ #ifndef _RTL_STRBUF_HXX_ @@ -48,8 +48,8 @@ For follow macros we need a special log file. If user forget to specify anyone, we must do it for him! _____________________________________________________________________________________________________________*/ - #ifndef LOGFILE_EVENTDEBUG - #define LOGFILE_EVENTDEBUG \ + #ifndef LOGFILE_EVENTDEBUG + #define LOGFILE_EVENTDEBUG \ "events.log" #endif @@ -60,39 +60,39 @@ ( Use new scope in macro to declare sBuffer more then on time in same "parentscope"! ) _____________________________________________________________________________________________________________*/ - #define LOG_FRAMEACTIONEVENT( SFRAMETYPE, SFRAMENAME, AFRAMEACTION ) \ - { \ - ::rtl::OStringBuffer sBuffer(1024); \ - sBuffer.append( "[ " ); \ - sBuffer.append( SFRAMETYPE ); \ - sBuffer.append( " ] \"" ); \ - sBuffer.append( U2B( SFRAMENAME ) ); \ - sBuffer.append( "\" send event \"" ); \ - switch( AFRAMEACTION ) \ - { \ - case ::com::sun::star::frame::FrameAction_COMPONENT_ATTACHED : sBuffer.append("COMPONENT ATTACHED" ); \ - break; \ - case ::com::sun::star::frame::FrameAction_COMPONENT_DETACHING : sBuffer.append("COMPONENT DETACHING" ); \ - break; \ - case ::com::sun::star::frame::FrameAction_COMPONENT_REATTACHED : sBuffer.append("COMPONENT REATTACHED" ); \ - break; \ - case ::com::sun::star::frame::FrameAction_FRAME_ACTIVATED : sBuffer.append("FRAME ACTIVATED" ); \ - break; \ - case ::com::sun::star::frame::FrameAction_FRAME_DEACTIVATING : sBuffer.append("FRAME DEACTIVATING" ); \ - break; \ - case ::com::sun::star::frame::FrameAction_CONTEXT_CHANGED : sBuffer.append("CONTEXT CHANGED" ); \ - break; \ - case ::com::sun::star::frame::FrameAction_FRAME_UI_ACTIVATED : sBuffer.append("FRAME UI ACTIVATED" ); \ - break; \ - case ::com::sun::star::frame::FrameAction_FRAME_UI_DEACTIVATING : sBuffer.append("FRAME UI DEACTIVATING" ); \ - break; \ - case ::com::sun::star::frame::FrameAction_MAKE_FIXED_SIZE : sBuffer.append("MAKE_FIXED_SIZE" ); \ - break; \ - default: sBuffer.append("... ERROR: invalid FrameAction detected!" ); \ - break; \ - } \ - sBuffer.append( " ... event to listener.\n\n" ); \ - WRITE_LOGFILE( LOGFILE_EVENTDEBUG, sBuffer.makeStringAndClear() ) \ + #define LOG_FRAMEACTIONEVENT( SFRAMETYPE, SFRAMENAME, AFRAMEACTION ) \ + { \ + ::rtl::OStringBuffer sBuffer(1024); \ + sBuffer.append( "[ " ); \ + sBuffer.append( SFRAMETYPE ); \ + sBuffer.append( " ] \"" ); \ + sBuffer.append( U2B( SFRAMENAME ) ); \ + sBuffer.append( "\" send event \"" ); \ + switch( AFRAMEACTION ) \ + { \ + case ::com::sun::star::frame::FrameAction_COMPONENT_ATTACHED : sBuffer.append("COMPONENT ATTACHED" ); \ + break; \ + case ::com::sun::star::frame::FrameAction_COMPONENT_DETACHING : sBuffer.append("COMPONENT DETACHING" ); \ + break; \ + case ::com::sun::star::frame::FrameAction_COMPONENT_REATTACHED : sBuffer.append("COMPONENT REATTACHED" ); \ + break; \ + case ::com::sun::star::frame::FrameAction_FRAME_ACTIVATED : sBuffer.append("FRAME ACTIVATED" ); \ + break; \ + case ::com::sun::star::frame::FrameAction_FRAME_DEACTIVATING : sBuffer.append("FRAME DEACTIVATING" ); \ + break; \ + case ::com::sun::star::frame::FrameAction_CONTEXT_CHANGED : sBuffer.append("CONTEXT CHANGED" ); \ + break; \ + case ::com::sun::star::frame::FrameAction_FRAME_UI_ACTIVATED : sBuffer.append("FRAME UI ACTIVATED" ); \ + break; \ + case ::com::sun::star::frame::FrameAction_FRAME_UI_DEACTIVATING : sBuffer.append("FRAME UI DEACTIVATING" ); \ + break; \ + case ::com::sun::star::frame::FrameAction_MAKE_FIXED_SIZE : sBuffer.append("MAKE_FIXED_SIZE" ); \ + break; \ + default: sBuffer.append("... ERROR: invalid FrameAction detected!" ); \ + break; \ + } \ + sBuffer.append( " ... event to listener.\n\n" ); \ + WRITE_LOGFILE( LOGFILE_EVENTDEBUG, sBuffer.makeStringAndClear() ) \ } /*_____________________________________________________________________________________________________________ @@ -102,31 +102,31 @@ ( Use new scope in macro to declare sBuffer more then on time in same "parentscope"! ) _____________________________________________________________________________________________________________*/ - #define LOG_DISPOSEEVENT( SFRAMETYPE, SFRAMENAME ) \ - { \ - ::rtl::OStringBuffer sBuffer(1024); \ - sBuffer.append( "[ " ); \ - sBuffer.append( SFRAMETYPE ); \ - sBuffer.append( " ] \"" ); \ - sBuffer.append( U2B( SFRAMENAME ) ); \ - sBuffer.append( "\" send dispose event to listener.\n\n"); \ - WRITE_LOGFILE( LOGFILE_EVENTDEBUG, sBuffer.makeStringAndClear() ) \ + #define LOG_DISPOSEEVENT( SFRAMETYPE, SFRAMENAME ) \ + { \ + ::rtl::OStringBuffer sBuffer(1024); \ + sBuffer.append( "[ " ); \ + sBuffer.append( SFRAMETYPE ); \ + sBuffer.append( " ] \"" ); \ + sBuffer.append( U2B( SFRAMENAME ) ); \ + sBuffer.append( "\" send dispose event to listener.\n\n"); \ + WRITE_LOGFILE( LOGFILE_EVENTDEBUG, sBuffer.makeStringAndClear() ) \ } -#else // #ifdef ENABLE_EVENTDEBUG +#else // #ifdef ENABLE_EVENTDEBUG /*_____________________________________________________________________________________________________________ If right testmode is'nt set - implements these macros empty! _____________________________________________________________________________________________________________*/ - #undef LOGFILE_EVENTDEBUG + #undef LOGFILE_EVENTDEBUG #define LOG_FRAMEACTIONEVENT( SFRAMETYPE, SFRAMENAME, AFRAMEACTION ) - #define LOG_DISPOSEEVENT( SFRAMETYPE, SFRAMENAME ) + #define LOG_DISPOSEEVENT( SFRAMETYPE, SFRAMENAME ) -#endif // #ifdef ENABLE_EVENTDEBUG +#endif // #ifdef ENABLE_EVENTDEBUG //***************************************************************************************************************** -// end of file +// end of file //***************************************************************************************************************** -#endif // #ifndef __FRAMEWORK_MACROS_DEBUG_EVENT_HXX_ +#endif // #ifndef __FRAMEWORK_MACROS_DEBUG_EVENT_HXX_ diff --git a/framework/inc/macros/debug/filterdbg.hxx b/framework/inc/macros/debug/filterdbg.hxx index 7befac530ee9..ab408f1b50e5 100644 --- a/framework/inc/macros/debug/filterdbg.hxx +++ b/framework/inc/macros/debug/filterdbg.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ #ifdef ENABLE_FILTERDBG //_________________________________________________________________________________________________________________ - // includes + // includes //_________________________________________________________________________________________________________________ #ifndef _RTL_STRBUF_HXX_ @@ -124,7 +124,7 @@ #endif // #ifdef ENABLE_FILTERDBG //***************************************************************************************************************** -// end of file +// end of file //***************************************************************************************************************** #endif // #ifndef __FRAMEWORK_MACROS_DEBUG_FILTERDBG_HXX_ diff --git a/framework/inc/macros/debug/logmechanism.hxx b/framework/inc/macros/debug/logmechanism.hxx index 9afa2546cafd..a2f6e4ec6f48 100644 --- a/framework/inc/macros/debug/logmechanism.hxx +++ b/framework/inc/macros/debug/logmechanism.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,13 +29,13 @@ #define __FRAMEWORK_MACROS_DEBUG_LOGMECHANISM_HXX_ //***************************************************************************************************************** -// generic macros for logging +// generic macros for logging //***************************************************************************************************************** -#ifdef ENABLE_LOGMECHANISM +#ifdef ENABLE_LOGMECHANISM //_____________________________________________________________________________________________________________ - // includes + // includes //_____________________________________________________________________________________________________________ #ifndef _RTL_STRING_HXX_ @@ -56,11 +56,11 @@ are handled wrong. _____________________________________________________________________________________________________________*/ - #define WRITE_LOGFILE( SFILENAME, STEXT ) \ - { \ - ::rtl::OString _swriteLogfileFileName ( SFILENAME ); \ - ::rtl::OString _swriteLogfileText ( STEXT ); \ - FILE* pFile = fopen( _swriteLogfileFileName.getStr(), "a" ); \ + #define WRITE_LOGFILE( SFILENAME, STEXT ) \ + { \ + ::rtl::OString _swriteLogfileFileName ( SFILENAME ); \ + ::rtl::OString _swriteLogfileText ( STEXT ); \ + FILE* pFile = fopen( _swriteLogfileFileName.getStr(), "a" ); \ fprintf( pFile, "%s", _swriteLogfileText.getStr() ); \ fclose ( pFile ); \ } @@ -69,34 +69,34 @@ LOGTYPE For other debug macros we need information about the output mode. If user forget to set this information we - do it for him. Valid values are: LOGTYPE_FILECONTINUE + do it for him. Valid values are: LOGTYPE_FILECONTINUE LOGTYPE_FILEEXIT LOGTYPE_MESSAGEBOX The normal case is LOGTYPE_MESSAGEBOX to show assertions in normal manner! _____________________________________________________________________________________________________________*/ - #define LOGTYPE_MESSAGEBOX 1 - #define LOGTYPE_FILECONTINUE 2 - #define LOGTYPE_FILEEXIT 3 + #define LOGTYPE_MESSAGEBOX 1 + #define LOGTYPE_FILECONTINUE 2 + #define LOGTYPE_FILEEXIT 3 - #ifndef LOGTYPE - #define LOGTYPE \ + #ifndef LOGTYPE + #define LOGTYPE \ LOGTYPE_MESSAGEBOX #endif -#else // #ifdef ENABLE_LOGMECHANISM +#else // #ifdef ENABLE_LOGMECHANISM /*_____________________________________________________________________________________________________________ If right testmode is'nt set - implements these macro empty! _____________________________________________________________________________________________________________*/ - #define WRITE_LOGFILE( SFILENAME, STEXT ) - #undef LOGTYPE + #define WRITE_LOGFILE( SFILENAME, STEXT ) + #undef LOGTYPE -#endif // #ifdef ENABLE_LOGMECHANISM +#endif // #ifdef ENABLE_LOGMECHANISM //***************************************************************************************************************** -// end of file +// end of file //***************************************************************************************************************** -#endif // #ifndef __FRAMEWORK_MACROS_DEBUG_LOGMECHANISM_HXX_ +#endif // #ifndef __FRAMEWORK_MACROS_DEBUG_LOGMECHANISM_HXX_ diff --git a/framework/inc/macros/debug/memorymeasure.hxx b/framework/inc/macros/debug/memorymeasure.hxx index e4106a3fa897..06bd9305adeb 100644 --- a/framework/inc/macros/debug/memorymeasure.hxx +++ b/framework/inc/macros/debug/memorymeasure.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ #endif //_________________________________________________________________________________________________________________ - // includes + // includes //_________________________________________________________________________________________________________________ #ifndef _RTL_STRBUF_HXX_ @@ -217,7 +217,7 @@ #endif // #ifdef ENABLE_MEMORYMEASURE //***************************************************************************************************************** -// end of file +// end of file //***************************************************************************************************************** #endif // #ifndef __FRAMEWORK_MACROS_DEBUG_MEMORYMEASURE_HXX_ diff --git a/framework/inc/macros/debug/mutex.hxx b/framework/inc/macros/debug/mutex.hxx index e8bd4852181e..85aec5acd9cd 100644 --- a/framework/inc/macros/debug/mutex.hxx +++ b/framework/inc/macros/debug/mutex.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,13 +29,13 @@ #define __FRAMEWORK_MACROS_DEBUG_MUTEX_HXX_ //***************************************************************************************************************** -// special macros for mutex handling +// special macros for mutex handling //***************************************************************************************************************** -#ifdef ENABLE_MUTEXDEBUG +#ifdef ENABLE_MUTEXDEBUG //_____________________________________________________________________________________________________________ - // includes + // includes //_____________________________________________________________________________________________________________ #ifndef _RTL_STRBUF_HXX_ @@ -48,7 +48,7 @@ For follow macros we need a special log file. If user forget to specify anyone, we must do it for him! _____________________________________________________________________________________________________________*/ - #ifndef LOGFILE_MUTEX + #ifndef LOGFILE_MUTEX #define LOGFILE_MUTEX "mutex.log" #endif @@ -98,20 +98,20 @@ WRITE_LOGFILE( LOGFILE_MUTEX, _sBuffer.makeStringAndClear() ) \ } -#else // #ifdef ENABLE_MUTEXDEBUG +#else // #ifdef ENABLE_MUTEXDEBUG /*_____________________________________________________________________________________________________________ If right testmode is'nt set - implements these macro with normal functionality! We need the guard but not the log mechanism. _____________________________________________________________________________________________________________*/ - #undef LOGFILE_MUTEX + #undef LOGFILE_MUTEX #define LOG_LOCKTYPE( _EFALLBACK, _ECURRENT ) -#endif // #ifdef ENABLE_MUTEXDEBUG +#endif // #ifdef ENABLE_MUTEXDEBUG //***************************************************************************************************************** -// end of file +// end of file //***************************************************************************************************************** -#endif // #ifndef __FRAMEWORK_MACROS_DEBUG_MUTEX_HXX_ +#endif // #ifndef __FRAMEWORK_MACROS_DEBUG_MUTEX_HXX_ diff --git a/framework/inc/macros/debug/plugin.hxx b/framework/inc/macros/debug/plugin.hxx index 2693b6b070ac..6ef4af316877 100644 --- a/framework/inc/macros/debug/plugin.hxx +++ b/framework/inc/macros/debug/plugin.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,13 +29,13 @@ #define __FRAMEWORK_MACROS_DEBUG_PLUGIN_HXX_ //***************************************************************************************************************** -// special macros to debug asynchronous methods of plugin frame +// special macros to debug asynchronous methods of plugin frame //***************************************************************************************************************** -#ifdef ENABLE_PLUGINDEBUG +#ifdef ENABLE_PLUGINDEBUG //_____________________________________________________________________________________________________________ - // includes + // includes //_____________________________________________________________________________________________________________ #ifndef _RTL_STRBUF_HXX_ @@ -52,8 +52,8 @@ For follow macros we need a special log file. If user forget to specify anyone, we must do it for him! _____________________________________________________________________________________________________________*/ - #ifndef LOGFILE_PLUGIN - #define LOGFILE_PLUGIN \ + #ifndef LOGFILE_PLUGIN + #define LOGFILE_PLUGIN \ "plugin.log" #endif @@ -65,20 +65,20 @@ With this macro you can log some parameter of this operation. _____________________________________________________________________________________________________________*/ - #define LOG_URLSEND( SFRAMENAME, SSENDMODE, SINTERNALURL, SEXTERNALURL ) \ - /* Use new scope to declare local private variables! */ \ - { \ - ::rtl::OStringBuffer sBuffer(1024); \ - sBuffer.append( "PlugInFrame [ \"" ); \ - sBuffer.append( SFRAMENAME ); \ - sBuffer.append( "\" ] send " ); \ - sBuffer.append( SSENDMODE ); \ - sBuffer.append( "( internalURL=\"" ); \ - sBuffer.append( U2B( SINTERNALURL ) ); \ - sBuffer.append( "\", externalURL=\""); \ - sBuffer.append( U2B( SEXTERNALURL ) ); \ - sBuffer.append( "\" ) to browser.\n"); \ - WRITE_LOGFILE( LOGFILE_PLUGIN, sBuffer.makeStringAndClear() ) \ + #define LOG_URLSEND( SFRAMENAME, SSENDMODE, SINTERNALURL, SEXTERNALURL ) \ + /* Use new scope to declare local private variables! */ \ + { \ + ::rtl::OStringBuffer sBuffer(1024); \ + sBuffer.append( "PlugInFrame [ \"" ); \ + sBuffer.append( SFRAMENAME ); \ + sBuffer.append( "\" ] send " ); \ + sBuffer.append( SSENDMODE ); \ + sBuffer.append( "( internalURL=\"" ); \ + sBuffer.append( U2B( SINTERNALURL ) ); \ + sBuffer.append( "\", externalURL=\""); \ + sBuffer.append( U2B( SEXTERNALURL ) ); \ + sBuffer.append( "\" ) to browser.\n"); \ + WRITE_LOGFILE( LOGFILE_PLUGIN, sBuffer.makeStringAndClear() ) \ } /*_____________________________________________________________________________________________________________ @@ -91,20 +91,20 @@ With this macro you can log some parameter of this operations. _____________________________________________________________________________________________________________*/ - #define LOG_URLRECEIVE( SFRAMENAME, SRECEIVEMODE, SEXTERNALURL, SINTERNALURL ) \ - /* Use new scope to declare local private variables! */ \ - { \ - ::rtl::OStringBuffer sBuffer(1024); \ - sBuffer.append( "PlugInFrame [ \"" ); \ - sBuffer.append( U2B( SFRAMENAME ) ); \ - sBuffer.append( "\" ] receive " ); \ - sBuffer.append( SRECEIVEMODE ); \ - sBuffer.append( "( externalURL=\"" ); \ - sBuffer.append( U2B( SEXTERNALURL ) ); \ - sBuffer.append( "\", internalURL=\"" ); \ - sBuffer.append( U2B( SINTERNALURL ) ); \ - sBuffer.append( "\" ) from browser.\n" ); \ - WRITE_LOGFILE( LOGFILE_PLUGIN, sBuffer.makeStringAndClear() ) \ + #define LOG_URLRECEIVE( SFRAMENAME, SRECEIVEMODE, SEXTERNALURL, SINTERNALURL ) \ + /* Use new scope to declare local private variables! */ \ + { \ + ::rtl::OStringBuffer sBuffer(1024); \ + sBuffer.append( "PlugInFrame [ \"" ); \ + sBuffer.append( U2B( SFRAMENAME ) ); \ + sBuffer.append( "\" ] receive " ); \ + sBuffer.append( SRECEIVEMODE ); \ + sBuffer.append( "( externalURL=\"" ); \ + sBuffer.append( U2B( SEXTERNALURL ) ); \ + sBuffer.append( "\", internalURL=\"" ); \ + sBuffer.append( U2B( SINTERNALURL ) ); \ + sBuffer.append( "\" ) from browser.\n" ); \ + WRITE_LOGFILE( LOGFILE_PLUGIN, sBuffer.makeStringAndClear() ) \ } /*_____________________________________________________________________________________________________________ @@ -113,29 +113,29 @@ Log information about parameter of a newURL() at a plugin frame. _____________________________________________________________________________________________________________*/ - #define LOG_PARAMETER_NEWURL( SFRAMENAME, SMIMETYPE, SURL, sFILTER, AANY ) \ - /* Use new scope to declare local private variables! */ \ - { \ - ::rtl::OStringBuffer sBuffer(1024); \ - sBuffer.append( "PlugInFrame [ \"" ); \ - sBuffer.append( U2B( SFRAMENAME ) ); \ - sBuffer.append( "\" ] called with newURL( \"" ); \ - sBuffer.append( U2B( SMIMETYPE ) ); \ - sBuffer.append( "\", \"" ); \ - sBuffer.append( U2B( SURL ) ); \ - sBuffer.append( "\", \"" ); \ - sBuffer.append( U2B( SFILTER ) ); \ - sBuffer.append( "\", " ); \ - if( AANY.hasValue() == sal_True ) \ - { \ - sBuffer.append( "filled Any )" ); \ - } \ - else \ - { \ - sBuffer.append( "empty Any )" ); \ - } \ - sBuffer.append( "\n" ); \ - WRITE_LOGFILE( LOGFILE_PLUGIN, sBuffer.makeStringAndClear() ) \ + #define LOG_PARAMETER_NEWURL( SFRAMENAME, SMIMETYPE, SURL, sFILTER, AANY ) \ + /* Use new scope to declare local private variables! */ \ + { \ + ::rtl::OStringBuffer sBuffer(1024); \ + sBuffer.append( "PlugInFrame [ \"" ); \ + sBuffer.append( U2B( SFRAMENAME ) ); \ + sBuffer.append( "\" ] called with newURL( \"" ); \ + sBuffer.append( U2B( SMIMETYPE ) ); \ + sBuffer.append( "\", \"" ); \ + sBuffer.append( U2B( SURL ) ); \ + sBuffer.append( "\", \"" ); \ + sBuffer.append( U2B( SFILTER ) ); \ + sBuffer.append( "\", " ); \ + if( AANY.hasValue() == sal_True ) \ + { \ + sBuffer.append( "filled Any )" ); \ + } \ + else \ + { \ + sBuffer.append( "empty Any )" ); \ + } \ + sBuffer.append( "\n" ); \ + WRITE_LOGFILE( LOGFILE_PLUGIN, sBuffer.makeStringAndClear() ) \ } /*_____________________________________________________________________________________________________________ @@ -144,59 +144,59 @@ Log information about parameter of a newStream() at a plugin frame. _____________________________________________________________________________________________________________*/ - #define LOG_PARAMETER_NEWSTREAM( SFRAMENAME, SMIMETYPE, SURL, SFILTER, XSTREAM, AANY ) \ - /* Use new scope to declare local private variables! */ \ - { \ - ::rtl::OStringBuffer sBuffer(1024); \ - sBuffer.append( "PlugInFrame [ \"" ); \ - sBuffer.append( U2B( SFRAMENAME ) ); \ - sBuffer.append( "\" ] called with newStream( \""); \ - sBuffer.append( U2B( SMIMETYPE ) ); \ - sBuffer.append( "\", \"" ); \ - sBuffer.append( U2B( SURL ) ); \ - sBuffer.append( "\", \"" ); \ - sBuffer.append( U2B( SFILTER ) ); \ - sBuffer.append( "\", " ); \ - if( XSTREAM.is() == sal_True ) \ - { \ - sal_Int32 nBytes = XSTREAM->available(); \ - OString sInfo("Stream with "); \ - sInfo += OString::valueOf( (sal_Int32)nBytes ); \ - sInfo += " Bytes, "; \ - sBuffer.append( sInfo ); \ - } \ - else \ - { \ - sBuffer.append( "empty Stream, " ); \ - } \ - if( AANY.hasValue() == sal_True ) \ - { \ - sBuffer.append( "filled Any )" ); \ - } \ - else \ - { \ - sBuffer.append( "empty Any )" ); \ - } \ - sBuffer.append( "\n" ); \ - WRITE_LOGFILE( LOGFILE_PLUGIN, sBuffer.makeStringAndClear() ) \ + #define LOG_PARAMETER_NEWSTREAM( SFRAMENAME, SMIMETYPE, SURL, SFILTER, XSTREAM, AANY ) \ + /* Use new scope to declare local private variables! */ \ + { \ + ::rtl::OStringBuffer sBuffer(1024); \ + sBuffer.append( "PlugInFrame [ \"" ); \ + sBuffer.append( U2B( SFRAMENAME ) ); \ + sBuffer.append( "\" ] called with newStream( \""); \ + sBuffer.append( U2B( SMIMETYPE ) ); \ + sBuffer.append( "\", \"" ); \ + sBuffer.append( U2B( SURL ) ); \ + sBuffer.append( "\", \"" ); \ + sBuffer.append( U2B( SFILTER ) ); \ + sBuffer.append( "\", " ); \ + if( XSTREAM.is() == sal_True ) \ + { \ + sal_Int32 nBytes = XSTREAM->available(); \ + OString sInfo("Stream with "); \ + sInfo += OString::valueOf( (sal_Int32)nBytes ); \ + sInfo += " Bytes, "; \ + sBuffer.append( sInfo ); \ + } \ + else \ + { \ + sBuffer.append( "empty Stream, " ); \ + } \ + if( AANY.hasValue() == sal_True ) \ + { \ + sBuffer.append( "filled Any )" ); \ + } \ + else \ + { \ + sBuffer.append( "empty Any )" ); \ + } \ + sBuffer.append( "\n" ); \ + WRITE_LOGFILE( LOGFILE_PLUGIN, sBuffer.makeStringAndClear() ) \ } -#else // #ifdef ENABLE_PLUGINDEBUG +#else // #ifdef ENABLE_PLUGINDEBUG /*_____________________________________________________________________________________________________________ If right testmode is'nt set - implements these macro empty! _____________________________________________________________________________________________________________*/ - #undef LOGFILE_PLUGIN - #define LOG_URLSEND( SFRAMENAME, SSENDMODE, SINTERNALURL, SEXTERNALURL ) - #define LOG_URLRECEIVE( SFRAMENAME, SRECEIVEMODE, SEXTERNALURL, SINTERNALURL ) - #define LOG_PARAMETER_NEWURL( SFRAMENAME, SMIMETYPE, SURL, SFILTER, AANY ) - #define LOG_PARAMETER_NEWSTREAM( SFRAMENAME, SMIMETYPE, SURL, SFILTER, XSTREAM, AANY ) + #undef LOGFILE_PLUGIN + #define LOG_URLSEND( SFRAMENAME, SSENDMODE, SINTERNALURL, SEXTERNALURL ) + #define LOG_URLRECEIVE( SFRAMENAME, SRECEIVEMODE, SEXTERNALURL, SINTERNALURL ) + #define LOG_PARAMETER_NEWURL( SFRAMENAME, SMIMETYPE, SURL, SFILTER, AANY ) + #define LOG_PARAMETER_NEWSTREAM( SFRAMENAME, SMIMETYPE, SURL, SFILTER, XSTREAM, AANY ) -#endif // #ifdef ENABLE_PLUGINDEBUG +#endif // #ifdef ENABLE_PLUGINDEBUG //***************************************************************************************************************** -// end of file +// end of file //***************************************************************************************************************** -#endif // #ifndef __FRAMEWORK_MACROS_DEBUG_PLUGIN_HXX_ +#endif // #ifndef __FRAMEWORK_MACROS_DEBUG_PLUGIN_HXX_ diff --git a/framework/inc/macros/debug/registration.hxx b/framework/inc/macros/debug/registration.hxx index 21f8ad20d340..e8ea5a0bafe6 100644 --- a/framework/inc/macros/debug/registration.hxx +++ b/framework/inc/macros/debug/registration.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,13 +29,13 @@ #define __FRAMEWORK_MACROS_DEBUG_REGISTRATION_HXX_ //***************************************************************************************************************** -// special macros for assertion handling +// special macros for assertion handling //***************************************************************************************************************** -#ifdef ENABLE_REGISTRATIONDEBUG +#ifdef ENABLE_REGISTRATIONDEBUG //_____________________________________________________________________________________________________________ - // includes + // includes //_____________________________________________________________________________________________________________ #ifndef _RTL_STRBUF_HXX_ @@ -48,8 +48,8 @@ For follow macros we need a special log file. If user forget to specify anyone, we must do it for him! _____________________________________________________________________________________________________________*/ - #ifndef LOGFILE_REGISTRATION - #define LOGFILE_REGISTRATION \ + #ifndef LOGFILE_REGISTRATION + #define LOGFILE_REGISTRATION \ "registration.log" #endif @@ -59,12 +59,12 @@ Write informations for component_writeInfo() in log file. _____________________________________________________________________________________________________________*/ - #define LOG_REGISTRATION_WRITEINFO( SINFOTEXT ) \ - { \ - ::rtl::OStringBuffer sOut( 1024 ); \ - sOut.append( "component_writeInfo():" ); \ - sOut.append( SINFOTEXT ); \ - WRITE_LOGFILE( LOGFILE_REGISTRATION, sOut.makeStringAndClear() ) \ + #define LOG_REGISTRATION_WRITEINFO( SINFOTEXT ) \ + { \ + ::rtl::OStringBuffer sOut( 1024 ); \ + sOut.append( "component_writeInfo():" ); \ + sOut.append( SINFOTEXT ); \ + WRITE_LOGFILE( LOGFILE_REGISTRATION, sOut.makeStringAndClear() ) \ } /*_____________________________________________________________________________________________________________ @@ -73,28 +73,28 @@ Write informations for component_getFactory() in log file. _____________________________________________________________________________________________________________*/ - #define LOG_REGISTRATION_GETFACTORY( SINFOTEXT ) \ - { \ - ::rtl::OStringBuffer sOut( 1024 ); \ - sOut.append( "component_getFactory():" ); \ - sOut.append( SINFOTEXT ); \ - WRITE_LOGFILE( LOGFILE_REGISTRATION, sOut.makeStringAndClear() ) \ + #define LOG_REGISTRATION_GETFACTORY( SINFOTEXT ) \ + { \ + ::rtl::OStringBuffer sOut( 1024 ); \ + sOut.append( "component_getFactory():" ); \ + sOut.append( SINFOTEXT ); \ + WRITE_LOGFILE( LOGFILE_REGISTRATION, sOut.makeStringAndClear() ) \ } -#else // #ifdef ENABLE_REGISTRATIONDEBUG +#else // #ifdef ENABLE_REGISTRATIONDEBUG /*_____________________________________________________________________________________________________________ If right testmode is'nt set - implements these macro empty! _____________________________________________________________________________________________________________*/ - #undef LOGFILE_REGISTRATION - #define LOG_REGISTRATION_WRITEINFO( SINFOTEXT ) - #define LOG_REGISTRATION_GETFACTORY( SINFOTEXT ) + #undef LOGFILE_REGISTRATION + #define LOG_REGISTRATION_WRITEINFO( SINFOTEXT ) + #define LOG_REGISTRATION_GETFACTORY( SINFOTEXT ) -#endif // #ifdef ENABLE_REGISTRATIONDEBUG +#endif // #ifdef ENABLE_REGISTRATIONDEBUG //***************************************************************************************************************** -// end of file +// end of file //***************************************************************************************************************** -#endif // #ifndef __FRAMEWORK_MACROS_DEBUG_REGISTRATION_HXX_ +#endif // #ifndef __FRAMEWORK_MACROS_DEBUG_REGISTRATION_HXX_ diff --git a/framework/inc/macros/debug/targeting.hxx b/framework/inc/macros/debug/targeting.hxx index 492389646cad..3f87b2fb7a30 100644 --- a/framework/inc/macros/debug/targeting.hxx +++ b/framework/inc/macros/debug/targeting.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,13 +29,13 @@ #define __FRAMEWORK_MACROS_DEBUG_TARGETING_HXX_ //***************************************************************************************************************** -// special macros for targeting of frames +// special macros for targeting of frames //***************************************************************************************************************** -#ifdef ENABLE_TARGETINGDEBUG +#ifdef ENABLE_TARGETINGDEBUG //_____________________________________________________________________________________________________________ - // includes + // includes //_____________________________________________________________________________________________________________ #ifndef _RTL_STRBUF_HXX_ @@ -48,9 +48,9 @@ For follow macros we need a special log file. If user forget to specify anyone, we must do it for him! _____________________________________________________________________________________________________________*/ - #ifndef LOGFILE_TARGETING - #define LOGFILE_TARGETSTEPS "targetsteps.log" - #define LOGFILE_TARGETPARAM "targetparam.log" + #ifndef LOGFILE_TARGETING + #define LOGFILE_TARGETSTEPS "targetsteps.log" + #define LOGFILE_TARGETPARAM "targetparam.log" #endif /*_____________________________________________________________________________________________________________ @@ -63,23 +63,23 @@ Use it at beginning of search only! _____________________________________________________________________________________________________________*/ - #define LOG_PARAMETER_FINDFRAME( SSERVICE, SFRAMENAME, STARGETNAME, NSEARCHFLAGS ) \ - /* Use new scope to prevent code against multiple variable defines! */ \ - { \ - ::rtl::OStringBuffer sBufferParam(256); \ - ::rtl::OStringBuffer sBufferSteps(256); \ - sBufferParam.append( SSERVICE ); \ - sBufferParam.append( "::findFrame( \"" ); \ - sBufferParam.append( U2B( STARGETNAME ) ); \ - sBufferParam.append( "\", " ); \ - sBufferParam.append( ::rtl::OString::valueOf( sal_Int32( NSEARCHFLAGS ) ) ); \ - sBufferParam.append( " ) my name is \"" ); \ - sBufferParam.append( U2B( SFRAMENAME ) ); \ - sBufferParam.append( "\"\n" ); \ - sBufferSteps.append( U2B( SFRAMENAME ) ); \ - sBufferSteps.append( "--" ); \ - WRITE_LOGFILE( LOGFILE_TARGETPARAM, sBufferParam.makeStringAndClear() ) \ - WRITE_LOGFILE( LOGFILE_TARGETSTEPS, sBufferSteps.makeStringAndClear() ) \ + #define LOG_PARAMETER_FINDFRAME( SSERVICE, SFRAMENAME, STARGETNAME, NSEARCHFLAGS ) \ + /* Use new scope to prevent code against multiple variable defines! */ \ + { \ + ::rtl::OStringBuffer sBufferParam(256); \ + ::rtl::OStringBuffer sBufferSteps(256); \ + sBufferParam.append( SSERVICE ); \ + sBufferParam.append( "::findFrame( \"" ); \ + sBufferParam.append( U2B( STARGETNAME ) ); \ + sBufferParam.append( "\", " ); \ + sBufferParam.append( ::rtl::OString::valueOf( sal_Int32( NSEARCHFLAGS ) ) ); \ + sBufferParam.append( " ) my name is \"" ); \ + sBufferParam.append( U2B( SFRAMENAME ) ); \ + sBufferParam.append( "\"\n" ); \ + sBufferSteps.append( U2B( SFRAMENAME ) ); \ + sBufferSteps.append( "--" ); \ + WRITE_LOGFILE( LOGFILE_TARGETPARAM, sBufferParam.makeStringAndClear() ) \ + WRITE_LOGFILE( LOGFILE_TARGETSTEPS, sBufferSteps.makeStringAndClear() ) \ } /*_____________________________________________________________________________________________________________ @@ -89,22 +89,22 @@ Use it at beginning of search only! _____________________________________________________________________________________________________________*/ - #define LOG_PARAMETER_QUERYDISPATCH( SSERVICE, SFRAMENAME, AURL, STARGETNAME, NSEARCHFLAGS ) \ - /* Use new scope to prevent code against multiple variable defines! */ \ - { \ - ::rtl::OStringBuffer sBuffer(1024); \ - sBuffer.append( "[ " ); \ - sBuffer.append( U2B( SFRAMENAME ) ); \ - sBuffer.append( "] " ); \ - sBuffer.append( SSERVICE ); \ - sBuffer.append( "::queryDispatch( \"" ); \ - sBuffer.append( U2B( AURL.Complete ) ); \ - sBuffer.append( "\", \"" ); \ - sBuffer.append( U2B( STARGETNAME ) ); \ - sBuffer.append( "\", " ); \ - sBuffer.append( ::rtl::OString::valueOf( sal_Int32( NSEARCHFLAGS ) ) ); \ - sBuffer.append( " )\n" ); \ - WRITE_LOGFILE( LOGFILE_TARGETPARAM, sBuffer.makeStringAndClear() ) \ + #define LOG_PARAMETER_QUERYDISPATCH( SSERVICE, SFRAMENAME, AURL, STARGETNAME, NSEARCHFLAGS ) \ + /* Use new scope to prevent code against multiple variable defines! */ \ + { \ + ::rtl::OStringBuffer sBuffer(1024); \ + sBuffer.append( "[ " ); \ + sBuffer.append( U2B( SFRAMENAME ) ); \ + sBuffer.append( "] " ); \ + sBuffer.append( SSERVICE ); \ + sBuffer.append( "::queryDispatch( \"" ); \ + sBuffer.append( U2B( AURL.Complete ) ); \ + sBuffer.append( "\", \"" ); \ + sBuffer.append( U2B( STARGETNAME ) ); \ + sBuffer.append( "\", " ); \ + sBuffer.append( ::rtl::OString::valueOf( sal_Int32( NSEARCHFLAGS ) ) ); \ + sBuffer.append( " )\n" ); \ + WRITE_LOGFILE( LOGFILE_TARGETPARAM, sBuffer.makeStringAndClear() ) \ } /*_____________________________________________________________________________________________________________ @@ -114,32 +114,32 @@ Use it at beginning of search only! _____________________________________________________________________________________________________________*/ - #define LOG_PARAMETER_LOADCOMPONENTFROMURL( SSERVICE, SFRAMENAME, SURL, STARGETNAME, NSEARCHFLAGS, SEQPARAMETER ) \ - /* Use new scope to prevent code against multiple variable defines! */ \ - { \ - ::rtl::OStringBuffer sBuffer(1024); \ - sBuffer.append( "[ " ); \ - sBuffer.append( U2B( SFRAMENAME ) ); \ - sBuffer.append( "] " ); \ - sBuffer.append( SSERVICE ); \ - sBuffer.append( "::loadComponentFromURL( \"" ); \ - sBuffer.append( U2B( SURL ) ); \ - sBuffer.append( "\", \"" ); \ - sBuffer.append( U2B( STARGETNAME ) ); \ - sBuffer.append( "\", " ); \ - sBuffer.append( ::rtl::OString::valueOf( sal_Int32( NSEARCHFLAGS ) ) ); \ - sBuffer.append( ", " ); \ - sal_Int32 nCount = SEQPARAMETER.getLength(); \ - for( sal_Int32 nParameter=0; nParameter<nCount; ++nParameter ) \ - { \ - sBuffer.append( U2B( SEQPARAMETER[nParameter].Name )); \ - if( nParameter<(nCount-1) ) \ - { \ - sBuffer.append( " | " ); \ - } \ - } \ - sBuffer.append( " )\n" ); \ - WRITE_LOGFILE( LOGFILE_TARGETPARAM, sBuffer.makeStringAndClear() ) \ + #define LOG_PARAMETER_LOADCOMPONENTFROMURL( SSERVICE, SFRAMENAME, SURL, STARGETNAME, NSEARCHFLAGS, SEQPARAMETER ) \ + /* Use new scope to prevent code against multiple variable defines! */ \ + { \ + ::rtl::OStringBuffer sBuffer(1024); \ + sBuffer.append( "[ " ); \ + sBuffer.append( U2B( SFRAMENAME ) ); \ + sBuffer.append( "] " ); \ + sBuffer.append( SSERVICE ); \ + sBuffer.append( "::loadComponentFromURL( \"" ); \ + sBuffer.append( U2B( SURL ) ); \ + sBuffer.append( "\", \"" ); \ + sBuffer.append( U2B( STARGETNAME ) ); \ + sBuffer.append( "\", " ); \ + sBuffer.append( ::rtl::OString::valueOf( sal_Int32( NSEARCHFLAGS ) ) ); \ + sBuffer.append( ", " ); \ + sal_Int32 nCount = SEQPARAMETER.getLength(); \ + for( sal_Int32 nParameter=0; nParameter<nCount; ++nParameter ) \ + { \ + sBuffer.append( U2B( SEQPARAMETER[nParameter].Name )); \ + if( nParameter<(nCount-1) ) \ + { \ + sBuffer.append( " | " ); \ + } \ + } \ + sBuffer.append( " )\n" ); \ + WRITE_LOGFILE( LOGFILE_TARGETPARAM, sBuffer.makeStringAndClear() ) \ } /*_____________________________________________________________________________________________________________ @@ -149,29 +149,29 @@ Use it at the end of this method only! _____________________________________________________________________________________________________________*/ - #define LOG_RESULT_FINDFRAME( SSERVICE, SFRAMENAME, XFRAME ) \ - /* Use new scope to prevent code against multiple variable defines! */ \ - { \ - ::rtl::OStringBuffer sBufferParam(256); \ - ::rtl::OStringBuffer sBufferSteps(256); \ - sBufferParam.append( SSERVICE ); \ - sBufferParam.append( "::findFrame() at \"" ); \ - sBufferParam.append( U2B( SFRAMENAME ) ); \ - sBufferParam.append( "\" " ); \ - if( XFRAME.is() == sal_True ) \ - { \ - sBufferParam.append( "return with valid frame.\n" ); \ - sBufferSteps.append( "OK [" ); \ - sBufferSteps.append( U2B( XFRAME->getName() ) ); \ - sBufferSteps.append( "]\n" ); \ - } \ - else \ - { \ - sBufferParam.append( "return with NULL frame!\n"); \ - sBufferSteps.append( "??\n" ); \ - } \ - WRITE_LOGFILE( LOGFILE_TARGETPARAM, sBufferParam.makeStringAndClear() ) \ - WRITE_LOGFILE( LOGFILE_TARGETSTEPS, sBufferSteps.makeStringAndClear() ) \ + #define LOG_RESULT_FINDFRAME( SSERVICE, SFRAMENAME, XFRAME ) \ + /* Use new scope to prevent code against multiple variable defines! */ \ + { \ + ::rtl::OStringBuffer sBufferParam(256); \ + ::rtl::OStringBuffer sBufferSteps(256); \ + sBufferParam.append( SSERVICE ); \ + sBufferParam.append( "::findFrame() at \"" ); \ + sBufferParam.append( U2B( SFRAMENAME ) ); \ + sBufferParam.append( "\" " ); \ + if( XFRAME.is() == sal_True ) \ + { \ + sBufferParam.append( "return with valid frame.\n" ); \ + sBufferSteps.append( "OK [" ); \ + sBufferSteps.append( U2B( XFRAME->getName() ) ); \ + sBufferSteps.append( "]\n" ); \ + } \ + else \ + { \ + sBufferParam.append( "return with NULL frame!\n"); \ + sBufferSteps.append( "??\n" ); \ + } \ + WRITE_LOGFILE( LOGFILE_TARGETPARAM, sBufferParam.makeStringAndClear() ) \ + WRITE_LOGFILE( LOGFILE_TARGETSTEPS, sBufferSteps.makeStringAndClear() ) \ } /*_____________________________________________________________________________________________________________ @@ -181,24 +181,24 @@ Use it at the end of this method only! _____________________________________________________________________________________________________________*/ - #define LOG_RESULT_QUERYDISPATCH( SSERVICE, SFRAMENAME, XDISPATCHER ) \ - /* Use new scope to prevent code against multiple variable defines! */ \ - { \ - ::rtl::OStringBuffer sBuffer(1024); \ - sBuffer.append( "[ " ); \ - sBuffer.append( U2B( SFRAMENAME ) ); \ - sBuffer.append( "] " ); \ - sBuffer.append( SSERVICE ); \ - if( XDISPATCHER.is() == sal_True ) \ - { \ - sBuffer.append( "::queryDispatch() return with valid dispatcher." ); \ - } \ - else \ - { \ - sBuffer.append( "::queryDispatch() return with NULL dispatcher!" ); \ - } \ - sBuffer.append( "\n" ); \ - WRITE_LOGFILE( LOGFILE_TARGETPARAM, sBuffer.makeStringAndClear() ) \ + #define LOG_RESULT_QUERYDISPATCH( SSERVICE, SFRAMENAME, XDISPATCHER ) \ + /* Use new scope to prevent code against multiple variable defines! */ \ + { \ + ::rtl::OStringBuffer sBuffer(1024); \ + sBuffer.append( "[ " ); \ + sBuffer.append( U2B( SFRAMENAME ) ); \ + sBuffer.append( "] " ); \ + sBuffer.append( SSERVICE ); \ + if( XDISPATCHER.is() == sal_True ) \ + { \ + sBuffer.append( "::queryDispatch() return with valid dispatcher." ); \ + } \ + else \ + { \ + sBuffer.append( "::queryDispatch() return with NULL dispatcher!" ); \ + } \ + sBuffer.append( "\n" ); \ + WRITE_LOGFILE( LOGFILE_TARGETPARAM, sBuffer.makeStringAndClear() ) \ } /*_____________________________________________________________________________________________________________ @@ -208,45 +208,45 @@ Use it at the end of this method only! _____________________________________________________________________________________________________________*/ - #define LOG_RESULT_LOADCOMPONENTFROMURL( SSERVICE, SFRAMENAME, XCOMPONENT ) \ - /* Use new scope to prevent code against multiple variable defines! */ \ - { \ - ::rtl::OStringBuffer sBuffer(1024); \ - sBuffer.append( "[ " ); \ - sBuffer.append( U2B( SFRAMENAME ) ); \ - sBuffer.append( "] " ); \ - sBuffer.append( SSERVICE ); \ - if( XCOMPONENT.is() == sal_True ) \ - { \ - sBuffer.append( "::loadComponentFromURL() return with valid component." ); \ - } \ - else \ - { \ - sBuffer.append( "::loadComponentFromURL() return with NULL component!" ); \ - } \ - sBuffer.append( "\n" ); \ - WRITE_LOGFILE( LOGFILE_TARGETPARAM, sBuffer.makeStringAndClear() ) \ + #define LOG_RESULT_LOADCOMPONENTFROMURL( SSERVICE, SFRAMENAME, XCOMPONENT ) \ + /* Use new scope to prevent code against multiple variable defines! */ \ + { \ + ::rtl::OStringBuffer sBuffer(1024); \ + sBuffer.append( "[ " ); \ + sBuffer.append( U2B( SFRAMENAME ) ); \ + sBuffer.append( "] " ); \ + sBuffer.append( SSERVICE ); \ + if( XCOMPONENT.is() == sal_True ) \ + { \ + sBuffer.append( "::loadComponentFromURL() return with valid component." ); \ + } \ + else \ + { \ + sBuffer.append( "::loadComponentFromURL() return with NULL component!" ); \ + } \ + sBuffer.append( "\n" ); \ + WRITE_LOGFILE( LOGFILE_TARGETPARAM, sBuffer.makeStringAndClear() ) \ } -#else // #ifdef ENABLE_TARGETINGDEBUG +#else // #ifdef ENABLE_TARGETINGDEBUG /*_____________________________________________________________________________________________________________ If right testmode is'nt set - implements these macro empty! _____________________________________________________________________________________________________________*/ - #undef LOGFILE_TARGETPARAM - #undef LOGFILE_TARGETSTEPS - #define LOG_PARAMETER_FINDFRAME( SSERVICE, SFRAMENAME, STARGETNAME, NSEARCHFLAGS ) - #define LOG_PARAMETER_QUERYDISPATCH( SSERVICE, SFRAMENAME, AURL, STARGETNAME, NSEARCHFLAGS ) - #define LOG_PARAMETER_LOADCOMPONENTFROMURL( SSERVICE, SFRAMENAME, SURL, STARGETNAME, NSEARCHFLAGS, SEQPARAMETER ) - #define LOG_RESULT_FINDFRAME( SSERVICE, SFRAMENAME, XFRAME ) - #define LOG_RESULT_QUERYDISPATCH( SSERVICE, SFRAMENAME, XDISPATCHER ) - #define LOG_RESULT_LOADCOMPONENTFROMURL( SSERVICE, SFRAMENAME, XCOMPONENT ) + #undef LOGFILE_TARGETPARAM + #undef LOGFILE_TARGETSTEPS + #define LOG_PARAMETER_FINDFRAME( SSERVICE, SFRAMENAME, STARGETNAME, NSEARCHFLAGS ) + #define LOG_PARAMETER_QUERYDISPATCH( SSERVICE, SFRAMENAME, AURL, STARGETNAME, NSEARCHFLAGS ) + #define LOG_PARAMETER_LOADCOMPONENTFROMURL( SSERVICE, SFRAMENAME, SURL, STARGETNAME, NSEARCHFLAGS, SEQPARAMETER ) + #define LOG_RESULT_FINDFRAME( SSERVICE, SFRAMENAME, XFRAME ) + #define LOG_RESULT_QUERYDISPATCH( SSERVICE, SFRAMENAME, XDISPATCHER ) + #define LOG_RESULT_LOADCOMPONENTFROMURL( SSERVICE, SFRAMENAME, XCOMPONENT ) -#endif // #ifdef ENABLE_TARGETINGDEBUG +#endif // #ifdef ENABLE_TARGETINGDEBUG //***************************************************************************************************************** -// end of file +// end of file //***************************************************************************************************************** -#endif // #ifndef __FRAMEWORK_MACROS_DEBUG_TARGETING_HXX_ +#endif // #ifndef __FRAMEWORK_MACROS_DEBUG_TARGETING_HXX_ diff --git a/framework/inc/macros/debug/timemeasure.hxx b/framework/inc/macros/debug/timemeasure.hxx index 056fae8b456c..119c6f7b1eb1 100644 --- a/framework/inc/macros/debug/timemeasure.hxx +++ b/framework/inc/macros/debug/timemeasure.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ #ifdef ENABLE_TIMEMEASURE //_________________________________________________________________________________________________________________ - // includes + // includes //_________________________________________________________________________________________________________________ #ifndef _RTL_STRBUF_HXX_ @@ -134,7 +134,7 @@ #endif // #ifdef ENABLE_TIMEMEASURE //***************************************************************************************************************** -// end of file +// end of file //***************************************************************************************************************** #endif // #ifndef __FRAMEWORK_MACROS_DEBUG_TIMEMEASURE_HXX_ diff --git a/framework/inc/macros/generic.hxx b/framework/inc/macros/generic.hxx index 9bf6090f1cb6..a18cf5cb9872 100644 --- a/framework/inc/macros/generic.hxx +++ b/framework/inc/macros/generic.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,14 +29,14 @@ #define __FRAMEWORK_MACROS_GENERIC_HXX_ //_________________________________________________________________________________________________________________ -// includes +// includes //_________________________________________________________________________________________________________________ #include <rtl/ustring.hxx> #include <rtl/textenc.h> //***************************************************************************************************************** -// generic macros +// generic macros //***************************************************************************************************************** /*_________________________________________________________________________________________________________________ @@ -46,7 +46,7 @@ zB. OUSting sTest = DECLARE_ASCII( "Test" ) _________________________________________________________________________________________________________________*/ -#define DECLARE_ASCII( SASCIIVALUE ) \ +#define DECLARE_ASCII( SASCIIVALUE ) \ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SASCIIVALUE ) ) /*_________________________________________________________________________________________________________________ @@ -59,20 +59,20 @@ ________________________________________________________________________________ We use UTF8 as default textencoding. If you will change this use U2B_ENC and B2U_ENC! _________________________________________________________________________________________________________________*/ -#define U2B( SUNICODEVALUE ) \ +#define U2B( SUNICODEVALUE ) \ ::rtl::OUStringToOString( SUNICODEVALUE, RTL_TEXTENCODING_UTF8 ) -#define B2U( SASCIIVALUE ) \ +#define B2U( SASCIIVALUE ) \ ::rtl::OStringToOUString( SASCIIVALUE, RTL_TEXTENCODING_UTF8 ) -#define U2B_ENC( SUNICODEVALUE, AENCODING ) \ +#define U2B_ENC( SUNICODEVALUE, AENCODING ) \ ::rtl::OUStringToOString( SUNICODEVALUE, AENCODING ) -#define B2U_ENC( SASCIIVALUE, AENCODING ) \ +#define B2U_ENC( SASCIIVALUE, AENCODING ) \ ::rtl::OStringToOUString( SASCIIVALUE, AENCODING ) //***************************************************************************************************************** -// end of file +// end of file //***************************************************************************************************************** -#endif // #ifndef __FRAMEWORK_MACROS_GENERIC_HXX_ +#endif // #ifndef __FRAMEWORK_MACROS_GENERIC_HXX_ diff --git a/framework/inc/macros/registration.hxx b/framework/inc/macros/registration.hxx index 4b95530d45aa..3db6761abc15 100644 --- a/framework/inc/macros/registration.hxx +++ b/framework/inc/macros/registration.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,13 +29,13 @@ #define __FRAMEWORK_MACROS_REGISTRATION_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <macros/debug.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> @@ -43,11 +43,11 @@ #include <com/sun/star/registry/InvalidRegistryException.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ //namespace framework{ @@ -57,168 +57,168 @@ macros for registration of services Please use follow public macros only! - 1) COMPONENTINFO( CLASS ) => use it as parameter for COMPONENT_WRITEINFO( INFOS ) - 2) IFFACTORY( CLASS ) => use it as parameter for COMPONENT_GETFACTORY( IFFACTORIES ) - 3) COMPONENTGETIMPLEMENTATIONENVIRONMENT => use it to define exported function component_getImplementationEnvironment() - 4) COMPONENTWRITEINFO( INFOS ) => use it to define exported function component_writeInfo() - 5) COMPONENTGETFACTORY( IFFACTORIES ) => use it to define exported function component_getFactory() + 1) COMPONENTINFO( CLASS ) => use it as parameter for COMPONENT_WRITEINFO( INFOS ) + 2) IFFACTORY( CLASS ) => use it as parameter for COMPONENT_GETFACTORY( IFFACTORIES ) + 3) COMPONENTGETIMPLEMENTATIONENVIRONMENT => use it to define exported function component_getImplementationEnvironment() + 4) COMPONENTWRITEINFO( INFOS ) => use it to define exported function component_writeInfo() + 5) COMPONENTGETFACTORY( IFFACTORIES ) => use it to define exported function component_getFactory() _________________________________________________________________________________________________________________*/ //***************************************************************************************************************** -// public -// use it as parameter for COMPONENT_WRITEINFO( INFOS ) +// public +// use it as parameter for COMPONENT_WRITEINFO( INFOS ) //***************************************************************************************************************** -#define COMPONENTINFO( CLASS ) \ - try \ - { \ - /* Set default result of follow operations !!! */ \ - bReturn = sal_False; \ - /* Do the follow only, if given key is valid ! */ \ - if ( xKey.is() == sal_True ) \ - { \ - LOG_REGISTRATION_WRITEINFO( "\t\t\txKey is valid ...\n" ) \ - /* Build new keyname */ \ - sKeyName = DECLARE_ASCII( "/" ); \ - sKeyName += CLASS::impl_getStaticImplementationName(); \ - sKeyName += DECLARE_ASCII( "/UNO/SERVICES" ); \ - LOG_REGISTRATION_WRITEINFO( "\t\t\tcreate key \"" ) \ - LOG_REGISTRATION_WRITEINFO( U2B( sKeyName ) ) \ - LOG_REGISTRATION_WRITEINFO( "\" ...\n" ) \ - /* Create new key with new name. */ \ - xNewKey = xKey->createKey( sKeyName ); \ - /* If this new key valid ... */ \ - if ( xNewKey.is() == sal_True ) \ - { \ - LOG_REGISTRATION_WRITEINFO( "\t\t\t\ttsuccessful ...\n" ) \ - /* Get information about supported services. */ \ - seqServiceNames = CLASS::impl_getStaticSupportedServiceNames() ; \ - pArray = seqServiceNames.getArray() ; \ - nLength = seqServiceNames.getLength() ; \ - nCounter = 0 ; \ - /* Then set this information on this key. */ \ - for ( nCounter = 0; nCounter < nLength; ++nCounter ) \ - { \ - LOG_REGISTRATION_WRITEINFO( "\t\t\t\twrite key \"" ) \ - LOG_REGISTRATION_WRITEINFO( U2B( pArray[nCounter] ) ) \ - LOG_REGISTRATION_WRITEINFO( "\" to registry ...\n" ) \ - xNewKey->createKey( pArray[nCounter] ); \ - } \ - /* Result of this operations = OK. */ \ - bReturn = sal_True ; \ - } \ - } \ - } \ - catch( ::com::sun::star::registry::InvalidRegistryException& ) \ - { \ - LOG_REGISTRATION_WRITEINFO( "\n\nERROR:\nInvalidRegistryException detected\n\n" ) \ - bReturn = sal_False ; \ +#define COMPONENTINFO( CLASS ) \ + try \ + { \ + /* Set default result of follow operations !!! */ \ + bReturn = sal_False; \ + /* Do the follow only, if given key is valid ! */ \ + if ( xKey.is() == sal_True ) \ + { \ + LOG_REGISTRATION_WRITEINFO( "\t\t\txKey is valid ...\n" ) \ + /* Build new keyname */ \ + sKeyName = DECLARE_ASCII( "/" ); \ + sKeyName += CLASS::impl_getStaticImplementationName(); \ + sKeyName += DECLARE_ASCII( "/UNO/SERVICES" ); \ + LOG_REGISTRATION_WRITEINFO( "\t\t\tcreate key \"" ) \ + LOG_REGISTRATION_WRITEINFO( U2B( sKeyName ) ) \ + LOG_REGISTRATION_WRITEINFO( "\" ...\n" ) \ + /* Create new key with new name. */ \ + xNewKey = xKey->createKey( sKeyName ); \ + /* If this new key valid ... */ \ + if ( xNewKey.is() == sal_True ) \ + { \ + LOG_REGISTRATION_WRITEINFO( "\t\t\t\ttsuccessful ...\n" ) \ + /* Get information about supported services. */ \ + seqServiceNames = CLASS::impl_getStaticSupportedServiceNames() ; \ + pArray = seqServiceNames.getArray() ; \ + nLength = seqServiceNames.getLength() ; \ + nCounter = 0 ; \ + /* Then set this information on this key. */ \ + for ( nCounter = 0; nCounter < nLength; ++nCounter ) \ + { \ + LOG_REGISTRATION_WRITEINFO( "\t\t\t\twrite key \"" ) \ + LOG_REGISTRATION_WRITEINFO( U2B( pArray[nCounter] ) ) \ + LOG_REGISTRATION_WRITEINFO( "\" to registry ...\n" ) \ + xNewKey->createKey( pArray[nCounter] ); \ + } \ + /* Result of this operations = OK. */ \ + bReturn = sal_True ; \ + } \ + } \ + } \ + catch( ::com::sun::star::registry::InvalidRegistryException& ) \ + { \ + LOG_REGISTRATION_WRITEINFO( "\n\nERROR:\nInvalidRegistryException detected\n\n" ) \ + bReturn = sal_False ; \ } //***************************************************************************************************************** -// public -// use it as parameter for COMPONENT_GETFACTORY( IFFACTORIES ) +// public +// use it as parameter for COMPONENT_GETFACTORY( IFFACTORIES ) //***************************************************************************************************************** -#define IFFACTORY( CLASS ) \ - /* If searched name found ... */ \ - /* You can't add some statements before follow line ... Here can be an ELSE-statement! */ \ - if ( CLASS::impl_getStaticImplementationName().equals( ::rtl::OUString::createFromAscii( pImplementationName ) ) ) \ - { \ - LOG_REGISTRATION_GETFACTORY( "\t\tImplementationname found - try to create factory! ...\n" ) \ - /* ... then create right factory for this service. */ \ - /* xFactory and xServiceManager are local variables of method which use this macro. */ \ - xFactory = CLASS::impl_createFactory( xServiceManager ); \ +#define IFFACTORY( CLASS ) \ + /* If searched name found ... */ \ + /* You can't add some statements before follow line ... Here can be an ELSE-statement! */ \ + if ( CLASS::impl_getStaticImplementationName().equals( ::rtl::OUString::createFromAscii( pImplementationName ) ) ) \ + { \ + LOG_REGISTRATION_GETFACTORY( "\t\tImplementationname found - try to create factory! ...\n" ) \ + /* ... then create right factory for this service. */ \ + /* xFactory and xServiceManager are local variables of method which use this macro. */ \ + xFactory = CLASS::impl_createFactory( xServiceManager ); \ } //***************************************************************************************************************** -// public -// define helper to get information about service environment +// public +// define helper to get information about service environment //***************************************************************************************************************** -#define COMPONENTGETIMPLEMENTATIONENVIRONMENT \ - extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char** ppEnvironmentTypeName , \ - uno_Environment** ) \ - { \ - *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ; \ +#define COMPONENTGETIMPLEMENTATIONENVIRONMENT \ + extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char** ppEnvironmentTypeName , \ + uno_Environment** ) \ + { \ + *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ; \ } //***************************************************************************************************************** -// public -// define registration of service +// public +// define registration of service //***************************************************************************************************************** -#define COMPONENTWRITEINFO( INFOS ) \ - extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/ , \ - void* pRegistryKey ) \ - { \ - LOG_REGISTRATION_WRITEINFO( "\t[start]\n" ) \ - /* Set default return value for this operation - if it failed. */ \ - sal_Bool bReturn = sal_False ; \ - if ( pRegistryKey != NULL ) \ - { \ - LOG_REGISTRATION_WRITEINFO( "\t\tpRegistryKey is valid ...\n" ) \ - /* Define variables for following helper macros! */ \ - /* bReturn will set automaticly. */ \ - ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey > xKey ; \ - ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey > xNewKey ; \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > seqServiceNames ; \ - const ::rtl::OUString* pArray ; \ - sal_Int32 nLength ; \ - sal_Int32 nCounter ; \ - ::rtl::OUString sKeyName ; \ - xKey = reinterpret_cast< ::com::sun::star::registry::XRegistryKey* >( pRegistryKey ); \ - /* This parameter will expand to */ \ - /* "COMPONENT_INFO(a) */ \ - /* ... */ \ - /* COMPONENT_INFO(z)" */ \ - INFOS \ - } \ - LOG_REGISTRATION_WRITEINFO( "\t[end]\n" ) \ - /* Return with result of this operation. */ \ - return bReturn ; \ +#define COMPONENTWRITEINFO( INFOS ) \ + extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/ , \ + void* pRegistryKey ) \ + { \ + LOG_REGISTRATION_WRITEINFO( "\t[start]\n" ) \ + /* Set default return value for this operation - if it failed. */ \ + sal_Bool bReturn = sal_False ; \ + if ( pRegistryKey != NULL ) \ + { \ + LOG_REGISTRATION_WRITEINFO( "\t\tpRegistryKey is valid ...\n" ) \ + /* Define variables for following helper macros! */ \ + /* bReturn will set automaticly. */ \ + ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey > xKey ; \ + ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey > xNewKey ; \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > seqServiceNames ; \ + const ::rtl::OUString* pArray ; \ + sal_Int32 nLength ; \ + sal_Int32 nCounter ; \ + ::rtl::OUString sKeyName ; \ + xKey = reinterpret_cast< ::com::sun::star::registry::XRegistryKey* >( pRegistryKey ); \ + /* This parameter will expand to */ \ + /* "COMPONENT_INFO(a) */ \ + /* ... */ \ + /* COMPONENT_INFO(z)" */ \ + INFOS \ + } \ + LOG_REGISTRATION_WRITEINFO( "\t[end]\n" ) \ + /* Return with result of this operation. */ \ + return bReturn ; \ } //***************************************************************************************************************** -// public -// define method to instanciate new services +// public +// define method to instanciate new services //***************************************************************************************************************** -#define COMPONENTGETFACTORY( IFFACTORIES ) \ - extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName , \ - void* pServiceManager , \ - void* /*pRegistryKey*/ ) \ - { \ - LOG_REGISTRATION_GETFACTORY( "\t[start]\n" ) \ - /* Set default return value for this operation - if it failed. */ \ - void* pReturn = NULL ; \ - if ( \ - ( pImplementationName != NULL ) && \ - ( pServiceManager != NULL ) \ - ) \ - { \ - LOG_REGISTRATION_GETFACTORY( "\t\tpImplementationName and pServiceManager are valid ...\n" ) \ - /* Define variables which are used in following macros. */ \ - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > xFactory ; \ - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceManager ; \ - xServiceManager = reinterpret_cast< ::com::sun::star::lang::XMultiServiceFactory* >( pServiceManager ) ; \ - /* These parameter will expand to */ \ - /* "IF_NAME_CREATECOMPONENTFACTORY(a) */ \ - /* else */ \ - /* ... */ \ - /* else */ \ - /* IF_NAME_CREATECOMPONENTFACTORY(z)" */ \ - IFFACTORIES \ - /* Factory is valid, if service was found. */ \ - if ( xFactory.is() == sal_True ) \ - { \ - LOG_REGISTRATION_GETFACTORY( "\t\t\txFactory valid - service was found ...\n" ) \ - xFactory->acquire(); \ - pReturn = xFactory.get(); \ - } \ - } \ - LOG_REGISTRATION_GETFACTORY( "\t[end]\n" ) \ - /* Return with result of this operation. */ \ - return pReturn ; \ +#define COMPONENTGETFACTORY( IFFACTORIES ) \ + extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName , \ + void* pServiceManager , \ + void* /*pRegistryKey*/ ) \ + { \ + LOG_REGISTRATION_GETFACTORY( "\t[start]\n" ) \ + /* Set default return value for this operation - if it failed. */ \ + void* pReturn = NULL ; \ + if ( \ + ( pImplementationName != NULL ) && \ + ( pServiceManager != NULL ) \ + ) \ + { \ + LOG_REGISTRATION_GETFACTORY( "\t\tpImplementationName and pServiceManager are valid ...\n" ) \ + /* Define variables which are used in following macros. */ \ + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > xFactory ; \ + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceManager ; \ + xServiceManager = reinterpret_cast< ::com::sun::star::lang::XMultiServiceFactory* >( pServiceManager ) ; \ + /* These parameter will expand to */ \ + /* "IF_NAME_CREATECOMPONENTFACTORY(a) */ \ + /* else */ \ + /* ... */ \ + /* else */ \ + /* IF_NAME_CREATECOMPONENTFACTORY(z)" */ \ + IFFACTORIES \ + /* Factory is valid, if service was found. */ \ + if ( xFactory.is() == sal_True ) \ + { \ + LOG_REGISTRATION_GETFACTORY( "\t\t\txFactory valid - service was found ...\n" ) \ + xFactory->acquire(); \ + pReturn = xFactory.get(); \ + } \ + } \ + LOG_REGISTRATION_GETFACTORY( "\t[end]\n" ) \ + /* Return with result of this operation. */ \ + return pReturn ; \ } -//} // namespace framework +//} // namespace framework -#endif // #ifndef __FRAMEWORK_MACROS_REGISTRATION_HXX_ +#endif // #ifndef __FRAMEWORK_MACROS_REGISTRATION_HXX_ diff --git a/framework/inc/macros/xinterface.hxx b/framework/inc/macros/xinterface.hxx index 5cf247891422..48a8654486c3 100644 --- a/framework/inc/macros/xinterface.hxx +++ b/framework/inc/macros/xinterface.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,17 +29,17 @@ #define __FRAMEWORK_MACROS_XINTERFACE_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/uno/RuntimeException.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Reference.hxx> @@ -48,7 +48,7 @@ #include <rtl/ustring.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ @@ -58,10 +58,10 @@ namespace framework{ macros for declaration and definition of XInterface Please use follow public macros only! - 1) DEFINE_XINTERFACE => use it in header to declare XInterface and his methods - 2) DIRECT_INTERFACE( INTERFACE ) => use it as parameter INTERFACEx at 4) if interface not ambigous - 3) DERIVED_INTERFACE( BASEINTERFACE, DERIVEDINTERFACE ) => use it as parameter INTERFACEx at 4) if interface can be ambigous - 4) DECLARE_XINTERFACE_0( CLASS, BASECLASS ) => use it to define implementation of XInterface for 0 additional interface to baseclass + 1) DEFINE_XINTERFACE => use it in header to declare XInterface and his methods + 2) DIRECT_INTERFACE( INTERFACE ) => use it as parameter INTERFACEx at 4) if interface not ambigous + 3) DERIVED_INTERFACE( BASEINTERFACE, DERIVEDINTERFACE ) => use it as parameter INTERFACEx at 4) if interface can be ambigous + 4) DECLARE_XINTERFACE_0( CLASS, BASECLASS ) => use it to define implementation of XInterface for 0 additional interface to baseclass DECLARE_XINTERFACE_1( CLASS, BASECLASS, INTERFACE1 ) => use it to define implementation of XInterface for 1 additional interface to baseclass ... DECLARE_XINTERFACE_16( CLASS, BASECLASS, INTERFACE1, ... , INTERFACE16 ) @@ -69,629 +69,629 @@ namespace framework{ _________________________________________________________________________________________________________________*/ //***************************************************************************************************************** -// private -// implementation of XInterface::aquire() -// XInterface::release() +// private +// implementation of XInterface::aquire() +// XInterface::release() //***************************************************************************************************************** -#define PRIVATE_DEFINE_XINTERFACE_AQUIRE_RELEASE( CLASS, BASECLASS ) \ - void SAL_CALL CLASS::acquire() throw() \ - { \ - /* Don't use mutex in methods of XInterface! */ \ - BASECLASS::acquire(); \ - } \ +#define PRIVATE_DEFINE_XINTERFACE_AQUIRE_RELEASE( CLASS, BASECLASS ) \ + void SAL_CALL CLASS::acquire() throw() \ + { \ + /* Don't use mutex in methods of XInterface! */ \ + BASECLASS::acquire(); \ + } \ \ - void SAL_CALL CLASS::release() throw() \ - { \ - /* Don't use mutex in methods of XInterface! */ \ - BASECLASS::release(); \ + void SAL_CALL CLASS::release() throw() \ + { \ + /* Don't use mutex in methods of XInterface! */ \ + BASECLASS::release(); \ } //***************************************************************************************************************** -// private -// implementation of XInterface::queryInterface() without any other interfaces! +// private +// implementation of XInterface::queryInterface() without any other interfaces! //***************************************************************************************************************** -#define PRIVATE_DEFINE_XINTERFACE_QUERYINTERFACE_PURE( CLASS, BASECLASS ) \ - ::com::sun::star::uno::Any SAL_CALL CLASS::queryInterface( const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException ) \ - { \ - /* Attention: Don't use mutex or guard in this method!!! Is a method of XInterface. */ \ - /* I have no own supported interfaces ... */ \ - /* ... ask baseclass for interfaces! */ \ - return BASECLASS::queryInterface( aType ); \ +#define PRIVATE_DEFINE_XINTERFACE_QUERYINTERFACE_PURE( CLASS, BASECLASS ) \ + ::com::sun::star::uno::Any SAL_CALL CLASS::queryInterface( const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException ) \ + { \ + /* Attention: Don't use mutex or guard in this method!!! Is a method of XInterface. */ \ + /* I have no own supported interfaces ... */ \ + /* ... ask baseclass for interfaces! */ \ + return BASECLASS::queryInterface( aType ); \ } //***************************************************************************************************************** -// private -// implementation of XInterface::queryInterface() with max. 12 other interfaces! +// private +// implementation of XInterface::queryInterface() with max. 12 other interfaces! //***************************************************************************************************************** -#define PRIVATE_DEFINE_XINTERFACE_QUERYINTERFACE( CLASS, BASECLASS, INTERFACES ) \ - ::com::sun::star::uno::Any SAL_CALL CLASS::queryInterface( const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException ) \ - { \ - /* Attention: Don't use mutex or guard in this method!!! Is a method of XInterface. */ \ - /* Ask for my own supported interfaces ... */ \ - ::com::sun::star::uno::Any aReturn ( ::cppu::queryInterface INTERFACES \ - ); \ - /* If searched interface not supported by this class ... */ \ - if ( aReturn.hasValue() == sal_False ) \ - { \ - /* ... ask baseclass for interfaces! */ \ - aReturn = BASECLASS::queryInterface( aType ); \ - } \ - /* Return result of this search. */ \ - return aReturn; \ +#define PRIVATE_DEFINE_XINTERFACE_QUERYINTERFACE( CLASS, BASECLASS, INTERFACES ) \ + ::com::sun::star::uno::Any SAL_CALL CLASS::queryInterface( const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException ) \ + { \ + /* Attention: Don't use mutex or guard in this method!!! Is a method of XInterface. */ \ + /* Ask for my own supported interfaces ... */ \ + ::com::sun::star::uno::Any aReturn ( ::cppu::queryInterface INTERFACES \ + ); \ + /* If searched interface not supported by this class ... */ \ + if ( aReturn.hasValue() == sal_False ) \ + { \ + /* ... ask baseclass for interfaces! */ \ + aReturn = BASECLASS::queryInterface( aType ); \ + } \ + /* Return result of this search. */ \ + return aReturn; \ } //***************************************************************************************************************** -// private -// implementation of XInterface::queryInterface() with more then 12 other interfaces! +// private +// implementation of XInterface::queryInterface() with more then 12 other interfaces! //***************************************************************************************************************** -#define PRIVATE_DEFINE_XINTERFACE_QUERYINTERFACE_LARGE( CLASS, BASECLASS, INTERFACES_FIRST, INTERFACES_SECOND ) \ - ::com::sun::star::uno::Any SAL_CALL CLASS::queryInterface( const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException ) \ - { \ - /* Attention: Don't use mutex or guard in this method!!! Is a method of XInterface. */ \ - /* Ask for my own supported interfaces ... */ \ - ::com::sun::star::uno::Any aReturn ( ::cppu::queryInterface INTERFACES_FIRST \ - ); \ - /* If searched interface not supported by first group ... */ \ - if ( aReturn.hasValue() == sal_False ) \ - { \ - /* ... search in second group. (cppuhelper support 12 items only!) */ \ - aReturn = ::cppu::queryInterface INTERFACES_SECOND ; \ - /* If searched interface not supported by this class ... */ \ - if ( aReturn.hasValue() == sal_False ) \ - { \ - /* ... ask baseclass for interfaces! */ \ - aReturn = BASECLASS::queryInterface( aType ); \ - } \ - } \ - /* Return result of this search. */ \ - return aReturn; \ +#define PRIVATE_DEFINE_XINTERFACE_QUERYINTERFACE_LARGE( CLASS, BASECLASS, INTERFACES_FIRST, INTERFACES_SECOND ) \ + ::com::sun::star::uno::Any SAL_CALL CLASS::queryInterface( const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException ) \ + { \ + /* Attention: Don't use mutex or guard in this method!!! Is a method of XInterface. */ \ + /* Ask for my own supported interfaces ... */ \ + ::com::sun::star::uno::Any aReturn ( ::cppu::queryInterface INTERFACES_FIRST \ + ); \ + /* If searched interface not supported by first group ... */ \ + if ( aReturn.hasValue() == sal_False ) \ + { \ + /* ... search in second group. (cppuhelper support 12 items only!) */ \ + aReturn = ::cppu::queryInterface INTERFACES_SECOND ; \ + /* If searched interface not supported by this class ... */ \ + if ( aReturn.hasValue() == sal_False ) \ + { \ + /* ... ask baseclass for interfaces! */ \ + aReturn = BASECLASS::queryInterface( aType ); \ + } \ + } \ + /* Return result of this search. */ \ + return aReturn; \ } //***************************************************************************************************************** -// private -// complete implementation of XInterface for different use cases +// private +// complete implementation of XInterface for different use cases //***************************************************************************************************************** -#define PRIVATE_DEFINE_XINTERFACE_PURE( CLASS, BASECLASS ) \ - PRIVATE_DEFINE_XINTERFACE_AQUIRE_RELEASE( CLASS, BASECLASS ) \ +#define PRIVATE_DEFINE_XINTERFACE_PURE( CLASS, BASECLASS ) \ + PRIVATE_DEFINE_XINTERFACE_AQUIRE_RELEASE( CLASS, BASECLASS ) \ PRIVATE_DEFINE_XINTERFACE_QUERYINTERFACE_PURE( CLASS, BASECLASS ) -#define PRIVATE_DEFINE_XINTERFACE( CLASS, BASECLASS, INTERFACES ) \ - PRIVATE_DEFINE_XINTERFACE_AQUIRE_RELEASE( CLASS, BASECLASS ) \ +#define PRIVATE_DEFINE_XINTERFACE( CLASS, BASECLASS, INTERFACES ) \ + PRIVATE_DEFINE_XINTERFACE_AQUIRE_RELEASE( CLASS, BASECLASS ) \ PRIVATE_DEFINE_XINTERFACE_QUERYINTERFACE( CLASS, BASECLASS, INTERFACES ) -#define PRIVATE_DEFINE_XINTERFACE_LARGE( CLASS, BASECLASS, INTERFACES_FIRST, INTERFACES_SECOND ) \ - PRIVATE_DEFINE_XINTERFACE_AQUIRE_RELEASE( CLASS, BASECLASS ) \ +#define PRIVATE_DEFINE_XINTERFACE_LARGE( CLASS, BASECLASS, INTERFACES_FIRST, INTERFACES_SECOND ) \ + PRIVATE_DEFINE_XINTERFACE_AQUIRE_RELEASE( CLASS, BASECLASS ) \ PRIVATE_DEFINE_XINTERFACE_QUERYINTERFACE_LARGE( CLASS, BASECLASS, INTERFACES_FIRST, INTERFACES_SECOND ) //***************************************************************************************************************** -// private -// help macros to replace INTERFACES in queryInterface() [see before] +// private +// help macros to replace INTERFACES in queryInterface() [see before] //***************************************************************************************************************** /* #ifdef ENABLE_SERVICEDEBUG - #define PRIVATE_DEFINE_INTERFACE_1( INTERFACE1 ) \ - static_cast< XSPECIALDEBUGINTERFACE##* >( this ), \ + #define PRIVATE_DEFINE_INTERFACE_1( INTERFACE1 ) \ + static_cast< XSPECIALDEBUGINTERFACE##* >( this ), \ INTERFACE1 #else */ - #define PRIVATE_DEFINE_INTERFACE_1( INTERFACE1 ) \ + #define PRIVATE_DEFINE_INTERFACE_1( INTERFACE1 ) \ INTERFACE1 //#endif // #ifdef ENABLE_SERVICEDEBUG -#define PRIVATE_DEFINE_INTERFACE_2( INTERFACE1, INTERFACE2 ) \ - PRIVATE_DEFINE_INTERFACE_1( INTERFACE1 ), \ +#define PRIVATE_DEFINE_INTERFACE_2( INTERFACE1, INTERFACE2 ) \ + PRIVATE_DEFINE_INTERFACE_1( INTERFACE1 ), \ INTERFACE2 -#define PRIVATE_DEFINE_INTERFACE_3( INTERFACE1, INTERFACE2, INTERFACE3 ) \ - PRIVATE_DEFINE_INTERFACE_2( INTERFACE1, INTERFACE2 ), \ +#define PRIVATE_DEFINE_INTERFACE_3( INTERFACE1, INTERFACE2, INTERFACE3 ) \ + PRIVATE_DEFINE_INTERFACE_2( INTERFACE1, INTERFACE2 ), \ INTERFACE3 -#define PRIVATE_DEFINE_INTERFACE_4( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4 ) \ - PRIVATE_DEFINE_INTERFACE_3( INTERFACE1, INTERFACE2, INTERFACE3 ), \ +#define PRIVATE_DEFINE_INTERFACE_4( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4 ) \ + PRIVATE_DEFINE_INTERFACE_3( INTERFACE1, INTERFACE2, INTERFACE3 ), \ INTERFACE4 -#define PRIVATE_DEFINE_INTERFACE_5( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5 ) \ - PRIVATE_DEFINE_INTERFACE_4( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4 ), \ +#define PRIVATE_DEFINE_INTERFACE_5( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5 ) \ + PRIVATE_DEFINE_INTERFACE_4( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4 ), \ INTERFACE5 -#define PRIVATE_DEFINE_INTERFACE_6( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6 ) \ - PRIVATE_DEFINE_INTERFACE_5( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5 ), \ +#define PRIVATE_DEFINE_INTERFACE_6( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6 ) \ + PRIVATE_DEFINE_INTERFACE_5( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5 ), \ INTERFACE6 -#define PRIVATE_DEFINE_INTERFACE_7( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7 ) \ - PRIVATE_DEFINE_INTERFACE_6( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6 ), \ +#define PRIVATE_DEFINE_INTERFACE_7( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7 ) \ + PRIVATE_DEFINE_INTERFACE_6( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6 ), \ INTERFACE7 -#define PRIVATE_DEFINE_INTERFACE_8( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8 ) \ - PRIVATE_DEFINE_INTERFACE_7( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7 ), \ +#define PRIVATE_DEFINE_INTERFACE_8( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8 ) \ + PRIVATE_DEFINE_INTERFACE_7( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7 ), \ INTERFACE8 -#define PRIVATE_DEFINE_INTERFACE_9( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9 ) \ - PRIVATE_DEFINE_INTERFACE_8( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8 ), \ +#define PRIVATE_DEFINE_INTERFACE_9( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9 ) \ + PRIVATE_DEFINE_INTERFACE_8( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8 ), \ INTERFACE9 -#define PRIVATE_DEFINE_INTERFACE_10( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10 ) \ - PRIVATE_DEFINE_INTERFACE_9( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9 ), \ +#define PRIVATE_DEFINE_INTERFACE_10( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10 ) \ + PRIVATE_DEFINE_INTERFACE_9( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9 ), \ INTERFACE10 -#define PRIVATE_DEFINE_INTERFACE_11( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11 ) \ - PRIVATE_DEFINE_INTERFACE_10( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10 ), \ +#define PRIVATE_DEFINE_INTERFACE_11( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11 ) \ + PRIVATE_DEFINE_INTERFACE_10( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10 ), \ INTERFACE11 //***************************************************************************************************************** -// public -// help macros for follow XInterface definitions +// public +// help macros for follow XInterface definitions //***************************************************************************************************************** -// Use it as parameter for DEFINE_XINTERFACE_X(), if you CAN use an interface directly in queryInterface()! -#define DIRECT_INTERFACE( INTERFACE ) \ +// Use it as parameter for DEFINE_XINTERFACE_X(), if you CAN use an interface directly in queryInterface()! +#define DIRECT_INTERFACE( INTERFACE ) \ static_cast< INTERFACE* >( this ) -// Use it as parameter for DEFINE_XINTERFACE_X(), if you CAN'T use an interface directly in queryInterface()! -// (zB at ambigous errors!) -#define DERIVED_INTERFACE( BASEINTERFACE, DERIVEDINTERFACE ) \ +// Use it as parameter for DEFINE_XINTERFACE_X(), if you CAN'T use an interface directly in queryInterface()! +// (zB at ambigous errors!) +#define DERIVED_INTERFACE( BASEINTERFACE, DERIVEDINTERFACE ) \ static_cast< BASEINTERFACE* >( static_cast< DERIVEDINTERFACE* >( this ) ) //***************************************************************************************************************** -// public -// declaration of XInterface +// public +// declaration of XInterface //***************************************************************************************************************** -#define FWK_DECLARE_XINTERFACE \ - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException ); \ - virtual void SAL_CALL acquire ( ) throw(); \ - virtual void SAL_CALL release ( ) throw(); +#define FWK_DECLARE_XINTERFACE \ + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException ); \ + virtual void SAL_CALL acquire ( ) throw(); \ + virtual void SAL_CALL release ( ) throw(); //***************************************************************************************************************** -// public -// implementation of XInterface +// public +// implementation of XInterface //***************************************************************************************************************** -// implementation of XInterface with 0 additional interface for queryInterface() -#define DEFINE_XINTERFACE_0( CLASS, BASECLASS ) \ - PRIVATE_DEFINE_XINTERFACE_PURE ( CLASS, \ - BASECLASS \ +// implementation of XInterface with 0 additional interface for queryInterface() +#define DEFINE_XINTERFACE_0( CLASS, BASECLASS ) \ + PRIVATE_DEFINE_XINTERFACE_PURE ( CLASS, \ + BASECLASS \ ) -// implementation of XInterface with 1 additional interface for queryInterface() -#define DEFINE_XINTERFACE_1( CLASS, BASECLASS, INTERFACE1 ) \ - PRIVATE_DEFINE_XINTERFACE ( CLASS, \ - BASECLASS, \ - ( aType, PRIVATE_DEFINE_INTERFACE_1 ( INTERFACE1 \ - ) \ - ) \ +// implementation of XInterface with 1 additional interface for queryInterface() +#define DEFINE_XINTERFACE_1( CLASS, BASECLASS, INTERFACE1 ) \ + PRIVATE_DEFINE_XINTERFACE ( CLASS, \ + BASECLASS, \ + ( aType, PRIVATE_DEFINE_INTERFACE_1 ( INTERFACE1 \ + ) \ + ) \ ) -// implementation of XInterface with 2 additional interfaces for queryInterface() -#define DEFINE_XINTERFACE_2( CLASS, BASECLASS, INTERFACE1, INTERFACE2 ) \ - PRIVATE_DEFINE_XINTERFACE ( CLASS, \ - BASECLASS, \ - ( aType, PRIVATE_DEFINE_INTERFACE_2 ( INTERFACE1 , \ - INTERFACE2 \ - ) \ - ) \ +// implementation of XInterface with 2 additional interfaces for queryInterface() +#define DEFINE_XINTERFACE_2( CLASS, BASECLASS, INTERFACE1, INTERFACE2 ) \ + PRIVATE_DEFINE_XINTERFACE ( CLASS, \ + BASECLASS, \ + ( aType, PRIVATE_DEFINE_INTERFACE_2 ( INTERFACE1 , \ + INTERFACE2 \ + ) \ + ) \ ) -// implementation of XInterface with 3 additional interfaces for queryInterface() -#define DEFINE_XINTERFACE_3( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3 ) \ - PRIVATE_DEFINE_XINTERFACE ( CLASS, \ - BASECLASS, \ - ( aType, PRIVATE_DEFINE_INTERFACE_3 ( INTERFACE1 , \ - INTERFACE2 , \ - INTERFACE3 \ - ) \ - ) \ +// implementation of XInterface with 3 additional interfaces for queryInterface() +#define DEFINE_XINTERFACE_3( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3 ) \ + PRIVATE_DEFINE_XINTERFACE ( CLASS, \ + BASECLASS, \ + ( aType, PRIVATE_DEFINE_INTERFACE_3 ( INTERFACE1 , \ + INTERFACE2 , \ + INTERFACE3 \ + ) \ + ) \ ) -// implementation of XInterface with 4 additional interfaces for queryInterface() -#define DEFINE_XINTERFACE_4( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4 ) \ - PRIVATE_DEFINE_XINTERFACE ( CLASS, \ - BASECLASS, \ - ( aType, PRIVATE_DEFINE_INTERFACE_4 ( INTERFACE1 , \ - INTERFACE2 , \ - INTERFACE3 , \ - INTERFACE4 \ - ) \ - ) \ +// implementation of XInterface with 4 additional interfaces for queryInterface() +#define DEFINE_XINTERFACE_4( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4 ) \ + PRIVATE_DEFINE_XINTERFACE ( CLASS, \ + BASECLASS, \ + ( aType, PRIVATE_DEFINE_INTERFACE_4 ( INTERFACE1 , \ + INTERFACE2 , \ + INTERFACE3 , \ + INTERFACE4 \ + ) \ + ) \ ) -// implementation of XInterface with 5 additional interfaces for queryInterface() -#define DEFINE_XINTERFACE_5( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5 ) \ - PRIVATE_DEFINE_XINTERFACE ( CLASS, \ - BASECLASS, \ - ( aType, PRIVATE_DEFINE_INTERFACE_5 ( INTERFACE1 , \ - INTERFACE2 , \ - INTERFACE3 , \ - INTERFACE4 , \ - INTERFACE5 \ - ) \ - ) \ +// implementation of XInterface with 5 additional interfaces for queryInterface() +#define DEFINE_XINTERFACE_5( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5 ) \ + PRIVATE_DEFINE_XINTERFACE ( CLASS, \ + BASECLASS, \ + ( aType, PRIVATE_DEFINE_INTERFACE_5 ( INTERFACE1 , \ + INTERFACE2 , \ + INTERFACE3 , \ + INTERFACE4 , \ + INTERFACE5 \ + ) \ + ) \ ) -// implementation of XInterface with 6 additional interfaces for queryInterface() -#define DEFINE_XINTERFACE_6( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6 ) \ - PRIVATE_DEFINE_XINTERFACE ( CLASS, \ - BASECLASS, \ - ( aType, PRIVATE_DEFINE_INTERFACE_6 ( INTERFACE1 , \ - INTERFACE2 , \ - INTERFACE3 , \ - INTERFACE4 , \ - INTERFACE5 , \ - INTERFACE6 \ - ) \ - ) \ +// implementation of XInterface with 6 additional interfaces for queryInterface() +#define DEFINE_XINTERFACE_6( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6 ) \ + PRIVATE_DEFINE_XINTERFACE ( CLASS, \ + BASECLASS, \ + ( aType, PRIVATE_DEFINE_INTERFACE_6 ( INTERFACE1 , \ + INTERFACE2 , \ + INTERFACE3 , \ + INTERFACE4 , \ + INTERFACE5 , \ + INTERFACE6 \ + ) \ + ) \ ) -// implementation of XInterface with 7 additional interfaces for queryInterface() -#define DEFINE_XINTERFACE_7( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7 ) \ - PRIVATE_DEFINE_XINTERFACE ( CLASS, \ - BASECLASS, \ - ( aType, PRIVATE_DEFINE_INTERFACE_7 ( INTERFACE1 , \ - INTERFACE2 , \ - INTERFACE3 , \ - INTERFACE4 , \ - INTERFACE5 , \ - INTERFACE6 , \ - INTERFACE7 \ - ) \ - ) \ +// implementation of XInterface with 7 additional interfaces for queryInterface() +#define DEFINE_XINTERFACE_7( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7 ) \ + PRIVATE_DEFINE_XINTERFACE ( CLASS, \ + BASECLASS, \ + ( aType, PRIVATE_DEFINE_INTERFACE_7 ( INTERFACE1 , \ + INTERFACE2 , \ + INTERFACE3 , \ + INTERFACE4 , \ + INTERFACE5 , \ + INTERFACE6 , \ + INTERFACE7 \ + ) \ + ) \ ) -// implementation of XInterface with 8 additional interfaces for queryInterface() -#define DEFINE_XINTERFACE_8( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8 ) \ - PRIVATE_DEFINE_XINTERFACE ( CLASS, \ - BASECLASS, \ - ( aType, PRIVATE_DEFINE_INTERFACE_8 ( INTERFACE1 , \ - INTERFACE2 , \ - INTERFACE3 , \ - INTERFACE4 , \ - INTERFACE5 , \ - INTERFACE6 , \ - INTERFACE7 , \ - INTERFACE8 \ - ) \ - ) \ +// implementation of XInterface with 8 additional interfaces for queryInterface() +#define DEFINE_XINTERFACE_8( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8 ) \ + PRIVATE_DEFINE_XINTERFACE ( CLASS, \ + BASECLASS, \ + ( aType, PRIVATE_DEFINE_INTERFACE_8 ( INTERFACE1 , \ + INTERFACE2 , \ + INTERFACE3 , \ + INTERFACE4 , \ + INTERFACE5 , \ + INTERFACE6 , \ + INTERFACE7 , \ + INTERFACE8 \ + ) \ + ) \ ) -// implementation of XInterface with 9 additional interfaces for queryInterface() -#define DEFINE_XINTERFACE_9( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9 ) \ - PRIVATE_DEFINE_XINTERFACE ( CLASS, \ - BASECLASS, \ - ( aType, PRIVATE_DEFINE_INTERFACE_9 ( INTERFACE1 , \ - INTERFACE2 , \ - INTERFACE3 , \ - INTERFACE4 , \ - INTERFACE5 , \ - INTERFACE6 , \ - INTERFACE7 , \ - INTERFACE8 , \ - INTERFACE9 \ - ) \ - ) \ +// implementation of XInterface with 9 additional interfaces for queryInterface() +#define DEFINE_XINTERFACE_9( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9 ) \ + PRIVATE_DEFINE_XINTERFACE ( CLASS, \ + BASECLASS, \ + ( aType, PRIVATE_DEFINE_INTERFACE_9 ( INTERFACE1 , \ + INTERFACE2 , \ + INTERFACE3 , \ + INTERFACE4 , \ + INTERFACE5 , \ + INTERFACE6 , \ + INTERFACE7 , \ + INTERFACE8 , \ + INTERFACE9 \ + ) \ + ) \ ) -// implementation of XInterface with 10 additional interfaces for queryInterface() -#define DEFINE_XINTERFACE_10( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10 ) \ - PRIVATE_DEFINE_XINTERFACE ( CLASS, \ - BASECLASS, \ - ( aType, PRIVATE_DEFINE_INTERFACE_10 ( INTERFACE1 , \ - INTERFACE2 , \ - INTERFACE3 , \ - INTERFACE4 , \ - INTERFACE5 , \ - INTERFACE6 , \ - INTERFACE7 , \ - INTERFACE8 , \ - INTERFACE9 , \ - INTERFACE10 \ - ) \ - ) \ +// implementation of XInterface with 10 additional interfaces for queryInterface() +#define DEFINE_XINTERFACE_10( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10 ) \ + PRIVATE_DEFINE_XINTERFACE ( CLASS, \ + BASECLASS, \ + ( aType, PRIVATE_DEFINE_INTERFACE_10 ( INTERFACE1 , \ + INTERFACE2 , \ + INTERFACE3 , \ + INTERFACE4 , \ + INTERFACE5 , \ + INTERFACE6 , \ + INTERFACE7 , \ + INTERFACE8 , \ + INTERFACE9 , \ + INTERFACE10 \ + ) \ + ) \ ) -// implementation of XInterface with 11 additional interfaces for queryInterface() -#define DEFINE_XINTERFACE_11( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11 ) \ - PRIVATE_DEFINE_XINTERFACE ( CLASS, \ - BASECLASS, \ - ( aType, PRIVATE_DEFINE_INTERFACE_11 ( INTERFACE1 , \ - INTERFACE2 , \ - INTERFACE3 , \ - INTERFACE4 , \ - INTERFACE5 , \ - INTERFACE6 , \ - INTERFACE7 , \ - INTERFACE8 , \ - INTERFACE9 , \ - INTERFACE10 , \ - INTERFACE11 \ - ) \ - ) \ +// implementation of XInterface with 11 additional interfaces for queryInterface() +#define DEFINE_XINTERFACE_11( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11 ) \ + PRIVATE_DEFINE_XINTERFACE ( CLASS, \ + BASECLASS, \ + ( aType, PRIVATE_DEFINE_INTERFACE_11 ( INTERFACE1 , \ + INTERFACE2 , \ + INTERFACE3 , \ + INTERFACE4 , \ + INTERFACE5 , \ + INTERFACE6 , \ + INTERFACE7 , \ + INTERFACE8 , \ + INTERFACE9 , \ + INTERFACE10 , \ + INTERFACE11 \ + ) \ + ) \ ) -// implementation of XInterface with 12 additional interfaces for queryInterface() -#define DEFINE_XINTERFACE_12( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12 ) \ - PRIVATE_DEFINE_XINTERFACE_LARGE ( CLASS, \ - BASECLASS, \ - ( aType, PRIVATE_DEFINE_INTERFACE_11 ( INTERFACE1 , \ - INTERFACE2 , \ - INTERFACE3 , \ - INTERFACE4 , \ - INTERFACE5 , \ - INTERFACE6 , \ - INTERFACE7 , \ - INTERFACE8 , \ - INTERFACE9 , \ - INTERFACE10 , \ - INTERFACE11 \ - ) \ - ), \ - ( aType, PRIVATE_DEFINE_INTERFACE_1 ( INTERFACE12 \ - ) \ - ) \ +// implementation of XInterface with 12 additional interfaces for queryInterface() +#define DEFINE_XINTERFACE_12( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12 ) \ + PRIVATE_DEFINE_XINTERFACE_LARGE ( CLASS, \ + BASECLASS, \ + ( aType, PRIVATE_DEFINE_INTERFACE_11 ( INTERFACE1 , \ + INTERFACE2 , \ + INTERFACE3 , \ + INTERFACE4 , \ + INTERFACE5 , \ + INTERFACE6 , \ + INTERFACE7 , \ + INTERFACE8 , \ + INTERFACE9 , \ + INTERFACE10 , \ + INTERFACE11 \ + ) \ + ), \ + ( aType, PRIVATE_DEFINE_INTERFACE_1 ( INTERFACE12 \ + ) \ + ) \ ) -// implementation of XInterface with 13 additional interfaces for queryInterface() -#define DEFINE_XINTERFACE_13( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12, INTERFACE13 ) \ - PRIVATE_DEFINE_XINTERFACE_LARGE ( CLASS, \ - BASECLASS, \ - ( aType, PRIVATE_DEFINE_INTERFACE_11 ( INTERFACE1 , \ - INTERFACE2 , \ - INTERFACE3 , \ - INTERFACE4 , \ - INTERFACE5 , \ - INTERFACE6 , \ - INTERFACE7 , \ - INTERFACE8 , \ - INTERFACE9 , \ - INTERFACE10 , \ - INTERFACE11 \ - ) \ - ), \ - ( aType, PRIVATE_DEFINE_INTERFACE_2 ( INTERFACE12 , \ - INTERFACE13 \ - ) \ - ) \ +// implementation of XInterface with 13 additional interfaces for queryInterface() +#define DEFINE_XINTERFACE_13( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12, INTERFACE13 ) \ + PRIVATE_DEFINE_XINTERFACE_LARGE ( CLASS, \ + BASECLASS, \ + ( aType, PRIVATE_DEFINE_INTERFACE_11 ( INTERFACE1 , \ + INTERFACE2 , \ + INTERFACE3 , \ + INTERFACE4 , \ + INTERFACE5 , \ + INTERFACE6 , \ + INTERFACE7 , \ + INTERFACE8 , \ + INTERFACE9 , \ + INTERFACE10 , \ + INTERFACE11 \ + ) \ + ), \ + ( aType, PRIVATE_DEFINE_INTERFACE_2 ( INTERFACE12 , \ + INTERFACE13 \ + ) \ + ) \ ) -// implementation of XInterface with 14 additional interfaces for queryInterface() -#define DEFINE_XINTERFACE_14( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12, INTERFACE13, INTERFACE14 ) \ - PRIVATE_DEFINE_XINTERFACE_LARGE ( CLASS, \ - BASECLASS, \ - ( aType, PRIVATE_DEFINE_INTERFACE_11 ( INTERFACE1 , \ - INTERFACE2 , \ - INTERFACE3 , \ - INTERFACE4 , \ - INTERFACE5 , \ - INTERFACE6 , \ - INTERFACE7 , \ - INTERFACE8 , \ - INTERFACE9 , \ - INTERFACE10 , \ - INTERFACE11 \ - ) \ - ), \ - ( aType, PRIVATE_DEFINE_INTERFACE_3 ( INTERFACE12 , \ - INTERFACE13 , \ - INTERFACE14 \ - ) \ - ) \ +// implementation of XInterface with 14 additional interfaces for queryInterface() +#define DEFINE_XINTERFACE_14( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12, INTERFACE13, INTERFACE14 ) \ + PRIVATE_DEFINE_XINTERFACE_LARGE ( CLASS, \ + BASECLASS, \ + ( aType, PRIVATE_DEFINE_INTERFACE_11 ( INTERFACE1 , \ + INTERFACE2 , \ + INTERFACE3 , \ + INTERFACE4 , \ + INTERFACE5 , \ + INTERFACE6 , \ + INTERFACE7 , \ + INTERFACE8 , \ + INTERFACE9 , \ + INTERFACE10 , \ + INTERFACE11 \ + ) \ + ), \ + ( aType, PRIVATE_DEFINE_INTERFACE_3 ( INTERFACE12 , \ + INTERFACE13 , \ + INTERFACE14 \ + ) \ + ) \ ) -// implementation of XInterface with 15 additional interfaces for queryInterface() -#define DEFINE_XINTERFACE_15( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12, INTERFACE13, INTERFACE14, INTERFACE15 ) \ - PRIVATE_DEFINE_XINTERFACE_LARGE ( CLASS, \ - BASECLASS, \ - ( aType, PRIVATE_DEFINE_INTERFACE_11 ( INTERFACE1 , \ - INTERFACE2 , \ - INTERFACE3 , \ - INTERFACE4 , \ - INTERFACE5 , \ - INTERFACE6 , \ - INTERFACE7 , \ - INTERFACE8 , \ - INTERFACE9 , \ - INTERFACE10 , \ - INTERFACE11 \ - ) \ - ), \ - ( aType, PRIVATE_DEFINE_INTERFACE_4 ( INTERFACE12 , \ - INTERFACE13 , \ - INTERFACE14 , \ - INTERFACE15 \ - ) \ - ) \ +// implementation of XInterface with 15 additional interfaces for queryInterface() +#define DEFINE_XINTERFACE_15( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12, INTERFACE13, INTERFACE14, INTERFACE15 ) \ + PRIVATE_DEFINE_XINTERFACE_LARGE ( CLASS, \ + BASECLASS, \ + ( aType, PRIVATE_DEFINE_INTERFACE_11 ( INTERFACE1 , \ + INTERFACE2 , \ + INTERFACE3 , \ + INTERFACE4 , \ + INTERFACE5 , \ + INTERFACE6 , \ + INTERFACE7 , \ + INTERFACE8 , \ + INTERFACE9 , \ + INTERFACE10 , \ + INTERFACE11 \ + ) \ + ), \ + ( aType, PRIVATE_DEFINE_INTERFACE_4 ( INTERFACE12 , \ + INTERFACE13 , \ + INTERFACE14 , \ + INTERFACE15 \ + ) \ + ) \ ) -// implementation of XInterface with 16 additional interfaces for queryInterface() -#define DEFINE_XINTERFACE_16( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12, INTERFACE13, INTERFACE14, INTERFACE15, INTERFACE16 ) \ - PRIVATE_DEFINE_XINTERFACE_LARGE ( CLASS, \ - BASECLASS, \ - ( aType, PRIVATE_DEFINE_INTERFACE_11 ( INTERFACE1 , \ - INTERFACE2 , \ - INTERFACE3 , \ - INTERFACE4 , \ - INTERFACE5 , \ - INTERFACE6 , \ - INTERFACE7 , \ - INTERFACE8 , \ - INTERFACE9 , \ - INTERFACE10 , \ - INTERFACE11 \ - ) \ - ), \ - ( aType, PRIVATE_DEFINE_INTERFACE_5 ( INTERFACE12 , \ - INTERFACE13 , \ - INTERFACE14 , \ - INTERFACE15 , \ - INTERFACE16 \ - ) \ - ) \ +// implementation of XInterface with 16 additional interfaces for queryInterface() +#define DEFINE_XINTERFACE_16( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12, INTERFACE13, INTERFACE14, INTERFACE15, INTERFACE16 ) \ + PRIVATE_DEFINE_XINTERFACE_LARGE ( CLASS, \ + BASECLASS, \ + ( aType, PRIVATE_DEFINE_INTERFACE_11 ( INTERFACE1 , \ + INTERFACE2 , \ + INTERFACE3 , \ + INTERFACE4 , \ + INTERFACE5 , \ + INTERFACE6 , \ + INTERFACE7 , \ + INTERFACE8 , \ + INTERFACE9 , \ + INTERFACE10 , \ + INTERFACE11 \ + ) \ + ), \ + ( aType, PRIVATE_DEFINE_INTERFACE_5 ( INTERFACE12 , \ + INTERFACE13 , \ + INTERFACE14 , \ + INTERFACE15 , \ + INTERFACE16 \ + ) \ + ) \ ) // implementation of XInterface with 17 additional interfaces for queryInterface() #define DEFINE_XINTERFACE_17( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12, INTERFACE13, INTERFACE14, INTERFACE15, INTERFACE16, INTERFACE17 ) \ - PRIVATE_DEFINE_XINTERFACE_LARGE ( CLASS, \ - BASECLASS, \ - ( aType, PRIVATE_DEFINE_INTERFACE_11 ( INTERFACE1 , \ - INTERFACE2 , \ - INTERFACE3 , \ - INTERFACE4 , \ - INTERFACE5 , \ - INTERFACE6 , \ - INTERFACE7 , \ - INTERFACE8 , \ - INTERFACE9 , \ - INTERFACE10 , \ - INTERFACE11 \ - ) \ - ), \ + PRIVATE_DEFINE_XINTERFACE_LARGE ( CLASS, \ + BASECLASS, \ + ( aType, PRIVATE_DEFINE_INTERFACE_11 ( INTERFACE1 , \ + INTERFACE2 , \ + INTERFACE3 , \ + INTERFACE4 , \ + INTERFACE5 , \ + INTERFACE6 , \ + INTERFACE7 , \ + INTERFACE8 , \ + INTERFACE9 , \ + INTERFACE10 , \ + INTERFACE11 \ + ) \ + ), \ ( aType, PRIVATE_DEFINE_INTERFACE_6 ( INTERFACE12 , \ - INTERFACE13 , \ - INTERFACE14 , \ - INTERFACE15 , \ + INTERFACE13 , \ + INTERFACE14 , \ + INTERFACE15 , \ INTERFACE16 , \ INTERFACE17 \ - ) \ - ) \ + ) \ + ) \ ) // implementation of XInterface with 18 additional interfaces for queryInterface() #define DEFINE_XINTERFACE_18( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12, INTERFACE13, INTERFACE14, INTERFACE15, INTERFACE16, INTERFACE17, INTERFACE18 ) \ - PRIVATE_DEFINE_XINTERFACE_LARGE ( CLASS, \ - BASECLASS, \ - ( aType, PRIVATE_DEFINE_INTERFACE_11 ( INTERFACE1 , \ - INTERFACE2 , \ - INTERFACE3 , \ - INTERFACE4 , \ - INTERFACE5 , \ - INTERFACE6 , \ - INTERFACE7 , \ - INTERFACE8 , \ - INTERFACE9 , \ - INTERFACE10 , \ - INTERFACE11 \ - ) \ - ), \ + PRIVATE_DEFINE_XINTERFACE_LARGE ( CLASS, \ + BASECLASS, \ + ( aType, PRIVATE_DEFINE_INTERFACE_11 ( INTERFACE1 , \ + INTERFACE2 , \ + INTERFACE3 , \ + INTERFACE4 , \ + INTERFACE5 , \ + INTERFACE6 , \ + INTERFACE7 , \ + INTERFACE8 , \ + INTERFACE9 , \ + INTERFACE10 , \ + INTERFACE11 \ + ) \ + ), \ ( aType, PRIVATE_DEFINE_INTERFACE_7 ( INTERFACE12 , \ - INTERFACE13 , \ - INTERFACE14 , \ - INTERFACE15 , \ + INTERFACE13 , \ + INTERFACE14 , \ + INTERFACE15 , \ INTERFACE16 , \ INTERFACE17 , \ INTERFACE18 \ - ) \ - ) \ + ) \ + ) \ ) // implementation of XInterface with 19 additional interfaces for queryInterface() #define DEFINE_XINTERFACE_19( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12, INTERFACE13, INTERFACE14, INTERFACE15, INTERFACE16, INTERFACE17, INTERFACE18, INTERFACE19 ) \ - PRIVATE_DEFINE_XINTERFACE_LARGE ( CLASS, \ - BASECLASS, \ - ( aType, PRIVATE_DEFINE_INTERFACE_11 ( INTERFACE1 , \ - INTERFACE2 , \ - INTERFACE3 , \ - INTERFACE4 , \ - INTERFACE5 , \ - INTERFACE6 , \ - INTERFACE7 , \ - INTERFACE8 , \ - INTERFACE9 , \ - INTERFACE10 , \ - INTERFACE11 \ - ) \ - ), \ + PRIVATE_DEFINE_XINTERFACE_LARGE ( CLASS, \ + BASECLASS, \ + ( aType, PRIVATE_DEFINE_INTERFACE_11 ( INTERFACE1 , \ + INTERFACE2 , \ + INTERFACE3 , \ + INTERFACE4 , \ + INTERFACE5 , \ + INTERFACE6 , \ + INTERFACE7 , \ + INTERFACE8 , \ + INTERFACE9 , \ + INTERFACE10 , \ + INTERFACE11 \ + ) \ + ), \ ( aType, PRIVATE_DEFINE_INTERFACE_8 ( INTERFACE12 , \ - INTERFACE13 , \ - INTERFACE14 , \ - INTERFACE15 , \ + INTERFACE13 , \ + INTERFACE14 , \ + INTERFACE15 , \ INTERFACE16 , \ INTERFACE17 , \ INTERFACE18 , \ INTERFACE19 \ - ) \ - ) \ + ) \ + ) \ ) // implementation of XInterface with 20 additional interfaces for queryInterface() #define DEFINE_XINTERFACE_20( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12, INTERFACE13, INTERFACE14, INTERFACE15, INTERFACE16, INTERFACE17, INTERFACE18, INTERFACE19, INTERFACE20 ) \ - PRIVATE_DEFINE_XINTERFACE_LARGE ( CLASS, \ - BASECLASS, \ - ( aType, PRIVATE_DEFINE_INTERFACE_11 ( INTERFACE1 , \ - INTERFACE2 , \ - INTERFACE3 , \ - INTERFACE4 , \ - INTERFACE5 , \ - INTERFACE6 , \ - INTERFACE7 , \ - INTERFACE8 , \ - INTERFACE9 , \ - INTERFACE10 , \ - INTERFACE11 \ - ) \ - ), \ + PRIVATE_DEFINE_XINTERFACE_LARGE ( CLASS, \ + BASECLASS, \ + ( aType, PRIVATE_DEFINE_INTERFACE_11 ( INTERFACE1 , \ + INTERFACE2 , \ + INTERFACE3 , \ + INTERFACE4 , \ + INTERFACE5 , \ + INTERFACE6 , \ + INTERFACE7 , \ + INTERFACE8 , \ + INTERFACE9 , \ + INTERFACE10 , \ + INTERFACE11 \ + ) \ + ), \ ( aType, PRIVATE_DEFINE_INTERFACE_9 ( INTERFACE12 , \ - INTERFACE13 , \ - INTERFACE14 , \ - INTERFACE15 , \ + INTERFACE13 , \ + INTERFACE14 , \ + INTERFACE15 , \ INTERFACE16 , \ INTERFACE17 , \ INTERFACE18 , \ INTERFACE19 , \ INTERFACE20 \ - ) \ - ) \ + ) \ + ) \ ) // implementation of XInterface with 21 additional interfaces for queryInterface() #define DEFINE_XINTERFACE_21( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12, INTERFACE13, INTERFACE14, INTERFACE15, INTERFACE16, INTERFACE17, INTERFACE18, INTERFACE19, INTERFACE20, INTERFACE21 ) \ - PRIVATE_DEFINE_XINTERFACE_LARGE ( CLASS, \ - BASECLASS, \ - ( aType, PRIVATE_DEFINE_INTERFACE_11 ( INTERFACE1 , \ - INTERFACE2 , \ - INTERFACE3 , \ - INTERFACE4 , \ - INTERFACE5 , \ - INTERFACE6 , \ - INTERFACE7 , \ - INTERFACE8 , \ - INTERFACE9 , \ - INTERFACE10 , \ - INTERFACE11 \ - ) \ - ), \ + PRIVATE_DEFINE_XINTERFACE_LARGE ( CLASS, \ + BASECLASS, \ + ( aType, PRIVATE_DEFINE_INTERFACE_11 ( INTERFACE1 , \ + INTERFACE2 , \ + INTERFACE3 , \ + INTERFACE4 , \ + INTERFACE5 , \ + INTERFACE6 , \ + INTERFACE7 , \ + INTERFACE8 , \ + INTERFACE9 , \ + INTERFACE10 , \ + INTERFACE11 \ + ) \ + ), \ ( aType, PRIVATE_DEFINE_INTERFACE_10 ( INTERFACE12 , \ - INTERFACE13 , \ - INTERFACE14 , \ - INTERFACE15 , \ + INTERFACE13 , \ + INTERFACE14 , \ + INTERFACE15 , \ INTERFACE16 , \ INTERFACE17 , \ INTERFACE18 , \ INTERFACE19 , \ INTERFACE20 , \ INTERFACE21 \ - ) \ - ) \ + ) \ + ) \ ) - + // implementation of XInterface with 22 additional interfaces for queryInterface() #define DEFINE_XINTERFACE_22( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12, INTERFACE13, INTERFACE14, INTERFACE15, INTERFACE16, INTERFACE17, INTERFACE18, INTERFACE19, INTERFACE20, INTERFACE21, INTERFACE22 ) \ - PRIVATE_DEFINE_XINTERFACE_LARGE ( CLASS, \ - BASECLASS, \ - ( aType, PRIVATE_DEFINE_INTERFACE_11 ( INTERFACE1 , \ - INTERFACE2 , \ - INTERFACE3 , \ - INTERFACE4 , \ - INTERFACE5 , \ - INTERFACE6 , \ - INTERFACE7 , \ - INTERFACE8 , \ - INTERFACE9 , \ - INTERFACE10 , \ - INTERFACE11 \ - ) \ - ), \ + PRIVATE_DEFINE_XINTERFACE_LARGE ( CLASS, \ + BASECLASS, \ + ( aType, PRIVATE_DEFINE_INTERFACE_11 ( INTERFACE1 , \ + INTERFACE2 , \ + INTERFACE3 , \ + INTERFACE4 , \ + INTERFACE5 , \ + INTERFACE6 , \ + INTERFACE7 , \ + INTERFACE8 , \ + INTERFACE9 , \ + INTERFACE10 , \ + INTERFACE11 \ + ) \ + ), \ ( aType, PRIVATE_DEFINE_INTERFACE_11 ( INTERFACE12 , \ - INTERFACE13 , \ - INTERFACE14 , \ - INTERFACE15 , \ + INTERFACE13 , \ + INTERFACE14 , \ + INTERFACE15 , \ INTERFACE16 , \ INTERFACE17 , \ INTERFACE18 , \ @@ -699,10 +699,10 @@ ________________________________________________________________________________ INTERFACE20 , \ INTERFACE22 , \ INTERFACE21 \ - ) \ - ) \ + ) \ + ) \ ) - -} // namespace framework -#endif // #ifndef __FRAMEWORK_MACROS_XINTERFACE_HXX_ +} // namespace framework + +#endif // #ifndef __FRAMEWORK_MACROS_XINTERFACE_HXX_ diff --git a/framework/inc/macros/xserviceinfo.hxx b/framework/inc/macros/xserviceinfo.hxx index fd5350a797d4..473ce69a74e6 100644 --- a/framework/inc/macros/xserviceinfo.hxx +++ b/framework/inc/macros/xserviceinfo.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,13 +29,13 @@ #define __FRAMEWORK_MACROS_XSERVICEINFO_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <general.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/uno/Exception.hpp> #include <com/sun/star/uno/RuntimeException.hpp> @@ -43,7 +43,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Reference.hxx> @@ -57,7 +57,7 @@ #include <rtl/logfile.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ @@ -75,61 +75,61 @@ namespace framework{ _________________________________________________________________________________________________________________*/ //***************************************************************************************************************** -// private -// implementation of XServiceInfo and helper functions +// private +// implementation of XServiceInfo and helper functions //***************************************************************************************************************** #define PRIVATE_DEFINE_XSERVICEINFO_BASE( CLASS, XINTERFACECAST, SERVICENAME, IMPLEMENTATIONNAME ) \ - /*===========================================================================================================*/ \ - /* XServiceInfo */ \ - /*===========================================================================================================*/ \ + /*===========================================================================================================*/ \ + /* XServiceInfo */ \ + /*===========================================================================================================*/ \ ::rtl::OUString SAL_CALL CLASS::getImplementationName() throw( css::uno::RuntimeException ) \ - { \ - return impl_getStaticImplementationName(); \ - } \ + { \ + return impl_getStaticImplementationName(); \ + } \ \ - /*===========================================================================================================*/ \ - /* XServiceInfo */ \ - /*===========================================================================================================*/ \ + /*===========================================================================================================*/ \ + /* XServiceInfo */ \ + /*===========================================================================================================*/ \ sal_Bool SAL_CALL CLASS::supportsService( const ::rtl::OUString& sServiceName ) throw( css::uno::RuntimeException ) \ - { \ + { \ return ::comphelper::findValue(getSupportedServiceNames(), sServiceName, sal_True).getLength() != 0; \ - } \ + } \ \ - /*===========================================================================================================*/ \ - /* XServiceInfo */ \ - /*===========================================================================================================*/ \ + /*===========================================================================================================*/ \ + /* XServiceInfo */ \ + /*===========================================================================================================*/ \ css::uno::Sequence< ::rtl::OUString > SAL_CALL CLASS::getSupportedServiceNames() throw( css::uno::RuntimeException ) \ - { \ - return impl_getStaticSupportedServiceNames(); \ - } \ + { \ + return impl_getStaticSupportedServiceNames(); \ + } \ \ - /*===========================================================================================================*/ \ + /*===========================================================================================================*/ \ /* Helper for XServiceInfo */ \ - /*===========================================================================================================*/ \ + /*===========================================================================================================*/ \ css::uno::Sequence< ::rtl::OUString > CLASS::impl_getStaticSupportedServiceNames() \ - { \ + { \ css::uno::Sequence< ::rtl::OUString > seqServiceNames( 1 ); \ - seqServiceNames.getArray() [0] = SERVICENAME ; \ - return seqServiceNames; \ - } \ + seqServiceNames.getArray() [0] = SERVICENAME ; \ + return seqServiceNames; \ + } \ \ - /*===========================================================================================================*/ \ - /* Helper for XServiceInfo */ \ - /*===========================================================================================================*/ \ - ::rtl::OUString CLASS::impl_getStaticImplementationName() \ - { \ - return IMPLEMENTATIONNAME ; \ + /*===========================================================================================================*/ \ + /* Helper for XServiceInfo */ \ + /*===========================================================================================================*/ \ + ::rtl::OUString CLASS::impl_getStaticImplementationName() \ + { \ + return IMPLEMENTATIONNAME ; \ } #define PRIVATE_DEFINE_XSERVICEINFO_OLDSTYLE( CLASS, XINTERFACECAST, SERVICENAME, IMPLEMENTATIONNAME ) \ - PRIVATE_DEFINE_XSERVICEINFO_BASE( CLASS, XINTERFACECAST, SERVICENAME, IMPLEMENTATIONNAME ) \ - /*===========================================================================================================*/ \ - /* Helper for registry */ \ + PRIVATE_DEFINE_XSERVICEINFO_BASE( CLASS, XINTERFACECAST, SERVICENAME, IMPLEMENTATIONNAME ) \ + /*===========================================================================================================*/ \ + /* Helper for registry */ \ /* Attention: To avoid against wrong ref counts during our own initialize procedure, we must */ \ /* use right EXTERNAL handling of them. That's why you should do nothing in your ctor, which could*/ \ /* work on your ref count! All other things are allowed. Do work with your own reference - please */ \ /* use "impl_initService()" method. */ \ - /*===========================================================================================================*/ \ + /*===========================================================================================================*/ \ css::uno::Reference< css::uno::XInterface > SAL_CALL CLASS::impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception ) \ { \ RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework","Ocke.Janssen@sun.com",U2B(IMPLEMENTATIONNAME).getStr()); \ @@ -144,22 +144,22 @@ ________________________________________________________________________________ } #define PRIVATE_DEFINE_XSERVICEINFO_NEWSTYLE( CLASS, XINTERFACECAST, SERVICENAME, IMPLEMENTATIONNAME ) \ - PRIVATE_DEFINE_XSERVICEINFO_BASE( CLASS, XINTERFACECAST, SERVICENAME, IMPLEMENTATIONNAME ) \ - /*===========================================================================================================*/ \ - /* Helper for registry */ \ + PRIVATE_DEFINE_XSERVICEINFO_BASE( CLASS, XINTERFACECAST, SERVICENAME, IMPLEMENTATIONNAME ) \ + /*===========================================================================================================*/ \ + /* Helper for registry */ \ /* Attention: To avoid against wrong ref counts during our own initialize procedure, we must */ \ /* use right EXTERNAL handling of them. That's why you should do nothing in your ctor, which could*/ \ /* work on your ref count! All other things are allowed. Do work with your own reference - please */ \ /* use "impl_initService()" method. */ \ - /*===========================================================================================================*/ \ + /*===========================================================================================================*/ \ css::uno::Reference< css::uno::XInterface > SAL_CALL CLASS::impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager )\ - throw( css::uno::Exception ) \ - { \ - /* retrieve component context from the given service manager */ \ - static const ::rtl::OUString PROP_DEFAULTCONTEXT = ::rtl::OUString::createFromAscii("DefaultContext"); \ - css::uno::Reference< css::beans::XPropertySet > xSMGRProps(xServiceManager, css::uno::UNO_QUERY_THROW); \ - css::uno::Reference< css::uno::XComponentContext > xComponentContext; \ - xSMGRProps->getPropertyValue( PROP_DEFAULTCONTEXT ) >>= xComponentContext; \ + throw( css::uno::Exception ) \ + { \ + /* retrieve component context from the given service manager */ \ + static const ::rtl::OUString PROP_DEFAULTCONTEXT = ::rtl::OUString::createFromAscii("DefaultContext"); \ + css::uno::Reference< css::beans::XPropertySet > xSMGRProps(xServiceManager, css::uno::UNO_QUERY_THROW); \ + css::uno::Reference< css::uno::XComponentContext > xComponentContext; \ + xSMGRProps->getPropertyValue( PROP_DEFAULTCONTEXT ) >>= xComponentContext; \ /* create new instance of service */ \ CLASS* pClass = new CLASS( xComponentContext ); \ /* hold it alive by increasing his ref count!!! */ \ @@ -171,8 +171,8 @@ ________________________________________________________________________________ } //***************************************************************************************************************** -// private -// definition of helper function createFactory() for multiple services +// private +// definition of helper function createFactory() for multiple services //***************************************************************************************************************** #define PRIVATE_DEFINE_SINGLEFACTORY( CLASS ) \ css::uno::Reference< css::lang::XSingleServiceFactory > CLASS::impl_createFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) \ @@ -187,8 +187,8 @@ ________________________________________________________________________________ } //***************************************************************************************************************** -// private -// definition of helper function createFactory() for one instance services +// private +// definition of helper function createFactory() for one instance services //***************************************************************************************************************** #define PRIVATE_DEFINE_ONEINSTANCEFACTORY( CLASS ) \ css::uno::Reference< css::lang::XSingleServiceFactory > CLASS::impl_createFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) \ @@ -203,8 +203,8 @@ ________________________________________________________________________________ } //***************************************************************************************************************** -// public -// declaration of XServiceInfo and helper functions +// public +// declaration of XServiceInfo and helper functions //***************************************************************************************************************** #define DECLARE_XSERVICEINFO \ /* interface XServiceInfo */ \ @@ -221,8 +221,8 @@ ________________________________________________________________________________ virtual void SAL_CALL impl_initService ( ); \ //***************************************************************************************************************** -// public -// implementation of XServiceInfo +// public +// implementation of XServiceInfo //***************************************************************************************************************** #define DEFINE_XSERVICEINFO_MULTISERVICE( CLASS, XINTERFACECAST, SERVICENAME, IMPLEMENTATIONNAME ) \ PRIVATE_DEFINE_XSERVICEINFO_OLDSTYLE( CLASS, XINTERFACECAST, SERVICENAME, IMPLEMENTATIONNAME ) \ @@ -241,7 +241,7 @@ ________________________________________________________________________________ PRIVATE_DEFINE_ONEINSTANCEFACTORY( CLASS ) //***************************************************************************************************************** -// public +// public // implementation of service initialize! // example of using: DEFINE_INIT_SERVICE( MyClassName, // { @@ -267,6 +267,6 @@ ________________________________________________________________________________ } \ } -} // namespace framework +} // namespace framework -#endif // #ifndef __FRAMEWORK_MACROS_XSERVICEINFO_HXX_ +#endif // #ifndef __FRAMEWORK_MACROS_XSERVICEINFO_HXX_ diff --git a/framework/inc/macros/xtypeprovider.hxx b/framework/inc/macros/xtypeprovider.hxx index 55ac260824cb..3e4decb3ac0f 100644 --- a/framework/inc/macros/xtypeprovider.hxx +++ b/framework/inc/macros/xtypeprovider.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,18 +29,18 @@ #define __FRAMEWORK_MACROS_XTYPEPROVIDER_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/uno/RuntimeException.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Reference.hxx> @@ -51,7 +51,7 @@ #include <rtl/ustring.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ @@ -61,654 +61,654 @@ namespace framework{ macros for declaration and definition of XTypeProvider Please use follow public macros only! - 1) DEFINE_XTYPEPROVIDER => use it in header to declare XTypeProvider and his methods - 2) DECLARE_TYPEPROVIDER_0( CLASS ) => use it to define implementation of XTypeProvider for 0 supported type - DECLARE_TYPEPROVIDER_1( CLASS, TYPE1 ) => use it to define implementation of XTypeProvider for 1 supported type + 1) DEFINE_XTYPEPROVIDER => use it in header to declare XTypeProvider and his methods + 2) DECLARE_TYPEPROVIDER_0( CLASS ) => use it to define implementation of XTypeProvider for 0 supported type + DECLARE_TYPEPROVIDER_1( CLASS, TYPE1 ) => use it to define implementation of XTypeProvider for 1 supported type ... DECLARE_TYPEPROVIDER_16( CLASS, TYPE1, ... , TYPE16 ) - 3) DEFINE_XTYPEPROVIDER_1_WITH_BASECLASS( CLASS, BASECLASS, TYPE1 ) => use it to define implementation of XTypeProvider for 1 additional supported type to baseclass + 3) DEFINE_XTYPEPROVIDER_1_WITH_BASECLASS( CLASS, BASECLASS, TYPE1 ) => use it to define implementation of XTypeProvider for 1 additional supported type to baseclass ... DEFINE_XTYPEPROVIDER_5_WITH_BASECLASS( CLASS, BASECLASS, TYPE1, ..., TYPE5 ) _________________________________________________________________________________________________________________*/ //***************************************************************************************************************** -// private -// implementation of XTypeProvider::getImplementationId() +// private +// implementation of XTypeProvider::getImplementationId() //***************************************************************************************************************** -#define PRIVATE_DEFINE_XTYPEPROVIDER_GETIMPLEMENTATIONID( CLASS ) \ - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL CLASS::getImplementationId() throw( ::com::sun::star::uno::RuntimeException ) \ - { \ - /* Create one Id for all instances of this class. */ \ - /* Use ethernet address to do this! (sal_True) */ \ - /* Optimize this method */ \ - /* We initialize a static variable only one time. And we don't must use a mutex at every call! */ \ - /* For the first call; pID is NULL - for the second call pID is different from NULL! */ \ - static ::cppu::OImplementationId* pID = NULL ; \ - if ( pID == NULL ) \ - { \ - /* Ready for multithreading; get global mutex for first call of this method only! see before */ \ - ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); \ - /* Control these pointer again ... it can be, that another instance will be faster then these! */ \ - if ( pID == NULL ) \ - { \ - /* Create a new static ID ... */ \ - static ::cppu::OImplementationId aID( sal_False ); \ - /* ... and set his address to static pointer! */ \ - pID = &aID ; \ - } \ - } \ - return pID->getImplementationId(); \ +#define PRIVATE_DEFINE_XTYPEPROVIDER_GETIMPLEMENTATIONID( CLASS ) \ + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL CLASS::getImplementationId() throw( ::com::sun::star::uno::RuntimeException ) \ + { \ + /* Create one Id for all instances of this class. */ \ + /* Use ethernet address to do this! (sal_True) */ \ + /* Optimize this method */ \ + /* We initialize a static variable only one time. And we don't must use a mutex at every call! */ \ + /* For the first call; pID is NULL - for the second call pID is different from NULL! */ \ + static ::cppu::OImplementationId* pID = NULL ; \ + if ( pID == NULL ) \ + { \ + /* Ready for multithreading; get global mutex for first call of this method only! see before */ \ + ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); \ + /* Control these pointer again ... it can be, that another instance will be faster then these! */ \ + if ( pID == NULL ) \ + { \ + /* Create a new static ID ... */ \ + static ::cppu::OImplementationId aID( sal_False ); \ + /* ... and set his address to static pointer! */ \ + pID = &aID ; \ + } \ + } \ + return pID->getImplementationId(); \ } //***************************************************************************************************************** -// private -// implementation of XTypeProvider::getTypes() with max. 12 interfaces! +// private +// implementation of XTypeProvider::getTypes() with max. 12 interfaces! //***************************************************************************************************************** -#define PRIVATE_DEFINE_XTYPEPROVIDER_GETTYPES( CLASS, TYPES ) \ - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL CLASS::getTypes() throw( ::com::sun::star::uno::RuntimeException ) \ - { \ - /* Optimize this method ! */ \ - /* We initialize a static variable only one time. */ \ - /* And we don't must use a mutex at every call! */ \ - /* For the first call; pTypeCollection is NULL - */ \ - /* for the second call pTypeCollection is different from NULL! */ \ - static ::cppu::OTypeCollection* pTypeCollection = NULL ; \ - if ( pTypeCollection == NULL ) \ - { \ - /* Ready for multithreading; get global mutex for first call of this method only! see before */ \ - ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); \ - /* Control these pointer again ... it can be, that another instance will be faster then these! */ \ - if ( pTypeCollection == NULL ) \ - { \ - /* Create a static typecollection ... */ \ - /* Attention: "TYPES" will expand to "(...)"! */ \ - static ::cppu::OTypeCollection aTypeCollection TYPES ; \ - /* ... and set his address to static pointer! */ \ - pTypeCollection = &aTypeCollection ; \ - } \ - } \ - return pTypeCollection->getTypes(); \ +#define PRIVATE_DEFINE_XTYPEPROVIDER_GETTYPES( CLASS, TYPES ) \ + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL CLASS::getTypes() throw( ::com::sun::star::uno::RuntimeException ) \ + { \ + /* Optimize this method ! */ \ + /* We initialize a static variable only one time. */ \ + /* And we don't must use a mutex at every call! */ \ + /* For the first call; pTypeCollection is NULL - */ \ + /* for the second call pTypeCollection is different from NULL! */ \ + static ::cppu::OTypeCollection* pTypeCollection = NULL ; \ + if ( pTypeCollection == NULL ) \ + { \ + /* Ready for multithreading; get global mutex for first call of this method only! see before */ \ + ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); \ + /* Control these pointer again ... it can be, that another instance will be faster then these! */ \ + if ( pTypeCollection == NULL ) \ + { \ + /* Create a static typecollection ... */ \ + /* Attention: "TYPES" will expand to "(...)"! */ \ + static ::cppu::OTypeCollection aTypeCollection TYPES ; \ + /* ... and set his address to static pointer! */ \ + pTypeCollection = &aTypeCollection ; \ + } \ + } \ + return pTypeCollection->getTypes(); \ } //***************************************************************************************************************** -// private -// implementation of XTypeProvider::getTypes() with more then 12 interfaces! +// private +// implementation of XTypeProvider::getTypes() with more then 12 interfaces! //***************************************************************************************************************** -#define PRIVATE_DEFINE_XTYPEPROVIDER_GETTYPES_LARGE( CLASS, TYPES_FIRST, TYPES_SECOND ) \ - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL CLASS::getTypes() throw( ::com::sun::star::uno::RuntimeException ) \ - { \ - /* Optimize this method ! */ \ - /* We initialize a static variable only one time. */ \ - /* And we don't must use a mutex at every call! */ \ - /* For the first call; pTypeCollection is NULL - */ \ - /* for the second call pTypeCollection is different from NULL! */ \ - static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >* pTypeCollection = NULL ; \ - if ( pTypeCollection == NULL ) \ - { \ - /* Ready for multithreading; get global mutex for first call of this method only! see before */ \ - ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); \ - /* Control these pointer again ... it can be, that another instance will be faster then these! */ \ - if ( pTypeCollection == NULL ) \ - { \ - /* Create two typecollections */ \ - /* (cppuhelper support 12 items per collection only!) */ \ - ::cppu::OTypeCollection aTypeCollection1 TYPES_FIRST ; \ - ::cppu::OTypeCollection aTypeCollection2 TYPES_SECOND ; \ - /* Copy all items from both sequences to one result list! */ \ - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > seqTypes1 = aTypeCollection1.getTypes(); \ - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > seqTypes2 = aTypeCollection2.getTypes(); \ - sal_Int32 nCount1 = seqTypes1.getLength(); \ - sal_Int32 nCount2 = seqTypes2.getLength(); \ - static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > seqResult ( nCount1+nCount2 ); \ - sal_Int32 nSource = 0; \ - sal_Int32 nDestination= 0; \ - while( nSource<nCount1 ) \ - { \ - seqResult[nDestination] = seqTypes1[nSource]; \ - ++nSource; \ - ++nDestination; \ - } \ - nSource = 0; \ - while( nSource<nCount2 ) \ - { \ - seqResult[nDestination] = seqTypes2[nSource]; \ - ++nSource; \ - ++nDestination; \ - } \ - /* ... and set his address to static pointer! */ \ - pTypeCollection = &seqResult; \ - } \ - } \ - return *pTypeCollection; \ +#define PRIVATE_DEFINE_XTYPEPROVIDER_GETTYPES_LARGE( CLASS, TYPES_FIRST, TYPES_SECOND ) \ + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL CLASS::getTypes() throw( ::com::sun::star::uno::RuntimeException ) \ + { \ + /* Optimize this method ! */ \ + /* We initialize a static variable only one time. */ \ + /* And we don't must use a mutex at every call! */ \ + /* For the first call; pTypeCollection is NULL - */ \ + /* for the second call pTypeCollection is different from NULL! */ \ + static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >* pTypeCollection = NULL ; \ + if ( pTypeCollection == NULL ) \ + { \ + /* Ready for multithreading; get global mutex for first call of this method only! see before */ \ + ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); \ + /* Control these pointer again ... it can be, that another instance will be faster then these! */ \ + if ( pTypeCollection == NULL ) \ + { \ + /* Create two typecollections */ \ + /* (cppuhelper support 12 items per collection only!) */ \ + ::cppu::OTypeCollection aTypeCollection1 TYPES_FIRST ; \ + ::cppu::OTypeCollection aTypeCollection2 TYPES_SECOND ; \ + /* Copy all items from both sequences to one result list! */ \ + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > seqTypes1 = aTypeCollection1.getTypes(); \ + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > seqTypes2 = aTypeCollection2.getTypes(); \ + sal_Int32 nCount1 = seqTypes1.getLength(); \ + sal_Int32 nCount2 = seqTypes2.getLength(); \ + static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > seqResult ( nCount1+nCount2 ); \ + sal_Int32 nSource = 0; \ + sal_Int32 nDestination= 0; \ + while( nSource<nCount1 ) \ + { \ + seqResult[nDestination] = seqTypes1[nSource]; \ + ++nSource; \ + ++nDestination; \ + } \ + nSource = 0; \ + while( nSource<nCount2 ) \ + { \ + seqResult[nDestination] = seqTypes2[nSource]; \ + ++nSource; \ + ++nDestination; \ + } \ + /* ... and set his address to static pointer! */ \ + pTypeCollection = &seqResult; \ + } \ + } \ + return *pTypeCollection; \ } //***************************************************************************************************************** -// private -// implementation of XTypeProvider::getTypes() with using max. 12 interfaces + baseclass! +// private +// implementation of XTypeProvider::getTypes() with using max. 12 interfaces + baseclass! //***************************************************************************************************************** -#define PRIVATE_DEFINE_XTYPEPROVIDER_GETTYPES_BASECLASS( CLASS, BASECLASS, TYPES ) \ - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL CLASS::getTypes() throw( ::com::sun::star::uno::RuntimeException ) \ - { \ - /* Optimize this method ! */ \ - /* We initialize a static variable only one time. */ \ - /* And we don't must use a mutex at every call! */ \ - /* For the first call; pTypeCollection is NULL - */ \ - /* for the second call pTypeCollection is different from NULL! */ \ - static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >* pTypeCollection = NULL ; \ - if ( pTypeCollection == NULL ) \ - { \ - /* Ready for multithreading; get global mutex for first call of this method only! see before */ \ - ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); \ - /* Control these pointer again ... it can be, that another instance will be faster then these! */ \ - if ( pTypeCollection == NULL ) \ - { \ - /* Create static typecollection for my own interfaces! */ \ - static ::cppu::OTypeCollection aTypeCollection TYPES ; \ - /* Copy all items from my list sequences and from my baseclass */ \ - /* to one result list! */ \ - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > seqTypes1 = aTypeCollection.getTypes(); \ - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > seqTypes2 = BASECLASS::getTypes(); \ - sal_Int32 nCount1 = seqTypes1.getLength(); \ - sal_Int32 nCount2 = seqTypes2.getLength(); \ - static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > seqResult ( nCount1+nCount2 ); \ - sal_Int32 nSource = 0; \ - sal_Int32 nDestination= 0; \ - while( nSource<nCount1 ) \ - { \ - seqResult[nDestination] = seqTypes1[nSource]; \ - ++nSource; \ - ++nDestination; \ - } \ - nSource = 0; \ - while( nSource<nCount2 ) \ - { \ - seqResult[nDestination] = seqTypes2[nSource]; \ - ++nSource; \ - ++nDestination; \ - } \ - /* ... and set his address to static pointer! */ \ - pTypeCollection = &seqResult; \ - } \ - } \ - return *pTypeCollection; \ +#define PRIVATE_DEFINE_XTYPEPROVIDER_GETTYPES_BASECLASS( CLASS, BASECLASS, TYPES ) \ + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL CLASS::getTypes() throw( ::com::sun::star::uno::RuntimeException ) \ + { \ + /* Optimize this method ! */ \ + /* We initialize a static variable only one time. */ \ + /* And we don't must use a mutex at every call! */ \ + /* For the first call; pTypeCollection is NULL - */ \ + /* for the second call pTypeCollection is different from NULL! */ \ + static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >* pTypeCollection = NULL ; \ + if ( pTypeCollection == NULL ) \ + { \ + /* Ready for multithreading; get global mutex for first call of this method only! see before */ \ + ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); \ + /* Control these pointer again ... it can be, that another instance will be faster then these! */ \ + if ( pTypeCollection == NULL ) \ + { \ + /* Create static typecollection for my own interfaces! */ \ + static ::cppu::OTypeCollection aTypeCollection TYPES ; \ + /* Copy all items from my list sequences and from my baseclass */ \ + /* to one result list! */ \ + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > seqTypes1 = aTypeCollection.getTypes(); \ + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > seqTypes2 = BASECLASS::getTypes(); \ + sal_Int32 nCount1 = seqTypes1.getLength(); \ + sal_Int32 nCount2 = seqTypes2.getLength(); \ + static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > seqResult ( nCount1+nCount2 ); \ + sal_Int32 nSource = 0; \ + sal_Int32 nDestination= 0; \ + while( nSource<nCount1 ) \ + { \ + seqResult[nDestination] = seqTypes1[nSource]; \ + ++nSource; \ + ++nDestination; \ + } \ + nSource = 0; \ + while( nSource<nCount2 ) \ + { \ + seqResult[nDestination] = seqTypes2[nSource]; \ + ++nSource; \ + ++nDestination; \ + } \ + /* ... and set his address to static pointer! */ \ + pTypeCollection = &seqResult; \ + } \ + } \ + return *pTypeCollection; \ } //***************************************************************************************************************** -// private -// help macros to replace TYPES in getTypes() [see before] +// private +// help macros to replace TYPES in getTypes() [see before] //***************************************************************************************************************** -#define PRIVATE_DEFINE_TYPE_1( TYPE1 ) \ +#define PRIVATE_DEFINE_TYPE_1( TYPE1 ) \ ::getCppuType(( const ::com::sun::star::uno::Reference< TYPE1 >*)NULL ) -#define PRIVATE_DEFINE_TYPE_2( TYPE1, TYPE2 ) \ - PRIVATE_DEFINE_TYPE_1( TYPE1 ), \ +#define PRIVATE_DEFINE_TYPE_2( TYPE1, TYPE2 ) \ + PRIVATE_DEFINE_TYPE_1( TYPE1 ), \ ::getCppuType(( const ::com::sun::star::uno::Reference< TYPE2 >*)NULL ) -#define PRIVATE_DEFINE_TYPE_3( TYPE1, TYPE2, TYPE3 ) \ - PRIVATE_DEFINE_TYPE_2( TYPE1, TYPE2 ), \ +#define PRIVATE_DEFINE_TYPE_3( TYPE1, TYPE2, TYPE3 ) \ + PRIVATE_DEFINE_TYPE_2( TYPE1, TYPE2 ), \ ::getCppuType(( const ::com::sun::star::uno::Reference< TYPE3 >*)NULL ) -#define PRIVATE_DEFINE_TYPE_4( TYPE1, TYPE2, TYPE3, TYPE4 ) \ - PRIVATE_DEFINE_TYPE_3( TYPE1, TYPE2, TYPE3 ), \ +#define PRIVATE_DEFINE_TYPE_4( TYPE1, TYPE2, TYPE3, TYPE4 ) \ + PRIVATE_DEFINE_TYPE_3( TYPE1, TYPE2, TYPE3 ), \ ::getCppuType(( const ::com::sun::star::uno::Reference< TYPE4 >*)NULL ) -#define PRIVATE_DEFINE_TYPE_5( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5 ) \ - PRIVATE_DEFINE_TYPE_4( TYPE1, TYPE2, TYPE3, TYPE4 ), \ +#define PRIVATE_DEFINE_TYPE_5( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5 ) \ + PRIVATE_DEFINE_TYPE_4( TYPE1, TYPE2, TYPE3, TYPE4 ), \ ::getCppuType(( const ::com::sun::star::uno::Reference< TYPE5 >*)NULL ) -#define PRIVATE_DEFINE_TYPE_6( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6 ) \ - PRIVATE_DEFINE_TYPE_5( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5 ), \ +#define PRIVATE_DEFINE_TYPE_6( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6 ) \ + PRIVATE_DEFINE_TYPE_5( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5 ), \ ::getCppuType(( const ::com::sun::star::uno::Reference< TYPE6 >*)NULL ) -#define PRIVATE_DEFINE_TYPE_7( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7 ) \ - PRIVATE_DEFINE_TYPE_6( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6 ), \ +#define PRIVATE_DEFINE_TYPE_7( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7 ) \ + PRIVATE_DEFINE_TYPE_6( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6 ), \ ::getCppuType(( const ::com::sun::star::uno::Reference< TYPE7 >*)NULL ) -#define PRIVATE_DEFINE_TYPE_8( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8 ) \ - PRIVATE_DEFINE_TYPE_7( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7 ), \ +#define PRIVATE_DEFINE_TYPE_8( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8 ) \ + PRIVATE_DEFINE_TYPE_7( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7 ), \ ::getCppuType(( const ::com::sun::star::uno::Reference< TYPE8 >*)NULL ) -#define PRIVATE_DEFINE_TYPE_9( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9 ) \ - PRIVATE_DEFINE_TYPE_8( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8 ), \ +#define PRIVATE_DEFINE_TYPE_9( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9 ) \ + PRIVATE_DEFINE_TYPE_8( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8 ), \ ::getCppuType(( const ::com::sun::star::uno::Reference< TYPE9 >*)NULL ) -#define PRIVATE_DEFINE_TYPE_10( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10 ) \ - PRIVATE_DEFINE_TYPE_9( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9 ), \ +#define PRIVATE_DEFINE_TYPE_10( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10 ) \ + PRIVATE_DEFINE_TYPE_9( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9 ), \ ::getCppuType(( const ::com::sun::star::uno::Reference< TYPE10 >*)NULL ) -#define PRIVATE_DEFINE_TYPE_11( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11 ) \ - PRIVATE_DEFINE_TYPE_10( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10 ), \ +#define PRIVATE_DEFINE_TYPE_11( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11 ) \ + PRIVATE_DEFINE_TYPE_10( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10 ), \ ::getCppuType(( const ::com::sun::star::uno::Reference< TYPE11 >*)NULL ) -#define PRIVATE_DEFINE_TYPE_12( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12 ) \ - PRIVATE_DEFINE_TYPE_11( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11 ), \ +#define PRIVATE_DEFINE_TYPE_12( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12 ) \ + PRIVATE_DEFINE_TYPE_11( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11 ), \ ::getCppuType(( const ::com::sun::star::uno::Reference< TYPE12 >*)NULL ) //***************************************************************************************************************** -// private -// complete implementation of XTypeProvider +// private +// complete implementation of XTypeProvider //***************************************************************************************************************** -#define PRIVATE_DEFINE_XTYPEPROVIDER_PURE( CLASS ) \ - PRIVATE_DEFINE_XTYPEPROVIDER_GETIMPLEMENTATIONID( CLASS ) \ +#define PRIVATE_DEFINE_XTYPEPROVIDER_PURE( CLASS ) \ + PRIVATE_DEFINE_XTYPEPROVIDER_GETIMPLEMENTATIONID( CLASS ) \ PRIVATE_DEFINE_XTYPEPROVIDER_GETTYPES( CLASS, ::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider >*)NULL ) ) -#define PRIVATE_DEFINE_XTYPEPROVIDER( CLASS, TYPES ) \ - PRIVATE_DEFINE_XTYPEPROVIDER_GETIMPLEMENTATIONID( CLASS ) \ +#define PRIVATE_DEFINE_XTYPEPROVIDER( CLASS, TYPES ) \ + PRIVATE_DEFINE_XTYPEPROVIDER_GETIMPLEMENTATIONID( CLASS ) \ PRIVATE_DEFINE_XTYPEPROVIDER_GETTYPES( CLASS, TYPES ) -#define PRIVATE_DEFINE_XTYPEPROVIDER_LARGE( CLASS, TYPES_FIRST, TYPES_SECOND ) \ - PRIVATE_DEFINE_XTYPEPROVIDER_GETIMPLEMENTATIONID( CLASS ) \ +#define PRIVATE_DEFINE_XTYPEPROVIDER_LARGE( CLASS, TYPES_FIRST, TYPES_SECOND ) \ + PRIVATE_DEFINE_XTYPEPROVIDER_GETIMPLEMENTATIONID( CLASS ) \ PRIVATE_DEFINE_XTYPEPROVIDER_GETTYPES_LARGE( CLASS, TYPES_FIRST, TYPES_SECOND ) -#define PRIVATE_DEFINE_XTYPEPROVIDER_BASECLASS( CLASS, BASECLASS, TYPES ) \ - PRIVATE_DEFINE_XTYPEPROVIDER_GETIMPLEMENTATIONID( CLASS ) \ +#define PRIVATE_DEFINE_XTYPEPROVIDER_BASECLASS( CLASS, BASECLASS, TYPES ) \ + PRIVATE_DEFINE_XTYPEPROVIDER_GETIMPLEMENTATIONID( CLASS ) \ PRIVATE_DEFINE_XTYPEPROVIDER_GETTYPES_BASECLASS( CLASS, BASECLASS, TYPES ) //***************************************************************************************************************** -// public -// declaration of XTypeProvider +// public +// declaration of XTypeProvider //***************************************************************************************************************** -#define FWK_DECLARE_XTYPEPROVIDER \ +#define FWK_DECLARE_XTYPEPROVIDER \ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes () throw( ::com::sun::star::uno::RuntimeException );\ - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( ::com::sun::star::uno::RuntimeException ); //***************************************************************************************************************** -// public -// implementation of XTypeProvider +// public +// implementation of XTypeProvider //***************************************************************************************************************** -// implementation of XTypeProvider without additional interface for getTypes() -// XTypeProvider is used as the only one interface automaticly. -// Following defines don't use XTypeProvider automaticly!!!! -#define DEFINE_XTYPEPROVIDER_0( CLASS ) \ - PRIVATE_DEFINE_XTYPEPROVIDER_PURE( CLASS ) - -// implementation of XTypeProvider with 1 additional interface for getTypes() -#define DEFINE_XTYPEPROVIDER_1( CLASS, TYPE1 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER ( CLASS, \ - (PRIVATE_DEFINE_TYPE_1 ( TYPE1 \ - )) \ +// implementation of XTypeProvider without additional interface for getTypes() +// XTypeProvider is used as the only one interface automaticly. +// Following defines don't use XTypeProvider automaticly!!!! +#define DEFINE_XTYPEPROVIDER_0( CLASS ) \ + PRIVATE_DEFINE_XTYPEPROVIDER_PURE( CLASS ) + +// implementation of XTypeProvider with 1 additional interface for getTypes() +#define DEFINE_XTYPEPROVIDER_1( CLASS, TYPE1 ) \ + PRIVATE_DEFINE_XTYPEPROVIDER ( CLASS, \ + (PRIVATE_DEFINE_TYPE_1 ( TYPE1 \ + )) \ ) -// implementation of XTypeProvider with 2 additional interfaces for getTypes() -#define DEFINE_XTYPEPROVIDER_2( CLASS, TYPE1, TYPE2 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER ( CLASS, \ - (PRIVATE_DEFINE_TYPE_2 ( TYPE1 , \ - TYPE2 \ - )) \ +// implementation of XTypeProvider with 2 additional interfaces for getTypes() +#define DEFINE_XTYPEPROVIDER_2( CLASS, TYPE1, TYPE2 ) \ + PRIVATE_DEFINE_XTYPEPROVIDER ( CLASS, \ + (PRIVATE_DEFINE_TYPE_2 ( TYPE1 , \ + TYPE2 \ + )) \ ) -// implementation of XTypeProvider with 3 additional interfaces for getTypes() -#define DEFINE_XTYPEPROVIDER_3( CLASS, TYPE1, TYPE2, TYPE3 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER ( CLASS, \ - (PRIVATE_DEFINE_TYPE_3 ( TYPE1 , \ - TYPE2 , \ - TYPE3 \ - )) \ +// implementation of XTypeProvider with 3 additional interfaces for getTypes() +#define DEFINE_XTYPEPROVIDER_3( CLASS, TYPE1, TYPE2, TYPE3 ) \ + PRIVATE_DEFINE_XTYPEPROVIDER ( CLASS, \ + (PRIVATE_DEFINE_TYPE_3 ( TYPE1 , \ + TYPE2 , \ + TYPE3 \ + )) \ ) -// implementation of XTypeProvider with 4 additional interfaces for getTypes() -#define DEFINE_XTYPEPROVIDER_4( CLASS, TYPE1, TYPE2, TYPE3, TYPE4 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER ( CLASS, \ - (PRIVATE_DEFINE_TYPE_4 ( TYPE1 , \ - TYPE2 , \ - TYPE3 , \ - TYPE4 \ - )) \ +// implementation of XTypeProvider with 4 additional interfaces for getTypes() +#define DEFINE_XTYPEPROVIDER_4( CLASS, TYPE1, TYPE2, TYPE3, TYPE4 ) \ + PRIVATE_DEFINE_XTYPEPROVIDER ( CLASS, \ + (PRIVATE_DEFINE_TYPE_4 ( TYPE1 , \ + TYPE2 , \ + TYPE3 , \ + TYPE4 \ + )) \ ) -// implementation of XTypeProvider with 5 additional interfaces for getTypes() -#define DEFINE_XTYPEPROVIDER_5( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER ( CLASS, \ - (PRIVATE_DEFINE_TYPE_5 ( TYPE1 , \ - TYPE2 , \ - TYPE3 , \ - TYPE4 , \ - TYPE5 \ - )) \ +// implementation of XTypeProvider with 5 additional interfaces for getTypes() +#define DEFINE_XTYPEPROVIDER_5( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5 ) \ + PRIVATE_DEFINE_XTYPEPROVIDER ( CLASS, \ + (PRIVATE_DEFINE_TYPE_5 ( TYPE1 , \ + TYPE2 , \ + TYPE3 , \ + TYPE4 , \ + TYPE5 \ + )) \ ) -// implementation of XTypeProvider with 6 additional interfaces for getTypes() -#define DEFINE_XTYPEPROVIDER_6( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER ( CLASS, \ - (PRIVATE_DEFINE_TYPE_6 ( TYPE1 , \ - TYPE2 , \ - TYPE3 , \ - TYPE4 , \ - TYPE5 , \ - TYPE6 \ - )) \ +// implementation of XTypeProvider with 6 additional interfaces for getTypes() +#define DEFINE_XTYPEPROVIDER_6( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6 ) \ + PRIVATE_DEFINE_XTYPEPROVIDER ( CLASS, \ + (PRIVATE_DEFINE_TYPE_6 ( TYPE1 , \ + TYPE2 , \ + TYPE3 , \ + TYPE4 , \ + TYPE5 , \ + TYPE6 \ + )) \ ) -// implementation of XTypeProvider with 7 additional interfaces for getTypes() -#define DEFINE_XTYPEPROVIDER_7( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER ( CLASS, \ - (PRIVATE_DEFINE_TYPE_7 ( TYPE1 , \ - TYPE2 , \ - TYPE3 , \ - TYPE4 , \ - TYPE5 , \ - TYPE6 , \ - TYPE7 \ - )) \ +// implementation of XTypeProvider with 7 additional interfaces for getTypes() +#define DEFINE_XTYPEPROVIDER_7( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7 ) \ + PRIVATE_DEFINE_XTYPEPROVIDER ( CLASS, \ + (PRIVATE_DEFINE_TYPE_7 ( TYPE1 , \ + TYPE2 , \ + TYPE3 , \ + TYPE4 , \ + TYPE5 , \ + TYPE6 , \ + TYPE7 \ + )) \ ) -// implementation of XTypeProvider with 8 additional interfaces for getTypes() -#define DEFINE_XTYPEPROVIDER_8( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER ( CLASS, \ - (PRIVATE_DEFINE_TYPE_8 ( TYPE1 , \ - TYPE2 , \ - TYPE3 , \ - TYPE4 , \ - TYPE5 , \ - TYPE6 , \ - TYPE7 , \ - TYPE8 \ - )) \ +// implementation of XTypeProvider with 8 additional interfaces for getTypes() +#define DEFINE_XTYPEPROVIDER_8( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8 ) \ + PRIVATE_DEFINE_XTYPEPROVIDER ( CLASS, \ + (PRIVATE_DEFINE_TYPE_8 ( TYPE1 , \ + TYPE2 , \ + TYPE3 , \ + TYPE4 , \ + TYPE5 , \ + TYPE6 , \ + TYPE7 , \ + TYPE8 \ + )) \ ) -// implementation of XTypeProvider with 9 additional interfaces for getTypes() -#define DEFINE_XTYPEPROVIDER_9( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER ( CLASS, \ - (PRIVATE_DEFINE_TYPE_9 ( TYPE1 , \ - TYPE2 , \ - TYPE3 , \ - TYPE4 , \ - TYPE5 , \ - TYPE6 , \ - TYPE7 , \ - TYPE8 , \ - TYPE9 \ - )) \ +// implementation of XTypeProvider with 9 additional interfaces for getTypes() +#define DEFINE_XTYPEPROVIDER_9( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9 ) \ + PRIVATE_DEFINE_XTYPEPROVIDER ( CLASS, \ + (PRIVATE_DEFINE_TYPE_9 ( TYPE1 , \ + TYPE2 , \ + TYPE3 , \ + TYPE4 , \ + TYPE5 , \ + TYPE6 , \ + TYPE7 , \ + TYPE8 , \ + TYPE9 \ + )) \ ) -// implementation of XTypeProvider with 10 additional interfaces for getTypes() -#define DEFINE_XTYPEPROVIDER_10( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER ( CLASS, \ - (PRIVATE_DEFINE_TYPE_10 ( TYPE1 , \ - TYPE2 , \ - TYPE3 , \ - TYPE4 , \ - TYPE5 , \ - TYPE6 , \ - TYPE7 , \ - TYPE8 , \ - TYPE9 , \ - TYPE10 \ - )) \ +// implementation of XTypeProvider with 10 additional interfaces for getTypes() +#define DEFINE_XTYPEPROVIDER_10( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10 ) \ + PRIVATE_DEFINE_XTYPEPROVIDER ( CLASS, \ + (PRIVATE_DEFINE_TYPE_10 ( TYPE1 , \ + TYPE2 , \ + TYPE3 , \ + TYPE4 , \ + TYPE5 , \ + TYPE6 , \ + TYPE7 , \ + TYPE8 , \ + TYPE9 , \ + TYPE10 \ + )) \ ) -// implementation of XTypeProvider with 11 additional interfaces for getTypes() -#define DEFINE_XTYPEPROVIDER_11( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER ( CLASS, \ - (PRIVATE_DEFINE_TYPE_11 ( TYPE1 , \ - TYPE2 , \ - TYPE3 , \ - TYPE4 , \ - TYPE5 , \ - TYPE6 , \ - TYPE7 , \ - TYPE8 , \ - TYPE9 , \ - TYPE10 , \ - TYPE11 \ - )) \ +// implementation of XTypeProvider with 11 additional interfaces for getTypes() +#define DEFINE_XTYPEPROVIDER_11( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11 ) \ + PRIVATE_DEFINE_XTYPEPROVIDER ( CLASS, \ + (PRIVATE_DEFINE_TYPE_11 ( TYPE1 , \ + TYPE2 , \ + TYPE3 , \ + TYPE4 , \ + TYPE5 , \ + TYPE6 , \ + TYPE7 , \ + TYPE8 , \ + TYPE9 , \ + TYPE10 , \ + TYPE11 \ + )) \ ) -// implementation of XTypeProvider with 12 additional interfaces for getTypes() -#define DEFINE_XTYPEPROVIDER_12( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER ( CLASS, \ - (PRIVATE_DEFINE_TYPE_12 ( TYPE1 , \ - TYPE2 , \ - TYPE3 , \ - TYPE4 , \ - TYPE5 , \ - TYPE6 , \ - TYPE7 , \ - TYPE8 , \ - TYPE9 , \ - TYPE10 , \ - TYPE11 , \ - TYPE12 \ - )) \ +// implementation of XTypeProvider with 12 additional interfaces for getTypes() +#define DEFINE_XTYPEPROVIDER_12( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12 ) \ + PRIVATE_DEFINE_XTYPEPROVIDER ( CLASS, \ + (PRIVATE_DEFINE_TYPE_12 ( TYPE1 , \ + TYPE2 , \ + TYPE3 , \ + TYPE4 , \ + TYPE5 , \ + TYPE6 , \ + TYPE7 , \ + TYPE8 , \ + TYPE9 , \ + TYPE10 , \ + TYPE11 , \ + TYPE12 \ + )) \ ) -// implementation of XTypeProvider with 13 additional interfaces for getTypes() -#define DEFINE_XTYPEPROVIDER_13( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12, TYPE13 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER_LARGE ( CLASS, \ - (PRIVATE_DEFINE_TYPE_12 ( TYPE1 , \ - TYPE2 , \ - TYPE3 , \ - TYPE4 , \ - TYPE5 , \ - TYPE6 , \ - TYPE7 , \ - TYPE8 , \ - TYPE9 , \ - TYPE10 , \ - TYPE11 , \ - TYPE12 \ - )), \ - (PRIVATE_DEFINE_TYPE_1 ( TYPE13 \ - )) \ +// implementation of XTypeProvider with 13 additional interfaces for getTypes() +#define DEFINE_XTYPEPROVIDER_13( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12, TYPE13 ) \ + PRIVATE_DEFINE_XTYPEPROVIDER_LARGE ( CLASS, \ + (PRIVATE_DEFINE_TYPE_12 ( TYPE1 , \ + TYPE2 , \ + TYPE3 , \ + TYPE4 , \ + TYPE5 , \ + TYPE6 , \ + TYPE7 , \ + TYPE8 , \ + TYPE9 , \ + TYPE10 , \ + TYPE11 , \ + TYPE12 \ + )), \ + (PRIVATE_DEFINE_TYPE_1 ( TYPE13 \ + )) \ ) -// implementation of XTypeProvider with 14 additional interfaces for getTypes() -#define DEFINE_XTYPEPROVIDER_14( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12, TYPE13, TYPE14 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER_LARGE ( CLASS, \ - (PRIVATE_DEFINE_TYPE_12 ( TYPE1 , \ - TYPE2 , \ - TYPE3 , \ - TYPE4 , \ - TYPE5 , \ - TYPE6 , \ - TYPE7 , \ - TYPE8 , \ - TYPE9 , \ - TYPE10 , \ - TYPE11 , \ - TYPE12 \ - )), \ - (PRIVATE_DEFINE_TYPE_2 ( TYPE13 , \ - TYPE14 \ - )) \ +// implementation of XTypeProvider with 14 additional interfaces for getTypes() +#define DEFINE_XTYPEPROVIDER_14( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12, TYPE13, TYPE14 ) \ + PRIVATE_DEFINE_XTYPEPROVIDER_LARGE ( CLASS, \ + (PRIVATE_DEFINE_TYPE_12 ( TYPE1 , \ + TYPE2 , \ + TYPE3 , \ + TYPE4 , \ + TYPE5 , \ + TYPE6 , \ + TYPE7 , \ + TYPE8 , \ + TYPE9 , \ + TYPE10 , \ + TYPE11 , \ + TYPE12 \ + )), \ + (PRIVATE_DEFINE_TYPE_2 ( TYPE13 , \ + TYPE14 \ + )) \ ) -// implementation of XTypeProvider with 15 additional interfaces for getTypes() -#define DEFINE_XTYPEPROVIDER_15( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12, TYPE13, TYPE14, TYPE15 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER_LARGE ( CLASS, \ - (PRIVATE_DEFINE_TYPE_12 ( TYPE1 , \ - TYPE2 , \ - TYPE3 , \ - TYPE4 , \ - TYPE5 , \ - TYPE6 , \ - TYPE7 , \ - TYPE8 , \ - TYPE9 , \ - TYPE10 , \ - TYPE11 , \ - TYPE12 \ - )), \ - (PRIVATE_DEFINE_TYPE_3 ( TYPE13 , \ - TYPE14 , \ - TYPE15 \ - )) \ +// implementation of XTypeProvider with 15 additional interfaces for getTypes() +#define DEFINE_XTYPEPROVIDER_15( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12, TYPE13, TYPE14, TYPE15 ) \ + PRIVATE_DEFINE_XTYPEPROVIDER_LARGE ( CLASS, \ + (PRIVATE_DEFINE_TYPE_12 ( TYPE1 , \ + TYPE2 , \ + TYPE3 , \ + TYPE4 , \ + TYPE5 , \ + TYPE6 , \ + TYPE7 , \ + TYPE8 , \ + TYPE9 , \ + TYPE10 , \ + TYPE11 , \ + TYPE12 \ + )), \ + (PRIVATE_DEFINE_TYPE_3 ( TYPE13 , \ + TYPE14 , \ + TYPE15 \ + )) \ ) -// implementation of XTypeProvider with 16 additional interfaces for getTypes() -#define DEFINE_XTYPEPROVIDER_16( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12, TYPE13, TYPE14, TYPE15, TYPE16 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER_LARGE ( CLASS, \ - (PRIVATE_DEFINE_TYPE_12 ( TYPE1 , \ - TYPE2 , \ - TYPE3 , \ - TYPE4 , \ - TYPE5 , \ - TYPE6 , \ - TYPE7 , \ - TYPE8 , \ - TYPE9 , \ - TYPE10 , \ - TYPE11 , \ - TYPE12 \ - )), \ - (PRIVATE_DEFINE_TYPE_4 ( TYPE13 , \ - TYPE14 , \ - TYPE15 , \ - TYPE16 \ - )) \ +// implementation of XTypeProvider with 16 additional interfaces for getTypes() +#define DEFINE_XTYPEPROVIDER_16( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12, TYPE13, TYPE14, TYPE15, TYPE16 ) \ + PRIVATE_DEFINE_XTYPEPROVIDER_LARGE ( CLASS, \ + (PRIVATE_DEFINE_TYPE_12 ( TYPE1 , \ + TYPE2 , \ + TYPE3 , \ + TYPE4 , \ + TYPE5 , \ + TYPE6 , \ + TYPE7 , \ + TYPE8 , \ + TYPE9 , \ + TYPE10 , \ + TYPE11 , \ + TYPE12 \ + )), \ + (PRIVATE_DEFINE_TYPE_4 ( TYPE13 , \ + TYPE14 , \ + TYPE15 , \ + TYPE16 \ + )) \ ) // implementation of XTypeProvider with 17 additional interfaces for getTypes() #define DEFINE_XTYPEPROVIDER_17( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12, TYPE13, TYPE14, TYPE15, TYPE16, TYPE17 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER_LARGE ( CLASS, \ - (PRIVATE_DEFINE_TYPE_12 ( TYPE1 , \ - TYPE2 , \ - TYPE3 , \ - TYPE4 , \ - TYPE5 , \ - TYPE6 , \ - TYPE7 , \ - TYPE8 , \ - TYPE9 , \ - TYPE10 , \ - TYPE11 , \ - TYPE12 \ - )), \ + PRIVATE_DEFINE_XTYPEPROVIDER_LARGE ( CLASS, \ + (PRIVATE_DEFINE_TYPE_12 ( TYPE1 , \ + TYPE2 , \ + TYPE3 , \ + TYPE4 , \ + TYPE5 , \ + TYPE6 , \ + TYPE7 , \ + TYPE8 , \ + TYPE9 , \ + TYPE10 , \ + TYPE11 , \ + TYPE12 \ + )), \ (PRIVATE_DEFINE_TYPE_5 ( TYPE13 , \ - TYPE14 , \ - TYPE15 , \ + TYPE14 , \ + TYPE15 , \ TYPE16 , \ TYPE17 \ - )) \ + )) \ ) // implementation of XTypeProvider with 18 additional interfaces for getTypes() #define DEFINE_XTYPEPROVIDER_18( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12, TYPE13, TYPE14, TYPE15, TYPE16, TYPE17, TYPE18 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER_LARGE ( CLASS, \ - (PRIVATE_DEFINE_TYPE_12 ( TYPE1 , \ - TYPE2 , \ - TYPE3 , \ - TYPE4 , \ - TYPE5 , \ - TYPE6 , \ - TYPE7 , \ - TYPE8 , \ - TYPE9 , \ - TYPE10 , \ - TYPE11 , \ - TYPE12 \ - )), \ + PRIVATE_DEFINE_XTYPEPROVIDER_LARGE ( CLASS, \ + (PRIVATE_DEFINE_TYPE_12 ( TYPE1 , \ + TYPE2 , \ + TYPE3 , \ + TYPE4 , \ + TYPE5 , \ + TYPE6 , \ + TYPE7 , \ + TYPE8 , \ + TYPE9 , \ + TYPE10 , \ + TYPE11 , \ + TYPE12 \ + )), \ (PRIVATE_DEFINE_TYPE_6 ( TYPE13 , \ - TYPE14 , \ - TYPE15 , \ + TYPE14 , \ + TYPE15 , \ TYPE16 , \ TYPE17 , \ TYPE18 \ - )) \ + )) \ ) // implementation of XTypeProvider with 19 additional interfaces for getTypes() #define DEFINE_XTYPEPROVIDER_19( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12, TYPE13, TYPE14, TYPE15, TYPE16, TYPE17, TYPE18, TYPE19 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER_LARGE ( CLASS, \ - (PRIVATE_DEFINE_TYPE_12 ( TYPE1 , \ - TYPE2 , \ - TYPE3 , \ - TYPE4 , \ - TYPE5 , \ - TYPE6 , \ - TYPE7 , \ - TYPE8 , \ - TYPE9 , \ - TYPE10 , \ - TYPE11 , \ - TYPE12 \ - )), \ + PRIVATE_DEFINE_XTYPEPROVIDER_LARGE ( CLASS, \ + (PRIVATE_DEFINE_TYPE_12 ( TYPE1 , \ + TYPE2 , \ + TYPE3 , \ + TYPE4 , \ + TYPE5 , \ + TYPE6 , \ + TYPE7 , \ + TYPE8 , \ + TYPE9 , \ + TYPE10 , \ + TYPE11 , \ + TYPE12 \ + )), \ (PRIVATE_DEFINE_TYPE_7 ( TYPE13 , \ - TYPE14 , \ - TYPE15 , \ + TYPE14 , \ + TYPE15 , \ TYPE16 , \ TYPE17 , \ TYPE18 , \ TYPE19 \ - )) \ + )) \ ) // implementation of XTypeProvider with 20 additional interfaces for getTypes() #define DEFINE_XTYPEPROVIDER_20( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12, TYPE13, TYPE14, TYPE15, TYPE16, TYPE17, TYPE18, TYPE19, TYPE20 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER_LARGE ( CLASS, \ - (PRIVATE_DEFINE_TYPE_12 ( TYPE1 , \ - TYPE2 , \ - TYPE3 , \ - TYPE4 , \ - TYPE5 , \ - TYPE6 , \ - TYPE7 , \ - TYPE8 , \ - TYPE9 , \ - TYPE10 , \ - TYPE11 , \ - TYPE12 \ - )), \ + PRIVATE_DEFINE_XTYPEPROVIDER_LARGE ( CLASS, \ + (PRIVATE_DEFINE_TYPE_12 ( TYPE1 , \ + TYPE2 , \ + TYPE3 , \ + TYPE4 , \ + TYPE5 , \ + TYPE6 , \ + TYPE7 , \ + TYPE8 , \ + TYPE9 , \ + TYPE10 , \ + TYPE11 , \ + TYPE12 \ + )), \ (PRIVATE_DEFINE_TYPE_8 ( TYPE13 , \ - TYPE14 , \ - TYPE15 , \ + TYPE14 , \ + TYPE15 , \ TYPE16 , \ TYPE17 , \ TYPE18 , \ TYPE19 , \ TYPE20 \ - )) \ + )) \ ) -// implementation of XTypeProvider with 1 additional interface for getTypes() AND using 1 baseclass -#define DEFINE_XTYPEPROVIDER_1_WITH_BASECLASS( CLASS, BASECLASS, TYPE1 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER_BASECLASS ( CLASS, \ - BASECLASS, \ - (PRIVATE_DEFINE_TYPE_1 ( TYPE1 \ - )) \ +// implementation of XTypeProvider with 1 additional interface for getTypes() AND using 1 baseclass +#define DEFINE_XTYPEPROVIDER_1_WITH_BASECLASS( CLASS, BASECLASS, TYPE1 ) \ + PRIVATE_DEFINE_XTYPEPROVIDER_BASECLASS ( CLASS, \ + BASECLASS, \ + (PRIVATE_DEFINE_TYPE_1 ( TYPE1 \ + )) \ ) -// implementation of XTypeProvider with 2 additional interface for getTypes() AND using 1 baseclass -#define DEFINE_XTYPEPROVIDER_2_WITH_BASECLASS( CLASS, BASECLASS, TYPE1, TYPE2 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER_BASECLASS ( CLASS, \ - BASECLASS, \ - (PRIVATE_DEFINE_TYPE_2 ( TYPE1 , \ - TYPE2 \ - )) \ +// implementation of XTypeProvider with 2 additional interface for getTypes() AND using 1 baseclass +#define DEFINE_XTYPEPROVIDER_2_WITH_BASECLASS( CLASS, BASECLASS, TYPE1, TYPE2 ) \ + PRIVATE_DEFINE_XTYPEPROVIDER_BASECLASS ( CLASS, \ + BASECLASS, \ + (PRIVATE_DEFINE_TYPE_2 ( TYPE1 , \ + TYPE2 \ + )) \ ) -// implementation of XTypeProvider with 3 additional interface for getTypes() AND using 1 baseclass -#define DEFINE_XTYPEPROVIDER_3_WITH_BASECLASS( CLASS, BASECLASS, TYPE1, TYPE2, TYPE3 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER_BASECLASS ( CLASS, \ - BASECLASS, \ - (PRIVATE_DEFINE_TYPE_3 ( TYPE1 , \ - TYPE2 , \ - TYPE3 \ - )) \ +// implementation of XTypeProvider with 3 additional interface for getTypes() AND using 1 baseclass +#define DEFINE_XTYPEPROVIDER_3_WITH_BASECLASS( CLASS, BASECLASS, TYPE1, TYPE2, TYPE3 ) \ + PRIVATE_DEFINE_XTYPEPROVIDER_BASECLASS ( CLASS, \ + BASECLASS, \ + (PRIVATE_DEFINE_TYPE_3 ( TYPE1 , \ + TYPE2 , \ + TYPE3 \ + )) \ ) -// implementation of XTypeProvider with 4 additional interface for getTypes() AND using 1 baseclass -#define DEFINE_XTYPEPROVIDER_4_WITH_BASECLASS( CLASS, BASECLASS, TYPE1, TYPE2, TYPE3, TYPE4 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER_BASECLASS ( CLASS, \ - BASECLASS, \ - (PRIVATE_DEFINE_TYPE_4 ( TYPE1 , \ - TYPE2 , \ - TYPE3 , \ - TYPE4 \ - )) \ +// implementation of XTypeProvider with 4 additional interface for getTypes() AND using 1 baseclass +#define DEFINE_XTYPEPROVIDER_4_WITH_BASECLASS( CLASS, BASECLASS, TYPE1, TYPE2, TYPE3, TYPE4 ) \ + PRIVATE_DEFINE_XTYPEPROVIDER_BASECLASS ( CLASS, \ + BASECLASS, \ + (PRIVATE_DEFINE_TYPE_4 ( TYPE1 , \ + TYPE2 , \ + TYPE3 , \ + TYPE4 \ + )) \ ) -// implementation of XTypeProvider with 5 additional interface for getTypes() AND using 1 baseclass -#define DEFINE_XTYPEPROVIDER_5_WITH_BASECLASS( CLASS, BASECLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER_BASECLASS ( CLASS, \ - BASECLASS, \ - (PRIVATE_DEFINE_TYPE_5 ( TYPE1 , \ - TYPE2 , \ - TYPE3 , \ - TYPE4 , \ - TYPE5 \ - )) \ +// implementation of XTypeProvider with 5 additional interface for getTypes() AND using 1 baseclass +#define DEFINE_XTYPEPROVIDER_5_WITH_BASECLASS( CLASS, BASECLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5 ) \ + PRIVATE_DEFINE_XTYPEPROVIDER_BASECLASS ( CLASS, \ + BASECLASS, \ + (PRIVATE_DEFINE_TYPE_5 ( TYPE1 , \ + TYPE2 , \ + TYPE3 , \ + TYPE4 , \ + TYPE5 \ + )) \ ) -} // namespace framework +} // namespace framework -#endif // #ifndef __FRAMEWORK_MACROS_XTYPEPROVIDER_HXX_ +#endif // #ifndef __FRAMEWORK_MACROS_XTYPEPROVIDER_HXX_ diff --git a/framework/inc/mediadescriptor.h b/framework/inc/mediadescriptor.h index 037053ddf819..278f13463ae7 100644 --- a/framework/inc/mediadescriptor.h +++ b/framework/inc/mediadescriptor.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/inc/pch/precompiled_framework.cxx b/framework/inc/pch/precompiled_framework.cxx index 833426c0ca57..0ce4985778a8 100644 --- a/framework/inc/pch/precompiled_framework.cxx +++ b/framework/inc/pch/precompiled_framework.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/inc/pch/precompiled_framework.hxx b/framework/inc/pch/precompiled_framework.hxx index 07e54531de59..45919a31047b 100644 --- a/framework/inc/pch/precompiled_framework.hxx +++ b/framework/inc/pch/precompiled_framework.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/inc/properties.h b/framework/inc/properties.h index 84d7370af6b2..5a32a42a28cc 100644 --- a/framework/inc/properties.h +++ b/framework/inc/properties.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ #include <general.h> //_______________________________________________ -// namespace +// namespace namespace framework{ diff --git a/framework/inc/protocols.h b/framework/inc/protocols.h index 12a0e9451d9e..20273e9a4325 100644 --- a/framework/inc/protocols.h +++ b/framework/inc/protocols.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,13 +31,13 @@ #define __FRAMEWORK_PROTOCOLS_H_ //_________________________________________________________________________________________________________________ -// includes +// includes //_________________________________________________________________________________________________________________ #include <macros/generic.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ @@ -146,7 +146,7 @@ class ProtocolCheck case E_SERVICE : return (sURL.compareTo(SPECIALPROTOCOL_SERVICE ,SPECIALPROTOCOL_SERVICE.getLength() ) == 0); case E_MAILTO : return (sURL.compareTo(SPECIALPROTOCOL_MAILTO ,SPECIALPROTOCOL_MAILTO.getLength() ) == 0); case E_NEWS : return (sURL.compareTo(SPECIALPROTOCOL_NEWS ,SPECIALPROTOCOL_NEWS.getLength() ) == 0); - default : return sal_False; + default : return sal_False; } return sal_False; } diff --git a/framework/inc/queries.h b/framework/inc/queries.h index 50f18078c19d..b8d122118abf 100644 --- a/framework/inc/queries.h +++ b/framework/inc/queries.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,30 +29,30 @@ #define __FRAMEWORK_QUERIES_H_ //_________________________________________________________________________________________________________________ -// own includes +// own includes //_________________________________________________________________________________________________________________ #include <general.h> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <com/sun/star/uno/Sequence.hxx> #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** - @short These values describe our supported queries for type, filter ... properties. + @short These values describe our supported queries for type, filter ... properties. They are used by our FilterFactory or ouer TypeDetection to return subsets of our cached configuration. *//*-*************************************************************************************************************/ @@ -397,6 +397,6 @@ class QueryAnalyzer }; // class QueryAnalyzer -} // namespace framework +} // namespace framework -#endif // #ifndef __FRAMEWORK_QUERIES_H_ +#endif // #ifndef __FRAMEWORK_QUERIES_H_ diff --git a/framework/inc/recording/dispatchrecorder.hxx b/framework/inc/recording/dispatchrecorder.hxx index d0813e31d145..c24e29c8312a 100644 --- a/framework/inc/recording/dispatchrecorder.hxx +++ b/framework/inc/recording/dispatchrecorder.hxx @@ -43,7 +43,7 @@ class DispatchRecorder // private member private: css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR ; - DispatchStatementList m_aStatements; + DispatchStatementList m_aStatements; sal_Int32 m_nRecordingID ; css::uno::Reference< css::script::XTypeConverter > m_xConverter; diff --git a/framework/inc/recording/dispatchrecordersupplier.hxx b/framework/inc/recording/dispatchrecordersupplier.hxx index ece1a4ed672f..b1fa77114b98 100644 --- a/framework/inc/recording/dispatchrecordersupplier.hxx +++ b/framework/inc/recording/dispatchrecordersupplier.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,15 +54,15 @@ #include <cppuhelper/weak.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace namespace framework{ //_________________________________________________________________________________________________________________ -// exported const +// exported const //_________________________________________________________________________________________________________________ -// exported definitions +// exported definitions //_______________________________________________ @@ -108,7 +108,7 @@ class DispatchRecorderSupplier : // interfaces //_______________________________________ // XInterface, XTypeProvider, XServiceInfo - + FWK_DECLARE_XINTERFACE FWK_DECLARE_XTYPEPROVIDER DECLARE_XSERVICEINFO @@ -132,6 +132,6 @@ class DispatchRecorderSupplier : // interfaces }; // class DispatchRecorderSupplier -} // namespace framework +} // namespace framework #endif // #ifndef __FRAMEWORK_RECORDING_DISPATCHRECORDERSUPPLIER_HXX_ diff --git a/framework/inc/services.h b/framework/inc/services.h index a104dd29423c..9c19f8b6251e 100644 --- a/framework/inc/services.h +++ b/framework/inc/services.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,42 +29,42 @@ #define __FRAMEWORK_SERVICES_H_ //_________________________________________________________________________________________________________________ -// includes +// includes //_________________________________________________________________________________________________________________ #include <macros/generic.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// used servicenames by framework +// used servicenames by framework //_________________________________________________________________________________________________________________ -#define SERVICENAME_FRAME DECLARE_ASCII("com.sun.star.frame.Frame" ) -#define SERVICENAME_DESKTOP DECLARE_ASCII("com.sun.star.frame.Desktop" ) -#define SERVICENAME_TASK DECLARE_ASCII("com.sun.star.frame.Task" ) -#define SERVICENAME_FRAMELOADERFACTORY DECLARE_ASCII("com.sun.star.frame.FrameLoaderFactory" ) -#define SERVICENAME_FILTERFACTORY DECLARE_ASCII("com.sun.star.document.FilterFactory" ) -#define SERVICENAME_URLTRANSFORMER DECLARE_ASCII("com.sun.star.util.URLTransformer" ) -#define SERVICENAME_PLUGINFRAME DECLARE_ASCII("com.sun.star.mozilla.Plugin" ) -#define SERVICENAME_BRIDGEFACTORY DECLARE_ASCII("com.sun.star.bridge.BridgeFactory" ) -#define SERVICENAME_INIMANAGER DECLARE_ASCII("com.sun.star.config.INIManager" ) -#define SERVICENAME_MEDIATYPEDETECTIONHELPER DECLARE_ASCII("com.sun.star.frame.MediaTypeDetectionHelper" ) -#define SERVICENAME_LOGINDIALOG DECLARE_ASCII("com.sun.star.framework.LoginDialog" ) -#define SERVICENAME_CONFIGURATION DECLARE_ASCII("com.sun.star.configuration.ConfigurationRegistry" ) -#define SERVICENAME_VCLTOOLKIT DECLARE_ASCII("com.sun.star.awt.Toolkit" ) -#define SERVICENAME_SIMPLEREGISTRY DECLARE_ASCII("com.sun.star.registry.SimpleRegistry" ) -#define SERVICENAME_NESTEDREGISTRY DECLARE_ASCII("com.sun.star.registry.NestedRegistry" ) -#define SERVICENAME_GENERICFRAMELOADER DECLARE_ASCII("com.sun.star.comp.office.FilterDetect" ) -#define SERVICENAME_TYPEDETECTION DECLARE_ASCII("com.sun.star.document.TypeDetection" ) -#define SERVICENAME_DOCUMENTPROPERTIES DECLARE_ASCII("com.sun.star.document.DocumentProperties" ) +#define SERVICENAME_FRAME DECLARE_ASCII("com.sun.star.frame.Frame" ) +#define SERVICENAME_DESKTOP DECLARE_ASCII("com.sun.star.frame.Desktop" ) +#define SERVICENAME_TASK DECLARE_ASCII("com.sun.star.frame.Task" ) +#define SERVICENAME_FRAMELOADERFACTORY DECLARE_ASCII("com.sun.star.frame.FrameLoaderFactory" ) +#define SERVICENAME_FILTERFACTORY DECLARE_ASCII("com.sun.star.document.FilterFactory" ) +#define SERVICENAME_URLTRANSFORMER DECLARE_ASCII("com.sun.star.util.URLTransformer" ) +#define SERVICENAME_PLUGINFRAME DECLARE_ASCII("com.sun.star.mozilla.Plugin" ) +#define SERVICENAME_BRIDGEFACTORY DECLARE_ASCII("com.sun.star.bridge.BridgeFactory" ) +#define SERVICENAME_INIMANAGER DECLARE_ASCII("com.sun.star.config.INIManager" ) +#define SERVICENAME_MEDIATYPEDETECTIONHELPER DECLARE_ASCII("com.sun.star.frame.MediaTypeDetectionHelper" ) +#define SERVICENAME_LOGINDIALOG DECLARE_ASCII("com.sun.star.framework.LoginDialog" ) +#define SERVICENAME_CONFIGURATION DECLARE_ASCII("com.sun.star.configuration.ConfigurationRegistry" ) +#define SERVICENAME_VCLTOOLKIT DECLARE_ASCII("com.sun.star.awt.Toolkit" ) +#define SERVICENAME_SIMPLEREGISTRY DECLARE_ASCII("com.sun.star.registry.SimpleRegistry" ) +#define SERVICENAME_NESTEDREGISTRY DECLARE_ASCII("com.sun.star.registry.NestedRegistry" ) +#define SERVICENAME_GENERICFRAMELOADER DECLARE_ASCII("com.sun.star.comp.office.FilterDetect" ) +#define SERVICENAME_TYPEDETECTION DECLARE_ASCII("com.sun.star.document.TypeDetection" ) +#define SERVICENAME_DOCUMENTPROPERTIES DECLARE_ASCII("com.sun.star.document.DocumentProperties" ) #define SERVICENAME_CFGREGISTRY DECLARE_ASCII("com.sun.star.configuration.ConfigurationRegistry" ) // describe simple registry service for read access to configuration -#define SERVICENAME_CFGPROVIDER DECLARE_ASCII("com.sun.star.configuration.ConfigurationProvider" ) // describe cfg-provider service for fatoffice, network installation -#define SERVICENAME_ADMINPROVIDER DECLARE_ASCII("com.sun.star.configuration.AdministrationProvider" ) // describe cfg-provider service for sun webtop +#define SERVICENAME_CFGPROVIDER DECLARE_ASCII("com.sun.star.configuration.ConfigurationProvider" ) // describe cfg-provider service for fatoffice, network installation +#define SERVICENAME_ADMINPROVIDER DECLARE_ASCII("com.sun.star.configuration.AdministrationProvider" ) // describe cfg-provider service for sun webtop #define SERVICENAME_CFGUPDATEACCESS DECLARE_ASCII("com.sun.star.configuration.ConfigurationUpdateAccess") // provides read/write access to the configuration #define SERVICENAME_CFGREADACCESS DECLARE_ASCII("com.sun.star.configuration.ConfigurationAccess" ) // provides readonly access to the configuration #define SERVICENAME_CONTENTHANDLER DECLARE_ASCII("com.sun.star.frame.ContentHandler" ) @@ -78,8 +78,8 @@ namespace framework{ #define SERVICENAME_DISPATCHRECORDER DECLARE_ASCII("com.sun.star.frame.DispatchRecorder" ) #define SERVICENAME_SYSTEMSHELLEXECUTE DECLARE_ASCII("com.sun.star.system.SystemShellExecute" ) #define SERVICENAME_PROTOCOLHANDLER DECLARE_ASCII("com.sun.star.frame.ProtocolHandler" ) -#define SERVICENAME_SUBSTITUTEPATHVARIABLES DECLARE_ASCII("com.sun.star.util.PathSubstitution" ) -#define SERVICENAME_PATHSETTINGS DECLARE_ASCII("com.sun.star.util.PathSettings" ) +#define SERVICENAME_SUBSTITUTEPATHVARIABLES DECLARE_ASCII("com.sun.star.util.PathSubstitution" ) +#define SERVICENAME_PATHSETTINGS DECLARE_ASCII("com.sun.star.util.PathSettings" ) #define SERVICENAME_DISPATCHHELPER DECLARE_ASCII("com.sun.star.frame.DispatchHelper" ) #define SERVICENAME_DETECTORFACTORY DECLARE_ASCII("com.sun.star.document.ExtendedTypeDetectionFactory" ) #define SERVICENAME_SCRIPTCONVERTER DECLARE_ASCII("com.sun.star.script.Converter" ) @@ -109,8 +109,8 @@ namespace framework{ #define SERVICENAME_TOOLBARFACTORY DECLARE_ASCII("com.sun.star.ui.ToolBarFactory" ) #define SERVICENAME_TOOLBARCONTROLLERFACTORY DECLARE_ASCII("com.sun.star.frame.ToolBarControllerFactory" ) #define SERVICENAME_LICENSE SERVICENAME_JOB -#define SERVICENAME_AUTORECOVERY DECLARE_ASCII("com.sun.star.frame.AutoRecovery" ) -#define SERVICENAME_GLOBALEVENTBROADCASTER DECLARE_ASCII("com.sun.star.frame.GlobalEventBroadcaster" ) +#define SERVICENAME_AUTORECOVERY DECLARE_ASCII("com.sun.star.frame.AutoRecovery" ) +#define SERVICENAME_GLOBALEVENTBROADCASTER DECLARE_ASCII("com.sun.star.frame.GlobalEventBroadcaster" ) #define SERVICENAME_STATUSBARFACTORY DECLARE_ASCII("com.sun.star.ui.StatusBarFactory" ) #define SERVICENAME_UICATEGORYDESCRIPTION DECLARE_ASCII("com.sun.star.ui.UICategoryDescription" ) #define SERVICENAME_STATUSBARCONTROLLERFACTORY DECLARE_ASCII("com.sun.star.frame.StatusbarControllerFactory" ) @@ -118,30 +118,30 @@ namespace framework{ #define SERVICENAME_STATUSBARCONTROLLER DECLARE_ASCII("com.sun.star.frame.StatusbarController" ) #define SERVICENAME_TABREG DECLARE_ASCII("com.sun.star.tab.tabreg" ) #define SERVICENAME_TASKCREATOR DECLARE_ASCII("com.sun.star.frame.TaskCreator" ) -#define SERVICENAME_TABWINFACTORY DECLARE_ASCII("com.sun.star.frame.TabWindowFactory" ) -#define SERVICENAME_TABWINDOW DECLARE_ASCII("com.sun.star.frame.TabWindow" ) +#define SERVICENAME_TABWINFACTORY DECLARE_ASCII("com.sun.star.frame.TabWindowFactory" ) +#define SERVICENAME_TABWINDOW DECLARE_ASCII("com.sun.star.frame.TabWindow" ) #define SERVICENAME_STRINGABBREVIATION DECLARE_ASCII("com.sun.star.util.UriAbbreviation" ) #define SERVICENAME_IMAGEMANAGER DECLARE_ASCII("com.sun.star.ui.ImageManager" ) #define SERVICENAME_TABWINDOWSERVICE DECLARE_ASCII("com.sun.star.ui.dialogs.TabContainerWindow" ) -#define SERVICENAME_WINDOWCONTENTFACTORYMANAGER DECLARE_ASCII("com.sun.star.ui.WindowContentFactoryManager" ) +#define SERVICENAME_WINDOWCONTENTFACTORYMANAGER DECLARE_ASCII("com.sun.star.ui.WindowContentFactoryManager" ) #define SERVICENAME_DISPLAYACCESS DECLARE_ASCII("com.sun.star.awt.DisplayAccess" ) //_________________________________________________________________________________________________________________ -// used implementationnames by framework +// used implementationnames by framework //_________________________________________________________________________________________________________________ -#define IMPLEMENTATIONNAME_FRAME DECLARE_ASCII("com.sun.star.comp.framework.Frame" ) -#define IMPLEMENTATIONNAME_DESKTOP DECLARE_ASCII("com.sun.star.comp.framework.Desktop" ) -#define IMPLEMENTATIONNAME_TASK DECLARE_ASCII("com.sun.star.comp.framework.Task" ) -//#define IMPLEMENTATIONNAME_FRAMELOADERFACTORY DECLARE_ASCII("com.sun.star.comp.framework.FrameLoaderFactory" ) -//#define IMPLEMENTATIONNAME_FILTERFACTORY DECLARE_ASCII("com.sun.star.comp.framework.FilterFactory" ) -#define IMPLEMENTATIONNAME_URLTRANSFORMER DECLARE_ASCII("com.sun.star.comp.framework.URLTransformer" ) -// #define IMPLEMENTATIONNAME_PLUGINFRAME DECLARE_ASCII("com.sun.star.comp.framework.PluginFrame" ) -#define IMPLEMENTATIONNAME_GENERICFRAMELOADER DECLARE_ASCII("com.sun.star.comp.office.FrameLoader" ) -#define IMPLEMENTATIONNAME_MEDIATYPEDETECTIONHELPER DECLARE_ASCII("com.sun.star.comp.framework.MediaTypeDetectionHelper") -//#define IMPLEMENTATIONNAME_LOGINDIALOG DECLARE_ASCII("com.sun.star.comp.framework.LoginDialog" ) -//#define IMPLEMENTATIONNAME_TYPEDETECTION DECLARE_ASCII("com.sun.star.comp.framework.TypeDetection" ) -//#define IMPLEMENTATIONNAME_DOCUMENTPROPERTIES DECLARE_ASCII("com.sun.star.comp.framework.DocumentProperties" ) +#define IMPLEMENTATIONNAME_FRAME DECLARE_ASCII("com.sun.star.comp.framework.Frame" ) +#define IMPLEMENTATIONNAME_DESKTOP DECLARE_ASCII("com.sun.star.comp.framework.Desktop" ) +#define IMPLEMENTATIONNAME_TASK DECLARE_ASCII("com.sun.star.comp.framework.Task" ) +//#define IMPLEMENTATIONNAME_FRAMELOADERFACTORY DECLARE_ASCII("com.sun.star.comp.framework.FrameLoaderFactory" ) +//#define IMPLEMENTATIONNAME_FILTERFACTORY DECLARE_ASCII("com.sun.star.comp.framework.FilterFactory" ) +#define IMPLEMENTATIONNAME_URLTRANSFORMER DECLARE_ASCII("com.sun.star.comp.framework.URLTransformer" ) +// #define IMPLEMENTATIONNAME_PLUGINFRAME DECLARE_ASCII("com.sun.star.comp.framework.PluginFrame" ) +#define IMPLEMENTATIONNAME_GENERICFRAMELOADER DECLARE_ASCII("com.sun.star.comp.office.FrameLoader" ) +#define IMPLEMENTATIONNAME_MEDIATYPEDETECTIONHELPER DECLARE_ASCII("com.sun.star.comp.framework.MediaTypeDetectionHelper") +//#define IMPLEMENTATIONNAME_LOGINDIALOG DECLARE_ASCII("com.sun.star.comp.framework.LoginDialog" ) +//#define IMPLEMENTATIONNAME_TYPEDETECTION DECLARE_ASCII("com.sun.star.comp.framework.TypeDetection" ) +//#define IMPLEMENTATIONNAME_DOCUMENTPROPERTIES DECLARE_ASCII("com.sun.star.comp.framework.DocumentProperties" ) #define IMPLEMENTATIONNAME_OXT_HANDLER DECLARE_ASCII("com.sun.star.comp.framework.OXTFileHandler" ) //#define IMPLEMENTATIONNAME_CONTENTHANDLERFACTORY DECLARE_ASCII("com.sun.star.comp.framework.ContentHandlerFactory" ) #define IMPLEMENTATIONNAME_SFXTERMINATOR DECLARE_ASCII("com.sun.star.comp.sfx2.SfxTerminateListener" ) @@ -154,8 +154,8 @@ namespace framework{ #define IMPLEMENTATIONNAME_MAILTODISPATCHER DECLARE_ASCII("com.sun.star.comp.framework.MailToDispatcher" ) #define IMPLEMENTATIONNAME_SERVICEHANDLER DECLARE_ASCII("com.sun.star.comp.framework.ServiceHandler" ) #define IMPLEMENTATIONNAME_UIINTERACTIONHANDLER DECLARE_ASCII("com.sun.star.comp.uui.UUIInteractionHandler" ) -#define IMPLEMENTATIONNAME_SUBSTITUTEPATHVARIABLES DECLARE_ASCII("com.sun.star.comp.framework.PathSubstitution" ) -#define IMPLEMENTATIONNAME_PATHSETTINGS DECLARE_ASCII("com.sun.star.comp.framework.PathSettings" ) +#define IMPLEMENTATIONNAME_SUBSTITUTEPATHVARIABLES DECLARE_ASCII("com.sun.star.comp.framework.PathSubstitution" ) +#define IMPLEMENTATIONNAME_PATHSETTINGS DECLARE_ASCII("com.sun.star.comp.framework.PathSettings" ) #define IMPLEMENTATIONNAME_JOBDISPATCH DECLARE_ASCII("com.sun.star.comp.framework.jobs.JobDispatch" ) #define IMPLEMENTATIONNAME_DISPATCHHELPER DECLARE_ASCII("com.sun.star.comp.framework.services.DispatchHelper" ) //#define IMPLEMENTATIONNAME_DETECTORFACTORY DECLARE_ASCII("com.sun.star.comp.framework.DetectorFactory" ) @@ -200,8 +200,8 @@ namespace framework{ #define IMPLEMENTATIONNAME_LOGOIMAGESTATUSBARCONTROLLER DECLARE_ASCII("com.sun.star.comp.framework.LogoImageStatusbarController" ) #define IMPLEMENTATIONNAME_LOGOTEXTSTATUSBARCONTROLLER DECLARE_ASCII("com.sun.star.comp.framework.LogoTextStatusbarController" ) #define IMPLEMENTATIONNAME_FWK_TASKCREATOR DECLARE_ASCII("com.sun.star.comp.framework.TaskCreator" ) -#define IMPLEMENTATIONNAME_TABWINFACTORY DECLARE_ASCII("com.sun.star.comp.framework.TabWindowFactory" ) -#define IMPLEMENTATIONNAME_TABWINDOW DECLARE_ASCII("com.sun.star.comp.framework.TabWindow" ) +#define IMPLEMENTATIONNAME_TABWINFACTORY DECLARE_ASCII("com.sun.star.comp.framework.TabWindowFactory" ) +#define IMPLEMENTATIONNAME_TABWINDOW DECLARE_ASCII("com.sun.star.comp.framework.TabWindow" ) #define IMPLEMENTATIONNAME_SYSTEMEXEC DECLARE_ASCII("com.sun.star.comp.framework.SystemExecute" ) #define IMPLEMENTATIONNAME_SIMPLETEXTSTATUSBARCONTROLLER DECLARE_ASCII("com.sun.star.comp.framework.SimpleTextStatusbarController" ) #define IMPLEMENTATIONNAME_URIABBREVIATION DECLARE_ASCII("com.sun.star.comp.framework.UriAbbreviation" ) @@ -210,9 +210,9 @@ namespace framework{ #define IMPLEMENTATIONNAME_LANGUAGESELECTIONMENUCONTROLLER DECLARE_ASCII("com.sum.star.comp.framework.LanguageSelectionMenuController" ) #define IMPLEMENTATIONNAME_IMAGEMANAGER DECLARE_ASCII("com.sun.star.comp.framework.ImageManager" ) #define IMPLEMENTATIONNAME_TABWINDOWSERVICE DECLARE_ASCII("com.sun.star.comp.framework.TabWindowService" ) -#define IMPLEMENTATIONNAME_WINDOWCONTENTFACTORYMANAGER DECLARE_ASCII("com.sun.star.comp.framework.WindowContentFactoryManager" ) +#define IMPLEMENTATIONNAME_WINDOWCONTENTFACTORYMANAGER DECLARE_ASCII("com.sun.star.comp.framework.WindowContentFactoryManager" ) -} // namespace framework +} // namespace framework -#endif // #ifndef __FRAMEWORK_SERVICES_H_ +#endif // #ifndef __FRAMEWORK_SERVICES_H_ diff --git a/framework/inc/services/autorecovery.hxx b/framework/inc/services/autorecovery.hxx index e4fb18c6480a..1c64e99ed91d 100644 --- a/framework/inc/services/autorecovery.hxx +++ b/framework/inc/services/autorecovery.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -153,7 +153,7 @@ class AutoRecovery : public css::lang::XTypeProvider /** These values are used as flags and represent the current state of a document. Every state of the life time of a document has to be recognized here. - + @attention Do not change (means reorganize) already used numbers. There exists some code inside SVX, which uses the same numbers, to analyze such document states. @@ -175,7 +175,7 @@ class AutoRecovery : public css::lang::XTypeProvider E_TRY_SAVE = 8, E_TRY_LOAD_BACKUP = 16, E_TRY_LOAD_ORIGINAL = 32, - + /* FINAL STATES */ /// the Auto/Emergency saved document isnt useable any longer @@ -484,7 +484,7 @@ class AutoRecovery : public css::lang::XTypeProvider // css.util.XChangesListener virtual void SAL_CALL changesOccurred(const css::util::ChangesEvent& aEvent) throw(css::uno::RuntimeException); - + //--------------------------------------- // css.util.XModifyListener virtual void SAL_CALL modified(const css::lang::EventObject& aEvent) @@ -505,9 +505,9 @@ class AutoRecovery : public css::lang::XTypeProvider // OPropertySetHelper virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& aConvertedValue, - css::uno::Any& aOldValue , - sal_Int32 nHandle , - const css::uno::Any& aValue ) + css::uno::Any& aOldValue , + sal_Int32 nHandle , + const css::uno::Any& aValue ) throw(css::lang::IllegalArgumentException); virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, @@ -573,7 +573,7 @@ class AutoRecovery : public css::lang::XTypeProvider @threadsafe */ void implts_readAutoSaveConfig(); - + //--------------------------------------- // TODO document me void implts_flushConfigItem(const AutoRecovery::TDocumentInfo& rInfo , @@ -667,7 +667,7 @@ class AutoRecovery : public css::lang::XTypeProvider //--------------------------------------- // TODO document me void implts_markDocumentModifiedAgainstLastBackup(const css::uno::Reference< css::frame::XModel >& xDocument); - + //--------------------------------------- // TODO document me void implts_updateModifiedState(const css::uno::Reference< css::frame::XModel >& xDocument); @@ -906,14 +906,14 @@ class AutoRecovery : public css::lang::XTypeProvider //--------------------------------------- /** try to make sure that all changed config items (not our used config access only) will be flushed back to disc. - + E.g. our svtools::ConfigItems() has to be flushed explicitly .-( - + Note: This method cant fail. Flushing of config entries is an optional feature. Errors can be ignored. */ void impl_flushALLConfigChanges(); - + //--------------------------------------- // TODO document me AutoRecovery::EFailureSafeResult implts_copyFile(const ::rtl::OUString& sSource , @@ -988,10 +988,10 @@ class AutoRecovery : public css::lang::XTypeProvider void impl_forgetProgress(const AutoRecovery::TDocumentInfo& rInfo , ::comphelper::MediaDescriptor& rArgs , const css::uno::Reference< css::frame::XFrame >& xNewFrame); - + //--------------------------------------- /** try to remove the specified file from disc. - + Every URL supported by our UCB component can be used here. Further it doesnt matter if the file realy exists or not. Because removing a non exsistent file will have the same @@ -1001,16 +1001,16 @@ class AutoRecovery : public css::lang::XTypeProvider feature. If we are not able doing so ... its not a real problem. Ok - users disc place will be samller then ... but we should produce a crash during crash save because we cant delete a temporary file only ! - + @param sURL the url of the file, which should be removed. */ static void st_impl_removeFile(const ::rtl::OUString& sURL); - + //--------------------------------------- /** try to remove ".lock" file from disc if office will be terminated not using the offical way .-) - + This method has to be handled "optional". So every error inside has to be ignored ! This method CANT FAIL ... it can forget something only .-) */ diff --git a/framework/inc/services/backingcomp.hxx b/framework/inc/services/backingcomp.hxx index 2752c5fe89af..17a902f7d24d 100644 --- a/framework/inc/services/backingcomp.hxx +++ b/framework/inc/services/backingcomp.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,7 +64,7 @@ namespace framework { - + //__________________________________________ /** implements the backing component. @@ -97,13 +97,13 @@ class BackingComp : public css::lang::XTypeProvider /** reference to the component window. */ css::uno::Reference< css::awt::XWindow > m_xWindow; - + /** the owner frame of this component. */ css::uno::Reference< css::frame::XFrame > m_xFrame; /** helper for drag&drop. */ css::uno::Reference< css::datatransfer::dnd::XDropTargetListener > m_xDropTargetListener; - + //______________________________________ // interface diff --git a/framework/inc/services/contenthandlerfactory.hxx b/framework/inc/services/contenthandlerfactory.hxx index 9059cf185d60..68960e101157 100644 --- a/framework/inc/services/contenthandlerfactory.hxx +++ b/framework/inc/services/contenthandlerfactory.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_SERVICES_CONTENTHANDLERFACTORY_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <classes/filtercache.hxx> @@ -46,7 +46,7 @@ #include <general.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/lang/XInitialization.hpp> @@ -60,23 +60,23 @@ #include <com/sun/star/util/XFlushable.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/weak.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// exported const +// exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// exported definitions +// exported definitions //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** @@ -86,7 +86,7 @@ namespace framework{ a given URL or handlername. (use service TypeDetection to do that) With a detected type name you can search a registered handler and create it with these factory. - @implements XInterface + @implements XInterface XTypeProvider XServiceInfo XMultiServiceFactory @@ -99,43 +99,43 @@ namespace framework{ @base ThreadHelpBase OWeakObject - @devstatus ready to use - @threadsafe yes + @devstatus ready to use + @threadsafe yes *//*-*************************************************************************************************************/ class ContentHandlerFactory : // interfaces - public css::lang::XTypeProvider , - public css::lang::XServiceInfo , - public css::lang::XMultiServiceFactory , - public css::container::XNameContainer , // => XNameReplace => XNameAccess => XElementAccess - public css::util::XFlushable , + public css::lang::XTypeProvider , + public css::lang::XServiceInfo , + public css::lang::XMultiServiceFactory , + public css::container::XNameContainer , // => XNameReplace => XNameAccess => XElementAccess + public css::util::XFlushable , // base classes // Order is neccessary for right initialization of it! private ThreadHelpBase , private TransactionBase , - public ::cppu::OWeakObject + public ::cppu::OWeakObject { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: //--------------------------------------------------------------------------------------------------------- - // constructor / destructor + // constructor / destructor //--------------------------------------------------------------------------------------------------------- ContentHandlerFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ); virtual ~ContentHandlerFactory( ); //--------------------------------------------------------------------------------------------------------- - // XInterface, XTypeProvider, XServiceInfo + // XInterface, XTypeProvider, XServiceInfo //--------------------------------------------------------------------------------------------------------- DECLARE_XINTERFACE DECLARE_XTYPEPROVIDER DECLARE_XSERVICEINFO //--------------------------------------------------------------------------------------------------------- - // XMultiServiceFactory + // XMultiServiceFactory //--------------------------------------------------------------------------------------------------------- virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance ( const ::rtl::OUString& sTypeName ) throw( css::uno::Exception , css::uno::RuntimeException ); @@ -144,7 +144,7 @@ class ContentHandlerFactory : // interfaces virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames ( ) throw( css::uno::RuntimeException ); //--------------------------------------------------------------------------------------------------------- - // XNameContainer + // XNameContainer //--------------------------------------------------------------------------------------------------------- virtual void SAL_CALL insertByName( const ::rtl::OUString& sHandlerName , const css::uno::Any& aHandlerProperties ) throw( css::lang::IllegalArgumentException , @@ -156,7 +156,7 @@ class ContentHandlerFactory : // interfaces css::uno::RuntimeException ); //--------------------------------------------------------------------------------------------------------- - // XNameReplace + // XNameReplace //--------------------------------------------------------------------------------------------------------- virtual void SAL_CALL replaceByName( const ::rtl::OUString& sHandlerName , const css::uno::Any& aHandlerProperties ) throw( css::lang::IllegalArgumentException , @@ -165,7 +165,7 @@ class ContentHandlerFactory : // interfaces css::uno::RuntimeException ); //--------------------------------------------------------------------------------------------------------- - // XNameAccess + // XNameAccess //--------------------------------------------------------------------------------------------------------- virtual css::uno::Any SAL_CALL getByName ( const ::rtl::OUString& sName ) throw( css::container::NoSuchElementException , css::lang::WrappedTargetException , @@ -174,41 +174,41 @@ class ContentHandlerFactory : // interfaces virtual sal_Bool SAL_CALL hasByName ( const ::rtl::OUString& sName ) throw( css::uno::RuntimeException ); //--------------------------------------------------------------------------------------------------------- - // XElementAccess + // XElementAccess //--------------------------------------------------------------------------------------------------------- virtual css::uno::Type SAL_CALL getElementType() throw( css::uno::RuntimeException ); virtual sal_Bool SAL_CALL hasElements () throw( css::uno::RuntimeException ); //--------------------------------------------------------------------------------------------------------- - // XFlushable + // XFlushable //--------------------------------------------------------------------------------------------------------- virtual void SAL_CALL flush ( ) throw ( css::uno::RuntimeException ); virtual void SAL_CALL addFlushListener ( const css::uno::Reference< css::util::XFlushListener >& xListener ) throw ( css::uno::RuntimeException ); virtual void SAL_CALL removeFlushListener( const css::uno::Reference< css::util::XFlushListener >& xListener ) throw ( css::uno::RuntimeException ); //------------------------------------------------------------------------------------------------------------- - // protected methods + // protected methods //------------------------------------------------------------------------------------------------------------- protected: //------------------------------------------------------------------------------------------------------------- - // debug methods - // (should be private everyway!) + // debug methods + // (should be private everyway!) //------------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short debug-method to check incoming parameter of some other mehods of this class - @descr The following methods are used to check parameters for other methods + @short debug-method to check incoming parameter of some other mehods of this class + @descr The following methods are used to check parameters for other methods of this class. The return value is used directly for an ASSERT(...). - @seealso ASSERTs in implementation! + @seealso ASSERTs in implementation! - @param references to checking variables - @return sal_False ,on invalid parameter - @return sal_True ,otherwise + @param references to checking variables + @return sal_False ,on invalid parameter + @return sal_True ,otherwise - @onerror - + @onerror - *//*-*****************************************************************************************************/ #ifdef ENABLE_ASSERTIONS @@ -216,27 +216,27 @@ class ContentHandlerFactory : // interfaces private: static sal_Bool implcp_ContentHandlerFactory ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ); - static sal_Bool implcp_createInstanceWithArguments ( const ::rtl::OUString& sTypeName , - const css::uno::Sequence< css::uno::Any >& lArguments ); - static sal_Bool implcp_getByName ( const ::rtl::OUString& sName ); - static sal_Bool implcp_hasByName ( const ::rtl::OUString& sName ); + static sal_Bool implcp_createInstanceWithArguments ( const ::rtl::OUString& sTypeName , + const css::uno::Sequence< css::uno::Any >& lArguments ); + static sal_Bool implcp_getByName ( const ::rtl::OUString& sName ); + static sal_Bool implcp_hasByName ( const ::rtl::OUString& sName ); static sal_Bool implcp_removeByName ( const ::rtl::OUString& sHandlerName ); - #endif // #ifdef ENABLE_ASSERTIONS + #endif // #ifdef ENABLE_ASSERTIONS //------------------------------------------------------------------------------------------------------------- - // private variables - // (should be private everyway!) + // private variables + // (should be private everyway!) //------------------------------------------------------------------------------------------------------------- private: - css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory ; + css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory ; FilterCache m_aCache ; -// ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer ; +// ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer ; }; // class ContentHandlerFactory -} // namespace framework +} // namespace framework #endif // #ifndef __FRAMEWORK_SERVICES_CONTENTHANDLERFACTORY_HXX_ diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx index 6879575f8e83..47bb501aeef8 100644 --- a/framework/inc/services/desktop.hxx +++ b/framework/inc/services/desktop.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_SERVICES_DESKTOP_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <classes/framecontainer.hxx> @@ -42,7 +42,7 @@ #include <macros/xserviceinfo.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/frame/XUntitledNumbers.hpp> @@ -74,7 +74,7 @@ #include <com/sun/star/frame/XDispatchRecorderSupplier.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <unotools/cmdoptions.hxx> #include <cppuhelper/propshlp.hxx> @@ -84,17 +84,17 @@ #include <comphelper/numberedcollection.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// exported const +// exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// exported definitions +// exported definitions //_________________________________________________________________________________________________________________ enum ELoadState @@ -106,11 +106,11 @@ enum ELoadState }; /*-************************************************************************************************************//** - @short implement the topframe of frame tree - @descr This is the root of the frame tree. The desktop has no window, is not visible but he is the logical + @short implement the topframe of frame tree + @descr This is the root of the frame tree. The desktop has no window, is not visible but he is the logical "masternode" to build the hierarchy. - @implements XInterface + @implements XInterface XTypeProvider XServiceInfo XDesktop @@ -127,7 +127,7 @@ enum ELoadState XEventListener XInteractionHandler - @base ThreadHelpBase + @base ThreadHelpBase TransactionBase OBroadcastHelper OPropertySetHelper @@ -165,7 +165,7 @@ class Desktop : // interfaces // public methods public: - // constructor / destructor + // constructor / destructor Desktop( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ); virtual ~Desktop( ); @@ -304,7 +304,7 @@ class Desktop : // interfaces virtual void SAL_CALL addFrameActionListener ( const css::uno::Reference< css::frame::XFrameActionListener >& xListener ) throw( css::uno::RuntimeException ); virtual void SAL_CALL removeFrameActionListener ( const css::uno::Reference< css::frame::XFrameActionListener >& xListener ) throw( css::uno::RuntimeException ); - // XComponent + // XComponent using cppu::OPropertySetHelper::disposing; virtual void SAL_CALL dispose ( ) throw( css::uno::RuntimeException ); virtual void SAL_CALL addEventListener ( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw( css::uno::RuntimeException ); @@ -313,7 +313,7 @@ class Desktop : // interfaces // XDispatchResultListener virtual void SAL_CALL dispatchFinished ( const css::frame::DispatchResultEvent& aEvent ) throw( css::uno::RuntimeException ); - // XEventListener + // XEventListener virtual void SAL_CALL disposing ( const css::lang::EventObject& aSource ) throw( css::uno::RuntimeException ); // XInteractionHandler @@ -339,11 +339,11 @@ class Desktop : // interfaces throw (css::uno::RuntimeException); //------------------------------------------------------------------------------------------------------------- - // protected methods + // protected methods //------------------------------------------------------------------------------------------------------------- protected: - // OPropertySetHelper + // OPropertySetHelper virtual sal_Bool SAL_CALL convertFastPropertyValue ( css::uno::Any& aConvertedValue , css::uno::Any& aOldValue , sal_Int32 nHandle , @@ -357,7 +357,7 @@ class Desktop : // interfaces virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo ( ) throw (css::uno::RuntimeException); //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: @@ -429,7 +429,7 @@ class Desktop : // interfaces ::sal_Bool impl_closeFrames(::sal_Bool bAllowUI); //------------------------------------------------------------------------------------------------------------- - // debug methods + // debug methods // (should be private everytime!) //------------------------------------------------------------------------------------------------------------- #ifdef ENABLE_ASSERTIONS @@ -445,21 +445,21 @@ class Desktop : // interfaces #endif // #ifdef ENABLE_ASSERTIONS //------------------------------------------------------------------------------------------------------------- - // variables + // variables // (should be private everytime!) //------------------------------------------------------------------------------------------------------------- private: - css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory ; /// reference to factory, which has create this instance - FrameContainer m_aChildTaskContainer ; /// array of child tasks (childs of desktop are tasks; and tasks are also frames - But pure frames are not accepted!) - ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer ; /// container for ALL Listener - css::uno::Reference< css::frame::XFrames > m_xFramesHelper ; /// helper for XFrames, XIndexAccess, XElementAccess and implementation of a childcontainer! + css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory ; /// reference to factory, which has create this instance + FrameContainer m_aChildTaskContainer ; /// array of child tasks (childs of desktop are tasks; and tasks are also frames - But pure frames are not accepted!) + ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer ; /// container for ALL Listener + css::uno::Reference< css::frame::XFrames > m_xFramesHelper ; /// helper for XFrames, XIndexAccess, XElementAccess and implementation of a childcontainer! css::uno::Reference< css::frame::XDispatchProvider > m_xDispatchHelper ; /// helper to dispatch something for new tasks, created by "_blank"! ELoadState m_eLoadState ; /// hold information about state of asynchron loading of component for loadComponentFromURL()! css::uno::Reference< css::frame::XFrame > m_xLastFrame ; /// last target of "loadComponentFromURL()"! css::uno::Any m_aInteractionRequest ; - sal_Bool m_bSuspendQuickstartVeto ; /// don't ask quickstart for a veto - SvtCommandOptions m_aCommandOptions ; /// ref counted class to support disabling commands defined by configuration file + sal_Bool m_bSuspendQuickstartVeto ; /// don't ask quickstart for a veto + SvtCommandOptions m_aCommandOptions ; /// ref counted class to support disabling commands defined by configuration file ::rtl::OUString m_sName ; ::rtl::OUString m_sTitle ; css::uno::Reference< css::frame::XDispatchRecorderSupplier > m_xDispatchRecorderSupplier ; @@ -506,8 +506,8 @@ class Desktop : // interfaces css::uno::Reference< css::frame::XUntitledNumbers > m_xTitleNumberGenerator; -}; // class Desktop +}; // class Desktop -} // namespace framework +} // namespace framework -#endif // #ifndef __FRAMEWORK_SERVICES_DESKTOP_HXX_ +#endif // #ifndef __FRAMEWORK_SERVICES_DESKTOP_HXX_ diff --git a/framework/inc/services/detectorfactory.hxx b/framework/inc/services/detectorfactory.hxx index 2a54a8012434..6fbd0f30afb5 100644 --- a/framework/inc/services/detectorfactory.hxx +++ b/framework/inc/services/detectorfactory.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -91,15 +91,15 @@ namespace framework{ /// @NOHTML class DetectorFactory : // interfaces - public css::lang::XTypeProvider , - public css::lang::XServiceInfo , - public css::lang::XMultiServiceFactory , - public css::container::XNameContainer , // => XNameReplace => XNameAccess => XElementAccess - public css::util::XFlushable , + public css::lang::XTypeProvider , + public css::lang::XServiceInfo , + public css::lang::XMultiServiceFactory , + public css::container::XNameContainer , // => XNameReplace => XNameAccess => XElementAccess + public css::util::XFlushable , // base classes // Order is neccessary for right initialization of it! private ThreadHelpBase , - public ::cppu::OWeakObject + public ::cppu::OWeakObject { //------------------------------------------- // member diff --git a/framework/inc/services/dispatchhelper.hxx b/framework/inc/services/dispatchhelper.hxx index b50e0f3ce5ad..0d5c2f097d9d 100644 --- a/framework/inc/services/dispatchhelper.hxx +++ b/framework/inc/services/dispatchhelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/inc/services/frame.hxx b/framework/inc/services/frame.hxx index 183b49d1f34f..6c8a6ed4dd58 100644 --- a/framework/inc/services/frame.hxx +++ b/framework/inc/services/frame.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_SERVICES_FRAME_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <classes/framecontainer.hxx> @@ -50,7 +50,7 @@ #include <general.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/frame/XDispatchInformationProvider.hpp> #include <com/sun/star/frame/XComponentLoader.hpp> @@ -81,7 +81,7 @@ #include <com/sun/star/frame/XLayoutManager.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <unotools/cmdoptions.hxx> #include <cppuhelper/interfacecontainer.hxx> @@ -89,40 +89,40 @@ #include <rtl/string.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// exported const +// exported const //_________________________________________________________________________________________________________________ // This enum can be used to set differnt active states of frames enum EActiveState { - E_INACTIVE , // I'am not a member of active path in tree and i don't have the focus. - E_ACTIVE , // I'am in the middle of an active path in tree and i don't have the focus. - E_FOCUS // I have the focus now. I must a member of an active path! + E_INACTIVE , // I'am not a member of active path in tree and i don't have the focus. + E_ACTIVE , // I'am in the middle of an active path in tree and i don't have the focus. + E_FOCUS // I have the focus now. I must a member of an active path! }; //_________________________________________________________________________________________________________________ -// exported definitions +// exported definitions //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** - @short implements a normal frame of hierarchy + @short implements a normal frame of hierarchy @descr An instance of these class can be a normal node in frame tree. A frame support influencing of his subtree, find of subframes, activate- and deactivate-mechanism as well as set/get of a frame window, component or controller. - @attention This implementation supports three states: a)uninitialized, b)working, c)disposed + @attention This implementation supports three states: a)uninitialized, b)working, c)disposed If you call wrong methods in modes a) or c) ... you will get some exceptions. How you should work with this service: - i) create it by using "xServiceManager->createInstance(...)" - ii) call XInitialization::initialize() with a valid window reference or use createInstanceWithArguments() at i) - iii) works with object - iv) dispose object by calling XComponent::dispose() + i) create it by using "xServiceManager->createInstance(...)" + ii) call XInitialization::initialize() with a valid window reference or use createInstanceWithArguments() at i) + iii) works with object + iv) dispose object by calling XComponent::dispose() After iv) all further requests are rejected by exceptions! (DisposedException) @base ThreadHelpBase @@ -135,21 +135,21 @@ enum EActiveState @base OWeakObject provides the refcount and XInterface, XWeak - @devstatus ready to use - @threadsafe yes + @devstatus ready to use + @threadsafe yes @modified 04.10.2004 10:47, as96863 *//*-*************************************************************************************************************/ -class Frame : // interfaces - public css::lang::XTypeProvider , - public css::lang::XServiceInfo , - public css::frame::XFramesSupplier , // => XFrame => XComponent - public css::frame::XDispatchProvider , - public css::frame::XDispatchProviderInterception , - public css::frame::XDispatchInformationProvider , - public css::task::XStatusIndicatorFactory , - public css::awt::XWindowListener , // => XEventListener - public css::awt::XTopWindowListener , - public css::awt::XFocusListener , +class Frame : // interfaces + public css::lang::XTypeProvider , + public css::lang::XServiceInfo , + public css::frame::XFramesSupplier , // => XFrame => XComponent + public css::frame::XDispatchProvider , + public css::frame::XDispatchProviderInterception , + public css::frame::XDispatchInformationProvider , + public css::task::XStatusIndicatorFactory , + public css::awt::XWindowListener , // => XEventListener + public css::awt::XTopWindowListener , + public css::awt::XFocusListener , public css::document::XActionLockable , public css::util::XCloseable , // => XCloseBroadcaster public css::frame::XComponentLoader , @@ -160,22 +160,22 @@ class Frame : // interfaces public ThreadHelpBase , public TransactionBase , public PropertySetHelper , // helper implements ThreadHelpbase, TransactionBase, XPropertySet, XPropertySetInfo - public ::cppu::OWeakObject // helper implements XInterface, XWeak + public ::cppu::OWeakObject // helper implements XInterface, XWeak { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: //--------------------------------------------------------------------------------------------------------- - // constructor / destructor + // constructor / destructor //--------------------------------------------------------------------------------------------------------- - Frame( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ); - virtual ~Frame( ); + Frame( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ); + virtual ~Frame( ); //--------------------------------------------------------------------------------------------------------- - // XInterface, XTypeProvider, XServiceInfo + // XInterface, XTypeProvider, XServiceInfo //--------------------------------------------------------------------------------------------------------- FWK_DECLARE_XINTERFACE FWK_DECLARE_XTYPEPROVIDER @@ -193,100 +193,100 @@ class Frame : // interfaces //--------------------------------------------------------------------------------------------------------- - // XFramesSupplier + // XFramesSupplier //--------------------------------------------------------------------------------------------------------- - virtual css::uno::Reference< css::frame::XFrames > SAL_CALL getFrames ( ) throw( css::uno::RuntimeException ); - virtual css::uno::Reference< css::frame::XFrame > SAL_CALL getActiveFrame ( ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL setActiveFrame ( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException ); + virtual css::uno::Reference< css::frame::XFrames > SAL_CALL getFrames ( ) throw( css::uno::RuntimeException ); + virtual css::uno::Reference< css::frame::XFrame > SAL_CALL getActiveFrame ( ) throw( css::uno::RuntimeException ); + virtual void SAL_CALL setActiveFrame ( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException ); //--------------------------------------------------------------------------------------------------------- - // XFrame + // XFrame //--------------------------------------------------------------------------------------------------------- - virtual void SAL_CALL initialize ( const css::uno::Reference< css::awt::XWindow >& xWindow ) throw( css::uno::RuntimeException ); - virtual css::uno::Reference< css::awt::XWindow > SAL_CALL getContainerWindow ( ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL setCreator ( const css::uno::Reference< css::frame::XFramesSupplier >& xCreator ) throw( css::uno::RuntimeException ); - virtual css::uno::Reference< css::frame::XFramesSupplier > SAL_CALL getCreator ( ) throw( css::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getName ( ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL setName ( const ::rtl::OUString& sName ) throw( css::uno::RuntimeException ); - virtual css::uno::Reference< css::frame::XFrame > SAL_CALL findFrame ( const ::rtl::OUString& sTargetFrameName , - sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException ); - virtual sal_Bool SAL_CALL isTop ( ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL activate ( ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL deactivate ( ) throw( css::uno::RuntimeException ); - virtual sal_Bool SAL_CALL isActive ( ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL contextChanged ( ) throw( css::uno::RuntimeException ); - virtual sal_Bool SAL_CALL setComponent ( const css::uno::Reference< css::awt::XWindow >& xComponentWindow , - const css::uno::Reference< css::frame::XController >& xController ) throw( css::uno::RuntimeException ); - virtual css::uno::Reference< css::awt::XWindow > SAL_CALL getComponentWindow ( ) throw( css::uno::RuntimeException ); - virtual css::uno::Reference< css::frame::XController > SAL_CALL getController ( ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL addFrameActionListener ( const css::uno::Reference< css::frame::XFrameActionListener >& xListener ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL removeFrameActionListener ( const css::uno::Reference< css::frame::XFrameActionListener >& xListener ) throw( css::uno::RuntimeException ); + virtual void SAL_CALL initialize ( const css::uno::Reference< css::awt::XWindow >& xWindow ) throw( css::uno::RuntimeException ); + virtual css::uno::Reference< css::awt::XWindow > SAL_CALL getContainerWindow ( ) throw( css::uno::RuntimeException ); + virtual void SAL_CALL setCreator ( const css::uno::Reference< css::frame::XFramesSupplier >& xCreator ) throw( css::uno::RuntimeException ); + virtual css::uno::Reference< css::frame::XFramesSupplier > SAL_CALL getCreator ( ) throw( css::uno::RuntimeException ); + virtual ::rtl::OUString SAL_CALL getName ( ) throw( css::uno::RuntimeException ); + virtual void SAL_CALL setName ( const ::rtl::OUString& sName ) throw( css::uno::RuntimeException ); + virtual css::uno::Reference< css::frame::XFrame > SAL_CALL findFrame ( const ::rtl::OUString& sTargetFrameName , + sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException ); + virtual sal_Bool SAL_CALL isTop ( ) throw( css::uno::RuntimeException ); + virtual void SAL_CALL activate ( ) throw( css::uno::RuntimeException ); + virtual void SAL_CALL deactivate ( ) throw( css::uno::RuntimeException ); + virtual sal_Bool SAL_CALL isActive ( ) throw( css::uno::RuntimeException ); + virtual void SAL_CALL contextChanged ( ) throw( css::uno::RuntimeException ); + virtual sal_Bool SAL_CALL setComponent ( const css::uno::Reference< css::awt::XWindow >& xComponentWindow , + const css::uno::Reference< css::frame::XController >& xController ) throw( css::uno::RuntimeException ); + virtual css::uno::Reference< css::awt::XWindow > SAL_CALL getComponentWindow ( ) throw( css::uno::RuntimeException ); + virtual css::uno::Reference< css::frame::XController > SAL_CALL getController ( ) throw( css::uno::RuntimeException ); + virtual void SAL_CALL addFrameActionListener ( const css::uno::Reference< css::frame::XFrameActionListener >& xListener ) throw( css::uno::RuntimeException ); + virtual void SAL_CALL removeFrameActionListener ( const css::uno::Reference< css::frame::XFrameActionListener >& xListener ) throw( css::uno::RuntimeException ); //--------------------------------------------------------------------------------------------------------- - // XComponent + // XComponent //--------------------------------------------------------------------------------------------------------- - virtual void SAL_CALL dispose ( ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL addEventListener ( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL removeEventListener ( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw( css::uno::RuntimeException ); + virtual void SAL_CALL dispose ( ) throw( css::uno::RuntimeException ); + virtual void SAL_CALL addEventListener ( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw( css::uno::RuntimeException ); + virtual void SAL_CALL removeEventListener ( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw( css::uno::RuntimeException ); //--------------------------------------------------------------------------------------------------------- - // XStatusIndicatorFactory + // XStatusIndicatorFactory //--------------------------------------------------------------------------------------------------------- - virtual css::uno::Reference< css::task::XStatusIndicator > SAL_CALL createStatusIndicator ( ) throw( css::uno::RuntimeException ); + virtual css::uno::Reference< css::task::XStatusIndicator > SAL_CALL createStatusIndicator ( ) throw( css::uno::RuntimeException ); //--------------------------------------------------------------------------------------------------------- - // XDispatchProvider + // XDispatchProvider //--------------------------------------------------------------------------------------------------------- - virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch ( const css::util::URL& aURL , - const ::rtl::OUString& sTargetFrameName , - sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException ); + virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch ( const css::util::URL& aURL , + const ::rtl::OUString& sTargetFrameName , + sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException ); virtual css::uno::Sequence< - css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches ( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) throw( css::uno::RuntimeException ); + css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches ( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) throw( css::uno::RuntimeException ); //--------------------------------------------------------------------------------------------------------- - // XDispatchProviderInterception + // XDispatchProviderInterception //--------------------------------------------------------------------------------------------------------- - virtual void SAL_CALL registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL releaseDispatchProviderInterceptor ( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor ) throw( css::uno::RuntimeException ); + virtual void SAL_CALL registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor ) throw( css::uno::RuntimeException ); + virtual void SAL_CALL releaseDispatchProviderInterceptor ( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor ) throw( css::uno::RuntimeException ); //--------------------------------------------------------------------------------------------------------- - // XDispatchInformationProvider + // XDispatchInformationProvider //--------------------------------------------------------------------------------------------------------- virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedCommandGroups ( ) throw (css::uno::RuntimeException); virtual css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation(sal_Int16 nCommandGroup) throw (css::uno::RuntimeException); //--------------------------------------------------------------------------------------------------------- - // XWindowListener + // XWindowListener // Attention: windowResized() and windowShown() are implement only! All other are empty! //--------------------------------------------------------------------------------------------------------- - virtual void SAL_CALL windowResized ( const css::awt::WindowEvent& aEvent ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL windowMoved ( const css::awt::WindowEvent& /*aEvent*/ ) throw( css::uno::RuntimeException ) {}; + virtual void SAL_CALL windowResized ( const css::awt::WindowEvent& aEvent ) throw( css::uno::RuntimeException ); + virtual void SAL_CALL windowMoved ( const css::awt::WindowEvent& /*aEvent*/ ) throw( css::uno::RuntimeException ) {}; virtual void SAL_CALL windowShown ( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException ); virtual void SAL_CALL windowHidden ( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException ); //--------------------------------------------------------------------------------------------------------- - // XFocusListener - // Attention: focusLost() not implemented yet! + // XFocusListener + // Attention: focusLost() not implemented yet! //--------------------------------------------------------------------------------------------------------- - virtual void SAL_CALL focusGained ( const css::awt::FocusEvent& aEvent ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL focusLost ( const css::awt::FocusEvent& /*aEvent*/ ) throw( css::uno::RuntimeException ) {}; + virtual void SAL_CALL focusGained ( const css::awt::FocusEvent& aEvent ) throw( css::uno::RuntimeException ); + virtual void SAL_CALL focusLost ( const css::awt::FocusEvent& /*aEvent*/ ) throw( css::uno::RuntimeException ) {}; //--------------------------------------------------------------------------------------------------------- - // XTopWindowListener + // XTopWindowListener // Attention: windowActivated(), windowDeactivated() and windowClosing() are implement only! All other are empty! //--------------------------------------------------------------------------------------------------------- - virtual void SAL_CALL windowActivated ( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL windowDeactivated ( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL windowOpened ( const css::lang::EventObject& /*aEvent*/ ) throw( css::uno::RuntimeException ) {}; + virtual void SAL_CALL windowActivated ( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException ); + virtual void SAL_CALL windowDeactivated ( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException ); + virtual void SAL_CALL windowOpened ( const css::lang::EventObject& /*aEvent*/ ) throw( css::uno::RuntimeException ) {}; virtual void SAL_CALL windowClosing ( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException ); virtual void SAL_CALL windowClosed ( const css::lang::EventObject& /*aEvent*/ ) throw( css::uno::RuntimeException ) {}; - virtual void SAL_CALL windowMinimized ( const css::lang::EventObject& /*aEvent*/ ) throw( css::uno::RuntimeException ) {}; - virtual void SAL_CALL windowNormalized ( const css::lang::EventObject& /*aEvent*/ ) throw( css::uno::RuntimeException ) {}; + virtual void SAL_CALL windowMinimized ( const css::lang::EventObject& /*aEvent*/ ) throw( css::uno::RuntimeException ) {}; + virtual void SAL_CALL windowNormalized ( const css::lang::EventObject& /*aEvent*/ ) throw( css::uno::RuntimeException ) {}; //--------------------------------------------------------------------------------------------------------- // XEventListener //--------------------------------------------------------------------------------------------------------- - virtual void SAL_CALL disposing ( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException ); + virtual void SAL_CALL disposing ( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException ); //--------------------------------------------------------------------------------------------------------- // XActionLockable @@ -322,7 +322,7 @@ class Frame : // interfaces virtual void SAL_CALL removeTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListenr ) throw (css::uno::RuntimeException); //--------------------------------------------------------------------------------------------------------- - // PropertySetHelper => XPropertySet, XPropertySetInfo + // PropertySetHelper => XPropertySet, XPropertySetInfo //--------------------------------------------------------------------------------------------------------- private: @@ -336,14 +336,14 @@ class Frame : // interfaces sal_Int32 nHandle ); //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: /*-****************************************************************************************************//** - @short helper methods - @descr Follow methods are needed at different points of our code (more then ones!). + @short helper methods + @descr Follow methods are needed at different points of our code (more then ones!). @attention Threadsafe methods are signed by "implts_..."! *//*-*****************************************************************************************************/ @@ -356,7 +356,7 @@ class Frame : // interfaces void implts_stopWindowListening ( ); void implts_saveWindowAttributes ( ); void implts_checkSuicide ( ); - void implts_forgetSubFrames ( ); + void implts_forgetSubFrames ( ); DECL_LINK( implts_windowClosing, void* ); css::uno::Reference< css::awt::XTopWindow > impl_searchTopWindow ( const css::uno::Reference< css::awt::XWindow >& xWindow ); @@ -368,26 +368,26 @@ class Frame : // interfaces static const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescriptor( ); //------------------------------------------------------------------------------------------------------------- - // debug methods - // (should be private everyway!) + // debug methods + // (should be private everyway!) //------------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short debug-method to check incoming parameter of some other mehods of this class - @descr The following methods are used to check parameters for other methods + @short debug-method to check incoming parameter of some other mehods of this class + @descr The following methods are used to check parameters for other methods of this class. The return value is used directly for an ASSERT(...). - @attention This methods are static and can't use our member directly! It's better for threadsafe code... + @attention This methods are static and can't use our member directly! It's better for threadsafe code... because we call it with references or pointer to check variables ... and must make it safe by himself! - @seealso ASSERTs in implementation! + @seealso ASSERTs in implementation! - @param references to checking variables - @return sal_True ,on invalid parameter - @return sal_False ,otherwise + @param references to checking variables + @return sal_True ,on invalid parameter + @return sal_False ,otherwise - @onerror We return sal_True + @onerror We return sal_True *//*-*****************************************************************************************************/ #ifdef ENABLE_ASSERTIONS @@ -406,11 +406,11 @@ class Frame : // interfaces static sal_Bool implcp_windowDeactivated ( const css::lang::EventObject& aEvent ); static sal_Bool implcp_disposing ( const css::lang::EventObject& aEvent ); - #endif // #ifdef ENABLE_ASSERTIONS + #endif // #ifdef ENABLE_ASSERTIONS //************************************************************************************************************* - // variables - // -threadsafe by own read/write lock "m_aLock" + // variables + // -threadsafe by own read/write lock "m_aLock" //************************************************************************************************************* private: @@ -473,8 +473,8 @@ class Frame : // interfaces return m_xParent; } -}; // class Frame +}; // class Frame -} // namespace framework +} // namespace framework -#endif // #ifndef __FRAMEWORK_SERVICES_FRAME_HXX_ +#endif // #ifndef __FRAMEWORK_SERVICES_FRAME_HXX_ diff --git a/framework/inc/services/frameloaderfactory.hxx b/framework/inc/services/frameloaderfactory.hxx index 6162ec4eeb79..5908e04cd959 100644 --- a/framework/inc/services/frameloaderfactory.hxx +++ b/framework/inc/services/frameloaderfactory.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_SERVICES_FRAMELOADERFACTORY_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <classes/filtercache.hxx> @@ -42,7 +42,7 @@ #include <general.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/lang/XInitialization.hpp> @@ -52,309 +52,309 @@ #include <com/sun/star/io/XInputStream.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/implbase3.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// exported const +// exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// exported definitions +// exported definitions //_________________________________________________________________________________________________________________ struct tIMPLExtractedArguments { - ::rtl::OUString sMimeType ; - sal_Int32 nFlags ; - ::rtl::OUString sFilterName ; - sal_Int32 nClipboardFormat ; - ::rtl::OUString sDetectService ; - css::uno::Reference< css::io::XInputStream > xInputStream ; - - sal_Int32 nValidMask ; + ::rtl::OUString sMimeType ; + sal_Int32 nFlags ; + ::rtl::OUString sFilterName ; + sal_Int32 nClipboardFormat ; + ::rtl::OUString sDetectService ; + css::uno::Reference< css::io::XInputStream > xInputStream ; + + sal_Int32 nValidMask ; }; /*-************************************************************************************************************//** - @short factory to create frameloader-objects - @descr These class can be used to create new loader for specified contents. + @short factory to create frameloader-objects + @descr These class can be used to create new loader for specified contents. We use cached values of the registry to lay down, wich frameloader match a given URL or filtername. To do this, we use the XMultiServiceFactory-interface. - @ATTENTION In a specialmode of these implementation we support a simple filterdetection. + @ATTENTION In a specialmode of these implementation we support a simple filterdetection. But there is no special interface. You must call some existing methods in another context! see createInstanceWithArguments() fo rfurther informations! - @implements XInterface + @implements XInterface XTypeProvider XServiceInfo XMultiServiceFactory XNameAccess XElementAccess - @base ThreadHelpBase + @base ThreadHelpBase OWeakObject - @devstatus deprecated + @devstatus deprecated *//*-*************************************************************************************************************/ -class FrameLoaderFactory : public ThreadHelpBase , // Struct for right initalization of mutex member! Mst first of baseclasses +class FrameLoaderFactory : public ThreadHelpBase , // Struct for right initalization of mutex member! Mst first of baseclasses public ::cppu::WeakImplHelper3< ::com::sun::star::lang::XServiceInfo,::com::sun::star::lang::XMultiServiceFactory,::com::sun::star::container::XNameAccess > { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: //--------------------------------------------------------------------------------------------------------- - // constructor / destructor + // constructor / destructor //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short standard constructor - @descr Initialize a new instance and fill the registrycache with values. + @short standard constructor + @descr Initialize a new instance and fill the registrycache with values. To do this - xFactory must be valid! - @seealso class RegistryCache - @seealso member m_aRegistryCache + @seealso class RegistryCache + @seealso member m_aRegistryCache - @param "xFactory", factory which has created us. - @return - + @param "xFactory", factory which has created us. + @return - - @onerror An ASSERTION is thrown in debug version, if xFactory is invalid or cache can't filled. + @onerror An ASSERTION is thrown in debug version, if xFactory is invalid or cache can't filled. *//*-*****************************************************************************************************/ FrameLoaderFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ); /*-****************************************************************************************************//** - @short standard destructor to delete instance - @descr We use it to clear ouer cache. + @short standard destructor to delete instance + @descr We use it to clear ouer cache. - @seealso class RegistryCache + @seealso class RegistryCache - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual ~FrameLoaderFactory(); //--------------------------------------------------------------------------------------------------------- - // XInterface, XTypeProvider, XServiceInfo + // XInterface, XTypeProvider, XServiceInfo //--------------------------------------------------------------------------------------------------------- DECLARE_XSERVICEINFO //--------------------------------------------------------------------------------------------------------- - // XMultiServiceFactory + // XMultiServiceFactory //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short create a new frameloder (without arguments!) - @descr We search for an agreement between given type name and our cache-content. + @short create a new frameloder (without arguments!) + @descr We search for an agreement between given type name and our cache-content. If we found some information, we create the registered frameloader for these type. Otherwise - we return NULL. We search from begin to end of internal loader list! - @seealso method impl_createFrameLoader() - @seealso method createInstanceWithArguments() + @seealso method impl_createFrameLoader() + @seealso method createInstanceWithArguments() - @param "sTypeName", type name of a document to filter, open or save. - @return A reference to a new created frameloader. + @param "sTypeName", type name of a document to filter, open or save. + @return A reference to a new created frameloader. - @onerror A null reference is returned. + @onerror A null reference is returned. *//*-*****************************************************************************************************/ - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& sTypeName ) throw( css::uno::Exception , - css::uno::RuntimeException ); + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& sTypeName ) throw( css::uno::Exception , + css::uno::RuntimeException ); /*-****************************************************************************************************//** - @short create a new frameloder - @descr We search for an agreement between given type name and our cache-content. + @short create a new frameloder + @descr We search for an agreement between given type name and our cache-content. If we found some information, we create the registered frameloader for these type. Otherwise - we return NULL. You can give us some optional arguments to influence our search! - @seealso method impl_createFrameLoader() - @seealso method createInstance() + @seealso method impl_createFrameLoader() + @seealso method createInstance() - @param "sTypeName", type name of a document to filter, open or save. - @param "seqArguments", list of optional arguments for initializing of new frameloader. - @return A reference to a new created frameloader. + @param "sTypeName", type name of a document to filter, open or save. + @param "seqArguments", list of optional arguments for initializing of new frameloader. + @return A reference to a new created frameloader. - @onerror A null reference is returned. + @onerror A null reference is returned. *//*-*****************************************************************************************************/ - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::rtl::OUString& sTypeName , - const css::uno::Sequence< css::uno::Any >& seqArguments) throw( css::uno::Exception , + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::rtl::OUString& sTypeName , + const css::uno::Sequence< css::uno::Any >& seqArguments) throw( css::uno::Exception , css::uno::RuntimeException); /*-****************************************************************************************************//** - @short not supported - @descr Please use XNameAcces instead of these! + @short not supported + @descr Please use XNameAcces instead of these! - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames() throw( css::uno::RuntimeException ); //--------------------------------------------------------------------------------------------------------- - // XNameAccess + // XNameAccess //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short return properties of registered frame loader specified by his implementation name - @descr Use these method to get all informations about our internal loader cache + @short return properties of registered frame loader specified by his implementation name + @descr Use these method to get all informations about our internal loader cache and a special frame loader. We return a Sequence< PropertyValue > in an Any packed as result. structure of return value: - [0].Name = "Types" - [0].Value = list of supported types of these loader as [sequence< oustring >] + [0].Name = "Types" + [0].Value = list of supported types of these loader as [sequence< oustring >] - [1].Name = "UIName" - [1].Value = localized name of loader as [string] + [1].Name = "UIName" + [1].Value = localized name of loader as [string] - @seealso method getElementNames() - @seealso method hasByName() + @seealso method getElementNames() + @seealso method hasByName() - @param "sName", the name of searched frame loader (use getElementNames() to get it!) - @return A Sequence< PropertyValue > packed in an Any. + @param "sName", the name of searched frame loader (use getElementNames() to get it!) + @return A Sequence< PropertyValue > packed in an Any. - @onerror If given name not exist a NoSuchElementException is thrown. + @onerror If given name not exist a NoSuchElementException is thrown. *//*-*****************************************************************************************************/ - virtual css::uno::Any SAL_CALL getByName( const ::rtl::OUString& sName ) throw( css::container::NoSuchElementException , - css::lang::WrappedTargetException , - css::uno::RuntimeException ); + virtual css::uno::Any SAL_CALL getByName( const ::rtl::OUString& sName ) throw( css::container::NoSuchElementException , + css::lang::WrappedTargetException , + css::uno::RuntimeException ); /*-****************************************************************************************************//** - @short return list of all well known loader names from configuration - @descr Use these method to get all names of well known loader. + @short return list of all well known loader names from configuration + @descr Use these method to get all names of well known loader. You can use it to get the properties of a loader by calling getByName()! - @seealso method getByName() - @seealso method hasByName() + @seealso method getByName() + @seealso method hasByName() - @param - - @return A list of well known loader. Is static at runtime! + @param - + @return A list of well known loader. Is static at runtime! - @onerror No error should occure. + @onerror No error should occure. *//*-*****************************************************************************************************/ virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw( css::uno::RuntimeException ); /*-****************************************************************************************************//** - @short check if searched frame loader exist in configuration - @descr Normaly nobody need these method realy (use getElementNames() in combination with getByName()). + @short check if searched frame loader exist in configuration + @descr Normaly nobody need these method realy (use getElementNames() in combination with getByName()). We guarantee correctness of these mechanism. There is no reason to check for existing elements then ... but if you have an unknwon name and has no fun to search it in returned sequence ... you can call these ... - @seealso method getByName() - @seealso method getElementNames() + @seealso method getByName() + @seealso method getElementNames() - @param "sName", implementation name of searched frame loader - @return sal_True if loader exist, sal_False otherwise. + @param "sName", implementation name of searched frame loader + @return sal_True if loader exist, sal_False otherwise. - @onerror No error should occure. + @onerror No error should occure. *//*-*****************************************************************************************************/ virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& sName ) throw( css::uno::RuntimeException ); //--------------------------------------------------------------------------------------------------------- - // XElementAccess + // XElementAccess //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short return the type of retrun value of method XNameAccess::getByName() - @descr In these implementation its a Sequence< PropertyValue > everytime! + @short return the type of retrun value of method XNameAccess::getByName() + @descr In these implementation its a Sequence< PropertyValue > everytime! - @seealso description of interface XNameAccess + @seealso description of interface XNameAccess - @param - - @return Type of Sequence< PropertyValue >. + @param - + @return Type of Sequence< PropertyValue >. - @onerror No error should occure. + @onerror No error should occure. *//*-*****************************************************************************************************/ virtual css::uno::Type SAL_CALL getElementType() throw( css::uno::RuntimeException ); /*-****************************************************************************************************//** - @short return state if informations about frame loader available - @descr If these method return false - no information could'nt read from configuration ... + @short return state if informations about frame loader available + @descr If these method return false - no information could'nt read from configuration ... I think nothing will work then. Normaly we return TRUE! - @seealso class FilterCache! + @seealso class FilterCache! - @param - - @return sal_True if information available, sal_False otherwise. + @param - + @return sal_True if information available, sal_False otherwise. - @onerror No error should occure. + @onerror No error should occure. *//*-*****************************************************************************************************/ virtual sal_Bool SAL_CALL hasElements() throw( css::uno::RuntimeException ); //------------------------------------------------------------------------------------------------------------- - // protected methods + // protected methods //------------------------------------------------------------------------------------------------------------- protected: //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: /*-****************************************************************************************************//** - @short try to set configuration properties at created loader - @descr We support the old async. loader interface ( XFrameLoader ) and the new one XSynchronousFrameLoader. + @short try to set configuration properties at created loader + @descr We support the old async. loader interface ( XFrameLoader ) and the new one XSynchronousFrameLoader. The new one should implement a property set on which we can set his configuration values! We try to cast given loader to these interface - if it's exist we set the values - otherwise not! - @seealso service FrameLoader - @seealso service SynchronousFrameLoader + @seealso service FrameLoader + @seealso service SynchronousFrameLoader - @param "xLoader" loader with generic XInterface! (We don't know before which service type is used!) - @param "pLoaderInfo" configuration structure of these loader. - @return - + @param "xLoader" loader with generic XInterface! (We don't know before which service type is used!) + @param "pLoaderInfo" configuration structure of these loader. + @return - - @onerror No error should occure. + @onerror No error should occure. *//*-*****************************************************************************************************/ void impl_initializeLoader( css::uno::Reference< css::uno::XInterface >& xLoader, const Loader& pLoaderInfo ); //------------------------------------------------------------------------------------------------------------- - // debug methods - // (should be private everyway!) + // debug methods + // (should be private everyway!) //------------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short debug-method to check incoming parameter of some other mehods of this class - @descr The following methods are used to check parameters for other methods + @short debug-method to check incoming parameter of some other mehods of this class + @descr The following methods are used to check parameters for other methods of this class. The return value is used directly for an ASSERT(...). - @seealso ASSERTs in implementation! + @seealso ASSERTs in implementation! - @param references to checking variables - @return sal_False ,on invalid parameter - @return sal_True ,otherwise + @param references to checking variables + @return sal_False ,on invalid parameter + @return sal_True ,otherwise - @onerror - + @onerror - *//*-*****************************************************************************************************/ @@ -362,27 +362,27 @@ class FrameLoaderFactory : public ThreadHelpBase , // Struct for right in private: - static sal_Bool impldbg_checkParameter_FrameLoaderFactory ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ); - static sal_Bool impldbg_checkParameter_createInstance ( const ::rtl::OUString& sTypeName ); - static sal_Bool impldbg_checkParameter_createInstanceWithArguments ( const ::rtl::OUString& sTypeName , - const css::uno::Sequence< css::uno::Any >& seqArguments); - static sal_Bool impldbg_checkParameter_getByName ( const ::rtl::OUString& sName ); - static sal_Bool impldbg_checkParameter_hasByName ( const ::rtl::OUString& sName ); + static sal_Bool impldbg_checkParameter_FrameLoaderFactory ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ); + static sal_Bool impldbg_checkParameter_createInstance ( const ::rtl::OUString& sTypeName ); + static sal_Bool impldbg_checkParameter_createInstanceWithArguments ( const ::rtl::OUString& sTypeName , + const css::uno::Sequence< css::uno::Any >& seqArguments); + static sal_Bool impldbg_checkParameter_getByName ( const ::rtl::OUString& sName ); + static sal_Bool impldbg_checkParameter_hasByName ( const ::rtl::OUString& sName ); - #endif // #ifdef ENABLE_ASSERTIONS + #endif // #ifdef ENABLE_ASSERTIONS //------------------------------------------------------------------------------------------------------------- - // private variables - // (should be private everyway!) + // private variables + // (should be private everyway!) //------------------------------------------------------------------------------------------------------------- private: - css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory ; - FilterCache m_aCache ; + css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory ; + FilterCache m_aCache ; -}; // class FrameLoaderFactory +}; // class FrameLoaderFactory -} // namespace framework +} // namespace framework -#endif // #ifndef __FRAMEWORK_SERVICES_FRAMELOADERFACTORY_HXX_ +#endif // #ifndef __FRAMEWORK_SERVICES_FRAMELOADERFACTORY_HXX_ diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx index 680ee5303f60..2ccba9e7ffde 100644 --- a/framework/inc/services/layoutmanager.hxx +++ b/framework/inc/services/layoutmanager.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ #include <vector> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> #include <threadhelp/resetableguard.hxx> @@ -52,7 +52,7 @@ #include <classes/addonsoptions.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> @@ -73,7 +73,7 @@ #include <com/sun/star/frame/XLayoutManagerEventBroadcaster.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/propshlp.hxx> #include <cppuhelper/implbase9.hxx> @@ -102,21 +102,21 @@ namespace framework class LayoutManager : public LayoutManager_Base , // base classes // Order is neccessary for right initialization! - private ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. + private ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. public ::cppu::OBroadcastHelper , public LayoutManager_PBase { public: enum { DOCKINGAREAS_COUNT = 4 }; - + LayoutManager( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rSMGR ); virtual ~LayoutManager(); - + /** declaration of XInterface, XTypeProvider, XServiceInfo */ FWK_DECLARE_XINTERFACE FWK_DECLARE_XTYPEPROVIDER DECLARE_XSERVICEINFO - + //--------------------------------------------------------------------------------------------------------- // XLayoutManager //--------------------------------------------------------------------------------------------------------- @@ -151,9 +151,9 @@ namespace framework virtual void SAL_CALL doLayout( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isVisible() throw (::com::sun::star::uno::RuntimeException); - + //--------------------------------------------------------------------------------------------------------- - // XInplaceLayout + // XInplaceLayout //--------------------------------------------------------------------------------------------------------- virtual void SAL_CALL setInplaceMenuBar( sal_Int64 pInplaceMenuBarPointer ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL resetInplaceMenuBar( ) throw (::com::sun::star::uno::RuntimeException); @@ -166,15 +166,15 @@ namespace framework virtual void SAL_CALL removeMergedMenuBar( ) throw (::com::sun::star::uno::RuntimeException); //--------------------------------------------------------------------------------------------------------- - // XWindowListener + // XWindowListener //--------------------------------------------------------------------------------------------------------- virtual void SAL_CALL windowResized( const css::awt::WindowEvent& aEvent ) throw( css::uno::RuntimeException ); virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& aEvent ) throw( css::uno::RuntimeException ); virtual void SAL_CALL windowShown( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException ); virtual void SAL_CALL windowHidden( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException ); - + //--------------------------------------------------------------------------------------------------------- - // XFrameActionListener + // XFrameActionListener //--------------------------------------------------------------------------------------------------------- virtual void SAL_CALL frameAction( const css::frame::FrameActionEvent& aEvent ) throw ( css::uno::RuntimeException ); @@ -183,13 +183,13 @@ namespace framework //--------------------------------------------------------------------------------------------------------- using cppu::OPropertySetHelper::disposing; virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException ); - + //--------------------------------------------------------------------------------------------------------- // XUIConfigurationListener //--------------------------------------------------------------------------------------------------------- virtual void SAL_CALL elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException); //--------------------------------------------------------------------------------------------------------- // XDockableWindowListener @@ -198,7 +198,7 @@ namespace framework virtual ::com::sun::star::awt::DockingData SAL_CALL docking( const ::com::sun::star::awt::DockingEvent& e ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL endDocking( const ::com::sun::star::awt::EndDockingEvent& e ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL prepareToggleFloatingMode( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL toggleFloatingMode( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL toggleFloatingMode( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL closed( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL endPopupMode( const ::com::sun::star::awt::EndPopupModeEvent& e ) throw (::com::sun::star::uno::RuntimeException); @@ -207,7 +207,7 @@ namespace framework //--------------------------------------------------------------------------------------------------------- virtual void SAL_CALL addLayoutManagerEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManagerListener >& aLayoutManagerListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeLayoutManagerEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManagerListener >& aLayoutManagerListener ) throw (::com::sun::star::uno::RuntimeException); - + DECL_LINK( MenuBarClose, MenuBar * ); DECL_LINK( WindowEventListener, VclSimpleEvent* ); @@ -224,8 +224,8 @@ namespace framework }; struct FloatingData { - FloatingData() : m_aPos( LONG_MAX, LONG_MAX ), - m_nLines( 1 ), + FloatingData() : m_aPos( LONG_MAX, LONG_MAX ), + m_nLines( 1 ), m_bIsHorizontal( sal_True ) {} Point m_aPos; @@ -273,14 +273,14 @@ namespace framework m_bStateRead( sal_False ), m_nStyle( BUTTON_SYMBOL ) {} - - UIElement( const rtl::OUString& rName, - const rtl::OUString& rType, + + UIElement( const rtl::OUString& rName, + const rtl::OUString& rType, const com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement >& rUIElement, sal_Bool bFloating = sal_False - ) : m_aType( rType ), + ) : m_aType( rType ), m_aName( rName ), - m_xUIElement( rUIElement ), + m_xUIElement( rUIElement ), m_bFloating( bFloating ), m_bVisible( sal_True ), m_bUserActive( sal_False ), @@ -316,13 +316,13 @@ namespace framework DockedData m_aDockedData; FloatingData m_aFloatingData; }; - + typedef std::vector< UIElement > UIElementVector; - + //--------------------------------------------------------------------------------------------------------- // helper //--------------------------------------------------------------------------------------------------------- - + //--------------------------------------------------------------------------------------------------------- // helper //--------------------------------------------------------------------------------------------------------- @@ -330,7 +330,7 @@ namespace framework void implts_reset( sal_Bool bAttach ); void implts_updateMenuBarClose(); sal_Bool implts_resetMenuBar(); - + void implts_lock(); sal_Bool implts_unlock(); @@ -362,14 +362,14 @@ namespace framework ::com::sun::star::uno::Reference< com::sun::star::awt::XWindowPeer > implts_createToolkitWindow( const ::com::sun::star::uno::Reference< com::sun::star::awt::XWindowPeer >& rParent ); ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > implts_createElement( const rtl::OUString& aName ); rtl::OUString implts_generateGenericAddonToolbarTitle( sal_Int32 nNumber ) const; - + // docking methods ::Rectangle implts_calcHotZoneRect( const ::Rectangle& rRect, sal_Int32 nHotZoneOffset ); void implts_calcDockingPosSize( UIElement& aUIElement, DockingOperation& eDockOperation, ::Rectangle& rTrackingRect, const Point& rMousePos ); DockingOperation implts_determineDockingOperation( ::com::sun::star::ui::DockingArea DockingArea, const ::Rectangle& rRowColRect, const Point& rMousePos ); ::Rectangle implts_getWindowRectFromRowColumn( ::com::sun::star::ui::DockingArea DockingArea, const SingleRowColumnWindowData& rRowColumnWindowData, const ::Point& rMousePos, const rtl::OUString& rExcludeElementName ); - ::Rectangle implts_determineFrontDockingRect( ::com::sun::star::ui::DockingArea eDockingArea, - sal_Int32 nRowCol, + ::Rectangle implts_determineFrontDockingRect( ::com::sun::star::ui::DockingArea eDockingArea, + sal_Int32 nRowCol, const ::Rectangle& rDockedElementRect, const ::rtl::OUString& rMovedElementName, const ::Rectangle& rMovedElementRect ); @@ -377,14 +377,14 @@ namespace framework sal_Int32 nOffset, SingleRowColumnWindowData& rRowColumnWindowData, const ::Size& rContainerSize ); - ::Rectangle implts_calcTrackingAndElementRect( ::com::sun::star::ui::DockingArea eDockingArea, + ::Rectangle implts_calcTrackingAndElementRect( ::com::sun::star::ui::DockingArea eDockingArea, sal_Int32 nRowCol, UIElement& rUIElement, const ::Rectangle& rTrackingRect, const ::Rectangle& rRowColumnRect, const ::Size& rContainerWinSize ); void implts_renumberRowColumnData( ::com::sun::star::ui::DockingArea eDockingArea, DockingOperation eDockingOperation, const UIElement& rUIElement ); - + // layouting methods sal_Bool implts_compareRectangles( const ::com::sun::star::awt::Rectangle& rRect1, const ::com::sun::star::awt::Rectangle& rRect2 ); sal_Bool implts_resizeContainerWindow( const ::com::sun::star::awt::Size& rContainerSize, const ::com::sun::star::awt::Point& rComponentPos ); @@ -392,8 +392,8 @@ namespace framework ::Size implts_getContainerWindowOutputSize(); ::com::sun::star::awt::Rectangle implts_getDockingAreaWindowSizes(); void implts_getDockingAreaElementInfos( ::com::sun::star::ui::DockingArea DockingArea, std::vector< SingleRowColumnWindowData >& rRowColumnsWindowData ); - void implts_getDockingAreaElementInfoOnSingleRowCol( ::com::sun::star::ui::DockingArea, - sal_Int32 nRowCol, + void implts_getDockingAreaElementInfoOnSingleRowCol( ::com::sun::star::ui::DockingArea, + sal_Int32 nRowCol, SingleRowColumnWindowData& rRowColumnWindowData ); ::Point implts_findNextCascadeFloatingPos(); void implts_findNextDockingPos( ::com::sun::star::ui::DockingArea DockingArea, const ::Size& aUIElementSize, ::Point& rVirtualPos, ::Point& rPixelPos ); @@ -401,7 +401,7 @@ namespace framework void implts_setDockingAreaWindowSizes( const com::sun::star::awt::Rectangle& rBorderSpace ); sal_Bool implts_doLayout( sal_Bool bForceRequestBorderSpace, sal_Bool bOuterResize ); void implts_doLayout_notify( sal_Bool bOuterResize ); - + // internal methods to control status/progress bar ::Size implts_getStatusBarSize(); void implts_destroyStatusBar(); @@ -416,10 +416,10 @@ namespace framework sal_Bool implts_hideProgressBar(); void implts_backupProgressBarWrapper(); - void implts_setInplaceMenuBar( + void implts_setInplaceMenuBar( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& xMergedMenuBar ) throw (::com::sun::star::uno::RuntimeException); - void implts_resetInplaceMenuBar() + void implts_resetInplaceMenuBar() throw (::com::sun::star::uno::RuntimeException); void implts_setVisibleState( sal_Bool bShow ); @@ -434,9 +434,9 @@ namespace framework DECL_LINK( OptionsChanged, void* ); DECL_LINK( SettingsChanged, void* ); - + //--------------------------------------------------------------------------------------------------------- - // OPropertySetHelper + // OPropertySetHelper //--------------------------------------------------------------------------------------------------------- virtual sal_Bool SAL_CALL convertFastPropertyValue ( com::sun::star::uno::Any& aConvertedValue , com::sun::star::uno::Any& aOldValue , @@ -513,10 +513,10 @@ namespace framework SvtMiscOptions* m_pMiscOptions; sal_Int16 m_eSymbolsSize; sal_Int16 m_eSymbolsStyle; - Timer m_aAsyncLayoutTimer; + Timer m_aAsyncLayoutTimer; ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; // container for ALL Listener }; - + } // namespace framework #endif // __FRAMEWORK_SERVICES_LAYOUTMANAGER_HXX_ diff --git a/framework/inc/services/license.hxx b/framework/inc/services/license.hxx index 0d4f8735cecf..59e7f036961e 100644 --- a/framework/inc/services/license.hxx +++ b/framework/inc/services/license.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ #include <vector> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> #include <threadhelp/resetableguard.hxx> @@ -50,7 +50,7 @@ #include <uielement/menubarmanager.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> @@ -59,7 +59,7 @@ #include <com/sun/star/util/CloseVetoException.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/propshlp.hxx> #include <cppuhelper/interfacecontainer.hxx> @@ -73,7 +73,7 @@ namespace framework public css::util::XCloseable , // base classes // Order is neccessary for right initialization! - private ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. + private ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. public ::cppu::OWeakObject // => XWeak, XInterface { private: @@ -82,11 +82,11 @@ namespace framework public: License( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rSMGR ); virtual ~License(); - + /** declaration of XInterface, XTypeProvider, XServiceInfo */ FWK_DECLARE_XINTERFACE FWK_DECLARE_XTYPEPROVIDER - DECLARE_XSERVICEINFO + DECLARE_XSERVICEINFO #if 0 DECL_STATIC_LINK( License, Terminate, void* ); @@ -94,7 +94,7 @@ namespace framework /* XJob... - any execute([in] sequence< ::com::sun::star::beans::NamedValue > Arguments ) + any execute([in] sequence< ::com::sun::star::beans::NamedValue > Arguments ) raises( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception ); @@ -106,7 +106,7 @@ namespace framework XCLoseable void close( [in] boolean DeliverOwnership ) raises(CloseVetoException ); */ - virtual void SAL_CALL close(sal_Bool bDeliverOwnership) throw (css::util::CloseVetoException); + virtual void SAL_CALL close(sal_Bool bDeliverOwnership) throw (css::util::CloseVetoException); /* XCloseVroadcaster @@ -117,7 +117,7 @@ namespace framework virtual void SAL_CALL removeCloseListener(const css::uno::Reference< css::util::XCloseListener >& aListener) throw (css::uno::RuntimeException); }; - + } // namespace framework #endif // __FRAMEWORK_SERVICES_LAYOUTMANAGER_HXX_ diff --git a/framework/inc/services/licensedlg.hxx b/framework/inc/services/licensedlg.hxx index ed7083e70c86..2cc63cd5ef76 100644 --- a/framework/inc/services/licensedlg.hxx +++ b/framework/inc/services/licensedlg.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/inc/services/logindialog.hrc b/framework/inc/services/logindialog.hrc index d287b34a2f9f..0d845d273fd8 100644 --- a/framework/inc/services/logindialog.hrc +++ b/framework/inc/services/logindialog.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -25,28 +25,28 @@ * ************************************************************************/ // windows / dialogs -#define RID_DLG_LOGIN 1000 +#define RID_DLG_LOGIN 1000 // controls -#define RID_FI_HEADER 1 -#define RID_FT_LOGINTEXT 2 -#define RID_FT_USERNAME 3 -#define RID_FT_PASSWORD 4 -#define RID_FT_SERVER 5 -#define RID_ED_USERNAME 6 -#define RID_ED_PASSWORD 7 -#define RID_FL_SERVER 8 -#define RID_CB_SERVER 9 -#define RID_FL_PROXYSETTINGS 10 -#define RID_RB_NOPROXY 11 -#define RID_RB_USEBROWSERPROXY 12 -#define RID_RB_USECUSTOMPROXY 13 -#define RID_FT_SECURITYPROXY 15 -#define RID_FT_SECURITYPROXYHOST 16 -#define RID_ED_SECURITYPROXYHOST 17 -#define RID_FT_SECURITYPROXYPORT 18 -#define RID_ED_SECURITYPROXYPORT 19 -#define RID_FL_BUTTONS 20 -#define RID_PB_OK 21 -#define RID_PB_CANCEL 22 -#define RID_PB_ADDITIONALSETTINGS 23 +#define RID_FI_HEADER 1 +#define RID_FT_LOGINTEXT 2 +#define RID_FT_USERNAME 3 +#define RID_FT_PASSWORD 4 +#define RID_FT_SERVER 5 +#define RID_ED_USERNAME 6 +#define RID_ED_PASSWORD 7 +#define RID_FL_SERVER 8 +#define RID_CB_SERVER 9 +#define RID_FL_PROXYSETTINGS 10 +#define RID_RB_NOPROXY 11 +#define RID_RB_USEBROWSERPROXY 12 +#define RID_RB_USECUSTOMPROXY 13 +#define RID_FT_SECURITYPROXY 15 +#define RID_FT_SECURITYPROXYHOST 16 +#define RID_ED_SECURITYPROXYHOST 17 +#define RID_FT_SECURITYPROXYPORT 18 +#define RID_ED_SECURITYPROXYPORT 19 +#define RID_FL_BUTTONS 20 +#define RID_PB_OK 21 +#define RID_PB_CANCEL 22 +#define RID_PB_ADDITIONALSETTINGS 23 diff --git a/framework/inc/services/logindialog.hxx b/framework/inc/services/logindialog.hxx index b50dc6daea90..1469181f13e0 100644 --- a/framework/inc/services/logindialog.hxx +++ b/framework/inc/services/logindialog.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_LOGINDIALOG_LOGINDIALOG_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #ifndef __FRAMEWORK_THREADHELPER_THREADHELPBASE_HXX_ @@ -44,7 +44,7 @@ #include <services/logindialog.hrc> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/awt/XDialog.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> @@ -55,7 +55,7 @@ #include <com/sun/star/util/XFlushable.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <tools/config.hxx> #include <cppuhelper/weak.hxx> @@ -75,269 +75,269 @@ #include <vcl/morebtn.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ -#define ANY ::com::sun::star::uno::Any -#define EXCEPTION ::com::sun::star::uno::Exception -#define ILLEGALARGUMENTEXCEPTION ::com::sun::star::lang::IllegalArgumentException -#define IPROPERTYARRAYHELPER ::cppu::IPropertyArrayHelper -#define OBROADCASTHELPER ::cppu::OBroadcastHelper -#define OPROPERTYSETHELPER ::cppu::OPropertySetHelper -#define OUSTRING ::rtl::OUString -#define OWEAKOBJECT ::cppu::OWeakObject -#define PROPERTY ::com::sun::star::beans::Property -#define REFERENCE ::com::sun::star::uno::Reference -#define RUNTIMEEXCEPTION ::com::sun::star::uno::RuntimeException -#define SEQUENCE ::com::sun::star::uno::Sequence -#define XDIALOG ::com::sun::star::awt::XDialog -#define XMULTISERVICEFACTORY ::com::sun::star::lang::XMultiServiceFactory -#define XPROPERTYSETINFO ::com::sun::star::beans::XPropertySetInfo -#define XSERVICEINFO ::com::sun::star::lang::XServiceInfo -#define XTYPEPROVIDER ::com::sun::star::lang::XTypeProvider -#define PROPERTYVALUE ::com::sun::star::beans::PropertyValue -#define LOCALE ::com::sun::star::lang::Locale +#define ANY ::com::sun::star::uno::Any +#define EXCEPTION ::com::sun::star::uno::Exception +#define ILLEGALARGUMENTEXCEPTION ::com::sun::star::lang::IllegalArgumentException +#define IPROPERTYARRAYHELPER ::cppu::IPropertyArrayHelper +#define OBROADCASTHELPER ::cppu::OBroadcastHelper +#define OPROPERTYSETHELPER ::cppu::OPropertySetHelper +#define OUSTRING ::rtl::OUString +#define OWEAKOBJECT ::cppu::OWeakObject +#define PROPERTY ::com::sun::star::beans::Property +#define REFERENCE ::com::sun::star::uno::Reference +#define RUNTIMEEXCEPTION ::com::sun::star::uno::RuntimeException +#define SEQUENCE ::com::sun::star::uno::Sequence +#define XDIALOG ::com::sun::star::awt::XDialog +#define XMULTISERVICEFACTORY ::com::sun::star::lang::XMultiServiceFactory +#define XPROPERTYSETINFO ::com::sun::star::beans::XPropertySetInfo +#define XSERVICEINFO ::com::sun::star::lang::XServiceInfo +#define XTYPEPROVIDER ::com::sun::star::lang::XTypeProvider +#define PROPERTYVALUE ::com::sun::star::beans::PropertyValue +#define LOCALE ::com::sun::star::lang::Locale #define XFLUSHABLE ::com::sun::star::util::XFlushable #define XFLUSHLISTENER ::com::sun::star::util::XFlushListener //_________________________________________________________________________________________________________________ -// exported const +// exported const //_________________________________________________________________________________________________________________ #ifdef WNT - #define ININAME DECLARE_ASCII("login.ini") + #define ININAME DECLARE_ASCII("login.ini") #elif defined UNIX - #define ININAME DECLARE_ASCII("loginrc") + #define ININAME DECLARE_ASCII("loginrc") #else #error "name of login profile unknown!" #endif -#define UNCPATHSEPERATOR sal_Unicode(0x002F) -#define MAX_SERVERHISTORY 10 - -// Use follow keys in follow order. -// [Global] -// UserName=as -// ActiveServer=2 -// ConnectionType=https -// Language=en-US -// UseProxy=[browser|custom|none] -// SecurityProxy=so-webcache:3128 -// dialog=[big|small] +#define UNCPATHSEPERATOR sal_Unicode(0x002F) +#define MAX_SERVERHISTORY 10 + +// Use follow keys in follow order. +// [Global] +// UserName=as +// ActiveServer=2 +// ConnectionType=https +// Language=en-US +// UseProxy=[browser|custom|none] +// SecurityProxy=so-webcache:3128 +// dialog=[big|small] // -// [DefaultPorts] -// https=8445 -// http=8090 +// [DefaultPorts] +// https=8445 +// http=8090 // -// [ServerHistory] -// Server_1=localhost -// Server_2=munch:7202 -// Server_3=www.xxx.com:8000 - -#define SECTION_GLOBAL "Global" -#define SECTION_DEFAULTPORTS "DefaultPorts" -#define SECTION_SERVERHISTORY "ServerHistory" - -#define SECTION_USERNAME SECTION_GLOBAL -#define SECTION_ACTIVESERVER SECTION_GLOBAL -#define SECTION_CONNECTIONTYPE SECTION_GLOBAL -#define SECTION_LANGUAGE SECTION_GLOBAL -#define SECTION_SECURITYPROXY SECTION_GLOBAL -#define SECTION_DIALOG SECTION_GLOBAL -#define SECTION_HTTP SECTION_DEFAULTPORTS -#define SECTION_HTTPS SECTION_DEFAULTPORTS -#define SECTION_SERVER_X SECTION_SERVERHISTORY - -#define KEY_USERNAME "UserName" -#define KEY_ACTIVESERVER "ActiveServer" -#define KEY_CONNECTIONTYPE "ConnectionType" -#define KEY_LANGUAGE "Language" -#define KEY_SERVER_X "Server_" -#define KEY_SECURITYPROXY "SecurityProxy" -#define KEY_USESECURITYPROXY "UseProxy" -#define KEY_DIALOG "dialog" -#define KEY_HTTP "http" -#define KEY_HTTPS "https" - -#define PROPERTYNAME_CONNECTIONTYPE DECLARE_ASCII("ConnectionType" ) -#define PROPERTYNAME_LANGUAGE DECLARE_ASCII("Language" ) +// [ServerHistory] +// Server_1=localhost +// Server_2=munch:7202 +// Server_3=www.xxx.com:8000 + +#define SECTION_GLOBAL "Global" +#define SECTION_DEFAULTPORTS "DefaultPorts" +#define SECTION_SERVERHISTORY "ServerHistory" + +#define SECTION_USERNAME SECTION_GLOBAL +#define SECTION_ACTIVESERVER SECTION_GLOBAL +#define SECTION_CONNECTIONTYPE SECTION_GLOBAL +#define SECTION_LANGUAGE SECTION_GLOBAL +#define SECTION_SECURITYPROXY SECTION_GLOBAL +#define SECTION_DIALOG SECTION_GLOBAL +#define SECTION_HTTP SECTION_DEFAULTPORTS +#define SECTION_HTTPS SECTION_DEFAULTPORTS +#define SECTION_SERVER_X SECTION_SERVERHISTORY + +#define KEY_USERNAME "UserName" +#define KEY_ACTIVESERVER "ActiveServer" +#define KEY_CONNECTIONTYPE "ConnectionType" +#define KEY_LANGUAGE "Language" +#define KEY_SERVER_X "Server_" +#define KEY_SECURITYPROXY "SecurityProxy" +#define KEY_USESECURITYPROXY "UseProxy" +#define KEY_DIALOG "dialog" +#define KEY_HTTP "http" +#define KEY_HTTPS "https" + +#define PROPERTYNAME_CONNECTIONTYPE DECLARE_ASCII("ConnectionType" ) +#define PROPERTYNAME_LANGUAGE DECLARE_ASCII("Language" ) #define PROPERTYNAME_PARENTWINDOW DECLARE_ASCII("ParentWindow" ) -#define PROPERTYNAME_PASSWORD DECLARE_ASCII("Password" ) -#define PROPERTYNAME_SECURITYPROXY DECLARE_ASCII("SecurityProxy" ) -#define PROPERTYNAME_SERVER DECLARE_ASCII("Server" ) -#define PROPERTYNAME_SERVERHISTORY DECLARE_ASCII("ServerHistory" ) -#define PROPERTYNAME_USERNAME DECLARE_ASCII("UserName" ) -#define PROPERTYNAME_USEPROXY DECLARE_ASCII("UseProxy" ) -#define PROPERTYNAME_DIALOG DECLARE_ASCII("Dialog" ) -#define PROPERTYNAME_HTTP DECLARE_ASCII("http" ) -#define PROPERTYNAME_HTTPS DECLARE_ASCII("https" ) - -#define PROPERTYHANDLE_CONNECTIONTYPE 1 -#define PROPERTYHANDLE_LANGUAGE 2 +#define PROPERTYNAME_PASSWORD DECLARE_ASCII("Password" ) +#define PROPERTYNAME_SECURITYPROXY DECLARE_ASCII("SecurityProxy" ) +#define PROPERTYNAME_SERVER DECLARE_ASCII("Server" ) +#define PROPERTYNAME_SERVERHISTORY DECLARE_ASCII("ServerHistory" ) +#define PROPERTYNAME_USERNAME DECLARE_ASCII("UserName" ) +#define PROPERTYNAME_USEPROXY DECLARE_ASCII("UseProxy" ) +#define PROPERTYNAME_DIALOG DECLARE_ASCII("Dialog" ) +#define PROPERTYNAME_HTTP DECLARE_ASCII("http" ) +#define PROPERTYNAME_HTTPS DECLARE_ASCII("https" ) + +#define PROPERTYHANDLE_CONNECTIONTYPE 1 +#define PROPERTYHANDLE_LANGUAGE 2 #define PROPERTYHANDLE_PARENTWINDOW 3 #define PROPERTYHANDLE_PASSWORD 4 #define PROPERTYHANDLE_SERVER 5 #define PROPERTYHANDLE_SERVERHISTORY 6 #define PROPERTYHANDLE_USERNAME 7 #define PROPERTYHANDLE_SECURITYPROXY 8 -#define PROPERTYHANDLE_USEPROXY 9 -#define PROPERTYHANDLE_DIALOG 10 -#define PROPERTYHANDLE_HTTP 11 -#define PROPERTYHANDLE_HTTPS 12 +#define PROPERTYHANDLE_USEPROXY 9 +#define PROPERTYHANDLE_DIALOG 10 +#define PROPERTYHANDLE_HTTP 11 +#define PROPERTYHANDLE_HTTPS 12 #define PROPERTYCOUNT 12 //_________________________________________________________________________________________________________________ -// exported definitions +// exported definitions //_________________________________________________________________________________________________________________ struct tIMPL_DialogData { - OUSTRING sUserName ; - OUSTRING sPassword ; - SEQUENCE< OUSTRING > seqServerList ; - sal_Int32 nActiveServer ; - OUSTRING sConnectionType ; - LOCALE aLanguage ; - sal_Int32 nPortHttp ; - sal_Int32 nPortHttps ; + OUSTRING sUserName ; + OUSTRING sPassword ; + SEQUENCE< OUSTRING > seqServerList ; + sal_Int32 nActiveServer ; + OUSTRING sConnectionType ; + LOCALE aLanguage ; + sal_Int32 nPortHttp ; + sal_Int32 nPortHttps ; ANY aParentWindow ; - OUSTRING sSecurityProxy ; - OUSTRING sUseProxy ; - OUSTRING sDialog ; - sal_Bool bProxyChanged ; + OUSTRING sSecurityProxy ; + OUSTRING sUseProxy ; + OUSTRING sDialog ; + sal_Bool bProxyChanged ; // default ctor to initialize empty structure. tIMPL_DialogData() - : sUserName ( OUSTRING() ) - , sPassword ( OUSTRING() ) - , seqServerList ( SEQUENCE< OUSTRING >() ) - , nActiveServer ( 1 ) - , sConnectionType ( OUSTRING() ) - , aLanguage ( OUSTRING(), OUSTRING(), OUSTRING() ) - , nPortHttp ( 0 ) - , nPortHttps ( 0 ) + : sUserName ( OUSTRING() ) + , sPassword ( OUSTRING() ) + , seqServerList ( SEQUENCE< OUSTRING >() ) + , nActiveServer ( 1 ) + , sConnectionType ( OUSTRING() ) + , aLanguage ( OUSTRING(), OUSTRING(), OUSTRING() ) + , nPortHttp ( 0 ) + , nPortHttps ( 0 ) , aParentWindow ( ) - , sSecurityProxy ( OUSTRING() ) - , sUseProxy ( OUSTRING() ) - , sDialog ( OUSTRING() ) - , bProxyChanged ( sal_False ) + , sSecurityProxy ( OUSTRING() ) + , sUseProxy ( OUSTRING() ) + , sDialog ( OUSTRING() ) + , bProxyChanged ( sal_False ) { } // copy ctor to initialize structure with values from another one. tIMPL_DialogData( const tIMPL_DialogData& aCopyDataSet ) - : sUserName ( aCopyDataSet.sUserName ) - , sPassword ( aCopyDataSet.sPassword ) - , seqServerList ( aCopyDataSet.seqServerList ) - , nActiveServer ( aCopyDataSet.nActiveServer ) - , sConnectionType ( aCopyDataSet.sConnectionType ) - , aLanguage ( aCopyDataSet.aLanguage ) - , nPortHttp ( aCopyDataSet.nPortHttp ) - , nPortHttps ( aCopyDataSet.nPortHttps ) + : sUserName ( aCopyDataSet.sUserName ) + , sPassword ( aCopyDataSet.sPassword ) + , seqServerList ( aCopyDataSet.seqServerList ) + , nActiveServer ( aCopyDataSet.nActiveServer ) + , sConnectionType ( aCopyDataSet.sConnectionType ) + , aLanguage ( aCopyDataSet.aLanguage ) + , nPortHttp ( aCopyDataSet.nPortHttp ) + , nPortHttps ( aCopyDataSet.nPortHttps ) , aParentWindow ( aCopyDataSet.aParentWindow ) - , sSecurityProxy ( aCopyDataSet.sSecurityProxy ) - , sUseProxy ( aCopyDataSet.sUseProxy ) - , sDialog ( aCopyDataSet.sDialog ) - , bProxyChanged ( aCopyDataSet.bProxyChanged ) + , sSecurityProxy ( aCopyDataSet.sSecurityProxy ) + , sUseProxy ( aCopyDataSet.sUseProxy ) + , sDialog ( aCopyDataSet.sDialog ) + , bProxyChanged ( aCopyDataSet.bProxyChanged ) { } // assignment operator to cop values from another struct to this one. tIMPL_DialogData& operator=( const tIMPL_DialogData& aCopyDataSet ) { - sUserName = aCopyDataSet.sUserName ; - sPassword = aCopyDataSet.sPassword ; - seqServerList = aCopyDataSet.seqServerList ; - nActiveServer = aCopyDataSet.nActiveServer ; - sConnectionType = aCopyDataSet.sConnectionType ; - aLanguage = aCopyDataSet.aLanguage ; - nPortHttp = aCopyDataSet.nPortHttp ; - nPortHttps = aCopyDataSet.nPortHttps ; + sUserName = aCopyDataSet.sUserName ; + sPassword = aCopyDataSet.sPassword ; + seqServerList = aCopyDataSet.seqServerList ; + nActiveServer = aCopyDataSet.nActiveServer ; + sConnectionType = aCopyDataSet.sConnectionType ; + aLanguage = aCopyDataSet.aLanguage ; + nPortHttp = aCopyDataSet.nPortHttp ; + nPortHttps = aCopyDataSet.nPortHttps ; aParentWindow = aCopyDataSet.aParentWindow ; - sSecurityProxy = aCopyDataSet.sSecurityProxy ; - sUseProxy = aCopyDataSet.sUseProxy ; - sDialog = aCopyDataSet.sDialog ; - bProxyChanged = aCopyDataSet.bProxyChanged ; + sSecurityProxy = aCopyDataSet.sSecurityProxy ; + sUseProxy = aCopyDataSet.sUseProxy ; + sDialog = aCopyDataSet.sDialog ; + bProxyChanged = aCopyDataSet.bProxyChanged ; return *this; } }; /*-************************************************************************************************************//** - @short implements an "private inline" dialog class used by follow class LoginDialog to show the dialog - @descr This is a VCL- modal dialog and not threadsafe! We use it as private definition in the context of login dialog only! + @short implements an "private inline" dialog class used by follow class LoginDialog to show the dialog + @descr This is a VCL- modal dialog and not threadsafe! We use it as private definition in the context of login dialog only! - @implements - + @implements - - @base ModalDialog + @base ModalDialog *//*-*************************************************************************************************************/ -class cIMPL_Dialog : public ModalDialog +class cIMPL_Dialog : public ModalDialog { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: /*-****************************************************************************************************//** - @short default ctor - @descr This ctor initialize the dialog, load ressources but not set values on edits or check boxes! + @short default ctor + @descr This ctor initialize the dialog, load ressources but not set values on edits or check boxes! These is implemented by setValues() on the same class. You must give us a language identifier to describe which ressource should be used! - @seealso method setValues() + @seealso method setValues() @param "aLanguage" , identifier to describe ressource language @param "pParent" , parent window handle for dialog! If is it NULL -> no parent exist ... - @return - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ cIMPL_Dialog( ::com::sun::star::lang::Locale aLocale, Window* pParent ); /*-****************************************************************************************************//** - @short default dtor - @descr This dtor deinitialize the dialog and free all used ressources. + @short default dtor + @descr This dtor deinitialize the dialog and free all used ressources. But you can't get the values of the dialog. Use getValues() to do this. - @seealso method getValues() + @seealso method getValues() - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ ~cIMPL_Dialog(); /*-****************************************************************************************************//** - @short set new values on dialog to show - @descr Use this to initialize the dialg with new values for showing before execute. + @short set new values on dialog to show + @descr Use this to initialize the dialg with new values for showing before execute. - @seealso method getValues() + @seealso method getValues() - @param "aDataSet"; struct of variables to set it on dialog controls - @return - + @param "aDataSet"; struct of variables to set it on dialog controls + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ void setValues( const tIMPL_DialogData& aDataSet ); /*-****************************************************************************************************//** - @short get current values from dialog controls - @descr Use this if you will get all values of dialog after execute. + @short get current values from dialog controls + @descr Use this if you will get all values of dialog after execute. - @seealso method setValues() + @seealso method setValues() - @param "aDataSet"; struct of variables filled by dialog - @return - + @param "aDataSet"; struct of variables filled by dialog + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ tIMPL_DialogData getValues(); @@ -349,94 +349,94 @@ class cIMPL_Dialog : public ModalDialog DECL_LINK( ClickHdl, void* ); //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: - void setCustomSettings(); + void setCustomSettings(); - void showDialogExpanded(); - void showDialogCollapsed(); + void showDialogExpanded(); + void showDialogCollapsed(); /*-****************************************************************************************************//** - @short get a host and port from a concated string form <host>:<port> + @short get a host and port from a concated string form <host>:<port> - @param "aProxyHostPort" ; a string with the following format <host>:<port> - @param "aHost" ; a host string - @param "aPort" ; a port string - @return - + @param "aProxyHostPort" ; a string with the following format <host>:<port> + @param "aHost" ; a host string + @param "aPort" ; a port string + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ - void getProxyHostPort( const OUSTRING& aProxyHostPort, OUSTRING& aHost, OUSTRING& aPort ); + void getProxyHostPort( const OUSTRING& aProxyHostPort, OUSTRING& aHost, OUSTRING& aPort ); /*-****************************************************************************************************//** - @short get a ressource for given id from right ressource file - @descr This dialog need his own ressource. We can't use the global ressource manager! + @short get a ressource for given id from right ressource file + @descr This dialog need his own ressource. We can't use the global ressource manager! We must use our own. You must give us the ressource language. If no right ressource could be found - any existing one is used automaticly! - @seealso method setValues() + @seealso method setValues() - @param "nId" ; id to convert it in right ressource id - @param "aLanguage" ; type of ressource language - @return - + @param "nId" ; id to convert it in right ressource id + @param "aLanguage" ; type of ressource language + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ - static ResId impl_getResId( sal_uInt16 nId , - ::com::sun::star::lang::Locale aLocale ); + static ResId impl_getResId( sal_uInt16 nId , + ::com::sun::star::lang::Locale aLocale ); //------------------------------------------------------------------------------------------------------------- - // private member + // private member //------------------------------------------------------------------------------------------------------------- private: - FixedImage m_imageHeader ; - FixedText m_textLoginText ; - FixedText m_textUserName ; - Edit m_editUserName ; - FixedText m_textPassword ; - Edit m_editPassword ; - FixedLine m_fixedLineServer ; - FixedText m_textServer ; - ComboBox m_comboServer ; - FixedLine m_fixedLineProxySettings ; - RadioButton m_radioNoProxy ; - RadioButton m_radioBrowserProxy ; - RadioButton m_radioCustomProxy ; - FixedText m_textSecurityProxy ; - FixedText m_textSecurityProxyHost ; - Edit m_editSecurityProxyHost ; - FixedText m_textSecurityProxyPort ; - Edit m_editSecurityProxyPort ; - FixedLine m_fixedLineButtons ; - OKButton m_buttonOK ; - CancelButton m_buttonCancel ; - PushButton m_buttonAdditionalSettings ; - Size m_expandedDialogSize ; - Size m_collapsedDialogSize ; - Point m_expOKButtonPos ; - Point m_expCancelButtonPos ; - Point m_expAdditionalButtonPos ; - Point m_colOKButtonPos ; - Point m_colCancelButtonPos ; - Point m_colAdditionalButtonPos ; - OUSTRING m_colButtonAddText ; - OUSTRING m_expButtonAddText ; - tIMPL_DialogData m_aDataSet ; + FixedImage m_imageHeader ; + FixedText m_textLoginText ; + FixedText m_textUserName ; + Edit m_editUserName ; + FixedText m_textPassword ; + Edit m_editPassword ; + FixedLine m_fixedLineServer ; + FixedText m_textServer ; + ComboBox m_comboServer ; + FixedLine m_fixedLineProxySettings ; + RadioButton m_radioNoProxy ; + RadioButton m_radioBrowserProxy ; + RadioButton m_radioCustomProxy ; + FixedText m_textSecurityProxy ; + FixedText m_textSecurityProxyHost ; + Edit m_editSecurityProxyHost ; + FixedText m_textSecurityProxyPort ; + Edit m_editSecurityProxyPort ; + FixedLine m_fixedLineButtons ; + OKButton m_buttonOK ; + CancelButton m_buttonCancel ; + PushButton m_buttonAdditionalSettings ; + Size m_expandedDialogSize ; + Size m_collapsedDialogSize ; + Point m_expOKButtonPos ; + Point m_expCancelButtonPos ; + Point m_expAdditionalButtonPos ; + Point m_colOKButtonPos ; + Point m_colCancelButtonPos ; + Point m_colAdditionalButtonPos ; + OUSTRING m_colButtonAddText ; + OUSTRING m_expButtonAddText ; + tIMPL_DialogData m_aDataSet ; }; /*-************************************************************************************************************//** @short - @descr - + @descr - - @implements XInterface + @implements XInterface XTypeProvider XServiceInfo XDialog @@ -445,55 +445,55 @@ class cIMPL_Dialog : public ModalDialog OWeakObject *//*-*************************************************************************************************************/ -class LoginDialog : public XTYPEPROVIDER , - public XSERVICEINFO , - public XDIALOG , +class LoginDialog : public XTYPEPROVIDER , + public XSERVICEINFO , + public XDIALOG , public XFLUSHABLE , private ThreadHelpBase , // Order of baseclasses is neccessary for right initialization! - public OBROADCASTHELPER , - public OPROPERTYSETHELPER , + public OBROADCASTHELPER , + public OPROPERTYSETHELPER , public OWEAKOBJECT { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: //--------------------------------------------------------------------------------------------------------- - // constructor / destructor + // constructor / destructor //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short - - @descr - + @short - + @descr - - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ LoginDialog( const REFERENCE< XMULTISERVICEFACTORY >& sFactory ); /*-****************************************************************************************************//** - @short - - @descr - + @short - + @descr - - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ - virtual ~LoginDialog(); + virtual ~LoginDialog(); //--------------------------------------------------------------------------------------------------------- - // XInterface, XTypeProvider, XServiceInfo + // XInterface, XTypeProvider, XServiceInfo //--------------------------------------------------------------------------------------------------------- DECLARE_XINTERFACE @@ -501,21 +501,21 @@ class LoginDialog : public XTYPEPROVIDER , DECLARE_XSERVICEINFO //--------------------------------------------------------------------------------------------------------- - // XFlushable + // XFlushable //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short write changed values to configuration - @descr Normaly the dialog returns with an OK or ERROR value. If OK occure - we flush data + @short write changed values to configuration + @descr Normaly the dialog returns with an OK or ERROR value. If OK occure - we flush data auomaticly. But otherwise we do nothing. If user of this service wish to use property set only without any UI(!) - he must call "flush()" explicitly to write data! - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual void SAL_CALL flush() throw( RUNTIMEEXCEPTION ); @@ -523,368 +523,368 @@ class LoginDialog : public XTYPEPROVIDER , virtual void SAL_CALL removeFlushListener( const REFERENCE< XFLUSHLISTENER >& xListener ) throw( RUNTIMEEXCEPTION ); //--------------------------------------------------------------------------------------------------------- - // XDialog + // XDialog //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short set new title of dialog - @descr - + @short set new title of dialog + @descr - - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual void SAL_CALL setTitle( const OUSTRING& sTitle ) throw( RUNTIMEEXCEPTION ); /*-****************************************************************************************************//** - @short return the current title of this dialog - @descr - + @short return the current title of this dialog + @descr - - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual OUSTRING SAL_CALL getTitle() throw( RUNTIMEEXCEPTION ); /*-****************************************************************************************************//** - @short show the dialog and return user reaction - @descr If user close dialog with OK we return 1 else + @short show the dialog and return user reaction + @descr If user close dialog with OK we return 1 else user has cancelled this dialog and we return 0. You can use this return value directly as boolean. - @seealso - + @seealso - - @param - - @return 1; if closed with OK - @return 0; if cancelled + @param - + @return 1; if closed with OK + @return 0; if cancelled - @onerror We return 0(FALSE). + @onerror We return 0(FALSE). *//*-*****************************************************************************************************/ virtual sal_Int16 SAL_CALL execute() throw( RUNTIMEEXCEPTION ); /*-****************************************************************************************************//** - @short not implemented yet! - @descr - + @short not implemented yet! + @descr - - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual void SAL_CALL endExecute() throw( RUNTIMEEXCEPTION ); //------------------------------------------------------------------------------------------------------------- - // protected methods + // protected methods //------------------------------------------------------------------------------------------------------------- protected: //--------------------------------------------------------------------------- - // OPropertySetHelper + // OPropertySetHelper //--------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short try to convert a property value - @descr This method is calling from helperclass "OPropertySetHelper". + @short try to convert a property value + @descr This method is calling from helperclass "OPropertySetHelper". Don't use this directly! You must try to convert the value of given propertyhandle and return results of this operation. This will be use to ask vetoable listener. If no listener have a veto, we will change value realy! ( in method setFastPropertyValue_NoBroadcast(...) ) - @seealso class OPropertySetHelper - @seealso method setFastPropertyValue_NoBroadcast() - @seealso method impl_tryToChangeProperty() + @seealso class OPropertySetHelper + @seealso method setFastPropertyValue_NoBroadcast() + @seealso method impl_tryToChangeProperty() - @param "aConvertedValue" new converted value of property - @param "aOldValue" old value of property - @param "nHandle" handle of property - @param "aValue" new value of property - @return sal_True if value will be changed, sal_FALSE otherway + @param "aConvertedValue" new converted value of property + @param "aOldValue" old value of property + @param "nHandle" handle of property + @param "aValue" new value of property + @return sal_True if value will be changed, sal_FALSE otherway - @onerror IllegalArgumentException, if you call this with an invalid argument + @onerror IllegalArgumentException, if you call this with an invalid argument *//*-*****************************************************************************************************/ - virtual sal_Bool SAL_CALL convertFastPropertyValue( ANY& aConvertedValue , - ANY& aOldValue , - sal_Int32 nHandle , - const ANY& aValue ) throw( ILLEGALARGUMENTEXCEPTION ); + virtual sal_Bool SAL_CALL convertFastPropertyValue( ANY& aConvertedValue , + ANY& aOldValue , + sal_Int32 nHandle , + const ANY& aValue ) throw( ILLEGALARGUMENTEXCEPTION ); /*-****************************************************************************************************//** - @short set value of a transient property - @descr This method is calling from helperclass "OPropertySetHelper". + @short set value of a transient property + @descr This method is calling from helperclass "OPropertySetHelper". Don't use this directly! Handle and value are valid everyway! You must set the new value only. After this, baseclass send messages to all listener automaticly. - @seealso OPropertySetHelper + @seealso OPropertySetHelper - @param "nHandle" handle of property to change - @param "aValue" new value of property - @return - + @param "nHandle" handle of property to change + @param "aValue" new value of property + @return - - @onerror An exception is thrown. + @onerror An exception is thrown. *//*-*****************************************************************************************************/ - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle , - const ANY& aValue ) throw( EXCEPTION ); + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle , + const ANY& aValue ) throw( EXCEPTION ); /*-****************************************************************************************************//** - @short get value of a transient property - @descr This method is calling from helperclass "OPropertySetHelper". + @short get value of a transient property + @descr This method is calling from helperclass "OPropertySetHelper". Don't use this directly! - @seealso OPropertySetHelper + @seealso OPropertySetHelper - @param "nHandle" handle of property to change - @param "aValue" current value of property - @return - + @param "nHandle" handle of property to change + @param "aValue" current value of property + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ - virtual void SAL_CALL getFastPropertyValue( ANY& aValue , - sal_Int32 nHandle ) const; + virtual void SAL_CALL getFastPropertyValue( ANY& aValue , + sal_Int32 nHandle ) const; /*-****************************************************************************************************//** @short return structure and information about transient properties - @descr This method is calling from helperclass "OPropertySetHelper". + @descr This method is calling from helperclass "OPropertySetHelper". Don't use this directly! - @seealso OPropertySetHelper + @seealso OPropertySetHelper - @param - - @return structure with property-informations + @param - + @return structure with property-informations - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual IPROPERTYARRAYHELPER& SAL_CALL getInfoHelper(); /*-****************************************************************************************************//** - @short return propertysetinfo - @descr You can call this method to get information about transient properties + @short return propertysetinfo + @descr You can call this method to get information about transient properties of this object. - @seealso OPropertySetHelper - @seealso XPropertySet - @seealso XMultiPropertySet + @seealso OPropertySetHelper + @seealso XPropertySet + @seealso XMultiPropertySet - @param - - @return reference to object with information [XPropertySetInfo] + @param - + @return reference to object with information [XPropertySetInfo] - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual REFERENCE< XPROPERTYSETINFO > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: /*-****************************************************************************************************//** - @short return table of all supported properties - @descr We need this table to initialize our helper baseclass OPropertySetHelper + @short return table of all supported properties + @descr We need this table to initialize our helper baseclass OPropertySetHelper - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ const SEQUENCE< PROPERTY > impl_getStaticPropertyDescriptor(); /*-****************************************************************************************************//** - @short helper method to check if a property will change his value - @descr Is neccessary for vetoable listener mechanism of OPropertySethelper. + @short helper method to check if a property will change his value + @descr Is neccessary for vetoable listener mechanism of OPropertySethelper. - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ - sal_Bool impl_tryToChangeProperty( const OUSTRING& sProperty , - const ANY& aValue , - ANY& aOldValue , - ANY& aConvertedValue ) throw( ILLEGALARGUMENTEXCEPTION ); + sal_Bool impl_tryToChangeProperty( const OUSTRING& sProperty , + const ANY& aValue , + ANY& aOldValue , + ANY& aConvertedValue ) throw( ILLEGALARGUMENTEXCEPTION ); - sal_Bool impl_tryToChangeProperty( const SEQUENCE< OUSTRING >& seqProperty , - const ANY& aValue , - ANY& aOldValue , - ANY& aConvertedValue ) throw( ILLEGALARGUMENTEXCEPTION ); + sal_Bool impl_tryToChangeProperty( const SEQUENCE< OUSTRING >& seqProperty , + const ANY& aValue , + ANY& aOldValue , + ANY& aConvertedValue ) throw( ILLEGALARGUMENTEXCEPTION ); - sal_Bool impl_tryToChangeProperty( const sal_Int32& nProperty , - const ANY& aValue , - ANY& aOldValue , - ANY& aConvertedValue ) throw( ILLEGALARGUMENTEXCEPTION ); + sal_Bool impl_tryToChangeProperty( const sal_Int32& nProperty , + const ANY& aValue , + ANY& aOldValue , + ANY& aConvertedValue ) throw( ILLEGALARGUMENTEXCEPTION ); - sal_Bool impl_tryToChangeProperty( const LOCALE& aProperty , - const ANY& aValue , - ANY& aOldValue , - ANY& aConvertedValue ) throw( ILLEGALARGUMENTEXCEPTION ); + sal_Bool impl_tryToChangeProperty( const LOCALE& aProperty , + const ANY& aValue , + ANY& aOldValue , + ANY& aConvertedValue ) throw( ILLEGALARGUMENTEXCEPTION ); sal_Bool impl_tryToChangeProperty( const ANY& aProperty , - const ANY& aValue , - ANY& aOldValue , - ANY& aConvertedValue ) throw( ILLEGALARGUMENTEXCEPTION ); + const ANY& aValue , + ANY& aOldValue , + ANY& aConvertedValue ) throw( ILLEGALARGUMENTEXCEPTION ); /*-****************************************************************************************************//** - @short search and open profile - @descr This method search and open the ini file. It initialize some member too. + @short search and open profile + @descr This method search and open the ini file. It initialize some member too. - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ void impl_openProfile(); /*-****************************************************************************************************//** - @short close profile and free some member - @descr This method close current opened ini file and deinitialize some member too. + @short close profile and free some member + @descr This method close current opened ini file and deinitialize some member too. - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ void impl_closeProfile(); /*-****************************************************************************************************//** - @short write profile and free some member - @descr This method writes current settings and deinitialize some member too. + @short write profile and free some member + @descr This method writes current settings and deinitialize some member too. - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ void impl_writeProfile(); /*-****************************************************************************************************//** - @short check current server history - @descr Our current server history implementation can handle 10 elements as maximum. + @short check current server history + @descr Our current server history implementation can handle 10 elements as maximum. If more then 10 elements exist; old ones will be deleted. - @seealso - + @seealso - - @param "seqHistory"; current history - @return Sequence< OUString >; checked and repaired history + @param "seqHistory"; current history + @return Sequence< OUString >; checked and repaired history - @onerror - + @onerror - *//*-*****************************************************************************************************/ - void impl_addServerToHistory( SEQUENCE< OUSTRING >& seqHistory , - sal_Int32& nActiveServer , - const OUSTRING& sServer ); + void impl_addServerToHistory( SEQUENCE< OUSTRING >& seqHistory , + sal_Int32& nActiveServer , + const OUSTRING& sServer ); /*-****************************************************************************************************//** - @short helper methods to read/write properties from/to ini file - @descr Using of Config-Class isn't easy everytime :-( + @short helper methods to read/write properties from/to ini file + @descr Using of Config-Class isn't easy everytime :-( Thats the reason for these helper. State of operation isn't realy important .. but we assert impossible cases or occured errors! - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror Assertions are shown. + @onerror Assertions are shown. *//*-*****************************************************************************************************/ - void impl_writeUserName ( const OUSTRING& sUserName ); - void impl_writeActiveServer ( sal_Int32 nActiveServer ); - void impl_writeServerHistory ( const SEQUENCE< OUSTRING >& lHistory ); - void impl_writeConnectionType ( const OUSTRING& sConnectionType ); - void impl_writeLanguage ( const LOCALE& aLanguage ); - void impl_writePortHttp ( sal_Int32 nPort ); - void impl_writePortHttps ( sal_Int32 nPort ); - void impl_writeSecurityProxy ( const OUSTRING& sSecurityProxy ); - void impl_writeUseProxy ( const OUSTRING& sUseProxy ); - void impl_writeDialog ( const OUSTRING& sDialog ); - - OUSTRING impl_readUserName ( ); - sal_Int32 impl_readActiveServer ( ); - SEQUENCE< OUSTRING > impl_readServerHistory ( ); - OUSTRING impl_readConnectionType ( ); - LOCALE impl_readLanguage ( ); - sal_Int32 impl_readPortHttp ( ); - sal_Int32 impl_readPortHttps ( ); - OUSTRING impl_readSecurityProxy ( ); - OUSTRING impl_readUseProxy ( ); - OUSTRING impl_readDialog ( ); + void impl_writeUserName ( const OUSTRING& sUserName ); + void impl_writeActiveServer ( sal_Int32 nActiveServer ); + void impl_writeServerHistory ( const SEQUENCE< OUSTRING >& lHistory ); + void impl_writeConnectionType ( const OUSTRING& sConnectionType ); + void impl_writeLanguage ( const LOCALE& aLanguage ); + void impl_writePortHttp ( sal_Int32 nPort ); + void impl_writePortHttps ( sal_Int32 nPort ); + void impl_writeSecurityProxy ( const OUSTRING& sSecurityProxy ); + void impl_writeUseProxy ( const OUSTRING& sUseProxy ); + void impl_writeDialog ( const OUSTRING& sDialog ); + + OUSTRING impl_readUserName ( ); + sal_Int32 impl_readActiveServer ( ); + SEQUENCE< OUSTRING > impl_readServerHistory ( ); + OUSTRING impl_readConnectionType ( ); + LOCALE impl_readLanguage ( ); + sal_Int32 impl_readPortHttp ( ); + sal_Int32 impl_readPortHttps ( ); + OUSTRING impl_readSecurityProxy ( ); + OUSTRING impl_readUseProxy ( ); + OUSTRING impl_readDialog ( ); //------------------------------------------------------------------------------------------------------------- - // debug methods - // (should be private everyway!) + // debug methods + // (should be private everyway!) //------------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short debug-method to check incoming parameter of some other mehods of this class - @descr The following methods are used to check parameters for other methods + @short debug-method to check incoming parameter of some other mehods of this class + @descr The following methods are used to check parameters for other methods of this class. The return value is used directly for an ASSERT(...). - @seealso ASSERTs in implementation! + @seealso ASSERTs in implementation! - @param references to checking variables - @return sal_False on invalid parameter<BR> + @param references to checking variables + @return sal_False on invalid parameter<BR> sal_True otherway - @onerror - + @onerror - *//*-*****************************************************************************************************/ #ifdef ENABLE_ASSERTIONS private: - sal_Bool impldbg_checkParameter_LoginDialog ( const REFERENCE< XMULTISERVICEFACTORY >& xFactory ); - sal_Bool impldbg_checkParameter_setTitle ( const OUSTRING& sTitle ); + sal_Bool impldbg_checkParameter_LoginDialog ( const REFERENCE< XMULTISERVICEFACTORY >& xFactory ); + sal_Bool impldbg_checkParameter_setTitle ( const OUSTRING& sTitle ); - #endif // #ifdef ENABLE_ASSERTIONS + #endif // #ifdef ENABLE_ASSERTIONS //------------------------------------------------------------------------------------------------------------- - // variables - // (should be private everyway!) + // variables + // (should be private everyway!) //------------------------------------------------------------------------------------------------------------- private: - REFERENCE< XMULTISERVICEFACTORY > m_xFactory ; /// reference to factory, which has created this instance - OUSTRING m_sININame ; /// full qualified path to profile UNC-notation - Config* m_pINIManager ; /// manager for full access to ini file - sal_Bool m_bInExecuteMode ; /// protection against setting of properties during showing of dialog - cIMPL_Dialog* m_pDialog ; /// VCL dialog - tIMPL_DialogData m_aPropertySet ; + REFERENCE< XMULTISERVICEFACTORY > m_xFactory ; /// reference to factory, which has created this instance + OUSTRING m_sININame ; /// full qualified path to profile UNC-notation + Config* m_pINIManager ; /// manager for full access to ini file + sal_Bool m_bInExecuteMode ; /// protection against setting of properties during showing of dialog + cIMPL_Dialog* m_pDialog ; /// VCL dialog + tIMPL_DialogData m_aPropertySet ; -}; // class LoginDialog +}; // class LoginDialog -} // namespace framework +} // namespace framework -#endif // #ifndef __FRAMEWORK_LOGINDIALOG_LOGINDIALOG_HXX_ +#endif // #ifndef __FRAMEWORK_LOGINDIALOG_LOGINDIALOG_HXX_ diff --git a/framework/inc/services/mediatypedetectionhelper.hxx b/framework/inc/services/mediatypedetectionhelper.hxx index 1106157c32ce..0451f0f1e52c 100644 --- a/framework/inc/services/mediatypedetectionhelper.hxx +++ b/framework/inc/services/mediatypedetectionhelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_SERVICES_MEDIATYPEDETECTIONHELPER_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <macros/generic.hxx> @@ -40,112 +40,112 @@ #include <general.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/util/XStringMapping.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/implbase2.hxx> //_________________________________________________________________________________________________________________ -// namespaces +// namespaces //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// definitions +// definitions //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** @short - - @descr - + @descr - - @implements XInterface + @implements XInterface XTypeProvider XServiceInfo XStringMapping - @base OWeakObject + @base OWeakObject - @devstatus deprecated + @devstatus deprecated *//*-*************************************************************************************************************/ -class MediaTypeDetectionHelper : public ::cppu::WeakImplHelper2< ::com::sun::star::util::XStringMapping, css::lang::XServiceInfo> +class MediaTypeDetectionHelper : public ::cppu::WeakImplHelper2< ::com::sun::star::util::XStringMapping, css::lang::XServiceInfo> { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: //--------------------------------------------------------------------------------------------------------- - // constructor / destructor + // constructor / destructor //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short standard ctor - @descr These initialize a new instance of this class with all needed informations for work. + @short standard ctor + @descr These initialize a new instance of this class with all needed informations for work. - @seealso - + @seealso - - @param "xFactory", reference to factory which has created ouer owner(!). We can use these to create new uno-services. - @return - + @param "xFactory", reference to factory which has created ouer owner(!). We can use these to create new uno-services. + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ MediaTypeDetectionHelper( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ); /*-****************************************************************************************************//** - @short standard destructor - @descr This method destruct an instance of this class and clear some member. + @short standard destructor + @descr This method destruct an instance of this class and clear some member. - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ - virtual ~MediaTypeDetectionHelper(); + virtual ~MediaTypeDetectionHelper(); //--------------------------------------------------------------------------------------------------------- - // XInterface, XTypeProvider, XServiceInfo + // XInterface, XTypeProvider, XServiceInfo //--------------------------------------------------------------------------------------------------------- DECLARE_XSERVICEINFO //--------------------------------------------------------------------------------------------------------- - // XStringMapping + // XStringMapping //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short - - @descr - + @short - + @descr - - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual sal_Bool SAL_CALL mapStrings( css::uno::Sequence< ::rtl::OUString >& seqParameter ) throw( css::uno::RuntimeException ); //------------------------------------------------------------------------------------------------------------- - // variables - // should be private every time + // variables + // should be private every time //------------------------------------------------------------------------------------------------------------- private: - css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory; /// reference to global servicemanager + css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory; /// reference to global servicemanager }; -} // namespace framework +} // namespace framework -#endif // #ifndef __FRAMEWORK_SERVICES_MEDIATYPEDETECTIONHELPER_HXX_ +#endif // #ifndef __FRAMEWORK_SERVICES_MEDIATYPEDETECTIONHELPER_HXX_ diff --git a/framework/inc/services/modulemanager.hxx b/framework/inc/services/modulemanager.hxx index d36e9dd76587..f1f6de71567f 100644 --- a/framework/inc/services/modulemanager.hxx +++ b/framework/inc/services/modulemanager.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -116,7 +116,7 @@ class ModuleManager : public css::lang::XTypeProvider css::container::NoSuchElementException, css::lang::WrappedTargetException , css::uno::RuntimeException ); - + // XNameAccess virtual css::uno::Any SAL_CALL getByName(const ::rtl::OUString& sName) throw(css::container::NoSuchElementException, @@ -139,7 +139,7 @@ class ModuleManager : public css::lang::XTypeProvider // XContainerQuery virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery(const ::rtl::OUString& sQuery) throw(css::uno::RuntimeException); - + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByProperties(const css::uno::Sequence< css::beans::NamedValue >& lProperties) throw(css::uno::RuntimeException); //___________________________________________ @@ -155,7 +155,7 @@ class ModuleManager : public css::lang::XTypeProvider method works together with the member m_xCFG, open it on demand and cache it afterwards. - + Note: A writable configuration access must be created explicitly. Otherwise we cant make sure that broken write requests @@ -178,11 +178,11 @@ class ModuleManager : public css::lang::XTypeProvider @descr It checks for the optional but preferred interface XModule first. If this module does not exists at the given component it tries to use XServiceInfo instead. - + Note: This method try to locate a suitable module name. Nothing else. Selecting the right component and throwing suitable exceptions must be done outside. - + @see identify() @param xComponent diff --git a/framework/inc/services/pathsettings.hxx b/framework/inc/services/pathsettings.hxx index 7c52dee0f128..52c81c4fedeb 100644 --- a/framework/inc/services/pathsettings.hxx +++ b/framework/inc/services/pathsettings.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_SERVICES_PATHSETTINGS_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> @@ -42,7 +42,7 @@ #include <stdtypes.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> @@ -51,7 +51,7 @@ #include <com/sun/star/container/XNameAccess.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/propshlp.hxx> #include <cppuhelper/interfacecontainer.hxx> @@ -119,7 +119,7 @@ class PathSettings : public css::lang::XTypeProvider , /// indicates real single pathes, which uses WritePath property only sal_Bool bIsSinglePath; - + /// simple handling of finalized/mandatory states ... => we know one state READONLY only .-) sal_Bool bIsReadonly; }; @@ -271,7 +271,7 @@ class PathSettings : public css::lang::XTypeProvider , const PathSettings::PathInfo* pPathNew); - // OPropertySetHelper + // OPropertySetHelper virtual sal_Bool SAL_CALL convertFastPropertyValue ( css::uno::Any& aConvertedValue , css::uno::Any& aOldValue , sal_Int32 nHandle , diff --git a/framework/inc/services/pluginframe.hxx b/framework/inc/services/pluginframe.hxx index 4d2f44840de4..13f374f353c7 100644 --- a/framework/inc/services/pluginframe.hxx +++ b/framework/inc/services/pluginframe.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,13 +29,13 @@ #define __FRAMEWORK_SERVICES_PLUGINFRAME_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <services/frame.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/mozilla/XPluginInstance.hpp> #include <com/sun/star/mozilla/XPluginInstancePeer.hpp> @@ -48,7 +48,7 @@ #include <com/sun/star/lang/EventObject.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #ifndef _VCL_ATOM_HXX @@ -58,24 +58,24 @@ //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// exported const +// exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// exported definitions +// exported definitions //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** - @short implements an special frame - a plugin frame - @descr - + @short implements an special frame - a plugin frame + @descr - - @implements XInitialization + @implements XInitialization XPluginInstance XDispatchResultListener @base Frame @@ -87,46 +87,46 @@ class PlugInFrame : public css::lang::XInitialization , public Frame // Order of baseclasses is neccessary for right initialization! { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: //--------------------------------------------------------------------------------------------------------- - // constructor / destructor + // constructor / destructor //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short standard constructor to create instance - @descr This constructor initialize a new instance of this class, + @short standard constructor to create instance + @descr This constructor initialize a new instance of this class, and will be set valid values on his member and baseclasses. - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ PlugInFrame( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ); /*-****************************************************************************************************//** - @short standard destructor - @descr This method destruct an instance of this class and clear some member. + @short standard destructor + @descr This method destruct an instance of this class and clear some member. - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ - virtual ~PlugInFrame(); + virtual ~PlugInFrame(); //--------------------------------------------------------------------------------------------------------- - // XInterface, XTypeProvider, XServiceInfo + // XInterface, XTypeProvider, XServiceInfo //--------------------------------------------------------------------------------------------------------- DECLARE_XINTERFACE @@ -134,56 +134,56 @@ class PlugInFrame : public css::lang::XInitialization , DECLARE_XSERVICEINFO //--------------------------------------------------------------------------------------------------------- - // XInitialization + // XInitialization //--------------------------------------------------------------------------------------------------------- - void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& seqArguments ) throw( css::uno::Exception , - css::uno::RuntimeException ); + void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& seqArguments ) throw( css::uno::Exception , + css::uno::RuntimeException ); //--------------------------------------------------------------------------------------------------------- - // XPluginInstance + // XPluginInstance //--------------------------------------------------------------------------------------------------------- - void SAL_CALL start () throw( css::uno::RuntimeException ); - void SAL_CALL implcb_start () throw( css::uno::RuntimeException ); - void SAL_CALL stop () throw( css::uno::RuntimeException ); - void SAL_CALL implcb_stop () throw( css::uno::RuntimeException ); - void SAL_CALL destroy () throw( css::uno::RuntimeException ); + void SAL_CALL start () throw( css::uno::RuntimeException ); + void SAL_CALL implcb_start () throw( css::uno::RuntimeException ); + void SAL_CALL stop () throw( css::uno::RuntimeException ); + void SAL_CALL implcb_stop () throw( css::uno::RuntimeException ); + void SAL_CALL destroy () throw( css::uno::RuntimeException ); void SAL_CALL implcb_destroy() throw( css::uno::RuntimeException ); - void SAL_CALL createWindow ( const css::uno::Any& aPlatformWindowHandle , - sal_Bool bEmbedded ) throw( css::uno::RuntimeException ); - void SAL_CALL implcb_createWindow ( const css::uno::Any& aPlatformWindowHandle , - sal_Bool bEmbedded ) throw( css::uno::RuntimeException ); - void SAL_CALL newStream ( const ::rtl::OUString& sMIMEDescription, - const ::rtl::OUString& sURL , - const ::rtl::OUString& sFilter , - const css::uno::Reference< css::io::XInputStream >& xStream , - const css::uno::Any& aSessionId ) throw( css::uno::RuntimeException ); + void SAL_CALL createWindow ( const css::uno::Any& aPlatformWindowHandle , + sal_Bool bEmbedded ) throw( css::uno::RuntimeException ); + void SAL_CALL implcb_createWindow ( const css::uno::Any& aPlatformWindowHandle , + sal_Bool bEmbedded ) throw( css::uno::RuntimeException ); + void SAL_CALL newStream ( const ::rtl::OUString& sMIMEDescription, + const ::rtl::OUString& sURL , + const ::rtl::OUString& sFilter , + const css::uno::Reference< css::io::XInputStream >& xStream , + const css::uno::Any& aSessionId ) throw( css::uno::RuntimeException ); void SAL_CALL implcb_newStream - ( const ::rtl::OUString& sMIMEDescription, - const ::rtl::OUString& sURL , - const ::rtl::OUString& sFilter , - const css::uno::Reference< css::io::XInputStream >& xStream , - const css::uno::Any& aSessionId ) throw( css::uno::RuntimeException ); - void SAL_CALL newURL ( const ::rtl::OUString& sMIMEDescription, - const ::rtl::OUString& sURL , - const ::rtl::OUString& sFilter , - const css::uno::Any& aSessionId ) throw( css::uno::RuntimeException ); - void SAL_CALL implcb_newURL ( const ::rtl::OUString& sMIMEDescription, - const ::rtl::OUString& sURL , - const ::rtl::OUString& sFilter , - const css::uno::Any& aSessionId ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL getHttpServerURL( ::rtl::OUString& sHost , - sal_uInt16& nPort , - ::rtl::OUString& sPrefix ) throw( css::uno::RuntimeException ); + ( const ::rtl::OUString& sMIMEDescription, + const ::rtl::OUString& sURL , + const ::rtl::OUString& sFilter , + const css::uno::Reference< css::io::XInputStream >& xStream , + const css::uno::Any& aSessionId ) throw( css::uno::RuntimeException ); + void SAL_CALL newURL ( const ::rtl::OUString& sMIMEDescription, + const ::rtl::OUString& sURL , + const ::rtl::OUString& sFilter , + const css::uno::Any& aSessionId ) throw( css::uno::RuntimeException ); + void SAL_CALL implcb_newURL ( const ::rtl::OUString& sMIMEDescription, + const ::rtl::OUString& sURL , + const ::rtl::OUString& sFilter , + const css::uno::Any& aSessionId ) throw( css::uno::RuntimeException ); + virtual void SAL_CALL getHttpServerURL( ::rtl::OUString& sHost , + sal_uInt16& nPort , + ::rtl::OUString& sPrefix ) throw( css::uno::RuntimeException ); //--------------------------------------------------------------------------------------------------------- - // XDispatchProvider + // XDispatchProvider //--------------------------------------------------------------------------------------------------------- - virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& aURL , - const ::rtl::OUString& sTargetFrameName, - sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException ); + virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& aURL , + const ::rtl::OUString& sTargetFrameName, + sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException ); virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& seqDescripts ) throw( css::uno::RuntimeException ); //--------------------------------------------------------------------------------------------------------- @@ -193,19 +193,19 @@ class PlugInFrame : public css::lang::XInitialization , virtual void SAL_CALL dispatchFinished ( const css::frame::DispatchResultEvent& aEvent ) throw( css::uno::RuntimeException ); //--------------------------------------------------------------------------------------------------------- - // XEventListener + // XEventListener //--------------------------------------------------------------------------------------------------------- void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException ); //------------------------------------------------------------------------------------------------------------- - // protected methods + // protected methods //------------------------------------------------------------------------------------------------------------- protected: //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: @@ -214,85 +214,85 @@ class PlugInFrame : public css::lang::XInitialization , sal_Bool impl_registerRemoteFactories( const css::uno::Reference< css::lang::XMultiServiceFactory >& xRemoteServiceManager ); //------------------------------------------------------------------------------------------------------------- - // debug methods - // (should be private everyway!) + // debug methods + // (should be private everyway!) //------------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short debug-method to check incoming parameter of some other mehods of this class - @descr The following methods are used to check parameters for other methods + @short debug-method to check incoming parameter of some other mehods of this class + @descr The following methods are used to check parameters for other methods of this class. The return value is used directly for an ASSERT(...). - @seealso ASSERTs in implementation! + @seealso ASSERTs in implementation! - @param references to checking variables - @return sal_False on invalid parameter<BR> + @param references to checking variables + @return sal_False on invalid parameter<BR> sal_True otherway - @onerror - + @onerror - *//*-*****************************************************************************************************/ #ifdef ENABLE_ASSERTIONS private: - static sal_Bool impldbg_checkParameter_initialize ( const css::uno::Sequence< css::uno::Any >& seqArguments ); - static sal_Bool impldbg_checkParameter_createWindow ( const css::uno::Any& aPlatformWindowHandle , - sal_Bool bEmbedded ); - static sal_Bool impldbg_checkParameter_newStream ( const ::rtl::OUString& sMIMEDescription , - const ::rtl::OUString& sURL , - const ::rtl::OUString& sFilter , - const css::uno::Reference< css::io::XInputStream >& xStream ); - static sal_Bool impldbg_checkParameter_newURL ( const ::rtl::OUString& sMIMEDescription , - const ::rtl::OUString& sURL , - const ::rtl::OUString& sFilter ); - static sal_Bool impldbg_checkParameter_getHttpServerURL ( ::rtl::OUString& sHost , - sal_uInt16& nPort , - ::rtl::OUString& sPrefix ); - static sal_Bool impldbg_checkParameter_queryDispatch ( const css::util::URL& aURL , - const ::rtl::OUString& sTargetFrameName , - sal_Int32 nSearchFlags ); - static sal_Bool impldbg_checkParameter_queryDispatches ( const css::uno::Sequence< css::frame::DispatchDescriptor >& seqDescripts ); - static sal_Bool impldbg_checkParameter_statusChanged ( const css::frame::FeatureStateEvent& aEvent ); - static sal_Bool impldbg_checkParameter_disposing ( const css::lang::EventObject& aEvent ); - - #endif // #ifdef ENABLE_ASSERTIONS + static sal_Bool impldbg_checkParameter_initialize ( const css::uno::Sequence< css::uno::Any >& seqArguments ); + static sal_Bool impldbg_checkParameter_createWindow ( const css::uno::Any& aPlatformWindowHandle , + sal_Bool bEmbedded ); + static sal_Bool impldbg_checkParameter_newStream ( const ::rtl::OUString& sMIMEDescription , + const ::rtl::OUString& sURL , + const ::rtl::OUString& sFilter , + const css::uno::Reference< css::io::XInputStream >& xStream ); + static sal_Bool impldbg_checkParameter_newURL ( const ::rtl::OUString& sMIMEDescription , + const ::rtl::OUString& sURL , + const ::rtl::OUString& sFilter ); + static sal_Bool impldbg_checkParameter_getHttpServerURL ( ::rtl::OUString& sHost , + sal_uInt16& nPort , + ::rtl::OUString& sPrefix ); + static sal_Bool impldbg_checkParameter_queryDispatch ( const css::util::URL& aURL , + const ::rtl::OUString& sTargetFrameName , + sal_Int32 nSearchFlags ); + static sal_Bool impldbg_checkParameter_queryDispatches ( const css::uno::Sequence< css::frame::DispatchDescriptor >& seqDescripts ); + static sal_Bool impldbg_checkParameter_statusChanged ( const css::frame::FeatureStateEvent& aEvent ); + static sal_Bool impldbg_checkParameter_disposing ( const css::lang::EventObject& aEvent ); + + #endif // #ifdef ENABLE_ASSERTIONS //------------------------------------------------------------------------------------------------------------- - // variables - // (should be private everyway!) + // variables + // (should be private everyway!) //------------------------------------------------------------------------------------------------------------- private: - css::uno::Reference< css::mozilla::XPluginInstancePeer > m_xPlugInInstancePeer ; /// Reference to UNO interface of PlugIn dll for communication with browser - css::uno::Reference< css::mozilla::XPluginWindowPeer > m_xPlugInWindowPeer ; /// Reference to set child window at plugin window - css::uno::Sequence< css::beans::PropertyValue > m_seqProperties ; /// Sequence of properties as arguments for load document - css::util::URL m_aURL ; /// URL for document to load - sal_Bool m_bILoad ; /// PlugInFrame has a valid loader which load the document and wait for finished/cancelled - sal_Bool m_bIHaveDocument ; /// We have a document loaded successful. - css::uno::Reference< css::frame::XDispatchProvider > m_xPlugInDispatcher ; /// Dispatcher to forward dispatches to browser + css::uno::Reference< css::mozilla::XPluginInstancePeer > m_xPlugInInstancePeer ; /// Reference to UNO interface of PlugIn dll for communication with browser + css::uno::Reference< css::mozilla::XPluginWindowPeer > m_xPlugInWindowPeer ; /// Reference to set child window at plugin window + css::uno::Sequence< css::beans::PropertyValue > m_seqProperties ; /// Sequence of properties as arguments for load document + css::util::URL m_aURL ; /// URL for document to load + sal_Bool m_bILoad ; /// PlugInFrame has a valid loader which load the document and wait for finished/cancelled + sal_Bool m_bIHaveDocument ; /// We have a document loaded successful. + css::uno::Reference< css::frame::XDispatchProvider > m_xPlugInDispatcher ; /// Dispatcher to forward dispatches to browser static sal_Bool m_bRemoteFactoriesExist ; /// indicates, if remote factories was already registered (neccessary one times only!) - SvtCommandOptions m_aCommandOptions ; /// ref counted class to support disabling commands defined by configuration file + SvtCommandOptions m_aCommandOptions ; /// ref counted class to support disabling commands defined by configuration file -}; // class PlugInFrame +}; // class PlugInFrame /*-************************************************************************************************************//** - @short used to forward all asynchronous calls which use VCL internal to the main thread - @descr We need this asynchronous mechanism to prevent us against dead locks. Sometimes our main thread + @short used to forward all asynchronous calls which use VCL internal to the main thread + @descr We need this asynchronous mechanism to prevent us against dead locks. Sometimes our main thread can call us for event handling like FOCUS, ACTIVATE and something else. But at the same time we will call the main thread to CREATE A WINDOW, SET IT VISIBLE ... Then we have a problem. We must send us himself a event to run our code synchronized with our main thread! @implements - @base - + @base - *//*-*************************************************************************************************************/ enum eIMPL_PluginCommand { - START , - STOP , - CREATEWINDOW , + START , + STOP , + CREATEWINDOW , DESTROY , NEWSTREAM , NEWURL @@ -301,75 +301,75 @@ enum eIMPL_PluginCommand class cIMPL_MainThreadExecutorRequest { public: - cIMPL_MainThreadExecutorRequest( eIMPL_PluginCommand eCommand , - PlugInFrame* pPluginInstance ); - - cIMPL_MainThreadExecutorRequest( eIMPL_PluginCommand eCommand , - PlugInFrame* pPluginInstance , - const css::uno::Any& aPlatformWindowHandle , - sal_Bool bEmbedded ); - - cIMPL_MainThreadExecutorRequest( eIMPL_PluginCommand eCommand , - PlugInFrame* pPluginInstance , - const ::rtl::OUString& sMIMEDescription , - const ::rtl::OUString& sURL , - const ::rtl::OUString& sFilter , - const css::uno::Reference< css::io::XInputStream >& xStream , - const css::uno::Any& aSessionId ); + cIMPL_MainThreadExecutorRequest( eIMPL_PluginCommand eCommand , + PlugInFrame* pPluginInstance ); + + cIMPL_MainThreadExecutorRequest( eIMPL_PluginCommand eCommand , + PlugInFrame* pPluginInstance , + const css::uno::Any& aPlatformWindowHandle , + sal_Bool bEmbedded ); + + cIMPL_MainThreadExecutorRequest( eIMPL_PluginCommand eCommand , + PlugInFrame* pPluginInstance , + const ::rtl::OUString& sMIMEDescription , + const ::rtl::OUString& sURL , + const ::rtl::OUString& sFilter , + const css::uno::Reference< css::io::XInputStream >& xStream , + const css::uno::Any& aSessionId ); /*-****************************************************************************************************//** - @short - - @descr - + @short - + @descr - - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual long doIt(); //------------------------------------------------------------------------------------------------------------- - // private variables + // private variables //------------------------------------------------------------------------------------------------------------- private: - eIMPL_PluginCommand m_eCommand ; /// switch to specify forward function - PlugInFrame* m_pPluginInstance ; /// instance wich has started this swicth mechanism and wish to called back from us - css::uno::Reference< css::uno::XInterface > m_xPluginInstance ; /// reference to our plugin frame to prevent that plugin frame dies before we call back - css::uno::Any m_aPlatformWindowHandle ; /// parameter for XPluginInstance->createWindow() - sal_Bool m_bEmbedded ; /// parameter for XPluginInstance->createWindow() - ::rtl::OUString m_sMIMEDescription ; /// parameter for XPluginInstance->newStream()/newURL() - ::rtl::OUString m_sURL ; /// parameter for XPluginInstance->newStream()/newURL() - ::rtl::OUString m_sFilter ; /// parameter for XPluginInstance->newStream()/newURL() - css::uno::Reference< css::io::XInputStream > m_xStream ; /// parameter for XPluginInstance->newStream()/newURL() - css::uno::Any m_aSessionId ; /// parameter for XPluginInstance->newStream()/newURL() + eIMPL_PluginCommand m_eCommand ; /// switch to specify forward function + PlugInFrame* m_pPluginInstance ; /// instance wich has started this swicth mechanism and wish to called back from us + css::uno::Reference< css::uno::XInterface > m_xPluginInstance ; /// reference to our plugin frame to prevent that plugin frame dies before we call back + css::uno::Any m_aPlatformWindowHandle ; /// parameter for XPluginInstance->createWindow() + sal_Bool m_bEmbedded ; /// parameter for XPluginInstance->createWindow() + ::rtl::OUString m_sMIMEDescription ; /// parameter for XPluginInstance->newStream()/newURL() + ::rtl::OUString m_sURL ; /// parameter for XPluginInstance->newStream()/newURL() + ::rtl::OUString m_sFilter ; /// parameter for XPluginInstance->newStream()/newURL() + css::uno::Reference< css::io::XInputStream > m_xStream ; /// parameter for XPluginInstance->newStream()/newURL() + css::uno::Any m_aSessionId ; /// parameter for XPluginInstance->newStream()/newURL() }; class cIMPL_MainThreadExecutor { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: static void execute( cIMPL_MainThreadExecutorRequest* pRequest ); /*-****************************************************************************************************//** - @short - - @descr - + @short - + @descr - - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ DECL_STATIC_LINK( cIMPL_MainThreadExecutor, worker, cIMPL_MainThreadExecutorRequest* ); }; -} // namespace framework +} // namespace framework -#endif // #ifndef __FRAMEWORK_SERVICES_PLUGINFRAME_HXX_ +#endif // #ifndef __FRAMEWORK_SERVICES_PLUGINFRAME_HXX_ diff --git a/framework/inc/services/sessionlistener.hxx b/framework/inc/services/sessionlistener.hxx index 5e08b33a82b0..8795d578ea15 100644 --- a/framework/inc/services/sessionlistener.hxx +++ b/framework/inc/services/sessionlistener.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -121,7 +121,7 @@ class SessionListener : // interfaces sal_Bool m_bAllowUserInteractionOnQuit; sal_Bool m_bTerminated; - + // in case of synchronous call the caller should do saveDone() call himself! void StoreSession( sal_Bool bAsync ); @@ -135,7 +135,7 @@ class SessionListener : // interfaces // XInterface, XTypeProvider, XServiceInfo FWK_DECLARE_XINTERFACE - FWK_DECLARE_XTYPEPROVIDER + FWK_DECLARE_XTYPEPROVIDER DECLARE_XSERVICEINFO #ifdef ENABLE_AUTODOC_FIX @@ -163,7 +163,7 @@ class SessionListener : // interfaces virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any >& args) throw (css::uno::RuntimeException); // XSessionManagerListener - virtual void SAL_CALL doSave( sal_Bool bShutdown, sal_Bool bCancelable ) + virtual void SAL_CALL doSave( sal_Bool bShutdown, sal_Bool bCancelable ) throw (css::uno::RuntimeException); virtual void SAL_CALL approveInteraction( sal_Bool bInteractionGranted ) throw (css::uno::RuntimeException); @@ -177,7 +177,7 @@ class SessionListener : // interfaces throw (::com::sun::star::uno::RuntimeException); // XStatusListener - virtual void SAL_CALL statusChanged(const com::sun::star::frame::FeatureStateEvent& event) + virtual void SAL_CALL statusChanged(const com::sun::star::frame::FeatureStateEvent& event) throw (css::uno::RuntimeException); void doSaveImpl( sal_Bool bShutdown, sal_Bool bCancelable ) throw (css::uno::RuntimeException); diff --git a/framework/inc/services/substitutepathvars.hxx b/framework/inc/services/substitutepathvars.hxx index ecfe5ccbfc41..9bf4b1ead43d 100644 --- a/framework/inc/services/substitutepathvars.hxx +++ b/framework/inc/services/substitutepathvars.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ #include <hash_map> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> @@ -46,7 +46,7 @@ #include <stdtypes.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> @@ -54,7 +54,7 @@ #include <com/sun/star/util/XStringSubstitution.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/implbase2.hxx> #include <rtl/ustring.hxx> @@ -68,12 +68,12 @@ namespace framework // Must be zero value based enum EnvironmentType { - ET_HOST = 0 , - ET_YPDOMAIN , - ET_DNSDOMAIN , - ET_NTDOMAIN , - ET_OS , - ET_UNKNOWN , + ET_HOST = 0 , + ET_YPDOMAIN , + ET_DNSDOMAIN , + ET_NTDOMAIN , + ET_OS , + ET_UNKNOWN , ET_COUNT }; @@ -81,10 +81,10 @@ enum EnvironmentType enum OperatingSystem { OS_WINDOWS = 0, - OS_UNIX , - OS_SOLARIS , - OS_LINUX , - OS_UNKNOWN , + OS_UNIX , + OS_SOLARIS , + OS_LINUX , + OS_UNKNOWN , OS_COUNT }; @@ -97,10 +97,10 @@ struct SubstituteRule EnvironmentType aType ) : aSubstVariable( aVarName ), aSubstValue( aValue ), aEnvValue( aVal ), aEnvType( aType ) {} - rtl::OUString aSubstVariable; - rtl::OUString aSubstValue; - com::sun::star::uno::Any aEnvValue; - EnvironmentType aEnvType; + rtl::OUString aSubstVariable; + rtl::OUString aSubstValue; + com::sun::star::uno::Any aEnvValue; + EnvironmentType aEnvType; }; struct SubstitutePathNotify @@ -109,7 +109,7 @@ struct SubstitutePathNotify const com::sun::star::uno::Sequence<rtl::OUString> aPropertyNames; }; -class SubstituteVariables : public ::std::hash_map< ::rtl::OUString, +class SubstituteVariables : public ::std::hash_map< ::rtl::OUString, SubstituteRule, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > @@ -131,45 +131,45 @@ class SubstitutePathVariables_Impl : public utl::ConfigItem static OperatingSystem GetOperatingSystemFromString( const rtl::OUString& ); static EnvironmentType GetEnvTypeFromString( const rtl::OUString& ); - void GetSharePointsRules( SubstituteVariables& aSubstVarMap ); + void GetSharePointsRules( SubstituteVariables& aSubstVarMap ); /** is called from the ConfigManager before application ends or from the PropertyChangeListener if the sub tree broadcasts changes. */ - virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); - virtual void Commit(); + virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); + virtual void Commit(); private: // Wrapper methods for low-level functions - OperatingSystem GetOperatingSystem(); - const rtl::OUString& GetYPDomainName(); - const rtl::OUString& GetDNSDomainName(); - const rtl::OUString& GetNTDomainName(); - const rtl::OUString& GetHostName(); + OperatingSystem GetOperatingSystem(); + const rtl::OUString& GetYPDomainName(); + const rtl::OUString& GetDNSDomainName(); + const rtl::OUString& GetNTDomainName(); + const rtl::OUString& GetHostName(); - sal_Bool FilterRuleSet( const SubstituteRuleVector& aRuleSet, SubstituteRule& aActiveRule ); + sal_Bool FilterRuleSet( const SubstituteRuleVector& aRuleSet, SubstituteRule& aActiveRule ); - void ReadSharePointsFromConfiguration( com::sun::star::uno::Sequence< rtl::OUString >& aSharePointsSeq ); - void ReadSharePointRuleSetFromConfiguration( const rtl::OUString& aSharePointName, + void ReadSharePointsFromConfiguration( com::sun::star::uno::Sequence< rtl::OUString >& aSharePointsSeq ); + void ReadSharePointRuleSetFromConfiguration( const rtl::OUString& aSharePointName, const rtl::OUString& aSharePointNodeName, SubstituteRuleVector& aRuleSet ); // Stored values for domains and host - sal_Bool m_bYPDomainRetrieved; - rtl::OUString m_aYPDomain; - sal_Bool m_bDNSDomainRetrieved; - rtl::OUString m_aDNSDomain; - sal_Bool m_bNTDomainRetrieved; - rtl::OUString m_aNTDomain; - sal_Bool m_bHostRetrieved; - rtl::OUString m_aHost; - sal_Bool m_bOSRetrieved; - OperatingSystem m_eOSType; - - Link m_aListenerNotify; - const rtl::OUString m_aSharePointsNodeName; - const rtl::OUString m_aDirPropertyName; - const rtl::OUString m_aEnvPropertyName; - const rtl::OUString m_aLevelSep; + sal_Bool m_bYPDomainRetrieved; + rtl::OUString m_aYPDomain; + sal_Bool m_bDNSDomainRetrieved; + rtl::OUString m_aDNSDomain; + sal_Bool m_bNTDomainRetrieved; + rtl::OUString m_aNTDomain; + sal_Bool m_bHostRetrieved; + rtl::OUString m_aHost; + sal_Bool m_bOSRetrieved; + OperatingSystem m_eOSType; + + Link m_aListenerNotify; + const rtl::OUString m_aSharePointsNodeName; + const rtl::OUString m_aDirPropertyName; + const rtl::OUString m_aEnvPropertyName; + const rtl::OUString m_aLevelSep; }; enum PreDefVariable @@ -202,15 +202,15 @@ enum PreDefVariable struct PredefinedPathVariables { // Predefined variables supported by substitute variables - LanguageType m_eLanguageType; // Lanuage type of Office - rtl::OUString m_FixedVar[ PREDEFVAR_COUNT ]; // Variable value access by PreDefVariable - rtl::OUString m_FixedVarNames[ PREDEFVAR_COUNT ]; // Variable name access by PreDefVariable + LanguageType m_eLanguageType; // Lanuage type of Office + rtl::OUString m_FixedVar[ PREDEFVAR_COUNT ]; // Variable value access by PreDefVariable + rtl::OUString m_FixedVarNames[ PREDEFVAR_COUNT ]; // Variable name access by PreDefVariable }; struct ReSubstFixedVarOrder { - sal_Int32 nVarValueLength; - PreDefVariable eVariable; + sal_Int32 nVarValueLength; + PreDefVariable eVariable; bool operator< ( const ReSubstFixedVarOrder& aFixedVarOrder ) const { @@ -221,8 +221,8 @@ struct ReSubstFixedVarOrder struct ReSubstUserVarOrder { - sal_Int32 nVarValueLength; - rtl::OUString aVarName; + sal_Int32 nVarValueLength; + rtl::OUString aVarName; bool operator< ( const ReSubstUserVarOrder& aUserVarOrder ) const { @@ -234,7 +234,7 @@ struct ReSubstUserVarOrder typedef std::list< ReSubstFixedVarOrder > ReSubstFixedVarOrderVector; typedef std::list< ReSubstUserVarOrder > ReSubstUserVarOrderVector; -class SubstitutePathVariables : private ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. +class SubstitutePathVariables : private ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. public ::cppu::WeakImplHelper2< ::com::sun::star::util::XStringSubstitution, css::lang::XServiceInfo> { friend class SubstitutePathVariables_Impl; @@ -257,16 +257,16 @@ class SubstitutePathVariables : private ThreadHelpBase , // Struct for ri protected: DECL_LINK( implts_ConfigurationNotify, SubstitutePathNotify* ); - void SetPredefinedPathVariables( PredefinedPathVariables& ); - rtl::OUString ConvertOSLtoUCBURL( const rtl::OUString& aOSLCompliantURL ) const; + void SetPredefinedPathVariables( PredefinedPathVariables& ); + rtl::OUString ConvertOSLtoUCBURL( const rtl::OUString& aOSLCompliantURL ) const; // Special case (transient) values can change during runtime! // Don't store them in the pre defined struct rtl::OUString GetWorkPath() const; - rtl::OUString GetWorkVariableValue() const; - rtl::OUString GetPathVariableValue() const; + rtl::OUString GetWorkVariableValue() const; + rtl::OUString GetPathVariableValue() const; - rtl::OUString GetHomeVariableValue() const; + rtl::OUString GetHomeVariableValue() const; // XStringSubstitution implementation methods rtl::OUString impl_substituteVariable( const ::rtl::OUString& aText, sal_Bool bSustRequired ) @@ -289,15 +289,15 @@ class SubstitutePathVariables : private ThreadHelpBase , // Struct for ri }; // heavy used string - const rtl::OUString m_aVarStart; - const rtl::OUString m_aVarEnd; - - VarNameToIndexMap m_aPreDefVarMap; // Mapping from pre-def variable names to enum for array access - SubstituteVariables m_aSubstVarMap; // Active rule set map indexed by variable name! - PredefinedPathVariables m_aPreDefVars; // All predefined variables - SubstitutePathVariables_Impl m_aImpl; // Implementation class that access the configuration - ReSubstFixedVarOrderVector m_aReSubstFixedVarOrder; // To speed up resubstitution fixed variables (order for lookup) - ReSubstUserVarOrderVector m_aReSubstUserVarOrder; // To speed up resubstitution user variables + const rtl::OUString m_aVarStart; + const rtl::OUString m_aVarEnd; + + VarNameToIndexMap m_aPreDefVarMap; // Mapping from pre-def variable names to enum for array access + SubstituteVariables m_aSubstVarMap; // Active rule set map indexed by variable name! + PredefinedPathVariables m_aPreDefVars; // All predefined variables + SubstitutePathVariables_Impl m_aImpl; // Implementation class that access the configuration + ReSubstFixedVarOrderVector m_aReSubstFixedVarOrder; // To speed up resubstitution fixed variables (order for lookup) + ReSubstUserVarOrderVector m_aReSubstUserVarOrder; // To speed up resubstitution user variables com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xServiceManager; }; diff --git a/framework/inc/services/tabwindowservice.hxx b/framework/inc/services/tabwindowservice.hxx index ccd522b9db11..ee3c6903b896 100644 --- a/framework/inc/services/tabwindowservice.hxx +++ b/framework/inc/services/tabwindowservice.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ #include <vector> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <classes/fwktabwindow.hxx> @@ -49,7 +49,7 @@ #include <stdtypes.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/awt/XSimpleTabController.hpp> @@ -57,46 +57,46 @@ #include <com/sun/star/beans/XPropertySet.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/weak.hxx> #include <vcl/window.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// exported const +// exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// exported definitions +// exported definitions //_________________________________________________________________________________________________________________ struct TTabPageInfo { public: - + TTabPageInfo() : m_nIndex ( -1 ) , m_bCreated (sal_False) , m_pPage ( NULL ) , m_lProperties ( ) {} - + TTabPageInfo(::sal_Int32 nID) : m_nIndex ( nID ) , m_bCreated (sal_False) , m_pPage ( NULL ) , m_lProperties ( ) {} - + public: - + ::sal_Int32 m_nIndex; ::sal_Bool m_bCreated; FwkTabPage* m_pPage; @@ -122,20 +122,20 @@ class TabWindowService : public css::lang::XTypeProvider , public ::cppu::OWeakObject { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: //--------------------------------------------------------------------------------------------------------- - // constructor / destructor + // constructor / destructor //--------------------------------------------------------------------------------------------------------- TabWindowService( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ); virtual ~TabWindowService(); //--------------------------------------------------------------------------------------------------------- - // XInterface, XTypeProvider, XServiceInfo + // XInterface, XTypeProvider, XServiceInfo //--------------------------------------------------------------------------------------------------------- FWK_DECLARE_XINTERFACE @@ -164,13 +164,13 @@ class TabWindowService : public css::lang::XTypeProvider virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw ( css::uno::RuntimeException ); //------------------------------------------------------------------------------------------------------------- - // protected methods + // protected methods //------------------------------------------------------------------------------------------------------------- protected: //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: @@ -194,39 +194,39 @@ class TabWindowService : public css::lang::XTypeProvider createPropertySetInfo( ::cppu::IPropertyArrayHelper& rProperties ) SAL_THROW( () ); */ //------------------------------------------------------------------------------------------------------------- - // variables - // (should be private everyway!) + // variables + // (should be private everyway!) //------------------------------------------------------------------------------------------------------------- private: /// reference to factory, which has created this instance css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory; - + /// the tab window as XWindow ( to hold window* alive !) css::uno::Reference< css::awt::XWindow > m_xTabWin; - + /// the VCL tab window FwkTabWindow* m_pTabWin; - + /// container of inserted tab pages TTabPageInfoHash m_lTabPageInfos; - + /// container of the added TabListener ::cppu::OMultiTypeInterfaceContainerHelper m_lListener; - + /// counter of the tabpage indexes ::sal_Int32 m_nPageIndexCounter; - + /// index of the current active page ::sal_Int32 m_nCurrentPageIndex; - + /// title of the tabcontrolled window ::rtl::OUString m_sTitle; }; // class TabWindowService -} // namespace framework +} // namespace framework #endif // #ifndef __FRAMEWORK_SERVICES_TABWINDOWSERVICE_HXX_ diff --git a/framework/inc/services/task.hxx b/framework/inc/services/task.hxx index 048bab27f7c9..d9f8a8d2c579 100644 --- a/framework/inc/services/task.hxx +++ b/framework/inc/services/task.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_SERVICES_TASK_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <services/frame.hxx> @@ -40,14 +40,14 @@ #include <macros/xserviceinfo.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/frame/XTask.hpp> #include <com/sun/star/awt/Point.hpp> #include <com/sun/star/awt/Size.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/weak.hxx> #include <cppuhelper/propshlp.hxx> @@ -56,27 +56,27 @@ #include <vcl/evntpost.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// exported const +// exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// exported definitions +// exported definitions //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** - @short implements an special frame - a task frame + @short implements an special frame - a task frame - @descr - + @descr - - @implements XTask + @implements XTask - @base Frame + @base Frame OPropertySet *//*-*************************************************************************************************************/ @@ -84,50 +84,50 @@ class Task : public css::frame::XTask , // => XFrame => XComponent public Frame // Order of baseclasses is neccessary for right initialization! { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: //--------------------------------------------------------------------------------------------------------- - // constructor / destructor + // constructor / destructor //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short standard constructor to create instance + @short standard constructor to create instance - @descr This constructor initialize a new instance of this class, + @descr This constructor initialize a new instance of this class, and will be set valid values on his member and baseclasses. - @seealso - + @seealso - - @param - + @param - - @return - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ Task( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ); /*-****************************************************************************************************//** - @short standard destructor + @short standard destructor - @descr This method destruct an instance of this class and clear some member. + @descr This method destruct an instance of this class and clear some member. - @seealso - + @seealso - - @param - + @param - - @return - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ - virtual ~Task(); + virtual ~Task(); //--------------------------------------------------------------------------------------------------------- - // XInterface, XTypeProvider, XServiceInfo + // XInterface, XTypeProvider, XServiceInfo //--------------------------------------------------------------------------------------------------------- DECLARE_XINTERFACE @@ -135,90 +135,90 @@ class Task : public css::frame::XTask , // => XFrame => XComponent DECLARE_XSERVICEINFO //--------------------------------------------------------------------------------------------------------- - // XTask + // XTask //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short - + @short - - @descr - + @descr - - @seealso - + @seealso - - @param - + @param - - @return - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual sal_Bool SAL_CALL close() throw( css::uno::RuntimeException ); /*-****************************************************************************************************//** - @short - + @short - - @descr - + @descr - - @seealso - + @seealso - - @param - + @param - - @return - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual void SAL_CALL tileWindows() throw( css::uno::RuntimeException ); /*-****************************************************************************************************//** - @short - + @short - - @descr - + @descr - - @seealso - + @seealso - - @param - + @param - - @return - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual void SAL_CALL arrangeWindowsVertical() throw( css::uno::RuntimeException ); /*-****************************************************************************************************//** - @short - + @short - - @descr - + @descr - - @seealso - + @seealso - - @param - + @param - - @return - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual void SAL_CALL arrangeWindowsHorizontal() throw( css::uno::RuntimeException ); //--------------------------------------------------------------------------------------------------------- - // XComponent + // XComponent //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short - + @short - - @descr We must overwrite this method, because baseclass Frame implements XFrame and XComponent. + @descr We must overwrite this method, because baseclass Frame implements XFrame and XComponent. XTask is derived from these classes to! The compiler don't know, which base is the right one. - @seealso - + @seealso - - @param - + @param - - @return - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual void SAL_CALL dispose() throw( css::uno::RuntimeException ) @@ -239,22 +239,22 @@ class Task : public css::frame::XTask , // => XFrame => XComponent } //--------------------------------------------------------------------------------------------------------- - // XFrame + // XFrame //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short - + @short - - @descr We must overwrite this method, because baseclass Frame implements XFrame and XComponent. + @descr We must overwrite this method, because baseclass Frame implements XFrame and XComponent. XTask is derived from these classes to! The compiler don't know, which base is right. - @seealso - + @seealso - - @param - + @param - - @return - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual void SAL_CALL initialize( const css::uno::Reference< css::awt::XWindow >& xWindow ) throw( css::uno::RuntimeException ) @@ -307,8 +307,8 @@ class Task : public css::frame::XTask , // => XFrame => XComponent return Frame::isActive(); } - virtual sal_Bool SAL_CALL setComponent( const css::uno::Reference< css::awt::XWindow >& xComponentWindow , - const css::uno::Reference< css::frame::XController >& xController ) throw( css::uno::RuntimeException ) + virtual sal_Bool SAL_CALL setComponent( const css::uno::Reference< css::awt::XWindow >& xComponentWindow , + const css::uno::Reference< css::frame::XController >& xController ) throw( css::uno::RuntimeException ) { return Frame::setComponent( xComponentWindow, xController ); } @@ -338,196 +338,196 @@ class Task : public css::frame::XTask , // => XFrame => XComponent Frame::removeFrameActionListener( xListener ); } - virtual css::uno::Reference< css::frame::XFrame > SAL_CALL findFrame( const ::rtl::OUString& sTargetFrameName , - sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException ); + virtual css::uno::Reference< css::frame::XFrame > SAL_CALL findFrame( const ::rtl::OUString& sTargetFrameName , + sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException ); //--------------------------------------------------------------------------------------------------------- - // XTopWindowListener + // XTopWindowListener //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short - + @short - - @descr - + @descr - - @seealso - - @seealso - + @seealso - + @seealso - - @param - + @param - - @return - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual void SAL_CALL windowClosing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException ); /*-****************************************************************************************************//** - @short - + @short - - @descr - + @descr - - @seealso - - @seealso - + @seealso - + @seealso - - @param - + @param - - @return - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual void SAL_CALL windowActivated( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException ); /*-****************************************************************************************************//** - @short - + @short - - @descr - + @descr - - @seealso - - @seealso - + @seealso - + @seealso - - @param - + @param - - @return - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual void SAL_CALL windowDeactivated( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException ); //--------------------------------------------------------------------------------------------------------- - // XEventListener + // XEventListener //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short - + @short - - @descr This object is forced to release all references to the interfaces given + @descr This object is forced to release all references to the interfaces given by the parameter Source. - @seealso - + @seealso - - @param - + @param - - @return - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException ); //------------------------------------------------------------------------------------------------------------- - // protected methods + // protected methods //------------------------------------------------------------------------------------------------------------- protected: //--------------------------------------------------------------------------- - // OPropertySetHelper + // OPropertySetHelper //--------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short try to convert a property value - @descr This method is calling from helperclass "OPropertySetHelper". + @short try to convert a property value + @descr This method is calling from helperclass "OPropertySetHelper". Don't use this directly! You must try to convert the value of given propertyhandle and return results of this operation. This will be use to ask vetoable listener. If no listener have a veto, we will change value realy! ( in method setFastPropertyValue_NoBroadcast(...) ) - @seealso OPropertySetHelper - @seealso setFastPropertyValue_NoBroadcast() + @seealso OPropertySetHelper + @seealso setFastPropertyValue_NoBroadcast() - @param "aConvertedValue" new converted value of property - @param "aOldValue" old value of property - @param "nHandle" handle of property - @param "aValue" new value of property + @param "aConvertedValue" new converted value of property + @param "aOldValue" old value of property + @param "nHandle" handle of property + @param "aValue" new value of property - @return sal_True if value will be changed, sal_FALSE otherway + @return sal_True if value will be changed, sal_FALSE otherway - @onerror IllegalArgumentException, if you call this with an invalid argument + @onerror IllegalArgumentException, if you call this with an invalid argument *//*-*****************************************************************************************************/ /* - virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& aConvertedValue , - css::uno::Any& aOldValue , - sal_Int32 nHandle , - const css::uno::Any& aValue ) throw( css::lang::IllegalArgumentException ); + virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& aConvertedValue , + css::uno::Any& aOldValue , + sal_Int32 nHandle , + const css::uno::Any& aValue ) throw( css::lang::IllegalArgumentException ); */ /*-****************************************************************************************************//** - @short set value of a transient property - @descr This method is calling from helperclass "OPropertySetHelper". + @short set value of a transient property + @descr This method is calling from helperclass "OPropertySetHelper". Don't use this directly! Handle and value are valid everyway! You must set the new value only. After this, baseclass send messages to all listener automaticly. - @seealso OPropertySetHelper + @seealso OPropertySetHelper - @param "nHandle" handle of property to change - @param "aValue" new value of property + @param "nHandle" handle of property to change + @param "aValue" new value of property - @return - + @return - - @onerror An exception is thrown. + @onerror An exception is thrown. *//*-*****************************************************************************************************/ /* - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle , - const css::uno::Any& aValue ) throw( css::uno::Exception ); + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle , + const css::uno::Any& aValue ) throw( css::uno::Exception ); */ /*-****************************************************************************************************//** - @short get value of a transient property - @descr This method is calling from helperclass "OPropertySetHelper". + @short get value of a transient property + @descr This method is calling from helperclass "OPropertySetHelper". Don't use this directly! - @seealso OPropertySetHelper + @seealso OPropertySetHelper - @param "nHandle" handle of property to change - @param "aValue" current value of property + @param "nHandle" handle of property to change + @param "aValue" current value of property - @return - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ /* - virtual void SAL_CALL getFastPropertyValue( css::uno::Any& aValue , - sal_Int32 nHandle ) const; + virtual void SAL_CALL getFastPropertyValue( css::uno::Any& aValue , + sal_Int32 nHandle ) const; */ /*-****************************************************************************************************//** @short return structure and information about transient properties - @descr This method is calling from helperclass "OPropertySetHelper". + @descr This method is calling from helperclass "OPropertySetHelper". Don't use this directly! - @seealso OPropertySetHelper + @seealso OPropertySetHelper - @param - + @param - - @return structure with property-informations + @return structure with property-informations - @onerror - + @onerror - *//*-*****************************************************************************************************/ /* virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); */ /*-****************************************************************************************************//** - @short return propertysetinfo - @descr You can call this method to get information about transient properties + @short return propertysetinfo + @descr You can call this method to get information about transient properties of this object. - @seealso OPropertySetHelper - @seealso XPropertySet - @seealso XMultiPropertySet + @seealso OPropertySetHelper + @seealso XPropertySet + @seealso XMultiPropertySet - @param - + @param - - @return reference to object with information [XPropertySetInfo] + @return reference to object with information [XPropertySetInfo] - @onerror - + @onerror - *//*-*****************************************************************************************************/ /* virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(); */ //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: @@ -536,43 +536,43 @@ class Task : public css::frame::XTask , // => XFrame => XComponent // void impl_SaveWindowAttributes(); -/* sal_Bool impl_tryToChangeProperty( sal_Bool bProperty , - const css::uno::Any& aValue , - css::uno::Any& aOldValue , - css::uno::Any& aConvertedValue ) throw( css::lang::IllegalArgumentException ); - sal_Bool impl_tryToChangeProperty( const ::rtl::OUString& sProperty , - const css::uno::Any& aValue , - css::uno::Any& aOldValue , - css::uno::Any& aConvertedValue ) throw( css::lang::IllegalArgumentException ); - sal_Bool impl_tryToChangeProperty( const css::awt::Point& aProperty , - const css::uno::Any& aValue , - css::uno::Any& aOldValue , - css::uno::Any& aConvertedValue ) throw( css::lang::IllegalArgumentException ); - sal_Bool impl_tryToChangeProperty( const css::awt::Size& aProperty , - const css::uno::Any& aValue , - css::uno::Any& aOldValue , - css::uno::Any& aConvertedValue ) throw( css::lang::IllegalArgumentException ); +/* sal_Bool impl_tryToChangeProperty( sal_Bool bProperty , + const css::uno::Any& aValue , + css::uno::Any& aOldValue , + css::uno::Any& aConvertedValue ) throw( css::lang::IllegalArgumentException ); + sal_Bool impl_tryToChangeProperty( const ::rtl::OUString& sProperty , + const css::uno::Any& aValue , + css::uno::Any& aOldValue , + css::uno::Any& aConvertedValue ) throw( css::lang::IllegalArgumentException ); + sal_Bool impl_tryToChangeProperty( const css::awt::Point& aProperty , + const css::uno::Any& aValue , + css::uno::Any& aOldValue , + css::uno::Any& aConvertedValue ) throw( css::lang::IllegalArgumentException ); + sal_Bool impl_tryToChangeProperty( const css::awt::Size& aProperty , + const css::uno::Any& aValue , + css::uno::Any& aOldValue , + css::uno::Any& aConvertedValue ) throw( css::lang::IllegalArgumentException ); static const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescriptor(); */ //------------------------------------------------------------------------------------------------------------- - // debug methods - // (should be private everyway!) + // debug methods + // (should be private everyway!) //------------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short debug-method to check incoming parameter of some other mehods of this class - @descr The following methods are used to check parameters for other methods + @short debug-method to check incoming parameter of some other mehods of this class + @descr The following methods are used to check parameters for other methods of this class. The return value is used directly for an ASSERT(...). - @seealso ASSERTs in implementation! + @seealso ASSERTs in implementation! - @param references to checking variables - @return sal_False on invalid parameter<BR> + @param references to checking variables + @return sal_False on invalid parameter<BR> sal_True otherway - @onerror - + @onerror - *//*-*****************************************************************************************************/ #ifdef ENABLE_ASSERTIONS @@ -581,11 +581,11 @@ class Task : public css::frame::XTask , // => XFrame => XComponent // Not used in the moment! - #endif // #ifdef ENABLE_ASSERTIONS + #endif // #ifdef ENABLE_ASSERTIONS //------------------------------------------------------------------------------------------------------------- - // variables - // (should be private everyway!) + // variables + // (should be private everyway!) //------------------------------------------------------------------------------------------------------------- protected: @@ -599,12 +599,12 @@ class Task : public css::frame::XTask , // => XFrame => XComponent // Properties sal_Bool m_bIsAlwaysVisible ; sal_Bool m_bIsFloating ; - css::awt::Point m_aPosition ; - css::awt::Size m_aSize ; + css::awt::Point m_aPosition ; + css::awt::Size m_aSize ; ::vcl::EventPoster m_aPoster ; -}; // class Tasks +}; // class Tasks -} // namespace framework +} // namespace framework -#endif // #ifndef __FRAMEWORK_SERVICES_TASKS_HXX_ +#endif // #ifndef __FRAMEWORK_SERVICES_TASKS_HXX_ diff --git a/framework/inc/services/taskcreatorsrv.hxx b/framework/inc/services/taskcreatorsrv.hxx index b805df44f185..fbd329f6456b 100644 --- a/framework/inc/services/taskcreatorsrv.hxx +++ b/framework/inc/services/taskcreatorsrv.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,35 +74,35 @@ class TaskCreatorService : public css::lang::XTypeProvider // types public: - + /// [XFrame] if it's set, it will be used as parent frame for the new created frame. static const ::rtl::OUString ARGUMENT_PARENTFRAME; - + /** [OUString] if it's not a special name (beginning with "_" ... which are not allowed here!) it will be set as the API name of the new created frame. */ static const ::rtl::OUString ARGUMENT_FRAMENAME; - + /// [sal_Bool] If its set to TRUE we will make the new created frame visible. static const ::rtl::OUString ARGUMENT_MAKEVISIBLE; - + /** [sal_Bool] If not "ContainerWindow" property is set it force creation of a top level window as new container window. */ static const ::rtl::OUString ARGUMENT_CREATETOPWINDOW; - + /// [Rectangle] Place the new created frame on this place and resize the container window. static const ::rtl::OUString ARGUMENT_POSSIZE; - + /// [XWindow] an outside created window, used as container window of the new created frame. static const ::rtl::OUString ARGUMENT_CONTAINERWINDOW; - + /** [sal_Bool] enable/disable special mode, where this frame will be part of the persistent window state feature suitable for any office module window */ static const ::rtl::OUString ARGUMENT_SUPPORTPERSISTENTWINDOWSTATE; - /** [sal_Bool] enable/disable special mode, where the title bar of our + /** [sal_Bool] enable/disable special mode, where the title bar of our the new created frame will be updated automaticly. Default = ON ! */ @@ -147,18 +147,18 @@ class TaskCreatorService : public css::lang::XTypeProvider css::uno::Reference< css::awt::XWindow > implts_createContainerWindow( const css::uno::Reference< css::awt::XWindow >& xParentWindow , const css::awt::Rectangle& aPosSize , sal_Bool bTopWindow ); - + void implts_applyDocStyleToWindow(const css::uno::Reference< css::awt::XWindow >& xWindow) const; - + css::uno::Reference< css::frame::XFrame > implts_createFrame( const css::uno::Reference< css::frame::XFrame >& xParentFrame , const css::uno::Reference< css::awt::XWindow >& xContainerWindow , const ::rtl::OUString& sName ); - + void implts_establishWindowStateListener( const css::uno::Reference< css::frame::XFrame >& xFrame ); void implts_establishTitleBarUpdate( const css::uno::Reference< css::frame::XFrame >& xFrame ); - + void implts_establishDocModifyListener( const css::uno::Reference< css::frame::XFrame >& xFrame ); - + ::rtl::OUString impl_filterNames( const ::rtl::OUString& sName ); }; diff --git a/framework/inc/services/uriabbreviation.hxx b/framework/inc/services/uriabbreviation.hxx index d78f68409080..42d5fa444d6e 100644 --- a/framework/inc/services/uriabbreviation.hxx +++ b/framework/inc/services/uriabbreviation.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,6 +61,6 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; }; -} // namespace framework +} // namespace framework -#endif // #ifndef __FRAMEWORK_SERVICES_URIABBREVIATION_HXX_ +#endif // #ifndef __FRAMEWORK_SERVICES_URIABBREVIATION_HXX_ diff --git a/framework/inc/services/urltransformer.hxx b/framework/inc/services/urltransformer.hxx index 5f14f2e5c324..069227446aa8 100644 --- a/framework/inc/services/urltransformer.hxx +++ b/framework/inc/services/urltransformer.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_SERVICES_URLTRANSFORMER_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #ifndef __FRAMEWORK_OMUTEXMEMBER_HXX_ @@ -43,181 +43,181 @@ #include <general.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/util/URL.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/implbase2.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// exported const +// exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// exported definitions +// exported definitions //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** @short - @descr - + @descr - - @implements XInterface + @implements XInterface XTypeProvider XServiceInfo XURLTransformer - @base ThreadHelpBase + @base ThreadHelpBase OWeakObject *//*-*************************************************************************************************************/ -class URLTransformer : public ::cppu::WeakImplHelper2< ::com::sun::star::util::XURLTransformer, css::lang::XServiceInfo> +class URLTransformer : public ::cppu::WeakImplHelper2< ::com::sun::star::util::XURLTransformer, css::lang::XServiceInfo> { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: //--------------------------------------------------------------------------------------------------------- - // constructor / destructor + // constructor / destructor //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short - - @descr - + @short - + @descr - - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ URLTransformer( const css::uno::Reference< css::lang::XMultiServiceFactory >& sFactory ); /*-****************************************************************************************************//** - @short - - @descr - + @short - + @descr - - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ - virtual ~URLTransformer(); + virtual ~URLTransformer(); //--------------------------------------------------------------------------------------------------------- - // XInterface, XTypeProvider, XServiceInfo + // XInterface, XTypeProvider, XServiceInfo //--------------------------------------------------------------------------------------------------------- DECLARE_XSERVICEINFO //--------------------------------------------------------------------------------------------------------- - // XURLTransformer + // XURLTransformer //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short - - @descr - + @short - + @descr - - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual sal_Bool SAL_CALL parseStrict( css::util::URL& aURL ) throw( css::uno::RuntimeException ); /*-****************************************************************************************************//** - @short - - @descr - + @short - + @descr - - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ - virtual sal_Bool SAL_CALL parseSmart( css::util::URL& aURL , - const ::rtl::OUString& sSmartProtocol ) throw( css::uno::RuntimeException ); + virtual sal_Bool SAL_CALL parseSmart( css::util::URL& aURL , + const ::rtl::OUString& sSmartProtocol ) throw( css::uno::RuntimeException ); /*-****************************************************************************************************//** - @short - - @descr - + @short - + @descr - - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual sal_Bool SAL_CALL assemble( css::util::URL& aURL ) throw( css::uno::RuntimeException ); /*-****************************************************************************************************//** - @short - - @descr - + @short - + @descr - - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ - virtual ::rtl::OUString SAL_CALL getPresentation( const css::util::URL& aURL , - sal_Bool bWithPassword ) throw( css::uno::RuntimeException ); + virtual ::rtl::OUString SAL_CALL getPresentation( const css::util::URL& aURL , + sal_Bool bWithPassword ) throw( css::uno::RuntimeException ); //------------------------------------------------------------------------------------------------------------- - // protected methods + // protected methods //------------------------------------------------------------------------------------------------------------- protected: //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: //------------------------------------------------------------------------------------------------------------- - // debug methods - // (should be private everyway!) + // debug methods + // (should be private everyway!) //------------------------------------------------------------------------------------------------------------- //------------------------------------------------------------------------------------------------------------- - // variables - // (should be private everyway!) + // variables + // (should be private everyway!) //------------------------------------------------------------------------------------------------------------- private: - css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory ; /// reference to factory, which has created this instance + css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory ; /// reference to factory, which has created this instance -}; // class URLTransformer +}; // class URLTransformer -} // namespace framework +} // namespace framework -#endif // #ifndef __FRAMEWORK_SERVICES_URLTRANSFORMER_HXX_ +#endif // #ifndef __FRAMEWORK_SERVICES_URLTRANSFORMER_HXX_ diff --git a/framework/inc/stdtypes.h b/framework/inc/stdtypes.h index 5bc781d3fee3..08e0f700a241 100644 --- a/framework/inc/stdtypes.h +++ b/framework/inc/stdtypes.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,7 +53,7 @@ #include <rtl/ustring.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ @@ -136,7 +136,7 @@ class OUStringList : public ::comphelper::SequenceAsVector< ::rtl::OUString > { return ::std::find(begin(), end(), sElement); } - + const_iterator findConst( const ::rtl::OUString& sElement ) const { return ::std::find(begin(), end(), sElement); diff --git a/framework/inc/tabwin/tabwindow.hxx b/framework/inc/tabwin/tabwindow.hxx index 80a43f6df529..3f0072be212f 100644 --- a/framework/inc/tabwin/tabwindow.hxx +++ b/framework/inc/tabwin/tabwindow.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_TABWIN_TABWINDOW_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <stdtypes.h> @@ -41,7 +41,7 @@ #include <services.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> @@ -59,7 +59,7 @@ #include <com/sun/star/awt/XTabListener.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <cppuhelper/propshlp.hxx> #include <cppuhelper/interfacecontainer.hxx> @@ -70,16 +70,16 @@ namespace framework { -class TabWindow : public ::com::sun::star::lang::XTypeProvider , - public ::com::sun::star::lang::XServiceInfo , - public ::com::sun::star::lang::XInitialization , +class TabWindow : public ::com::sun::star::lang::XTypeProvider , + public ::com::sun::star::lang::XServiceInfo , + public ::com::sun::star::lang::XInitialization , public ::com::sun::star::lang::XComponent , public ::com::sun::star::awt::XWindowListener , public ::com::sun::star::awt::XTopWindowListener , public ::com::sun::star::awt::XSimpleTabController , - protected ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. - public ::cppu::OBroadcastHelper , - public ::cppu::OPropertySetHelper , // => XPropertySet / XFastPropertySet / XMultiPropertySet + protected ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. + public ::cppu::OBroadcastHelper , + public ::cppu::OPropertySetHelper , // => XPropertySet / XFastPropertySet / XMultiPropertySet public ::cppu::OWeakObject { public: @@ -93,21 +93,21 @@ class TabWindow : public ::com::sun::star::lang::XTypeProvider , using ::cppu::OPropertySetHelper::disposing; using ::cppu::OPropertySetHelper::getFastPropertyValue; - + //--------------------------------------------------------------------------------------------------------- - // XInitialization + // XInitialization //--------------------------------------------------------------------------------------------------------- virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); //--------------------------------------------------------------------------------------------------------- - // XComponent + // XComponent //--------------------------------------------------------------------------------------------------------- virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); //--------------------------------------------------------------------------------------------------------- - // XSimpleTabController + // XSimpleTabController //--------------------------------------------------------------------------------------------------------- virtual ::sal_Int32 SAL_CALL insertTab() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeTab( ::sal_Int32 ID ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); @@ -124,7 +124,7 @@ class TabWindow : public ::com::sun::star::lang::XTypeProvider , virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException ); //--------------------------------------------------------------------------------------------------------- - // XTopWindowListener + // XTopWindowListener //--------------------------------------------------------------------------------------------------------- virtual void SAL_CALL windowOpened( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL windowClosing( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException); @@ -135,7 +135,7 @@ class TabWindow : public ::com::sun::star::lang::XTypeProvider , virtual void SAL_CALL windowDeactivated( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException); //--------------------------------------------------------------------------------------------------------- - // XWindowListener + // XWindowListener //--------------------------------------------------------------------------------------------------------- virtual void SAL_CALL windowResized( const css::awt::WindowEvent& aEvent ) throw( css::uno::RuntimeException ); virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& aEvent ) throw( css::uno::RuntimeException ); @@ -148,7 +148,7 @@ class TabWindow : public ::com::sun::star::lang::XTypeProvider , private: //--------------------------------------------------------------------------------------------------------- - // OPropertySetHelper + // OPropertySetHelper //--------------------------------------------------------------------------------------------------------- virtual sal_Bool SAL_CALL convertFastPropertyValue( com::sun::star::uno::Any& aConvertedValue , com::sun::star::uno::Any& aOldValue , @@ -183,15 +183,15 @@ class TabWindow : public ::com::sun::star::lang::XTypeProvider , typedef std::vector< sal_uInt16 > PageIdVector; - sal_Bool m_bInitialized : 1, + sal_Bool m_bInitialized : 1, m_bDisposed : 1; sal_Int32 m_nNextTabID; ::rtl::OUString m_aTitlePropName; ::rtl::OUString m_aPosPropName; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTopWindow > m_xTopWindow; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xContainerWindow; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xTabControlWindow; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xContainerWindow; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xTabControlWindow; ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; // container for ALL Listener }; diff --git a/framework/inc/tabwin/tabwinfactory.hxx b/framework/inc/tabwin/tabwinfactory.hxx index b73b19116851..c2c33d014819 100644 --- a/framework/inc/tabwin/tabwinfactory.hxx +++ b/framework/inc/tabwin/tabwinfactory.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_TABWIN_TABWINFACTORY_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <stdtypes.h> @@ -41,7 +41,7 @@ #include <services.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> @@ -51,7 +51,7 @@ #include <com/sun/star/awt/XToolkit.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <cppuhelper/implbase2.hxx> #include <rtl/ustring.hxx> @@ -59,7 +59,7 @@ namespace framework { -class TabWinFactory : protected ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. +class TabWinFactory : protected ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XSingleComponentFactory, com::sun::star::lang::XServiceInfo> { public: @@ -75,7 +75,7 @@ class TabWinFactory : protected ThreadHelpBase , // Struct for ri private: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > m_xToolkit; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > m_xToolkit; }; } diff --git a/framework/inc/targets.h b/framework/inc/targets.h index 80cdeb959b92..df96d0db7f03 100644 --- a/framework/inc/targets.h +++ b/framework/inc/targets.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,19 +29,19 @@ #define __FRAMEWORK_TARGETS_H_ //_________________________________________________________________________________________________________________ -// includes +// includes //_________________________________________________________________________________________________________________ #include <macros/generic.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// Values for special frame search ... sTargetFrameName of findFrame() or queryDispatch() or loadComponentFromURL() +// Values for special frame search ... sTargetFrameName of findFrame() or queryDispatch() or loadComponentFromURL() //_________________________________________________________________________________________________________________ #define SPECIALTARGET_ASCII_SELF "_self" // The frame himself is searched. @@ -64,6 +64,6 @@ namespace framework{ #define SPECIALTARGET_HELPAGENT DECLARE_ASCII(SPECIALTARGET_ASCII_HELPAGENT ) #define SPECIALTARGET_HELPTASK DECLARE_ASCII(SPECIALTARGET_ASCII_HELPTASK ) -} // namespace framework +} // namespace framework -#endif // #ifndef __FRAMEWORK_TARGETS_H_ +#endif // #ifndef __FRAMEWORK_TARGETS_H_ diff --git a/framework/inc/threadhelp/fairrwlock.hxx b/framework/inc/threadhelp/fairrwlock.hxx index c326619c4783..0f984c8d03f9 100644 --- a/framework/inc/threadhelp/fairrwlock.hxx +++ b/framework/inc/threadhelp/fairrwlock.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_THREADHELP_FAIRRWLOCK_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/inoncopyable.h> @@ -37,33 +37,33 @@ #include <macros/debug.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/uno/XInterface.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <osl/mutex.hxx> #include <osl/conditn.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** @short implement a read/write lock with fairness between read/write accessors - @descr These implementation never should used as base class! Use it as a member every time. + @descr These implementation never should used as base class! Use it as a member every time. Use ReadGuard and/or WriteGuard in your methods (which work with these lock) to make your code threadsafe. Fair means: All reading or writing threads are synchronized AND serialzed by using one @@ -71,17 +71,17 @@ namespace framework{ for writer this mutex is used to have an exclusiv access on your class member! => It's a multi-reader/single-writer lock, which no preferred accessor. - @implements IRWlock + @implements IRWlock @base INonCopyable IRWLock - @devstatus ready to use + @devstatus ready to use *//*-*************************************************************************************************************/ class FairRWLock : public IRWLock , private INonCopyable { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: @@ -270,17 +270,17 @@ class FairRWLock : public IRWLock } //------------------------------------------------------------------------------------------------------------- - // private member + // private member //------------------------------------------------------------------------------------------------------------- private: - ::osl::Mutex m_aAccessLock ; /// regulate access on internal member of this instance - ::osl::Mutex m_aSerializer ; /// serialze incoming read/write access threads - ::osl::Condition m_aWriteCondition ; /// a writer must wait till current working reader are gone - sal_Int32 m_nReadCount ; /// every reader is registered - the last one open the door for waiting writer + ::osl::Mutex m_aAccessLock ; /// regulate access on internal member of this instance + ::osl::Mutex m_aSerializer ; /// serialze incoming read/write access threads + ::osl::Condition m_aWriteCondition ; /// a writer must wait till current working reader are gone + sal_Int32 m_nReadCount ; /// every reader is registered - the last one open the door for waiting writer -}; // class FairRWLock +}; // class FairRWLock -} // namespace framework +} // namespace framework -#endif // #ifndef __FRAMEWORK_THREADHELP_FAIRRWLOCK_HXX_ +#endif // #ifndef __FRAMEWORK_THREADHELP_FAIRRWLOCK_HXX_ diff --git a/framework/inc/threadhelp/gate.hxx b/framework/inc/threadhelp/gate.hxx index c95a5039a579..c3d4712d4fc9 100644 --- a/framework/inc/threadhelp/gate.hxx +++ b/framework/inc/threadhelp/gate.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,69 +29,69 @@ #define __FRAMEWORK_THREADHELP_GATE_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/inoncopyable.h> #include <threadhelp/igate.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <osl/mutex.hxx> #include <osl/conditn.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** @short implement a gate to block multiple threads at same time or unblock all - @descr A gate can be used as a negative-condition! You can open a "door" - wait() will not block ... + @descr A gate can be used as a negative-condition! You can open a "door" - wait() will not block ... or you can close it - wait() blocks till open() is called again. As a special feature you can open the gate a little bit by sing openGap(). Then all currently waiting threads are running immediately - but new ones are blocked! - @attention To prevent us against wrong using, the default ctor, copy ctor and the =operator are maked private! + @attention To prevent us against wrong using, the default ctor, copy ctor and the =operator are maked private! @implements IGate @base IGate INonCopyable - @devstatus ready to use + @devstatus ready to use *//*-*************************************************************************************************************/ class Gate : public IGate , private INonCopyable { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: /*-****************************************************************************************************//** - @short ctor - @descr These initialize the object right as an open gate. + @short ctor + @descr These initialize the object right as an open gate. - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ inline Gate() : m_bClosed ( sal_False ) @@ -101,17 +101,17 @@ class Gate : public IGate } /*-****************************************************************************************************//** - @short dtor - @descr Is user forget it - we open the gate ... + @short dtor + @descr Is user forget it - we open the gate ... blocked threads can running ... but I don't know if it's right - we are destroyed yet!? - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ inline virtual ~Gate() { @@ -120,15 +120,15 @@ class Gate : public IGate /*-****************************************************************************************************//** @interface IGate - @short open the gate - @descr A wait() call will not block then. + @short open the gate + @descr A wait() call will not block then. - @seealso method close() + @seealso method close() - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ inline virtual void open() { @@ -143,15 +143,15 @@ class Gate : public IGate /*-****************************************************************************************************//** @interface IGate - @short close the gate - @descr A wait() call will block then. + @short close the gate + @descr A wait() call will block then. - @seealso method open() + @seealso method open() - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ inline virtual void close() { @@ -166,18 +166,18 @@ class Gate : public IGate /*-****************************************************************************************************//** @interface IGate - @short open gate for current waiting threads - @descr All current waiting threads stand in wait() at line "m_aPassage.wait()" ... + @short open gate for current waiting threads + @descr All current waiting threads stand in wait() at line "m_aPassage.wait()" ... With this call you can open the passage for these waiting ones. The "gap" is closed by any new thread which call wait() automaticly! - @seealso method wait() - @seealso method open() + @seealso method wait() + @seealso method open() - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ inline virtual void openGap() { @@ -192,19 +192,19 @@ class Gate : public IGate /*-****************************************************************************************************//** @interface IGate - @short must be called to pass the gate - @descr If gate "open" => wait() will not block. + @short must be called to pass the gate + @descr If gate "open" => wait() will not block. If gate "closed" => wait() will block till somewhere open it again. If gap "open" => currently waiting threads unblocked, new ones blocked - @seealso method wait() - @seealso method open() + @seealso method wait() + @seealso method open() - @param "pTimeOut", optional parameter to wait a certain time - @return true, if wait was successful (gate was opened) + @param "pTimeOut", optional parameter to wait a certain time + @return true, if wait was successful (gate was opened) false, if condition has an error or timeout was reached! - @onerror We return false. + @onerror We return false. *//*-*****************************************************************************************************/ inline virtual sal_Bool wait( const TimeValue* pTimeOut = NULL ) { @@ -232,17 +232,17 @@ class Gate : public IGate } //------------------------------------------------------------------------------------------------------------- - // private member + // private member //------------------------------------------------------------------------------------------------------------- private: - ::osl::Mutex m_aAccessLock ; - ::osl::Condition m_aPassage ; - sal_Bool m_bClosed ; - sal_Bool m_bGapOpen ; + ::osl::Mutex m_aAccessLock ; + ::osl::Condition m_aPassage ; + sal_Bool m_bClosed ; + sal_Bool m_bGapOpen ; -}; // class Gate +}; // class Gate -} // namespace framework +} // namespace framework -#endif // #ifndef __FRAMEWORK_THREADHELP_GATE_HXX_ +#endif // #ifndef __FRAMEWORK_THREADHELP_GATE_HXX_ diff --git a/framework/inc/threadhelp/igate.h b/framework/inc/threadhelp/igate.h index 96a7fe6df143..b599dcd4ac25 100644 --- a/framework/inc/threadhelp/igate.h +++ b/framework/inc/threadhelp/igate.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,19 +29,19 @@ #define __FRAMEWORK_THREADHELP_IGATE_H_ //_________________________________________________________________________________________________________________ -// includes +// includes //_________________________________________________________________________________________________________________ #include <osl/time.h> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** @@ -50,12 +50,12 @@ namespace framework{ class IGate { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: /*-****************************************************************************************************//** - @descr These functions must be supported by a derived class! + @descr These functions must be supported by a derived class! open() -open access for all waiting threads close() -close access for all further coming threads openGap() -open access for current waiting threads only @@ -68,6 +68,6 @@ class IGate }; // class IGate -} // namespace framework +} // namespace framework #endif // #ifndef __FRAMEWORK_THREADHELP_IGATE_H_ diff --git a/framework/inc/threadhelp/imutex.h b/framework/inc/threadhelp/imutex.h index 44ccff83a7fc..70784c312b87 100644 --- a/framework/inc/threadhelp/imutex.h +++ b/framework/inc/threadhelp/imutex.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,17 +29,17 @@ #define __FRAMEWORK_THREADHELP_IMUTEX_H_ //_________________________________________________________________________________________________________________ -// includes +// includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** @@ -48,12 +48,12 @@ namespace framework{ class IMutex { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: /*-****************************************************************************************************//** - @descr These functions must be supported by a derived class! + @descr These functions must be supported by a derived class! acquire() -try to register thread release() -unregister thread *//*-*****************************************************************************************************/ @@ -62,6 +62,6 @@ class IMutex }; // class IMutex -} // namespace framework +} // namespace framework #endif // #ifndef __FRAMEWORK_THREADHELP_IMUTEX_H_ diff --git a/framework/inc/threadhelp/inoncopyable.h b/framework/inc/threadhelp/inoncopyable.h index fef21a3175c6..a0652ff2ea39 100644 --- a/framework/inc/threadhelp/inoncopyable.h +++ b/framework/inc/threadhelp/inoncopyable.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,33 +29,33 @@ #define __FRAMEWORK_THREADHELP_INONCOPYABLE_H_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** - @descr Use this as one of your base classes to disable + @descr Use this as one of your base classes to disable all possiblities to copy or assign one object to another one! We declare neccessary functions private to do so. *//*-*************************************************************************************************************/ @@ -72,6 +72,6 @@ class INonCopyable }; // class INonCopyable -} // namespace framework +} // namespace framework -#endif // #ifndef __FRAMEWORK_THREADHELP_INONCOPYABLE_H_ +#endif // #ifndef __FRAMEWORK_THREADHELP_INONCOPYABLE_H_ diff --git a/framework/inc/threadhelp/irwlock.h b/framework/inc/threadhelp/irwlock.h index ddd01350b8a2..e34b310a8fe8 100644 --- a/framework/inc/threadhelp/irwlock.h +++ b/framework/inc/threadhelp/irwlock.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,32 +29,32 @@ #define __FRAMEWORK_THREADHELP_IRWLOCK_H_ //_________________________________________________________________________________________________________________ -// includes +// includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** - @descr A guard (specialy a write guard) support different internal working states. + @descr A guard (specialy a write guard) support different internal working states. His lock can set for reading or writing/reading! Or he was unlocked by user ... *//*-*************************************************************************************************************/ enum ELockMode { - E_NOLOCK , - E_READLOCK , + E_NOLOCK , + E_READLOCK , E_WRITELOCK }; /*-************************************************************************************************************//** - @descr We implement two guards for using an rw-lock. But if you wish to implement + @descr We implement two guards for using an rw-lock. But if you wish to implement different rw-locks to you will have problems by using with same guard implementation! Thats why we define this "pure virtual base class" ... All rw-locks must support this base interface for working and all guard must use this one too! @@ -62,17 +62,17 @@ enum ELockMode class IRWLock { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: /*-****************************************************************************************************//** - @descr These functions must be supported by a derived class! - acquireReadAccess() -try to register thread as reader - releaseReadAccess() -unregister thread as reader - acquireWriteAccess() -try to register thread as writer - releaseWriteAccess() -unregister thread as writer - downgradeWriteAccess() -make writer to reader + @descr These functions must be supported by a derived class! + acquireReadAccess() -try to register thread as reader + releaseReadAccess() -unregister thread as reader + acquireWriteAccess() -try to register thread as writer + releaseWriteAccess() -unregister thread as writer + downgradeWriteAccess() -make writer to reader *//*-*****************************************************************************************************/ virtual void acquireReadAccess () =0; virtual void releaseReadAccess () =0; @@ -80,8 +80,8 @@ class IRWLock virtual void releaseWriteAccess () =0; virtual void downgradeWriteAccess () =0; -}; // class IRWLock +}; // class IRWLock -} // namespace framework +} // namespace framework -#endif // #ifndef __FRAMEWORK_THREADHELP_IRWLOCK_H_ +#endif // #ifndef __FRAMEWORK_THREADHELP_IRWLOCK_H_ diff --git a/framework/inc/threadhelp/itransactionmanager.h b/framework/inc/threadhelp/itransactionmanager.h index 4d9464d32b0d..f0db5a24a113 100644 --- a/framework/inc/threadhelp/itransactionmanager.h +++ b/framework/inc/threadhelp/itransactionmanager.h @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_THREADHELP_ITRANSACTIONMANAGER_H_ //_________________________________________________________________________________________________________________ -// includes +// includes //_________________________________________________________________________________________________________________ #include <general.h> @@ -37,17 +37,17 @@ #include <com/sun/star/lang/DisposedException.hpp> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** - @descr Describe different states of a feature of following implementation. + @descr Describe different states of a feature of following implementation. During live time of an object different working states occure: initialization - working - closing - closed If you whish to implement thread safe classes you should use these feature to protect @@ -70,8 +70,8 @@ enum EWorkingMode *//*-*************************************************************************************************************/ enum ERejectReason { - E_UNINITIALIZED , - E_NOREASON , + E_UNINITIALIZED , + E_NOREASON , E_INCLOSE , E_CLOSED }; @@ -81,12 +81,12 @@ enum ERejectReason e.g. We can throw a DisposedException if user try to work and our mode is E_CLOSE! But sometimes he dont need this feature - will handle it by himself. Then we must differ between some exception-modi: - E_NOEXCEPTIONS We never throw any exceptions! User handle it private and looks for ERejectReason. - E_HARDEXCEPTIONS We throw exceptions for all working modes different from E_WORK! + E_NOEXCEPTIONS We never throw any exceptions! User handle it private and looks for ERejectReason. + E_HARDEXCEPTIONS We throw exceptions for all working modes different from E_WORK! E_SOFTEXCEPTIONS We throw exceptions for all working modes different from E_WORK AND E_INCLOSE! This mode is useful for impl-methods which should be callable from dispose() method! - e.g. void dispose() + e.g. void dispose() { m_aTransactionManager.setWorkingMode( E_BEFORECLOSE ); ... @@ -109,7 +109,7 @@ enum ERejectReason *//*-*************************************************************************************************************/ enum EExceptionMode { - E_NOEXCEPTIONS , + E_NOEXCEPTIONS , E_HARDEXCEPTIONS, E_SOFTEXCEPTIONS }; @@ -123,16 +123,16 @@ enum EExceptionMode class ITransactionManager { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: /*-****************************************************************************************************//** - @descr These functions must be supported by a derived class! + @descr These functions must be supported by a derived class! getWorkingMode() -return current set working mode - setWorkingMode() -change working mode + setWorkingMode() -change working mode (This will block till all current transactions are finished!) - isCallRejected() -test method to check if a call will be rejected by wrong working mode or not + isCallRejected() -test method to check if a call will be rejected by wrong working mode or not registerTransaction() -start new transaction (increase internal transaction count) unregisterTransaction() -finish transaction (decrease internal transaction count) *//*-*****************************************************************************************************/ @@ -144,6 +144,6 @@ class ITransactionManager }; // class ITransactionManager -} // namespace framework +} // namespace framework #endif // #ifndef __FRAMEWORK_THREADHELP_ITRANSACTIONMANAGER_H_ diff --git a/framework/inc/threadhelp/lockhelper.hxx b/framework/inc/threadhelp/lockhelper.hxx index e199bdb45cbb..5677350b5349 100644 --- a/framework/inc/threadhelp/lockhelper.hxx +++ b/framework/inc/threadhelp/lockhelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_THREADHELP_LOCKHELPER_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/inoncopyable.h> @@ -38,23 +38,23 @@ #include <threadhelp/fairrwlock.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <osl/mutex.hxx> #include <vos/mutex.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** @@ -75,7 +75,7 @@ enum ELockType #define FALLBACK_LOCKTYPE E_SOLARMUTEX //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** @@ -109,7 +109,7 @@ class LockHelper : public IMutex , private INonCopyable { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: @@ -174,6 +174,6 @@ class LockHelper : public IMutex mutable sal_Bool m_bDummySolarMutex ; }; -} // namespace framework +} // namespace framework #endif // #ifndef __FRAMEWORK_THREADHELP_LOCKHELPER_HXX_ diff --git a/framework/inc/threadhelp/readguard.hxx b/framework/inc/threadhelp/readguard.hxx index dc680f4a557e..997042c9e601 100644 --- a/framework/inc/threadhelp/readguard.hxx +++ b/framework/inc/threadhelp/readguard.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_THREADHELP_READGUARD_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/inoncopyable.h> @@ -40,31 +40,31 @@ //#endif //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <sal/types.h> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** @short implement a guard to set read locks - @descr This guard should be used to set a lock for reading object internal member. + @descr This guard should be used to set a lock for reading object internal member. Nobody can control it but don't use member after successfuly locking for writing! We never need a own mutex to safe our internal member access - because a guard is used as function-local member only. There exist no multithreaded access to it realy ... @@ -73,15 +73,15 @@ namespace framework{ b) Use interface "IRWLock" of set LockHelper only - because we must support a finer granularity of locking. Interface "IMutex" should be used by easier guard implementations ... like "ResetableGuard"! - @implements - + @implements - @base INonCopyable - @devstatus ready to use + @devstatus ready to use *//*-*************************************************************************************************************/ class ReadGuard : private INonCopyable { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: @@ -171,34 +171,34 @@ class ReadGuard : private INonCopyable } //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: /*-****************************************************************************************************//** - @short disable using of these functions! - @descr It's not allowed to use this methods. Different problem can occure otherwise. + @short disable using of these functions! + @descr It's not allowed to use this methods. Different problem can occure otherwise. Thats why we disable it by make it private. - @seealso other ctor + @seealso other ctor - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ ReadGuard(); //------------------------------------------------------------------------------------------------------------- - // private member + // private member //------------------------------------------------------------------------------------------------------------- private: IRWLock* m_pLock ; /// reference to lock-member of protected object - sal_Bool m_bLocked ; /// protection against multiple lock calls without unlock! + sal_Bool m_bLocked ; /// protection against multiple lock calls without unlock! -}; // class ReadGuard +}; // class ReadGuard -} // namespace framework +} // namespace framework -#endif // #ifndef __FRAMEWORK_THREADHELP_READGUARD_HXX_ +#endif // #ifndef __FRAMEWORK_THREADHELP_READGUARD_HXX_ diff --git a/framework/inc/threadhelp/resetableguard.hxx b/framework/inc/threadhelp/resetableguard.hxx index b929e70c41a2..58830189e052 100644 --- a/framework/inc/threadhelp/resetableguard.hxx +++ b/framework/inc/threadhelp/resetableguard.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_THREADHELP_RESETABLEGUARD_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/inoncopyable.h> @@ -40,31 +40,31 @@ //#endif //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <sal/types.h> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** @short implement a guard for implementing save thread access - @descr These guard has an additional feature to well known one ::osl::Guard. + @descr These guard has an additional feature to well known one ::osl::Guard. You can lock() and unlock() it very often! A set bool flag inside protect this implementation against multiple lock() calls without any unlock()! So the increasing of guarded mutex couldn't be greater then 1 ... @@ -73,30 +73,30 @@ namespace framework{ b) Use interface "IMutex" of set LockHelper only - because we must support an exclusiv locking. Interface "IRWLock" should be used by special guard implementations ... like "ReadGuard" or "WriteGuard"! - @implements - + @implements - @base INonCopyable - @devstatus ready to use + @devstatus ready to use *//*-*************************************************************************************************************/ class ResetableGuard : private INonCopyable { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: /*-****************************************************************************************************//** - @short ctors - @descr Use these ctor methods to initialize the guard right. + @short ctors + @descr Use these ctor methods to initialize the guard right. Given lock reference must be valid - otherwise crashes could occure! - @seealso - + @seealso - @param "pLock", pointer to lock helper of user @param "rLock", reference to lock helper of user - @return - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ inline ResetableGuard( IMutex* pLock ) : m_pLock ( pLock ) @@ -114,15 +114,15 @@ class ResetableGuard : private INonCopyable } /*-****************************************************************************************************//** - @short dtor - @descr We must release set mutex if programmer forget it ... + @short dtor + @descr We must release set mutex if programmer forget it ... - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ inline ~ResetableGuard() { @@ -130,8 +130,8 @@ class ResetableGuard : private INonCopyable } /*-****************************************************************************************************//** - @short enable/disable the lock - @descr Use this methods to lock or unlock the mutex. + @short enable/disable the lock + @descr Use this methods to lock or unlock the mutex. You can do it so often you wish to do that ... @attention We use another member to prevent us against multiple acquire calls of the same guard @@ -140,12 +140,12 @@ class ResetableGuard : private INonCopyable because nobody use the same guard instance from different threads! It will be a function-local object every time. - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ inline void lock() { @@ -167,34 +167,34 @@ class ResetableGuard : private INonCopyable } //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: /*-****************************************************************************************************//** - @short disable using of these functions! - @descr It's not allowed to use this methods. Different problem can occure otherwise. + @short disable using of these functions! + @descr It's not allowed to use this methods. Different problem can occure otherwise. Thats why we disable it by make it private. - @seealso other ctor + @seealso other ctor - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ ResetableGuard(); //------------------------------------------------------------------------------------------------------------- - // private member + // private member //------------------------------------------------------------------------------------------------------------- private: IMutex* m_pLock ; /// pointer to safed lock member of user - sal_Bool m_bLocked ; /// protection against multiple lock() calls without unlock() + sal_Bool m_bLocked ; /// protection against multiple lock() calls without unlock() -}; // class ResetableGuard +}; // class ResetableGuard -} // namespace framework +} // namespace framework -#endif // #ifndef __FRAMEWORK_THREADHELP_RESETABLEGUARD_HXX_ +#endif // #ifndef __FRAMEWORK_THREADHELP_RESETABLEGUARD_HXX_ diff --git a/framework/inc/threadhelp/threadhelpbase.hxx b/framework/inc/threadhelp/threadhelpbase.hxx index 7af1e227fabe..499d6324d6ca 100644 --- a/framework/inc/threadhelp/threadhelpbase.hxx +++ b/framework/inc/threadhelp/threadhelpbase.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,31 +29,31 @@ #define __FRAMEWORK_THREADHELP_THREADHELPBASE_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/lockhelper.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** @@ -66,10 +66,10 @@ namespace framework{ @seealso class LockHelper - @implements - - @base - + @implements - + @base - - @devstatus ready to use + @devstatus ready to use *//*-*************************************************************************************************************/ struct ThreadHelpBase { @@ -91,6 +91,6 @@ struct ThreadHelpBase mutable LockHelper m_aLock; }; -} // namespace framework +} // namespace framework #endif // #ifndef __FRAMEWORK_THREADHELP_THREADHELPBASE_HXX_ diff --git a/framework/inc/threadhelp/transactionbase.hxx b/framework/inc/threadhelp/transactionbase.hxx index d777ecbf1e31..7cb0eba2eb61 100644 --- a/framework/inc/threadhelp/transactionbase.hxx +++ b/framework/inc/threadhelp/transactionbase.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,31 +29,31 @@ #define __FRAMEWORK_THREADHELP_TRANSACTIONBASE_H_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/transactionmanager.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** @@ -63,15 +63,15 @@ namespace framework{ of your implementation - because base classes are initialized by his order and before your member! Thats why ist a good place to declare this member. - @implements - - @base - + @implements - + @base - - @devstatus ready to use + @devstatus ready to use *//*-*************************************************************************************************************/ struct TransactionBase { //------------------------------------------------------------------------------------------------------------- - // public member + // public member //------------------------------------------------------------------------------------------------------------- public: @@ -80,6 +80,6 @@ struct TransactionBase }; // struct TransactionBase -} // namespace framework +} // namespace framework #endif // #ifndef __FRAMEWORK_THREADHELP_TRANSACTIONBASE_H_ diff --git a/framework/inc/threadhelp/transactionguard.hxx b/framework/inc/threadhelp/transactionguard.hxx index d5aaf5274cba..e116cf8a2185 100644 --- a/framework/inc/threadhelp/transactionguard.hxx +++ b/framework/inc/threadhelp/transactionguard.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,32 +29,32 @@ #define __FRAMEWORK_THREADHELP_TRANSACTIONGUARD_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/inoncopyable.h> #include <threadhelp/itransactionmanager.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** @@ -67,9 +67,9 @@ namespace framework{ It's possible too, to enable automaticly throwing of some exceptions for illegal transaction requests ... e.g. interface call for already disposed objects. - @attention To prevent us against wrong using, the default ctor, copy ctor and the =operator are maked private! + @attention To prevent us against wrong using, the default ctor, copy ctor and the =operator are maked private! - @implements - + @implements - @base INonCopyable @devstatus draft @@ -77,7 +77,7 @@ namespace framework{ class TransactionGuard : private INonCopyable { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: @@ -156,26 +156,26 @@ class TransactionGuard : private INonCopyable } //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: /*-****************************************************************************************************//** - @short disable using of these functions! - @descr It's not allowed to use this methods. Different problem can occure otherwise. + @short disable using of these functions! + @descr It's not allowed to use this methods. Different problem can occure otherwise. Thats why we disable it by make it private. - @seealso other ctor + @seealso other ctor - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ TransactionGuard(); //------------------------------------------------------------------------------------------------------------- - // private member + // private member //------------------------------------------------------------------------------------------------------------- private: @@ -183,6 +183,6 @@ class TransactionGuard : private INonCopyable }; // class TransactionGuard -} // namespace framework +} // namespace framework #endif // #ifndef __FRAMEWORK_THREADHELP_TRANSACTIONGUARD_HXX_ diff --git a/framework/inc/threadhelp/transactionmanager.hxx b/framework/inc/threadhelp/transactionmanager.hxx index e8cf8f9bd99d..eca13d63103c 100644 --- a/framework/inc/threadhelp/transactionmanager.hxx +++ b/framework/inc/threadhelp/transactionmanager.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_THREADHELP_TRANSACTIONMANAGER_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/inoncopyable.h> @@ -38,7 +38,7 @@ #include <macros/debug.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/XInterface.hpp> @@ -46,22 +46,22 @@ #include <com/sun/star/lang/DisposedException.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <osl/mutex.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** @@ -82,7 +82,7 @@ class TransactionManager : public ITransactionManager , private INonCopyable { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: @@ -95,14 +95,14 @@ class TransactionManager : public ITransactionManager virtual void unregisterTransaction ( ) throw( css::uno::RuntimeException, css::lang::DisposedException ); //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: void impl_throwExceptions( EExceptionMode eMode, ERejectReason eReason ) const throw( css::uno::RuntimeException, css::lang::DisposedException ); //------------------------------------------------------------------------------------------------------------- - // private member + // private member //------------------------------------------------------------------------------------------------------------- private: @@ -113,6 +113,6 @@ class TransactionManager : public ITransactionManager }; // class TransactionManager -} // namespace framework +} // namespace framework #endif // #ifndef __FRAMEWORK_THREADHELP_TRANSACTIONMANAGER_HXX_ diff --git a/framework/inc/threadhelp/writeguard.hxx b/framework/inc/threadhelp/writeguard.hxx index f882118b6ee7..07dbdf6fe466 100644 --- a/framework/inc/threadhelp/writeguard.hxx +++ b/framework/inc/threadhelp/writeguard.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_THREADHELP_WRITEGUARD_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/inoncopyable.h> @@ -40,30 +40,30 @@ //#endif //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** @short implement a guard to set write locks - @descr This guard should be used to set a lock for reading AND writing object internal member. + @descr This guard should be used to set a lock for reading AND writing object internal member. We never need a own mutex to safe our internal member access - because a guard is used as function-local member only. There exist no multithreaded access to it realy ... @@ -71,15 +71,15 @@ namespace framework{ b) Use interface "IRWLock" of set LockHelper only - because we must support a finer granularity of locking. Interface "IMutex" should be used by easier guard implementations ... like "ResetableGuard"! - @implements - + @implements - @base INonCopyable - @devstatus ready to use + @devstatus ready to use *//*-*************************************************************************************************************/ class WriteGuard : private INonCopyable { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: @@ -157,7 +157,7 @@ class WriteGuard : private INonCopyable m_eMode = E_WRITELOCK; } break; - default: break; // nothing to do + default: break; // nothing to do } } @@ -231,34 +231,34 @@ class WriteGuard : private INonCopyable } //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: /*-****************************************************************************************************//** - @short disable using of these functions! - @descr It's not allowed to use this methods. Different problem can occure otherwise. + @short disable using of these functions! + @descr It's not allowed to use this methods. Different problem can occure otherwise. Thats why we disable it by make it private. - @seealso other ctor + @seealso other ctor - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ WriteGuard(); //------------------------------------------------------------------------------------------------------------- - // private member + // private member //------------------------------------------------------------------------------------------------------------- private: IRWLock* m_pLock ; /// reference to lock-member of protected object - ELockMode m_eMode ; /// protection against multiple lock calls without unlock and difference between supported lock modi + ELockMode m_eMode ; /// protection against multiple lock calls without unlock and difference between supported lock modi -}; // class WriteGuard +}; // class WriteGuard } // namespace framework -#endif // #ifndef __FRAMEWORK_THREADHELP_WRITEGUARD_HXX_ +#endif // #ifndef __FRAMEWORK_THREADHELP_WRITEGUARD_HXX_ diff --git a/framework/inc/uiconfiguration/globalsettings.hxx b/framework/inc/uiconfiguration/globalsettings.hxx index 94a4a9aec7ed..b1b83de369a0 100644 --- a/framework/inc/uiconfiguration/globalsettings.hxx +++ b/framework/inc/uiconfiguration/globalsettings.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ #include <hash_map> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> @@ -46,14 +46,14 @@ #include <stdtypes.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/container/XNameAccess.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/weak.hxx> #include <rtl/ustring.hxx> @@ -66,7 +66,7 @@ class GlobalSettings public: GlobalSettings( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rSrvMgr ); ~GlobalSettings(); - + enum UIElementType { UIELEMENT_TYPE_TOOLBAR, @@ -91,7 +91,7 @@ class GlobalSettings ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xSrvMgr; }; - + } // namespace framework #endif // __FRAMEWORK_UIELEMENT_WINDOWSTATECONFIGURATION_HXX_ diff --git a/framework/inc/uiconfiguration/graphicnameaccess.hxx b/framework/inc/uiconfiguration/graphicnameaccess.hxx index 35b00aec143e..1526f57fc4c5 100644 --- a/framework/inc/uiconfiguration/graphicnameaccess.hxx +++ b/framework/inc/uiconfiguration/graphicnameaccess.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,10 +31,10 @@ #include <stdtypes.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/container/XNameContainer.hpp> -#ifndef _COM_SUN_STAR_GRAPHIC_XGRAPHIC_HXX_ +#ifndef _COM_SUN_STAR_GRAPHIC_XGRAPHIC_HXX_ #include <com/sun/star/graphic/XGraphic.hpp> #endif #include <cppuhelper/implbase1.hxx> @@ -46,9 +46,9 @@ namespace framework public: GraphicNameAccess(); virtual ~GraphicNameAccess(); - + void addElement( const rtl::OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& rElement ); - + // XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, diff --git a/framework/inc/uiconfiguration/imagemanager.hxx b/framework/inc/uiconfiguration/imagemanager.hxx index 7e84c33284d0..f30cb70e8387 100644 --- a/framework/inc/uiconfiguration/imagemanager.hxx +++ b/framework/inc/uiconfiguration/imagemanager.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ #include <memory> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> @@ -49,7 +49,7 @@ #include <uiconfiguration/imagetype.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> @@ -64,7 +64,7 @@ #include <com/sun/star/ui/XImageManager.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/implbase2.hxx> #include <cppuhelper/interfacecontainer.hxx> @@ -79,7 +79,7 @@ namespace framework { class ImageManagerImpl; - class ImageManager : private ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. + class ImageManager : private ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. public ::cppu::WeakImplHelper2< ::com::sun::star::ui::XImageManager, css::lang::XServiceInfo> { public: @@ -119,7 +119,7 @@ namespace framework // Non-UNO methods void setStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage ) throw (::com::sun::star::uno::RuntimeException); - + private: ::std::auto_ptr<ImageManagerImpl> m_pImpl; }; diff --git a/framework/inc/uiconfiguration/imagetype.hxx b/framework/inc/uiconfiguration/imagetype.hxx index 8cf1e5045856..d96ec77c374e 100644 --- a/framework/inc/uiconfiguration/imagetype.hxx +++ b/framework/inc/uiconfiguration/imagetype.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,8 +43,8 @@ enum ImageType ImageType_COUNT }; -typedef std::hash_map< rtl::OUString, - rtl::OUString, +typedef std::hash_map< rtl::OUString, + rtl::OUString, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > CommandToImageNameMap; typedef std::hash_map< rtl::OUString, diff --git a/framework/inc/uiconfiguration/moduleimagemanager.hxx b/framework/inc/uiconfiguration/moduleimagemanager.hxx index e8b5b79d1cad..f9d18670ddce 100644 --- a/framework/inc/uiconfiguration/moduleimagemanager.hxx +++ b/framework/inc/uiconfiguration/moduleimagemanager.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ #include <memory> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> @@ -49,7 +49,7 @@ #include <uiconfiguration/imagetype.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> @@ -64,7 +64,7 @@ #include <com/sun/star/ui/XImageManager.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/implbase1.hxx> #include <cppuhelper/interfacecontainer.hxx> @@ -80,7 +80,7 @@ namespace framework { class ImageManagerImpl; - class ModuleImageManager : private ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. + class ModuleImageManager : private ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. public ::cppu::WeakImplHelper1< ::com::sun::star::ui::XImageManager> { public: diff --git a/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx b/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx index 8631e381bc27..33c4a2737cc6 100644 --- a/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx +++ b/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ #include <hash_map> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> @@ -47,7 +47,7 @@ #include <stdtypes.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> @@ -59,7 +59,7 @@ #include <com/sun/star/embed/XTransactedObject.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/weak.hxx> #include <cppuhelper/interfacecontainer.hxx> @@ -68,11 +68,11 @@ namespace framework { - class ModuleUIConfigurationManagerSupplier : public com::sun::star::lang::XTypeProvider , - public com::sun::star::lang::XServiceInfo , + class ModuleUIConfigurationManagerSupplier : public com::sun::star::lang::XTypeProvider , + public com::sun::star::lang::XServiceInfo , public com::sun::star::lang::XComponent , public ::com::sun::star::ui::XModuleUIConfigurationManagerSupplier , - private ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. + private ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. public ::cppu::OWeakObject { public: @@ -85,11 +85,11 @@ namespace framework virtual ~ModuleUIConfigurationManagerSupplier(); // XComponent - virtual void SAL_CALL dispose() + virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); // XModuleUIConfigurationManagerSupplier diff --git a/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx b/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx index f85ff68d2f52..856746139b68 100644 --- a/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx +++ b/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ #include <hash_map> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <accelerators/presethandler.hxx> #include <threadhelp/threadhelpbase.hxx> @@ -49,7 +49,7 @@ #include <uiconfiguration/moduleimagemanager.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> @@ -65,7 +65,7 @@ #include <com/sun/star/container/XIndexContainer.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/weak.hxx> #include <cppuhelper/interfacecontainer.hxx> @@ -74,15 +74,15 @@ namespace framework { - class ModuleUIConfigurationManager : public com::sun::star::lang::XTypeProvider , - public com::sun::star::lang::XServiceInfo , + class ModuleUIConfigurationManager : public com::sun::star::lang::XTypeProvider , + public com::sun::star::lang::XServiceInfo , public com::sun::star::lang::XComponent , public com::sun::star::lang::XInitialization , public ::com::sun::star::ui::XUIConfiguration , public ::com::sun::star::ui::XUIConfigurationManager , public ::com::sun::star::ui::XModuleUIConfigurationManager , public ::com::sun::star::ui::XUIConfigurationPersistence , - private ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. + private ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. public ::cppu::OWeakObject { public: @@ -138,7 +138,7 @@ namespace framework LAYER_USERDEFINED, LAYER_COUNT }; - + enum NotifyOp { NotifyOp_Remove, @@ -153,7 +153,7 @@ namespace framework rtl::OUString aResourceURL; rtl::OUString aUIName; }; - + struct UIElementData { UIElementData() : bModified( false ), bDefault( true ), bDefaultNode( true ) {}; @@ -169,14 +169,14 @@ namespace framework struct UIElementType; friend struct UIElementType; typedef ::std::hash_map< rtl::OUString, UIElementData, OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementDataHashMap; - + struct UIElementType { UIElementType() : bModified( false ), - bLoaded( false ), + bLoaded( false ), bDefaultLayer( false ), nElementType( ::com::sun::star::ui::UIElementType::UNKNOWN ) {} - + bool bModified; bool bLoaded; diff --git a/framework/inc/uiconfiguration/uicategorydescription.hxx b/framework/inc/uiconfiguration/uicategorydescription.hxx index 8c0595df4bdb..b29df7c643e3 100644 --- a/framework/inc/uiconfiguration/uicategorydescription.hxx +++ b/framework/inc/uiconfiguration/uicategorydescription.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ #include <hash_map> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> @@ -45,7 +45,7 @@ #include <stdtypes.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> @@ -53,7 +53,7 @@ #include <com/sun/star/frame/XModuleManager.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ namespace framework diff --git a/framework/inc/uiconfiguration/uiconfigurationmanager.hxx b/framework/inc/uiconfiguration/uiconfigurationmanager.hxx index 6bd26b64098e..875ee7fb10b6 100644 --- a/framework/inc/uiconfiguration/uiconfigurationmanager.hxx +++ b/framework/inc/uiconfiguration/uiconfigurationmanager.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ #include <hash_map> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> @@ -48,7 +48,7 @@ #include <uiconfiguration/imagemanager.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> @@ -65,7 +65,7 @@ #include <com/sun/star/container/XIndexContainer.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/weak.hxx> #include <cppuhelper/interfacecontainer.hxx> @@ -74,14 +74,14 @@ namespace framework { - class UIConfigurationManager : public com::sun::star::lang::XTypeProvider , - public com::sun::star::lang::XServiceInfo , + class UIConfigurationManager : public com::sun::star::lang::XTypeProvider , + public com::sun::star::lang::XServiceInfo , public com::sun::star::lang::XComponent , public ::com::sun::star::ui::XUIConfiguration , public ::com::sun::star::ui::XUIConfigurationManager , public ::com::sun::star::ui::XUIConfigurationPersistence , public ::com::sun::star::ui::XUIConfigurationStorage , - private ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. + private ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. public ::cppu::OWeakObject { public: @@ -142,7 +142,7 @@ namespace framework rtl::OUString aResourceURL; rtl::OUString aUIName; }; - + struct UIElementData { UIElementData() : bModified( false ), bDefault( true ) {}; @@ -157,14 +157,14 @@ namespace framework struct UIElementType; friend struct UIElementType; typedef ::std::hash_map< rtl::OUString, UIElementData, OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementDataHashMap; - + struct UIElementType { - UIElementType() : bModified( false ), - bLoaded( false ), + UIElementType() : bModified( false ), + bLoaded( false ), bDefaultLayer( false ), nElementType( ::com::sun::star::ui::UIElementType::UNKNOWN ) {} - + bool bModified; bool bLoaded; diff --git a/framework/inc/uiconfiguration/windowstateconfiguration.hxx b/framework/inc/uiconfiguration/windowstateconfiguration.hxx index b8609c416d35..861237c0bf6f 100644 --- a/framework/inc/uiconfiguration/windowstateconfiguration.hxx +++ b/framework/inc/uiconfiguration/windowstateconfiguration.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ #include <hash_map> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> @@ -46,7 +46,7 @@ #include <stdtypes.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> @@ -54,7 +54,7 @@ #include <com/sun/star/frame/XModuleManager.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/implbase2.hxx> #include <rtl/ustring.hxx> @@ -80,7 +80,7 @@ namespace framework #define WINDOWSTATE_PROPERTY_CONTEXTACTIVE "ContextActive" class ConfigurationAccess_Windows; -class WindowStateConfiguration : private ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. +class WindowStateConfiguration : private ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. public ::cppu::WeakImplHelper2< ::com::sun::star::container::XNameAccess, css::lang::XServiceInfo> { public: @@ -93,26 +93,26 @@ class WindowStateConfiguration : private ThreadHelpBase , // Struct for ri DECLARE_XSERVICEINFO // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() + + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw (::com::sun::star::uno::RuntimeException); - - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + + virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() + virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasElements() + virtual sal_Bool SAL_CALL hasElements() throw (::com::sun::star::uno::RuntimeException); typedef ::std::hash_map< ::rtl::OUString, ::rtl::OUString, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > ModuleToWindowStateFileMap; - + typedef ::std::hash_map< ::rtl::OUString, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >, OUStringHashCode, diff --git a/framework/inc/uielement/addonstoolbarmanager.hxx b/framework/inc/uielement/addonstoolbarmanager.hxx index 26e39dea2827..bf1525cf5f63 100644 --- a/framework/inc/uielement/addonstoolbarmanager.hxx +++ b/framework/inc/uielement/addonstoolbarmanager.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_UIELEMENT_ADDONSTOOLBARMANAGER_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #ifndef __FRAMEWORK_UILEMENT_TOOLBARMANAGER_HXX_ @@ -41,7 +41,7 @@ #include <macros/xtypeprovider.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XStatusListener.hpp> @@ -52,7 +52,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <rtl/ustring.hxx> #include <cppuhelper/weak.hxx> @@ -68,15 +68,15 @@ class ToolBar; class AddonsToolBarManager : public ToolBarManager { public: - AddonsToolBarManager( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServicveManager, - const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, + AddonsToolBarManager( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServicveManager, + const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, const rtl::OUString& rResourceName, ToolBar* pToolBar ); virtual ~AddonsToolBarManager(); // XComponent void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException ); - + virtual void RefreshImages(); using ToolBarManager::FillToolbar; void FillToolbar( const com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > >& rAddonToolbar ); @@ -94,7 +94,7 @@ class AddonsToolBarManager : public ToolBarManager virtual bool MenuItemAllowed( sal_uInt16 ) const; }; - + } #endif // __FRAMEWORK_UIELEMENT_ADDONSTOOLBARMANAGER_HXX_ diff --git a/framework/inc/uielement/addonstoolbarwrapper.hxx b/framework/inc/uielement/addonstoolbarwrapper.hxx index 9683b0e1e516..e1a04acef2eb 100644 --- a/framework/inc/uielement/addonstoolbarwrapper.hxx +++ b/framework/inc/uielement/addonstoolbarwrapper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,20 +29,20 @@ #define __FRAMEWORK_UIELEMENT_ADDONSTOOLBARWRAPPER_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <helper/uielementwrapperbase.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ namespace framework @@ -54,10 +54,10 @@ class AddonsToolBarWrapper : public UIElementWrapperBase public: AddonsToolBarWrapper( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); virtual ~AddonsToolBarWrapper(); - + // XComponent virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException); - + // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); @@ -65,7 +65,7 @@ class AddonsToolBarWrapper : public UIElementWrapperBase virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException); //------------------------------------------------------------------------------------------------------------- - // protected methods + // protected methods //------------------------------------------------------------------------------------------------------------- private: com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xServiceManager; diff --git a/framework/inc/uielement/buttontoolbarcontroller.hxx b/framework/inc/uielement/buttontoolbarcontroller.hxx index 57f0ff23c6c1..eba7914e9430 100644 --- a/framework/inc/uielement/buttontoolbarcontroller.hxx +++ b/framework/inc/uielement/buttontoolbarcontroller.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ #include <com/sun/star/frame/XToolbarController.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <comphelper/broadcasthelper.hxx> @@ -59,10 +59,10 @@ class ButtonToolbarController : public ::com::sun::star::frame::XStatusListener, public ::com::sun::star::util::XUpdatable, public ::com::sun::star::lang::XComponent, public ::comphelper::OBaseMutex, - public ::cppu::OWeakObject + public ::cppu::OWeakObject { public: - ButtonToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, + ButtonToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, ToolBox* pToolBar, const rtl::OUString& aCommand ); virtual ~ButtonToolbarController(); @@ -71,13 +71,13 @@ class ButtonToolbarController : public ::com::sun::star::frame::XStatusListener, virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL acquire() throw (); virtual void SAL_CALL release() throw (); - + // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XUpdatable virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException); - + // XComponent virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); @@ -85,17 +85,17 @@ class ButtonToolbarController : public ::com::sun::star::frame::XStatusListener, // XEventListener virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException ); - + // XStatusListener virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ); - + // XToolbarController virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL click() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL doubleClick() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createPopupWindow() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createItemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& Parent ) throw (::com::sun::star::uno::RuntimeException); - + private: sal_Bool m_bInitialized : 1, m_bDisposed : 1; diff --git a/framework/inc/uielement/comboboxtoolbarcontroller.hxx b/framework/inc/uielement/comboboxtoolbarcontroller.hxx index 33df553fa5b9..bc55ff78cd64 100644 --- a/framework/inc/uielement/comboboxtoolbarcontroller.hxx +++ b/framework/inc/uielement/comboboxtoolbarcontroller.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ #include <com/sun/star/frame/ControlCommand.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ //#include <vcl/toolbox.hxx> @@ -60,10 +60,10 @@ class IComboBoxListener class ComboboxToolbarController : public IComboBoxListener, public ComplexToolbarController - + { public: - ComboboxToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, + ComboboxToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolBar, USHORT nID, diff --git a/framework/inc/uielement/commandinfo.hxx b/framework/inc/uielement/commandinfo.hxx index dc4f24891fcc..d33ab0d7baad 100644 --- a/framework/inc/uielement/commandinfo.hxx +++ b/framework/inc/uielement/commandinfo.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_UIELEMENT_COMMANDINFO_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <macros/generic.hxx> diff --git a/framework/inc/uielement/complextoolbarcontroller.hxx b/framework/inc/uielement/complextoolbarcontroller.hxx index 09ad0b193833..dfb7741a223b 100644 --- a/framework/inc/uielement/complextoolbarcontroller.hxx +++ b/framework/inc/uielement/complextoolbarcontroller.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ #include <com/sun/star/frame/XControlNotificationListener.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <svtools/toolboxcontroller.hxx> @@ -62,10 +62,10 @@ struct NotifyInfo class ToolBar; class ComplexToolbarController : public svt::ToolboxController - + { public: - ComplexToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, + ComplexToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolBar, USHORT nID, @@ -76,14 +76,14 @@ class ComplexToolbarController : public svt::ToolboxController virtual void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException ); // XToolbarController - virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException); // XStatusListener virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ); - DECL_STATIC_LINK( ComplexToolbarController, ExecuteHdl_Impl, ExecuteInfo* ); - DECL_STATIC_LINK( ComplexToolbarController, Notify_Impl, NotifyInfo* ); - + DECL_STATIC_LINK( ComplexToolbarController, ExecuteHdl_Impl, ExecuteInfo* ); + DECL_STATIC_LINK( ComplexToolbarController, Notify_Impl, NotifyInfo* ); + protected: static sal_Int32 getFontSizePixel( const Window* pWindow ); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > getDispatchFromCommand( const rtl::OUString& aCommand ) const; diff --git a/framework/inc/uielement/constitemcontainer.hxx b/framework/inc/uielement/constitemcontainer.hxx index c112205ad93b..c2eeea0e3c28 100644 --- a/framework/inc/uielement/constitemcontainer.hxx +++ b/framework/inc/uielement/constitemcontainer.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_UIELEMENT_CONSTITEMCONTAINER_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> @@ -38,7 +38,7 @@ #include <macros/xtypeprovider.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/lang/XSingleComponentFactory.hpp> @@ -49,7 +49,7 @@ #include <com/sun/star/lang/XUnoTunnel.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <rtl/ustring.hxx> #include <cppuhelper/weak.hxx> @@ -62,7 +62,7 @@ namespace framework class RootItemContainer; class ItemContainer; -class ConstItemContainer : public ::com::sun::star::lang::XTypeProvider , +class ConstItemContainer : public ::com::sun::star::lang::XTypeProvider , public com::sun::star::container::XIndexAccess , public ::com::sun::star::lang::XUnoTunnel , public ::com::sun::star::beans::XFastPropertySet, @@ -71,7 +71,7 @@ class ConstItemContainer : public ::com::sun::star::lang::XTypeProvider , { friend class RootItemContainer; friend class ItemContainer; - + public: ConstItemContainer(); ConstItemContainer( const ItemContainer& rtemContainer ); @@ -80,16 +80,16 @@ class ConstItemContainer : public ::com::sun::star::lang::XTypeProvider , virtual ~ConstItemContainer(); //--------------------------------------------------------------------------------------------------------- - // XInterface, XTypeProvider + // XInterface, XTypeProvider //--------------------------------------------------------------------------------------------------------- FWK_DECLARE_XINTERFACE FWK_DECLARE_XTYPEPROVIDER - + // XUnoTunnel - static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); - static ConstItemContainer* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw(); - sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException); - + static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); + static ConstItemContainer* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw(); + sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException); + // XIndexAccess virtual sal_Int32 SAL_CALL getCount() throw (::com::sun::star::uno::RuntimeException); @@ -115,7 +115,7 @@ class ConstItemContainer : public ::com::sun::star::lang::XTypeProvider , virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - + // XFastPropertySet virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getFastPropertyValue( sal_Int32 nHandle ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); @@ -123,7 +123,7 @@ class ConstItemContainer : public ::com::sun::star::lang::XTypeProvider , private: ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); const com::sun::star::uno::Sequence< com::sun::star::beans::Property > impl_getStaticPropertyDescriptor(); - static ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySetInfo > SAL_CALL createPropertySetInfo( ::cppu::IPropertyArrayHelper & rProperties ) SAL_THROW( () ); + static ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySetInfo > SAL_CALL createPropertySetInfo( ::cppu::IPropertyArrayHelper & rProperties ) SAL_THROW( () ); void copyItemContainer( const std::vector< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > >& rSourceVector ); com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > deepCopyContainer( const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& rSubContainer ); @@ -131,7 +131,7 @@ class ConstItemContainer : public ::com::sun::star::lang::XTypeProvider , std::vector< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > > m_aItemVector; rtl::OUString m_aUIName; }; - + } #endif // #ifndef __FRAMEWORK_UIELEMENT_CONSTITEMCONTAINER_HXX_ diff --git a/framework/inc/uielement/controlmenucontroller.hxx b/framework/inc/uielement/controlmenucontroller.hxx index 35af7cf48659..6e0c9deb03c0 100644 --- a/framework/inc/uielement/controlmenucontroller.hxx +++ b/framework/inc/uielement/controlmenucontroller.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,14 +29,14 @@ #define __FRAMEWORK_UIELEMENT_CONTROLMENUCONTROLLER_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <macros/xserviceinfo.hxx> #include <stdtypes.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> @@ -50,7 +50,7 @@ #include <com/sun/star/frame/XModel.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <svtools/popupmenucontrollerbase.hxx> #include <toolkit/awt/vclxmenu.hxx> @@ -67,13 +67,13 @@ namespace framework public: ControlMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); virtual ~ControlMenuController(); - + // XServiceInfo DECLARE_XSERVICEINFO // XPopupMenuController virtual void SAL_CALL updatePopupMenu() throw (::com::sun::star::uno::RuntimeException); - + // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); @@ -89,7 +89,7 @@ namespace framework private: virtual void impl_setPopupMenu(); virtual void impl_select(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aURL); - + class UrlToDispatchMap : public ::std::hash_map< ::rtl::OUString, com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >, OUStringHashCode, @@ -104,7 +104,7 @@ namespace framework void updateImagesPopupMenu( PopupMenu* pPopupMenu ); void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu ); - + sal_Bool m_bWasHiContrast : 1, m_bShowMenuImages : 1; PopupMenu* m_pResPopupMenu; diff --git a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx index 05db7b4d9d0f..4f828c35ff3e 100644 --- a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx +++ b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ #include <com/sun/star/frame/ControlCommand.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <uielement/complextoolbarcontroller.hxx> @@ -52,16 +52,16 @@ class IListBoxListener virtual void Select() = 0; virtual void DoubleClick() = 0; virtual void GetFocus() = 0; - virtual void LoseFocus() = 0; + virtual void LoseFocus() = 0; virtual long PreNotify( NotifyEvent& rNEvt ) = 0; }; class DropdownToolbarController : public IListBoxListener, public ComplexToolbarController - + { public: - DropdownToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, + DropdownToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolBar, USHORT nID, diff --git a/framework/inc/uielement/edittoolbarcontroller.hxx b/framework/inc/uielement/edittoolbarcontroller.hxx index dc55589cc368..cdb22db98997 100644 --- a/framework/inc/uielement/edittoolbarcontroller.hxx +++ b/framework/inc/uielement/edittoolbarcontroller.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ #include <com/sun/star/frame/ControlCommand.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <uielement/complextoolbarcontroller.hxx> @@ -58,10 +58,10 @@ class IEditListener class EditToolbarController : public IEditListener, public ComplexToolbarController - + { public: - EditToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, + EditToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolBar, USHORT nID, diff --git a/framework/inc/uielement/fontmenucontroller.hxx b/framework/inc/uielement/fontmenucontroller.hxx index 3cc3ce0635e4..79905658839b 100644 --- a/framework/inc/uielement/fontmenucontroller.hxx +++ b/framework/inc/uielement/fontmenucontroller.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,14 +29,14 @@ #define __FRAMEWORK_UIELEMENT_FONTMENUCONTROLLER_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <macros/xserviceinfo.hxx> #include <stdtypes.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> @@ -48,7 +48,7 @@ #include <com/sun/star/frame/XPopupMenuController.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <svtools/popupmenucontrollerbase.hxx> #include <toolkit/awt/vclxmenu.hxx> @@ -64,7 +64,7 @@ namespace framework public: FontMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); virtual ~FontMenuController(); - + // XServiceInfo DECLARE_XSERVICEINFO @@ -76,7 +76,7 @@ namespace framework // XMenuListener virtual void SAL_CALL activate( const ::com::sun::star::awt::MenuEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException); - + // XEventListener virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException ); @@ -84,7 +84,7 @@ namespace framework virtual void impl_setPopupMenu(); virtual void impl_select(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aURL); void fillPopupMenu( const com::sun::star::uno::Sequence< ::rtl::OUString >& rFontNameSeq, com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu ); - + rtl::OUString m_aFontFamilyName; com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > m_xFontListDispatch; }; diff --git a/framework/inc/uielement/fontsizemenucontroller.hxx b/framework/inc/uielement/fontsizemenucontroller.hxx index 9578cb8af07d..4e5623084908 100644 --- a/framework/inc/uielement/fontsizemenucontroller.hxx +++ b/framework/inc/uielement/fontsizemenucontroller.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,14 +29,14 @@ #define __FRAMEWORK_UIELEMENT_FONTSIZEMENUCONTROLLER_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <macros/xserviceinfo.hxx> #include <stdtypes.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> @@ -49,7 +49,7 @@ #include <com/sun/star/frame/status/FontHeight.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <svtools/popupmenucontrollerbase.hxx> #include <toolkit/awt/vclxmenu.hxx> @@ -65,13 +65,13 @@ namespace framework public: FontSizeMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); virtual ~FontSizeMenuController(); - + // XServiceInfo DECLARE_XSERVICEINFO // XPopupMenuController virtual void SAL_CALL updatePopupMenu() throw (::com::sun::star::uno::RuntimeException); - + // XStatusListener virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ); @@ -84,7 +84,7 @@ namespace framework void setCurHeight( long nHeight, com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu ); void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu ); rtl::OUString retrievePrinterName( com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame ); - + long* m_pHeightArray; sal_Bool m_bRebuildMenu; com::sun::star::awt::FontDescriptor m_aFontDescriptor; diff --git a/framework/inc/uielement/footermenucontroller.hxx b/framework/inc/uielement/footermenucontroller.hxx index 00bff791f36b..cc154e41a6c3 100644 --- a/framework/inc/uielement/footermenucontroller.hxx +++ b/framework/inc/uielement/footermenucontroller.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_UIELEMENT_FOOTERMENUCONTROLLER_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <uielement/headermenucontroller.hxx> @@ -40,17 +40,17 @@ namespace framework public: FooterMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); virtual ~FooterMenuController(); - + // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName ( ) throw( css::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService ( const ::rtl::OUString& sServiceName ) throw( css::uno::RuntimeException ); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames ( ) throw( css::uno::RuntimeException ); - /* Helper for XServiceInfo */ - static css::uno::Sequence< ::rtl::OUString > SAL_CALL impl_getStaticSupportedServiceNames( ); - static ::rtl::OUString SAL_CALL impl_getStaticImplementationName ( ); - /* Helper for registry */ - static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception ); - static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ); + virtual ::rtl::OUString SAL_CALL getImplementationName ( ) throw( css::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService ( const ::rtl::OUString& sServiceName ) throw( css::uno::RuntimeException ); + virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames ( ) throw( css::uno::RuntimeException ); + /* Helper for XServiceInfo */ + static css::uno::Sequence< ::rtl::OUString > SAL_CALL impl_getStaticSupportedServiceNames( ); + static ::rtl::OUString SAL_CALL impl_getStaticImplementationName ( ); + /* Helper for registry */ + static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception ); + static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ); }; } diff --git a/framework/inc/uielement/generictoolbarcontroller.hxx b/framework/inc/uielement/generictoolbarcontroller.hxx index dc5fc7eafdee..d8efaf1ad5ad 100644 --- a/framework/inc/uielement/generictoolbarcontroller.hxx +++ b/framework/inc/uielement/generictoolbarcontroller.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_UIELEMENT_GENERICTOOLBARCONTROLLER_HXX_ //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <svtools/toolboxcontroller.hxx> @@ -46,7 +46,7 @@ class ToolBar; class GenericToolbarController : public svt::ToolboxController { public: - GenericToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, + GenericToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolBar, USHORT nID, @@ -57,13 +57,13 @@ class GenericToolbarController : public svt::ToolboxController virtual void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException ); // XToolbarController - virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException); // XStatusListener virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ); - DECL_STATIC_LINK( GenericToolbarController, ExecuteHdl_Impl, ExecuteInfo* ); - + DECL_STATIC_LINK( GenericToolbarController, ExecuteHdl_Impl, ExecuteInfo* ); + protected: ToolBox* m_pToolbar; sal_uInt16 m_nID; @@ -79,12 +79,12 @@ class MenuToolbarController : public GenericToolbarController com::sun::star::uno::Reference< com::sun::star::lang::XComponent > m_xMenuManager; rtl::OUString m_aModuleIdentifier; public: - MenuToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, + MenuToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolBar, USHORT nID, - const rtl::OUString& aCommand, - const rtl::OUString& aModuleIdentifier, + const rtl::OUString& aCommand, + const rtl::OUString& aModuleIdentifier, const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& xMenuDesc ); ~MenuToolbarController(); diff --git a/framework/inc/uielement/headermenucontroller.hxx b/framework/inc/uielement/headermenucontroller.hxx index ccafbf584891..0deeb878156d 100644 --- a/framework/inc/uielement/headermenucontroller.hxx +++ b/framework/inc/uielement/headermenucontroller.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,14 +29,14 @@ #define __FRAMEWORK_UIELEMENT_HEADERMENUCONTROLLER_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <macros/xserviceinfo.hxx> #include <stdtypes.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> @@ -50,7 +50,7 @@ #include <com/sun/star/frame/XModel.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <svtools/popupmenucontrollerbase.hxx> #include <toolkit/awt/vclxmenu.hxx> @@ -66,13 +66,13 @@ namespace framework public: HeaderMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager,bool _bFooter = sal_False ); virtual ~HeaderMenuController(); - + // XServiceInfo DECLARE_XSERVICEINFO // XPopupMenuController virtual void SAL_CALL updatePopupMenu() throw (::com::sun::star::uno::RuntimeException); - + // XStatusListener virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ); diff --git a/framework/inc/uielement/imagebuttontoolbarcontroller.hxx b/framework/inc/uielement/imagebuttontoolbarcontroller.hxx index 5881a423ee37..d67ee86ef569 100644 --- a/framework/inc/uielement/imagebuttontoolbarcontroller.hxx +++ b/framework/inc/uielement/imagebuttontoolbarcontroller.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ #include <com/sun/star/frame/ControlCommand.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <uielement/complextoolbarcontroller.hxx> @@ -45,10 +45,10 @@ namespace framework class ToolBar; class ImageButtonToolbarController : public ComplexToolbarController - + { public: - ImageButtonToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, + ImageButtonToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolBar, USHORT nID, @@ -61,7 +61,7 @@ class ImageButtonToolbarController : public ComplexToolbarController protected: virtual void executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand ); - private: + private: sal_Bool ReadImageFromURL( sal_Bool bBigImage, const rtl::OUString& aImageURL, Image& aImage ); }; diff --git a/framework/inc/uielement/itemcontainer.hxx b/framework/inc/uielement/itemcontainer.hxx index cff28fd62834..ab45d039e636 100644 --- a/framework/inc/uielement/itemcontainer.hxx +++ b/framework/inc/uielement/itemcontainer.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_UIELEMENT_ITEMCONTAINER_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> @@ -39,14 +39,14 @@ #include <helper/shareablemutex.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <rtl/ustring.hxx> #include <cppuhelper/implbase1.hxx> @@ -68,13 +68,13 @@ class ItemContainer : public ::cppu::WeakImplHelper1< ::com::sun::star::contai virtual ~ItemContainer(); //--------------------------------------------------------------------------------------------------------- - // XInterface, XTypeProvider + // XInterface, XTypeProvider //--------------------------------------------------------------------------------------------------------- // XUnoTunnel - static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); - static ItemContainer* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw(); - sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException); - + static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); + static ItemContainer* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw(); + sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException); + // XIndexContainer virtual void SAL_CALL insertByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); @@ -107,11 +107,11 @@ class ItemContainer : public ::cppu::WeakImplHelper1< ::com::sun::star::contai ItemContainer(); void copyItemContainer( const std::vector< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > >& rSourceVector, const ShareableMutex& rMutex ); com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > deepCopyContainer( const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& rSubContainer, const ShareableMutex& rMutex ); - + mutable ShareableMutex m_aShareMutex; std::vector< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > > m_aItemVector; }; - + } #endif // #ifndef __FRAMEWORK_UIELEMENT_ITEMCONTAINER_HXX_ diff --git a/framework/inc/uielement/langselectionmenucontroller.hxx b/framework/inc/uielement/langselectionmenucontroller.hxx index e9f61255b834..257638ecd77f 100644 --- a/framework/inc/uielement/langselectionmenucontroller.hxx +++ b/framework/inc/uielement/langselectionmenucontroller.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,14 +29,14 @@ #define __FRAMEWORK_UIELEMENT_LANGUAGESELECTIONMENUCONTROLLER_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <macros/xserviceinfo.hxx> #include <stdtypes.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> @@ -49,7 +49,7 @@ #include <com/sun/star/linguistic2/XLanguageGuessing.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <svtools/popupmenucontrollerbase.hxx> #include <toolkit/awt/vclxmenu.hxx> @@ -67,13 +67,13 @@ namespace framework public: LanguageSelectionMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); virtual ~LanguageSelectionMenuController(); - + // XServiceInfo DECLARE_XSERVICEINFO // XPopupMenuController virtual void SAL_CALL updatePopupMenu() throw (::com::sun::star::uno::RuntimeException); - + // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); @@ -93,21 +93,21 @@ namespace framework MODE_SetLanguageAllTextMenu }; - sal_Bool m_bShowMenu; + sal_Bool m_bShowMenu; ::rtl::OUString m_aLangStatusCommandURL; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > m_xLanguageDispatch; ::rtl::OUString m_aMenuCommandURL_Lang; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > m_xMenuDispatch_Lang; ::rtl::OUString m_aMenuCommandURL_Font; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > m_xMenuDispatch_Font; - ::rtl::OUString m_aMenuCommandURL_CharDlgForParagraph; + ::rtl::OUString m_aMenuCommandURL_CharDlgForParagraph; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > m_xMenuDispatch_CharDlgForParagraph; ::rtl::OUString m_aCurLang; sal_Int16 m_nScriptType; ::rtl::OUString m_aKeyboardLang; ::rtl::OUString m_aGuessedTextLang; LanguageGuessingHelper m_aLangGuessHelper; - + void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu, const Mode rMode ); }; } diff --git a/framework/inc/uielement/langselectionstatusbarcontroller.hxx b/framework/inc/uielement/langselectionstatusbarcontroller.hxx index 5c2170a5345d..4d46538eb6d6 100644 --- a/framework/inc/uielement/langselectionstatusbarcontroller.hxx +++ b/framework/inc/uielement/langselectionstatusbarcontroller.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,43 +62,43 @@ class LangSelectionStatusbarController : public svt::StatusbarController // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - + // XComponent virtual void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException ); // XEventListener virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException ); - + // XStatusListener virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ); - + // XStatusbarController virtual ::sal_Bool SAL_CALL mouseButtonDown( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL mouseMove( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL mouseButtonUp( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL command( const ::com::sun::star::awt::Point& aPos, - ::sal_Int32 nCommand, - ::sal_Bool bMouseEvent, + virtual void SAL_CALL command( const ::com::sun::star::awt::Point& aPos, + ::sal_Int32 nCommand, + ::sal_Bool bMouseEvent, const ::com::sun::star::uno::Any& aData ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL paint( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xGraphics, - const ::com::sun::star::awt::Rectangle& rOutputRectangle, + virtual void SAL_CALL paint( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xGraphics, + const ::com::sun::star::awt::Rectangle& rOutputRectangle, ::sal_Int32 nItemId, ::sal_Int32 nStyle ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL click() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL doubleClick() throw (::com::sun::star::uno::RuntimeException); - + private: virtual ~LangSelectionStatusbarController() {} LangSelectionStatusbarController(LangSelectionStatusbarController &); // not defined void operator =(LangSelectionStatusbarController &); // not defined - + sal_Bool m_bShowMenu; // if the menu is to be displayed or not (depending on the selected object/text) sal_Int16 m_nScriptType; // the flags for the different script types available in the selection, LATIN = 0x0001, ASIAN = 0x0002, COMPLEX = 0x0004 ::rtl::OUString m_aCurLang; // the language of the current selection, "*" if there are more than one languages ::rtl::OUString m_aKeyboardLang; // the keyboard language ::rtl::OUString m_aGuessedTextLang; // the 'guessed' language for the selection, "" if none could be guessed LanguageGuessingHelper m_aLangGuessHelper; - + void LangMenu() throw (::com::sun::star::uno::RuntimeException); }; diff --git a/framework/inc/uielement/logoimagestatusbarcontroller.hxx b/framework/inc/uielement/logoimagestatusbarcontroller.hxx index 6331af10547b..6f4a3ffb6563 100644 --- a/framework/inc/uielement/logoimagestatusbarcontroller.hxx +++ b/framework/inc/uielement/logoimagestatusbarcontroller.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,11 +43,11 @@ class LogoImageStatusbarController : public svt::StatusbarController { public: LogoImageStatusbarController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); - virtual ~LogoImageStatusbarController(); - + virtual ~LogoImageStatusbarController(); + // XServiceInfo DECLARE_XSERVICEINFO - + // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL acquire() throw (); @@ -55,13 +55,13 @@ class LogoImageStatusbarController : public svt::StatusbarController // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - + // XComponent virtual void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException ); // XEventListener virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException ); - + // XStatusListener virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ); @@ -69,16 +69,16 @@ class LogoImageStatusbarController : public svt::StatusbarController virtual ::sal_Bool SAL_CALL mouseButtonDown( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL mouseMove( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL mouseButtonUp( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL command( const ::com::sun::star::awt::Point& aPos, - ::sal_Int32 nCommand, - ::sal_Bool bMouseEvent, + virtual void SAL_CALL command( const ::com::sun::star::awt::Point& aPos, + ::sal_Int32 nCommand, + ::sal_Bool bMouseEvent, const ::com::sun::star::uno::Any& aData ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL paint( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xGraphics, - const ::com::sun::star::awt::Rectangle& rOutputRectangle, + virtual void SAL_CALL paint( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xGraphics, + const ::com::sun::star::awt::Rectangle& rOutputRectangle, ::sal_Int32 nItemId, ::sal_Int32 nStyle ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL click() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL doubleClick() throw (::com::sun::star::uno::RuntimeException); - + private: Image m_aLogoImage; }; diff --git a/framework/inc/uielement/logotextstatusbarcontroller.hxx b/framework/inc/uielement/logotextstatusbarcontroller.hxx index 0a83a7120f13..5adba49186eb 100644 --- a/framework/inc/uielement/logotextstatusbarcontroller.hxx +++ b/framework/inc/uielement/logotextstatusbarcontroller.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,11 +43,11 @@ class LogoTextStatusbarController : public svt::StatusbarController { public: LogoTextStatusbarController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); - virtual ~LogoTextStatusbarController(); - + virtual ~LogoTextStatusbarController(); + // XServiceInfo DECLARE_XSERVICEINFO - + // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL acquire() throw (); @@ -55,13 +55,13 @@ class LogoTextStatusbarController : public svt::StatusbarController // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - + // XComponent virtual void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException ); // XEventListener virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException ); - + // XStatusListener virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ); @@ -69,16 +69,16 @@ class LogoTextStatusbarController : public svt::StatusbarController virtual ::sal_Bool SAL_CALL mouseButtonDown( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL mouseMove( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL mouseButtonUp( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL command( const ::com::sun::star::awt::Point& aPos, - ::sal_Int32 nCommand, - ::sal_Bool bMouseEvent, + virtual void SAL_CALL command( const ::com::sun::star::awt::Point& aPos, + ::sal_Int32 nCommand, + ::sal_Bool bMouseEvent, const ::com::sun::star::uno::Any& aData ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL paint( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xGraphics, - const ::com::sun::star::awt::Rectangle& rOutputRectangle, + virtual void SAL_CALL paint( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xGraphics, + const ::com::sun::star::awt::Rectangle& rOutputRectangle, ::sal_Int32 nItemId, ::sal_Int32 nStyle ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL click() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL doubleClick() throw (::com::sun::star::uno::RuntimeException); - + private: rtl::OUString m_aLogoText; }; diff --git a/framework/inc/uielement/macrosmenucontroller.hxx b/framework/inc/uielement/macrosmenucontroller.hxx index 7c45a30d50f4..1e8b9024eaca 100644 --- a/framework/inc/uielement/macrosmenucontroller.hxx +++ b/framework/inc/uielement/macrosmenucontroller.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,16 +58,16 @@ namespace framework ::com::sun::star::util::URL aTargetURL; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs; }; - DECL_STATIC_LINK( MacrosMenuController, ExecuteHdl_Impl, ExecuteInfo* ); + DECL_STATIC_LINK( MacrosMenuController, ExecuteHdl_Impl, ExecuteInfo* ); ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xDispatchProvider; ::rtl::OUString m_aModuleIdentifier; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xUICommandLabels; - + public: MacrosMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); virtual ~MacrosMenuController(); - + // XServiceInfo DECLARE_XSERVICEINFO @@ -80,7 +80,7 @@ namespace framework private: virtual void impl_select(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aURL); void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu ); - String RetrieveLabelFromCommand( const String& aCmdURL ); + String RetrieveLabelFromCommand( const String& aCmdURL ); void addScriptItems( PopupMenu* pPopupMenu, USHORT startItemId ); }; } diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx index f3fdc9289f7b..773efafa52fe 100644 --- a/framework/inc/uielement/menubarmanager.hxx +++ b/framework/inc/uielement/menubarmanager.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,14 +34,14 @@ #include <vector> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> #include <macros/debug.hxx> #include <stdtypes.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XDispatch.hpp> @@ -63,7 +63,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <rtl/ustring.hxx> #include <vcl/menu.hxx> @@ -92,31 +92,31 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener public com::sun::star::ui::XUIConfigurationListener , public com::sun::star::lang::XComponent , public com::sun::star::awt::XSystemDependentMenuPeer , - public ThreadHelpBase , + public ThreadHelpBase , public ::cppu::OWeakObject { protected: // #110897# - MenuBarManager( + MenuBarManager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, const ::com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer >& _xURLTransformer, - AddonMenu* pAddonMenu, - sal_Bool bDelete, - sal_Bool bDeleteChildren ); + AddonMenu* pAddonMenu, + sal_Bool bDelete, + sal_Bool bDeleteChildren ); // #110897# - MenuBarManager( + MenuBarManager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, const ::com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer >& _xURLTransformer, - AddonPopupMenu* pAddonMenu, - sal_Bool bDelete, - sal_Bool bDeleteChildren ); + AddonPopupMenu* pAddonMenu, + sal_Bool bDelete, + sal_Bool bDeleteChildren ); public: // #110897# - MenuBarManager( + MenuBarManager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer >& _xURLTransformer, @@ -149,35 +149,35 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener // XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException ); - + // XUIConfigurationListener virtual void SAL_CALL elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException); // XSystemDependentMenuPeer virtual ::com::sun::star::uno::Any SAL_CALL getMenuHandle( const ::com::sun::star::uno::Sequence< sal_Int8 >& ProcessId, sal_Int16 SystemType ) throw (::com::sun::star::uno::RuntimeException); DECL_LINK( Select, Menu * ); - Menu* GetMenuBar() const { return m_pVCLMenu; } - + Menu* GetMenuBar() const { return m_pVCLMenu; } + // Configuration methods - static void FillMenuWithConfiguration( USHORT& nId, Menu* pMenu, - const ::rtl::OUString& rModuleIdentifier, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rItemContainer, + static void FillMenuWithConfiguration( USHORT& nId, Menu* pMenu, + const ::rtl::OUString& rModuleIdentifier, + const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rItemContainer, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer >& rTransformer ); - static void FillMenu( USHORT& nId, - Menu* pMenu, - const ::rtl::OUString& rModuleIdentifier, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rItemContainer, + static void FillMenu( USHORT& nId, + Menu* pMenu, + const ::rtl::OUString& rModuleIdentifier, + const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rItemContainer, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider ); - - void FillMenuManager( Menu* pMenu, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, + + void FillMenuManager( Menu* pMenu, + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, - const rtl::OUString& rModuleIdentifier, - sal_Bool bDelete, + const rtl::OUString& rModuleIdentifier, + sal_Bool bDelete, sal_Bool bDeleteChildren ); void SetItemContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rItemContainer ); void GetPopupController( PopupControllerCache& rPopupController ); @@ -193,30 +193,30 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener void RetrieveImageManagers(); static sal_Bool MustBeHidden( PopupMenu* pPopupMenu, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer >& rTransformer ); String RetrieveLabelFromCommand( const String& aCmdURL ); - + private: - - - + + + void Destroy(); struct MenuItemHandler { - MenuItemHandler( USHORT aItemId, - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xManager, + MenuItemHandler( USHORT aItemId, + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xManager, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& rDispatch ) : - nItemId( aItemId ), + nItemId( aItemId ), bCheckHide( sal_True ), xSubMenuManager( xManager ), xMenuItemDispatch( rDispatch ) {} - USHORT nItemId; + USHORT nItemId; sal_Bool bCheckHide; - ::rtl::OUString aTargetFrame; - ::rtl::OUString aMenuItemURL; - ::rtl::OUString aFilter; - ::rtl::OUString aPassword; - ::rtl::OUString aTitle; + ::rtl::OUString aTargetFrame; + ::rtl::OUString aMenuItemURL; + ::rtl::OUString aFilter; + ::rtl::OUString aPassword; + ::rtl::OUString aTitle; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > xSubMenuManager; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xMenuItemDispatch; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XPopupMenuController > xPopupMenuController; @@ -225,7 +225,7 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener }; void RetrieveShortcuts( std::vector< MenuItemHandler* >& aMenuShortCuts ); - void CreatePicklistArguments( + void CreatePicklistArguments( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgsList, const MenuItemHandler* ); void CheckAndAddMenuExtension( Menu* pMenu ); @@ -233,7 +233,7 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener const ::com::sun::star::uno::Sequence< rtl::OUString >& rCommands, std::vector< MenuItemHandler* >& aMenuShortCuts ); static void MergeAddonMenus( Menu* pMenuBar, const MergeMenuInstructionContainer&, const ::rtl::OUString& aModuleIdentifier ); - + MenuItemHandler* GetMenuItemHandler( USHORT nItemId ); sal_Bool CreatePopupMenuController( MenuItemHandler* pMenuItemHandler ); void AddMenu(MenuBarManager* pSubMenuManager,const ::rtl::OUString& _sItemCommand,USHORT _nItemId); @@ -252,13 +252,13 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener sal_Bool m_bRetrieveImages : 1, m_bAcceleratorCfg : 1; sal_Bool m_bModuleIdentified; - ::rtl::OUString m_aMenuItemCommand; + ::rtl::OUString m_aMenuItemCommand; ::rtl::OUString m_aModuleIdentifier; - Menu* m_pVCLMenu; + Menu* m_pVCLMenu; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xUICommandLabels; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XUIControllerRegistration > m_xPopupMenuControllerRegistration; - ::std::vector< MenuItemHandler* > m_aMenuItemHandlerVector; + ::std::vector< MenuItemHandler* > m_aMenuItemHandlerVector; ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xDispatchProvider; ::com::sun::star::uno::Reference< ::com::sun::star::ui::XImageManager > m_xDocImageManager; diff --git a/framework/inc/uielement/menubarmerger.hxx b/framework/inc/uielement/menubarmerger.hxx index 681028a6961a..e4e930faafe2 100644 --- a/framework/inc/uielement/menubarmerger.hxx +++ b/framework/inc/uielement/menubarmerger.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/inc/uielement/menubarwrapper.hxx b/framework/inc/uielement/menubarwrapper.hxx index ee14f19fbf80..e5ccacd28c8f 100644 --- a/framework/inc/uielement/menubarwrapper.hxx +++ b/framework/inc/uielement/menubarwrapper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,14 +29,14 @@ #define __FRAMEWORK_UIELEMENT_MENUBARWRAPPER_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <helper/uiconfigelementwrapperbase.hxx> #include <uielement/menubarmanager.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> @@ -47,7 +47,7 @@ #endif //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <hash_map> @@ -57,26 +57,26 @@ namespace framework class MenuBarWrapper : public UIConfigElementWrapperBase, public ::com::sun::star::container::XNameAccess - + { - public: + public: // #110897# - MenuBarWrapper( + MenuBarWrapper( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); virtual ~MenuBarWrapper(); //--------------------------------------------------------------------------------------------------------- - // XInterface, XTypeProvider + // XInterface, XTypeProvider //--------------------------------------------------------------------------------------------------------- FWK_DECLARE_XINTERFACE FWK_DECLARE_XTYPEPROVIDER - + MenuBarManager* GetMenuBarManager() const { return static_cast< MenuBarManager* >( m_xMenuBarManager.get() ); } void InvalidatePopupControllerCache() { m_bRefreshPopupControllerCache = sal_True; } // XComponent virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException); - + // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); @@ -89,7 +89,7 @@ class MenuBarWrapper : public UIConfigElementWrapperBase, // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL hasElements() throw (::com::sun::star::uno::RuntimeException); - + // XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw (::com::sun::star::uno::RuntimeException); diff --git a/framework/inc/uielement/newmenucontroller.hxx b/framework/inc/uielement/newmenucontroller.hxx index 3e652b2212e2..5e14b70f0044 100644 --- a/framework/inc/uielement/newmenucontroller.hxx +++ b/framework/inc/uielement/newmenucontroller.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,14 +29,14 @@ #define __FRAMEWORK_UIELEMENT_NEWMENUCONTROLLER_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <macros/xserviceinfo.hxx> #include <stdtypes.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> @@ -51,7 +51,7 @@ #include <com/sun/star/ui/XAcceleratorConfiguration.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <svtools/popupmenucontrollerbase.hxx> #include <toolkit/awt/vclxmenu.hxx> @@ -79,10 +79,10 @@ namespace framework public: NewMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); virtual ~NewMenuController(); - + // XServiceInfo DECLARE_XSERVICEINFO - + // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); @@ -96,8 +96,8 @@ namespace framework // XEventListener virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException ); - DECL_STATIC_LINK( NewMenuController, ExecuteHdl_Impl, NewDocument* ); - + DECL_STATIC_LINK( NewMenuController, ExecuteHdl_Impl, NewDocument* ); + private: virtual void impl_setPopupMenu(); struct AddInfo @@ -105,9 +105,9 @@ namespace framework rtl::OUString aTargetFrame; rtl::OUString aImageId; }; - + typedef ::std::hash_map< int, AddInfo > AddInfoForId; - + void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu ); void retrieveShortcutsFromConfiguration( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration >& rAccelCfg, const ::com::sun::star::uno::Sequence< rtl::OUString >& rCommands, diff --git a/framework/inc/uielement/objectmenucontroller.hxx b/framework/inc/uielement/objectmenucontroller.hxx index 02e2dde11d11..7a03dfd1458e 100644 --- a/framework/inc/uielement/objectmenucontroller.hxx +++ b/framework/inc/uielement/objectmenucontroller.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,14 +29,14 @@ #define __FRAMEWORK_UIELEMENT_OBJECTMENUCONTROLLER_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <macros/xserviceinfo.hxx> #include <stdtypes.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> @@ -49,7 +49,7 @@ #include <com/sun/star/embed/VerbDescriptor.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <svtools/popupmenucontrollerbase.hxx> #include <toolkit/awt/vclxmenu.hxx> diff --git a/framework/inc/uielement/popupmenucontroller.hxx b/framework/inc/uielement/popupmenucontroller.hxx index 96491dbd3ea7..ef44a4703ca2 100644 --- a/framework/inc/uielement/popupmenucontroller.hxx +++ b/framework/inc/uielement/popupmenucontroller.hxx @@ -55,7 +55,7 @@ public: // XServiceInfo DECLARE_XSERVICEINFO - + // XComponent virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException); diff --git a/framework/inc/uielement/progressbarwrapper.hxx b/framework/inc/uielement/progressbarwrapper.hxx index cb941f41e33d..e16d050e7d42 100644 --- a/framework/inc/uielement/progressbarwrapper.hxx +++ b/framework/inc/uielement/progressbarwrapper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define _FRAMEWORK_UIELEMENT_PROGRESSBARWRAPPER_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <helper/uielementwrapperbase.hxx> @@ -40,19 +40,19 @@ #include <macros/debug.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/task/XStatusIndicator.hpp> #include <com/sun/star/awt/XWindow.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/weak.hxx> #include <cppuhelper/weakref.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ @@ -61,7 +61,7 @@ class ProgressBarWrapper : public UIElementWrapperBase { public: //--------------------------------------------------------------------------------------------------------- - // constructor / destructor + // constructor / destructor //--------------------------------------------------------------------------------------------------------- ProgressBarWrapper(); virtual ~ProgressBarWrapper(); @@ -69,30 +69,30 @@ class ProgressBarWrapper : public UIElementWrapperBase // public interfaces void setStatusBar( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& rStatusBar, sal_Bool bOwnsInstance = sal_False ); ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > getStatusBar() const; - + // wrapped methods of ::com::sun::star::task::XStatusIndicator void start( const ::rtl::OUString& Text, ::sal_Int32 Range ) throw (::com::sun::star::uno::RuntimeException); void end() throw (::com::sun::star::uno::RuntimeException); void setText( const ::rtl::OUString& Text ) throw (::com::sun::star::uno::RuntimeException); void setValue( ::sal_Int32 Value ) throw (::com::sun::star::uno::RuntimeException); void reset() throw (::com::sun::star::uno::RuntimeException); - + // UNO interfaces // XComponent virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException); - + // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - + // XUpdatable virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException); // XUIElement virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException); - + //------------------------------------------------------------------------------------------------------------- - // variables - // (should be private everyway!) + // variables + // (should be private everyway!) //------------------------------------------------------------------------------------------------------------- private: ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xStatusBar; // Reference to our status bar XWindow @@ -103,6 +103,6 @@ class ProgressBarWrapper : public UIElementWrapperBase rtl::OUString m_aText; }; // class ProgressBarWrapper -} // namespace framework +} // namespace framework #endif // _FRAMEWORK_UIELEMENT_PROGRESSBARWRAPPER_HXX_ diff --git a/framework/inc/uielement/recentfilesmenucontroller.hxx b/framework/inc/uielement/recentfilesmenucontroller.hxx index 4397aee31d9f..26a8e38dd49c 100644 --- a/framework/inc/uielement/recentfilesmenucontroller.hxx +++ b/framework/inc/uielement/recentfilesmenucontroller.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,14 +29,14 @@ #define __FRAMEWORK_UIELEMENT_RECENTFILESMENUCONTROLLER_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <macros/xserviceinfo.hxx> #include <stdtypes.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> @@ -50,7 +50,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <svtools/popupmenucontrollerbase.hxx> #include <toolkit/awt/vclxmenu.hxx> @@ -73,13 +73,13 @@ namespace framework public: RecentFilesMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); virtual ~RecentFilesMenuController(); - + // XServiceInfo DECLARE_XSERVICEINFO // XPopupMenuController virtual void SAL_CALL updatePopupMenu() throw (::com::sun::star::uno::RuntimeException); - + // XStatusListener virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ); @@ -91,15 +91,15 @@ namespace framework virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& sTarget, sal_Int32 nFlags ) throw( ::com::sun::star::uno::RuntimeException ); // XDispatch - virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& seqProperties ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& seqProperties ) throw( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL addStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL removeStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) throw( ::com::sun::star::uno::RuntimeException ); - + virtual void SAL_CALL removeStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) throw( ::com::sun::star::uno::RuntimeException ); + // XEventListener virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException ); - DECL_STATIC_LINK( RecentFilesMenuController, ExecuteHdl_Impl, LoadRecentFile* ); - + DECL_STATIC_LINK( RecentFilesMenuController, ExecuteHdl_Impl, LoadRecentFile* ); + private: virtual void impl_setPopupMenu(); struct RecentFile diff --git a/framework/inc/uielement/rootitemcontainer.hxx b/framework/inc/uielement/rootitemcontainer.hxx index c77079631929..9ec0955c3ffe 100644 --- a/framework/inc/uielement/rootitemcontainer.hxx +++ b/framework/inc/uielement/rootitemcontainer.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_UIELEMENT_ROOTITEMCONTAINER_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> @@ -39,7 +39,7 @@ #include <helper/shareablemutex.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/container/XIndexAccess.hpp> @@ -49,7 +49,7 @@ #include <com/sun/star/lang/XUnoTunnel.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <rtl/ustring.hxx> #include <cppuhelper/weak.hxx> @@ -63,8 +63,8 @@ namespace framework class ConstItemContainer; class ItemContainer; -class RootItemContainer : public ::com::sun::star::lang::XTypeProvider , - public ::com::sun::star::container::XIndexContainer , +class RootItemContainer : public ::com::sun::star::lang::XTypeProvider , + public ::com::sun::star::container::XIndexContainer , public ::com::sun::star::lang::XSingleComponentFactory , public ::com::sun::star::lang::XUnoTunnel , protected ThreadHelpBase , @@ -81,15 +81,15 @@ class RootItemContainer : public ::com::sun::star::lang::XTypeProvider virtual ~RootItemContainer(); //--------------------------------------------------------------------------------------------------------- - // XInterface, XTypeProvider + // XInterface, XTypeProvider //--------------------------------------------------------------------------------------------------------- FWK_DECLARE_XINTERFACE - FWK_DECLARE_XTYPEPROVIDER + FWK_DECLARE_XTYPEPROVIDER // XUnoTunnel - static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); - static RootItemContainer* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw(); - sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException); + static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); + static RootItemContainer* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw(); + sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException); // XIndexContainer virtual void SAL_CALL insertByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) @@ -124,7 +124,7 @@ class RootItemContainer : public ::com::sun::star::lang::XTypeProvider virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArgumentsAndContext( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& Context ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); protected: - // OPropertySetHelper + // OPropertySetHelper virtual sal_Bool SAL_CALL convertFastPropertyValue ( com::sun::star::uno::Any& aConvertedValue , com::sun::star::uno::Any& aOldValue , sal_Int32 nHandle , @@ -150,7 +150,7 @@ class RootItemContainer : public ::com::sun::star::lang::XTypeProvider std::vector< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > > m_aItemVector; rtl::OUString m_aUIName; }; - + } #endif // #ifndef __FRAMEWORK_UIELEMENT_ROOTITEMCONTAINER_HXX_ diff --git a/framework/inc/uielement/simpletextstatusbarcontroller.hxx b/framework/inc/uielement/simpletextstatusbarcontroller.hxx index 0da55f6bdef5..6c13b2f6ced9 100644 --- a/framework/inc/uielement/simpletextstatusbarcontroller.hxx +++ b/framework/inc/uielement/simpletextstatusbarcontroller.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,11 +45,11 @@ class SimpleTextStatusbarController : public svt::StatusbarController { public: SimpleTextStatusbarController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); - virtual ~SimpleTextStatusbarController(); - + virtual ~SimpleTextStatusbarController(); + // XServiceInfo DECLARE_XSERVICEINFO - + // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL acquire() throw (); @@ -57,13 +57,13 @@ class SimpleTextStatusbarController : public svt::StatusbarController // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - + // XComponent virtual void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException ); // XEventListener virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException ); - + // XStatusListener virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ); @@ -71,16 +71,16 @@ class SimpleTextStatusbarController : public svt::StatusbarController virtual ::sal_Bool SAL_CALL mouseButtonDown( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL mouseMove( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL mouseButtonUp( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL command( const ::com::sun::star::awt::Point& aPos, - ::sal_Int32 nCommand, - ::sal_Bool bMouseEvent, + virtual void SAL_CALL command( const ::com::sun::star::awt::Point& aPos, + ::sal_Int32 nCommand, + ::sal_Bool bMouseEvent, const ::com::sun::star::uno::Any& aData ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL paint( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xGraphics, - const ::com::sun::star::awt::Rectangle& rOutputRectangle, + virtual void SAL_CALL paint( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xGraphics, + const ::com::sun::star::awt::Rectangle& rOutputRectangle, ::sal_Int32 nItemId, ::sal_Int32 nStyle ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL click() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL doubleClick() throw (::com::sun::star::uno::RuntimeException); - + private: rtl::OUString m_aText; }; diff --git a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx index 5cf7519cb8e1..17a9e1611ffa 100644 --- a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx +++ b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ #include <com/sun/star/frame/ControlCommand.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <uielement/complextoolbarcontroller.hxx> @@ -64,10 +64,10 @@ class ISpinfieldListener class SpinfieldToolbarController : public ISpinfieldListener, public ComplexToolbarController - + { public: - SpinfieldToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, + SpinfieldToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolBar, USHORT nID, @@ -84,7 +84,7 @@ class SpinfieldToolbarController : public ISpinfieldListener, virtual void First(); virtual void Last(); virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void Modify(); + virtual void Modify(); virtual void GetFocus(); virtual void LoseFocus(); virtual void StateChanged( StateChangedType nType ); diff --git a/framework/inc/uielement/statusbar.hxx b/framework/inc/uielement/statusbar.hxx index 66b475ca8bbb..70ea373917eb 100644 --- a/framework/inc/uielement/statusbar.hxx +++ b/framework/inc/uielement/statusbar.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,17 +29,17 @@ #define __FRAMEWORK_UIELEMENT_STATUSBAR_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <uielement/statusbarmanager.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <vcl/status.hxx> @@ -56,7 +56,7 @@ class FrameworkStatusBar : public StatusBar virtual ~FrameworkStatusBar(); void SetStatusBarManager( StatusBarManager* pStatusBarManager ); - + virtual void StateChanged( StateChangedType nType ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); virtual void UserDraw(const UserDrawEvent& rUDEvt); @@ -66,8 +66,8 @@ class FrameworkStatusBar : public StatusBar virtual void MouseButtonUp( const MouseEvent& rMEvt ); private: - StatusBarManager* m_pMgr; - sal_Bool m_bShow : 1, + StatusBarManager* m_pMgr; + sal_Bool m_bShow : 1, m_bLock : 1; }; diff --git a/framework/inc/uielement/statusbarmanager.hxx b/framework/inc/uielement/statusbarmanager.hxx index ecb0df64c904..cfcb71960304 100644 --- a/framework/inc/uielement/statusbarmanager.hxx +++ b/framework/inc/uielement/statusbarmanager.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_UIELEMENT_STATUSBARMANAGER_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> @@ -39,7 +39,7 @@ #include <stdtypes.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XStatusListener.hpp> @@ -51,7 +51,7 @@ #include <com/sun/star/container/XNameAccess.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <rtl/ustring.hxx> #include <cppuhelper/weak.hxx> @@ -66,14 +66,14 @@ class StatusBarManager : public ::com::sun::star::frame::XFrameActionListener public ::com::sun::star::lang::XComponent , public ::com::sun::star::lang::XTypeProvider , public ::com::sun::star::ui::XUIConfigurationListener, - public ThreadHelpBase , + public ThreadHelpBase , public ::cppu::OWeakObject { friend class FrameworkStatusBar; public: - StatusBarManager( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServicveManager, - const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, + StatusBarManager( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServicveManager, + const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, const rtl::OUString& rResourceName, StatusBar* pStatusBar ); virtual ~StatusBarManager(); @@ -81,20 +81,20 @@ class StatusBarManager : public ::com::sun::star::frame::XFrameActionListener // XInterface, XTypeProvider, XServiceInfo FWK_DECLARE_XINTERFACE FWK_DECLARE_XTYPEPROVIDER - + StatusBar* GetStatusBar() const; - + // XFrameActionListener virtual void SAL_CALL frameAction( const com::sun::star::frame::FrameActionEvent& Action ) throw ( ::com::sun::star::uno::RuntimeException ); - + // XEventListener virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException ); - + // XUIConfigurationListener virtual void SAL_CALL elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException); - + virtual void SAL_CALL elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException); + // XComponent void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException ); void SAL_CALL addEventListener( const com::sun::star::uno::Reference< XEventListener >& xListener ) throw( com::sun::star::uno::RuntimeException ); @@ -137,7 +137,7 @@ class StatusBarManager : public ::com::sun::star::frame::XFrameActionListener ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xServiceManager; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XUIControllerRegistration > m_xStatusbarControllerRegistration; }; - + } #endif // __FRAMEWORK_UIELEMENT_STATUSBARMANAGER_HXX_ diff --git a/framework/inc/uielement/statusbarwrapper.hxx b/framework/inc/uielement/statusbarwrapper.hxx index c8231a4f8417..7bb1a0bee352 100644 --- a/framework/inc/uielement/statusbarwrapper.hxx +++ b/framework/inc/uielement/statusbarwrapper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,21 +29,21 @@ #define __FRAMEWORK_UIELEMENT_STATUSBARWRAPPER_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <helper/uiconfigelementwrapperbase.hxx> #include <uielement/statusbarmanager.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ namespace framework @@ -52,13 +52,13 @@ namespace framework class StatusBarWrapper : public UIConfigElementWrapperBase { public: - StatusBarWrapper( + StatusBarWrapper( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); virtual ~StatusBarWrapper(); // XComponent virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException); - + // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); diff --git a/framework/inc/uielement/statusindicatorinterfacewrapper.hxx b/framework/inc/uielement/statusindicatorinterfacewrapper.hxx index c7635456f5ee..085d2d58ffa9 100644 --- a/framework/inc/uielement/statusindicatorinterfacewrapper.hxx +++ b/framework/inc/uielement/statusindicatorinterfacewrapper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_UIELEMENT_STATUSINDICATORINTERFACEWRAPPER_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> @@ -38,14 +38,14 @@ #include <macros/xtypeprovider.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/task/XStatusIndicator.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/lang/XComponent.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <rtl/ustring.hxx> #include <cppuhelper/implbase1.hxx> @@ -62,7 +62,7 @@ class StatusIndicatorInterfaceWrapper : public ::cppu::WeakImplHelper1< ::com: virtual ~StatusIndicatorInterfaceWrapper(); //--------------------------------------------------------------------------------------------------------- - // XStatusIndicator + // XStatusIndicator //--------------------------------------------------------------------------------------------------------- virtual void SAL_CALL start ( const ::rtl::OUString& sText , sal_Int32 nRange ) throw( ::com::sun::star::uno::RuntimeException ); @@ -76,7 +76,7 @@ class StatusIndicatorInterfaceWrapper : public ::cppu::WeakImplHelper1< ::com: ::com::sun::star::uno::WeakReference< ::com::sun::star::lang::XComponent > m_xStatusIndicatorImpl; }; - + } #endif // __FRAMEWORK_UIELEMENT_STATUSINDICATORINTERFACEWRAPPER_HXX_ diff --git a/framework/inc/uielement/togglebuttontoolbarcontroller.hxx b/framework/inc/uielement/togglebuttontoolbarcontroller.hxx index 180c02975da5..1261b96c769e 100644 --- a/framework/inc/uielement/togglebuttontoolbarcontroller.hxx +++ b/framework/inc/uielement/togglebuttontoolbarcontroller.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ #include <com/sun/star/frame/ControlCommand.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <uielement/complextoolbarcontroller.hxx> @@ -45,7 +45,7 @@ namespace framework class ToolBar; class ToggleButtonToolbarController : public ComplexToolbarController - + { public: enum Style @@ -55,7 +55,7 @@ class ToggleButtonToolbarController : public ComplexToolbarController STYLE_TOGGLE_DROPDOWNBUTTON }; - ToggleButtonToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, + ToggleButtonToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolBar, USHORT nID, @@ -75,7 +75,7 @@ class ToggleButtonToolbarController : public ComplexToolbarController private: DECL_LINK( MenuSelectHdl, Menu *); - + Style m_eStyle; rtl::OUString m_aCurrentSelection; std::vector< rtl::OUString > m_aDropdownMenuList; diff --git a/framework/inc/uielement/toolbar.hxx b/framework/inc/uielement/toolbar.hxx index 5fb0821f9c5d..a5329bab3f75 100644 --- a/framework/inc/uielement/toolbar.hxx +++ b/framework/inc/uielement/toolbar.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,7 +26,7 @@ ************************************************************************/ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ @@ -44,15 +44,15 @@ class ToolBar : public ToolBox public: ToolBar( Window* pParent, WinBits nWinBits ); virtual ~ToolBar(); - - virtual void Command ( const CommandEvent& rCEvt ); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + + virtual void Command ( const CommandEvent& rCEvt ); + virtual void StateChanged( StateChangedType nType ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); // Toolbar manager void SetToolBarManager( ToolBarManager* pTbMgr ); ToolBarManager* GetToolBarManager() const { return m_pToolBarManager; } - + // Provide additional handlers to support external implementations void SetCommandHdl( const Link& aLink ) { m_aCommandHandler = aLink; } const Link& GetCommandHdl() const { return m_aCommandHandler; } diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx index 0c3448d48212..5e780edb366b 100644 --- a/framework/inc/uielement/toolbarmanager.hxx +++ b/framework/inc/uielement/toolbarmanager.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_UIELEMENT_TOOLBARMANAGER_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> @@ -40,7 +40,7 @@ #include <uielement/commandinfo.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XStatusListener.hpp> @@ -64,7 +64,7 @@ #include <com/sun/star/frame/XToolbarController.hpp> //end //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <rtl/ustring.hxx> #include <cppuhelper/weak.hxx> @@ -96,12 +96,12 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener public ::com::sun::star::lang::XComponent , public ::com::sun::star::lang::XTypeProvider , public ::com::sun::star::ui::XUIConfigurationListener, - public ThreadHelpBase , + public ThreadHelpBase , public ::cppu::OWeakObject { public: - ToolBarManager( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServicveManager, - const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, + ToolBarManager( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServicveManager, + const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, const rtl::OUString& rResourceName, ToolBar* pToolBar ); virtual ~ToolBarManager(); @@ -109,23 +109,23 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener // XInterface, XTypeProvider, XServiceInfo FWK_DECLARE_XINTERFACE FWK_DECLARE_XTYPEPROVIDER - + ToolBox* GetToolBar() const; - + // XFrameActionListener virtual void SAL_CALL frameAction( const com::sun::star::frame::FrameActionEvent& Action ) throw ( ::com::sun::star::uno::RuntimeException ); - + // XStatusListener virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ); - + // XEventListener virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException ); - + // XUIConfigurationListener virtual void SAL_CALL elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException); - + virtual void SAL_CALL elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException); + // XComponent void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException ); void SAL_CALL addEventListener( const com::sun::star::uno::Reference< XEventListener >& xListener ) throw( com::sun::star::uno::RuntimeException ); @@ -158,7 +158,7 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener sal_Int16 nWidth; }; typedef std::vector< ControllerParams > ControllerParamsVector; - + protected: //added for 33668 by shizhoubo : 2008:04 DECL_LINK( Command, CommandEvent * ); @@ -197,7 +197,7 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener void ImplClearPopupMenu( ToolBox *pToolBar ); void RequestImages(); sal_uInt16 ConvertStyleToToolboxItemBits( sal_Int32 nStyle ); - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetModelFromFrame() const; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetModelFromFrame() const; sal_Bool IsPluginMode() const; Image QueryAddonsImage( const ::rtl::OUString& aCommandURL, bool bBigImages, bool bHiContrast ); long HandleClick(void ( SAL_CALL ::com::sun::star::frame::XToolbarController::*_pClick )( )); @@ -243,15 +243,15 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener CommandToInfoMap m_aCommandMap; SubToolBarToSubToolBarControllerMap m_aSubToolBarControllerMap; - Timer m_aAsyncUpdateControllersTimer; + Timer m_aAsyncUpdateControllersTimer; sal_Int16 m_nSymbolsStyle; MenuDescriptionMap m_aMenuMap; - sal_Bool m_bAcceleratorCfg; + sal_Bool m_bAcceleratorCfg; ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration > m_xDocAcceleratorManager; ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration > m_xModuleAcceleratorManager; ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration > m_xGlobalAcceleratorManager; }; - + } #endif // __FRAMEWORK_UIELEMENT_TOOLBARMANAGER_HXX_ diff --git a/framework/inc/uielement/toolbarmerger.hxx b/framework/inc/uielement/toolbarmerger.hxx index 2fe68b6d41a9..8016bbb620b8 100644 --- a/framework/inc/uielement/toolbarmerger.hxx +++ b/framework/inc/uielement/toolbarmerger.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/inc/uielement/toolbarsmenucontroller.hxx b/framework/inc/uielement/toolbarsmenucontroller.hxx index 0fa60c9e6840..35f517d33e80 100644 --- a/framework/inc/uielement/toolbarsmenucontroller.hxx +++ b/framework/inc/uielement/toolbarsmenucontroller.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,14 +29,14 @@ #define __FRAMEWORK_UIELEMENT_TOOLBARSMENUCONTROLLER_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <macros/xserviceinfo.hxx> #include <stdtypes.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> @@ -52,7 +52,7 @@ #include <com/sun/star/ui/XUIConfigurationManager.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <svtools/popupmenucontrollerbase.hxx> #include <toolkit/awt/vclxmenu.hxx> @@ -71,13 +71,13 @@ namespace framework public: ToolbarsMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); virtual ~ToolbarsMenuController(); - + // XServiceInfo DECLARE_XSERVICEINFO // XPopupMenuController virtual void SAL_CALL setPopupMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >& PopupMenu ) throw (::com::sun::star::uno::RuntimeException); - + // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); @@ -97,9 +97,9 @@ namespace framework ::com::sun::star::util::URL aTargetURL; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs; }; - + DECL_STATIC_LINK( ToolbarsMenuController, ExecuteHdl_Impl, ExecuteInfo* ); - + private: void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu ); ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > > getLayoutManagerToolbars( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& rLayoutManager ); diff --git a/framework/inc/uielement/toolbarwrapper.hxx b/framework/inc/uielement/toolbarwrapper.hxx index b3fcd495052d..06e99d2017b4 100644 --- a/framework/inc/uielement/toolbarwrapper.hxx +++ b/framework/inc/uielement/toolbarwrapper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,13 +29,13 @@ #define __FRAMEWORK_UIELEMENT_TOOLBARWRAPPER_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <helper/uiconfigelementwrapperbase.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/lang/XComponent.hpp> @@ -43,7 +43,7 @@ #include <com/sun/star/ui/XUIFunctionListener.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ namespace framework @@ -56,15 +56,15 @@ class ToolBarWrapper : public ::com::sun::star::ui::XUIFunctionListener, public: ToolBarWrapper( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); virtual ~ToolBarWrapper(); - + // XInterface virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw( ::com::sun::star::uno::RuntimeException ); - + // XComponent virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException); - + // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); @@ -73,7 +73,7 @@ class ToolBarWrapper : public ::com::sun::star::ui::XUIFunctionListener, // XUpdatable virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException); - + // XUIElementSettings virtual void SAL_CALL updateSettings() throw (::com::sun::star::uno::RuntimeException); @@ -83,14 +83,14 @@ class ToolBarWrapper : public ::com::sun::star::ui::XUIFunctionListener, // XEventListener using cppu::OPropertySetHelper::disposing; virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException); - + //------------------------------------------------------------------------------------------------------------- - // protected methods + // protected methods //------------------------------------------------------------------------------------------------------------- protected: virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const com::sun::star::uno::Any& aValue ) throw( com::sun::star::uno::Exception ); virtual void impl_fillNewData(); - + private: com::sun::star::uno::Reference< com::sun::star::lang::XComponent > m_xToolBarManager; com::sun::star::uno::Reference< com::sun::star::awt::XWindow > m_xToolBarWindow; diff --git a/framework/inc/uielement/uicommanddescription.hxx b/framework/inc/uielement/uicommanddescription.hxx index c0f3d5d48ab1..dd95981bba90 100644 --- a/framework/inc/uielement/uicommanddescription.hxx +++ b/framework/inc/uielement/uicommanddescription.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ #include <hash_map> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> @@ -46,7 +46,7 @@ #include <stdtypes.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> @@ -54,15 +54,15 @@ #include <com/sun/star/frame/XModuleManager.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/implbase2.hxx> #include <rtl/ustring.hxx> namespace framework { -class UICommandDescription : private ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. - public ::cppu::WeakImplHelper2< com::sun::star::lang::XServiceInfo , +class UICommandDescription : private ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. + public ::cppu::WeakImplHelper2< com::sun::star::lang::XServiceInfo , com::sun::star::container::XNameAccess > { public: @@ -73,19 +73,19 @@ class UICommandDescription : private ThreadHelpBase , // Struct for right DECLARE_XSERVICEINFO private: // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() + + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw (::com::sun::star::uno::RuntimeException); - - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + + virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() + virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasElements() + virtual sal_Bool SAL_CALL hasElements() throw (::com::sun::star::uno::RuntimeException); public: @@ -93,7 +93,7 @@ public: ::rtl::OUString, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > ModuleToCommandFileMap; - + typedef ::std::hash_map< ::rtl::OUString, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >, OUStringHashCode, diff --git a/framework/inc/uifactory/addonstoolboxfactory.hxx b/framework/inc/uifactory/addonstoolboxfactory.hxx index f0e85e25892a..4a77e85e73a5 100644 --- a/framework/inc/uifactory/addonstoolboxfactory.hxx +++ b/framework/inc/uifactory/addonstoolboxfactory.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_UIFACTORY_ADDONSTOOLBOXFACTORY_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <stdtypes.h> @@ -41,7 +41,7 @@ #include <services.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> @@ -53,7 +53,7 @@ #include <com/sun/star/frame/XModel.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <cppuhelper/implbase2.hxx> #include <rtl/ustring.hxx> @@ -61,8 +61,8 @@ namespace framework { -class AddonsToolBoxFactory : protected ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. - public ::cppu::WeakImplHelper2< com::sun::star::lang::XServiceInfo , +class AddonsToolBoxFactory : protected ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. + public ::cppu::WeakImplHelper2< com::sun::star::lang::XServiceInfo , com::sun::star::ui::XUIElementFactory > { public: @@ -75,7 +75,7 @@ class AddonsToolBoxFactory : protected ThreadHelpBase , // Struct // XUIElementFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > SAL_CALL createUIElement( const ::rtl::OUString& ResourceURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Args ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); - sal_Bool hasButtonsInContext( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& rPropSeq, + sal_Bool hasButtonsInContext( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& rPropSeq, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); private: diff --git a/framework/inc/uifactory/factoryconfiguration.hxx b/framework/inc/uifactory/factoryconfiguration.hxx index a20575b09b2a..14a62daca285 100755 --- a/framework/inc/uifactory/factoryconfiguration.hxx +++ b/framework/inc/uifactory/factoryconfiguration.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ #include <stdtypes.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> @@ -45,21 +45,21 @@ #include <com/sun/star/frame/XUIControllerRegistration.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/implbase1.hxx> #include <rtl/ustring.hxx> //_________________________________________________________________________________________________________________ -// Namespace +// Namespace //_________________________________________________________________________________________________________________ -// +// namespace framework { //***************************************************************************************************************** -// Configuration access class for PopupMenuControllerFactory implementation +// Configuration access class for PopupMenuControllerFactory implementation //***************************************************************************************************************** class ConfigurationAccess_ControllerFactory : // interfaces private ThreadHelpBase, diff --git a/framework/inc/uifactory/menubarfactory.hxx b/framework/inc/uifactory/menubarfactory.hxx index 477a2220df0e..85f6e84d08ad 100644 --- a/framework/inc/uifactory/menubarfactory.hxx +++ b/framework/inc/uifactory/menubarfactory.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_UIFACTORY_MENUBARFACTORY_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <stdtypes.h> @@ -40,7 +40,7 @@ #include <macros/xserviceinfo.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> @@ -50,7 +50,7 @@ #include <com/sun/star/frame/XModuleManager.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <toolkit/awt/vclxmenu.hxx> #include <cppuhelper/implbase2.hxx> @@ -58,14 +58,14 @@ namespace framework { - class MenuBarFactory : protected ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. + class MenuBarFactory : protected ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. public ::cppu::WeakImplHelper2< com::sun::star::lang::XServiceInfo, ::com::sun::star::ui::XUIElementFactory> { public: MenuBarFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); virtual ~MenuBarFactory(); - + // XInterface, XTypeProvider, XServiceInfo DECLARE_XSERVICEINFO diff --git a/framework/inc/uifactory/popupmenucontrollerfactory.hxx b/framework/inc/uifactory/popupmenucontrollerfactory.hxx index 1288f3404ab2..9e10cc4d2ef5 100644 --- a/framework/inc/uifactory/popupmenucontrollerfactory.hxx +++ b/framework/inc/uifactory/popupmenucontrollerfactory.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,18 +35,18 @@ #include <list> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <macros/xserviceinfo.hxx> #include <stdtypes.h> #include <uifactory/toolbarcontrollerfactory.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ namespace framework diff --git a/framework/inc/uifactory/statusbarcontrollerfactory.hxx b/framework/inc/uifactory/statusbarcontrollerfactory.hxx index 0606b6daf3db..6dd8fa3b5040 100644 --- a/framework/inc/uifactory/statusbarcontrollerfactory.hxx +++ b/framework/inc/uifactory/statusbarcontrollerfactory.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,18 +29,18 @@ #define __FRAMEWORK_UIFACTORY_STATUSBARCONTROLLERFACTORY_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <macros/xserviceinfo.hxx> #include <uifactory/toolbarcontrollerfactory.hxx> #include <stdtypes.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ diff --git a/framework/inc/uifactory/statusbarfactory.hxx b/framework/inc/uifactory/statusbarfactory.hxx index 88cabcebbd60..6f275ed9a21e 100644 --- a/framework/inc/uifactory/statusbarfactory.hxx +++ b/framework/inc/uifactory/statusbarfactory.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_UIFACTORY_STATUSBARFACTORY_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <stdtypes.h> @@ -39,10 +39,10 @@ #include <uifactory/menubarfactory.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <rtl/ustring.hxx> diff --git a/framework/inc/uifactory/toolbarcontrollerfactory.hxx b/framework/inc/uifactory/toolbarcontrollerfactory.hxx index 3869e56af6f2..7b093d6cb681 100644 --- a/framework/inc/uifactory/toolbarcontrollerfactory.hxx +++ b/framework/inc/uifactory/toolbarcontrollerfactory.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_UIFACTORY_TOOLBARCONTROLLERFACTORY_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> @@ -40,7 +40,7 @@ #include <stdtypes.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> @@ -48,7 +48,7 @@ #include <com/sun/star/frame/XUIControllerRegistration.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/implbase3.hxx> #include <rtl/ustring.hxx> @@ -57,7 +57,7 @@ namespace framework { class ConfigurationAccess_ControllerFactory; -class ToolbarControllerFactory : protected ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. +class ToolbarControllerFactory : protected ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. public ::cppu::WeakImplHelper3< com::sun::star::lang::XServiceInfo, com::sun::star::lang::XMultiComponentFactory, com::sun::star::frame::XUIControllerRegistration> diff --git a/framework/inc/uifactory/toolboxfactory.hxx b/framework/inc/uifactory/toolboxfactory.hxx index c93c3c4f619a..0197f3ec298d 100644 --- a/framework/inc/uifactory/toolboxfactory.hxx +++ b/framework/inc/uifactory/toolboxfactory.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_UIFACTORY_TOOLBOXFACTORY_HXX_ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <stdtypes.h> @@ -38,10 +38,10 @@ #include <uifactory/menubarfactory.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <cppuhelper/weak.hxx> #include <rtl/ustring.hxx> diff --git a/framework/inc/uifactory/uielementfactorymanager.hxx b/framework/inc/uifactory/uielementfactorymanager.hxx index bf63733c07fa..4cf2cb769a27 100644 --- a/framework/inc/uifactory/uielementfactorymanager.hxx +++ b/framework/inc/uifactory/uielementfactorymanager.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ #include <list> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> @@ -45,7 +45,7 @@ #include <stdtypes.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/ui/XUIElementFactory.hpp> @@ -55,7 +55,7 @@ #include "com/sun/star/frame/XModuleManager.hpp" //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase3.hxx> @@ -88,7 +88,7 @@ namespace framework // lang.XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); - + private: class FactoryManagerMap : public std::hash_map< rtl::OUString, rtl::OUString, @@ -100,7 +100,7 @@ namespace framework FactoryManagerMap().swap( *this ); } }; - + sal_Bool impl_getElementProps( const ::com::sun::star::uno::Any& rElement, rtl::OUString& rType, rtl::OUString& rName, rtl::OUString& rModule, rtl::OUString& rServiceSpecifier ) const; rtl::OUString m_aPropType; @@ -113,11 +113,11 @@ namespace framework ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xConfigProvider; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xConfigAccess; sal_Bool m_bConfigAccessInitialized; - bool m_bConfigDirty; + bool m_bConfigDirty; }; -class UIElementFactoryManager : private ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. +class UIElementFactoryManager : private ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. public ::cppu::WeakImplHelper3< ::com::sun::star::lang::XServiceInfo, ::com::sun::star::ui::XUIElementFactory, ::com::sun::star::ui::XUIElementFactoryRegistration> @@ -137,7 +137,7 @@ class UIElementFactoryManager : private ThreadHelpBase virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElementFactory > SAL_CALL getFactory( const ::rtl::OUString& ResourceURL, const ::rtl::OUString& ModuleIdentifier ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL registerFactory( const ::rtl::OUString& aType, const ::rtl::OUString& aName, const ::rtl::OUString& aModuleIdentifier, const ::rtl::OUString& aFactoryImplementationName ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL deregisterFactory( const ::rtl::OUString& aType, const ::rtl::OUString& aName, const ::rtl::OUString& aModuleIdentifier ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); - + private: sal_Bool m_bConfigRead; diff --git a/framework/inc/uifactory/windowcontentfactorymanager.hxx b/framework/inc/uifactory/windowcontentfactorymanager.hxx index c9d75819f56e..5e299204e485 100644 --- a/framework/inc/uifactory/windowcontentfactorymanager.hxx +++ b/framework/inc/uifactory/windowcontentfactorymanager.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ #include <list> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> @@ -45,14 +45,14 @@ #include <stdtypes.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include "com/sun/star/frame/XModuleManager.hpp" //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/implbase2.hxx> #include <rtl/ustring.hxx> @@ -61,8 +61,8 @@ namespace framework { class ConfigurationAccess_FactoryManager; -class WindowContentFactoryManager : private ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. - public ::cppu::WeakImplHelper2< com::sun::star::lang::XServiceInfo , +class WindowContentFactoryManager : private ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. + public ::cppu::WeakImplHelper2< com::sun::star::lang::XServiceInfo , com::sun::star::lang::XSingleComponentFactory> { public: @@ -75,9 +75,9 @@ class WindowContentFactoryManager : private ThreadHelpBase , // XSingleComponentFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithContext( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& Context ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArgumentsAndContext( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& Context ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - + static void RetrieveTypeNameFromResourceURL( const ::rtl::OUString& aResourceURL, rtl::OUString& aType, rtl::OUString& aName ); - private: + private: sal_Bool m_bConfigRead; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager; diff --git a/framework/inc/xml/acceleratorconfigurationreader.hxx b/framework/inc/xml/acceleratorconfigurationreader.hxx index d56ad67239b9..745dea7ecee9 100644 --- a/framework/inc/xml/acceleratorconfigurationreader.hxx +++ b/framework/inc/xml/acceleratorconfigurationreader.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,9 +62,9 @@ class AcceleratorConfigurationReader : public css::xml::sax::XDocumentHandler { //------------------------------------------- // const, types - + private: - + //--------------------------------------- /** @short classification of XML elements. */ enum EXMLElement @@ -72,7 +72,7 @@ class AcceleratorConfigurationReader : public css::xml::sax::XDocumentHandler E_ELEMENT_ACCELERATORLIST, E_ELEMENT_ITEM }; - + //--------------------------------------- /** @short classification of XML attributes. */ enum EXMLAttribute @@ -84,7 +84,7 @@ class AcceleratorConfigurationReader : public css::xml::sax::XDocumentHandler E_ATTRIBUTE_MOD_MOD3, E_ATTRIBUTE_URL }; - + //--------------------------------------- /** @short some namespace defines */ enum EAcceleratorXMLNamespace @@ -92,54 +92,54 @@ class AcceleratorConfigurationReader : public css::xml::sax::XDocumentHandler E_NAMESPACE_ACCEL, E_NAMESPACE_XLINK }; - + //------------------------------------------- // member - + private: - + //--------------------------------------- /** @short needed to read the xml configuration. */ css::uno::Reference< css::xml::sax::XDocumentHandler > m_xReader; - + //--------------------------------------- /** @short reference to the outside container, where this reader/writer must work on. */ AcceleratorCache& m_rContainer; - + //--------------------------------------- /** @short used to detect if an accelerator list occures recursive inside xml. */ sal_Bool m_bInsideAcceleratorList; - + //--------------------------------------- /** @short used to detect if an accelerator item occures recursive inside xml. */ sal_Bool m_bInsideAcceleratorItem; - + //--------------------------------------- /** @short is used to map key codes to its string representation. - + @descr To perform this operatio is created only one times and holded alive forever ...*/ ::salhelper::SingletonRef< KeyMapping > m_rKeyMapping; - + //--------------------------------------- /** @short provide informations abou the parsing state. - + @descr We use it to find out the line and column, where an error occure. */ css::uno::Reference< css::xml::sax::XLocator > m_xLocator; - + /* SfxAcceleratorItemList& m_aReadAcceleratorList; -*/ - +*/ + //------------------------------------------- // interface - + public: //--------------------------------------- @@ -147,12 +147,12 @@ class AcceleratorConfigurationReader : public css::xml::sax::XDocumentHandler to an outside container, which should be used flushed to the underlying XML configuration or filled from there. - + @param rContainer - a reference to the outside container. + a reference to the outside container. */ AcceleratorConfigurationReader(AcceleratorCache& rContainer); - + //--------------------------------------- /** @short does nothing real ... */ virtual ~AcceleratorConfigurationReader(); @@ -166,50 +166,50 @@ class AcceleratorConfigurationReader : public css::xml::sax::XDocumentHandler virtual void SAL_CALL startDocument() throw(css::xml::sax::SAXException, css::uno::RuntimeException ); - + virtual void SAL_CALL endDocument() throw(css::xml::sax::SAXException, css::uno::RuntimeException ); - + virtual void SAL_CALL startElement(const ::rtl::OUString& sElement , const css::uno::Reference< css::xml::sax::XAttributeList >& xAttributeList) throw(css::xml::sax::SAXException, css::uno::RuntimeException ); - + virtual void SAL_CALL endElement(const ::rtl::OUString& sElement) throw(css::xml::sax::SAXException, css::uno::RuntimeException ); - + virtual void SAL_CALL characters(const ::rtl::OUString& sChars) throw(css::xml::sax::SAXException, css::uno::RuntimeException ); - + virtual void SAL_CALL ignorableWhitespace(const ::rtl::OUString& sWhitespaces) throw(css::xml::sax::SAXException, css::uno::RuntimeException ); - + virtual void SAL_CALL processingInstruction(const ::rtl::OUString& sTarget, const ::rtl::OUString& sData ) throw(css::xml::sax::SAXException, css::uno::RuntimeException ); - + virtual void SAL_CALL setDocumentLocator(const css::uno::Reference< css::xml::sax::XLocator >& xLocator) throw(css::xml::sax::SAXException, css::uno::RuntimeException ); //------------------------------------------- // helper - + private: - + //--------------------------------------- /** TODO document me */ static EXMLElement implst_classifyElement(const ::rtl::OUString& sElement); - + //--------------------------------------- /** TODO document me */ static EXMLAttribute implst_classifyAttribute(const ::rtl::OUString& sAttribute); - + //--------------------------------------- /** TODO document me */ ::rtl::OUString implts_getErrorLineString(); diff --git a/framework/inc/xml/acceleratorconfigurationwriter.hxx b/framework/inc/xml/acceleratorconfigurationwriter.hxx index 26c2d3b938e1..caba9b8fa02f 100644 --- a/framework/inc/xml/acceleratorconfigurationwriter.hxx +++ b/framework/inc/xml/acceleratorconfigurationwriter.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,46 +54,46 @@ class AcceleratorConfigurationWriter : private ThreadHelpBase { //------------------------------------------- // member - + private: - + //--------------------------------------- /** @short needed to write the xml configuration. */ css::uno::Reference< css::xml::sax::XDocumentHandler > m_xConfig; - + //--------------------------------------- /** @short reference to the outside container, where this writer must work on. */ const AcceleratorCache& m_rContainer; - + //--------------------------------------- /** @short is used to map key codes to its string representation. - + @descr To perform this operatio is created only one times and holded alive forever ...*/ ::salhelper::SingletonRef< KeyMapping > m_rKeyMapping; - + //------------------------------------------- // interface - + public: //--------------------------------------- /** @short connect this new writer instance to an outside container, which should be flushed to the underlying XML configuration. - + @param rContainer a reference to the outside container. - + @param xConfig - used to write the configuration there. + used to write the configuration there. */ AcceleratorConfigurationWriter(const AcceleratorCache& rContainer, const css::uno::Reference< css::xml::sax::XDocumentHandler >& xConfig ); - + //--------------------------------------- /** @short does nothing real ... */ virtual ~AcceleratorConfigurationWriter(); @@ -101,12 +101,12 @@ class AcceleratorConfigurationWriter : private ThreadHelpBase //--------------------------------------- /** @short TODO */ virtual void flush(); - + //------------------------------------------- // helper - + private: - + //--------------------------------------- /** @short TODO */ void impl_ts_writeKeyCommandPair(const css::awt::KeyEvent& aKey , diff --git a/framework/inc/xml/eventsconfiguration.hxx b/framework/inc/xml/eventsconfiguration.hxx index 0aacbdc4e912..e5e1ab474a2a 100644 --- a/framework/inc/xml/eventsconfiguration.hxx +++ b/framework/inc/xml/eventsconfiguration.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,20 +42,20 @@ namespace framework struct EventsConfig { - ::com::sun::star::uno::Sequence< ::rtl::OUString > aEventNames; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aEventsProperties; + ::com::sun::star::uno::Sequence< ::rtl::OUString > aEventNames; + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aEventsProperties; }; class EventsConfiguration { public: // #110897# - static sal_Bool LoadEventsConfig( + static sal_Bool LoadEventsConfig( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, SvStream& rInStream, EventsConfig& aItems ); // #110897# - static sal_Bool StoreEventsConfig( + static sal_Bool StoreEventsConfig( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, SvStream& rOutStream, const EventsConfig& aItems ); }; diff --git a/framework/inc/xml/eventsdocumenthandler.hxx b/framework/inc/xml/eventsdocumenthandler.hxx index 8d32d5d1f915..aa5d5ec52e1f 100644 --- a/framework/inc/xml/eventsdocumenthandler.hxx +++ b/framework/inc/xml/eventsdocumenthandler.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ #endif //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #ifndef __COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_ @@ -41,7 +41,7 @@ #endif //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> #include <rtl/ustring.hxx> @@ -51,7 +51,7 @@ #include <stdtypes.h> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ @@ -59,7 +59,7 @@ namespace framework{ //***************************************************************************************************************** // Hash code function for using in all hash maps of follow implementation. -class OReadEventsDocumentHandler : private ThreadHelpBase, // Struct for right initalization of lock member! Must be first of baseclasses. +class OReadEventsDocumentHandler : private ThreadHelpBase, // Struct for right initalization of lock member! Must be first of baseclasses. public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XDocumentHandler > { public: @@ -82,45 +82,45 @@ class OReadEventsDocumentHandler : private ThreadHelpBase, // Struct for right i EV_NS_XLINK, EV_XML_NAMESPACES_COUNT }; - + OReadEventsDocumentHandler( EventsConfig& aItems ); - + // XDocumentHandler virtual void SAL_CALL startDocument(void) - throw ( ::com::sun::star::xml::sax::SAXException, + throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL endDocument(void) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL startElement( const rtl::OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &xAttribs) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL endElement(const rtl::OUString& aName) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL characters(const rtl::OUString& aChars) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL ignorableWhitespace(const rtl::OUString& aWhitespaces) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL processingInstruction(const rtl::OUString& aTarget, const rtl::OUString& aData) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > &xLocator) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); protected: @@ -129,10 +129,10 @@ class OReadEventsDocumentHandler : private ThreadHelpBase, // Struct for right i private: ::rtl::OUString getErrorLineString(); - class EventsHashMap : public ::std::hash_map< ::rtl::OUString , - Events_XML_Entry , - OUStringHashCode , - ::std::equal_to< ::rtl::OUString > > + class EventsHashMap : public ::std::hash_map< ::rtl::OUString , + Events_XML_Entry , + OUStringHashCode , + ::std::equal_to< ::rtl::OUString > > { public: inline void free() @@ -141,12 +141,12 @@ class OReadEventsDocumentHandler : private ThreadHelpBase, // Struct for right i } }; - sal_Bool m_bEventsStartFound; - sal_Bool m_bEventsEndFound; - sal_Bool m_bEventStartFound; - EventsHashMap m_aEventsMap; - EventsConfig& m_aEventItems; - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > m_xLocator; + sal_Bool m_bEventsStartFound; + sal_Bool m_bEventsEndFound; + sal_Bool m_bEventStartFound; + EventsHashMap m_aEventsMap; + EventsConfig& m_aEventItems; + ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > m_xLocator; }; class OWriteEventsDocumentHandler : private ThreadHelpBase // Struct for right initalization of lock member! Must be first of baseclasses. @@ -160,26 +160,26 @@ class OWriteEventsDocumentHandler : private ThreadHelpBase // Struct for right i void WriteEventsDocument() throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - + protected: - virtual void WriteEvent( - const ::rtl::OUString& aEventName, + virtual void WriteEvent( + const ::rtl::OUString& aEventName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aPropertyValue ) throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - const EventsConfig& m_aItems; - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > m_xWriteDocumentHandler; - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > m_xEmptyList; - ::rtl::OUString m_aXMLEventNS; - ::rtl::OUString m_aXMLXlinkNS; - ::rtl::OUString m_aAttributeType; - ::rtl::OUString m_aAttributeURL; - ::rtl::OUString m_aAttributeLanguage; - ::rtl::OUString m_aAttributeLinkType; - ::rtl::OUString m_aAttributeMacroName; - ::rtl::OUString m_aAttributeLibrary; - ::rtl::OUString m_aAttributeName; + const EventsConfig& m_aItems; + ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > m_xWriteDocumentHandler; + ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > m_xEmptyList; + ::rtl::OUString m_aXMLEventNS; + ::rtl::OUString m_aXMLXlinkNS; + ::rtl::OUString m_aAttributeType; + ::rtl::OUString m_aAttributeURL; + ::rtl::OUString m_aAttributeLanguage; + ::rtl::OUString m_aAttributeLinkType; + ::rtl::OUString m_aAttributeMacroName; + ::rtl::OUString m_aAttributeLibrary; + ::rtl::OUString m_aAttributeName; }; } // namespace framework diff --git a/framework/inc/xml/imagesconfiguration.hxx b/framework/inc/xml/imagesconfiguration.hxx index bb75947dbded..733822db8beb 100644 --- a/framework/inc/xml/imagesconfiguration.hxx +++ b/framework/inc/xml/imagesconfiguration.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,36 +53,36 @@ struct ImageItemDescriptor { ImageItemDescriptor() : nIndex( -1 ) {} - String aCommandURL; // URL command to dispatch - long nIndex; // index of the bitmap inside the bitmaplist + String aCommandURL; // URL command to dispatch + long nIndex; // index of the bitmap inside the bitmaplist }; struct ExternalImageItemDescriptor { - String aCommandURL; // URL command to dispatch - String aURL; // a URL to an external bitmap + String aCommandURL; // URL command to dispatch + String aURL; // a URL to an external bitmap }; typedef ImageItemDescriptor* ImageItemDescriptorPtr; SV_DECL_PTRARR_DEL( ImageItemListDescriptor, ImageItemDescriptorPtr, 10, 2) typedef ExternalImageItemDescriptor* ExternalImageItemDescriptorPtr; -SV_DECL_PTRARR_DEL( ExternalImageItemListDescriptor, ExternalImageItemDescriptorPtr, 10, 2) +SV_DECL_PTRARR_DEL( ExternalImageItemListDescriptor, ExternalImageItemDescriptorPtr, 10, 2) struct ImageListItemDescriptor { ImageListItemDescriptor() : nMaskMode( ImageMaskMode_Color ), pImageItemList( 0 ) {} - + ~ImageListItemDescriptor() { delete pImageItemList; } - String aURL; // an URL to a bitmap with several images inside - Color aMaskColor; // a color used as transparent - String aMaskURL; // an URL to an optional bitmap used as a mask - ImageMaskMode nMaskMode; // an enum to describe the current mask mode - ImageItemListDescriptor* pImageItemList; // an array of ImageItemDescriptors that describes every image - String aHighContrastURL; // an URL to an optional high contrast bitmap with serveral images inside - String aHighContrastMaskURL; // an URL to an optional high contrast bitmap as a mask + String aURL; // an URL to a bitmap with several images inside + Color aMaskColor; // a color used as transparent + String aMaskURL; // an URL to an optional bitmap used as a mask + ImageMaskMode nMaskMode; // an enum to describe the current mask mode + ImageItemListDescriptor* pImageItemList; // an array of ImageItemDescriptors that describes every image + String aHighContrastURL; // an URL to an optional high contrast bitmap with serveral images inside + String aHighContrastMaskURL; // an URL to an optional high contrast bitmap as a mask }; typedef ImageListItemDescriptor* ImageListItemDescriptorPtr; @@ -94,20 +94,20 @@ struct ImageListsDescriptor pExternalImageList( 0 ) {} ~ImageListsDescriptor() { delete pImageList; delete pExternalImageList; } - ImageListDescriptor* pImageList; - ExternalImageItemListDescriptor* pExternalImageList; + ImageListDescriptor* pImageList; + ExternalImageItemListDescriptor* pExternalImageList; }; class ImagesConfiguration { public: // #110897# - static sal_Bool LoadImages( + static sal_Bool LoadImages( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, SvStream& rInStream, ImageListsDescriptor& aItems ); // #110897# - static sal_Bool StoreImages( + static sal_Bool StoreImages( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, SvStream& rOutStream, const ImageListsDescriptor& aItems ); diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx index 6d4e8d5992ff..2ecb63ed1609 100644 --- a/framework/inc/xml/imagesdocumenthandler.hxx +++ b/framework/inc/xml/imagesdocumenthandler.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_XML_IMAGEDOCUMENTHANDLER_HXX_ //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #ifndef __COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_ @@ -37,7 +37,7 @@ #endif //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <xml/imagesconfiguration.hxx> #include <threadhelp/threadhelpbase.hxx> @@ -48,7 +48,7 @@ #include <stdtypes.h> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ @@ -56,7 +56,7 @@ namespace framework{ //***************************************************************************************************************** // Hash code function for using in all hash maps of follow implementation. -class OReadImagesDocumentHandler : private ThreadHelpBase, // Struct for right initalization of lock member! Must be first of baseclasses. +class OReadImagesDocumentHandler : private ThreadHelpBase, // Struct for right initalization of lock member! Must be first of baseclasses. public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XDocumentHandler > { public: @@ -84,54 +84,54 @@ class OReadImagesDocumentHandler : private ThreadHelpBase, // Struct for right i IMG_NS_XLINK, TBL_XML_NAMESPACES_COUNT }; - + OReadImagesDocumentHandler( ImageListsDescriptor& aItems ); virtual ~OReadImagesDocumentHandler(); // XDocumentHandler virtual void SAL_CALL startDocument(void) - throw ( ::com::sun::star::xml::sax::SAXException, + throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL endDocument(void) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL startElement( const rtl::OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &xAttribs) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL endElement(const rtl::OUString& aName) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL characters(const rtl::OUString& aChars) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL ignorableWhitespace(const rtl::OUString& aWhitespaces) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL processingInstruction(const rtl::OUString& aTarget, const rtl::OUString& aData) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > &xLocator) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); private: ::rtl::OUString getErrorLineString(); - class ImageHashMap : public ::std::hash_map< ::rtl::OUString , - Image_XML_Entry , - OUStringHashCode , - ::std::equal_to< ::rtl::OUString > > + class ImageHashMap : public ::std::hash_map< ::rtl::OUString , + Image_XML_Entry , + OUStringHashCode , + ::std::equal_to< ::rtl::OUString > > { public: inline void free() @@ -140,21 +140,21 @@ class OReadImagesDocumentHandler : private ThreadHelpBase, // Struct for right i } }; - sal_Bool m_bImageContainerStartFound; - sal_Bool m_bImageContainerEndFound; - sal_Bool m_bImagesStartFound; - sal_Bool m_bImagesEndFound; - sal_Bool m_bImageStartFound; - sal_Bool m_bExternalImagesStartFound; - sal_Bool m_bExternalImagesEndFound; - sal_Bool m_bExternalImageStartFound; - sal_Int32 m_nHashMaskModeBitmap; - sal_Int32 m_nHashMaskModeColor; - ImageHashMap m_aImageMap; - ImageListsDescriptor& m_aImageList; - ImageListItemDescriptor* m_pImages; - ExternalImageItemListDescriptor* m_pExternalImages; - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > m_xLocator; + sal_Bool m_bImageContainerStartFound; + sal_Bool m_bImageContainerEndFound; + sal_Bool m_bImagesStartFound; + sal_Bool m_bImagesEndFound; + sal_Bool m_bImageStartFound; + sal_Bool m_bExternalImagesStartFound; + sal_Bool m_bExternalImagesEndFound; + sal_Bool m_bExternalImageStartFound; + sal_Int32 m_nHashMaskModeBitmap; + sal_Int32 m_nHashMaskModeColor; + ImageHashMap m_aImageMap; + ImageListsDescriptor& m_aImageList; + ImageListItemDescriptor* m_pImages; + ExternalImageItemListDescriptor* m_pExternalImages; + ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > m_xLocator; }; class OWriteImagesDocumentHandler : private ThreadHelpBase // Struct for right initalization of lock member! Must be first of baseclasses. @@ -168,7 +168,7 @@ class OWriteImagesDocumentHandler : private ThreadHelpBase // Struct for right i void WriteImagesDocument() throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - + protected: virtual void WriteImageList( const ImageListItemDescriptor* ) throw ( ::com::sun::star::xml::sax::SAXException, @@ -186,14 +186,14 @@ class OWriteImagesDocumentHandler : private ThreadHelpBase // Struct for right i ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - const ImageListsDescriptor& m_aImageListsItems; - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > m_xWriteDocumentHandler; - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > m_xEmptyList; - ::rtl::OUString m_aXMLXlinkNS; - ::rtl::OUString m_aXMLImageNS; - ::rtl::OUString m_aAttributeType; - ::rtl::OUString m_aAttributeXlinkType; - ::rtl::OUString m_aAttributeValueSimple; + const ImageListsDescriptor& m_aImageListsItems; + ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > m_xWriteDocumentHandler; + ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > m_xEmptyList; + ::rtl::OUString m_aXMLXlinkNS; + ::rtl::OUString m_aXMLImageNS; + ::rtl::OUString m_aAttributeType; + ::rtl::OUString m_aAttributeXlinkType; + ::rtl::OUString m_aAttributeValueSimple; }; } // namespace framework diff --git a/framework/inc/xml/menuconfiguration.hxx b/framework/inc/xml/menuconfiguration.hxx index 758832ff6530..ad43ee07997d 100644 --- a/framework/inc/xml/menuconfiguration.hxx +++ b/framework/inc/xml/menuconfiguration.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_XML_MENUCONFIGURATION_HXX_ //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -42,30 +42,30 @@ #include <com/sun/star/frame/XDispatchProvider.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <cppuhelper/weak.hxx> #include <vcl/menu.hxx> #include <vcl/toolbox.hxx> -#define BOOKMARK_NEWMENU ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:menu_bookmark_new" )) -#define BOOKMARK_WIZARDMENU ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:menu_bookmark_wizard" )) -#define ADDONS_POPUPMENU ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:menu_addons_popup" )) +#define BOOKMARK_NEWMENU ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:menu_bookmark_new" )) +#define BOOKMARK_WIZARDMENU ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:menu_bookmark_wizard" )) +#define ADDONS_POPUPMENU ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:menu_addons_popup" )) // Prepare for inclusion by framework and sfx // Please consider that there is a corresponding define also in sfxsids.hrc!! (SID_SFX_START)/(SID_ADDONS) -#define FWK_SID_SFX_START 5000 +#define FWK_SID_SFX_START 5000 #define FWK_SID_ADDONS (FWK_SID_SFX_START+1678) #define FWK_SID_ADDONHELP (FWK_SID_SFX_START+1684) -const USHORT START_ITEMID_PICKLIST = 4500; +const USHORT START_ITEMID_PICKLIST = 4500; const USHORT END_ITEMID_PICKLIST = 4599; const USHORT MAX_ITEMCOUNT_PICKLIST = 99; // difference between START_... & END_... for picklist / must be changed too, if these values are changed! -const USHORT START_ITEMID_WINDOWLIST = 4600; -const USHORT END_ITEMID_WINDOWLIST = 4699; -const USHORT ITEMID_ADDONLIST = FWK_SID_ADDONS; -const USHORT ITEMID_ADDONHELP = FWK_SID_ADDONHELP; +const USHORT START_ITEMID_WINDOWLIST = 4600; +const USHORT END_ITEMID_WINDOWLIST = 4699; +const USHORT ITEMID_ADDONLIST = FWK_SID_ADDONS; +const USHORT ITEMID_ADDONHELP = FWK_SID_ADDONHELP; namespace framework { @@ -78,13 +78,13 @@ class MenuConfiguration Attributes() {} Attributes( const ::rtl::OUString& aFrame, const ::rtl::OUString& aImageIdStr ) : aTargetFrame( aFrame ), aImageId( aImageIdStr ) {} - + ::rtl::OUString aTargetFrame; - ::rtl::OUString aImageId; + ::rtl::OUString aImageId; ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XDispatchProvider > xDispatchProvider; sal_Int16 nStyle; }; - + MenuConfiguration( // #110897#-1 use const when giving a uno reference by reference const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rServiceManager ); @@ -111,7 +111,7 @@ class MenuConfiguration void StoreToolBox( ToolBox* pToolBox, ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rOutputStream ) throw ( ::com::sun::star::lang::WrappedTargetException ); - + static BOOL IsPickListItemId( USHORT nId ); static BOOL IsWindowListItemId( USHORT nId ); diff --git a/framework/inc/xml/menudocumenthandler.hxx b/framework/inc/xml/menudocumenthandler.hxx index 67d783a40d76..fbf1dce837e3 100644 --- a/framework/inc/xml/menudocumenthandler.hxx +++ b/framework/inc/xml/menudocumenthandler.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #define __FRAMEWORK_XML_MENUDOCUMENTHANDLER_HXX_ //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #ifndef __COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_ @@ -42,7 +42,7 @@ #include <com/sun/star/uno/XComponentContext.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> #include <rtl/ustring.hxx> @@ -50,12 +50,12 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ -class ReadMenuDocumentHandlerBase : public ThreadHelpBase, // Struct for right initalization of mutex member! Must be first of baseclasses. +class ReadMenuDocumentHandlerBase : public ThreadHelpBase, // Struct for right initalization of mutex member! Must be first of baseclasses. public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XDocumentHandler > { public: @@ -64,39 +64,39 @@ class ReadMenuDocumentHandlerBase : public ThreadHelpBase, // Struct for right i // XDocumentHandler virtual void SAL_CALL startDocument(void) - throw ( ::com::sun::star::xml::sax::SAXException, + throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ) = 0; virtual void SAL_CALL endDocument(void) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ) = 0; virtual void SAL_CALL startElement( const rtl::OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &xAttribs) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ) = 0; virtual void SAL_CALL endElement(const rtl::OUString& aName) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ) = 0; virtual void SAL_CALL characters(const rtl::OUString& aChars) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ) = 0; virtual void SAL_CALL ignorableWhitespace(const rtl::OUString& aWhitespaces) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL processingInstruction(const rtl::OUString& aTarget, const rtl::OUString& aData) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > &xLocator) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); protected: @@ -122,7 +122,7 @@ class OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBase { public: // #110897# - OReadMenuDocumentHandler( + OReadMenuDocumentHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, const com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer >& rItemContainer ); virtual ~OReadMenuDocumentHandler(); @@ -132,41 +132,41 @@ class OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBase // XDocumentHandler virtual void SAL_CALL startDocument(void) - throw ( ::com::sun::star::xml::sax::SAXException, + throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL endDocument(void) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL startElement( const rtl::OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &xAttribs) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL endElement(const rtl::OUString& aName) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL characters(const rtl::OUString& aChars) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); private: - int m_nElementDepth; - sal_Bool m_bMenuBarMode; + int m_nElementDepth; + sal_Bool m_bMenuBarMode; com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > m_xMenuBarContainer; com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory > m_xContainerFactory; const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& mxServiceFactory; -}; // OReadMenuDocumentHandler +}; // OReadMenuDocumentHandler class OReadMenuBarHandler : public ReadMenuDocumentHandlerBase { public: // #110897# - OReadMenuBarHandler( + OReadMenuBarHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, const com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& rMenuBarContainer, const com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory >& rContainerFactory ); @@ -177,36 +177,36 @@ class OReadMenuBarHandler : public ReadMenuDocumentHandlerBase // XDocumentHandler virtual void SAL_CALL startDocument(void) - throw ( ::com::sun::star::xml::sax::SAXException, + throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL endDocument(void) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL startElement( const rtl::OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &xAttribs) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL endElement(const rtl::OUString& aName) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL characters(const rtl::OUString& aChars) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); private: - int m_nElementDepth; - sal_Bool m_bMenuMode; + int m_nElementDepth; + sal_Bool m_bMenuMode; com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > m_xMenuBarContainer; com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory > m_xContainerFactory; // #110897# const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& mxServiceFactory; -}; // OReadMenuBarHandler +}; // OReadMenuBarHandler class OReadMenuHandler : public ReadMenuDocumentHandlerBase @@ -218,30 +218,30 @@ class OReadMenuHandler : public ReadMenuDocumentHandlerBase // XDocumentHandler virtual void SAL_CALL startDocument(void) - throw ( ::com::sun::star::xml::sax::SAXException, + throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL endDocument(void) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL startElement( const rtl::OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &xAttribs) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL endElement(const rtl::OUString& aName) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL characters(const rtl::OUString& aChars) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); private: - int m_nElementDepth; - sal_Bool m_bMenuPopupMode; + int m_nElementDepth; + sal_Bool m_bMenuPopupMode; com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > m_xMenuContainer; com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory > m_xContainerFactory; }; // OReadMenuHandler @@ -256,37 +256,37 @@ class OReadMenuPopupHandler : public ReadMenuDocumentHandlerBase // XDocumentHandler virtual void SAL_CALL startDocument(void) - throw ( ::com::sun::star::xml::sax::SAXException, + throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL endDocument(void) - throw ( ::com::sun::star::xml::sax::SAXException, + throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL startElement( const rtl::OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &xAttribs) - throw ( ::com::sun::star::xml::sax::SAXException, + throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL endElement(const rtl::OUString& aName) - throw ( ::com::sun::star::xml::sax::SAXException, + throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL characters(const rtl::OUString& aChars) - throw ( ::com::sun::star::xml::sax::SAXException, + throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); private: enum NextElementClose { ELEM_CLOSE_NONE, ELEM_CLOSE_MENUITEM, ELEM_CLOSE_MENUSEPARATOR }; - int m_nElementDepth; - sal_Bool m_bMenuMode; + int m_nElementDepth; + sal_Bool m_bMenuMode; com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > m_xMenuContainer; com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory > m_xContainerFactory; com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xComponentContext; - NextElementClose m_nNextElementExpected; + NextElementClose m_nNextElementExpected; }; // OReadMenuPopupHandler @@ -315,4 +315,4 @@ class OWriteMenuDocumentHandler } // namespace framework -#endif // #ifndef __FRAMEWORK_XML_MENUDOCUMENTHANDLER_HXX_ +#endif // #ifndef __FRAMEWORK_XML_MENUDOCUMENTHANDLER_HXX_ diff --git a/framework/inc/xml/saxnamespacefilter.hxx b/framework/inc/xml/saxnamespacefilter.hxx index fc83628b2e16..7d04dd434441 100644 --- a/framework/inc/xml/saxnamespacefilter.hxx +++ b/framework/inc/xml/saxnamespacefilter.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,13 +38,13 @@ #include <stack> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework { -class SaxNamespaceFilter : public ThreadHelpBase, // Struct for right initalization of mutex member! Must be first of baseclasses. +class SaxNamespaceFilter : public ThreadHelpBase, // Struct for right initalization of mutex member! Must be first of baseclasses. public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XDocumentHandler > { public: @@ -53,50 +53,50 @@ class SaxNamespaceFilter : public ThreadHelpBase, // Struct for right initalizat // XDocumentHandler virtual void SAL_CALL startDocument(void) - throw ( ::com::sun::star::xml::sax::SAXException, + throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - + virtual void SAL_CALL endDocument(void) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - + virtual void SAL_CALL startElement( const rtl::OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &xAttribs) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - + virtual void SAL_CALL endElement(const rtl::OUString& aName) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - + virtual void SAL_CALL characters(const rtl::OUString& aChars) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL ignorableWhitespace(const rtl::OUString& aWhitespaces) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL processingInstruction(const rtl::OUString& aTarget, const rtl::OUString& aData) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - - virtual void SAL_CALL setDocumentLocator( + + virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > &xLocator) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); protected: typedef ::std::stack< XMLNamespaces > NamespaceStack; ::rtl::OUString getErrorLineString(); - + ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > m_xLocator; ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler> xDocumentHandler; - NamespaceStack m_aNamespaceStack; - sal_Int32 m_nDepth; + NamespaceStack m_aNamespaceStack; + sal_Int32 m_nDepth; }; } diff --git a/framework/inc/xml/statusbarconfiguration.hxx b/framework/inc/xml/statusbarconfiguration.hxx index 550d1fcbc2ad..8619ae423622 100644 --- a/framework/inc/xml/statusbarconfiguration.hxx +++ b/framework/inc/xml/statusbarconfiguration.hxx @@ -16,10 +16,10 @@ namespace framework struct StatusBarItemDescriptor { - String aURL; // URL command to dispatch - long nItemBits; // properties for this statusbar item (WinBits) - long nWidth; // width of a statusbar item - long nOffset; // offset + String aURL; // URL command to dispatch + long nItemBits; // properties for this statusbar item (WinBits) + long nWidth; // width of a statusbar item + long nOffset; // offset public: @@ -34,20 +34,20 @@ SV_DECL_PTRARR_DEL( StatusBarDescriptor, StatusBarItemDescriptorPtr, 10, 2) class StatusBarConfiguration { public: - static sal_Bool LoadStatusBar( + static sal_Bool LoadStatusBar( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, SvStream& rInStream, StatusBarDescriptor& aItems ); - static sal_Bool StoreStatusBar( + static sal_Bool StoreStatusBar( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, SvStream& rOutStream, const StatusBarDescriptor& aItems ); - static sal_Bool LoadStatusBar( + static sal_Bool LoadStatusBar( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInputStream, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& rStatusbarConfiguration ); - static sal_Bool StoreStatusBar( + static sal_Bool StoreStatusBar( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& xOutputStream, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rStatusbarConfiguration ); diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx index 86b25bf7762b..3ce94a872344 100644 --- a/framework/inc/xml/statusbardocumenthandler.hxx +++ b/framework/inc/xml/statusbardocumenthandler.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ #endif //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #ifndef __COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_ @@ -41,7 +41,7 @@ #endif //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> #include <rtl/ustring.hxx> @@ -51,7 +51,7 @@ #include <stdtypes.h> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ @@ -59,7 +59,7 @@ namespace framework{ //***************************************************************************************************************** // Hash code function for using in all hash maps of follow implementation. -class OReadStatusBarDocumentHandler : private ThreadHelpBase, // Struct for right initalization of lock member! Must be first of baseclasses. +class OReadStatusBarDocumentHandler : private ThreadHelpBase, // Struct for right initalization of lock member! Must be first of baseclasses. public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XDocumentHandler > { public: @@ -84,54 +84,54 @@ class OReadStatusBarDocumentHandler : private ThreadHelpBase, // Struct for righ SB_NS_XLINK, SB_XML_NAMESPACES_COUNT }; - + OReadStatusBarDocumentHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& aStatusBarItems ); virtual ~OReadStatusBarDocumentHandler(); // XDocumentHandler virtual void SAL_CALL startDocument(void) - throw ( ::com::sun::star::xml::sax::SAXException, + throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL endDocument(void) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL startElement( const rtl::OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &xAttribs) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL endElement(const rtl::OUString& aName) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL characters(const rtl::OUString& aChars) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL ignorableWhitespace(const rtl::OUString& aWhitespaces) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL processingInstruction(const rtl::OUString& aTarget, const rtl::OUString& aData) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > &xLocator) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); private: ::rtl::OUString getErrorLineString(); - class StatusBarHashMap : public ::std::hash_map< ::rtl::OUString , - StatusBar_XML_Entry , - OUStringHashCode , - ::std::equal_to< ::rtl::OUString > > + class StatusBarHashMap : public ::std::hash_map< ::rtl::OUString , + StatusBar_XML_Entry , + OUStringHashCode , + ::std::equal_to< ::rtl::OUString > > { public: inline void free() @@ -140,12 +140,12 @@ class OReadStatusBarDocumentHandler : private ThreadHelpBase, // Struct for righ } }; - sal_Bool m_bStatusBarStartFound; - sal_Bool m_bStatusBarEndFound; - sal_Bool m_bStatusBarItemStartFound; - StatusBarHashMap m_aStatusBarMap; + sal_Bool m_bStatusBarStartFound; + sal_Bool m_bStatusBarEndFound; + sal_Bool m_bStatusBarItemStartFound; + StatusBarHashMap m_aStatusBarMap; ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > m_aStatusBarItems; - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > m_xLocator; + ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > m_xLocator; }; class OWriteStatusBarDocumentHandler : private ThreadHelpBase // Struct for right initalization of lock member! Must be first of baseclasses. @@ -159,9 +159,9 @@ class OWriteStatusBarDocumentHandler : private ThreadHelpBase // Struct for righ void WriteStatusBarDocument() throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - + protected: - virtual void WriteStatusBarItem( + virtual void WriteStatusBarItem( const rtl::OUString& rCommandURL, const rtl::OUString& rHelpURL, sal_Int16 nOffset, @@ -171,12 +171,12 @@ class OWriteStatusBarDocumentHandler : private ThreadHelpBase // Struct for righ ::com::sun::star::uno::RuntimeException ); ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > m_aStatusBarItems; - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > m_xWriteDocumentHandler; - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > m_xEmptyList; - ::rtl::OUString m_aXMLStatusBarNS; - ::rtl::OUString m_aXMLXlinkNS; - ::rtl::OUString m_aAttributeType; - ::rtl::OUString m_aAttributeURL; + ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > m_xWriteDocumentHandler; + ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > m_xEmptyList; + ::rtl::OUString m_aXMLStatusBarNS; + ::rtl::OUString m_aXMLXlinkNS; + ::rtl::OUString m_aAttributeType; + ::rtl::OUString m_aAttributeURL; }; } // namespace framework diff --git a/framework/inc/xml/toolboxconfiguration.hxx b/framework/inc/xml/toolboxconfiguration.hxx index f1f0949e4e1f..924c601ac689 100644 --- a/framework/inc/xml/toolboxconfiguration.hxx +++ b/framework/inc/xml/toolboxconfiguration.hxx @@ -21,13 +21,13 @@ class ToolBoxConfiguration { public: // #110897# - static sal_Bool LoadToolBox( + static sal_Bool LoadToolBox( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rInputStream, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& rToolbarConfiguration ); // #110897# - static sal_Bool StoreToolBox( + static sal_Bool StoreToolBox( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rOutputStream, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rToolbarConfiguration ); diff --git a/framework/inc/xml/toolboxconfigurationdefines.hxx b/framework/inc/xml/toolboxconfigurationdefines.hxx index 3aee5d1f703a..c3cd030f6213 100644 --- a/framework/inc/xml/toolboxconfigurationdefines.hxx +++ b/framework/inc/xml/toolboxconfigurationdefines.hxx @@ -1,84 +1,84 @@ #ifndef __FRAMEWORK_XML_TOOLBOXCONFIGURATIONDEFINES_HXX_ #define __FRAMEWORK_XML_TOOLBOXCONFIGURATIONDEFINES_HXX_ -#define XMLNS_TOOLBAR "http://openoffice.org/2001/toolbar" -#define XMLNS_XLINK "http://www.w3.org/1999/xlink" -#define XMLNS_TOOLBAR_PREFIX "toolbar:" -#define XMLNS_XLINK_PREFIX "xlink:" +#define XMLNS_TOOLBAR "http://openoffice.org/2001/toolbar" +#define XMLNS_XLINK "http://www.w3.org/1999/xlink" +#define XMLNS_TOOLBAR_PREFIX "toolbar:" +#define XMLNS_XLINK_PREFIX "xlink:" -#define XMLNS_FILTER_SEPARATOR "^" +#define XMLNS_FILTER_SEPARATOR "^" -#define ELEMENT_TOOLBAR "toolbar" -#define ELEMENT_TOOLBARITEM "toolbaritem" -#define ELEMENT_TOOLBARSPACE "toolbarspace" -#define ELEMENT_TOOLBARBREAK "toolbarbreak" -#define ELEMENT_TOOLBARSEPARATOR "toolbarseparator" +#define ELEMENT_TOOLBAR "toolbar" +#define ELEMENT_TOOLBARITEM "toolbaritem" +#define ELEMENT_TOOLBARSPACE "toolbarspace" +#define ELEMENT_TOOLBARBREAK "toolbarbreak" +#define ELEMENT_TOOLBARSEPARATOR "toolbarseparator" -#define ELEMENT_TOOLBARLAYOUTS "toolbarlayouts" -#define ELEMENT_TOOLBARLAYOUT "toolbarlayout" -#define ELEMENT_TOOLBARCONFIGITEMS "toolbarconfigitems" -#define ELEMENT_TOOLBARCONFIGITEM "toolbarconfigitem" +#define ELEMENT_TOOLBARLAYOUTS "toolbarlayouts" +#define ELEMENT_TOOLBARLAYOUT "toolbarlayout" +#define ELEMENT_TOOLBARCONFIGITEMS "toolbarconfigitems" +#define ELEMENT_TOOLBARCONFIGITEM "toolbarconfigitem" #define ATTRIBUTE_UINAME "uiname" -#define ATTRIBUTE_BITMAP "bitmap" -#define ATTRIBUTE_TEXT "text" -#define ATTRIBUTE_URL "href" -#define ATTRIBUTE_ITEMBITS "property" -#define ATTRIBUTE_VISIBLE "visible" -#define ATTRIBUTE_WIDTH "width" -#define ATTRIBUTE_USER "userdefined" -#define ATTRIBUTE_HELPID "helpid" -#define ATTRIBUTE_TOOLTIP "tooltip" -#define ATTRIBUTE_ITEMSTYLE "style" - -#define ATTRIBUTE_ID "id" -#define ATTRIBUTE_FLOATINGPOSLEFT "floatingposleft" -#define ATTRIBUTE_FLOATINGPOSTOP "floatingpostop" -#define ATTRIBUTE_TOOLBARNAME "toolbarname" -#define ATTRIBUTE_CONTEXT "context" -#define ATTRIBUTE_FLOATINGLINES "floatinglines" -#define ATTRIBUTE_DOCKINGLINES "dockinglines" -#define ATTRIBUTE_ALIGN "align" -#define ATTRIBUTE_FLOATING "floating" -#define ATTRIBUTE_BUTTONTYPE "style" -#define ATTRIBUTE_USERDEFNAME "userdefname" - -#define ELEMENT_NS_TOOLBAR "toolbar:toolbar" -#define ELEMENT_NS_TOOLBARITEM "toolbar:toolbaritem" -#define ELEMENT_NS_TOOLBARSPACE "toolbar:toolbarspace" -#define ELEMENT_NS_TOOLBARBREAK "toolbar:toolbarbreak" -#define ELEMENT_NS_TOOLBARSEPARATOR "toolbar:toolbarseparator" - -#define ELEMENT_NS_TOOLBARLAYOUTS "toolbar:toolbarlayouts" -#define ELEMENT_NS_TOOLBARLAYOUT "toolbar:toolbarlayout" -#define ELEMENT_NS_TOOLBARCONFIGITEMS "toolbar:toolbarconfigitems" -#define ELEMENT_NS_TOOLBARCONFIGITEM "toolbar:toolbarconfigitem" - -#define ATTRIBUTE_XMLNS_TOOLBAR "xmlns:toolbar" -#define ATTRIBUTE_XMLNS_XLINK "xmlns:xlink" - -#define ATTRIBUTE_TYPE_CDATA "CDATA" - -#define ATTRIBUTE_BOOLEAN_TRUE "true" -#define ATTRIBUTE_BOOLEAN_FALSE "false" - -#define ATTRIBUTE_ALIGN_LEFT "left" -#define ATTRIBUTE_ALIGN_RIGHT "right" -#define ATTRIBUTE_ALIGN_TOP "top" -#define ATTRIBUTE_ALIGN_BOTTOM "bottom" - -#define ATTRIBUTE_STYLE_TEXT "text" -#define ATTRIBUTE_STYLE_SYMBOL "symbol" -#define ATTRIBUTE_STYLE_SYMBOLTEXT "symboltext" -#define ATTRIBUTE_STYLE_SYMBOLPLUSTEXT "symbol+text" - -#define ATTRIBUTE_ITEMSTYLE_RADIO "radio" -#define ATTRIBUTE_ITEMSTYLE_AUTO "auto" -#define ATTRIBUTE_ITEMSTYLE_LEFT "left" -#define ATTRIBUTE_ITEMSTYLE_AUTOSIZE "autosize" -#define ATTRIBUTE_ITEMSTYLE_DROPDOWN "dropdown" -#define ATTRIBUTE_ITEMSTYLE_REPEAT "repeat" +#define ATTRIBUTE_BITMAP "bitmap" +#define ATTRIBUTE_TEXT "text" +#define ATTRIBUTE_URL "href" +#define ATTRIBUTE_ITEMBITS "property" +#define ATTRIBUTE_VISIBLE "visible" +#define ATTRIBUTE_WIDTH "width" +#define ATTRIBUTE_USER "userdefined" +#define ATTRIBUTE_HELPID "helpid" +#define ATTRIBUTE_TOOLTIP "tooltip" +#define ATTRIBUTE_ITEMSTYLE "style" + +#define ATTRIBUTE_ID "id" +#define ATTRIBUTE_FLOATINGPOSLEFT "floatingposleft" +#define ATTRIBUTE_FLOATINGPOSTOP "floatingpostop" +#define ATTRIBUTE_TOOLBARNAME "toolbarname" +#define ATTRIBUTE_CONTEXT "context" +#define ATTRIBUTE_FLOATINGLINES "floatinglines" +#define ATTRIBUTE_DOCKINGLINES "dockinglines" +#define ATTRIBUTE_ALIGN "align" +#define ATTRIBUTE_FLOATING "floating" +#define ATTRIBUTE_BUTTONTYPE "style" +#define ATTRIBUTE_USERDEFNAME "userdefname" + +#define ELEMENT_NS_TOOLBAR "toolbar:toolbar" +#define ELEMENT_NS_TOOLBARITEM "toolbar:toolbaritem" +#define ELEMENT_NS_TOOLBARSPACE "toolbar:toolbarspace" +#define ELEMENT_NS_TOOLBARBREAK "toolbar:toolbarbreak" +#define ELEMENT_NS_TOOLBARSEPARATOR "toolbar:toolbarseparator" + +#define ELEMENT_NS_TOOLBARLAYOUTS "toolbar:toolbarlayouts" +#define ELEMENT_NS_TOOLBARLAYOUT "toolbar:toolbarlayout" +#define ELEMENT_NS_TOOLBARCONFIGITEMS "toolbar:toolbarconfigitems" +#define ELEMENT_NS_TOOLBARCONFIGITEM "toolbar:toolbarconfigitem" + +#define ATTRIBUTE_XMLNS_TOOLBAR "xmlns:toolbar" +#define ATTRIBUTE_XMLNS_XLINK "xmlns:xlink" + +#define ATTRIBUTE_TYPE_CDATA "CDATA" + +#define ATTRIBUTE_BOOLEAN_TRUE "true" +#define ATTRIBUTE_BOOLEAN_FALSE "false" + +#define ATTRIBUTE_ALIGN_LEFT "left" +#define ATTRIBUTE_ALIGN_RIGHT "right" +#define ATTRIBUTE_ALIGN_TOP "top" +#define ATTRIBUTE_ALIGN_BOTTOM "bottom" + +#define ATTRIBUTE_STYLE_TEXT "text" +#define ATTRIBUTE_STYLE_SYMBOL "symbol" +#define ATTRIBUTE_STYLE_SYMBOLTEXT "symboltext" +#define ATTRIBUTE_STYLE_SYMBOLPLUSTEXT "symbol+text" + +#define ATTRIBUTE_ITEMSTYLE_RADIO "radio" +#define ATTRIBUTE_ITEMSTYLE_AUTO "auto" +#define ATTRIBUTE_ITEMSTYLE_LEFT "left" +#define ATTRIBUTE_ITEMSTYLE_AUTOSIZE "autosize" +#define ATTRIBUTE_ITEMSTYLE_DROPDOWN "dropdown" +#define ATTRIBUTE_ITEMSTYLE_REPEAT "repeat" #define ATTRIBUTE_ITEMSTYLE_TEXT "text" #define ATTRIBUTE_ITEMSTYLE_DROPDOWNONLY "dropdownonly" #define ATTRIBUTE_ITEMSTYLE_IMAGE "image" diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx index 6fe49ab80172..5cb634b2bdc9 100644 --- a/framework/inc/xml/toolboxdocumenthandler.hxx +++ b/framework/inc/xml/toolboxdocumenthandler.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,13 +31,13 @@ #include <xml/toolboxconfiguration.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/xml/sax/XDocumentHandler.hpp> #include <com/sun/star/beans/PropertyValue.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> #include <rtl/ustring.hxx> @@ -45,7 +45,7 @@ #include <stdtypes.h> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ @@ -53,7 +53,7 @@ namespace framework{ //***************************************************************************************************************** // Hash code function for using in all hash maps of follow implementation. -class OReadToolBoxDocumentHandler : private ThreadHelpBase, // Struct for right initalization of lock member! Must be first of baseclasses. +class OReadToolBoxDocumentHandler : private ThreadHelpBase, // Struct for right initalization of lock member! Must be first of baseclasses. public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XDocumentHandler > { public: @@ -90,48 +90,48 @@ class OReadToolBoxDocumentHandler : private ThreadHelpBase, // Struct for right // XDocumentHandler virtual void SAL_CALL startDocument(void) - throw ( ::com::sun::star::xml::sax::SAXException, + throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL endDocument(void) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL startElement( const rtl::OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &xAttribs) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL endElement(const rtl::OUString& aName) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL characters(const rtl::OUString& aChars) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL ignorableWhitespace(const rtl::OUString& aWhitespaces) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL processingInstruction(const rtl::OUString& aTarget, const rtl::OUString& aData) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > &xLocator) - throw( ::com::sun::star::xml::sax::SAXException, + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); private: ::rtl::OUString getErrorLineString(); - class ToolBoxHashMap : public ::std::hash_map< ::rtl::OUString , - ToolBox_XML_Entry , - OUStringHashCode , - ::std::equal_to< ::rtl::OUString > > + class ToolBoxHashMap : public ::std::hash_map< ::rtl::OUString , + ToolBox_XML_Entry , + OUStringHashCode , + ::std::equal_to< ::rtl::OUString > > { public: inline void free() @@ -140,22 +140,22 @@ class OReadToolBoxDocumentHandler : private ThreadHelpBase, // Struct for right } }; - sal_Bool m_bToolBarStartFound : 1; - sal_Bool m_bToolBarEndFound : 1; - sal_Bool m_bToolBarItemStartFound : 1; - sal_Bool m_bToolBarSpaceStartFound : 1; - sal_Bool m_bToolBarBreakStartFound : 1; - sal_Bool m_bToolBarSeparatorStartFound : 1; - ToolBoxHashMap m_aToolBoxMap; + sal_Bool m_bToolBarStartFound : 1; + sal_Bool m_bToolBarEndFound : 1; + sal_Bool m_bToolBarItemStartFound : 1; + sal_Bool m_bToolBarSpaceStartFound : 1; + sal_Bool m_bToolBarBreakStartFound : 1; + sal_Bool m_bToolBarSeparatorStartFound : 1; + ToolBoxHashMap m_aToolBoxMap; com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer > m_rItemContainer; - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > m_xLocator; - - sal_Int32 m_nHashCode_Style_Radio; - sal_Int32 m_nHashCode_Style_Auto; - sal_Int32 m_nHashCode_Style_Left; - sal_Int32 m_nHashCode_Style_AutoSize; - sal_Int32 m_nHashCode_Style_DropDown; - sal_Int32 m_nHashCode_Style_Repeat; + ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > m_xLocator; + + sal_Int32 m_nHashCode_Style_Radio; + sal_Int32 m_nHashCode_Style_Auto; + sal_Int32 m_nHashCode_Style_Left; + sal_Int32 m_nHashCode_Style_AutoSize; + sal_Int32 m_nHashCode_Style_DropDown; + sal_Int32 m_nHashCode_Style_Repeat; sal_Int32 m_nHashCode_Style_DropDownOnly; sal_Int32 m_nHashCode_Style_Text; sal_Int32 m_nHashCode_Style_Image; @@ -169,7 +169,7 @@ class OReadToolBoxDocumentHandler : private ThreadHelpBase, // Struct for right }; -class OWriteToolBoxDocumentHandler : private ThreadHelpBase // Struct for right initalization of lock member! Must be first of baseclasses. +class OWriteToolBoxDocumentHandler : private ThreadHelpBase // Struct for right initalization of lock member! Must be first of baseclasses. { public: OWriteToolBoxDocumentHandler( @@ -180,7 +180,7 @@ class OWriteToolBoxDocumentHandler : private ThreadHelpBase // Struct for right void WriteToolBoxDocument() throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - + protected: virtual void WriteToolBoxItem( const rtl::OUString& aCommandURL, const rtl::OUString& aLabel, const rtl::OUString& aHelpURL, const rtl::OUString& aTooltip, sal_Int16 nStyle, sal_Int16 nWidth, sal_Bool bVisible ) throw @@ -190,22 +190,22 @@ class OWriteToolBoxDocumentHandler : private ThreadHelpBase // Struct for right virtual void WriteToolBoxSpace() throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - + virtual void WriteToolBoxBreak() throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - + virtual void WriteToolBoxSeparator() throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > m_xWriteDocumentHandler; - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > m_xEmptyList; + ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > m_xWriteDocumentHandler; + ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > m_xEmptyList; com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > m_rItemAccess; - ::rtl::OUString m_aXMLToolbarNS; - ::rtl::OUString m_aXMLXlinkNS; - ::rtl::OUString m_aAttributeType; - ::rtl::OUString m_aAttributeURL; + ::rtl::OUString m_aXMLToolbarNS; + ::rtl::OUString m_aXMLXlinkNS; + ::rtl::OUString m_aAttributeType; + ::rtl::OUString m_aAttributeURL; }; } // namespace framework diff --git a/framework/inc/xml/xmlnamespaces.hxx b/framework/inc/xml/xmlnamespaces.hxx index c398211278b1..81b6bb305ee0 100644 --- a/framework/inc/xml/xmlnamespaces.hxx +++ b/framework/inc/xml/xmlnamespaces.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,14 +42,14 @@ class XMLNamespaces XMLNamespaces( const XMLNamespaces& ); virtual ~XMLNamespaces(); - void addNamespace( const ::rtl::OUString& aName, const ::rtl::OUString& aValue ) - throw( ::com::sun::star::xml::sax::SAXException ); + void addNamespace( const ::rtl::OUString& aName, const ::rtl::OUString& aValue ) + throw( ::com::sun::star::xml::sax::SAXException ); - ::rtl::OUString applyNSToAttributeName( const ::rtl::OUString& ) const - throw( ::com::sun::star::xml::sax::SAXException ); + ::rtl::OUString applyNSToAttributeName( const ::rtl::OUString& ) const + throw( ::com::sun::star::xml::sax::SAXException ); ::rtl::OUString applyNSToElementName( const ::rtl::OUString& ) const - throw( ::com::sun::star::xml::sax::SAXException ); - + throw( ::com::sun::star::xml::sax::SAXException ); + private: typedef ::std::map< ::rtl::OUString, ::rtl::OUString > NamespaceMap; @@ -57,7 +57,7 @@ class XMLNamespaces throw( ::com::sun::star::xml::sax::SAXException ); ::rtl::OUString m_aDefaultNamespace; - NamespaceMap m_aNamespaceMap; + NamespaceMap m_aNamespaceMap; }; } diff --git a/framework/qa/complex/ModuleManager/CheckXModuleManager.java b/framework/qa/complex/ModuleManager/CheckXModuleManager.java index 33bc2c0d0ca2..ba0c9e318980 100644 --- a/framework/qa/complex/ModuleManager/CheckXModuleManager.java +++ b/framework/qa/complex/ModuleManager/CheckXModuleManager.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,28 +48,28 @@ public class CheckXModuleManager extends ComplexTestCase { //------------------------------------------- // some const - + //------------------------------------------- // member - + /** points to the global uno service manager. */ private XMultiServiceFactory m_xSmgr = null; - + /** the module manager for testing. */ private XModuleManager m_xMM = null; - + /** a special frame used to load documents there. */ private XComponentLoader m_xLoader = null; - + //------------------------------------------- // test environment - + //------------------------------------------- /** @short A function to tell the framework, which test functions are available. - + @return All test methods. - @todo Think about selection of tests from outside ... + @todo Think about selection of tests from outside ... */ public String[] getTestMethodNames() { @@ -84,7 +84,7 @@ public class CheckXModuleManager extends ComplexTestCase //------------------------------------------- /** @short Create the environment for following tests. - + @descr Use either a component loader from desktop or from frame */ @@ -96,16 +96,16 @@ public class CheckXModuleManager extends ComplexTestCase // create module manager m_xMM = (XModuleManager)UnoRuntime.queryInterface( - XModuleManager.class, + XModuleManager.class, m_xSmgr.createInstance("com.sun.star.frame.ModuleManager")); - + // create desktop instance to create a special frame to load documents there. XFrame xDesktop = (XFrame)UnoRuntime.queryInterface( - XFrame.class, + XFrame.class, m_xSmgr.createInstance("com.sun.star.frame.Desktop")); - + m_xLoader = (XComponentLoader)UnoRuntime.queryInterface( - XComponentLoader.class, + XComponentLoader.class, xDesktop.findFrame("_blank", 0)); } @@ -119,7 +119,7 @@ public class CheckXModuleManager extends ComplexTestCase XCloseable.class, m_xLoader); xClose.close(false); - + m_xLoader = null; m_xMM = null; m_xSmgr = null; @@ -141,7 +141,7 @@ public class CheckXModuleManager extends ComplexTestCase impl_identifyModulesBasedOnDocs("com.sun.star.sdb.OfficeDatabaseDocument" ); impl_identifyModulesBasedOnDocs("com.sun.star.chart.ChartDocument" ); } - + //------------------------------------------- /** @todo document me */ @@ -166,7 +166,7 @@ public class CheckXModuleManager extends ComplexTestCase impl_checkReadOnlyPropsOfModule("com.sun.star.presentation.PresentationDocument"); impl_checkReadOnlyPropsOfModule("com.sun.star.sdb.OfficeDatabaseDocument" ); impl_checkReadOnlyPropsOfModule("com.sun.star.chart.ChartDocument" ); - + // other modules impl_checkReadOnlyPropsOfModule("com.sun.star.sdb.FormDesign" ); impl_checkReadOnlyPropsOfModule("com.sun.star.sdb.TextReportDesign" ); @@ -203,12 +203,12 @@ public class CheckXModuleManager extends ComplexTestCase throws java.lang.Exception { log.println("search modules matching document service '"+sDocumentService+"' ..."); - + NamedValue[] lProps = new NamedValue[1]; lProps[0] = new NamedValue(); lProps[0].Name = "ooSetupFactoryDocumentService"; lProps[0].Value = sDocumentService; - + XContainerQuery xMM = (XContainerQuery)UnoRuntime.queryInterface(XContainerQuery.class, m_xMM); XEnumeration xResult = xMM.createSubSetEnumerationByProperties(lProps); while(xResult.hasMoreElements()) @@ -225,13 +225,13 @@ public class CheckXModuleManager extends ComplexTestCase if (lModuleProps[i].Name.equals("ooSetupFactoryDocumentService")) sFoundDocService = AnyConverter.toString(lModuleProps[i].Value); } - + if (sFoundModule.length() < 1) failed("Miss module identifier in result set. Returned data are incomplete."); - + if ( ! sFoundDocService.equals(sDocumentService)) failed("Query returned wrong module '"+sFoundModule+"' with DocumentService='"+sFoundDocService+"'."); - + log.println("Found module '"+sFoundModule+"'."); } } @@ -243,13 +243,13 @@ public class CheckXModuleManager extends ComplexTestCase throws java.lang.Exception { log.println("check identification of module '"+sModule+"' ..."); - + XNameAccess xMM = (XNameAccess)UnoRuntime.queryInterface(XNameAccess.class, m_xMM); PropertyValue[] lModuleProps = (PropertyValue[])AnyConverter.toArray(xMM.getByName(sModule)); int c = lModuleProps.length; int i = 0; String sFactoryURL = ""; - + for (i=0; i<c; ++i) { if (lModuleProps[i].Name.equals("ooSetupFactoryEmptyDocumentURL")) @@ -258,20 +258,20 @@ public class CheckXModuleManager extends ComplexTestCase break; } } - + PropertyValue[] lArgs = new PropertyValue[1]; lArgs[0] = new PropertyValue(); lArgs[0].Name = "Hidden"; lArgs[0].Value = Boolean.TRUE; - + XComponent xModel = m_xLoader.loadComponentFromURL(sFactoryURL, "_self", 0, lArgs); XFrame xFrame = (XFrame)UnoRuntime.queryInterface(XFrame.class, m_xLoader); XController xController = xFrame.getController(); - + String sModuleFrame = m_xMM.identify(xFrame ); String sModuleController = m_xMM.identify(xController); String sModuleModel = m_xMM.identify(xModel ); - + if ( ! sModuleFrame.equals(sModule)) failed("Identification of module '"+sModule+"' failed if frame was used as entry point."); if ( ! sModuleController.equals(sModule)) @@ -287,7 +287,7 @@ public class CheckXModuleManager extends ComplexTestCase throws java.lang.Exception { XNameReplace xWrite = (XNameReplace)UnoRuntime.queryInterface(XNameReplace.class, m_xMM); - + impl_checkReadOnlyPropOfModule(xWrite, sModule, "ooSetupFactoryDocumentService" , "test"); impl_checkReadOnlyPropOfModule(xWrite, sModule, "ooSetupFactoryActualFilter" , "test"); impl_checkReadOnlyPropOfModule(xWrite, sModule, "ooSetupFactoryActualTemplateFilter", "test"); @@ -307,7 +307,7 @@ public class CheckXModuleManager extends ComplexTestCase lChanges[0] = new PropertyValue(); lChanges[0].Name = sPropName; lChanges[0].Value = aPropValue; - + // Note: Exception is expected ! log.println("check readonly state of module '"+sModule+"' for property '"+sPropName+"' ..."); try diff --git a/framework/qa/complex/XUserInputInterception/EventTest.java b/framework/qa/complex/XUserInputInterception/EventTest.java index 4b9ba0eb6f74..a54f9daaa932 100644 --- a/framework/qa/complex/XUserInputInterception/EventTest.java +++ b/framework/qa/complex/XUserInputInterception/EventTest.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,10 +56,10 @@ import util.SOfficeFactory; //----------------------------------------------- /** - * This <CODE>ComplexTest</CODE> checks the interface + * This <CODE>ComplexTest</CODE> checks the interface * <CODE>XUserInputInterception</CODE>. Therefore it creates a document, * adds a mouse and a key listener onto the interface and fire the - * correspond events. If all listener works as expected the test resluts in + * correspond events. If all listener works as expected the test resluts in * <CODE>OK</CODE> status. * @short Check the interface XUserInputIntercaption * @descr checks is a simple way the interface XUserInputInteraction @@ -67,35 +67,35 @@ import util.SOfficeFactory; public class EventTest extends ComplexTestCase { //------------------------------------------- // some const - + //------------------------------------------- // member - + /** points to the global uno service manager. */ private XMultiServiceFactory m_xMSF = null; - + /** indicates if the mousePressed event was called*/ private boolean m_mousePressed = false; /** indicates if the mouseReleased event was called*/ private boolean m_mouseReleased = false; - + /** indicates if the mousePressed event was called*/ private boolean m_keyPressed = false; /** indicates if the mouseReleased event was called*/ private boolean m_keyReleased = false; - + /** points to a global StarOffice factory */ private SOfficeFactory m_SOF = null; - + /** * define the miliseconds to wait until a <CODE>EventTrigger</CODE> thread should * be finished with its work */ final int m_threadWait = 3000; - + //------------------------------------------- // test environment - + //------------------------------------------- /** * The test methods are: @@ -122,7 +122,7 @@ public class EventTest extends ComplexTestCase { "checkMathDocument", }; } - + //------------------------------------------- /** * creates the mebmer <CODE>m_xMSF</CODE> and <CODE>m_SOF</CODE> @@ -133,17 +133,17 @@ public class EventTest extends ComplexTestCase { public void before() { // get uno service manager from global test environment m_xMSF = (XMultiServiceFactory)param.getMSF(); - + // create frame instance try { // get a soffice factory object m_SOF = SOfficeFactory.getFactory((XMultiServiceFactory) param.getMSF()); - + } catch(java.lang.Throwable ex) { failed("Could not create the XUserInputInterception instance."); } } - + //------------------------------------------- /** * closes the document @@ -159,7 +159,7 @@ public class EventTest extends ComplexTestCase { log.println("document couldn't be closed successfully."); } } - + /** * creates a text document and check the <CODE>XMouseClickHandler</CODE> and * <CODE>XKeyHandler</CODE> @@ -167,20 +167,20 @@ public class EventTest extends ComplexTestCase { * @see com.sun.star.awt.XMouseClickHandler */ public void checkTextDocument(){ - + XTextDocument xDoc = null; - + try{ xDoc = m_SOF.createTextDoc("WriterTest"); } catch (com.sun.star.uno.Exception e){ failed("Could not create a text document: " +e.toString()); } - + checkListener(xDoc); - + closeDoc(xDoc); } - + /** * creates an impress document and check the <CODE>XMouseClickHandler</CODE> and * <CODE>XKeyHandler</CODE> @@ -188,20 +188,20 @@ public class EventTest extends ComplexTestCase { * @see com.sun.star.awt.XMouseClickHandler */ public void checkImpressDocument(){ - + XComponent xDoc = null; - + try{ xDoc = m_SOF.createImpressDoc("ImpressTest"); } catch (com.sun.star.uno.Exception e){ failed("Could not create an impress document: " +e.toString()); } - + checkListener(xDoc); - + closeDoc(xDoc); } - + /** * creates a chart document and check the <CODE>XMouseClickHandler</CODE> and * <CODE>XKeyHandler</CODE> @@ -209,20 +209,20 @@ public class EventTest extends ComplexTestCase { * @see com.sun.star.awt.XMouseClickHandler */ public void checkChartDocument(){ - + XChartDocument xDoc = null; - + try{ xDoc = m_SOF.createChartDoc("ChartTest"); } catch (com.sun.star.uno.Exception e){ failed("Could not create a chart document: " +e.toString()); } - + checkListener(xDoc); - + closeDoc(xDoc); } - + /** * creates a math document and check the <CODE>XMouseClickHandler</CODE> and * <CODE>XKeyHandler</CODE> @@ -230,20 +230,20 @@ public class EventTest extends ComplexTestCase { * @see com.sun.star.awt.XMouseClickHandler */ public void checkMathDocument(){ - + XComponent xDoc = null; - + try{ xDoc = m_SOF.createMathDoc("MathTest"); } catch (com.sun.star.uno.Exception e){ failed("Could not create a math document: " +e.toString()); } - + checkListener(xDoc); - + closeDoc(xDoc); } - + /** * creates a draw document and check the <CODE>XMouseClickHandler</CODE> and * <CODE>XKeyHandler</CODE> @@ -251,20 +251,20 @@ public class EventTest extends ComplexTestCase { * @see com.sun.star.awt.XMouseClickHandler */ public void checkDrawDocument(){ - + XComponent xDoc = null; - + try{ xDoc = m_SOF.createDrawDoc("DrawTest"); } catch (com.sun.star.uno.Exception e){ failed("Could not create a draw document: " +e.toString()); } - + checkListener(xDoc); - + closeDoc(xDoc); } - + /** * creates a calc document and check the <CODE>XMouseClickHandler</CODE> and * <CODE>XKeyHandler</CODE> @@ -272,19 +272,19 @@ public class EventTest extends ComplexTestCase { * @see com.sun.star.awt.XMouseClickHandler */ public void checkCalcDocument(){ - + XSpreadsheetDocument xDoc = null; - + try{ xDoc = m_SOF.createCalcDoc("CalcTest"); } catch (com.sun.star.uno.Exception e){ failed("Could not create a calc document: " +e.toString()); } - + checkListener(xDoc); closeDoc(xDoc); } - + /** * This is the central test method. It is called by ceck[DOCTYPE]Document. It * creates the <CODE>XUserInputInterception</CODE> from the document and call the @@ -292,20 +292,20 @@ public class EventTest extends ComplexTestCase { * @param xDoc the document to test */ private void checkListener(XInterface xDoc){ - + XModel xModel = (XModel) UnoRuntime.queryInterface(XModel.class, xDoc); - + XUserInputInterception xUII = getUII(xModel); - + checkMouseListener(xUII, xModel); checkKeyListener(xUII, xModel); } - + /** - * Creates a <CODE>MyKeyHandler</CODE> and adds it to the - * <CODE>XUserInputInterception</CODE>. Then an <CODE>EventTrigger</CODE> thread + * Creates a <CODE>MyKeyHandler</CODE> and adds it to the + * <CODE>XUserInputInterception</CODE>. Then an <CODE>EventTrigger</CODE> thread * was created and started. - * Has <CODE>OK</CODE> if the members <CODE>m_keyPressed</CODE> and + * Has <CODE>OK</CODE> if the members <CODE>m_keyPressed</CODE> and * <CODE>m_keyReleased</CODE> are <CODE>TRUE</CODE> * @param xUII the XUserInputInterception * @param xModel the XModel of a document @@ -315,64 +315,64 @@ public class EventTest extends ComplexTestCase { private void checkKeyListener(XUserInputInterception xUII, XModel xModel) { m_keyPressed = false; m_keyReleased = false; - + MyKeyHandler keyListener = new MyKeyHandler(); - + xUII.addKeyHandler(keyListener); - + log.println("starting thread to check the key listener..."); EventTrigger et = new EventTrigger(xModel, EventTriggerType.KEY_TEXT_INTO_DOC); et.run(); - + util.utils.shortWait(m_threadWait); log.println("key listener thread should be finished."); - + assure("key event does not work!", m_keyPressed && m_keyReleased); xUII.removeKeyHandler(keyListener); - + } - + /** - * Creates a <CODE>MyMouseClickHandler</CODE> and adds it to the - * <CODE>XUserInputInterception</CODE>. Then an <CODE>EventTrigger</CODE> thread + * Creates a <CODE>MyMouseClickHandler</CODE> and adds it to the + * <CODE>XUserInputInterception</CODE>. Then an <CODE>EventTrigger</CODE> thread * was created and started. - * Has <CODE>OK</CODE> if the members <CODE>m_mousePressed</CODE> and + * Has <CODE>OK</CODE> if the members <CODE>m_mousePressed</CODE> and * <CODE>m_mouseReleased</CODE> are <CODE>TRUE</CODE> * @param xUII the XUserInputInterception * @param xModel the XModel of a document * @see EventTest.MyMouseClickHander * @see EventTest.EventTrigger */ - + private void checkMouseListener(XUserInputInterception xUII, XModel xModel) { - + m_mousePressed = false; m_mouseReleased = false; - + MyMouseClickHandler mouseListener = new MyMouseClickHandler(); - + xUII.addMouseClickHandler(mouseListener); - + log.println("starting thread to check the mouse listener..."); EventTrigger et = new EventTrigger(xModel, EventTriggerType.MOUSE_KLICK_INTO_DOC); et.run(); - + util.utils.shortWait(m_threadWait); log.println("mouse listener thread should be finished."); - + assure("mouse event does not work!", m_mousePressed && m_mouseReleased); xUII.removeMouseClickHandler(mouseListener); } - + /** * returns the <CODE>XUserInputInterception</CODE> from the <CODE>XMdoel</CODE> * @param xModel the XModel of a document * @return the <CODE>XUserInputInterception</CODE> of the document */ private XUserInputInterception getUII(XModel xModel){ - + XController xController = xModel.getCurrentController(); XUserInputInterception xUII = (XUserInputInterception) UnoRuntime.queryInterface( @@ -382,7 +382,7 @@ public class EventTest extends ComplexTestCase { } return xUII; } - + /** * Listener which added and its method must be called * on <code>keyPressed</code> and <code>keyReleased</code> call. @@ -418,7 +418,7 @@ public class EventTest extends ComplexTestCase { log.println("XKeyHandler: disposing-Event"); } } - + /** * Listener which added and its method must be called * on <code>mousePressed</code> and <code>mouseReleased</code> call. @@ -454,14 +454,14 @@ public class EventTest extends ComplexTestCase { log.println("XMouseClickHandler: disposing-Event"); } }; - + /** * To check the events this class is a thread which click a mouse button and * press a key with the <CODE>Robot</CODE> class * @see java.awt.Robot */ private class EventTrigger extends Thread{ - + /** * represents a <CODE>AccessibilityTools</CODE> */ @@ -475,7 +475,7 @@ public class EventTest extends ComplexTestCase { * represents a <CODE>XModel</CODE> of a document */ private XModel xModel = null; - + /** * Creates an instacne of this class. The parameter <CODE>eType</CODE> represents * the kind of event wich will be triggert at <CODE>run()</CODE> @@ -487,26 +487,26 @@ public class EventTest extends ComplexTestCase { this.xModel = model; this.eventType = eType; } - + /** * Triggers the event wich is represented by <CODE>eventType</CODE> * The scenarios are: * <ul> * <li>EventTest.EventTriggerType.MOUSE_KLICK_INTO_DOC - * which calls + * which calls * <li><CODE>clickIntoDoc</CODE></LI> * </LI> * <li>EventTest.EventTriggerType.KEY_TEXT_INTO_DOC - * which calls + * which calls * <li><CODE>clickIntodoc</CODE></LI> * <li><CODE>keyIntoDoc</CODE></LI> * </LI> * </UL> */ public void run(){ - + switch (this.eventType){ - + case EventTriggerType.MOUSE_KLICK_INTO_DOC: clickIntoDoc(); break; @@ -514,7 +514,7 @@ public class EventTest extends ComplexTestCase { clickIntoDoc(); keyIntoDoc(); break; - + } } /** @@ -529,12 +529,12 @@ public class EventTest extends ComplexTestCase { // get the position and the range of a scroll bar XWindow xWindow = at.getCurrentWindow( - (XMultiServiceFactory) param.getMSF(), + (XMultiServiceFactory) param.getMSF(), xModel); XAccessible xRoot = at.getAccessibleObject(xWindow); - - + + XAccessibleContext xPanel = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PANEL); XAccessibleComponent xPanelCont = (XAccessibleComponent) UnoRuntime.queryInterface(XAccessibleComponent.class, xPanel); @@ -560,7 +560,7 @@ public class EventTest extends ComplexTestCase { log.println("could not click into the scroll bar: " + e.toString()); } } - + /** * This method press the "A" key. Therefore it uses the <CODE>Robot</CODE> * class. @@ -575,20 +575,20 @@ public class EventTest extends ComplexTestCase { } catch (java.awt.AWTException e) { log.println("couldn't press key"); } - + } } - - /** This interface represents all possible actions which could be used + + /** This interface represents all possible actions which could be used * in the <CODE>EventTrigger</CODE> class. * @see EventTest.EventTrigger - */ + */ private interface EventTriggerType{ - + /** klick the mouse into the scroll bar*/ final public static int MOUSE_KLICK_INTO_DOC = 1; - + /** write some text into a spread sheet*/ final public static int KEY_TEXT_INTO_DOC = 2; - } + } }
\ No newline at end of file diff --git a/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java b/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java index a63baf116c2a..95a0fce2c92c 100644 --- a/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java +++ b/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ import helper.*; //----------------------------------------------- /** @short todo document me */ -public class AcceleratorsConfigurationTest extends ComplexTestCase +public class AcceleratorsConfigurationTest extends ComplexTestCase { /** points to the global uno service manager. */ private XMultiServiceFactory m_xSmgr = null; @@ -106,7 +106,7 @@ public class AcceleratorsConfigurationTest extends ComplexTestCase m_xSecondaryKeys = (XNameAccess)UnoRuntime.queryInterface(XNameAccess.class, m_xConfig.getByName("SecondaryKeys")); } } - + //------------------------------------------- /** @short close the environment. */ @@ -157,7 +157,7 @@ public class AcceleratorsConfigurationTest extends ComplexTestCase "com.sun.star.frame.StartModule", "com.sun.star.drawing.DrawingDocument", "com.sun.star.presentation.PresentationDocument", - "com.sun.star.sheet.SpreadsheetDocument", + "com.sun.star.sheet.SpreadsheetDocument", "com.sun.star.text.TextDocument", // add other modules here }; @@ -176,7 +176,7 @@ public class AcceleratorsConfigurationTest extends ComplexTestCase XInitialization xInit = (XInitialization)UnoRuntime.queryInterface(XInitialization.class, m_xModuleAccelCfg); xInit.initialize(aProp); // to fill cache - + XNameAccess xPrimaryModules = (XNameAccess)UnoRuntime.queryInterface(XNameAccess.class, m_xPrimaryKeys.getByName("Modules")); XNameAccess xSecondaryModules = (XNameAccess)UnoRuntime.queryInterface(XNameAccess.class, m_xSecondaryKeys.getByName("Modules")); @@ -258,7 +258,7 @@ public class AcceleratorsConfigurationTest extends ComplexTestCase SaveDocumentAcceleratorConfiguration(sDocCfgName); sDocCfgName = "file:///c:/test.cfg"; - LoadDocumentAcceleratorConfiguration(sDocCfgName); + LoadDocumentAcceleratorConfiguration(sDocCfgName); } //------------------------------------------- @@ -276,7 +276,7 @@ public class AcceleratorsConfigurationTest extends ComplexTestCase log.println("** get command by " + sKeys[i] + " **"); String sCmdFromCache = new String(); // get a value using XAcceleratorConfiguration API - String sCmdFromConfiguration = new String(); // get a value using configuration API + String sCmdFromConfiguration = new String(); // get a value using configuration API // GET shortcuts/commands using XAcceleratorConfiguration API sCmdFromCache = xAccelCfg.getCommandByKeyEvent(convertShortcut2AWTKey(sKeys[i])); @@ -434,7 +434,7 @@ public class AcceleratorsConfigurationTest extends ComplexTestCase XNameAccess xCommand = (XNameAccess)UnoRuntime.queryInterface(XNameAccess.class, xKey.getByName("Command")); String sLocale = getOfficeLocale(); - if (xCommand.hasByName(sLocale)) + if (xCommand.hasByName(sLocale)) sCommand = (String)UnoRuntime.queryInterface(String.class, xCommand.getByName(sLocale)); } diff --git a/framework/qa/complex/accelerators/helper/KeyMapping.java b/framework/qa/complex/accelerators/helper/KeyMapping.java index ec538d53b6f1..b0628e3cc7fd 100644 --- a/framework/qa/complex/accelerators/helper/KeyMapping.java +++ b/framework/qa/complex/accelerators/helper/KeyMapping.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/qa/complex/api_internal/CheckAPI.java b/framework/qa/complex/api_internal/CheckAPI.java index 7042034e5583..432182222eeb 100755 --- a/framework/qa/complex/api_internal/CheckAPI.java +++ b/framework/qa/complex/api_internal/CheckAPI.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/qa/complex/broken_document/LoadDocument.java b/framework/qa/complex/broken_document/LoadDocument.java index e1e27907d952..5318b15bc1ea 100755 --- a/framework/qa/complex/broken_document/LoadDocument.java +++ b/framework/qa/complex/broken_document/LoadDocument.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java b/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java index 8cad076b2d24..556cadc7d1b0 100644 --- a/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java +++ b/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java @@ -54,10 +54,10 @@ public class CheckContextMenuInterceptor extends ComplexTestCase { XFrame xFrame = null; Point point = null; XWindow xWindow = null; - + public void before() { xMSF = (XMultiServiceFactory)param.getMSF(); - } + } public void after() { log.println("release the popup menu"); @@ -71,7 +71,7 @@ public class CheckContextMenuInterceptor extends ComplexTestCase { } catch (java.awt.AWTException e) { log.println("couldn't press mouse button"); } - + com.sun.star.util.XCloseable xClose = (com.sun.star.util.XCloseable)UnoRuntime.queryInterface( com.sun.star.util.XCloseable.class, xFrame); @@ -86,14 +86,14 @@ public class CheckContextMenuInterceptor extends ComplexTestCase { xFrame = null; } - + public String[] getTestMethodNames() { return new String[]{"checkContextMenuInterceptor"}; } - + public void checkContextMenuInterceptor() { log.println(" **** Context Menu Interceptor *** "); - + try { // intialize the test document com.sun.star.lang.XComponent xDrawDoc = DrawTools.createDrawDoc(xMSF); @@ -101,25 +101,25 @@ public class CheckContextMenuInterceptor extends ComplexTestCase { SOfficeFactory SOF = SOfficeFactory.getFactory( xMSF); XShape oShape = SOF.createShape(xDrawDoc,5000,5000,1500,1000,"GraphicObject"); DrawTools.getShapes(DrawTools.getDrawPage(xDrawDoc,0)).add(oShape); - - com.sun.star.frame.XModel xModel = + + com.sun.star.frame.XModel xModel = (com.sun.star.frame.XModel)UnoRuntime.queryInterface( com.sun.star.frame.XModel.class, xDrawDoc); - + // get the frame for later usage xFrame = xModel.getCurrentController().getFrame(); - + // ensure that the document content is optimal visible DesktopTools.zoomToEntirePage(xDrawDoc); - + XBitmap xBitmap = null; - + // adding graphic as ObjRelation for GraphicObjectShape XPropertySet oShapeProps = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class,oShape); log.println( "Inserting a shape into the document"); - - try + + try { oShapeProps.setPropertyValue( "GraphicURL",util.utils.getFullTestURL("space-metal.jpg")); @@ -130,46 +130,46 @@ public class CheckContextMenuInterceptor extends ComplexTestCase { } catch (com.sun.star.lang.IllegalArgumentException e) { } catch (com.sun.star.beans.PropertyVetoException e) { } catch (com.sun.star.beans.UnknownPropertyException e) { - } - + } + // reuse the frame com.sun.star.frame.XController xController = xFrame.getController(); com.sun.star.ui.XContextMenuInterception xContextMenuInterception = null; com.sun.star.ui.XContextMenuInterceptor xContextMenuInterceptor = null; - - if ( xController != null ) + + if ( xController != null ) { log.println( "Creating context menu interceptor"); - + // add our context menu interceptor - xContextMenuInterception = - (com.sun.star.ui.XContextMenuInterception)UnoRuntime.queryInterface( + xContextMenuInterception = + (com.sun.star.ui.XContextMenuInterception)UnoRuntime.queryInterface( com.sun.star.ui.XContextMenuInterception.class, xController ); - - if( xContextMenuInterception != null ) + + if( xContextMenuInterception != null ) { ContextMenuInterceptor aContextMenuInterceptor = new ContextMenuInterceptor( xBitmap ); - xContextMenuInterceptor = - (com.sun.star.ui.XContextMenuInterceptor)UnoRuntime.queryInterface( + xContextMenuInterceptor = + (com.sun.star.ui.XContextMenuInterceptor)UnoRuntime.queryInterface( com.sun.star.ui.XContextMenuInterceptor.class, aContextMenuInterceptor ); - + log.println( "Register context menu interceptor"); xContextMenuInterception.registerContextMenuInterceptor( xContextMenuInterceptor ); } } - - // utils.shortWait(10000); - + + // utils.shortWait(10000); + openContextMenu((XModel) UnoRuntime.queryInterface(XModel.class, xDrawDoc)); - + checkHelpEntry(); - + // remove our context menu interceptor if ( xContextMenuInterception != null && xContextMenuInterceptor != null ) { log.println( "Release context menu interceptor"); xContextMenuInterception.releaseContextMenuInterceptor( - xContextMenuInterceptor ); + xContextMenuInterceptor ); } } catch ( com.sun.star.uno.RuntimeException ex ) { @@ -184,7 +184,7 @@ public class CheckContextMenuInterceptor extends ComplexTestCase { private void checkHelpEntry(){ XInterface toolkit = null; - + log.println("get accesibility..."); try{ toolkit = (XInterface) xMSF.createInstance("com.sun.star.awt.Toolkit"); @@ -199,15 +199,15 @@ public class CheckContextMenuInterceptor extends ComplexTestCase { AccessibilityTools at = new AccessibilityTools(); try { - xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, + xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, tk.getTopWindow(0)); - + xRoot = at.getAccessibleObject(xWindow); - + // at.printAccessibleTree((PrintWriter)log, xRoot, param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); at.printAccessibleTree((PrintWriter)log, xRoot, true); - } - catch (com.sun.star.lang.IndexOutOfBoundsException e) + } + catch (com.sun.star.lang.IndexOutOfBoundsException e) { log.println("Couldn't get Window"); } @@ -215,29 +215,29 @@ public class CheckContextMenuInterceptor extends ComplexTestCase { XAccessibleContext oPopMenu = at.getAccessibleObjectForRole(xRoot, AccessibleRole.POPUP_MENU); log.println("ImplementationName: " + util.utils.getImplName(oPopMenu)); - + XAccessible xHelp = null; try{ log.println("Try to get first entry of context menu..."); xHelp = oPopMenu.getAccessibleChild(0); - + } catch (IndexOutOfBoundsException e){ failed("Not possible to get first entry of context menu"); } - + if (xHelp == null) failed("first entry of context menu is NULL"); - + XAccessibleContext xHelpCont = xHelp.getAccessibleContext(); - if ( xHelpCont == null ) + if ( xHelpCont == null ) failed("No able to retrieve accessible context from first entry of context menu"); - + String aAccessibleName = xHelpCont.getAccessibleName(); if ( !aAccessibleName.equals( "Help" )) { log.println("Accessible name found = "+aAccessibleName ); failed("First entry of context menu is not from context menu interceptor"); } - + try { log.println("try to get first children of Help context..."); @@ -246,11 +246,11 @@ public class CheckContextMenuInterceptor extends ComplexTestCase { } catch (IndexOutOfBoundsException e){ failed("not possible to get first children of Help context"); } - + } - + private void openContextMenu(XModel aModel){ - + log.println("try to open contex menu..."); AccessibilityTools at = new AccessibilityTools(); @@ -265,7 +265,7 @@ public class CheckContextMenuInterceptor extends ComplexTestCase { point = window.getLocationOnScreen(); Rectangle rect = window.getBounds(); - + log.println("klick mouse button..."); try { Robot rob = new Robot(); @@ -280,8 +280,8 @@ public class CheckContextMenuInterceptor extends ComplexTestCase { } catch (java.awt.AWTException e) { log.println("couldn't press mouse button"); } - + utils.shortWait(3000); - + } } diff --git a/framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java b/framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java index 2a6d9e000d73..cb0d95900c6f 100644 --- a/framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java +++ b/framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java @@ -12,15 +12,15 @@ import com.sun.star.lang.IllegalArgumentException; public class ContextMenuInterceptor implements XContextMenuInterceptor { private com.sun.star.awt.XBitmap myBitmap; - + public ContextMenuInterceptor( com.sun.star.awt.XBitmap aBitmap ) { myBitmap = aBitmap; } - + public ContextMenuInterceptorAction notifyContextMenuExecute( - com.sun.star.ui.ContextMenuExecuteEvent aEvent ) throws RuntimeException + com.sun.star.ui.ContextMenuExecuteEvent aEvent ) throws RuntimeException { - try + try { // Retrieve context menu container and query for service factory to // create sub menus, menu entries and separators @@ -28,16 +28,16 @@ public class ContextMenuInterceptor implements XContextMenuInterceptor { com.sun.star.lang.XMultiServiceFactory xMenuElementFactory = (com.sun.star.lang.XMultiServiceFactory)UnoRuntime.queryInterface( com.sun.star.lang.XMultiServiceFactory.class, xContextMenu ); - - if ( xMenuElementFactory != null ) + + if ( xMenuElementFactory != null ) { - + // create root menu entry for sub menu and sub menu com.sun.star.beans.XPropertySet xRootMenuEntry = (XPropertySet)UnoRuntime.queryInterface( com.sun.star.beans.XPropertySet.class, xMenuElementFactory.createInstance("com.sun.star.ui.ActionTrigger" )); - + // create a line separator for our new help sub menu com.sun.star.beans.XPropertySet xSeparator = (com.sun.star.beans.XPropertySet)UnoRuntime.queryInterface( @@ -45,20 +45,20 @@ public class ContextMenuInterceptor implements XContextMenuInterceptor { xMenuElementFactory.createInstance("com.sun.star.ui.ActionTriggerSeparator" ) ); Short aSeparatorType = new Short( ActionTriggerSeparatorType.LINE ); xSeparator.setPropertyValue( "SeparatorType", (Object)aSeparatorType ); - + // query sub menu for index container to get access com.sun.star.container.XIndexContainer xSubMenuContainer = (com.sun.star.container.XIndexContainer)UnoRuntime.queryInterface( com.sun.star.container.XIndexContainer.class, xMenuElementFactory.createInstance("com.sun.star.ui.ActionTriggerContainer" )); - + // intialize root menu entry "Help" xRootMenuEntry.setPropertyValue( "Text", new String( "Help" )); xRootMenuEntry.setPropertyValue( "CommandURL", new String( "slot:5410" )); xRootMenuEntry.setPropertyValue( "HelpURL", new String( "5410" )); xRootMenuEntry.setPropertyValue( "SubContainer", (Object)xSubMenuContainer ); xRootMenuEntry.setPropertyValue( "Image", myBitmap ); - + // create menu entries for the new sub menu // intialize help/content menu entry // entry "Content" @@ -68,10 +68,10 @@ public class ContextMenuInterceptor implements XContextMenuInterceptor { xMenuEntry.setPropertyValue( "Text", new String( "Content" )); xMenuEntry.setPropertyValue( "CommandURL", new String( "slot:5401" )); xMenuEntry.setPropertyValue( "HelpURL", new String( "5401" )); - + // insert menu entry to sub menu xSubMenuContainer.insertByIndex ( 0, (Object)xMenuEntry ); - + // intialize help/help agent // entry "Help Agent" xMenuEntry = (com.sun.star.beans.XPropertySet)UnoRuntime.queryInterface( @@ -80,7 +80,7 @@ public class ContextMenuInterceptor implements XContextMenuInterceptor { xMenuEntry.setPropertyValue( "Text", new String( "Help Agent" )); xMenuEntry.setPropertyValue( "CommandURL", new String( "slot:5962" )); xMenuEntry.setPropertyValue( "HelpURL", new String( "5962" )); - + // insert menu entry to sub menu xSubMenuContainer.insertByIndex( 1, (Object)xMenuEntry ); // intialize help/tips @@ -94,37 +94,37 @@ public class ContextMenuInterceptor implements XContextMenuInterceptor { // insert menu entry to sub menu xSubMenuContainer.insertByIndex ( 2, (Object)xMenuEntry ); - + // add separator into the given context menu xContextMenu.insertByIndex ( 0, (Object)xSeparator ); - + // add new sub menu into the given context menu xContextMenu.insertByIndex ( 0, (Object)xRootMenuEntry ); - + // The controller should execute the modified context menu and stop notifying other // interceptors. return com.sun.star.ui.ContextMenuInterceptorAction.EXECUTE_MODIFIED ; } } - catch ( com.sun.star.beans.UnknownPropertyException ex ) + catch ( com.sun.star.beans.UnknownPropertyException ex ) { // do something useful // we used a unknown property } - catch ( com.sun.star.lang.IndexOutOfBoundsException ex ) + catch ( com.sun.star.lang.IndexOutOfBoundsException ex ) { // do something useful // we used an invalid index for accessing a container } - catch ( com.sun.star.uno.Exception ex ) + catch ( com.sun.star.uno.Exception ex ) { // something strange has happend! } - catch ( java.lang.Throwable ex ) + catch ( java.lang.Throwable ex ) { // catch java exceptions � do something useful } - + return com.sun.star.ui.ContextMenuInterceptorAction.IGNORED; } } diff --git a/framework/qa/complex/desktop/DesktopTerminate.java b/framework/qa/complex/desktop/DesktopTerminate.java index f63c2adef268..88cfa433aa31 100755 --- a/framework/qa/complex/desktop/DesktopTerminate.java +++ b/framework/qa/complex/desktop/DesktopTerminate.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -106,9 +106,9 @@ public class DesktopTerminate extends ComplexTestCase { if ( iOfficeCloseTime == 0 ) { iOfficeCloseTime = 1000; } - + if (!connect()) return; - + if (!disconnect()) return; } catch(Exception e) { diff --git a/framework/qa/complex/dispatches/checkdispatchapi.java b/framework/qa/complex/dispatches/checkdispatchapi.java index ef612c8cc1a6..518ec277ae53 100644 --- a/framework/qa/complex/dispatches/checkdispatchapi.java +++ b/framework/qa/complex/dispatches/checkdispatchapi.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,14 +49,14 @@ public class checkdispatchapi extends ComplexTestCase { //------------------------------------------- // some const - + //------------------------------------------- // member - - /** points to the global uno service manager. */ + + /** points to the global uno service manager. */ private XMultiServiceFactory m_xMSF = null; private connectivity.tools.HsqlDatabase db; - + /** can be used to create new test frames. */ private XFrame m_xDesktop = null; @@ -65,13 +65,13 @@ public class checkdispatchapi extends ComplexTestCase //------------------------------------------- // test environment - + //------------------------------------------- /** @short A function to tell the framework, which test functions are available. - + @return All test methods. - @todo Think about selection of tests from outside ... + @todo Think about selection of tests from outside ... */ public String[] getTestMethodNames() { @@ -95,7 +95,7 @@ public class checkdispatchapi extends ComplexTestCase "checkInterception" }; } - + //------------------------------------------- /** @short Create the environment for following tests. @@ -283,11 +283,11 @@ public class checkdispatchapi extends ComplexTestCase { String [] lDisabledURLs = new String [1]; lDisabledURLs[0] = ".uno:Open"; - + log.println("create and initialize interceptor ..."); Interceptor aInterceptor = new Interceptor(log); aInterceptor.setURLs4URLs4Blocking(lDisabledURLs); - + com.sun.star.frame.XDispatchProviderInterceptor xInterceptor = (com.sun.star.frame.XDispatchProviderInterceptor)UnoRuntime.queryInterface( com.sun.star.frame.XDispatchProviderInterceptor.class, aInterceptor); @@ -295,14 +295,14 @@ public class checkdispatchapi extends ComplexTestCase log.println("create and initialize frame ..."); com.sun.star.frame.XFrame xFrame = impl_createNewFrame(); impl_loadIntoFrame(xFrame, "private:factory/swriter", null); - + com.sun.star.frame.XDispatchProviderInterception xInterception = (com.sun.star.frame.XDispatchProviderInterception)UnoRuntime.queryInterface( com.sun.star.frame.XDispatchProviderInterception.class, xFrame); log.println("register interceptor ..."); xInterception.registerDispatchProviderInterceptor(xInterceptor); - + log.println("deregister interceptor ..."); xInterception.releaseDispatchProviderInterceptor(xInterceptor); } diff --git a/framework/qa/complex/dispatches/helper/Interceptor.java b/framework/qa/complex/dispatches/helper/Interceptor.java index c4eec8f9461e..a5b6b25c69d5 100644 --- a/framework/qa/complex/dispatches/helper/Interceptor.java +++ b/framework/qa/complex/dispatches/helper/Interceptor.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java b/framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java index ec7a36d3ba21..89dea19e08b6 100755 --- a/framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java +++ b/framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/qa/complex/framework/autosave/AutoSave.java b/framework/qa/complex/framework/autosave/AutoSave.java index a1bf20b46612..015d9771be59 100644 --- a/framework/qa/complex/framework/autosave/AutoSave.java +++ b/framework/qa/complex/framework/autosave/AutoSave.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -156,7 +156,7 @@ public class AutoSave extends ComplexTestCase /** a test document, which needs some time for saving to simulate concurrent * save operations. */ private XStorable m_xTestDoc = null; - + private XURLTransformer m_xURLParser = null; //------------------------------------------- diff --git a/framework/qa/complex/framework/autosave/Protocol.java b/framework/qa/complex/framework/autosave/Protocol.java index 87617a58178f..11f6c4eeeff3 100644 --- a/framework/qa/complex/framework/autosave/Protocol.java +++ b/framework/qa/complex/framework/autosave/Protocol.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/qa/complex/framework/recovery/CrashThread.java b/framework/qa/complex/framework/recovery/CrashThread.java index a439834daf1b..616d4baa200e 100644 --- a/framework/qa/complex/framework/recovery/CrashThread.java +++ b/framework/qa/complex/framework/recovery/CrashThread.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ import com.sun.star.util.URL; import com.sun.star.util.XURLTransformer; /** - * Thread to crash the office. This thread dies after the office process + * Thread to crash the office. This thread dies after the office process * is nopt longer available. */ public class CrashThread extends Thread { @@ -56,10 +56,10 @@ public class CrashThread extends Thread { XController xController = xModel.getCurrentController(); XDispatchProvider xDispProv = (XDispatchProvider) UnoRuntime.queryInterface( - XDispatchProvider.class, + XDispatchProvider.class, xController); XURLTransformer xParser = (XURLTransformer) UnoRuntime.queryInterface( - XURLTransformer.class, + XURLTransformer.class, msf.createInstance( "com.sun.star.util.URLTransformer")); diff --git a/framework/qa/complex/framework/recovery/KlickButtonThread.java b/framework/qa/complex/framework/recovery/KlickButtonThread.java index c9057c85b844..426a2e3d2a79 100644 --- a/framework/qa/complex/framework/recovery/KlickButtonThread.java +++ b/framework/qa/complex/framework/recovery/KlickButtonThread.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ import com.sun.star.lang.XMultiServiceFactory; import util.UITools; /** - * Thread to crash the office. This thread dies after the office process + * Thread to crash the office. This thread dies after the office process * is nopt longer available. */ public class KlickButtonThread extends Thread { @@ -49,9 +49,9 @@ public class KlickButtonThread extends Thread { public void run() { try{ UITools oUITools = new UITools(xMSF, xWindow); - + oUITools.clickButton(buttonName); - + } catch (Exception e){} } } diff --git a/framework/qa/complex/framework/recovery/RecoveryTest.java b/framework/qa/complex/framework/recovery/RecoveryTest.java index 0afd03b52528..ee565ff74330 100644 --- a/framework/qa/complex/framework/recovery/RecoveryTest.java +++ b/framework/qa/complex/framework/recovery/RecoveryTest.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -85,22 +85,22 @@ import util.UITools; import util.utils; public class RecoveryTest extends ComplexTestCase { - + static XMultiServiceFactory xMSF; static SOfficeFactory SOF; static RecoveryTools rt; /** * If you devid the screen in four parts in the first of them the office * windows should be placed. The range of the first quarter is stored in the variable. - */ + */ static Point windowMaxPosition; /** * The office windows starts in the first quarter of the screen. In this variable * the maximum size for the windows was stored so the windows can be placed * visible on the screen. - */ + */ static Size windowMaxSize; - + /** * All office windows will be placed by this test on randomized positions. * This positions was stored in this Hashmap. The keys are the frame names @@ -108,7 +108,7 @@ public class RecoveryTest extends ComplexTestCase { * @see com.sun.star.awt.Rectangle */ private Hashtable windowsPosSize = new Hashtable(); - + /** * A function to tell the framework, which test functions are available. * @return All test methods. @@ -125,13 +125,13 @@ public class RecoveryTest extends ComplexTestCase { public String[] getTestMethodNames() { return new String[]{"testCrash"}; } - + /** Create the environment for following tests. * Use either a component loader from desktop or * from frame * @throws Exception Exception */ - + public void normalCrash(){ cleanRecoveryData(); startOffice(); @@ -144,7 +144,7 @@ public class RecoveryTest extends ComplexTestCase { handleCrashReporterDialog(true, true); checkDocumentCount(expectedDocumentCount); } - + public void testCrash(){ cleanRecoveryData(); restoreBackupRecoveryData(); @@ -155,7 +155,7 @@ public class RecoveryTest extends ComplexTestCase { //handleCrashReporterDialog(true, true); //checkDocumentCount(expectedDocumentCount); } - + public void before() throws Exception { String msg ="\n\n\tPATH TO OFFICE BINARY MISSING!\n"; @@ -173,20 +173,20 @@ public class RecoveryTest extends ComplexTestCase { msg += "Please append to your command the following parameter:\n\n"; msg += "\t-NoOffice=true"; assure(msg, param.getBool("NoOffice")); - - + + rt = new RecoveryTools(param ,log); - + rt.removeParametersFromAppExecutionCommand(); - + log.println("start the office to test recovery feature..."); - + // make window ranges makeWindowPositionRage(); - + //makeRecoveryData(); } - + private void makeRecoveryData(){ cleanRecoveryData(); startOffice(); @@ -197,17 +197,17 @@ public class RecoveryTest extends ComplexTestCase { backupRecoveryData(); cleanRecoveryData(); } - + private void startOffice(){ assure("Could not connect to office", connect()); log.setWatcher(param.get("Watcher")); } - - + + private void checkDocumentCount(int expectedDocumentCount){ XEnumeration allComp = DesktopTools.getAllComponents(xMSF); int documentCount = 0; - + try{ while (allComp.hasMoreElements()){ allComp.nextElement(); @@ -216,21 +216,21 @@ public class RecoveryTest extends ComplexTestCase { } catch ( com.sun.star.container.NoSuchElementException e){} catch ( com.sun.star.lang.WrappedTargetException e){} - + String msg ="The amount of documents to recover is different form the expected amount:\n"; msg += "\texpected:\t" + expectedDocumentCount + "\n"; msg += "\tto recover:\t" + documentCount; assure(msg, expectedDocumentCount == documentCount); } - + /** * This function starts an office instance. It uses the AppExecutionCommad parameter. * @return TRUE if office is connected otherwise FALSE - */ + */ private boolean connect(){ try { - + OfficeProvider oProvider = new OfficeProvider(); xMSF = (XMultiServiceFactory)oProvider.getManager(param); @@ -245,7 +245,7 @@ public class RecoveryTest extends ComplexTestCase { } return true; } - + /** * While creating the test environment the positions and sizes of the frames * was saved. After the Office has recovered the documents, this functions @@ -254,11 +254,11 @@ public class RecoveryTest extends ComplexTestCase { private void compareWindowPositions(){ System.out.println("all frames:########"); System.out.println(windowsPosSize.entrySet().toString()); - + XEnumeration allComp = DesktopTools.getAllComponents(xMSF); - + String msg=null; - + while (allComp.hasMoreElements()){ try{ // get all components from the desktop @@ -271,18 +271,18 @@ public class RecoveryTest extends ComplexTestCase { // check if this frame was used in creation of test environment if (windowsPosSize.containsKey(frameName)){ - + Rectangle oldRect = (Rectangle) windowsPosSize.get(frameName); - + XWindow xWindow = xModel.getCurrentController().getFrame().getContainerWindow(); Rectangle newRect = xWindow.getPosSize(); - - + + boolean ok = oldRect.Height == newRect.Height; ok &= oldRect.Width == newRect.Width; ok &= oldRect.X == newRect.X; ok &= oldRect.Y == newRect.Y; - + if (!ok){ msg = "The frame '" + frameName + "' has a different position/size:\n"; msg += "original value -> restored value:\n"; @@ -293,24 +293,24 @@ public class RecoveryTest extends ComplexTestCase { } assure(msg, ok, CONTINUE); - + } } catch (com.sun.star.container.NoSuchElementException e) { } catch ( com.sun.star.lang.WrappedTargetException e) {} } - + } - + /** * This function crashes the office */ private void makeCrash(){ // get all documents Object[] allDocs = DesktopTools.getAllOpenDocuments(xMSF); - + // get one of them for dispatching XComponent xDoc = (XComponent) allDocs[0]; - log.println("make the crash in second thread"); + log.println("make the crash in second thread"); CrashThread crash = new CrashThread(xDoc, xMSF); crash.start(); @@ -321,50 +321,50 @@ public class RecoveryTest extends ComplexTestCase { /** * This function uses accessibility to handle the dialog which appears while the * office is crashed. It click the button "OK" to continue. - */ + */ private void handleRecoveryDialogAfterCrash(int expectedDocumentCount){ try{ - - // if the office crashes, the recovery feature needs some time + + // if the office crashes, the recovery feature needs some time // to save all docs. Therefore the recovery dialog could need some // time to pop up. log.println("wating for recovery dialog..."); - + int counter = 0; int maximum = param.getInt(PropertyName.THREAD_TIME_OUT) / param.getInt(PropertyName.SHORT_WAIT); - + XDialog oDialog = rt.getActiveDialog(xMSF); - + while ( oDialog == null && (counter < maximum)) { rt.pause(); - oDialog = rt.getActiveDialog(xMSF); + oDialog = rt.getActiveDialog(xMSF); counter ++; } - + assure("could not get Recovery Window",(oDialog != null)); - + XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, oDialog); - + UITools oUITools = new UITools(xMSF, xWindow); oUITools.printAccessibleTree((PrintWriter) log, param.getBool(PropertyName.DEBUG_IS_ACTIVE)); String[] documents = oUITools.getListBoxItems("The following files will be recovered"); log.println("there are " + documents.length + " documents to save"); - + String msg ="The amount of documents to recover is different form the expected amount:\n"; msg += "\texpected:\t" + expectedDocumentCount + "\n"; msg += "\tto recover:\t" + documents.length; - + assure(msg, expectedDocumentCount == documents.length); - + log.println("disable automatically launch of Office"); oUITools.setCheckBoxValue("Launch StarOffice automatically", new Integer(0)); - + log.println("start saving..."); oUITools.clickButton("OK"); - + rt.waitForClosedOffice(); } catch (Exception e){ @@ -372,47 +372,47 @@ public class RecoveryTest extends ComplexTestCase { failed("Could not handle crash-dialog: " + e.toString()); } } - + private void handleCrashReporterDialog(boolean cancel, boolean YesNo){ try{ - + log.println("try to get Crash Reporter Dialog..."); - + XDialog oDialog = rt.getActiveDialog(xMSF); assure("could not get CrashReporter Dialog", oDialog != null); - + XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, oDialog); - + log.println(oDialog.getTitle()); UITools oUITools = new UITools(xMSF, xWindow); if (cancel) { log.println("clicking 'Cancel' button..."); - + try{ rt.clickThreadButton(xMSF, xWindow, "Cancel"); } catch (com.sun.star.accessibility.IllegalAccessibleComponentStateException e){ failed("Could not click 'Cancel' at CrashReporter Dialog"); } - + } else { log.println("clicking 'Next' button..."); oUITools.clickButton("Next>>"); } - + } catch (Exception e){ failed("Could not handle CrashReporter Dialog: " + e.toString()); } } - + private void handleRecoveryDialog_QuickExit(int expectedDocumentCount){ log.println("handle Recovery Dialog at restart: quick exit"); handleRecoveryDialogAtRestart(expectedDocumentCount, false, true); handleAreYouSureDialog(true); handleSaveDocumentsDialog(false); - + } private void handleRecoveryDialog_QuickExitAndSave(int expectedDocumentCount){ log.println("handle Recovery Dialog at restart: quick exit"); @@ -421,10 +421,10 @@ public class RecoveryTest extends ComplexTestCase { handleSaveDocumentsDialog(true); } private void handleRecoveryDialog_Recover(int expectedDocumentCount){ - + } private void handleRecoveryDialog_RecoverAndCrashreporter(int expectedDocumentCount){ - + } /** * This function uses accessibility to handle the dialog which appears while the @@ -432,20 +432,20 @@ public class RecoveryTest extends ComplexTestCase { * and click it then to continue. * @param expectedDocumentCount the amount of documents which must be displayed in the recovery dialog * @param recover If the documenst should be recoverd this variable must be true. If it is fasle - * the recovery process was stoped and the button cancel was klicked. + * the recovery process was stoped and the button cancel was klicked. * @param cancel If the recovery is fifnished, this parameter desicdes to klick the "Next" button * or the click cancel. If the value is true, the cancel button was clicked. - */ + */ private void handleRecoveryDialogAtRestart(int expectedDocumentCount, boolean recover, boolean cancel){ try{ - + log.println("try to get Recovery Dialog..."); XDialog oDialog = null; oDialog = rt.getActiveDialogAfterStartup(xMSF); - + assure("could not get Recovery Dialog at start of office", (oDialog != null), CONTINUE); - + XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, oDialog); log.println("got the following dialog: '" +oDialog.getTitle() + "'"); @@ -458,18 +458,18 @@ public class RecoveryTest extends ComplexTestCase { for (int i=0;i<documents.length;i++){ log.println(documents[i]); } - + String msg ="The amount of documents to recover is different form the expected amount:\n"; msg += "\texpected:\t" + expectedDocumentCount + "\n"; msg += "\tto recover:\t" + documents.length; - + assure(msg, expectedDocumentCount ==documents.length); - + if (recover){ - + log.println("clicking 'Start Recovery' button..."); oUITools.clickButton("Start Recovery >"); - + rt.pause(); //XAccessibleContext oButton = oUITools.getButton("Start Recovery >"); @@ -482,7 +482,7 @@ public class RecoveryTest extends ComplexTestCase { log.println("recovering..."); try{ - oButton = oUITools.getButton("Next >"); + oButton = oUITools.getButton("Next >"); } catch (java.lang.NullPointerException e){ // no fault: The title "Start Recovery" switches to "Next" // while all documents are recoverd @@ -490,7 +490,7 @@ public class RecoveryTest extends ComplexTestCase { rt.pause(); counter++; } - + if (cancel) { log.println("clicking 'Cancel' button..."); @@ -507,7 +507,7 @@ public class RecoveryTest extends ComplexTestCase { } rt.pause(); - + } else { log.println("do not recover: clicking 'Cancel' button..."); @@ -517,19 +517,19 @@ public class RecoveryTest extends ComplexTestCase { failed("Could not click 'Cancel' at recovery-dialog"); } } - + } catch (Exception e){ failed("Could not handle recovery-dialog at restart: " + e.toString()); } - + } - + /** * This function uses accessibility to handle the dialog "Are you sure". * It cklick "Yes" or "No", dependend on the value of the parameter <CODE>Yes</CODE> * @param yes If value is <CODE>TRUE</CODE> the button "Yes" was clicked, otherwise the button * "No". - */ + */ private void handleAreYouSureDialog(boolean yes) { try{ @@ -542,13 +542,13 @@ public class RecoveryTest extends ComplexTestCase { failed("Could not handle 'Are you sure' dialog."); } } - + /** * This function uses accessibility to handle the dialog "Are you sure". * It cklick "Yes" or "No", dependend on the value of the parameter <CODE>Yes</CODE> * @param yes If value is <CODE>TRUE</CODE> the button "Yes" was clicked, otherwise the button * "No". - */ + */ private void handleSaveDocumentsDialog(boolean saveDocuments) { try{ @@ -561,9 +561,9 @@ public class RecoveryTest extends ComplexTestCase { assure("could not get 'Save Documents' Dialog: ", (oDialog != null), CONTINUE); UITools oUITools = new UITools(xMSF, oDialog); - + oUITools.printAccessibleTree((PrintWriter) log, param.getBool(PropertyName.DEBUG_IS_ACTIVE)); - + String listBoxName = "Documents"; String[] documents = null; try{ @@ -577,7 +577,7 @@ public class RecoveryTest extends ComplexTestCase { log.println(documents[i]); } String tempURL = utils.getOfficeTempDir(xMSF); - + log.println("the destination for saveing is: " + tempURL); try{ oUITools.setTextEditFiledText("Save to", tempURL); @@ -594,7 +594,7 @@ public class RecoveryTest extends ComplexTestCase { failed("Could not handle 'Are you sure' dialog."); } } - + /** * This function gets the current screen size and calculate the first * quarter of it. This qaurter was used to postion to Office windows. @@ -605,50 +605,50 @@ public class RecoveryTest extends ComplexTestCase { Dimension screenDim = Toolkit.getDefaultToolkit().getScreenSize(); Point pos = new Point(); Size size = new Size(); - + // get the max position of the first quarter of the screen pos.x = screenDim.width / 2; pos.y = screenDim.height / 2; windowMaxPosition = pos; - + // get the max size of the windows while they placed in windowMaxPosition // range and not outside the visibility size.Height = screenDim.height; size.Width = screenDim.width; windowMaxSize = size; } - + private void generateDesktop(){ - + // create some documents with content makeWriterDoc("WriterDoc1", true); // makeCalcDoc("CalcDoc1", true); // makeDrawDoc("DrawDoc1", true); // makeImpressDoc("ImpressDoc1", true); // makeMathDoc("MathDoc1", true); - + // create some documents without content // makeMathDoc("_blank_math", false); // makeDrawDoc("_blank_draw", false); // makeCalcDoc("_blank_calc", false); // makeWriterDoc("_blank_writer", false); // makeImpressDoc("_blank_impress", false); - + // makeMathDoc("MathDocEmpty", false); // makeDrawDoc("DrawDocEmpty", false); // makeCalcDoc("CalcDocEmpty", false); makeWriterDoc("WriterDocEmpty", false); // makeImpressDoc("ImpressDocEmpty", false); - + log.println("Test object successfully created."); - + } - + private void makeImpressDoc(String frameName, boolean withContent){ log.println("creating Impress document '" + frameName + "'"); XComponent xImpressDoc = createNewImpressDoc(frameName); if (withContent) fillImpressDocWithContent(xImpressDoc); - positioningDocument((XModel) UnoRuntime.queryInterface(XModel.class, + positioningDocument((XModel) UnoRuntime.queryInterface(XModel.class, xImpressDoc)); } @@ -656,37 +656,37 @@ public class RecoveryTest extends ComplexTestCase { log.println("creating Draw document '" + frameName + "'"); XComponent xDrawDoc = createNewDrawDoc(frameName); if (withContent) fillDrawDocWithContent(xDrawDoc); - positioningDocument((XModel) UnoRuntime.queryInterface(XModel.class, + positioningDocument((XModel) UnoRuntime.queryInterface(XModel.class, xDrawDoc)); } - + private void makeCalcDoc(String frameName, boolean withContent){ log.println("creating Calc document '" + frameName + "'"); XSpreadsheetDocument xSpreadsheetDoc = createNewCalcDoc(frameName); if (withContent) fillCalcDocWithContent(xSpreadsheetDoc); - positioningDocument((XModel) UnoRuntime.queryInterface(XModel.class, + positioningDocument((XModel) UnoRuntime.queryInterface(XModel.class, xSpreadsheetDoc)); } - + private void positioningDocument(XModel model){ - + XWindow xWindow = model.getCurrentController().getFrame().getContainerWindow(); String frameName = model.getCurrentController().getFrame().getName(); - + // get randomized position and size - Rectangle posSize = makePosZize(); - + Rectangle posSize = makePosZize(); + // save position and size windowsPosSize.put(frameName, posSize); - + xWindow.setPosSize(posSize.X, posSize.Y, posSize.Width, posSize.Height, com.sun.star.awt.PosSize.POSSIZE); Rectangle test = xWindow.getPosSize(); log.println("x: "+test.X+" y:"+test.Y+" width:"+test.Width+" height:"+test.Height); } - + private Rectangle makePosZize(){ - + Rectangle posSize = new Rectangle(); Random rand = new Random(); @@ -698,22 +698,22 @@ public class RecoveryTest extends ComplexTestCase { int maxWidth = windowMaxSize.Width-posSize.Y; int height = rand.nextInt(maxHeight + 1); int width = rand.nextInt((windowMaxSize.Width-posSize.Y) + 1); - + // be shure that the new size his greater then the half of windowMaxSize posSize.Height = (height < (maxHeight / 2)) ? height + (maxHeight / 2) : height; posSize.Width = (width < (maxWidth / 2)) ? width + (maxWidth / 2) : width; - + return posSize; } - + private void makeMathDoc(String frameName, boolean withContent){ log.println("creating Math document '" + frameName + "'"); XComponent xMathDoc = createNewMathDoc(frameName); if (withContent) fillMathDocWithContent(xMathDoc); - positioningDocument((XModel) UnoRuntime.queryInterface(XModel.class, + positioningDocument((XModel) UnoRuntime.queryInterface(XModel.class, xMathDoc)); } - + private XComponent createNewMathDoc(String frameName){ XComponent xMathDoc = null; try{ @@ -724,8 +724,8 @@ public class RecoveryTest extends ComplexTestCase { } return xMathDoc; } - - private void fillMathDocWithContent(XComponent xMathDoc){ + + private void fillMathDocWithContent(XComponent xMathDoc){ // setting a formula in document final String expFormula = "sum a cdot b"; final XPropertySet xPS = (XPropertySet) UnoRuntime.queryInterface @@ -746,7 +746,7 @@ public class RecoveryTest extends ComplexTestCase { failed("Couldn't create test environment"); } } - + private XComponent createNewImpressDoc(String frameName){ XComponent xImpressDoc = null; try{ @@ -757,10 +757,10 @@ public class RecoveryTest extends ComplexTestCase { } return xImpressDoc; } - - + + private void fillImpressDocWithContent(XComponent xImpressDoc){ - + log.println( "get presentation" ); XPresentationSupplier oPS = (XPresentationSupplier) UnoRuntime.queryInterface(XPresentationSupplier.class, xImpressDoc); @@ -797,7 +797,7 @@ public class RecoveryTest extends ComplexTestCase { failed("Couldn't create test environment"); } } - + private XComponent createNewDrawDoc(String frameName){ XComponent xDrawDoc = null; try{ @@ -808,7 +808,7 @@ public class RecoveryTest extends ComplexTestCase { } return xDrawDoc; } - + private void fillDrawDocWithContent(XComponent xDrawDoc){ XDrawPagesSupplier oDPS = (XDrawPagesSupplier) UnoRuntime.queryInterface(XDrawPagesSupplier.class, xDrawDoc); @@ -873,10 +873,10 @@ public class RecoveryTest extends ComplexTestCase { log.println("creating Writer document '" + frameName + "'"); XTextDocument xTextDoc = createNewWriterDoc(frameName); if (withContent) fillWriterDocWithContent(xTextDoc); - positioningDocument((XModel) UnoRuntime.queryInterface(XModel.class, + positioningDocument((XModel) UnoRuntime.queryInterface(XModel.class, xTextDoc)); } - + private XTextDocument createNewWriterDoc(String frameName){ XTextDocument xTextDoc = null; try { @@ -887,7 +887,7 @@ public class RecoveryTest extends ComplexTestCase { } return xTextDoc; } - + private void fillWriterDocWithContent(XTextDocument xTextDoc){ try{ log.println( "inserting some lines" ); @@ -916,11 +916,11 @@ public class RecoveryTest extends ComplexTestCase { failed("Couldn't create test environment"); } } - + private XSpreadsheetDocument createNewCalcDoc(String frameName){ - + XSpreadsheetDocument xSheetDoc = null; - + try { xSheetDoc = SOF.createCalcDoc(frameName); } catch (com.sun.star.uno.Exception e) { @@ -929,21 +929,21 @@ public class RecoveryTest extends ComplexTestCase { } return xSheetDoc; } - + private void fillCalcDocWithContent(XSpreadsheetDocument xSpreadsheetDoc){ try{ XSpreadsheets oSpreadsheets = xSpreadsheetDoc.getSheets(); XSpreadsheet oSheet = (XSpreadsheet) AnyConverter.toObject( - new Type(XSpreadsheet.class), + new Type(XSpreadsheet.class), oSpreadsheets.getByName( oSpreadsheets.getElementNames()[0])); XCellRange testRange = oSheet.getCellRangeByName("$A$1:$D$4"); XSheetCellRange testSheetRange = (XSheetCellRange) UnoRuntime.queryInterface( - XSheetCellRange.class, + XSheetCellRange.class, testRange); oSheet.getCellByPosition(1, 1).setValue(1); oSheet.getCellByPosition(4, 5).setValue(1); @@ -966,11 +966,11 @@ public class RecoveryTest extends ComplexTestCase { failed("Couldn't create test environment"); } } - + /** * copies all files from the backup folder into a folder called backup.recoveryTest * and copies the Recovery.xcu to recovery.xcu.recoeryTest - */ + */ private void backupRecoveryData() { log.println("backup recovery data..."); @@ -982,11 +982,11 @@ public class RecoveryTest extends ComplexTestCase { failed("could not copy recovery data: " + e.toString()); } } - + /** * copies all files from the backup.recoveryTest folder into the backup folder * and copies the Recovery.xcu.recoveryTest to recovery.xcu - */ + */ private void restoreBackupRecoveryData() { log.println("restore backup recovery data..."); @@ -998,13 +998,13 @@ public class RecoveryTest extends ComplexTestCase { failed("could not copy recovery data: " + e.toString()); } } - + private void cleanRecoveryData(){ try{ log.println("bootstrapping the office to get user path to remove old recovery data..."); rt.cleanRecoveryData(); - + } catch (com.sun.star.io.IOException e){ failed("could not clean recovery data: " + e.toString()); } diff --git a/framework/qa/complex/framework/recovery/RecoveryTools.java b/framework/qa/complex/framework/recovery/RecoveryTools.java index 5ddaff8cdb95..28936949d8ef 100644 --- a/framework/qa/complex/framework/recovery/RecoveryTools.java +++ b/framework/qa/complex/framework/recovery/RecoveryTools.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,10 +60,10 @@ import util.utils; * functions. */ public class RecoveryTools { - + private final TestParameters param; private final LogWriter log; - + /** * Creates new OfficeWatcher * @param param the test parameter @@ -72,19 +72,19 @@ public class RecoveryTools { public RecoveryTools(TestParameters param, LogWriter log) { this.param = param; this.log = log; - + } - + /** * get the active dialog from the top of the desktop * @param xToolKit xToolKit the <CODE> XExtendedToolkit</CODE> to get the dialog from the top of the desktop. * @return a <CODE>XDialog</CODE> interface of the dialog - */ + */ public XDialog getActiveDialog( XMultiServiceFactory xMSF){ XWindow xWin = getActiveWindow(xMSF); return (XDialog) UnoRuntime.queryInterface(XDialog.class, xWin); } - + public XWindow getActiveWindow( XMultiServiceFactory xMSF){ XInterface xToolKit = null; try { @@ -105,10 +105,10 @@ public class RecoveryTools { * tries to get the dialog until the <CODE>OfficeWatcher</CODE> kills the office. * @param xToolKit the <CODE> XExtendedToolkit</CODE> to get the dialog from the top of the desktop. * @return a <CODE>XDialog</CODE> interface of the dialog - */ + */ public XDialog getActiveDialogAfterStartup(XMultiServiceFactory xMSF){ // while the office starts it takes some time to get the dialog. - + // the dialog is accessible AFTER the office has recoverd all documents. // This could consumes more time then the TimeOut allow. int counter = 0; @@ -116,9 +116,9 @@ public class RecoveryTools { int pause = param.getInt(PropertyName.SHORT_WAIT)*10; int timeOut = param.getInt(PropertyName.THREAD_TIME_OUT)*5; int maximum = (timeOut / pause) * multi; - + XDialog oDialog = getActiveDialog(xMSF); - + while (oDialog == null && (counter < maximum)){ log.println("waiting until the office has recoverd... remaining " + (timeOut * multi - pause * counter)/1000 + " seconds"); pause(pause); @@ -130,18 +130,18 @@ public class RecoveryTools { /** * halt the thread for some time - */ + */ public void pause(){ pause(param.getInt(PropertyName.SHORT_WAIT)); } - + /** * halt the thread for some time - */ + */ public void pause(int sleepTime){ sleep(sleepTime); } - + private void sleep(long millis){ try{ Thread.sleep(millis); @@ -153,36 +153,36 @@ public class RecoveryTools { * was done from the Office via XSimpleFileAccess * @param xMSF a <CODE>XMultiServiceFactory</CODE> to get <CODE>XSimpleFileAccess</CODE> * @throws com.sun.star.io.IOException the exception was thrown if something goes wrong. - */ + */ public void cleanRecoveryData() throws com.sun.star.io.IOException { try{ HashMap recFiles = getRecoveryFiles(); - + String recoveryFolder = (String) recFiles.get("recoveryFolder"); String recoveryXCU = (String) recFiles.get("recoveryXCU"); log.println("try to remove content of '" + recoveryFolder + "'"); - + File rf = new File(recoveryFolder); - + boolean success = FileTools.cleanDir(rf); log.println("removed " + recoveryFolder + ": " + success); - + log.println("try to remove '" + recoveryXCU + "'"); - + File xcu = new File(recoveryXCU); if (xcu.isFile()){ success = xcu.delete(); log.println("removed " + recoveryXCU + " : " + success); } - + } catch (Exception e){ throw new com.sun.star.io.IOException("could not remove old recovery data: " + e.toString()); } } - + public HashMap getRecoveryFiles() throws com.sun.star.io.IOException { @@ -190,46 +190,46 @@ public class RecoveryTools { log.println("try to get UnoProvider..."); UnoProvider unoProv = new UnoProvider(); XMultiServiceFactory xMSF = (XMultiServiceFactory) unoProv.getManager(param); - + String userPath = utils.expandMacro(xMSF, "${$ORIGIN/bootstraprc:UserInstallation}"); System.out.println("userPath:'" + userPath + "'"); - + if (userPath.equals(""))userPath = utils.expandMacro(xMSF, "${$ORIGIN/bootstrap.ini:UserInstallation}"); System.out.println("userPath:'" + userPath + "'"); - + if (userPath.equals("")) throw new com.sun.star.io.IOException("could not get user path at bootstraping"); - + String recoveryFolder = utils.getSystemURL(userPath + "/user/backup"); - + String recoveryXCU = utils.getSystemURL(userPath + "/user/registry/data/org/openoffice/Office/Recovery.xcu"); - + HashMap recFiles = new HashMap(); - + recFiles.put("recoveryFolder", recoveryFolder); recFiles.put("recoveryXCU", recoveryXCU); return recFiles; - + } catch (Exception e){ throw new com.sun.star.io.IOException("could not get recovery folder: " + e.toString()); } - + } /** * This function close the office while calling terminate on the desktop. If * this failed, the <CODE>ProcessHandler</CODE> kills the process. * @param xMSF the <CODE>XMultiServiceFactory</CODE> * @return <CODE>TRUE</CODE> if no exception was thrown, otherwise <CODE>FALSE</CODE> - */ + */ public boolean closeOffice(XMultiServiceFactory xMSF) { try { XDesktop desk = (XDesktop) UnoRuntime.queryInterface( XDesktop.class, xMSF.createInstance( "com.sun.star.frame.Desktop")); xMSF = null; - + desk.terminate(); log.println("Waiting until ProcessHandler loose the office..."); - + } catch (java.lang.Exception e) { e.printStackTrace(); @@ -238,11 +238,11 @@ public class RecoveryTools { waitForClosedOffice(); return true; } - + /** * This function waits until the office is closed. If the closing time reach * the value of parameter <CODE>THREAD_TIME_OUT</CODE> the office was killed. - */ + */ public void waitForClosedOffice(){ // check for the office process helper.ProcessHandler ph = (helper.ProcessHandler) param.get("AppProvider"); @@ -259,7 +259,7 @@ public class RecoveryTools { // be shure that office is closed if (ph != null) ph.kill(); } - + public void killOffice(){ helper.ProcessHandler ph = (helper.ProcessHandler) param.get("AppProvider"); ph.kill(); @@ -269,9 +269,9 @@ public class RecoveryTools { * The office must be started WITH restore and crashreporter functionality. * Therefore the parmater '<CODE>-norestore</CODE>' and '<CODE>-nocrashreport</CODE>' * was removed from the <CODE>AppExecutionCommand</CODE> parameter - */ + */ public void removeParametersFromAppExecutionCommand(){ - + //remove some params to start office String office = (String) param.get("AppExecutionCommand"); String[] params = {"-norestore", "-nocrashreport"}; @@ -286,19 +286,19 @@ public class RecoveryTools { } param.put("AppExecutionCommand", office); log.println("connect: " + (String) param.get("AppExecutionCommand")); - + } - + /** * This function uses accessibility to handle modal dialogs like the * "Are you sure" dialog. * It cklick the named button given in parameter <CODE>buttonName</CODE> * @param buttonName the name of the button wich should be chlicked - */ + */ public void handleModalDialog(XMultiServiceFactory xMSF, String buttonName) throws com.sun.star.accessibility.IllegalAccessibleComponentStateException - { - + { + log.println("try to get modal Dialog..."); pause(); @@ -319,7 +319,7 @@ public class RecoveryTools { } pause(); } - + public void clickThreadButton(XMultiServiceFactory xMSF, XWindow xWindow, String buttonName) throws com.sun.star.accessibility.IllegalAccessibleComponentStateException { @@ -327,12 +327,12 @@ public class RecoveryTools { kbt.start(); pause(param.getInt(PropertyName.SHORT_WAIT) * 10); } - + public void copyRecoveryData(boolean backup) throws com.sun.star.io.IOException, java.io.IOException - { + { HashMap recFiles = null; - + try{ recFiles = getRecoveryFiles(); } catch ( com.sun.star.io.IOException e){ @@ -361,6 +361,6 @@ public class RecoveryTools { throw new java.io.IOException("Could not copy recovery files: " + e.toString()); } } - - + + }
\ No newline at end of file diff --git a/framework/qa/complex/framework/recovery/TimeoutThread.java b/framework/qa/complex/framework/recovery/TimeoutThread.java index da3f418c657c..088f4b3d36f6 100644 --- a/framework/qa/complex/framework/recovery/TimeoutThread.java +++ b/framework/qa/complex/framework/recovery/TimeoutThread.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,9 +33,9 @@ public class TimeoutThread extends Thread{ public TimeoutThread(int timeOut) { this.timeOut = timeOut; } - + public void run(){ util.utils.shortWait(timeOut); } - + } diff --git a/framework/qa/complex/imageManager/CheckImageManager.java b/framework/qa/complex/imageManager/CheckImageManager.java index 4dac9986232e..8f283a034e20 100755 --- a/framework/qa/complex/imageManager/CheckImageManager.java +++ b/framework/qa/complex/imageManager/CheckImageManager.java @@ -29,22 +29,22 @@ import share.LogWriter; public class CheckImageManager extends ComplexTestCase { boolean checkUIConfigManager = false; XMultiServiceFactory xMSF = null; - + public void before() { xMSF = (XMultiServiceFactory)param.getMSF(); - } - + } + public String[] getTestMethodNames() { return new String[]{"checkImageManagerFromModule"};//, "checkImageManager"}; } - + public void checkImageManagerFromModule() { log.println(" **** ImageManager from ModuleUIConfigurationManager *** "); XUIConfigurationManager xManager = null; try { Object o = (XInterface)xMSF.createInstance( "com.sun.star.ui.ModuleUIConfigurationManagerSupplier"); - XModuleUIConfigurationManagerSupplier xMUICMS = + XModuleUIConfigurationManagerSupplier xMUICMS = (XModuleUIConfigurationManagerSupplier)UnoRuntime.queryInterface( XModuleUIConfigurationManagerSupplier.class, o); xManager = xMUICMS.getUIConfigurationManager( @@ -76,17 +76,17 @@ public class CheckImageManager extends ComplexTestCase { XImageManager.class, xManager.getImageManager()); performChecks(xImageManager, "UIConfig", xManager); } - + private void performChecks(XImageManager xImageManager, String testObjectName, XUIConfigurationManager xManager) { util.dbg.printInterfaces(xImageManager); OXUIConfigurationListenerImpl configListener = new OXUIConfigurationListenerImpl(log, xManager, xMSF); param.put("XUIConfiguration.XUIConfigurationListenerImpl", configListener); - + XInitialization xInit = (XInitialization)UnoRuntime.queryInterface(XInitialization.class, xImageManager); _XInitialization _xInit = new _XInitialization(log, param, xInit); assure(testObjectName + "::XInitialization.initialize", _xInit._initialize(), true); - + // xImageManager is already there, just write a test ;-) _XImageManager _xImage = new _XImageManager(log, param, xImageManager); assure(testObjectName + "::XImageManager.getAllImageNames", _xImage._getAllImageNames(), true); @@ -96,18 +96,18 @@ public class CheckImageManager extends ComplexTestCase { assure(testObjectName + "::XImageManager.removeImages", _xImage._removeImages(), true); assure(testObjectName + "::XImageManager.replaceImages", _xImage._replaceImages(), true); assure(testObjectName + "::XImageManager.reset", _xImage._reset(), true); - + XTypeProvider xType = (XTypeProvider)UnoRuntime.queryInterface(XTypeProvider.class, xImageManager); _XTypeProvider _xType = new _XTypeProvider(log,param,xType); assure(testObjectName + "::XTypeProvider.getImplementationId", _xType._getImplementationId(), true); assure(testObjectName + "::XTypeProvider.getTypes", _xType._getTypes(), true); - + XUIConfiguration xUIConfig = (XUIConfiguration)UnoRuntime.queryInterface(XUIConfiguration.class, xImageManager); _XUIConfiguration _xUIConfig = new _XUIConfiguration(log, param, xUIConfig); _xUIConfig.before(); assure(testObjectName + "::XUIConfig.addConfigurationListener", _xUIConfig._addConfigurationListener(), true); assure(testObjectName + "::XUIConfig.removeConfigurationListener", _xUIConfig._removeConfigurationListener(), true); - + XUIConfigurationPersistence xUIConfigPersistence = (XUIConfigurationPersistence)UnoRuntime.queryInterface(XUIConfiguration.class, xImageManager); _XUIConfigurationPersistence _xUIConfigPersistence = new _XUIConfigurationPersistence(log, param, xUIConfigPersistence); _xUIConfigPersistence.before(); @@ -116,7 +116,7 @@ public class CheckImageManager extends ComplexTestCase { assure(testObjectName + "::XUIConfigPersistence.reload", _xUIConfigPersistence._reload(), true); assure(testObjectName + "::XUIConfigPersistence.store", _xUIConfigPersistence._store(), true); assure(testObjectName + "::XUIConfigPersistence.storeToStorage", _xUIConfigPersistence._storeToStorage(), true); - + XComponent xComp = (XComponent)UnoRuntime.queryInterface(XComponent.class, xImageManager); _XComponent _xComp = new _XComponent(log, param, xComp); _xComp.before(); @@ -124,42 +124,42 @@ public class CheckImageManager extends ComplexTestCase { assure(testObjectName + "::XComponent.removeEventListener", _xComp._removeEventListener(), true); assure(testObjectName + "::XComponent.dispose", _xComp._dispose(), true); } - - + + class OXUIConfigurationListenerImpl implements _XUIConfiguration.XUIConfigurationListenerImpl { private boolean triggered = false; private LogWriter log = null; private XUIConfigurationManager xUIManager = null; private XMultiServiceFactory xMSF = null; - + public OXUIConfigurationListenerImpl(LogWriter _log, XUIConfigurationManager xUIManager, XMultiServiceFactory xMSF) { log = _log; this.xUIManager = xUIManager; this.xMSF = xMSF; } - + public boolean actionWasTriggered() { return triggered; } - + public void disposing(com.sun.star.lang.EventObject eventObject) { triggered = true; } - + public void elementInserted(com.sun.star.ui.ConfigurationEvent configurationEvent) { triggered = true; } - + public void elementRemoved(com.sun.star.ui.ConfigurationEvent configurationEvent) { triggered = true; } - + public void elementReplaced(com.sun.star.ui.ConfigurationEvent configurationEvent) { triggered = true; } - + public void fireEvent() { - // remove for real action: + // remove for real action: triggered = !triggered; /* try { XIndexAccess xMenuBarSettings = xUIManager.getSettings( @@ -187,11 +187,11 @@ public class CheckImageManager extends ComplexTestCase { e.printStackTrace((java.io.PrintWriter)log); } */ } - + public void reset() { // remove comment for real function //triggered = false; } - + } } diff --git a/framework/qa/complex/imageManager/interfaces/_XComponent.java b/framework/qa/complex/imageManager/interfaces/_XComponent.java index e86743c7b52d..4e30848b28d2 100755 --- a/framework/qa/complex/imageManager/interfaces/_XComponent.java +++ b/framework/qa/complex/imageManager/interfaces/_XComponent.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/qa/complex/imageManager/interfaces/_XImageManager.java b/framework/qa/complex/imageManager/interfaces/_XImageManager.java index bc0a124cf313..ccba1464c106 100755 --- a/framework/qa/complex/imageManager/interfaces/_XImageManager.java +++ b/framework/qa/complex/imageManager/interfaces/_XImageManager.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ public class _XImageManager { this.tEnv = tEnv; this.oObj = oObj; } - + public boolean _getAllImageNames() { short s = ImageType.COLOR_NORMAL + ImageType.SIZE_DEFAULT; imageNames = oObj.getAllImageNames(s); @@ -55,7 +55,7 @@ public class _XImageManager { System.out.println("###### Image: " + imageNames[i]); return imageNames != null; } - + public boolean _getImages() { short s = ImageType.COLOR_NORMAL + ImageType.SIZE_DEFAULT; try { @@ -65,12 +65,12 @@ public class _XImageManager { } return xGraphicArray != null; } - + public boolean _hasImage() { boolean result = true; short s = ImageType.COLOR_NORMAL + ImageType.SIZE_DEFAULT; try { // check the first image names, 10 at max - for (int i=0; i<(imageNames.length>10?10:imageNames.length); i++) + for (int i=0; i<(imageNames.length>10?10:imageNames.length); i++) result &= oObj.hasImage(s, imageNames[i]); } catch(com.sun.star.lang.IllegalArgumentException e) { @@ -79,7 +79,7 @@ public class _XImageManager { } return result; } - + public boolean _insertImages() { try { oObj.insertImages((short)imageNames.length, imageNames, xGraphicArray); @@ -92,7 +92,7 @@ public class _XImageManager { } return true; } - + public boolean _removeImages() { try { oObj.removeImages((short)(imageNames.length-1), imageNames); @@ -103,11 +103,11 @@ public class _XImageManager { } return true; } - + public boolean _replaceImages() { return true; } - + public boolean _reset() { return true; } diff --git a/framework/qa/complex/imageManager/interfaces/_XInitialization.java b/framework/qa/complex/imageManager/interfaces/_XInitialization.java index 115f581f7ebc..da957331671b 100755 --- a/framework/qa/complex/imageManager/interfaces/_XInitialization.java +++ b/framework/qa/complex/imageManager/interfaces/_XInitialization.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/qa/complex/imageManager/interfaces/_XTypeProvider.java b/framework/qa/complex/imageManager/interfaces/_XTypeProvider.java index 7af00b163e60..7ea641ca63d5 100755 --- a/framework/qa/complex/imageManager/interfaces/_XTypeProvider.java +++ b/framework/qa/complex/imageManager/interfaces/_XTypeProvider.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/qa/complex/imageManager/interfaces/_XUIConfiguration.java b/framework/qa/complex/imageManager/interfaces/_XUIConfiguration.java index 1a3936bbc690..a1e9e75cabd3 100755 --- a/framework/qa/complex/imageManager/interfaces/_XUIConfiguration.java +++ b/framework/qa/complex/imageManager/interfaces/_XUIConfiguration.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/qa/complex/imageManager/interfaces/_XUIConfigurationPersistence.java b/framework/qa/complex/imageManager/interfaces/_XUIConfigurationPersistence.java index b3fb3a1e76f9..0e029deb4204 100755 --- a/framework/qa/complex/imageManager/interfaces/_XUIConfigurationPersistence.java +++ b/framework/qa/complex/imageManager/interfaces/_XUIConfigurationPersistence.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java index f65612e24701..12368c6e3a89 100644 --- a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java +++ b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,19 +72,19 @@ import java.util.Vector; <li>2. ftp</li> <li>3. http</li> </ul> - <p> + <p> The test will look for a list of files from the <i>TestDocumentPath</i> on and load these files from the mounted directory, via ftp and http. The parameters for this have to be "ftp_access" and "http_access". If they are not given, tests for ftp and http will fail. - - @todo We need a further test for accessing UNC pathes on windows! + + @todo We need a further test for accessing UNC pathes on windows! */ public class CheckXComponentLoader extends ComplexTestCase { //------------------------------------------- // some const - + /** used to classify the result of a loadComponentFromURL() request. */ private static final int RESULT_UNKNOWN = 0; private static final int RESULT_VALID_DOC = 1; @@ -93,11 +93,11 @@ public class CheckXComponentLoader extends ComplexTestCase private static final int RESULT_IOEXCEPTION = 4; private static final int RESULT_RUNTIMEEXCEPTION = 5; private static final int RESULT_EXCEPTION = 6; - + /** File/URL separators. */ private static final String fs_url = "/"; private static final String fs_sys = System.getProperty("file.separator"); - + /** used for testing password protected files. */ private static final String SUFFIX_PASSWORD_TEMPFILE = "password_"; private static final String PREFIX_PASSWORD_TEMPFILE = ".sxw"; @@ -105,25 +105,25 @@ public class CheckXComponentLoader extends ComplexTestCase //------------------------------------------- // member - - /** points to the global uno service manager. */ + + /** points to the global uno service manager. */ private XMultiServiceFactory m_xMSF = null; - + /** provides XComponentLoader interface. */ private XFrame m_xDesktop = null; - + /** provides XComponentLoader interface too. */ private XFrame m_xFrame = null; - + /** will be set to xDesktop OR xFrame. */ private XComponentLoader m_xLoader = null; - + /** can be used to open local files as stream. */ private XSimpleFileAccess m_xStreamProvider = null; /** directory for creating temp. files. */ private String m_sTempPath = null; - + /** directory for searching files to load */ private String m_sTestDocPath = null; @@ -132,13 +132,13 @@ public class CheckXComponentLoader extends ComplexTestCase //------------------------------------------- // test environment - + //------------------------------------------- /** @short A function to tell the framework, which test functions are available. - + @return All test methods. - @todo Think about selection of tests from outside ... + @todo Think about selection of tests from outside ... */ public String[] getTestMethodNames() { @@ -155,7 +155,7 @@ public class CheckXComponentLoader extends ComplexTestCase //------------------------------------------- /** @short Create the environment for following tests. - + @descr Use either a component loader from desktop or from frame */ @@ -168,7 +168,7 @@ public class CheckXComponentLoader extends ComplexTestCase try { m_xStreamProvider = (XSimpleFileAccess)UnoRuntime.queryInterface( - XSimpleFileAccess.class, + XSimpleFileAccess.class, m_xMSF.createInstance("com.sun.star.ucb.SimpleFileAccess")); } catch(java.lang.Throwable ex) @@ -176,12 +176,12 @@ public class CheckXComponentLoader extends ComplexTestCase ex.printStackTrace(); failed("Could not create a stream provider instance."); } - + // create desktop instance try { m_xDesktop = (XFrame)UnoRuntime.queryInterface( - XFrame.class, + XFrame.class, m_xMSF.createInstance("com.sun.star.frame.Desktop")); } catch(java.lang.Throwable ex) @@ -191,7 +191,7 @@ public class CheckXComponentLoader extends ComplexTestCase } // create frame instance - m_xFrame = m_xDesktop.findFrame("testFrame_componentLoader" , + m_xFrame = m_xDesktop.findFrame("testFrame_componentLoader" , FrameSearchFlag.TASKS | FrameSearchFlag.CREATE); if (m_xFrame==null) failed("Couldn't create test frame."); @@ -199,7 +199,7 @@ public class CheckXComponentLoader extends ComplexTestCase // define default loader for testing // TODO think about using of bot loader instances! m_xLoader = (XComponentLoader)UnoRuntime.queryInterface( - XComponentLoader.class, + XComponentLoader.class, m_xDesktop); if (m_xLoader==null) failed("Desktop service doesnt support needed component loader interface."); @@ -207,11 +207,11 @@ public class CheckXComponentLoader extends ComplexTestCase // get temp path for this environment m_sTempPath = (String) param.get("TempPath"); m_sTempPath = "."+fs_sys; - + // get all files from the given directory // TODO URLHelper should ignore directories! m_lTestFiles = new Vector(); - m_sTestDocPath = (String) param.get("TestDocumentPath"); + m_sTestDocPath = (String) param.get("TestDocumentPath"); try { File aBaseDir = new File(m_sTestDocPath); @@ -221,7 +221,7 @@ public class CheckXComponentLoader extends ComplexTestCase while(lList.hasMoreElements()) { File aFile = (File)lList.nextElement(); - + // ignore broken links and directories at all if ( (!aFile.exists()) || @@ -230,14 +230,14 @@ public class CheckXComponentLoader extends ComplexTestCase { continue; } - + String sCompletePath = aFile.getAbsolutePath(); String sSubPath = sCompletePath.substring(nBasePathLength + 1); - + // Some test files are checked into CVS. ignore CVS helper files! if (sSubPath.indexOf("CVS") > -1) continue; - + m_lTestFiles.add(sSubPath); } } @@ -262,7 +262,7 @@ public class CheckXComponentLoader extends ComplexTestCase } catch(com.sun.star.util.CloseVetoException exVeto) { failed("Test frame couldn't be closed successfully."); } - + m_xFrame = null; m_xLoader = null; } @@ -274,7 +274,7 @@ public class CheckXComponentLoader extends ComplexTestCase { InteractionHandler xHandler = new InteractionHandler(); StatusIndicator xIndicator = new StatusIndicator(StatusIndicator.SHOWSTATUS_LOG); - + PropertyValue[] lProps = new PropertyValue[3]; lProps[0] = new PropertyValue(); @@ -294,7 +294,7 @@ public class CheckXComponentLoader extends ComplexTestCase { File aSysFile = new File(m_sTestDocPath+fs_sys+(String)aSnapshot.nextElement()); String sURL = URLHelper.getFileURLFromSystemPath(aSysFile); - + loadURL(m_xLoader, RESULT_VALID_DOC, sURL, "_blank", 0, lProps); // Its not needed to reset this using states! @@ -315,18 +315,18 @@ public class CheckXComponentLoader extends ComplexTestCase File aDir = new File(sTempPath); if (!aDir.exists()) failed("Could not access temp directory \""+sTempPath+"\"."); - + for (int i=0; i<999999; ++i) { File aTempFile = new File(aDir, sSuffix+i+sPrefix); if (!aTempFile.exists()) return aTempFile.getAbsolutePath(); } - + failed("Seems that all temp file names are currently in use!"); return null; } - + //------------------------------------------- /** TODO document me and move this method to a more global helper! */ private void impl_createTempOfficeDocument(XComponentLoader xLoader , @@ -336,25 +336,25 @@ public class CheckXComponentLoader extends ComplexTestCase String sPassword ) { PropertyValue[] lLoadProps = new PropertyValue[1]; - + lLoadProps[0] = new PropertyValue(); lLoadProps[0].Name = "Hidden"; lLoadProps[0].Value = Boolean.TRUE; PropertyValue[] lSaveProps = new PropertyValue[3]; - + lSaveProps[0] = new PropertyValue(); lSaveProps[0].Name = "FilterName"; lSaveProps[0].Value = sFilter; - + lSaveProps[1] = new PropertyValue(); lSaveProps[1].Name = "PassWord"; lSaveProps[1].Value = sPassword; - + lSaveProps[2] = new PropertyValue(); lSaveProps[2].Name = "Overwrite"; lSaveProps[2].Value = Boolean.TRUE; - + XComponent xDoc = null; try { @@ -368,12 +368,12 @@ public class CheckXComponentLoader extends ComplexTestCase XStorable.class, xDoc); xStore.storeAsURL(sTargetURL, lSaveProps); - + // Dont forget to close this file. Otherwise the temp file is locked! XCloseable xClose = (XCloseable)UnoRuntime.queryInterface( XCloseable.class, xDoc); - xClose.close(false); + xClose.close(false); } catch(java.lang.Throwable ex) { @@ -381,10 +381,10 @@ public class CheckXComponentLoader extends ComplexTestCase failed("Could not create temp office document."); } } - + //------------------------------------------- /** @short Check the password handling. - + @descr The used password is the one given as password for the ftp connection, or - if none given a default one. @@ -398,17 +398,17 @@ public class CheckXComponentLoader extends ComplexTestCase impl_createTempOfficeDocument(m_xLoader, "private:factory/swriter", sTestURL, "StarOffice XML (Writer)", DEFAULT_PASSWORD); PropertyValue[] lArgs1 = new PropertyValue[2]; - + lArgs1[0] = new PropertyValue(); lArgs1[0].Name = "Hidden"; lArgs1[0].Value = Boolean.TRUE; - + lArgs1[1] = new PropertyValue(); lArgs1[1].Name = "Password"; lArgs1[1].Value = DEFAULT_PASSWORD; - + PropertyValue[] lArgs2 = new PropertyValue[1]; - + lArgs2[0] = new PropertyValue(); lArgs2[0].Name = "Hidden"; lArgs2[0].Value = Boolean.TRUE; @@ -445,7 +445,7 @@ public class CheckXComponentLoader extends ComplexTestCase byte[] baURL = null; while (aSnapshot.hasMoreElements()) { - File aFile = new File(m_sTestDocPath + fs_sys + + File aFile = new File(m_sTestDocPath + fs_sys + aSnapshot.nextElement()); String sFile = URLHelper.getFileURLFromSystemPath(aFile); @@ -480,15 +480,15 @@ public class CheckXComponentLoader extends ComplexTestCase log.println("ENC[" + sEncoding[i] + "]"); if (sEncoding[i + 1].equals("TRUE")) { - loadURL(m_xLoader, RESULT_VALID_DOC, encURL, "_blank", 0, + loadURL(m_xLoader, RESULT_VALID_DOC, encURL, "_blank", 0, lProps); } else { //with cws_loadenv01 changed to IllegalArgumentException - loadURL(m_xLoader, RESULT_ILLEGALARGUMENTEXCEPTION, encURL, "_blank", 0, + loadURL(m_xLoader, RESULT_ILLEGALARGUMENTEXCEPTION, encURL, "_blank", 0, lProps); } } catch (java.io.UnsupportedEncodingException e) { - failed("Unsopported Encoding: " + sEncoding[i] + + failed("Unsopported Encoding: " + sEncoding[i] + "\n Not able to test encoding on this platform.", true); } } @@ -512,57 +512,57 @@ public class CheckXComponentLoader extends ComplexTestCase log.println("check possible but unsupported URLs"); String[] sIllegalArgs = new String[] { - "slot:5000", "slot:10909", ".uno:SaveAs", ".uno:Open", + "slot:5000", "slot:10909", ".uno:SaveAs", ".uno:Open", }; - loadURL(m_xLoader, RESULT_ILLEGALARGUMENTEXCEPTION, sIllegalArgs, + loadURL(m_xLoader, RESULT_ILLEGALARGUMENTEXCEPTION, sIllegalArgs, "_blank", 0, lProps); log.println("check stupid URLs"); sIllegalArgs = new String[] { - "slot:xxx", "slot:111111111", ".uno:save_as", ".uno:open_this", - ".UnO:*", + "slot:xxx", "slot:111111111", ".uno:save_as", ".uno:open_this", + ".UnO:*", }; - loadURL(m_xLoader, RESULT_ILLEGALARGUMENTEXCEPTION, sIllegalArgs, + loadURL(m_xLoader, RESULT_ILLEGALARGUMENTEXCEPTION, sIllegalArgs, "_blank", 0, lProps); String[] sEmptyDocs = new String[] { - "mailo:hansi.meier@germany.sun.com", "file:/c:\\test/file.cxx", - "file:///c|:\\test/file.cxx", "http_server://staroffice-doc\\", - "c:\\\\test///\\test.sxw", "news_:staroffice-doc", - "newsletter@blubber", "private_factory/swriter", - "private:factory//swriter", "private:factory/swriter/___", - "c:\\test\\test.sxw", "macro:///ImportWizard.Main.Main", - "macro:///Euro.AutoPilotRun.StartAutoPilot", - "service:com.sun.star.frame.Frame", - "mailto:steffen.grund@germany.sun.com", "news:staroffice-doc", - "macro:/ExportWizard", "macro://Euro.AutoPilotRun.StartAutoPilot", + "mailo:hansi.meier@germany.sun.com", "file:/c:\\test/file.cxx", + "file:///c|:\\test/file.cxx", "http_server://staroffice-doc\\", + "c:\\\\test///\\test.sxw", "news_:staroffice-doc", + "newsletter@blubber", "private_factory/swriter", + "private:factory//swriter", "private:factory/swriter/___", + "c:\\test\\test.sxw", "macro:///ImportWizard.Main.Main", + "macro:///Euro.AutoPilotRun.StartAutoPilot", + "service:com.sun.star.frame.Frame", + "mailto:steffen.grund@germany.sun.com", "news:staroffice-doc", + "macro:/ExportWizard", "macro://Euro.AutoPilotRun.StartAutoPilot", "service:com.sun.star.frame." }; - + //with cws_loadenv01 changed to IllegalArgumentException - loadURL(m_xLoader, RESULT_ILLEGALARGUMENTEXCEPTION, sEmptyDocs, "_blank", 0, + loadURL(m_xLoader, RESULT_ILLEGALARGUMENTEXCEPTION, sEmptyDocs, "_blank", 0, lProps); log.println("check case senstive URLs"); sIllegalArgs = new String[] { - "sLot:5000", "sloT:10909", ".unO:SaveAs", ".uno:OPEN", + "sLot:5000", "sloT:10909", ".unO:SaveAs", ".uno:OPEN", }; - loadURL(m_xLoader, RESULT_ILLEGALARGUMENTEXCEPTION, sIllegalArgs, + loadURL(m_xLoader, RESULT_ILLEGALARGUMENTEXCEPTION, sIllegalArgs, "_blank", 0, lProps); sEmptyDocs = new String[] { - "private:factory/SWRITER", "private:factory/SWRITER/WEB", - "macro:///importwizard.main.main", - "Macro:///euro.autopilotrun.startautopilot", - "Service:Com.Sun.Star.Frame.Frame", - "Mailto:andreas.schluens@germany.sun.com", "neWs:staroffice-doc", + "private:factory/SWRITER", "private:factory/SWRITER/WEB", + "macro:///importwizard.main.main", + "Macro:///euro.autopilotrun.startautopilot", + "Service:Com.Sun.Star.Frame.Frame", + "Mailto:andreas.schluens@germany.sun.com", "neWs:staroffice-doc", "News:Staroffice-doc" }; - + //with cws_loadenv01 changed to IllegalArgumentException - loadURL(m_xLoader, RESULT_ILLEGALARGUMENTEXCEPTION, sEmptyDocs, "_blank", 0, + loadURL(m_xLoader, RESULT_ILLEGALARGUMENTEXCEPTION, sEmptyDocs, "_blank", 0, lProps); log.println("check FTP URLs"); @@ -577,7 +577,7 @@ public class CheckXComponentLoader extends ComplexTestCase // if os is windows doc = doc.replace('\\', '/'); if (doc.indexOf("CVS")<0) { - loadURL(m_xLoader, RESULT_VALID_DOC, sFTPURL + "/" + doc, + loadURL(m_xLoader, RESULT_VALID_DOC, sFTPURL + "/" + doc, "_blank", 0, lProps); } } @@ -593,8 +593,8 @@ public class CheckXComponentLoader extends ComplexTestCase // if os is windows doc = doc.replace('\\', '/'); - if (doc.indexOf("CVS")<0) { - loadURL(m_xLoader, RESULT_VALID_DOC, sHTTPURL + "/" + doc, + if (doc.indexOf("CVS")<0) { + loadURL(m_xLoader, RESULT_VALID_DOC, sHTTPURL + "/" + doc, "_blank", 0, lProps); } } @@ -609,7 +609,7 @@ public class CheckXComponentLoader extends ComplexTestCase lProps[0] = new PropertyValue(); lProps[0].Name = "Hidden"; lProps[0].Value = Boolean.TRUE; - + lProps[1] = new PropertyValue(); lProps[1].Name = "InputStream"; @@ -618,10 +618,10 @@ public class CheckXComponentLoader extends ComplexTestCase { File aFile = new File(m_sTestDocPath + fs_sys + (String) aSnapshot.nextElement()); String sURL = URLHelper.getFileURLFromSystemPath(aFile); - + if (sURL.indexOf("CVS") > -1) continue; - + try { XInputStream xStream = m_xStreamProvider.openFileRead(sURL); @@ -629,13 +629,13 @@ public class CheckXComponentLoader extends ComplexTestCase } catch(com.sun.star.uno.Exception e) { failed("Could not open test file \""+sURL+"\" for stream test."); } - - // check different version of "private:stream" URL! + + // check different version of "private:stream" URL! loadURL(m_xLoader, RESULT_VALID_DOC, "private:stream" , "_blank", 0, lProps); loadURL(m_xLoader, RESULT_VALID_DOC, "private:stream/", "_blank", 0, lProps); } } - + /** * Loads one URL with the given parameters using the method * loadComponentFromURL(). Further it's possible to specify, whch result is @@ -644,14 +644,14 @@ public class CheckXComponentLoader extends ComplexTestCase * all possible exceptions and try to leave the office without any forgotten * but opened documents. */ - private void loadURL(XComponentLoader m_xLoader, int nRequiredResult, - String sURL, String sTarget, int nFlags, + private void loadURL(XComponentLoader m_xLoader, int nRequiredResult, + String sURL, String sTarget, int nFlags, PropertyValue[] lProps) { int nResult = RESULT_EMPTY_DOC; XComponent xDoc = null; try { - xDoc = m_xLoader.loadComponentFromURL(sURL, sTarget, nFlags, + xDoc = m_xLoader.loadComponentFromURL(sURL, sTarget, nFlags, lProps); if (xDoc != null) { @@ -677,30 +677,30 @@ public class CheckXComponentLoader extends ComplexTestCase xDoc = null; } } catch (com.sun.star.uno.RuntimeException exClosing) { - log.println("exception during disposing of a document found!" + + log.println("exception during disposing of a document found!" + " Doesn't influence test - but should be checked."); } String sMessage = "URL[\"" + sURL + "\"]"; if (nResult == nRequiredResult) { - log.println(sMessage + " expected result [" + + log.println(sMessage + " expected result [" + convertResult2String(nResult) + "] "); } else { - failed(sMessage + " unexpected result [" + - convertResult2String(nResult) + "] " + - "\nrequired was [" + - convertResult2String(nRequiredResult) + "]" + - "\nwe got [" + convertResult2String(nResult) + "]", + failed(sMessage + " unexpected result [" + + convertResult2String(nResult) + "] " + + "\nrequired was [" + + convertResult2String(nRequiredResult) + "]" + + "\nwe got [" + convertResult2String(nResult) + "]", true); } } - private void loadURL(XComponentLoader m_xLoader, int nRequiredResult, - String[] sURL, String sTarget, int nFlags, + private void loadURL(XComponentLoader m_xLoader, int nRequiredResult, + String[] sURL, String sTarget, int nFlags, PropertyValue[] lProps) { for (int i = 0; i < sURL.length; i++) - loadURL(m_xLoader, nRequiredResult, sURL[i], sTarget, nFlags, + loadURL(m_xLoader, nRequiredResult, sURL[i], sTarget, nFlags, lProps); } diff --git a/framework/qa/complex/loadAllDocuments/helper/InteractionHandler.java b/framework/qa/complex/loadAllDocuments/helper/InteractionHandler.java index f018912a2bd7..ff4bf87c4f23 100644 --- a/framework/qa/complex/loadAllDocuments/helper/InteractionHandler.java +++ b/framework/qa/complex/loadAllDocuments/helper/InteractionHandler.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/qa/complex/loadAllDocuments/helper/StatusIndicator.java b/framework/qa/complex/loadAllDocuments/helper/StatusIndicator.java index 4320462835ea..61f6d9fc525c 100644 --- a/framework/qa/complex/loadAllDocuments/helper/StatusIndicator.java +++ b/framework/qa/complex/loadAllDocuments/helper/StatusIndicator.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -230,7 +230,7 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator // not supported yet! } */ } - + public boolean wasUsed() { return m_bWasUsed; } diff --git a/framework/qa/complex/loadAllDocuments/helper/StreamSimulator.java b/framework/qa/complex/loadAllDocuments/helper/StreamSimulator.java index 99c12fa90bea..2f09044960ad 100644 --- a/framework/qa/complex/loadAllDocuments/helper/StreamSimulator.java +++ b/framework/qa/complex/loadAllDocuments/helper/StreamSimulator.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -177,15 +177,15 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { nRead = m_xInStream.readSomeBytes(lData,nMaxBytesToRead); } - catch (com.sun.star.io.NotConnectedException exConnect) { + catch (com.sun.star.io.NotConnectedException exConnect) { } - catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { + catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { } - catch (com.sun.star.io.IOException exIO ) { + catch (com.sun.star.io.IOException exIO ) { } - catch (com.sun.star.uno.RuntimeException exRuntime) { + catch (com.sun.star.uno.RuntimeException exRuntime) { } - catch (com.sun.star.uno.Exception exUno ) { + catch (com.sun.star.uno.Exception exUno ) { } return nRead; @@ -193,7 +193,7 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , //_________________________________ - public void skipBytes(int nBytesToSkip) + public void skipBytes(int nBytesToSkip) throws com.sun.star.io.NotConnectedException, com.sun.star.io.BufferSizeExceededException , com.sun.star.io.IOException @@ -209,15 +209,15 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { m_xInStream.skipBytes(nBytesToSkip); } - catch (com.sun.star.io.NotConnectedException exConnect) { + catch (com.sun.star.io.NotConnectedException exConnect) { } - catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { + catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { } - catch (com.sun.star.io.IOException exIO ) { + catch (com.sun.star.io.IOException exIO ) { } - catch (com.sun.star.uno.RuntimeException exRuntime) { + catch (com.sun.star.uno.RuntimeException exRuntime) { } - catch (com.sun.star.uno.Exception exUno ) { + catch (com.sun.star.uno.Exception exUno ) { } } @@ -237,13 +237,13 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { nAvailable = m_xInStream.available(); } - catch (com.sun.star.io.NotConnectedException exConnect) { + catch (com.sun.star.io.NotConnectedException exConnect) { } - catch (com.sun.star.io.IOException exIO ) { + catch (com.sun.star.io.IOException exIO ) { } - catch (com.sun.star.uno.RuntimeException exRuntime) { + catch (com.sun.star.uno.RuntimeException exRuntime) { } - catch (com.sun.star.uno.Exception exUno ) { + catch (com.sun.star.uno.Exception exUno ) { } return nAvailable; @@ -265,13 +265,13 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { m_xInStream.closeInput(); } - catch (com.sun.star.io.NotConnectedException exConnect) { + catch (com.sun.star.io.NotConnectedException exConnect) { } - catch (com.sun.star.io.IOException exIO ) { + catch (com.sun.star.io.IOException exIO ) { } - catch (com.sun.star.uno.RuntimeException exRuntime) { + catch (com.sun.star.uno.RuntimeException exRuntime) { } - catch (com.sun.star.uno.Exception exUno ) { + catch (com.sun.star.uno.Exception exUno ) { } } @@ -282,7 +282,7 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , * and try to map all neccessary functions to the internal * open out-stream. */ - public void writeBytes(byte[] lData) + public void writeBytes(byte[] lData) throws com.sun.star.io.NotConnectedException, com.sun.star.io.BufferSizeExceededException , com.sun.star.io.IOException @@ -298,15 +298,15 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { m_xOutStream.writeBytes(lData); } - catch (com.sun.star.io.NotConnectedException exConnect) { + catch (com.sun.star.io.NotConnectedException exConnect) { } - catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { + catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { } - catch (com.sun.star.io.IOException exIO ) { + catch (com.sun.star.io.IOException exIO ) { } - catch (com.sun.star.uno.RuntimeException exRuntime) { + catch (com.sun.star.uno.RuntimeException exRuntime) { } - catch (com.sun.star.uno.Exception exUno ) { + catch (com.sun.star.uno.Exception exUno ) { } } @@ -328,15 +328,15 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { m_xOutStream.flush(); } - catch (com.sun.star.io.NotConnectedException exConnect) { + catch (com.sun.star.io.NotConnectedException exConnect) { } - catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { + catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { } - catch (com.sun.star.io.IOException exIO ) { + catch (com.sun.star.io.IOException exIO ) { } - catch (com.sun.star.uno.RuntimeException exRuntime) { + catch (com.sun.star.uno.RuntimeException exRuntime) { } - catch (com.sun.star.uno.Exception exUno ) { + catch (com.sun.star.uno.Exception exUno ) { } } @@ -357,15 +357,15 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { m_xOutStream.closeOutput(); } - catch (com.sun.star.io.NotConnectedException exConnect) { + catch (com.sun.star.io.NotConnectedException exConnect) { } - catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { + catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { } - catch (com.sun.star.io.IOException exIO ) { + catch (com.sun.star.io.IOException exIO ) { } - catch (com.sun.star.uno.RuntimeException exRuntime) { + catch (com.sun.star.uno.RuntimeException exRuntime) { } - catch (com.sun.star.uno.Exception exUno ) { + catch (com.sun.star.uno.Exception exUno ) { } } @@ -376,7 +376,7 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , * and try to map all neccessary functions to the internal * open stream. */ - public void seek(long nLocation ) + public void seek(long nLocation ) throws com.sun.star.lang.IllegalArgumentException, com.sun.star.io.IOException { @@ -462,11 +462,11 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { nLen = m_xSeek.getLength(); } - catch (com.sun.star.io.IOException exIO ) { + catch (com.sun.star.io.IOException exIO ) { } - catch (com.sun.star.uno.RuntimeException exRuntime) { + catch (com.sun.star.uno.RuntimeException exRuntime) { } - catch (com.sun.star.uno.Exception exUno ) { + catch (com.sun.star.uno.Exception exUno ) { } return nLen; diff --git a/framework/qa/complex/path_settings/PathSettingsTest.java b/framework/qa/complex/path_settings/PathSettingsTest.java index b264bbd558c6..cc896a74ea16 100755 --- a/framework/qa/complex/path_settings/PathSettingsTest.java +++ b/framework/qa/complex/path_settings/PathSettingsTest.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/qa/complex/path_substitution/PathSubstitutionTest.java b/framework/qa/complex/path_substitution/PathSubstitutionTest.java index 88877d8c7699..27fe6410eca0 100755 --- a/framework/qa/complex/path_substitution/PathSubstitutionTest.java +++ b/framework/qa/complex/path_substitution/PathSubstitutionTest.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/qa/complex/sequence/CheckSequenceOfEnum.java b/framework/qa/complex/sequence/CheckSequenceOfEnum.java index 90399c5030e9..a09703398f8c 100755 --- a/framework/qa/complex/sequence/CheckSequenceOfEnum.java +++ b/framework/qa/complex/sequence/CheckSequenceOfEnum.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/source/accelerators/acceleratorcache.cxx b/framework/source/accelerators/acceleratorcache.cxx index d6e596d6a409..96a266818d31 100644 --- a/framework/source/accelerators/acceleratorcache.cxx +++ b/framework/source/accelerators/acceleratorcache.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,13 +56,13 @@ namespace framework { -//----------------------------------------------- +//----------------------------------------------- AcceleratorCache::AcceleratorCache() : ThreadHelpBase(&Application::GetSolarMutex()) { } -//----------------------------------------------- +//----------------------------------------------- AcceleratorCache::AcceleratorCache(const AcceleratorCache& rCopy) : ThreadHelpBase(&Application::GetSolarMutex()) { @@ -70,62 +70,62 @@ AcceleratorCache::AcceleratorCache(const AcceleratorCache& rCopy) m_lKey2Commands = rCopy.m_lKey2Commands; } -//----------------------------------------------- +//----------------------------------------------- AcceleratorCache::~AcceleratorCache() { // Dont save anything automaticly here. // The user has to do that explicitly! } -//----------------------------------------------- +//----------------------------------------------- void AcceleratorCache::takeOver(const AcceleratorCache& rCopy) { // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); - + m_lCommand2Keys = rCopy.m_lCommand2Keys; m_lKey2Commands = rCopy.m_lKey2Commands; - + aWriteLock.unlock(); // <- SAFE ---------------------------------- } -//----------------------------------------------- +//----------------------------------------------- AcceleratorCache& AcceleratorCache::operator=(const AcceleratorCache& rCopy) { takeOver(rCopy); return *this; } -//----------------------------------------------- +//----------------------------------------------- sal_Bool AcceleratorCache::hasKey(const css::awt::KeyEvent& aKey) const { // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); - + return (m_lKey2Commands.find(aKey) != m_lKey2Commands.end()); // <- SAFE ---------------------------------- } -//----------------------------------------------- +//----------------------------------------------- sal_Bool AcceleratorCache::hasCommand(const ::rtl::OUString& sCommand) const { // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); - + return (m_lCommand2Keys.find(sCommand) != m_lCommand2Keys.end()); // <- SAFE ---------------------------------- } -//----------------------------------------------- +//----------------------------------------------- AcceleratorCache::TKeyList AcceleratorCache::getAllKeys() const { TKeyList lKeys; - + // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); lKeys.reserve(m_lKey2Commands.size()); - + TKey2Commands::const_iterator pIt; TKey2Commands::const_iterator pEnd = m_lKey2Commands.end(); for ( pIt = m_lKey2Commands.begin(); @@ -134,14 +134,14 @@ AcceleratorCache::TKeyList AcceleratorCache::getAllKeys() const { lKeys.push_back(pIt->first); } - + aReadLock.unlock(); // <- SAFE ---------------------------------- - + return lKeys; } -//----------------------------------------------- +//----------------------------------------------- void AcceleratorCache::setKeyCommandPair(const css::awt::KeyEvent& aKey , const ::rtl::OUString& sCommand) { @@ -149,62 +149,62 @@ void AcceleratorCache::setKeyCommandPair(const css::awt::KeyEvent& aKey , WriteGuard aWriteLock(m_aLock); // register command for the specified key - m_lKey2Commands[aKey] = sCommand; + m_lKey2Commands[aKey] = sCommand; // update optimized structure to bind multiple keys to one command - TKeyList& rKeyList = m_lCommand2Keys[sCommand]; + TKeyList& rKeyList = m_lCommand2Keys[sCommand]; rKeyList.push_back(aKey); - + aWriteLock.unlock(); // <- SAFE ---------------------------------- } -//----------------------------------------------- +//----------------------------------------------- AcceleratorCache::TKeyList AcceleratorCache::getKeysByCommand(const ::rtl::OUString& sCommand) const { TKeyList lKeys; - + // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); - + TCommand2Keys::const_iterator pCommand = m_lCommand2Keys.find(sCommand); if (pCommand == m_lCommand2Keys.end()) throw css::container::NoSuchElementException( - ::rtl::OUString(), css::uno::Reference< css::uno::XInterface >()); - lKeys = pCommand->second; - + ::rtl::OUString(), css::uno::Reference< css::uno::XInterface >()); + lKeys = pCommand->second; + aReadLock.unlock(); // <- SAFE ---------------------------------- - + return lKeys; } -//----------------------------------------------- +//----------------------------------------------- ::rtl::OUString AcceleratorCache::getCommandByKey(const css::awt::KeyEvent& aKey) const { ::rtl::OUString sCommand; - + // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); - + TKey2Commands::const_iterator pKey = m_lKey2Commands.find(aKey); if (pKey == m_lKey2Commands.end()) throw css::container::NoSuchElementException( - ::rtl::OUString(), css::uno::Reference< css::uno::XInterface >()); + ::rtl::OUString(), css::uno::Reference< css::uno::XInterface >()); sCommand = pKey->second; - + aReadLock.unlock(); // <- SAFE ---------------------------------- - + return sCommand; } -//----------------------------------------------- +//----------------------------------------------- void AcceleratorCache::removeKey(const css::awt::KeyEvent& aKey) { // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); - + // check if key exists TKey2Commands::const_iterator pKey = m_lKey2Commands.find(aKey); if (pKey == m_lKey2Commands.end()) @@ -212,26 +212,26 @@ void AcceleratorCache::removeKey(const css::awt::KeyEvent& aKey) // get its registered command // Because we must know its place inside the optimized - // structure, which bind keys to commands, too! + // structure, which bind keys to commands, too! ::rtl::OUString sCommand = pKey->second; - pKey = m_lKey2Commands.end(); // nobody should use an undefined value .-) + pKey = m_lKey2Commands.end(); // nobody should use an undefined value .-) // remove key from primary list m_lKey2Commands.erase(aKey); - + // remove key from optimized command list m_lCommand2Keys.erase(sCommand); - + aWriteLock.unlock(); // <- SAFE ---------------------------------- } -//----------------------------------------------- +//----------------------------------------------- void AcceleratorCache::removeCommand(const ::rtl::OUString& sCommand) { // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); - + const TKeyList& lKeys = getKeysByCommand(sCommand); AcceleratorCache::TKeyList::const_iterator pKey ; for ( pKey = lKeys.begin(); @@ -242,9 +242,9 @@ void AcceleratorCache::removeCommand(const ::rtl::OUString& sCommand) removeKey(rKey); } m_lCommand2Keys.erase(sCommand); - + aWriteLock.unlock(); // <- SAFE ---------------------------------- } - + } // namespace framework diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx index 88a941294ae0..43772f5c4273 100644 --- a/framework/source/accelerators/acceleratorconfiguration.cxx +++ b/framework/source/accelerators/acceleratorconfiguration.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -114,7 +114,7 @@ namespace framework { const sal_Int32 nBeginIndex = 4; // "KEY_" is the prefix of a identifier... ::rtl::OUStringBuffer sKeyBuffer((_rKeyMapping->mapCodeToIdentifier(aKeyEvent.KeyCode)).copy(nBeginIndex)); - + if ( (aKeyEvent.Modifiers & css::awt::KeyModifier::SHIFT) == css::awt::KeyModifier::SHIFT ) sKeyBuffer.appendAscii("_SHIFT"); if ( (aKeyEvent.Modifiers & css::awt::KeyModifier::MOD1 ) == css::awt::KeyModifier::MOD1 ) @@ -127,8 +127,8 @@ namespace framework return sKeyBuffer.makeStringAndClear(); } -//----------------------------------------------- -// XInterface, XTypeProvider +//----------------------------------------------- +// XInterface, XTypeProvider DEFINE_XINTERFACE_6(XMLBasedAcceleratorConfiguration , OWeakObject , DIRECT_INTERFACE(css::lang::XTypeProvider ), @@ -139,14 +139,14 @@ DEFINE_XINTERFACE_6(XMLBasedAcceleratorConfiguration , DIRECT_INTERFACE(css::ui::XUIConfiguration )) DEFINE_XTYPEPROVIDER_6(XMLBasedAcceleratorConfiguration , - css::lang::XTypeProvider , + css::lang::XTypeProvider , css::ui::XAcceleratorConfiguration , css::form::XReset , css::ui::XUIConfigurationPersistence, css::ui::XUIConfigurationStorage , css::ui::XUIConfiguration ) - -//----------------------------------------------- + +//----------------------------------------------- XMLBasedAcceleratorConfiguration::XMLBasedAcceleratorConfiguration(const css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR) : ThreadHelpBase (&Application::GetSolarMutex()) , m_xSMGR (xSMGR ) @@ -155,45 +155,45 @@ XMLBasedAcceleratorConfiguration::XMLBasedAcceleratorConfiguration(const css::un { } -//----------------------------------------------- +//----------------------------------------------- XMLBasedAcceleratorConfiguration::~XMLBasedAcceleratorConfiguration() { LOG_ASSERT(!m_pWriteCache, "XMLBasedAcceleratorConfiguration::~XMLBasedAcceleratorConfiguration()\nChanges not flushed. Ignore it ...") } -//----------------------------------------------- +//----------------------------------------------- css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfiguration::getAllKeyEvents() throw(css::uno::RuntimeException) { // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); - + AcceleratorCache& rCache = impl_getCFG(); AcceleratorCache::TKeyList lKeys = rCache.getAllKeys(); return lKeys.getAsConstList(); - + // <- SAFE ---------------------------------- } -//----------------------------------------------- +//----------------------------------------------- ::rtl::OUString SAL_CALL XMLBasedAcceleratorConfiguration::getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent) throw(css::container::NoSuchElementException, css::uno::RuntimeException ) { // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); - + AcceleratorCache& rCache = impl_getCFG(); if (!rCache.hasKey(aKeyEvent)) throw css::container::NoSuchElementException( ::rtl::OUString(), static_cast< ::cppu::OWeakObject* >(this)); return rCache.getCommandByKey(aKeyEvent); - + // <- SAFE ---------------------------------- } -//----------------------------------------------- +//----------------------------------------------- void SAL_CALL XMLBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyEvent& aKeyEvent, const ::rtl::OUString& sCommand ) throw(css::lang::IllegalArgumentException, @@ -226,7 +226,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyE // <- SAFE ---------------------------------- } -//----------------------------------------------- +//----------------------------------------------- void SAL_CALL XMLBasedAcceleratorConfiguration::removeKeyEvent(const css::awt::KeyEvent& aKeyEvent) throw(css::container::NoSuchElementException, css::uno::RuntimeException ) @@ -239,12 +239,12 @@ throw(css::container::NoSuchElementException, throw css::container::NoSuchElementException( ::rtl::OUString(), static_cast< ::cppu::OWeakObject* >(this)); - rCache.removeKey(aKeyEvent); + rCache.removeKey(aKeyEvent); // <- SAFE ---------------------------------- } -//----------------------------------------------- +//----------------------------------------------- css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfiguration::getKeyEventsByCommand(const ::rtl::OUString& sCommand) throw(css::lang::IllegalArgumentException , css::container::NoSuchElementException, @@ -255,35 +255,35 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfigurati ::rtl::OUString::createFromAscii("Empty command strings are not allowed here."), static_cast< ::cppu::OWeakObject* >(this), 1); - + // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); - + AcceleratorCache& rCache = impl_getCFG(); if (!rCache.hasCommand(sCommand)) throw css::container::NoSuchElementException( ::rtl::OUString(), static_cast< ::cppu::OWeakObject* >(this)); - + AcceleratorCache::TKeyList lKeys = rCache.getKeysByCommand(sCommand); return lKeys.getAsConstList(); - + // <- SAFE ---------------------------------- } -//----------------------------------------------- +//----------------------------------------------- css::uno::Sequence< css::uno::Any > SAL_CALL XMLBasedAcceleratorConfiguration::getPreferredKeyEventsForCommandList(const css::uno::Sequence< ::rtl::OUString >& lCommandList) throw(css::lang::IllegalArgumentException , css::uno::RuntimeException ) { // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); - + sal_Int32 i = 0; - sal_Int32 c = lCommandList.getLength(); + sal_Int32 c = lCommandList.getLength(); css::uno::Sequence< css::uno::Any > lPreferredOnes (c); // dont pack list! AcceleratorCache& rCache = impl_getCFG(); - + for (i=0; i<c; ++i) { const ::rtl::OUString& rCommand = lCommandList[i]; @@ -292,25 +292,25 @@ css::uno::Sequence< css::uno::Any > SAL_CALL XMLBasedAcceleratorConfiguration::g ::rtl::OUString::createFromAscii("Empty command strings are not allowed here."), static_cast< ::cppu::OWeakObject* >(this), (sal_Int16)i); - + if (!rCache.hasCommand(rCommand)) continue; - + AcceleratorCache::TKeyList lKeys = rCache.getKeysByCommand(rCommand); if ( lKeys.empty() ) continue; - + css::uno::Any& rAny = lPreferredOnes[i]; - rAny <<= *(lKeys.begin()); + rAny <<= *(lKeys.begin()); } - + aReadLock.unlock(); // <- SAFE ---------------------------------- - + return lPreferredOnes; } -//----------------------------------------------- +//----------------------------------------------- void SAL_CALL XMLBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(const ::rtl::OUString& sCommand) throw(css::lang::IllegalArgumentException , css::container::NoSuchElementException, @@ -321,22 +321,22 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co ::rtl::OUString::createFromAscii("Empty command strings are not allowed here."), static_cast< ::cppu::OWeakObject* >(this), 0); - + // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); - + AcceleratorCache& rCache = impl_getCFG(sal_True); // TRUE => force getting of a writeable cache! if (!rCache.hasCommand(sCommand)) throw css::container::NoSuchElementException( ::rtl::OUString::createFromAscii("Command does not exists inside this container."), static_cast< ::cppu::OWeakObject* >(this)); - rCache.removeCommand(sCommand); - + rCache.removeCommand(sCommand); + aWriteLock.unlock(); // <- SAFE ---------------------------------- } -//----------------------------------------------- +//----------------------------------------------- void SAL_CALL XMLBasedAcceleratorConfiguration::reload() throw(css::uno::Exception , css::uno::RuntimeException) @@ -351,13 +351,13 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::reload() xStreamNoLang = m_aPresetHandler.openPreset(PresetHandler::PRESET_DEFAULT(), sal_True); } catch(const css::io::IOException&) {} // does not have to exist - aReadLock.unlock(); + aReadLock.unlock(); // <- SAFE ---------------------------------- css::uno::Reference< css::io::XInputStream > xIn; if (xStream.is()) xIn = xStream->getInputStream(); - if (!xIn.is()) + if (!xIn.is()) throw css::io::IOException( ::rtl::OUString::createFromAscii("Could not open accelerator configuration for reading."), static_cast< ::cppu::OWeakObject* >(this)); @@ -366,10 +366,10 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::reload() // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); m_aReadCache = AcceleratorCache(); - aWriteLock.unlock(); + aWriteLock.unlock(); // <- SAFE ---------------------------------- - impl_ts_load(xIn); + impl_ts_load(xIn); // Load also the general language independent default accelerators // (ignoring the already defined accelerators) @@ -380,8 +380,8 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::reload() impl_ts_load(xIn); } } - -//----------------------------------------------- + +//----------------------------------------------- void SAL_CALL XMLBasedAcceleratorConfiguration::store() throw(css::uno::Exception , css::uno::RuntimeException) @@ -389,14 +389,14 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::store() // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); css::uno::Reference< css::io::XStream > xStream = m_aPresetHandler.openTarget(PresetHandler::TARGET_CURRENT(), sal_True); // TRUE => open or create! - aReadLock.unlock(); + aReadLock.unlock(); // <- SAFE ---------------------------------- css::uno::Reference< css::io::XOutputStream > xOut; if (xStream.is()) xOut = xStream->getOutputStream(); - if (!xOut.is()) + if (!xOut.is()) throw css::io::IOException( ::rtl::OUString::createFromAscii("Could not open accelerator configuration for saving."), static_cast< ::cppu::OWeakObject* >(this)); @@ -408,8 +408,8 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::store() m_aPresetHandler.commitUserChanges(); } - -//----------------------------------------------- + +//----------------------------------------------- void SAL_CALL XMLBasedAcceleratorConfiguration::storeToStorage(const css::uno::Reference< css::embed::XStorage >& xStorage) throw(css::uno::Exception , css::uno::RuntimeException) @@ -422,18 +422,18 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::storeToStorage(const css::uno::R css::uno::Reference< css::io::XOutputStream > xOut; if (xStream.is()) xOut = xStream->getOutputStream(); - - if (!xOut.is()) + + if (!xOut.is()) throw css::io::IOException( ::rtl::OUString::createFromAscii("Could not open accelerator configuration for saving."), static_cast< ::cppu::OWeakObject* >(this)); - + impl_ts_save(xOut); - + // TODO inform listener about success, so it can flush the root and sub storage of this stream! } - -//----------------------------------------------- + +//----------------------------------------------- ::sal_Bool SAL_CALL XMLBasedAcceleratorConfiguration::isModified() throw(css::uno::RuntimeException) { @@ -442,8 +442,8 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::storeToStorage(const css::uno::R return (m_pWriteCache != 0); // <- SAFE ---------------------------------- } - -//----------------------------------------------- + +//----------------------------------------------- ::sal_Bool SAL_CALL XMLBasedAcceleratorConfiguration::isReadOnly() throw(css::uno::RuntimeException) { @@ -456,39 +456,39 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::storeToStorage(const css::uno::R css::uno::Reference< css::io::XOutputStream > xOut; if (xStream.is()) xOut = xStream->getOutputStream(); - return !(xOut.is()); + return !(xOut.is()); } - -//----------------------------------------------- + +//----------------------------------------------- void SAL_CALL XMLBasedAcceleratorConfiguration::setStorage(const css::uno::Reference< css::embed::XStorage >& /*xStorage*/) throw(css::uno::RuntimeException) { LOG_WARNING("XMLBasedAcceleratorConfiguration::setStorage()", "TODO implement this HACK .-)") } - -//----------------------------------------------- + +//----------------------------------------------- ::sal_Bool SAL_CALL XMLBasedAcceleratorConfiguration::hasStorage() throw(css::uno::RuntimeException) { LOG_WARNING("XMLBasedAcceleratorConfiguration::hasStorage()", "TODO implement this HACK .-)") return sal_False; } - -//----------------------------------------------- + +//----------------------------------------------- void SAL_CALL XMLBasedAcceleratorConfiguration::addConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& /*xListener*/) throw(css::uno::RuntimeException) { LOG_WARNING("XMLBasedAcceleratorConfiguration::addConfigurationListener()", "TODO implement me") } - -//----------------------------------------------- + +//----------------------------------------------- void SAL_CALL XMLBasedAcceleratorConfiguration::removeConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& /*xListener*/) throw(css::uno::RuntimeException) { LOG_WARNING("XMLBasedAcceleratorConfiguration::removeConfigurationListener()", "TODO implement me") } -//----------------------------------------------- +//----------------------------------------------- void SAL_CALL XMLBasedAcceleratorConfiguration::reset() throw(css::uno::RuntimeException) { @@ -500,15 +500,15 @@ throw(css::uno::RuntimeException) reload(); } - -//----------------------------------------------- + +//----------------------------------------------- void SAL_CALL XMLBasedAcceleratorConfiguration::addResetListener(const css::uno::Reference< css::form::XResetListener >& /*xListener*/) throw(css::uno::RuntimeException) { LOG_WARNING("XMLBasedAcceleratorConfiguration::addResetListener()", "TODO implement me") } - -//----------------------------------------------- + +//----------------------------------------------- void SAL_CALL XMLBasedAcceleratorConfiguration::removeResetListener(const css::uno::Reference< css::form::XResetListener >& /*xListener*/) throw(css::uno::RuntimeException) { @@ -522,12 +522,12 @@ void XMLBasedAcceleratorConfiguration::changesOccured(const ::rtl::OUString& /*s reload(); } -//----------------------------------------------- +//----------------------------------------------- void XMLBasedAcceleratorConfiguration::impl_ts_load(const css::uno::Reference< css::io::XInputStream >& xStream) { // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); - + css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = m_xSMGR; if (m_pWriteCache) { @@ -536,14 +536,14 @@ void XMLBasedAcceleratorConfiguration::impl_ts_load(const css::uno::Reference< c m_pWriteCache = 0; delete pTemp; } - + aWriteLock.unlock(); // <- SAFE ---------------------------------- css::uno::Reference< css::io::XSeekable > xSeek(xStream, css::uno::UNO_QUERY); if (xSeek.is()) xSeek->seek(0); - + // add accelerators to the cache (the cache is not cleared) // SAFE -> ---------------------------------- aWriteLock.lock(); @@ -554,29 +554,29 @@ void XMLBasedAcceleratorConfiguration::impl_ts_load(const css::uno::Reference< c // Use further a temp cache for reading! AcceleratorConfigurationReader* pReader = new AcceleratorConfigurationReader(m_aReadCache); css::uno::Reference< css::xml::sax::XDocumentHandler > xReader (static_cast< ::cppu::OWeakObject* >(pReader), css::uno::UNO_QUERY_THROW); - SaxNamespaceFilter* pFilter = new SaxNamespaceFilter(xReader); + SaxNamespaceFilter* pFilter = new SaxNamespaceFilter(xReader); css::uno::Reference< css::xml::sax::XDocumentHandler > xFilter (static_cast< ::cppu::OWeakObject* >(pFilter), css::uno::UNO_QUERY_THROW); // connect parser, filter and stream css::uno::Reference< css::xml::sax::XParser > xParser(xSMGR->createInstance(SERVICENAME_SAXPARSER), css::uno::UNO_QUERY_THROW); xParser->setDocumentHandler(xFilter); - + css::xml::sax::InputSource aSource; aSource.aInputStream = xStream; // TODO think about error handling xParser->parseStream(aSource); - + aWriteLock.unlock(); // <- SAFE ---------------------------------- } -//----------------------------------------------- +//----------------------------------------------- void XMLBasedAcceleratorConfiguration::impl_ts_save(const css::uno::Reference< css::io::XOutputStream >& xStream) { // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); - + AcceleratorCache aCache; sal_Bool bChanged = (m_pWriteCache != 0); if (bChanged) @@ -584,13 +584,13 @@ void XMLBasedAcceleratorConfiguration::impl_ts_save(const css::uno::Reference< c else aCache.takeOver(m_aReadCache); css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = m_xSMGR; - + aReadLock.unlock(); // <- SAFE ---------------------------------- - + css::uno::Reference< css::io::XTruncate > xClearable(xStream, css::uno::UNO_QUERY_THROW); xClearable->truncate(); - + // TODO can be removed if seek(0) is done by truncate() automaticly! css::uno::Reference< css::io::XSeekable > xSeek(xStream, css::uno::UNO_QUERY); if (xSeek.is()) @@ -600,15 +600,15 @@ void XMLBasedAcceleratorConfiguration::impl_ts_save(const css::uno::Reference< c css::uno::Reference< css::xml::sax::XDocumentHandler > xWriter (xSMGR->createInstance(SERVICENAME_SAXWRITER), css::uno::UNO_QUERY_THROW); css::uno::Reference< css::io::XActiveDataSource> xDataSource(xWriter , css::uno::UNO_QUERY_THROW); xDataSource->setOutputStream(xStream); - + // write into the stream AcceleratorConfigurationWriter aWriter(aCache, xWriter); aWriter.flush(); - + // take over all changes into the original container // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); - + // take over all changes into the readonly cache ... // and forget the copy-on-write copied cache if (bChanged) @@ -619,12 +619,12 @@ void XMLBasedAcceleratorConfiguration::impl_ts_save(const css::uno::Reference< c m_pWriteCache = 0; delete pTemp; } - + aWriteLock.unlock(); // <- SAFE ---------------------------------- } -//----------------------------------------------- +//----------------------------------------------- AcceleratorCache& XMLBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bWriteAccessRequested) { // SAFE -> ---------------------------------- @@ -639,7 +639,7 @@ AcceleratorCache& XMLBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bWriteA { m_pWriteCache = new AcceleratorCache(m_aReadCache); } - + // in case, we have a writeable cache, we use it for reading too! // Otherwhise the API user cant find its own changes ... if (m_pWriteCache) @@ -649,37 +649,37 @@ AcceleratorCache& XMLBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bWriteA // <- SAFE ---------------------------------- } -//----------------------------------------------- +//----------------------------------------------- ::comphelper::Locale XMLBasedAcceleratorConfiguration::impl_ts_getLocale() const { static ::rtl::OUString LOCALE_PACKAGE = ::rtl::OUString::createFromAscii("/org.openoffice.Setup"); static ::rtl::OUString LOCALE_PATH = ::rtl::OUString::createFromAscii("L10N" ); static ::rtl::OUString LOCALE_KEY = ::rtl::OUString::createFromAscii("ooLocale" ); - + // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = m_xSMGR; aReadLock.unlock(); // <- SAFE ---------------------------------- - + css::uno::Reference< css::uno::XInterface > xCFG = fpc::ConfigurationHelper::openConfig(xSMGR, LOCALE_PACKAGE, LOCALE_PATH, fpc::ConfigurationHelper::E_READONLY); css::uno::Reference< css::beans::XPropertySet > xProp (xCFG, css::uno::UNO_QUERY_THROW); ::rtl::OUString sISOLocale; xProp->getPropertyValue(LOCALE_KEY) >>= sISOLocale; - + if (!sISOLocale.getLength()) return ::comphelper::Locale::EN_US(); return ::comphelper::Locale(sISOLocale); } /******************************************************************************* -* +* * XCU based accelerator configuration -* +* *******************************************************************************/ -//----------------------------------------------- -// XInterface, XTypeProvider +//----------------------------------------------- +// XInterface, XTypeProvider DEFINE_XINTERFACE_7(XCUBasedAcceleratorConfiguration , OWeakObject , DIRECT_INTERFACE(css::lang::XTypeProvider ), @@ -691,7 +691,7 @@ DEFINE_XINTERFACE_7(XCUBasedAcceleratorConfiguration , DIRECT_INTERFACE(css::ui::XUIConfiguration )) DEFINE_XTYPEPROVIDER_7(XCUBasedAcceleratorConfiguration , - css::lang::XTypeProvider , + css::lang::XTypeProvider , css::ui::XAcceleratorConfiguration , css::util::XChangesListener , css::form::XReset , @@ -699,7 +699,7 @@ DEFINE_XINTERFACE_7(XCUBasedAcceleratorConfiguration , css::ui::XUIConfigurationStorage , css::ui::XUIConfiguration ) -//----------------------------------------------- +//----------------------------------------------- XCUBasedAcceleratorConfiguration::XCUBasedAcceleratorConfiguration(const css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR) : ThreadHelpBase (&Application::GetSolarMutex()) , m_xSMGR (xSMGR ) @@ -707,17 +707,17 @@ XCUBasedAcceleratorConfiguration::XCUBasedAcceleratorConfiguration(const css::un , m_pSecondaryWriteCache(0 ) { static const ::rtl::OUString CFG_ENTRY_ACCELERATORS(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Accelerators")); - m_xCfg = css::uno::Reference< css::container::XNameAccess > ( - ::comphelper::ConfigurationHelper::openConfig( m_xSMGR, CFG_ENTRY_ACCELERATORS, ::comphelper::ConfigurationHelper::E_ALL_LOCALES ), + m_xCfg = css::uno::Reference< css::container::XNameAccess > ( + ::comphelper::ConfigurationHelper::openConfig( m_xSMGR, CFG_ENTRY_ACCELERATORS, ::comphelper::ConfigurationHelper::E_ALL_LOCALES ), css::uno::UNO_QUERY ); } -//----------------------------------------------- +//----------------------------------------------- XCUBasedAcceleratorConfiguration::~XCUBasedAcceleratorConfiguration() { } -//----------------------------------------------- +//----------------------------------------------- css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfiguration::getAllKeyEvents() throw(css::uno::RuntimeException) { @@ -738,7 +738,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfigurati // <- SAFE ---------------------------------- } -//----------------------------------------------- +//----------------------------------------------- ::rtl::OUString SAL_CALL XCUBasedAcceleratorConfiguration::getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent) throw(css::container::NoSuchElementException, css::uno::RuntimeException ) @@ -762,7 +762,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfigurati // <- SAFE ---------------------------------- } -//----------------------------------------------- +//----------------------------------------------- void SAL_CALL XCUBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyEvent& aKeyEvent, const ::rtl::OUString& sCommand ) throw(css::lang::IllegalArgumentException, @@ -832,7 +832,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyE rPrimaryCache.setKeyCommandPair(aKeyEvent, sCommand); } } - + else { if (rPrimaryCache.hasCommand(sCommand)) @@ -849,7 +849,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyE // <- SAFE ---------------------------------- } -//----------------------------------------------- +//----------------------------------------------- void SAL_CALL XCUBasedAcceleratorConfiguration::removeKeyEvent(const css::awt::KeyEvent& aKeyEvent) throw(css::container::NoSuchElementException, css::uno::RuntimeException ) @@ -892,7 +892,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::removeKeyEvent(const css::awt::K // <- SAFE ---------------------------------- } -//----------------------------------------------- +//----------------------------------------------- css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfiguration::getKeyEventsByCommand(const ::rtl::OUString& sCommand) throw(css::lang::IllegalArgumentException , css::container::NoSuchElementException, @@ -938,7 +938,7 @@ AcceleratorCache::TKeyList::const_iterator lcl_getPreferredKey(const Accelerator const css::awt::KeyEvent& rAWTKey = *pIt; const KeyCode aVCLKey = ::svt::AcceleratorExecute::st_AWTKey2VCLKey(rAWTKey); const String sName = aVCLKey.GetName(); - + if (sName.Len () > 0) return pIt; } @@ -955,7 +955,7 @@ css::uno::Sequence< css::uno::Any > SAL_CALL XCUBasedAcceleratorConfiguration::g ReadGuard aReadLock(m_aLock); sal_Int32 i = 0; - sal_Int32 c = lCommandList.getLength(); + sal_Int32 c = lCommandList.getLength(); css::uno::Sequence< css::uno::Any > lPreferredOnes (c); // dont pack list! AcceleratorCache& rCache = impl_getCFG(sal_True); @@ -989,7 +989,7 @@ css::uno::Sequence< css::uno::Any > SAL_CALL XCUBasedAcceleratorConfiguration::g return lPreferredOnes; } -//----------------------------------------------- +//----------------------------------------------- void SAL_CALL XCUBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(const ::rtl::OUString& sCommand) throw(css::lang::IllegalArgumentException , css::container::NoSuchElementException, @@ -1013,15 +1013,15 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co static_cast< ::cppu::OWeakObject* >(this)); if (rPrimaryCache.hasCommand(sCommand)) - rPrimaryCache.removeCommand(sCommand); + rPrimaryCache.removeCommand(sCommand); if (rSecondaryCache.hasCommand(sCommand)) - rSecondaryCache.removeCommand(sCommand); + rSecondaryCache.removeCommand(sCommand); aWriteLock.unlock(); // <- SAFE ---------------------------------- } -//----------------------------------------------- +//----------------------------------------------- void SAL_CALL XCUBasedAcceleratorConfiguration::reload() throw(css::uno::Exception , css::uno::RuntimeException) @@ -1042,8 +1042,8 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::reload() AcceleratorCache* pTemp = m_pPrimaryWriteCache; m_pPrimaryWriteCache = 0; delete pTemp; - } - m_xCfg->getByName(CFG_ENTRY_PRIMARY) >>= xAccess; + } + m_xCfg->getByName(CFG_ENTRY_PRIMARY) >>= xAccess; impl_ts_load(bPreferred, xAccess); // load the preferred keys bPreferred = sal_False; @@ -1055,14 +1055,14 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::reload() m_pSecondaryWriteCache = 0; delete pTemp; } - m_xCfg->getByName(CFG_ENTRY_SECONDARY) >>= xAccess; + m_xCfg->getByName(CFG_ENTRY_SECONDARY) >>= xAccess; impl_ts_load(bPreferred, xAccess); // load the secondary keys - aWriteLock.unlock(); + aWriteLock.unlock(); // <- SAFE ---------------------------------- } -//----------------------------------------------- +//----------------------------------------------- void SAL_CALL XCUBasedAcceleratorConfiguration::store() throw(css::uno::Exception , css::uno::RuntimeException) @@ -1071,32 +1071,32 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::store() // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); - + sal_Bool bPreferred; css::uno::Reference< css::container::XNameAccess > xAccess; bPreferred = sal_True; // on-demand creation of the primary write cache impl_getCFG(bPreferred, sal_True); - m_xCfg->getByName(CFG_ENTRY_PRIMARY) >>= xAccess; + m_xCfg->getByName(CFG_ENTRY_PRIMARY) >>= xAccess; impl_ts_save(bPreferred, xAccess); bPreferred = sal_False; // on-demand creation of the secondary write cache impl_getCFG(bPreferred, sal_True); - m_xCfg->getByName(CFG_ENTRY_SECONDARY) >>= xAccess; + m_xCfg->getByName(CFG_ENTRY_SECONDARY) >>= xAccess; impl_ts_save(bPreferred, xAccess); aReadLock.unlock(); // <- SAFE ---------------------------------- } -//----------------------------------------------- +//----------------------------------------------- void SAL_CALL XCUBasedAcceleratorConfiguration::storeToStorage(const css::uno::Reference< css::embed::XStorage >& xStorage) throw(css::uno::Exception , css::uno::RuntimeException) { - // use m_aCache + old AcceleratorXMLWriter to store data directly on storage given as parameter ... + // use m_aCache + old AcceleratorXMLWriter to store data directly on storage given as parameter ... if (!xStorage.is()) return; @@ -1158,28 +1158,28 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::storeToStorage(const css::uno::R aWriter.flush(); } -//----------------------------------------------- +//----------------------------------------------- ::sal_Bool SAL_CALL XCUBasedAcceleratorConfiguration::isModified() throw(css::uno::RuntimeException) { return sal_False; } -//----------------------------------------------- +//----------------------------------------------- ::sal_Bool SAL_CALL XCUBasedAcceleratorConfiguration::isReadOnly() throw(css::uno::RuntimeException) { return sal_False; } -//----------------------------------------------- +//----------------------------------------------- void SAL_CALL XCUBasedAcceleratorConfiguration::setStorage(const css::uno::Reference< css::embed::XStorage >& /*xStorage*/) throw(css::uno::RuntimeException) { LOG_WARNING("XCUBasedAcceleratorConfiguration::setStorage()", "TODO implement this HACK .-)") } -//----------------------------------------------- +//----------------------------------------------- ::sal_Bool SAL_CALL XCUBasedAcceleratorConfiguration::hasStorage() throw(css::uno::RuntimeException) { @@ -1187,21 +1187,21 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::setStorage(const css::uno::Refer return sal_False; } -//----------------------------------------------- +//----------------------------------------------- void SAL_CALL XCUBasedAcceleratorConfiguration::addConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& /*xListener*/) throw(css::uno::RuntimeException) { LOG_WARNING("XCUBasedAcceleratorConfiguration::addConfigurationListener()", "TODO implement me") } -//----------------------------------------------- +//----------------------------------------------- void SAL_CALL XCUBasedAcceleratorConfiguration::removeConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& /*xListener*/) throw(css::uno::RuntimeException) { LOG_WARNING("XCUBasedAcceleratorConfiguration::removeConfigurationListener()", "TODO implement me") } -//----------------------------------------------- +//----------------------------------------------- void SAL_CALL XCUBasedAcceleratorConfiguration::reset() throw(css::uno::RuntimeException) { @@ -1209,35 +1209,35 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::reset() ::rtl::OUString sConfig = xNamed->getName(); if ( sConfig.equalsAscii("Global") ) { - m_xCfg = css::uno::Reference< css::container::XNameAccess > ( - ::comphelper::ConfigurationHelper::openConfig( m_xSMGR, CFG_ENTRY_GLOBAL, ::comphelper::ConfigurationHelper::E_ALL_LOCALES ), - css::uno::UNO_QUERY ); + m_xCfg = css::uno::Reference< css::container::XNameAccess > ( + ::comphelper::ConfigurationHelper::openConfig( m_xSMGR, CFG_ENTRY_GLOBAL, ::comphelper::ConfigurationHelper::E_ALL_LOCALES ), + css::uno::UNO_QUERY ); XCUBasedAcceleratorConfiguration::reload(); } else if ( sConfig.equalsAscii("Modules") ) { - m_xCfg = css::uno::Reference< css::container::XNameAccess > ( - ::comphelper::ConfigurationHelper::openConfig( m_xSMGR, CFG_ENTRY_MODULES, ::comphelper::ConfigurationHelper::E_ALL_LOCALES ), + m_xCfg = css::uno::Reference< css::container::XNameAccess > ( + ::comphelper::ConfigurationHelper::openConfig( m_xSMGR, CFG_ENTRY_MODULES, ::comphelper::ConfigurationHelper::E_ALL_LOCALES ), css::uno::UNO_QUERY ); XCUBasedAcceleratorConfiguration::reload(); } } -//----------------------------------------------- +//----------------------------------------------- void SAL_CALL XCUBasedAcceleratorConfiguration::addResetListener(const css::uno::Reference< css::form::XResetListener >& /*xListener*/) throw(css::uno::RuntimeException) { LOG_WARNING("XCUBasedAcceleratorConfiguration::addResetListener()", "TODO implement me") } -//----------------------------------------------- +//----------------------------------------------- void SAL_CALL XCUBasedAcceleratorConfiguration::removeResetListener(const css::uno::Reference< css::form::XResetListener >& /*xListener*/) throw(css::uno::RuntimeException) { LOG_WARNING("XCUBasedAcceleratorConfiguration::removeResetListener()", "TODO implement me") } -//----------------------------------------------- +//----------------------------------------------- void SAL_CALL XCUBasedAcceleratorConfiguration::changesOccurred(const css::util::ChangesEvent& aEvent) throw(css::uno::RuntimeException) { @@ -1259,7 +1259,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::changesOccurred(const css::util: // be interesting for use. Sometimes short path values are given also by the broadcaster ... but they must be ignored :-) // So we try to split the path into 3 parts (module isnt important here, because we already know it ... because // these instance is bound to a specific module configuration ... or it''s the global configuration where no module is given at all. - + ::rtl::OUString sOrgPath ; ::rtl::OUString sPath ; ::rtl::OUString sKey; @@ -1268,7 +1268,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::changesOccurred(const css::util: sPath = sOrgPath; ::rtl::OUString sPrimarySecondary = ::utl::extractFirstFromConfigurationPath(sPath, &sPath); ::rtl::OUString sGlobalModules = ::utl::extractFirstFromConfigurationPath(sPath, &sPath); - + if ( sGlobalModules.equals(CFG_ENTRY_GLOBAL) ) { ::rtl::OUString sModule; @@ -1280,7 +1280,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::changesOccurred(const css::util: { ::rtl::OUString sModule = ::utl::extractFirstFromConfigurationPath(sPath, &sPath); sKey = ::utl::extractFirstFromConfigurationPath(sPath, &sPath); - + if (( sKey.getLength() > 0 ) && ( sPath.getLength() > 0 )) { reloadChanged(sPrimarySecondary, sGlobalModules, sModule, sKey); @@ -1289,13 +1289,13 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::changesOccurred(const css::util: } } -//----------------------------------------------- +//----------------------------------------------- void SAL_CALL XCUBasedAcceleratorConfiguration::disposing(const css::lang::EventObject& /*aSource*/) throw(css::uno::RuntimeException) { } -//----------------------------------------------- +//----------------------------------------------- void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const css::uno::Reference< css::container::XNameAccess >& xCfg ) { AcceleratorCache aReadCache = AcceleratorCache(); @@ -1321,7 +1321,7 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const for ( sal_Int32 i=0; i<nKeys; ++i ) { ::rtl::OUString sKey = lKeys[i]; - xAccess->getByName(sKey) >>= xKey; + xAccess->getByName(sKey) >>= xKey; xKey->getByName(CFG_PROP_COMMAND) >>= xCommand; css::uno::Sequence< ::rtl::OUString > lLocales = xCommand->getElementNames(); @@ -1405,7 +1405,7 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const m_aSecondaryReadCache.takeOver(aReadCache); } -//----------------------------------------------- +//----------------------------------------------- void XCUBasedAcceleratorConfiguration::impl_ts_save(sal_Bool bPreferred, const css::uno::Reference< css::container::XNameAccess >& /*xCfg*/) { if (bPreferred) @@ -1455,7 +1455,7 @@ void XCUBasedAcceleratorConfiguration::impl_ts_save(sal_Bool bPreferred, const c { AcceleratorCache::TKeyList::const_iterator pIt; AcceleratorCache::TKeyList lSecondaryReadKeys = m_aSecondaryReadCache.getAllKeys(); - AcceleratorCache::TKeyList lSecondaryWriteKeys = m_pSecondaryWriteCache->getAllKeys(); + AcceleratorCache::TKeyList lSecondaryWriteKeys = m_pSecondaryWriteCache->getAllKeys(); for ( pIt = lSecondaryReadKeys.begin(); pIt != lSecondaryReadKeys.end(); ++pIt) { @@ -1498,7 +1498,7 @@ void XCUBasedAcceleratorConfiguration::impl_ts_save(sal_Bool bPreferred, const c ::comphelper::ConfigurationHelper::flush(m_xCfg); } -//----------------------------------------------- +//----------------------------------------------- void XCUBasedAcceleratorConfiguration::insertKeyToConfiguration( const css::awt::KeyEvent& aKeyEvent, const ::rtl::OUString& sCommand, const sal_Bool bPreferred ) { css::uno::Reference< css::container::XNameAccess > xAccess; @@ -1519,8 +1519,8 @@ void XCUBasedAcceleratorConfiguration::insertKeyToConfiguration( const css::awt: xAccess->getByName(CFG_ENTRY_MODULES) >>= xModules; if ( !xModules->hasByName(m_sModuleCFG) ) { - xFac = css::uno::Reference< css::lang::XSingleServiceFactory >(xModules, css::uno::UNO_QUERY); - xInst = xFac->createInstance(); + xFac = css::uno::Reference< css::lang::XSingleServiceFactory >(xModules, css::uno::UNO_QUERY); + xInst = xFac->createInstance(); xModules->insertByName(m_sModuleCFG, css::uno::makeAny(xInst)); } xModules->getByName(m_sModuleCFG) >>= xContainer; @@ -1545,7 +1545,7 @@ void XCUBasedAcceleratorConfiguration::insertKeyToConfiguration( const css::awt: xCommand->replaceByName(sLocale, css::uno::makeAny(sCommand)); } -//----------------------------------------------- +//----------------------------------------------- void XCUBasedAcceleratorConfiguration::removeKeyFromConfiguration( const css::awt::KeyEvent& aKeyEvent, const sal_Bool bPreferred ) { css::uno::Reference< css::container::XNameAccess > xAccess; @@ -1571,7 +1571,7 @@ void XCUBasedAcceleratorConfiguration::removeKeyFromConfiguration( const css::aw xContainer->removeByName(sKey); } -//----------------------------------------------- +//----------------------------------------------- void XCUBasedAcceleratorConfiguration::reloadChanged( const ::rtl::OUString& sPrimarySecondary, const ::rtl::OUString& sGlobalModules, const ::rtl::OUString& sModule, const ::rtl::OUString& sKey ) { css::uno::Reference< css::container::XNameAccess > xAccess; @@ -1622,7 +1622,7 @@ void XCUBasedAcceleratorConfiguration::reloadChanged( const ::rtl::OUString& sPr { ::rtl::OUString sLocale = impl_ts_getLocale().toISO(); xContainer->getByName(sKey) >>= xKey; - xKey->getByName(CFG_PROP_COMMAND) >>= xCommand; + xKey->getByName(CFG_PROP_COMMAND) >>= xCommand; xCommand->getByName(sLocale) >>= sCommand; } @@ -1642,7 +1642,7 @@ void XCUBasedAcceleratorConfiguration::reloadChanged( const ::rtl::OUString& sPr } } -//----------------------------------------------- +//----------------------------------------------- AcceleratorCache& XCUBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bPreferred, sal_Bool bWriteAccessRequested) { // SAFE -> ---------------------------------- @@ -1691,7 +1691,7 @@ AcceleratorCache& XCUBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bPrefer // <- SAFE ---------------------------------- } -//----------------------------------------------- +//----------------------------------------------- ::comphelper::Locale XCUBasedAcceleratorConfiguration::impl_ts_getLocale() const { static ::rtl::OUString LOCALE_PACKAGE = ::rtl::OUString::createFromAscii("/org.openoffice.Setup"); diff --git a/framework/source/accelerators/acceleratorexecute.cxx b/framework/source/accelerators/acceleratorexecute.cxx index 9ed0e1178618..98fe7bb7630b 100644 --- a/framework/source/accelerators/acceleratorexecute.cxx +++ b/framework/source/accelerators/acceleratorexecute.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -109,7 +109,7 @@ void AcceleratorExecute::init(const css::uno::Reference< css::lang::XMultiServic // take over the uno service manager m_xSMGR = xSMGR; - + // specify our internal dispatch provider // frame or desktop?! => document or global config. sal_Bool bDesktopIsUsed = sal_False; @@ -118,33 +118,33 @@ void AcceleratorExecute::init(const css::uno::Reference< css::lang::XMultiServic { aLock.clear(); // <- SAFE ------------------------------ - + css::uno::Reference< css::frame::XDispatchProvider > xDispatcher( xSMGR->createInstance(SERVICENAME_DESKTOP), css::uno::UNO_QUERY_THROW); - + // SAFE -> ------------------------------ aLock.reset(); - + m_xDispatcher = xDispatcher; bDesktopIsUsed = sal_True; } aLock.clear(); // <- SAFE ---------------------------------- - + // open all needed configuration objects css::uno::Reference< css::ui::XAcceleratorConfiguration > xGlobalCfg; css::uno::Reference< css::ui::XAcceleratorConfiguration > xModuleCfg; css::uno::Reference< css::ui::XAcceleratorConfiguration > xDocCfg ; - + // global cfg xGlobalCfg = AcceleratorExecute::impl_st_openGlobalConfig(xSMGR); if (!bDesktopIsUsed) - { + { // module cfg xModuleCfg = AcceleratorExecute::impl_st_openModuleConfig(xSMGR, xEnv); - + // doc cfg css::uno::Reference< css::frame::XController > xController; css::uno::Reference< css::frame::XModel > xModel; @@ -154,14 +154,14 @@ void AcceleratorExecute::init(const css::uno::Reference< css::lang::XMultiServic if (xModel.is()) xDocCfg = AcceleratorExecute::impl_st_openDocConfig(xModel); } - + // SAFE -> ------------------------------ aLock.reset(); - + m_xGlobalCfg = xGlobalCfg; m_xModuleCfg = xModuleCfg; m_xDocCfg = xDocCfg ; - + aLock.clear(); // <- SAFE ---------------------------------- } @@ -181,13 +181,13 @@ void AcceleratorExecute::execute(const css::awt::KeyEvent& aAWTKey) // No Command found? Do nothing! User isnt interested on any error handling .-) if (!sCommand.getLength()) return; - + // SAFE -> ---------------------------------- ::osl::ResettableMutexGuard aLock(m_aLock); - + m_lCommandQueue.push_back(sCommand); m_aAsyncCallback.Post(0); - + aLock.clear(); // <- SAFE ---------------------------------- } @@ -198,24 +198,24 @@ css::awt::KeyEvent AcceleratorExecute::st_VCLKey2AWTKey(const KeyCode& aVCLKey) css::awt::KeyEvent aAWTKey; aAWTKey.Modifiers = 0; aAWTKey.KeyCode = (sal_Int16)aVCLKey.GetCode(); - + if (aVCLKey.IsShift()) - aAWTKey.Modifiers |= css::awt::KeyModifier::SHIFT; + aAWTKey.Modifiers |= css::awt::KeyModifier::SHIFT; if (aVCLKey.IsMod1()) - aAWTKey.Modifiers |= css::awt::KeyModifier::MOD1; + aAWTKey.Modifiers |= css::awt::KeyModifier::MOD1; if (aVCLKey.IsMod2()) aAWTKey.Modifiers |= css::awt::KeyModifier::MOD2; if (aVCLKey.IsMod3()) - aAWTKey.Modifiers |= css::awt::KeyModifier::MOD3; - - return aAWTKey; + aAWTKey.Modifiers |= css::awt::KeyModifier::MOD3; + + return aAWTKey; } /* -ViewFrame->GetObjectShell +ViewFrame->GetObjectShell ObjectShell->GetStyleSheetPool */ - + //----------------------------------------------- KeyCode AcceleratorExecute::st_AWTKey2VCLKey(const css::awt::KeyEvent& aAWTKey) { @@ -224,7 +224,7 @@ KeyCode AcceleratorExecute::st_AWTKey2VCLKey(const css::awt::KeyEvent& aAWTKey) sal_Bool bMod2 = ((aAWTKey.Modifiers & css::awt::KeyModifier::MOD2 ) == css::awt::KeyModifier::MOD2 ); sal_Bool bMod3 = ((aAWTKey.Modifiers & css::awt::KeyModifier::MOD3 ) == css::awt::KeyModifier::MOD3 ); USHORT nKey = (USHORT)aAWTKey.KeyCode; - + return KeyCode(nKey, bShift, bMod1, bMod2, bMod3); } @@ -233,14 +233,14 @@ KeyCode AcceleratorExecute::st_AWTKey2VCLKey(const css::awt::KeyEvent& aAWTKey) { // SAFE -> ---------------------------------- ::osl::ResettableMutexGuard aLock(m_aLock); - + css::uno::Reference< css::ui::XAcceleratorConfiguration > xGlobalCfg = m_xGlobalCfg; css::uno::Reference< css::ui::XAcceleratorConfiguration > xModuleCfg = m_xModuleCfg; css::uno::Reference< css::ui::XAcceleratorConfiguration > xDocCfg = m_xDocCfg ; - - aLock.clear(); + + aLock.clear(); // <- SAFE ---------------------------------- - + ::rtl::OUString sCommand; try { @@ -265,7 +265,7 @@ KeyCode AcceleratorExecute::st_AWTKey2VCLKey(const css::awt::KeyEvent& aAWTKey) {} } } - + return sCommand; } @@ -275,9 +275,9 @@ css::uno::Reference< css::ui::XAcceleratorConfiguration > AcceleratorExecute::im css::uno::Reference< css::ui::XAcceleratorConfiguration > xAccCfg( xSMGR->createInstance(SERVICENAME_GLOBALACCELERATORCONFIGURATION), css::uno::UNO_QUERY_THROW); - return xAccCfg; + return xAccCfg; } - + //----------------------------------------------- css::uno::Reference< css::ui::XAcceleratorConfiguration > AcceleratorExecute::impl_st_openModuleConfig(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR , const css::uno::Reference< css::frame::XFrame >& xFrame) @@ -286,20 +286,20 @@ css::uno::Reference< css::ui::XAcceleratorConfiguration > AcceleratorExecute::im xSMGR->createInstance(SERVICENAME_MODULEMANAGER), css::uno::UNO_QUERY_THROW); - ::rtl::OUString sModule; + ::rtl::OUString sModule; try - { + { sModule = xModuleDetection->identify(xFrame); } catch(const css::uno::RuntimeException& exRuntime) { throw exRuntime; } catch(const css::uno::Exception&) { return css::uno::Reference< css::ui::XAcceleratorConfiguration >(); } - + css::uno::Reference< css::ui::XModuleUIConfigurationManagerSupplier > xUISupplier( xSMGR->createInstance(SERVICENAME_MODULEUICONFIGURATIONMANAGERSUPPLIER), css::uno::UNO_QUERY_THROW); - + css::uno::Reference< css::ui::XUIConfigurationManager > xUIManager = xUISupplier->getUIConfigurationManager(sModule); css::uno::Reference< css::ui::XAcceleratorConfiguration > xAccCfg (xUIManager->getShortCutManager(), css::uno::UNO_QUERY_THROW); return xAccCfg; @@ -313,7 +313,7 @@ css::uno::Reference< css::ui::XAcceleratorConfiguration > AcceleratorExecute::im css::uno::Reference< css::ui::XAcceleratorConfiguration > xAccCfg (xUIManager->getShortCutManager(), css::uno::UNO_QUERY_THROW); return xAccCfg; } - + //----------------------------------------------- css::uno::Reference< css::util::XURLTransformer > AcceleratorExecute::impl_ts_getURLParser() { @@ -323,37 +323,37 @@ css::uno::Reference< css::util::XURLTransformer > AcceleratorExecute::impl_ts_ge if (m_xURLParser.is()) return m_xURLParser; css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = m_xSMGR; - + aLock.clear(); // <- SAFE ---------------------------------- - + css::uno::Reference< css::util::XURLTransformer > xParser( xSMGR->createInstance(SERVICENAME_URLTRANSFORMER), css::uno::UNO_QUERY_THROW); - + // SAFE -> ---------------------------------- aLock.reset(); m_xURLParser = xParser; aLock.clear(); // <- SAFE ---------------------------------- - + return xParser; -} - +} + //----------------------------------------------- IMPL_LINK(AcceleratorExecute, impl_ts_asyncCallback, void*, pVoid) { // SAFE -> ---------------------------------- ::osl::ResettableMutexGuard aLock(m_aLock); - + TCommandQueue::iterator pIt = m_lCommandQueue.begin(); if (pIt == m_lCommandQueue.end()) return 0; ::rtl::OUString sCommand = *pIt; m_lCommandQueue.erase(pIt); - + css::uno::Reference< css::frame::XDispatchProvider > xProvider = m_xDispatcher; - + aLock.clear(); // <- SAFE ---------------------------------- diff --git a/framework/source/accelerators/acceleratorexecute.hxx b/framework/source/accelerators/acceleratorexecute.hxx index 87c5717d65c1..07f6348184e2 100644 --- a/framework/source/accelerators/acceleratorexecute.hxx +++ b/framework/source/accelerators/acceleratorexecute.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,27 +65,27 @@ namespace svt { - + #ifdef css #error "Who define css? I need it as namespace alias." #else #define css ::com::sun::star #endif - + //=============================================== // definitions struct TMutexInit { ::osl::Mutex m_aLock; -}; - +}; + //=============================================== /** @descr implements a helper, which can be used to convert vcl key codes into awt key codes ... and reverse. - + Further such key code can be triggered. Doing so different accelerator configurations are merged together; a suitable @@ -102,41 +102,41 @@ struct TMutexInit queued internal and dispatched ASAP. Of course this queue will be stopped if the environment - will be destructed ... + will be destructed ... */ class AcceleratorExecute : private TMutexInit { //------------------------------------------- // const, types private: - + /** TODO document me */ typedef ::std::vector< ::rtl::OUString > TCommandQueue; - + //------------------------------------------- // member private: /** TODO document me */ css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR; - + /** TODO document me */ css::uno::Reference< css::util::XURLTransformer > m_xURLParser; - + /** TODO document me */ css::uno::Reference< css::frame::XDispatchProvider > m_xDispatcher; - + /** TODO document me */ css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xGlobalCfg; css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xModuleCfg; css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xDocCfg; - + /** TODO document me */ TCommandQueue m_lCommandQueue; - + /** TODO document me */ ::vcl::EventPoster m_aAsyncCallback; - + //------------------------------------------- // interface public: @@ -144,39 +144,39 @@ class AcceleratorExecute : private TMutexInit //--------------------------------------- /** @short factory method to create new accelerator helper instance. - + @descr Such helper instance must be initialized at first. So it can know its environment (global/module or document specific). - + Afterwards it can be used to execute incoming accelerator requests. - + The "end of life" of such helper can be reached as follow: - + - delete the object => If it stands currently in its execute method, they will be finished. All further queued requests will be removed and further not executed! - - Other modes are possible and will be implemented ASAP :-) + + Other modes are possible and will be implemented ASAP :-) */ static AcceleratorExecute* createAcceleratorHelper(); - + //--------------------------------------- - /** @short fight against inlining ... */ + /** @short fight against inlining ... */ virtual ~AcceleratorExecute(); - + //--------------------------------------- /** @short init this instance. - + @descr It must be called as first method after creation. And further it can be called more then once ... but at least its should be used one times only. Otherwhise nobody can say, which asynchronous executions will be used inside the old and which one will be used inside the new environment. - + @param xSMGR reference to an uno service manager. @@ -186,62 +186,62 @@ class AcceleratorExecute : private TMutexInit is used to locate the right module configuration and use it merged together with the document and the global configuration. - + If this parameter is set to NULL, the global configuration is used only. Further the global Desktop instance is - used for dispatch. + used for dispatch. */ - virtual void init(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR, + virtual void init(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR, const css::uno::Reference< css::frame::XFrame >& xEnv ); - + //--------------------------------------- /** @short trigger this accelerator. - + @descr The internal configuartions are used to find as suitable command for this key code. This command will be queued and executed later asynchronous. - + @param aKey specify the accelerator for execute. */ virtual void execute(const KeyCode& aKey); virtual void execute(const css::awt::KeyEvent& aKey); - + //--------------------------------------- /** TODO document me */ static css::awt::KeyEvent st_VCLKey2AWTKey(const KeyCode& aKey); static KeyCode st_AWTKey2VCLKey(const css::awt::KeyEvent& aKey); - + //------------------------------------------- // internal private: - + //--------------------------------------- /** @short allow creation of instances of this class by using our factory only! - */ + */ AcceleratorExecute(); AcceleratorExecute(const AcceleratorExecute& rCopy); void operator=(const AcceleratorExecute& rCopy) {}; - + //--------------------------------------- /** TODO document me */ css::uno::Reference< css::ui::XAcceleratorConfiguration > impl_st_openGlobalConfig(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR); - + css::uno::Reference< css::ui::XAcceleratorConfiguration > impl_st_openModuleConfig(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR , const css::uno::Reference< css::frame::XFrame >& xFrame); - + css::uno::Reference< css::ui::XAcceleratorConfiguration > impl_st_openDocConfig(const css::uno::Reference< css::frame::XModel >& xModel); - + //--------------------------------------- /** TODO document me */ ::rtl::OUString impl_ts_findCommand(const css::awt::KeyEvent& aKey); - + //--------------------------------------- /** TODO document me */ css::uno::Reference< css::util::XURLTransformer > impl_ts_getURLParser(); - + //--------------------------------------- /** TODO document me */ DECL_LINK(impl_ts_asyncCallback, void*); diff --git a/framework/source/accelerators/documentacceleratorconfiguration.cxx b/framework/source/accelerators/documentacceleratorconfiguration.cxx index 644b41b70663..81edb165653c 100644 --- a/framework/source/accelerators/documentacceleratorconfiguration.cxx +++ b/framework/source/accelerators/documentacceleratorconfiguration.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -91,7 +91,7 @@ namespace framework { -//----------------------------------------------- +//----------------------------------------------- // XInterface, XTypeProvider, XServiceInfo DEFINE_XINTERFACE_2(DocumentAcceleratorConfiguration , XMLBasedAcceleratorConfiguration , @@ -104,7 +104,7 @@ DEFINE_XTYPEPROVIDER_2_WITH_BASECLASS(DocumentAcceleratorConfiguration , css::lang::XServiceInfo , css::lang::XInitialization) // css::ui::XUIConfigurationStorage) - + DEFINE_XSERVICEINFO_MULTISERVICE(DocumentAcceleratorConfiguration , ::cppu::OWeakObject , SERVICENAME_DOCUMENTACCELERATORCONFIGURATION , @@ -119,39 +119,39 @@ DEFINE_INIT_SERVICE(DocumentAcceleratorConfiguration, */ } ) - -//----------------------------------------------- + +//----------------------------------------------- DocumentAcceleratorConfiguration::DocumentAcceleratorConfiguration(const css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR) : XMLBasedAcceleratorConfiguration(xSMGR) { } -//----------------------------------------------- +//----------------------------------------------- DocumentAcceleratorConfiguration::~DocumentAcceleratorConfiguration() { m_aPresetHandler.removeStorageListener(this); } -//----------------------------------------------- +//----------------------------------------------- void SAL_CALL DocumentAcceleratorConfiguration::initialize(const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , css::uno::RuntimeException) { // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); - + ::comphelper::SequenceAsHashMap lArgs(lArguments); m_xDocumentRoot = lArgs.getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii("DocumentRoot"), css::uno::Reference< css::embed::XStorage >()); - + aWriteLock.unlock(); // <- SAFE ---------------------------------- - + impl_ts_fillCache(); } -//----------------------------------------------- +//----------------------------------------------- void SAL_CALL DocumentAcceleratorConfiguration::setStorage(const css::uno::Reference< css::embed::XStorage >& xStorage) throw(css::uno::RuntimeException) { @@ -171,7 +171,7 @@ void SAL_CALL DocumentAcceleratorConfiguration::setStorage(const css::uno::Refer impl_ts_fillCache(); } -//----------------------------------------------- +//----------------------------------------------- sal_Bool SAL_CALL DocumentAcceleratorConfiguration::hasStorage() throw(css::uno::RuntimeException) { @@ -181,7 +181,7 @@ sal_Bool SAL_CALL DocumentAcceleratorConfiguration::hasStorage() // <- SAFE ---------------------------------- } -//----------------------------------------------- +//----------------------------------------------- void DocumentAcceleratorConfiguration::impl_ts_fillCache() { // SAFE -> ---------------------------------- @@ -231,7 +231,7 @@ void DocumentAcceleratorConfiguration::impl_ts_fillCache() {} } -//----------------------------------------------- +//----------------------------------------------- void DocumentAcceleratorConfiguration::impl_ts_clearCache() { m_aPresetHandler.forgetCachedStorages(); diff --git a/framework/source/accelerators/globalacceleratorconfiguration.cxx b/framework/source/accelerators/globalacceleratorconfiguration.cxx index ba103a9e273e..dc040479d854 100644 --- a/framework/source/accelerators/globalacceleratorconfiguration.cxx +++ b/framework/source/accelerators/globalacceleratorconfiguration.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ namespace framework { -//----------------------------------------------- +//----------------------------------------------- // XInterface, XTypeProvider, XServiceInfo DEFINE_XINTERFACE_2(GlobalAcceleratorConfiguration , XCUBasedAcceleratorConfiguration , @@ -67,7 +67,7 @@ DEFINE_XTYPEPROVIDER_2_WITH_BASECLASS(GlobalAcceleratorConfiguration, XCUBasedAcceleratorConfiguration , css::lang::XServiceInfo , css::lang::XInitialization) - + DEFINE_XSERVICEINFO_MULTISERVICE(GlobalAcceleratorConfiguration , ::cppu::OWeakObject , SERVICENAME_GLOBALACCELERATORCONFIGURATION , @@ -83,36 +83,36 @@ DEFINE_INIT_SERVICE(GlobalAcceleratorConfiguration, impl_ts_fillCache(); } ) - -//----------------------------------------------- + +//----------------------------------------------- GlobalAcceleratorConfiguration::GlobalAcceleratorConfiguration(const css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR) : XCUBasedAcceleratorConfiguration(xSMGR) { } -//----------------------------------------------- +//----------------------------------------------- GlobalAcceleratorConfiguration::~GlobalAcceleratorConfiguration() { } void SAL_CALL GlobalAcceleratorConfiguration::initialize(const css::uno::Sequence< css::uno::Any >& /*lArguments*/) - throw(css::uno::Exception , + throw(css::uno::Exception , css::uno::RuntimeException) { } -//----------------------------------------------- +//----------------------------------------------- void GlobalAcceleratorConfiguration::impl_ts_fillCache() { // get current office locale ... but dont cache it. // Otherwise we must be listener on the configuration layer // which seems to superflous for this small implementation .-) ::comphelper::Locale aLocale = ::comphelper::Locale(m_sLocale); - + // May be there exists no accelerator config? Handle it gracefully :-) try - { - m_sGlobalOrModules = CFG_ENTRY_GLOBAL; + { + m_sGlobalOrModules = CFG_ENTRY_GLOBAL; XCUBasedAcceleratorConfiguration::reload(); css::uno::Reference< css::util::XChangesNotifier > xBroadcaster(m_xCfg, css::uno::UNO_QUERY_THROW); diff --git a/framework/source/accelerators/keymapping.cxx b/framework/source/accelerators/keymapping.cxx index b1d00d0ef966..7d4054014524 100644 --- a/framework/source/accelerators/keymapping.cxx +++ b/framework/source/accelerators/keymapping.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ namespace framework { - + //_______________________________________________ // helper @@ -155,9 +155,9 @@ KeyMapping::KeyIdentifierInfo KeyMapping::KeyIdentifierMap[] = {css::awt::Key::TILDE , "KEY_TILDE" }, {css::awt::Key::QUOTELEFT , "KEY_QUOTELEFT" }, {0 , "" } // mark the end of this array! -}; +}; -//----------------------------------------------- +//----------------------------------------------- KeyMapping::KeyMapping() { sal_Int32 i = 0; @@ -165,27 +165,27 @@ KeyMapping::KeyMapping() { ::rtl::OUString sIdentifier = ::rtl::OUString::createFromAscii(KeyIdentifierMap[i].Identifier); sal_Int16 nCode = KeyIdentifierMap[i].Code; - + m_lIdentifierHash[sIdentifier] = nCode ; m_lCodeHash [nCode] = sIdentifier; - + ++i; } } -//----------------------------------------------- +//----------------------------------------------- KeyMapping::~KeyMapping() { } -//----------------------------------------------- +//----------------------------------------------- sal_uInt16 KeyMapping::mapIdentifierToCode(const ::rtl::OUString& sIdentifier) throw(css::lang::IllegalArgumentException) { Identifier2CodeHash::const_iterator pIt = m_lIdentifierHash.find(sIdentifier); if (pIt != m_lIdentifierHash.end()) - return pIt->second; - + return pIt->second; + // Its not well known identifier - but may be a pure key code formated as string ... // Check and convert it! sal_uInt16 nCode = 0; @@ -194,32 +194,32 @@ sal_uInt16 KeyMapping::mapIdentifierToCode(const ::rtl::OUString& sIdentifier) DECLARE_ASCII("Cant map given identifier to a valid key code value."), css::uno::Reference< css::uno::XInterface >(), 0); - + return (sal_uInt16)nCode; } - -//----------------------------------------------- + +//----------------------------------------------- ::rtl::OUString KeyMapping::mapCodeToIdentifier(sal_uInt16 nCode) { Code2IdentifierHash::const_iterator pIt = m_lCodeHash.find(nCode); if (pIt != m_lCodeHash.end()) return pIt->second; - + // If we have no well known identifier - use the pure code value! - return ::rtl::OUString::valueOf((sal_Int32)nCode); + return ::rtl::OUString::valueOf((sal_Int32)nCode); } -//----------------------------------------------- +//----------------------------------------------- sal_Bool KeyMapping::impl_st_interpretIdentifierAsPureKeyCode(const ::rtl::OUString& sIdentifier, sal_uInt16& rCode ) { - sal_Int32 nCode = sIdentifier.toInt32(); + sal_Int32 nCode = sIdentifier.toInt32(); if (nCode > 0) { rCode = (sal_uInt16)nCode; return sal_True; } - + // 0 is normaly an error of the called method toInt32() ... // But we must be aware, that the identifier is "0"! rCode = 0; diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx index c85cb404ffb4..566311d6f5be 100644 --- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx +++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,7 +75,7 @@ namespace framework { -//----------------------------------------------- +//----------------------------------------------- // XInterface, XTypeProvider, XServiceInfo DEFINE_XINTERFACE_2(ModuleAcceleratorConfiguration , XCUBasedAcceleratorConfiguration , @@ -86,7 +86,7 @@ DEFINE_XTYPEPROVIDER_2_WITH_BASECLASS(ModuleAcceleratorConfiguration, XCUBasedAcceleratorConfiguration , css::lang::XServiceInfo , css::lang::XInitialization ) - + DEFINE_XSERVICEINFO_MULTISERVICE(ModuleAcceleratorConfiguration , ::cppu::OWeakObject , SERVICENAME_MODULEACCELERATORCONFIGURATION , @@ -101,21 +101,21 @@ DEFINE_INIT_SERVICE(ModuleAcceleratorConfiguration, */ } ) - -//----------------------------------------------- + +//----------------------------------------------- ModuleAcceleratorConfiguration::ModuleAcceleratorConfiguration(const css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR) : XCUBasedAcceleratorConfiguration(xSMGR) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ModuleAcceleratorConfiguration::ModuleAcceleratorConfiguration" ); } -//----------------------------------------------- +//----------------------------------------------- ModuleAcceleratorConfiguration::~ModuleAcceleratorConfiguration() { // m_aPresetHandler.removeStorageListener(this); } -//----------------------------------------------- +//----------------------------------------------- void SAL_CALL ModuleAcceleratorConfiguration::initialize(const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , css::uno::RuntimeException) @@ -123,23 +123,23 @@ void SAL_CALL ModuleAcceleratorConfiguration::initialize(const css::uno::Sequenc RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ModuleAcceleratorConfiguration::initialize" ); // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); - + ::comphelper::SequenceAsHashMap lArgs(lArguments); m_sModule = lArgs.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("ModuleIdentifier"), ::rtl::OUString()); m_sLocale = lArgs.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("Locale") , ::rtl::OUString::createFromAscii("x-default")); - + if (!m_sModule.getLength()) throw css::uno::RuntimeException( ::rtl::OUString::createFromAscii("The module dependend accelerator configuration service was initialized with an empty module identifier!"), static_cast< ::cppu::OWeakObject* >(this)); - + aWriteLock.unlock(); // <- SAFE ---------------------------------- - + impl_ts_fillCache(); } - -//----------------------------------------------- + +//----------------------------------------------- void ModuleAcceleratorConfiguration::impl_ts_fillCache() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ModuleAcceleratorConfiguration::impl_ts_fillCache" ); @@ -154,7 +154,7 @@ void ModuleAcceleratorConfiguration::impl_ts_fillCache() // Otherwise we must be listener on the configuration layer // which seems to superflous for this small implementation .-) ::comphelper::Locale aLocale = ::comphelper::Locale(m_sLocale); - + // May be the current app module does not have any // accelerator config? Handle it gracefully :-) try diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx index f35d8ac84a79..ecfe6d2a0a5f 100644 --- a/framework/source/accelerators/presethandler.cxx +++ b/framework/source/accelerators/presethandler.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -105,49 +105,49 @@ static const ::sal_Int32 ID_CORRUPT_UICONFIG_GENERAL = 3; namespace framework { -//----------------------------------------------- +//----------------------------------------------- ::rtl::OUString PresetHandler::PRESET_DEFAULT() { static ::rtl::OUString RSTYPE = DECLARE_ASCII("default"); return RSTYPE; } -//----------------------------------------------- +//----------------------------------------------- ::rtl::OUString PresetHandler::TARGET_CURRENT() { static ::rtl::OUString RSTYPE = DECLARE_ASCII("current"); return RSTYPE; } -//----------------------------------------------- +//----------------------------------------------- ::rtl::OUString PresetHandler::RESOURCETYPE_MENUBAR() { static ::rtl::OUString RSTYPE = DECLARE_ASCII("menubar"); return RSTYPE; } -//----------------------------------------------- +//----------------------------------------------- ::rtl::OUString PresetHandler::RESOURCETYPE_TOOLBAR() { static ::rtl::OUString RSTYPE = DECLARE_ASCII("toolbar"); return RSTYPE; } -//----------------------------------------------- +//----------------------------------------------- ::rtl::OUString PresetHandler::RESOURCETYPE_ACCELERATOR() { static ::rtl::OUString RSTYPE = DECLARE_ASCII("accelerator"); return RSTYPE; } -//----------------------------------------------- +//----------------------------------------------- ::rtl::OUString PresetHandler::RESOURCETYPE_STATUSBAR() { static ::rtl::OUString RSTYPE = DECLARE_ASCII("statusbar"); return RSTYPE; } -//----------------------------------------------- +//----------------------------------------------- PresetHandler::PresetHandler(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR) : ThreadHelpBase (&Application::GetSolarMutex() ) , m_xSMGR (xSMGR ) @@ -157,7 +157,7 @@ PresetHandler::PresetHandler(const css::uno::Reference< css::lang::XMultiService { } -//----------------------------------------------- +//----------------------------------------------- PresetHandler::PresetHandler(const PresetHandler& rCopy) : ThreadHelpBase (&Application::GetSolarMutex() ) { @@ -178,7 +178,7 @@ PresetHandler::PresetHandler(const PresetHandler& rCopy) m_sRelPathUser = rCopy.m_sRelPathUser; } -//----------------------------------------------- +//----------------------------------------------- PresetHandler::~PresetHandler() { m_xWorkingStorageShare.clear(); @@ -205,26 +205,26 @@ PresetHandler::~PresetHandler() m_lDocumentStorages.forgetCachedStorages(); } -//----------------------------------------------- +//----------------------------------------------- void PresetHandler::forgetCachedStorages() { // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); - + if (m_eConfigType == E_DOCUMENT) { m_xWorkingStorageShare.clear(); m_xWorkingStorageNoLang.clear(); m_xWorkingStorageUser.clear(); } - + m_lDocumentStorages.forgetCachedStorages(); - + aWriteLock.unlock(); // <- SAFE ---------------------------------- } -//----------------------------------------------- +//----------------------------------------------- ::rtl::OUString lcl_getLocalizedMessage(::sal_Int32 nID) { ::rtl::OUString sMessage = ::rtl::OUString::createFromAscii("Unknown error."); @@ -234,11 +234,11 @@ void PresetHandler::forgetCachedStorages() case ID_CORRUPT_UICONFIG_SHARE : sMessage = ::rtl::OUString( String( FwkResId( STR_CORRUPT_UICFG_SHARE ))); break; - + case ID_CORRUPT_UICONFIG_USER : sMessage = ::rtl::OUString( String( FwkResId( STR_CORRUPT_UICFG_USER ))); break; - + case ID_CORRUPT_UICONFIG_GENERAL : sMessage = ::rtl::OUString( String( FwkResId( STR_CORRUPT_UICFG_GENERAL ))); break; @@ -247,36 +247,36 @@ void PresetHandler::forgetCachedStorages() return sMessage; } -//----------------------------------------------- +//----------------------------------------------- css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorageShare() { - css::uno::Reference< css::embed::XStorage > xRoot = m_aSharedStorages->m_lStoragesShare.getRootStorage(); + css::uno::Reference< css::embed::XStorage > xRoot = m_aSharedStorages->m_lStoragesShare.getRootStorage(); if (xRoot.is()) return xRoot; - + // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = m_xSMGR; aReadLock.unlock(); // <- SAFE ---------------------------------- - + css::uno::Reference< css::beans::XPropertySet > xPathSettings( - xSMGR->createInstance(SERVICENAME_PATHSETTINGS), + xSMGR->createInstance(SERVICENAME_PATHSETTINGS), css::uno::UNO_QUERY_THROW); - + ::rtl::OUString sShareLayer; xPathSettings->getPropertyValue(BASEPATH_SHARE_LAYER) >>= sShareLayer; - + // "UIConfig" is a "multi path" ... use first part only here! sal_Int32 nPos = sShareLayer.indexOf(';'); if (nPos > 0) sShareLayer = sShareLayer.copy(0, nPos); - - // Note: May be an user uses URLs without a final slash! Check it ... + + // Note: May be an user uses URLs without a final slash! Check it ... nPos = sShareLayer.lastIndexOf('/'); if (nPos != sShareLayer.getLength()-1) sShareLayer += ::rtl::OUString::createFromAscii("/"); - + sShareLayer += RELPATH_SHARE_LAYER; // folder /* // TODO remove me! @@ -287,10 +287,10 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorag css::uno::Sequence< css::uno::Any > lArgs(2); lArgs[0] <<= sShareLayer; lArgs[1] <<= css::embed::ElementModes::READ | css::embed::ElementModes::NOCREATE; - + css::uno::Reference< css::lang::XSingleServiceFactory > xStorageFactory(xSMGR->createInstance(SERVICENAME_FILESYSTEMSTORAGEFACTORY) , css::uno::UNO_QUERY_THROW); css::uno::Reference< css::embed::XStorage > xStorage; - + try { xStorage = css::uno::Reference< css::embed::XStorage >(xStorageFactory->createInstanceWithArguments(lArgs), css::uno::UNO_QUERY_THROW); @@ -302,46 +302,46 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorag css::uno::Reference< css::uno::XInterface >(), ex.Message); } - + m_aSharedStorages->m_lStoragesShare.setRootStorage(xStorage); - + return xStorage; -} +} -//----------------------------------------------- +//----------------------------------------------- css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorageUser() { - css::uno::Reference< css::embed::XStorage > xRoot = m_aSharedStorages->m_lStoragesUser.getRootStorage(); + css::uno::Reference< css::embed::XStorage > xRoot = m_aSharedStorages->m_lStoragesUser.getRootStorage(); if (xRoot.is()) return xRoot; - + // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = m_xSMGR; aReadLock.unlock(); // <- SAFE ---------------------------------- - + css::uno::Reference< css::beans::XPropertySet > xPathSettings( - xSMGR->createInstance(SERVICENAME_PATHSETTINGS), + xSMGR->createInstance(SERVICENAME_PATHSETTINGS), css::uno::UNO_QUERY_THROW); - + ::rtl::OUString sUserLayer; xPathSettings->getPropertyValue(BASEPATH_USER_LAYER) >>= sUserLayer ; - - // Note: May be an user uses URLs without a final slash! Check it ... + + // Note: May be an user uses URLs without a final slash! Check it ... sal_Int32 nPos = sUserLayer.lastIndexOf('/'); if (nPos != sUserLayer.getLength()-1) sUserLayer += ::rtl::OUString::createFromAscii("/"); - + sUserLayer += RELPATH_USER_LAYER; // storage file - + css::uno::Sequence< css::uno::Any > lArgs(2); lArgs[0] <<= sUserLayer; lArgs[1] <<= css::embed::ElementModes::READWRITE; - + css::uno::Reference< css::lang::XSingleServiceFactory > xStorageFactory(xSMGR->createInstance(SERVICENAME_FILESYSTEMSTORAGEFACTORY) , css::uno::UNO_QUERY_THROW); css::uno::Reference< css::embed::XStorage > xStorage; - + try { xStorage = css::uno::Reference< css::embed::XStorage >(xStorageFactory->createInstanceWithArguments(lArgs), css::uno::UNO_QUERY_THROW); @@ -355,7 +355,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorag } m_aSharedStorages->m_lStoragesUser.setRootStorage(xStorage); - + return xStorage; } @@ -385,7 +385,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getParentStorageShare css::uno::Reference< css::embed::XStorage > xWorking = m_xWorkingStorageShare; aReadLock.unlock(); // <- SAFE ---------------------------------- - + return m_aSharedStorages->m_lStoragesShare.getParentStorage(xWorking); } @@ -397,7 +397,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getParentStorageUser( css::uno::Reference< css::embed::XStorage > xWorking = m_xWorkingStorageUser; aReadLock.unlock(); // <- SAFE ---------------------------------- - + return m_aSharedStorages->m_lStoragesUser.getParentStorage(xWorking); } @@ -406,18 +406,18 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType const ::rtl::OUString& sResource , const ::rtl::OUString& sModule , const css::uno::Reference< css::embed::XStorage >& xDocumentRoot, - const ::comphelper::Locale& aLocale ) + const ::comphelper::Locale& aLocale ) { // TODO free all current open storages! - + // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); m_eConfigType = eConfigType ; m_sResourceType = sResource ; m_sModule = sModule ; - m_aLocale = aLocale ; - + m_aLocale = aLocale ; + aWriteLock.unlock(); // <- SAFE ---------------------------------- @@ -439,7 +439,7 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType } else { - xShare = getOrCreateRootStorageShare(); + xShare = getOrCreateRootStorageShare(); xUser = getOrCreateRootStorageUser(); } @@ -451,7 +451,7 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType // existing ones only! // b) inside user layer we can (SOFT mode!) but sometimes we shouldnt (HARD mode!) // create new empty structures. We should preferr using of any existing structure. - sal_Int32 eShareMode = (css::embed::ElementModes::READ | css::embed::ElementModes::NOCREATE); + sal_Int32 eShareMode = (css::embed::ElementModes::READ | css::embed::ElementModes::NOCREATE); sal_Int32 eUserMode = (css::embed::ElementModes::READWRITE ); ::rtl::OUStringBuffer sRelPathBuf(1024); @@ -465,14 +465,14 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType sRelPathBuf.append(SUBSTORAGE_GLOBAL); sRelPathBuf.append(PATH_SEPERATOR ); sRelPathBuf.append(sResource ); - sRelPathShare = sRelPathBuf.makeStringAndClear(); + sRelPathShare = sRelPathBuf.makeStringAndClear(); sRelPathUser = sRelPathShare; xShare = impl_openPathIgnoringErrors(sRelPathShare, eShareMode, sal_True ); xUser = impl_openPathIgnoringErrors(sRelPathUser , eUserMode , sal_False); } break; - + case E_MODULES : { sRelPathBuf.append(SUBSTORAGE_MODULES); @@ -480,7 +480,7 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType sRelPathBuf.append(sModule ); sRelPathBuf.append(PATH_SEPERATOR ); sRelPathBuf.append(sResource ); - sRelPathShare = sRelPathBuf.makeStringAndClear(); + sRelPathShare = sRelPathBuf.makeStringAndClear(); sRelPathUser = sRelPathShare; xShare = impl_openPathIgnoringErrors(sRelPathShare, eShareMode, sal_True ); @@ -495,7 +495,7 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType // So we open the user layer here only and set the share layer equals to it .-) sRelPathBuf.append(sResource); - sRelPathUser = sRelPathBuf.makeStringAndClear(); + sRelPathUser = sRelPathBuf.makeStringAndClear(); sRelPathShare = sRelPathUser; try @@ -524,7 +524,7 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType // Fallbacks are allowed there. ::comphelper::Locale aShareLocale = aLocale ; ::rtl::OUString sLocalizedSharePath(sRelPathShare); - sal_Bool bAllowFallbacks = sal_True ; + sal_Bool bAllowFallbacks = sal_True ; xShare = impl_openLocalizedPathIgnoringErrors(sLocalizedSharePath, eShareMode, sal_True , aShareLocale, bAllowFallbacks); // The try to locate the right sub dir inside user layer ... without using fallbacks! @@ -532,30 +532,30 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType // Because we allow creation of storages inside user layer by default. ::comphelper::Locale aUserLocale = aLocale ; ::rtl::OUString sLocalizedUserPath(sRelPathUser); - bAllowFallbacks = sal_False ; + bAllowFallbacks = sal_False ; xUser = impl_openLocalizedPathIgnoringErrors(sLocalizedUserPath, eUserMode , sal_False, aUserLocale, bAllowFallbacks); - + sRelPathShare = sLocalizedSharePath; sRelPathUser = sLocalizedUserPath ; } - + // read content of level 3 (presets, targets) css::uno::Reference< css::container::XNameAccess > xAccess ; css::uno::Sequence< ::rtl::OUString > lNames ; const ::rtl::OUString* pNames ; sal_Int32 c ; sal_Int32 i ; - OUStringList lPresets; - OUStringList lTargets; - - // read preset names of share layer + OUStringList lPresets; + OUStringList lTargets; + + // read preset names of share layer xAccess = css::uno::Reference< css::container::XNameAccess >(xShare, css::uno::UNO_QUERY); if (xAccess.is()) { lNames = xAccess->getElementNames(); pNames = lNames.getConstArray(); c = lNames.getLength(); - + for (i=0; i<c; ++i) { ::rtl::OUString sTemp = pNames[i]; @@ -565,15 +565,15 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType lPresets.push_back(sTemp); } } - - // read preset names of user layer + + // read preset names of user layer xAccess = css::uno::Reference< css::container::XNameAccess >(xUser, css::uno::UNO_QUERY); if (xAccess.is()) { lNames = xAccess->getElementNames(); pNames = lNames.getConstArray(); c = lNames.getLength(); - + for (i=0; i<c; ++i) { ::rtl::OUString sTemp = pNames[i]; @@ -583,10 +583,10 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType lTargets.push_back(sTemp); } } - + // SAFE -> ---------------------------------- aWriteLock.lock(); - + m_xWorkingStorageShare = xShare ; m_xWorkingStorageNoLang= xNoLang; m_xWorkingStorageUser = xUser ; @@ -595,7 +595,7 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType m_sRelPathShare = sRelPathShare; m_sRelPathNoLang = sRelPathNoLang; m_sRelPathUser = sRelPathUser; - + aWriteLock.unlock(); // <- SAFE ---------------------------------- @@ -609,13 +609,13 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType } } -//----------------------------------------------- +//----------------------------------------------- void PresetHandler::copyPresetToTarget(const ::rtl::OUString& sPreset, const ::rtl::OUString& sTarget) { // dont check our preset list, if element exists - // We try to open it and forward all errors to the user! - + // We try to open it and forward all errors to the user! + // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); css::uno::Reference< css::embed::XStorage > xWorkingShare = m_xWorkingStorageShare; @@ -629,13 +629,13 @@ void PresetHandler::copyPresetToTarget(const ::rtl::OUString& sPreset, (!xWorkingShare.is()) || (!xWorkingUser.is() ) ) - { + { return; } - + ::rtl::OUString sPresetFile(sPreset); sPresetFile += FILE_EXTENSION; - + ::rtl::OUString sTargetFile(sTarget); sTargetFile += FILE_EXTENSION; @@ -646,13 +646,13 @@ void PresetHandler::copyPresetToTarget(const ::rtl::OUString& sPreset, xWorkingUser->removeElement(sTargetFile); xWorkingShare->copyElementTo(sPresetFile, xWorkingUser, sTargetFile); - + // If our storages work in transacted mode, we have // to commit all changes from bottom to top! commitUserChanges(); } -//----------------------------------------------- +//----------------------------------------------- css::uno::Reference< css::io::XStream > PresetHandler::openPreset(const ::rtl::OUString& sPreset, sal_Bool bUseNoLangGlobal) { @@ -661,11 +661,11 @@ css::uno::Reference< css::io::XStream > PresetHandler::openPreset(const ::rtl::O css::uno::Reference< css::embed::XStorage > xFolder = bUseNoLangGlobal? m_xWorkingStorageNoLang: m_xWorkingStorageShare; aReadLock.unlock(); // <- SAFE ---------------------------------- - + // e.g. module without any config data ?! if (!xFolder.is()) return css::uno::Reference< css::io::XStream >(); - + ::rtl::OUString sFile(sPreset); sFile += FILE_EXTENSION; @@ -674,7 +674,7 @@ css::uno::Reference< css::io::XStream > PresetHandler::openPreset(const ::rtl::O return xStream; } -//----------------------------------------------- +//----------------------------------------------- css::uno::Reference< css::io::XStream > PresetHandler::openTarget(const ::rtl::OUString& sTarget , sal_Bool bCreateIfMissing) { @@ -683,14 +683,14 @@ css::uno::Reference< css::io::XStream > PresetHandler::openTarget(const ::rtl::O css::uno::Reference< css::embed::XStorage > xFolder = m_xWorkingStorageUser; aReadLock.unlock(); // <- SAFE ---------------------------------- - + // e.g. module without any config data ?! if (!xFolder.is()) return css::uno::Reference< css::io::XStream >(); - + ::rtl::OUString sFile(sTarget); sFile += FILE_EXTENSION; - + sal_Int32 nOpenMode = css::embed::ElementModes::READWRITE; if (!bCreateIfMissing) nOpenMode |= css::embed::ElementModes::NOCREATE; @@ -703,7 +703,7 @@ css::uno::Reference< css::io::XStream > PresetHandler::openTarget(const ::rtl::O return xStream; } catch(const css::uno::RuntimeException&) - { throw; } + { throw; } catch(const css::uno::Exception&) { xStream.clear(); } @@ -711,7 +711,7 @@ css::uno::Reference< css::io::XStream > PresetHandler::openTarget(const ::rtl::O // inform user about errors (use original exceptions!) nOpenMode &= ~css::embed::ElementModes::WRITE; xStream = xFolder->openStreamElement(sFile, nOpenMode); - + return xStream; } @@ -724,15 +724,15 @@ void PresetHandler::commitUserChanges() EConfigType eCfgType = m_eConfigType; aReadLock.unlock(); // <- SAFE ---------------------------------- - + // e.g. module without any config data ?! if (!xWorking.is()) return; - + ::rtl::OUString sPath; - + switch(eCfgType) - { + { case E_GLOBAL : case E_MODULES : { @@ -741,7 +741,7 @@ void PresetHandler::commitUserChanges() m_aSharedStorages->m_lStoragesUser.notifyPath(sPath); } break; - + case E_DOCUMENT : { sPath = m_lDocumentStorages.getPathOfStorage(xWorking); @@ -752,7 +752,7 @@ void PresetHandler::commitUserChanges() } } -//----------------------------------------------- +//----------------------------------------------- void PresetHandler::addStorageListener(IStorageListener* pListener) { // SAFE -> ---------------------------------- @@ -764,7 +764,7 @@ void PresetHandler::addStorageListener(IStorageListener* pListener) if (!sRelPath.getLength()) return; - + switch(eCfgType) { case E_GLOBAL : @@ -773,7 +773,7 @@ void PresetHandler::addStorageListener(IStorageListener* pListener) m_aSharedStorages->m_lStoragesUser.addStorageListener(pListener, sRelPath); } break; - + case E_DOCUMENT : { m_lDocumentStorages.addStorageListener(pListener, sRelPath); @@ -782,7 +782,7 @@ void PresetHandler::addStorageListener(IStorageListener* pListener) } } -//----------------------------------------------- +//----------------------------------------------- void PresetHandler::removeStorageListener(IStorageListener* pListener) { // SAFE -> ---------------------------------- @@ -794,7 +794,7 @@ void PresetHandler::removeStorageListener(IStorageListener* pListener) if (!sRelPath.getLength()) return; - + switch(eCfgType) { case E_GLOBAL : @@ -803,7 +803,7 @@ void PresetHandler::removeStorageListener(IStorageListener* pListener) m_aSharedStorages->m_lStoragesUser.removeStorageListener(pListener, sRelPath); } break; - + case E_DOCUMENT : { m_lDocumentStorages.removeStorageListener(pListener, sRelPath); @@ -840,7 +840,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openPathIgnoring ::std::vector< ::rtl::OUString >::const_iterator pFound = lLocalizedValues.end(); if (bAllowFallbacks) { - pFound = ::comphelper::Locale::getFallback(lLocalizedValues, aLocale.toISO()); + pFound = ::comphelper::Locale::getFallback(lLocalizedValues, aLocale.toISO()); } else { @@ -861,7 +861,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openPathIgnoring const ::rtl::OUString& sISOLocale = *pFound; aLocale.fromISO(sISOLocale); } - + return pFound; } @@ -881,8 +881,8 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openLocalizedPat (pLocaleFolder == lSubFolders.end() ) && ((eMode & css::embed::ElementModes::NOCREATE) == css::embed::ElementModes::NOCREATE) ) - return css::uno::Reference< css::embed::XStorage >(); - + return css::uno::Reference< css::embed::XStorage >(); + // it doesnt matter, if there is a locale fallback or not // If creation of storages is allowed, we do it anyway. // Otherwhise we have no acc config at all, which can make other trouble. @@ -900,7 +900,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openLocalizedPat sPath = sLocalizedPath; else sPath = ::rtl::OUString(); - + return xLocalePath; } @@ -916,7 +916,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openLocalizedPat const ::rtl::OUString* pNames = lNames.getConstArray(); sal_Int32 c = lNames.getLength(); sal_Int32 i = 0; - + for (i=0; i<c; ++i) { try @@ -933,5 +933,5 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openLocalizedPat return lSubFolders; } -//----------------------------------------------- +//----------------------------------------------- } // namespace framework diff --git a/framework/source/accelerators/storageholder.cxx b/framework/source/accelerators/storageholder.cxx index 48c45e819334..33776d8c7fc1 100644 --- a/framework/source/accelerators/storageholder.cxx +++ b/framework/source/accelerators/storageholder.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -87,7 +87,7 @@ namespace framework { -namespace css = ::com::sun::star; +namespace css = ::com::sun::star; //----------------------------------------------- StorageHolder::StorageHolder() @@ -126,7 +126,7 @@ void StorageHolder::forgetCachedStorages() rInfo.Storage.clear(); } m_lStorages.clear(); - + aWriteLock.unlock(); // <- SAFE ---------------------------------- } @@ -156,7 +156,7 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openPath(const ::rtl: { ::rtl::OUString sNormedPath = StorageHolder::impl_st_normPath(sPath); OUStringList lFolders = StorageHolder::impl_st_parsePath(sNormedPath); - + // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); css::uno::Reference< css::embed::XStorage > xParent = m_xRoot; @@ -164,9 +164,9 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openPath(const ::rtl: // <- SAFE ---------------------------------- css::uno::Reference< css::embed::XStorage > xChild ; - ::rtl::OUString sRelPath; + ::rtl::OUString sRelPath; OUStringList::const_iterator pIt ; - + for ( pIt = lFolders.begin(); pIt != lFolders.end() ; ++pIt ) @@ -175,7 +175,7 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openPath(const ::rtl: ::rtl::OUString sCheckPath (sRelPath); sCheckPath += sChild; sCheckPath += PATH_SEPERATOR; - + // SAFE -> ------------------------------ aReadLock.lock(); @@ -188,7 +188,7 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openPath(const ::rtl: pInfo = &(pCheck->second); ++(pInfo->UseCount); xChild = pInfo->Storage; - } + } else { aReadLock.unlock(); @@ -214,24 +214,24 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openPath(const ::rtl: */ throw exAny; } - + // SAFE -> ------------------------------ WriteGuard aWriteLock(m_aLock); - pInfo = &(m_lStorages[sCheckPath]); + pInfo = &(m_lStorages[sCheckPath]); pInfo->Storage = xChild; - pInfo->UseCount = 1; + pInfo->UseCount = 1; aWriteLock.unlock(); // <- SAFE ------------------------------ } - + xParent = xChild; sRelPath += sChild; sRelPath += PATH_SEPERATOR; - } - + } + // TODO think about return last storage as working storage ... but dont caching it inside this holder! // => otherwhise the same storage is may be commit more then once. - + return xChild; } @@ -240,14 +240,14 @@ StorageHolder::TStorageList StorageHolder::getAllPathStorages(const ::rtl::OUStr { ::rtl::OUString sNormedPath = StorageHolder::impl_st_normPath(sPath); OUStringList lFolders = StorageHolder::impl_st_parsePath(sNormedPath); - + StorageHolder::TStorageList lStoragesOfPath; - ::rtl::OUString sRelPath ; + ::rtl::OUString sRelPath ; OUStringList::const_iterator pIt ; - + // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); - + for ( pIt = lFolders.begin(); pIt != lFolders.end() ; ++pIt ) @@ -256,7 +256,7 @@ StorageHolder::TStorageList StorageHolder::getAllPathStorages(const ::rtl::OUStr ::rtl::OUString sCheckPath (sRelPath); sCheckPath += sChild; sCheckPath += PATH_SEPERATOR; - + TPath2StorageInfo::iterator pCheck = m_lStorages.find(sCheckPath); if (pCheck == m_lStorages.end()) { @@ -271,11 +271,11 @@ StorageHolder::TStorageList StorageHolder::getAllPathStorages(const ::rtl::OUStr sRelPath += sChild; sRelPath += PATH_SEPERATOR; - } - + } + aReadLock.unlock(); // <- SAFE ---------------------------------- - + return lStoragesOfPath; } @@ -283,25 +283,25 @@ StorageHolder::TStorageList StorageHolder::getAllPathStorages(const ::rtl::OUStr void StorageHolder::commitPath(const ::rtl::OUString& sPath) { StorageHolder::TStorageList lStorages = getAllPathStorages(sPath); - + css::uno::Reference< css::embed::XTransactedObject > xCommit; StorageHolder::TStorageList::reverse_iterator pIt; for ( pIt = lStorages.rbegin(); // order of commit is important ... otherwhise changes are not recognized! pIt != lStorages.rend() ; - ++pIt ) + ++pIt ) { xCommit = css::uno::Reference< css::embed::XTransactedObject >(*pIt, css::uno::UNO_QUERY); if (!xCommit.is()) continue; - xCommit->commit(); + xCommit->commit(); } - + // SAFE -> ------------------------------ ReadGuard aReadLock(m_aLock); xCommit = css::uno::Reference< css::embed::XTransactedObject >(m_xRoot, css::uno::UNO_QUERY); aReadLock.unlock(); // <- SAFE ------------------------------ - + if (xCommit.is()) xCommit->commit(); } @@ -311,7 +311,7 @@ void StorageHolder::closePath(const ::rtl::OUString& rPath) { ::rtl::OUString sNormedPath = StorageHolder::impl_st_normPath(rPath); OUStringList lFolders = StorageHolder::impl_st_parsePath(sNormedPath); - + /* convert list of pathes in the following way: [0] = "path_1" => "path_1 [1] = "path_2" => "path_1/path_2" @@ -326,13 +326,13 @@ void StorageHolder::closePath(const ::rtl::OUString& rPath) ::rtl::OUString sCurrentRelPath = sParentPath; sCurrentRelPath += *pIt1; sCurrentRelPath += PATH_SEPERATOR; - *pIt1 = sCurrentRelPath; - sParentPath = sCurrentRelPath; + *pIt1 = sCurrentRelPath; + sParentPath = sCurrentRelPath; } // SAFE -> ------------------------------ ReadGuard aReadLock(m_aLock); - + OUStringList::reverse_iterator pIt2; for ( pIt2 = lFolders.rbegin(); pIt2 != lFolders.rend() ; @@ -342,16 +342,16 @@ void StorageHolder::closePath(const ::rtl::OUString& rPath) TPath2StorageInfo::iterator pPath = m_lStorages.find(sPath); if (pPath == m_lStorages.end()) continue; // ??? - + TStorageInfo& rInfo = pPath->second; --rInfo.UseCount; if (rInfo.UseCount < 1) { rInfo.Storage.clear(); m_lStorages.erase(pPath); - } + } } - + aReadLock.unlock(); // <- SAFE ------------------------------ } @@ -360,25 +360,25 @@ void StorageHolder::closePath(const ::rtl::OUString& rPath) void StorageHolder::notifyPath(const ::rtl::OUString& sPath) { ::rtl::OUString sNormedPath = StorageHolder::impl_st_normPath(sPath); - + // SAFE -> ------------------------------ ReadGuard aReadLock(m_aLock); - + TPath2StorageInfo::iterator pIt1 = m_lStorages.find(sNormedPath); if (pIt1 == m_lStorages.end()) return; - + TStorageInfo& rInfo = pIt1->second; TStorageListenerList::iterator pIt2; for ( pIt2 = rInfo.Listener.begin(); pIt2 != rInfo.Listener.end() ; ++pIt2 ) - { + { IStorageListener* pListener = *pIt2; if (pListener) pListener->changesOccured(sNormedPath); } - + aReadLock.unlock(); // <- SAFE ------------------------------ } @@ -388,19 +388,19 @@ void StorageHolder::addStorageListener( IStorageListener* pListener, const ::rtl::OUString& sPath ) { ::rtl::OUString sNormedPath = StorageHolder::impl_st_normPath(sPath); - + // SAFE -> ------------------------------ ReadGuard aReadLock(m_aLock); - + TPath2StorageInfo::iterator pIt1 = m_lStorages.find(sNormedPath); if (pIt1 == m_lStorages.end()) return; - + TStorageInfo& rInfo = pIt1->second; TStorageListenerList::iterator pIt2 = ::std::find(rInfo.Listener.begin(), rInfo.Listener.end(), pListener); if (pIt2 == rInfo.Listener.end()) rInfo.Listener.push_back(pListener); - + aReadLock.unlock(); // <- SAFE ------------------------------ } @@ -410,29 +410,29 @@ void StorageHolder::removeStorageListener( IStorageListener* pListener, const ::rtl::OUString& sPath ) { ::rtl::OUString sNormedPath = StorageHolder::impl_st_normPath(sPath); - + // SAFE -> ------------------------------ ReadGuard aReadLock(m_aLock); - + TPath2StorageInfo::iterator pIt1 = m_lStorages.find(sNormedPath); if (pIt1 == m_lStorages.end()) return; - + TStorageInfo& rInfo = pIt1->second; TStorageListenerList::iterator pIt2 = ::std::find(rInfo.Listener.begin(), rInfo.Listener.end(), pListener); if (pIt2 != rInfo.Listener.end()) rInfo.Listener.erase(pIt2); - + aReadLock.unlock(); // <- SAFE ------------------------------ } - + //----------------------------------------------- ::rtl::OUString StorageHolder::getPathOfStorage(const css::uno::Reference< css::embed::XStorage >& xStorage) { // SAFE -> ------------------------------ ReadGuard aReadLock(m_aLock); - + TPath2StorageInfo::const_iterator pIt; for ( pIt = m_lStorages.begin(); pIt != m_lStorages.end() ; @@ -447,7 +447,7 @@ void StorageHolder::removeStorageListener( IStorageListener* pListener, return ::rtl::OUString(); return pIt->first; - + // <- SAFE ------------------------------ } @@ -464,7 +464,7 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::getParentStorage(cons // normed path = "a/b/c/" ... we search for "a/b/" ::rtl::OUString sNormedPath = StorageHolder::impl_st_normPath(sChildPath); OUStringList lFolders = StorageHolder::impl_st_parsePath(sNormedPath); - sal_Int32 c = lFolders.size(); + sal_Int32 c = lFolders.size(); // a) "" => - => no parent // b) "a/b/c/" => "a/b/" => return storage "a/b/" @@ -472,20 +472,20 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::getParentStorage(cons // a) if (c < 1) - return css::uno::Reference< css::embed::XStorage >(); + return css::uno::Reference< css::embed::XStorage >(); // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); - + // b) if (c < 2) return m_xRoot; - + // c) ::rtl::OUString sParentPath; sal_Int32 i = 0; for (i=0; i<c-1; ++i) - { + { sParentPath += lFolders[i]; sParentPath += PATH_SEPERATOR; } @@ -493,10 +493,10 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::getParentStorage(cons TPath2StorageInfo::const_iterator pParent = m_lStorages.find(sParentPath); if (pParent != m_lStorages.end()) return pParent->second.Storage; - + aReadLock.unlock(); // <- SAFE ---------------------------------- - + // ? LOG_WARNING("StorageHolder::getParentStorage()", "Unexpected situation. Cached storage item seems to be wrong.") return css::uno::Reference< css::embed::XStorage >(); @@ -511,7 +511,7 @@ void StorageHolder::operator=(const StorageHolder& rCopy) m_xSMGR = rCopy.m_xSMGR; // ??? m_xRoot = rCopy.m_xRoot; m_lStorages = rCopy.m_lStorages; - + aWriteLock.unlock(); // <- SAFE ---------------------------------- } @@ -535,7 +535,7 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openSubStorageWithFal { throw; } catch(const css::uno::Exception& ex) { exResult = ex; } - + // b) readonly already tried? => forward last error! if ( (!bAllowFallback ) || // fallback allowed ? @@ -550,10 +550,10 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openSubStorageWithFal css::uno::Reference< css::embed::XStorage > xSubStorage = xBaseStorage->openStorageElement(sSubStorage, eNewMode); if (xSubStorage.is()) return xSubStorage; - + // d) no chance! - LOG_WARNING("openSubStorageWithFallback()", "Unexpected situation! Got no exception for missing storage ...") - return css::uno::Reference< css::embed::XStorage >(); + LOG_WARNING("openSubStorageWithFallback()", "Unexpected situation! Got no exception for missing storage ...") + return css::uno::Reference< css::embed::XStorage >(); } //----------------------------------------------- @@ -575,7 +575,7 @@ css::uno::Reference< css::io::XStream > StorageHolder::openSubStreamWithFallback { throw; } catch(const css::uno::Exception& ex) { exResult = ex; } - + // b) readonly already tried? => forward last error! if ( (!bAllowFallback ) || // fallback allowed ? @@ -590,19 +590,19 @@ css::uno::Reference< css::io::XStream > StorageHolder::openSubStreamWithFallback css::uno::Reference< css::io::XStream > xSubStream = xBaseStorage->openStreamElement(sSubStream, eNewMode); if (xSubStream.is()) return xSubStream; - + // d) no chance! - LOG_WARNING("openSubStreamWithFallbacks()", "Unexpected situation! Got no exception for missing stream ...") - return css::uno::Reference< css::io::XStream >(); + LOG_WARNING("openSubStreamWithFallbacks()", "Unexpected situation! Got no exception for missing stream ...") + return css::uno::Reference< css::io::XStream >(); } //----------------------------------------------- ::rtl::OUString StorageHolder::impl_st_normPath(const ::rtl::OUString& sPath) { // path must start without "/" but end with "/"! - + ::rtl::OUString sNormedPath = sPath; - + // "/bla" => "bla" && "/" => "" (!) if (sNormedPath.indexOf(PATH_SEPERATOR) == 0) sNormedPath += sNormedPath.copy(1); @@ -610,12 +610,12 @@ css::uno::Reference< css::io::XStream > StorageHolder::openSubStreamWithFallback // "/" => "" || "" => "" ? if (sNormedPath.getLength() < 1) return ::rtl::OUString(); - + // "bla" => "bla/" if (sNormedPath.lastIndexOf(PATH_SEPERATOR) != (sNormedPath.getLength()-1)) sNormedPath += PATH_SEPERATOR; - - return sNormedPath; + + return sNormedPath; } //----------------------------------------------- @@ -630,8 +630,8 @@ OUStringList StorageHolder::impl_st_parsePath(const ::rtl::OUString& sPath) break; lToken.push_back(sToken); } - return lToken; -} + return lToken; +} //=============================================== } // namespace framework diff --git a/framework/source/application/framework.cxx b/framework/source/application/framework.cxx index 5533b1f32ad4..76044ae6bb51 100644 --- a/framework/source/application/framework.cxx +++ b/framework/source/application/framework.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #ifndef __FRAMEWORK_HELPER_OINSTANCEPROVIDER_HXX_ @@ -43,7 +43,7 @@ #endif //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/frame/XDesktop.hpp> #include <com/sun/star/frame/XFrame.hpp> @@ -65,7 +65,7 @@ #endif //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <comphelper/processfactory.hxx> #include <com/sun/star/uno/Reference.hxx> @@ -78,43 +78,43 @@ #include <vos/process.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ -using namespace ::rtl ; -using namespace ::vos ; -using namespace ::comphelper ; -using namespace ::framework ; -using namespace ::com::sun::star::uno ; -using namespace ::com::sun::star::lang ; -using namespace ::com::sun::star::frame ; -using namespace ::com::sun::star::awt ; -using namespace ::com::sun::star::beans ; -using namespace ::com::sun::star::util ; -using namespace ::com::sun::star::connection ; -using namespace ::com::sun::star::bridge ; +using namespace ::rtl ; +using namespace ::vos ; +using namespace ::comphelper ; +using namespace ::framework ; +using namespace ::com::sun::star::uno ; +using namespace ::com::sun::star::lang ; +using namespace ::com::sun::star::frame ; +using namespace ::com::sun::star::awt ; +using namespace ::com::sun::star::beans ; +using namespace ::com::sun::star::util ; +using namespace ::com::sun::star::connection ; +using namespace ::com::sun::star::bridge ; //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ -#define APPLICATIONNAME "FrameWork" -#define COMMANDARGUMENT_PLUGIN DECLARE_ASCII("-plugin" ) -#define NAME_PLUGINBRIDGE DECLARE_ASCII("mozilla plugin bridge" ) -#define PROTOCOL_PLUGINBRIDGE DECLARE_ASCII("urp" ) +#define APPLICATIONNAME "FrameWork" +#define COMMANDARGUMENT_PLUGIN DECLARE_ASCII("-plugin" ) +#define NAME_PLUGINBRIDGE DECLARE_ASCII("mozilla plugin bridge" ) +#define PROTOCOL_PLUGINBRIDGE DECLARE_ASCII("urp" ) //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** - @short normal application - @descr An instance of these class can be a normal node in frame tree only. The highest level to be allowed is 3! + @short normal application + @descr An instance of these class can be a normal node in frame tree only. The highest level to be allowed is 3! On 1 stand the desktop himself as the only one, on 2 are all tasks present ... and then comes frames only. A frame support influencing of his subtree, find of subframes, activate- and deactivate-mechanism as well as set/get of a frame window, component or controller. - @implements XInterface + @implements XInterface XTypeProvider XServiceInfo XFramesSupplier @@ -129,15 +129,15 @@ using namespace ::com::sun::star::bridge ; XWindowListener XTopWindowListener [ XDebugging, if TEST_TREE is defined! ] - @base OMutexMember + @base OMutexMember OWeakObject - @devstatus deprecated + @devstatus deprecated *//*-*************************************************************************************************************/ class FrameWork : public Application { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: @@ -147,36 +147,36 @@ class FrameWork : public Application void impl_analyzeCommandArguments(); private: - sal_Bool m_bUsePlugIn ; + sal_Bool m_bUsePlugIn ; -}; // class FrameWork +}; // class FrameWork //_________________________________________________________________________________________________________________ -// definitions +// definitions //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// global variables +// global variables //_________________________________________________________________________________________________________________ -FrameWork aFrameWork ; +FrameWork aFrameWork ; //_________________________________________________________________________________________________________________ -// definitions +// definitions //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// private methods +// private methods //***************************************************************************************************************** void FrameWork::impl_analyzeCommandArguments() { // First reset all member variables which present states of incoming arguments! - m_bUsePlugIn = sal_False; // depends from "/plugin" + m_bUsePlugIn = sal_False; // depends from "/plugin" // Then step over all given arguments and search for supported one. - OStartupInfo aInfo ; - OUString sArgument ; - sal_uInt32 nCount = aInfo.getCommandArgCount(); + OStartupInfo aInfo ; + OUString sArgument ; + sal_uInt32 nCount = aInfo.getCommandArgCount(); for ( sal_uInt32 nArgument=0; nArgument<nCount; ++nArgument ) { // If extraction of current argument successfull ... @@ -193,7 +193,7 @@ void FrameWork::impl_analyzeCommandArguments() } //_________________________________________________________________________________________________________________ -// main +// main //_________________________________________________________________________________________________________________ void FrameWork::Main() @@ -229,17 +229,17 @@ void FrameWork::Main() #if 0 if ( m_bUsePlugIn == sal_True ) { - Reference< XConnection > xConnection = new OPipeConnection( xGlobalServiceManager ); - Reference< XBridgeFactory > xBridgeFactory ( xGlobalServiceManager->createInstance( SERVICENAME_BRIDGEFACTORY ), UNO_QUERY ); - if ( - ( xConnection.is() == sal_True ) && - ( xBridgeFactory.is() == sal_True ) + Reference< XConnection > xConnection = new OPipeConnection( xGlobalServiceManager ); + Reference< XBridgeFactory > xBridgeFactory ( xGlobalServiceManager->createInstance( SERVICENAME_BRIDGEFACTORY ), UNO_QUERY ); + if ( + ( xConnection.is() == sal_True ) && + ( xBridgeFactory.is() == sal_True ) ) { - Reference< XBridge > xBridge = xBridgeFactory->createBridge( NAME_PLUGINBRIDGE , - PROTOCOL_PLUGINBRIDGE , - xConnection , - new OInstanceProvider( xGlobalServiceManager ) ); + Reference< XBridge > xBridge = xBridgeFactory->createBridge( NAME_PLUGINBRIDGE , + PROTOCOL_PLUGINBRIDGE , + xConnection , + new OInstanceProvider( xGlobalServiceManager ) ); } else { @@ -267,7 +267,7 @@ void FrameWork::Main() xDispatch->dispatch( aURL, Sequence< PropertyValue >() ); // Use special feature of desktop service and log current tree state in file. -// LOG_TREE( xDesktop ) +// LOG_TREE( xDesktop ) // Build URL ... sURL = OUString( RTL_CONSTASCII_USTRINGPARAM( "file://d|/menu.htm" )); @@ -277,7 +277,7 @@ void FrameWork::Main() xDispatch->dispatch( aURL, Sequence< PropertyValue >() ); // Use special feature of desktop service and log current tree state in file. -// LOG_TREE( xDesktop ) +// LOG_TREE( xDesktop ) } // Set running-mode for application. diff --git a/framework/source/application/login.cxx b/framework/source/application/login.cxx index a8b7df2d74b3..b3cad049ba95 100644 --- a/framework/source/application/login.cxx +++ b/framework/source/application/login.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #ifndef __FRAMEWORK_SERVICES_LOGINDIALOG_HXX_ @@ -41,14 +41,14 @@ #include <services.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/awt/XDialog.hpp> #include <com/sun/star/beans/XPropertySet.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <comphelper/processfactory.hxx> #include <com/sun/star/uno/Reference.hxx> @@ -63,11 +63,11 @@ #include <stdio.h> //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ -#define TEMPFILE_ENCODING RTL_TEXTENCODING_UTF8 // encoding of written temp. ascii file -#define LOGIN_RDB DECLARE_ASCII("login.rdb") // name of our own registry file - neccessary to create own servicemanager +#define TEMPFILE_ENCODING RTL_TEXTENCODING_UTF8 // encoding of written temp. ascii file +#define LOGIN_RDB DECLARE_ASCII("login.rdb") // name of our own registry file - neccessary to create own servicemanager #define SEPERATOR "\n" // used to seperate parts in temp. file #define MINARGUMENTCOUNT 1 // count of min. required arguments @@ -78,68 +78,68 @@ #define ARGUMENT_DIALOGPARENT DECLARE_ASCII("-p=") // we support "-p=36748322" as window handle of parent for vcl dialog //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ -using namespace ::rtl ; -using namespace ::vos ; -using namespace ::comphelper ; -using namespace ::framework ; -using namespace ::com::sun::star::uno ; -using namespace ::com::sun::star::lang ; -using namespace ::com::sun::star::awt ; -using namespace ::com::sun::star::beans ; +using namespace ::rtl ; +using namespace ::vos ; +using namespace ::comphelper ; +using namespace ::framework ; +using namespace ::com::sun::star::uno ; +using namespace ::com::sun::star::lang ; +using namespace ::com::sun::star::awt ; +using namespace ::com::sun::star::beans ; //_________________________________________________________________________________________________________________ -// defines +// defines //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** - @short implement command application to show login dialog and save his information in temp. file! - @descr We need this temp. file to share informations between our dialog and different processes, which + @short implement command application to show login dialog and save his information in temp. file! + @descr We need this temp. file to share informations between our dialog and different processes, which can't use vcl directly. Caller of this executable give us the file name as an argument - we save all informations in it - caller can read it and MUST delete temp. file. This is neccessary for example; to hide the password! - @implements - + @implements - - @base Application + @base Application *//*-*************************************************************************************************************/ class LoginApplication : public Application { //************************************************************************************************************* - // public methods + // public methods //************************************************************************************************************* public: void Main(); //************************************************************************************************************* - // private methods + // private methods //************************************************************************************************************* private: - void impl_parseCommandline(); // search supported arguments on command line + void impl_parseCommandline(); // search supported arguments on command line //************************************************************************************************************* - // private variables + // private variables //************************************************************************************************************* private: OString m_sTempFile ; // name of temp. file in system notation sal_Int32 m_nParentHandle ; // a parent window handle for used vcl dialog -}; // class LoginApplication +}; // class LoginApplication //_________________________________________________________________________________________________________________ -// global variables +// global variables //_________________________________________________________________________________________________________________ -LoginApplication gLoginApplication; +LoginApplication gLoginApplication; //_________________________________________________________________________________________________________________ -// main +// main //_________________________________________________________________________________________________________________ void LoginApplication::Main() @@ -156,14 +156,14 @@ void LoginApplication::Main() // Try to get neccessary dialog service. // By the way - cast it to interface XPropertySet too - we need it later. // (define SERVICENAME... comes from defines.hxx!) - Reference< XDialog > xLoginDialog( xServiceManager->createInstance( SERVICENAME_LOGINDIALOG ), UNO_QUERY ); - Reference< XPropertySet > xPropertySet( xLoginDialog , UNO_QUERY ); + Reference< XDialog > xLoginDialog( xServiceManager->createInstance( SERVICENAME_LOGINDIALOG ), UNO_QUERY ); + Reference< XPropertySet > xPropertySet( xLoginDialog , UNO_QUERY ); // Work with valid ressources only! // Otherwise do nothing ... - if ( - ( xLoginDialog.is() == sal_True ) && - ( xPropertySet.is() == sal_True ) && + if ( + ( xLoginDialog.is() == sal_True ) && + ( xPropertySet.is() == sal_True ) && ( m_sTempFile.getLength() > 0 ) ) { @@ -182,21 +182,21 @@ void LoginApplication::Main() // Show login dialog and get decision of user. sal_Bool bDecision = (sal_Bool)(xLoginDialog->execute()); - OUString sUserName ; - OUString sPassword ; - OUString sServer ; - OUString sConnectionType ; - sal_Int32 nPort=0 ; // We need this default if follow "if"-statement "failed"! + OUString sUserName ; + OUString sPassword ; + OUString sServer ; + OUString sConnectionType ; + sal_Int32 nPort=0 ; // We need this default if follow "if"-statement "failed"! // If user say "OK" ... get values from dialog. // If user say "NO" ... leave it. Then we save empty informations later ... if( bDecision == sal_True ) { // defines PROPERTYNAME... comes from logindialog.hxx! - xPropertySet->getPropertyValue( PROPERTYNAME_USERNAME ) >>= sUserName ; - xPropertySet->getPropertyValue( PROPERTYNAME_PASSWORD ) >>= sPassword ; - xPropertySet->getPropertyValue( PROPERTYNAME_SERVER ) >>= sServer ; - xPropertySet->getPropertyValue( PROPERTYNAME_CONNECTIONTYPE ) >>= sConnectionType ; + xPropertySet->getPropertyValue( PROPERTYNAME_USERNAME ) >>= sUserName ; + xPropertySet->getPropertyValue( PROPERTYNAME_PASSWORD ) >>= sPassword ; + xPropertySet->getPropertyValue( PROPERTYNAME_SERVER ) >>= sServer ; + xPropertySet->getPropertyValue( PROPERTYNAME_CONNECTIONTYPE ) >>= sConnectionType ; if( sConnectionType.getLength() > 0 ) { xPropertySet->getPropertyValue( sConnectionType ) >>= nPort; @@ -221,15 +221,15 @@ void LoginApplication::Main() sBuffer.appendAscii( "0" ); } sBuffer.appendAscii ( SEPERATOR ); - sBuffer.append ( sUserName ); + sBuffer.append ( sUserName ); sBuffer.appendAscii ( SEPERATOR ); - sBuffer.append ( sPassword ); + sBuffer.append ( sPassword ); sBuffer.appendAscii ( SEPERATOR ); - sBuffer.append ( sServer ); + sBuffer.append ( sServer ); sBuffer.appendAscii ( SEPERATOR ); - sBuffer.append ( sConnectionType ); + sBuffer.append ( sConnectionType ); sBuffer.appendAscii ( SEPERATOR ); - sBuffer.append ( nPort ); + sBuffer.append ( nPort ); sBuffer.appendAscii ( SEPERATOR ); // Write informations in temp. file. @@ -240,14 +240,14 @@ void LoginApplication::Main() if( pFile != NULL ) { OString sEncodedOut = U2B_ENC( sBuffer.makeStringAndClear(), TEMPFILE_ENCODING ); - fprintf( pFile, sEncodedOut.getStr() ); - fclose ( pFile ); + fprintf( pFile, sEncodedOut.getStr() ); + fclose ( pFile ); } } } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** void LoginApplication::impl_parseCommandline() { @@ -256,9 +256,9 @@ void LoginApplication::impl_parseCommandline() // Set it on our member. Caller of this method must control setted values. OStartupInfo aInfo; - sal_uInt32 nCount = aInfo.getCommandArgCount() ; - sal_uInt32 nArgument = 0 ; - OUString sArgument ; + sal_uInt32 nCount = aInfo.getCommandArgCount() ; + sal_uInt32 nArgument = 0 ; + OUString sArgument ; OUString sValue ; // Warn programmer if argument count isnt ok! diff --git a/framework/source/classes/actiontriggercontainer.cxx b/framework/source/classes/actiontriggercontainer.cxx index 6152ab5f0969..ea549fd3fda8 100644 --- a/framework/source/classes/actiontriggercontainer.cxx +++ b/framework/source/classes/actiontriggercontainer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -156,12 +156,12 @@ Sequence< Type > SAL_CALL ActionTriggerContainer::getTypes() throw ( RuntimeExce { // Create a static typecollection ... static ::cppu::OTypeCollection aTypeCollection( - ::getCppuType(( const Reference< XMultiServiceFactory >*)NULL ) , - ::getCppuType(( const Reference< XIndexContainer >*)NULL ) , - ::getCppuType(( const Reference< XIndexAccess >*)NULL ) , - ::getCppuType(( const Reference< XIndexReplace >*)NULL ) , - ::getCppuType(( const Reference< XServiceInfo >*)NULL ) , - ::getCppuType(( const Reference< XTypeProvider >*)NULL ) ) ; + ::getCppuType(( const Reference< XMultiServiceFactory >*)NULL ) , + ::getCppuType(( const Reference< XIndexContainer >*)NULL ) , + ::getCppuType(( const Reference< XIndexAccess >*)NULL ) , + ::getCppuType(( const Reference< XIndexReplace >*)NULL ) , + ::getCppuType(( const Reference< XServiceInfo >*)NULL ) , + ::getCppuType(( const Reference< XTypeProvider >*)NULL ) ) ; // ... and set his address to static pointer! pTypeCollection = &aTypeCollection ; diff --git a/framework/source/classes/actiontriggerpropertyset.cxx b/framework/source/classes/actiontriggerpropertyset.cxx index 8c30fde1379f..e72efe6e7cba 100644 --- a/framework/source/classes/actiontriggerpropertyset.cxx +++ b/framework/source/classes/actiontriggerpropertyset.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,7 +62,7 @@ namespace framework ActionTriggerPropertySet::ActionTriggerPropertySet( const Reference< XMultiServiceFactory >& /*xServiceManager*/ ) : ThreadHelpBase ( &Application::GetSolarMutex() ) , OBroadcastHelper ( m_aLock.getShareableOslMutex() ) - , OPropertySetHelper ( *SAL_STATIC_CAST( OBroadcastHelper *, this )) + , OPropertySetHelper ( *SAL_STATIC_CAST( OBroadcastHelper *, this )) , OWeakObject () , m_xBitmap ( 0 ) , m_xActionTriggerContainer( 0 ) @@ -147,11 +147,11 @@ Sequence< Type > SAL_CALL ActionTriggerPropertySet::getTypes() throw ( RuntimeEx { // Create a static typecollection ... static ::cppu::OTypeCollection aTypeCollection( - ::getCppuType(( const Reference< XPropertySet >*)NULL ) , - ::getCppuType(( const Reference< XFastPropertySet >*)NULL ) , - ::getCppuType(( const Reference< XMultiPropertySet >*)NULL ) , - ::getCppuType(( const Reference< XServiceInfo >*)NULL ) , - ::getCppuType(( const Reference< XTypeProvider >*)NULL ) ) ; + ::getCppuType(( const Reference< XPropertySet >*)NULL ) , + ::getCppuType(( const Reference< XFastPropertySet >*)NULL ) , + ::getCppuType(( const Reference< XMultiPropertySet >*)NULL ) , + ::getCppuType(( const Reference< XServiceInfo >*)NULL ) , + ::getCppuType(( const Reference< XTypeProvider >*)NULL ) ) ; // ... and set his address to static pointer! pTypeCollection = &aTypeCollection ; @@ -190,21 +190,21 @@ Sequence< sal_Int8 > SAL_CALL ActionTriggerPropertySet::getImplementationId() th } //--------------------------------------------------------------------------------------------------------- -// OPropertySetHelper implementation +// OPropertySetHelper implementation //--------------------------------------------------------------------------------------------------------- sal_Bool SAL_CALL ActionTriggerPropertySet::convertFastPropertyValue( - Any& aConvertedValue, - Any& aOldValue, - sal_Int32 nHandle, - const Any& aValue ) + Any& aConvertedValue, + Any& aOldValue, + sal_Int32 nHandle, + const Any& aValue ) throw( IllegalArgumentException ) { - // Check, if value of property will changed in method "setFastPropertyValue_NoBroadcast()". - // Return TRUE, if changed - else return FALSE. - // Attention: Method "impl_tryToChangeProperty()" can throw the IllegalArgumentException !!! - // Initialize return value with FALSE !!! - // (Handle can be invalid) + // Check, if value of property will changed in method "setFastPropertyValue_NoBroadcast()". + // Return TRUE, if changed - else return FALSE. + // Attention: Method "impl_tryToChangeProperty()" can throw the IllegalArgumentException !!! + // Initialize return value with FALSE !!! + // (Handle can be invalid) sal_Bool bReturn = sal_False; switch( nHandle ) @@ -350,11 +350,11 @@ const Sequence< Property > ActionTriggerPropertySet::impl_getStaticPropertyDescr { static const Property pActionTriggerPropertys[] = { - Property( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CommandURL" )), HANDLE_COMMANDURL , ::getCppuType((::rtl::OUString*)0) , PropertyAttribute::TRANSIENT ), - Property( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HelpURL" )), HANDLE_HELPURL , ::getCppuType((::rtl::OUString*)0) , PropertyAttribute::TRANSIENT ), - Property( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Image" )), HANDLE_IMAGE , ::getCppuType((Reference<XBitmap>*)0) , PropertyAttribute::TRANSIENT ), - Property( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SubContainer" )), HANDLE_SUBCONTAINER , ::getCppuType((::rtl::OUString*)0) , PropertyAttribute::TRANSIENT ), - Property( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Text" )), HANDLE_TEXT , ::getCppuType((Reference<XInterface>*)0) , PropertyAttribute::TRANSIENT ) + Property( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CommandURL" )), HANDLE_COMMANDURL , ::getCppuType((::rtl::OUString*)0) , PropertyAttribute::TRANSIENT ), + Property( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HelpURL" )), HANDLE_HELPURL , ::getCppuType((::rtl::OUString*)0) , PropertyAttribute::TRANSIENT ), + Property( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Image" )), HANDLE_IMAGE , ::getCppuType((Reference<XBitmap>*)0) , PropertyAttribute::TRANSIENT ), + Property( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SubContainer" )), HANDLE_SUBCONTAINER , ::getCppuType((::rtl::OUString*)0) , PropertyAttribute::TRANSIENT ), + Property( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Text" )), HANDLE_TEXT , ::getCppuType((Reference<XInterface>*)0) , PropertyAttribute::TRANSIENT ) }; // Use it to initialize sequence! @@ -366,13 +366,13 @@ const Sequence< Property > ActionTriggerPropertySet::impl_getStaticPropertyDescr //****************************************************************************************************************************** -// private method +// private method //****************************************************************************************************************************** sal_Bool ActionTriggerPropertySet::impl_tryToChangeProperty( - const ::rtl::OUString& sCurrentValue , - const Any& aNewValue , - Any& aOldValue , - Any& aConvertedValue ) + const ::rtl::OUString& sCurrentValue , + const Any& aNewValue , + Any& aOldValue , + Any& aConvertedValue ) throw( IllegalArgumentException ) { // Set default return value if method failed. @@ -386,16 +386,16 @@ throw( IllegalArgumentException ) if( sValue != sCurrentValue ) { // ... set information of change. - aOldValue <<= sCurrentValue ; - aConvertedValue <<= sValue ; + aOldValue <<= sCurrentValue ; + aConvertedValue <<= sValue ; // Return OK - "value will be change ..." bReturn = sal_True; } else { // ... clear information of return parameter! - aOldValue.clear () ; - aConvertedValue.clear () ; + aOldValue.clear () ; + aConvertedValue.clear () ; // Return NOTHING - "value will not be change ..." bReturn = sal_False; } @@ -405,10 +405,10 @@ throw( IllegalArgumentException ) sal_Bool ActionTriggerPropertySet::impl_tryToChangeProperty( - const Reference< XBitmap > aCurrentValue , - const Any& aNewValue , - Any& aOldValue , - Any& aConvertedValue ) + const Reference< XBitmap > aCurrentValue , + const Any& aNewValue , + Any& aOldValue , + Any& aConvertedValue ) throw( IllegalArgumentException ) { // Set default return value if method failed. @@ -422,16 +422,16 @@ throw( IllegalArgumentException ) if( aValue != aCurrentValue ) { // ... set information of change. - aOldValue <<= aCurrentValue ; - aConvertedValue <<= aValue ; + aOldValue <<= aCurrentValue ; + aConvertedValue <<= aValue ; // Return OK - "value will be change ..." bReturn = sal_True; } else { // ... clear information of return parameter! - aOldValue.clear () ; - aConvertedValue.clear () ; + aOldValue.clear () ; + aConvertedValue.clear () ; // Return NOTHING - "value will not be change ..." bReturn = sal_False; } @@ -440,10 +440,10 @@ throw( IllegalArgumentException ) } sal_Bool ActionTriggerPropertySet::impl_tryToChangeProperty( - const Reference< XInterface > aCurrentValue , - const Any& aNewValue , - Any& aOldValue , - Any& aConvertedValue ) + const Reference< XInterface > aCurrentValue , + const Any& aNewValue , + Any& aOldValue , + Any& aConvertedValue ) throw( IllegalArgumentException ) { // Set default return value if method failed. @@ -457,16 +457,16 @@ throw( IllegalArgumentException ) if( aValue != aCurrentValue ) { // ... set information of change. - aOldValue <<= aCurrentValue ; - aConvertedValue <<= aValue ; + aOldValue <<= aCurrentValue ; + aConvertedValue <<= aValue ; // Return OK - "value will be change ..." bReturn = sal_True; } else { // ... clear information of return parameter! - aOldValue.clear () ; - aConvertedValue.clear () ; + aOldValue.clear () ; + aConvertedValue.clear () ; // Return NOTHING - "value will not be change ..." bReturn = sal_False; } diff --git a/framework/source/classes/actiontriggerseparatorpropertyset.cxx b/framework/source/classes/actiontriggerseparatorpropertyset.cxx index aea4934f2012..f68c293fcef4 100644 --- a/framework/source/classes/actiontriggerseparatorpropertyset.cxx +++ b/framework/source/classes/actiontriggerseparatorpropertyset.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,9 +58,9 @@ namespace framework ActionTriggerSeparatorPropertySet::ActionTriggerSeparatorPropertySet( const Reference< XMultiServiceFactory >& /*ServiceManager*/ ) : ThreadHelpBase ( &Application::GetSolarMutex() ) , OBroadcastHelper ( m_aLock.getShareableOslMutex() ) - , OPropertySetHelper ( *SAL_STATIC_CAST( OBroadcastHelper *, this ) ) - , OWeakObject ( ) - , m_nSeparatorType( 0 ) + , OPropertySetHelper ( *SAL_STATIC_CAST( OBroadcastHelper *, this ) ) + , OWeakObject ( ) + , m_nSeparatorType( 0 ) { } @@ -141,11 +141,11 @@ Sequence< Type > SAL_CALL ActionTriggerSeparatorPropertySet::getTypes() throw ( { // Create a static typecollection ... static ::cppu::OTypeCollection aTypeCollection( - ::getCppuType(( const Reference< XPropertySet >*)NULL ) , - ::getCppuType(( const Reference< XFastPropertySet >*)NULL ) , - ::getCppuType(( const Reference< XMultiPropertySet >*)NULL ) , - ::getCppuType(( const Reference< XServiceInfo >*)NULL ) , - ::getCppuType(( const Reference< XTypeProvider >*)NULL ) ) ; + ::getCppuType(( const Reference< XPropertySet >*)NULL ) , + ::getCppuType(( const Reference< XFastPropertySet >*)NULL ) , + ::getCppuType(( const Reference< XMultiPropertySet >*)NULL ) , + ::getCppuType(( const Reference< XServiceInfo >*)NULL ) , + ::getCppuType(( const Reference< XTypeProvider >*)NULL ) ) ; // ... and set his address to static pointer! pTypeCollection = &aTypeCollection ; @@ -184,21 +184,21 @@ Sequence< sal_Int8 > SAL_CALL ActionTriggerSeparatorPropertySet::getImplementati } //--------------------------------------------------------------------------------------------------------- -// OPropertySetHelper implementation +// OPropertySetHelper implementation //--------------------------------------------------------------------------------------------------------- sal_Bool SAL_CALL ActionTriggerSeparatorPropertySet::convertFastPropertyValue( - Any& aConvertedValue, - Any& aOldValue, - sal_Int32 nHandle, - const Any& aValue ) + Any& aConvertedValue, + Any& aOldValue, + sal_Int32 nHandle, + const Any& aValue ) throw( IllegalArgumentException ) { - // Check, if value of property will changed in method "setFastPropertyValue_NoBroadcast()". - // Return TRUE, if changed - else return FALSE. - // Attention: Method "impl_tryToChangeProperty()" can throw the IllegalArgumentException !!! - // Initialize return value with FALSE !!! - // (Handle can be invalid) + // Check, if value of property will changed in method "setFastPropertyValue_NoBroadcast()". + // Return TRUE, if changed - else return FALSE. + // Attention: Method "impl_tryToChangeProperty()" can throw the IllegalArgumentException !!! + // Initialize return value with FALSE !!! + // (Handle can be invalid) sal_Bool bReturn = sal_False; switch( nHandle ) @@ -308,13 +308,13 @@ const Sequence< Property > ActionTriggerSeparatorPropertySet::impl_getStaticProp //****************************************************************************************************************************** -// private method +// private method //****************************************************************************************************************************** sal_Bool ActionTriggerSeparatorPropertySet::impl_tryToChangeProperty( - sal_Int16 aCurrentValue , - const Any& aNewValue , - Any& aOldValue , - Any& aConvertedValue ) + sal_Int16 aCurrentValue , + const Any& aNewValue , + Any& aOldValue , + Any& aConvertedValue ) throw( IllegalArgumentException ) { // Set default return value if method failed. @@ -328,16 +328,16 @@ throw( IllegalArgumentException ) if( aValue != aCurrentValue ) { // ... set information of change. - aOldValue <<= aCurrentValue ; - aConvertedValue <<= aValue ; + aOldValue <<= aCurrentValue ; + aConvertedValue <<= aValue ; // Return OK - "value will be change ..." bReturn = sal_True; } else { // ... clear information of return parameter! - aOldValue.clear () ; - aConvertedValue.clear () ; + aOldValue.clear () ; + aConvertedValue.clear () ; // Return NOTHING - "value will not be change ..." bReturn = sal_False; } diff --git a/framework/source/classes/addonmenu.cxx b/framework/source/classes/addonmenu.cxx index 7105da2d68d1..4961a8f7c1f2 100644 --- a/framework/source/classes/addonmenu.cxx +++ b/framework/source/classes/addonmenu.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include "classes/addonmenu.hxx" #include "classes/addonsoptions.hxx" @@ -39,7 +39,7 @@ #include <xml/menuconfiguration.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/util/URL.hpp> @@ -47,14 +47,14 @@ #include <com/sun/star/lang/XServiceInfo.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <tools/config.hxx> #include <vcl/svapp.hxx> #include <svtools/menuoptions.hxx> #include <svl/solar.hrc> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ using namespace ::com::sun::star::uno; @@ -272,13 +272,13 @@ void AddonMenuManager::MergeAddonHelpMenu( const Reference< XFrame >& rFrame, Me // Merge the addon popup menus into the given menu bar at the provided pos. void AddonMenuManager::MergeAddonPopupMenus( const Reference< XFrame >& rFrame, const Reference< XModel >& rModel, - USHORT nMergeAtPos, + USHORT nMergeAtPos, MenuBar* pMergeMenuBar ) { if ( pMergeMenuBar ) { - AddonsOptions aAddonsOptions; - USHORT nInsertPos = nMergeAtPos; + AddonsOptions aAddonsOptions; + USHORT nInsertPos = nMergeAtPos; ::rtl::OUString aTitle; ::rtl::OUString aURL; @@ -288,7 +288,7 @@ void AddonMenuManager::MergeAddonPopupMenus( const Reference< XFrame >& rFrame, Sequence< Sequence< PropertyValue > > aAddonSubMenu; USHORT nUniqueMenuId = ADDONMENU_ITEMID_START; - const Sequence< Sequence< PropertyValue > >& rAddonMenuEntries = aAddonsOptions.GetAddonsMenuBarPart(); + const Sequence< Sequence< PropertyValue > >& rAddonMenuEntries = aAddonsOptions.GetAddonsMenuBarPart(); for ( sal_Int32 i = 0; i < rAddonMenuEntries.getLength(); i++ ) { AddonMenuManager::GetMenuEntry( rAddonMenuEntries[i], @@ -333,12 +333,12 @@ void AddonMenuManager::BuildMenu( PopupMenu* pCurrent const Reference< XFrame >& rFrame, const Reference< XModel >& rModel ) { - Sequence< Sequence< PropertyValue > > aAddonSubMenu; + Sequence< Sequence< PropertyValue > > aAddonSubMenu; BOOL bInsertSeparator = FALSE; - UINT32 i = 0; + UINT32 i = 0; UINT32 nElements = 0; - UINT32 nCount = aAddonMenuDefinition.getLength(); - AddonsOptions aAddonsOptions; + UINT32 nCount = aAddonMenuDefinition.getLength(); + AddonsOptions aAddonsOptions; ::rtl::OUString aTitle; ::rtl::OUString aURL; @@ -406,10 +406,10 @@ void AddonMenuManager::GetMenuEntry( const Sequence< PropertyValue >& rAddonMenu ::rtl::OUString& rTarget, ::rtl::OUString& rImageId, ::rtl::OUString& rContext, - Sequence< Sequence< PropertyValue > >& rAddonSubMenu ) + Sequence< Sequence< PropertyValue > >& rAddonSubMenu ) { // Reset submenu parameter - rAddonSubMenu = Sequence< Sequence< PropertyValue > >(); + rAddonSubMenu = Sequence< Sequence< PropertyValue > >(); for ( int i = 0; i < rAddonMenuEntry.getLength(); i++ ) { diff --git a/framework/source/classes/addonsoptions.cxx b/framework/source/classes/addonsoptions.cxx index a1b22c2de5b8..9bdaeb7dfda3 100644 --- a/framework/source/classes/addonsoptions.cxx +++ b/framework/source/classes/addonsoptions.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// includes +// includes //_________________________________________________________________________________________________________________ #include <classes/addonsoptions.hxx> #include <unotools/configmgr.hxx> @@ -54,46 +54,46 @@ #include <vector> //_________________________________________________________________________________________________________________ -// namespaces +// namespaces //_________________________________________________________________________________________________________________ -using namespace ::std ; -using namespace ::utl ; -using namespace ::osl ; -using namespace ::com::sun::star::uno ; -using namespace ::com::sun::star::beans ; -using namespace ::com::sun::star::lang ; +using namespace ::std ; +using namespace ::utl ; +using namespace ::osl ; +using namespace ::com::sun::star::uno ; +using namespace ::com::sun::star::beans ; +using namespace ::com::sun::star::lang ; //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ -#define ROOTNODE_ADDONMENU ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Addons" )) -#define PATHDELIMITER ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/" )) -#define TOOLBARITEMS ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ToolBarItems" )) -#define SEPARATOR_URL_STR "private:separator" -#define SEPARATOR_URL_LEN 17 -#define SEPARATOR_URL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SEPARATOR_URL_STR )) +#define ROOTNODE_ADDONMENU ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Addons" )) +#define PATHDELIMITER ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/" )) +#define TOOLBARITEMS ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ToolBarItems" )) +#define SEPARATOR_URL_STR "private:separator" +#define SEPARATOR_URL_LEN 17 +#define SEPARATOR_URL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SEPARATOR_URL_STR )) #define PROPERTYNAME_URL ADDONSMENUITEM_PROPERTYNAME_URL #define PROPERTYNAME_TITLE ADDONSMENUITEM_PROPERTYNAME_TITLE #define PROPERTYNAME_TARGET ADDONSMENUITEM_PROPERTYNAME_TARGET #define PROPERTYNAME_IMAGEIDENTIFIER ADDONSMENUITEM_PROPERTYNAME_IMAGEIDENTIFIER -#define PROPERTYNAME_CONTEXT ADDONSMENUITEM_PROPERTYNAME_CONTEXT -#define PROPERTYNAME_SUBMENU ADDONSMENUITEM_PROPERTYNAME_SUBMENU +#define PROPERTYNAME_CONTEXT ADDONSMENUITEM_PROPERTYNAME_CONTEXT +#define PROPERTYNAME_SUBMENU ADDONSMENUITEM_PROPERTYNAME_SUBMENU #define PROPERTYNAME_CONTROLTYPE ADDONSMENUITEM_PROPERTYNAME_CONTROLTYPE #define PROPERTYNAME_WIDTH ADDONSMENUITEM_PROPERTYNAME_WIDTH -#define PROPERTYNAME_IMAGESMALL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImageSmall" )) -#define PROPERTYNAME_IMAGEBIG ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImageBig" )) -#define PROPERTYNAME_IMAGESMALLHC ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImageSmallHC" )) -#define PROPERTYNAME_IMAGEBIGHC ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImageBigHC" )) -#define PROPERTYNAME_IMAGESMALL_URL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImageSmallURL" )) -#define PROPERTYNAME_IMAGEBIG_URL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImageBigURL" )) -#define PROPERTYNAME_IMAGESMALLHC_URL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImageSmallHCURL" )) -#define PROPERTYNAME_IMAGEBIGHC_URL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImageBigHCURL" )) +#define PROPERTYNAME_IMAGESMALL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImageSmall" )) +#define PROPERTYNAME_IMAGEBIG ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImageBig" )) +#define PROPERTYNAME_IMAGESMALLHC ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImageSmallHC" )) +#define PROPERTYNAME_IMAGEBIGHC ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImageBigHC" )) +#define PROPERTYNAME_IMAGESMALL_URL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImageSmallURL" )) +#define PROPERTYNAME_IMAGEBIG_URL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImageBigURL" )) +#define PROPERTYNAME_IMAGESMALLHC_URL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImageSmallHCURL" )) +#define PROPERTYNAME_IMAGEBIGHC_URL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImageBigHCURL" )) -#define IMAGES_NODENAME ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UserDefinedImages" )) +#define IMAGES_NODENAME ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UserDefinedImages" )) #define PRIVATE_IMAGE_URL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:image/" )) #define PROPERTYNAME_MERGEMENU_MERGEPOINT ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MergePoint" )) @@ -116,50 +116,50 @@ using namespace ::com::sun::star::lang ; #define INDEX_URL 0 #define INDEX_TITLE 1 #define INDEX_IMAGEIDENTIFIER 2 -#define INDEX_TARGET 3 -#define INDEX_CONTEXT 4 -#define INDEX_SUBMENU 5 +#define INDEX_TARGET 3 +#define INDEX_CONTEXT 4 +#define INDEX_SUBMENU 5 #define INDEX_CONTROLTYPE 6 #define INDEX_WIDTH 7 #define PROPERTYCOUNT_INDEX 8 // The following order is mandatory. Please add properties at the end! -#define PROPERTYCOUNT_MENUITEM 6 +#define PROPERTYCOUNT_MENUITEM 6 #define OFFSET_MENUITEM_URL 0 #define OFFSET_MENUITEM_TITLE 1 -#define OFFSET_MENUITEM_IMAGEIDENTIFIER 2 -#define OFFSET_MENUITEM_TARGET 3 -#define OFFSET_MENUITEM_CONTEXT 4 -#define OFFSET_MENUITEM_SUBMENU 5 +#define OFFSET_MENUITEM_IMAGEIDENTIFIER 2 +#define OFFSET_MENUITEM_TARGET 3 +#define OFFSET_MENUITEM_CONTEXT 4 +#define OFFSET_MENUITEM_SUBMENU 5 // The following order is mandatory. Please add properties at the end! -#define PROPERTYCOUNT_POPUPMENU 4 -#define OFFSET_POPUPMENU_TITLE 0 -#define OFFSET_POPUPMENU_CONTEXT 1 -#define OFFSET_POPUPMENU_SUBMENU 2 -#define OFFSET_POPUPMENU_URL 3 // Used for property set +#define PROPERTYCOUNT_POPUPMENU 4 +#define OFFSET_POPUPMENU_TITLE 0 +#define OFFSET_POPUPMENU_CONTEXT 1 +#define OFFSET_POPUPMENU_SUBMENU 2 +#define OFFSET_POPUPMENU_URL 3 // Used for property set // The following order is mandatory. Please add properties at the end! -#define PROPERTYCOUNT_TOOLBARITEM 7 -#define OFFSET_TOOLBARITEM_URL 0 -#define OFFSET_TOOLBARITEM_TITLE 1 -#define OFFSET_TOOLBARITEM_IMAGEIDENTIFIER 2 -#define OFFSET_TOOLBARITEM_TARGET 3 -#define OFFSET_TOOLBARITEM_CONTEXT 4 +#define PROPERTYCOUNT_TOOLBARITEM 7 +#define OFFSET_TOOLBARITEM_URL 0 +#define OFFSET_TOOLBARITEM_TITLE 1 +#define OFFSET_TOOLBARITEM_IMAGEIDENTIFIER 2 +#define OFFSET_TOOLBARITEM_TARGET 3 +#define OFFSET_TOOLBARITEM_CONTEXT 4 #define OFFSET_TOOLBARITEM_CONTROLTYPE 5 #define OFFSET_TOOLBARITEM_WIDTH 6 // The following order is mandatory. Please add properties at the end! -#define PROPERTYCOUNT_IMAGES 8 +#define PROPERTYCOUNT_IMAGES 8 #define PROPERTYCOUNT_EMBEDDED_IMAGES 4 -#define OFFSET_IMAGES_SMALL 0 -#define OFFSET_IMAGES_BIG 1 -#define OFFSET_IMAGES_SMALLHC 2 -#define OFFSET_IMAGES_BIGHC 3 -#define OFFSET_IMAGES_SMALL_URL 4 -#define OFFSET_IMAGES_BIG_URL 5 -#define OFFSET_IMAGES_SMALLHC_URL 6 -#define OFFSET_IMAGES_BIGHC_URL 7 +#define OFFSET_IMAGES_SMALL 0 +#define OFFSET_IMAGES_BIG 1 +#define OFFSET_IMAGES_SMALLHC 2 +#define OFFSET_IMAGES_BIGHC 3 +#define OFFSET_IMAGES_SMALL_URL 4 +#define OFFSET_IMAGES_BIG_URL 5 +#define OFFSET_IMAGES_SMALLHC_URL 6 +#define OFFSET_IMAGES_BIGHC_URL 7 #define PROPERTYCOUNT_MERGE_MENUBAR 6 #define OFFSET_MERGEMENU_MERGEPOINT 0 @@ -184,7 +184,7 @@ const Size aImageSizeSmall( 16, 16 ); const Size aImageSizeBig( 26, 26 ); //_________________________________________________________________________________________________________________ -// private declarations! +// private declarations! //_________________________________________________________________________________________________________________ /*-**************************************************************************************************************** @@ -197,54 +197,54 @@ namespace framework class AddonsOptions_Impl : public ConfigItem { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: //--------------------------------------------------------------------------------------------------------- - // constructor / destructor + // constructor / destructor //--------------------------------------------------------------------------------------------------------- AddonsOptions_Impl(); ~AddonsOptions_Impl(); //--------------------------------------------------------------------------------------------------------- - // overloaded methods of baseclass + // overloaded methods of baseclass //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short called for notify of configmanager - @descr These method is called from the ConfigManager before application ends or from the + @short called for notify of configmanager + @descr These method is called from the ConfigManager before application ends or from the PropertyChangeListener if the sub tree broadcasts changes. You must update your internal values. - @seealso baseclass ConfigItem + @seealso baseclass ConfigItem @param "lPropertyNames" is the list of properties which should be updated. - @return - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual void Notify( const Sequence< ::rtl::OUString >& lPropertyNames ); /*-****************************************************************************************************//** - @short write changes to configuration - @descr These method writes the changed values into the sub tree + @short write changes to configuration + @descr These method writes the changed values into the sub tree and should always called in our destructor to guarantee consistency of config data. - @seealso baseclass ConfigItem + @seealso baseclass ConfigItem - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual void Commit(); //--------------------------------------------------------------------------------------------------------- - // public interface + // public interface //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** @@ -252,30 +252,30 @@ class AddonsOptions_Impl : public ConfigItem @descr These class is used as static member of "SvtDynamicMenuOptions" ... => The code exist only for one time and isn't duplicated for every instance! - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ - sal_Bool HasAddonsMenu () const ; - sal_Bool HasAddonsHelpMenu () const ; + sal_Bool HasAddonsMenu () const ; + sal_Bool HasAddonsHelpMenu () const ; sal_Int32 GetAddonsToolBarCount() const ; - const Sequence< Sequence< PropertyValue > >& GetAddonsMenu () const ; - const Sequence< Sequence< PropertyValue > >& GetAddonsMenuBarPart () const ; - const Sequence< Sequence< PropertyValue > >& GetAddonsToolBarPart ( sal_uInt32 nIndex ) const ; + const Sequence< Sequence< PropertyValue > >& GetAddonsMenu () const ; + const Sequence< Sequence< PropertyValue > >& GetAddonsMenuBarPart () const ; + const Sequence< Sequence< PropertyValue > >& GetAddonsToolBarPart ( sal_uInt32 nIndex ) const ; const ::rtl::OUString GetAddonsToolbarResourceName( sal_uInt32 nIndex ) const; - const Sequence< Sequence< PropertyValue > >& GetAddonsHelpMenu () const ; - Image GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast, sal_Bool bNoScale ) const; + const Sequence< Sequence< PropertyValue > >& GetAddonsHelpMenu () const ; + Image GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast, sal_Bool bNoScale ) const; const MergeMenuInstructionContainer& GetMergeMenuInstructions() const; bool GetMergeToolbarInstructions( const ::rtl::OUString& rToolbarName, MergeToolbarInstructionContainer& rToolbarInstructions ) const; void ReadConfigurationData(); //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: @@ -289,10 +289,10 @@ class AddonsOptions_Impl : public ConfigItem struct ImageEntry { - Image aImageSmall; - Image aImageBig; - Image aImageSmallHC; - Image aImageBigHC; + Image aImageSmall; + Image aImageBig; + Image aImageSmallHC; + Image aImageBigHC; Image aImageSmallNoScale; Image aImageBigNoScale; @@ -313,56 +313,56 @@ class AddonsOptions_Impl : public ConfigItem /*-****************************************************************************************************//** @short return list of key names of our configuration management which represent oue module tree - @descr These methods return the current list of key names! We need it to get needed values from our + @descr These methods return the current list of key names! We need it to get needed values from our configuration management! - @seealso - + @seealso - @param "nCount" , returns count of menu entries for "new" - @return A list of configuration key names is returned. + @return A list of configuration key names is returned. - @onerror - + @onerror - *//*-*****************************************************************************************************/ - sal_Bool ReadAddonMenuSet( Sequence< Sequence< PropertyValue > >& aAddonMenuSeq ); - sal_Bool ReadOfficeMenuBarSet( Sequence< Sequence< PropertyValue > >& aAddonOfficeMenuBarSeq ); - sal_Bool ReadOfficeToolBarSet( AddonToolBars& rAddonOfficeToolBars, std::vector< rtl::OUString >& rAddonOfficeToolBarResNames ); - sal_Bool ReadToolBarItemSet( const rtl::OUString rToolBarItemSetNodeName, Sequence< Sequence< PropertyValue > >& aAddonOfficeToolBarSeq ); - sal_Bool ReadOfficeHelpSet( Sequence< Sequence< PropertyValue > >& aAddonOfficeHelpMenuSeq ); - sal_Bool ReadImages( ImageManager& aImageManager ); + sal_Bool ReadAddonMenuSet( Sequence< Sequence< PropertyValue > >& aAddonMenuSeq ); + sal_Bool ReadOfficeMenuBarSet( Sequence< Sequence< PropertyValue > >& aAddonOfficeMenuBarSeq ); + sal_Bool ReadOfficeToolBarSet( AddonToolBars& rAddonOfficeToolBars, std::vector< rtl::OUString >& rAddonOfficeToolBarResNames ); + sal_Bool ReadToolBarItemSet( const rtl::OUString rToolBarItemSetNodeName, Sequence< Sequence< PropertyValue > >& aAddonOfficeToolBarSeq ); + sal_Bool ReadOfficeHelpSet( Sequence< Sequence< PropertyValue > >& aAddonOfficeHelpMenuSeq ); + sal_Bool ReadImages( ImageManager& aImageManager ); sal_Bool ReadMenuMergeInstructions( MergeMenuInstructionContainer& rContainer ); sal_Bool ReadToolbarMergeInstructions( ToolbarMergingInstructions& rToolbarMergeMap ); sal_Bool ReadMergeMenuData( const ::rtl::OUString& aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeMenu ); sal_Bool ReadMergeToolbarData( const ::rtl::OUString& aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeToolbarItems ); - sal_Bool ReadMenuItem( const ::rtl::OUString& aMenuItemNodeName, Sequence< PropertyValue >& aMenuItem, sal_Bool bIgnoreSubMenu = sal_False ); - sal_Bool ReadPopupMenu( const ::rtl::OUString& aPopupMenuNodeName, Sequence< PropertyValue >& aPopupMenu ); + sal_Bool ReadMenuItem( const ::rtl::OUString& aMenuItemNodeName, Sequence< PropertyValue >& aMenuItem, sal_Bool bIgnoreSubMenu = sal_False ); + sal_Bool ReadPopupMenu( const ::rtl::OUString& aPopupMenuNodeName, Sequence< PropertyValue >& aPopupMenu ); sal_Bool AppendPopupMenu( Sequence< PropertyValue >& aTargetPopupMenu, const Sequence< PropertyValue >& rSourcePopupMenu ); - sal_Bool ReadToolBarItem( const ::rtl::OUString& aToolBarItemNodeName, Sequence< PropertyValue >& aToolBarItem ); - sal_Bool ReadImagesItem( const ::rtl::OUString& aImagesItemNodeName, Sequence< PropertyValue >& aImagesItem ); - ImageEntry* ReadImageData( const ::rtl::OUString& aImagesNodeName ); + sal_Bool ReadToolBarItem( const ::rtl::OUString& aToolBarItemNodeName, Sequence< PropertyValue >& aToolBarItem ); + sal_Bool ReadImagesItem( const ::rtl::OUString& aImagesItemNodeName, Sequence< PropertyValue >& aImagesItem ); + ImageEntry* ReadImageData( const ::rtl::OUString& aImagesNodeName ); void ReadAndAssociateImages( const ::rtl::OUString& aURL, const ::rtl::OUString& aImageId ); void ReadImageFromURL( ImageSize nImageSize, const ::rtl::OUString& aURL, Image& aImage, Image& aNoScaleImage ); sal_Bool HasAssociatedImages( const ::rtl::OUString& aURL ); void SubstituteVariables( ::rtl::OUString& aURL ); - sal_Bool ReadSubMenuEntries( const Sequence< ::rtl::OUString >& aSubMenuNodeNames, Sequence< Sequence< PropertyValue > >& rSubMenu ); - void InsertToolBarSeparator( Sequence< Sequence< PropertyValue > >& rAddonOfficeToolBarSeq ); - ::rtl::OUString GeneratePrefixURL(); + sal_Bool ReadSubMenuEntries( const Sequence< ::rtl::OUString >& aSubMenuNodeNames, Sequence< Sequence< PropertyValue > >& rSubMenu ); + void InsertToolBarSeparator( Sequence< Sequence< PropertyValue > >& rAddonOfficeToolBarSeq ); + ::rtl::OUString GeneratePrefixURL(); Sequence< ::rtl::OUString > GetPropertyNamesMergeMenuInstruction( const ::rtl::OUString& aPropertyRootName ) const; Sequence< ::rtl::OUString > GetPropertyNamesMenuItem( const ::rtl::OUString& aPropertyRootNode ) const; Sequence< ::rtl::OUString > GetPropertyNamesPopupMenu( const ::rtl::OUString& aPropertyRootNode ) const; Sequence< ::rtl::OUString > GetPropertyNamesToolBarItem( const ::rtl::OUString& aPropertyRootNode ) const; Sequence< ::rtl::OUString > GetPropertyNamesImages( const ::rtl::OUString& aPropertyRootNode ) const; - sal_Bool CreateImageFromSequence( Image& rImage, sal_Bool bBig, Sequence< sal_Int8 >& rBitmapDataSeq ) const; + sal_Bool CreateImageFromSequence( Image& rImage, sal_Bool bBig, Sequence< sal_Int8 >& rBitmapDataSeq ) const; //------------------------------------------------------------------------------------------------------------- - // private member + // private member //------------------------------------------------------------------------------------------------------------- private: - ImageEntry* ReadOptionalImageData( const ::rtl::OUString& aMenuNodeName ); + ImageEntry* ReadOptionalImageData( const ::rtl::OUString& aMenuNodeName ); sal_Int32 m_nRootAddonPopupMenuId; ::rtl::OUString m_aPropNames[PROPERTYCOUNT_INDEX]; @@ -387,11 +387,11 @@ class AddonsOptions_Impl : public ConfigItem }; //_________________________________________________________________________________________________________________ -// definitions +// definitions //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** AddonsOptions_Impl::AddonsOptions_Impl() // Init baseclasses first @@ -403,24 +403,24 @@ AddonsOptions_Impl::AddonsOptions_Impl() m_aPrivateImageURL( PRIVATE_IMAGE_URL ) { // initialize array with fixed property names - m_aPropNames[ INDEX_URL ] = PROPERTYNAME_URL; - m_aPropNames[ INDEX_TITLE ] = PROPERTYNAME_TITLE; - m_aPropNames[ INDEX_TARGET ] = PROPERTYNAME_TARGET; - m_aPropNames[ INDEX_IMAGEIDENTIFIER ] = PROPERTYNAME_IMAGEIDENTIFIER; - m_aPropNames[ INDEX_CONTEXT ] = PROPERTYNAME_CONTEXT; - m_aPropNames[ INDEX_SUBMENU ] = PROPERTYNAME_SUBMENU; // Submenu set! + m_aPropNames[ INDEX_URL ] = PROPERTYNAME_URL; + m_aPropNames[ INDEX_TITLE ] = PROPERTYNAME_TITLE; + m_aPropNames[ INDEX_TARGET ] = PROPERTYNAME_TARGET; + m_aPropNames[ INDEX_IMAGEIDENTIFIER ] = PROPERTYNAME_IMAGEIDENTIFIER; + m_aPropNames[ INDEX_CONTEXT ] = PROPERTYNAME_CONTEXT; + m_aPropNames[ INDEX_SUBMENU ] = PROPERTYNAME_SUBMENU; // Submenu set! m_aPropNames[ INDEX_CONTROLTYPE ] = PROPERTYNAME_CONTROLTYPE; m_aPropNames[ INDEX_WIDTH ] = PROPERTYNAME_WIDTH; // initialize array with fixed images property names - m_aPropImagesNames[ OFFSET_IMAGES_SMALL ] = PROPERTYNAME_IMAGESMALL; - m_aPropImagesNames[ OFFSET_IMAGES_BIG ] = PROPERTYNAME_IMAGEBIG; - m_aPropImagesNames[ OFFSET_IMAGES_SMALLHC ] = PROPERTYNAME_IMAGESMALLHC; - m_aPropImagesNames[ OFFSET_IMAGES_BIGHC ] = PROPERTYNAME_IMAGEBIGHC; - m_aPropImagesNames[ OFFSET_IMAGES_SMALL_URL ] = PROPERTYNAME_IMAGESMALL_URL; - m_aPropImagesNames[ OFFSET_IMAGES_BIG_URL ] = PROPERTYNAME_IMAGEBIG_URL; - m_aPropImagesNames[ OFFSET_IMAGES_SMALLHC_URL ] = PROPERTYNAME_IMAGESMALLHC_URL; - m_aPropImagesNames[ OFFSET_IMAGES_BIGHC_URL ] = PROPERTYNAME_IMAGEBIGHC_URL; + m_aPropImagesNames[ OFFSET_IMAGES_SMALL ] = PROPERTYNAME_IMAGESMALL; + m_aPropImagesNames[ OFFSET_IMAGES_BIG ] = PROPERTYNAME_IMAGEBIG; + m_aPropImagesNames[ OFFSET_IMAGES_SMALLHC ] = PROPERTYNAME_IMAGESMALLHC; + m_aPropImagesNames[ OFFSET_IMAGES_BIGHC ] = PROPERTYNAME_IMAGEBIGHC; + m_aPropImagesNames[ OFFSET_IMAGES_SMALL_URL ] = PROPERTYNAME_IMAGESMALL_URL; + m_aPropImagesNames[ OFFSET_IMAGES_BIG_URL ] = PROPERTYNAME_IMAGEBIG_URL; + m_aPropImagesNames[ OFFSET_IMAGES_SMALLHC_URL ] = PROPERTYNAME_IMAGESMALLHC_URL; + m_aPropImagesNames[ OFFSET_IMAGES_BIGHC_URL ] = PROPERTYNAME_IMAGEBIGHC_URL; // initialize array with fixed merge menu property names m_aPropMergeMenuNames[ OFFSET_MERGEMENU_MERGEPOINT ] = PROPERTYNAME_MERGEMENU_MERGEPOINT; @@ -458,7 +458,7 @@ AddonsOptions_Impl::AddonsOptions_Impl() } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** AddonsOptions_Impl::~AddonsOptions_Impl() { @@ -493,7 +493,7 @@ void AddonsOptions_Impl::ReadConfigurationData() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void AddonsOptions_Impl::Notify( const Sequence< ::rtl::OUString >& /*lPropertyNames*/ ) { @@ -501,7 +501,7 @@ void AddonsOptions_Impl::Notify( const Sequence< ::rtl::OUString >& /*lPropertyN } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void AddonsOptions_Impl::Commit() { @@ -509,7 +509,7 @@ void AddonsOptions_Impl::Commit() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Bool AddonsOptions_Impl::HasAddonsMenu() const { @@ -517,15 +517,15 @@ sal_Bool AddonsOptions_Impl::HasAddonsMenu() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** -sal_Bool AddonsOptions_Impl::HasAddonsHelpMenu () const +sal_Bool AddonsOptions_Impl::HasAddonsHelpMenu () const { return ( m_aCachedHelpMenuProperties.getLength() > 0 ); } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Int32 AddonsOptions_Impl::GetAddonsToolBarCount() const { @@ -533,7 +533,7 @@ sal_Int32 AddonsOptions_Impl::GetAddonsToolBarCount() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsMenu() const { @@ -541,7 +541,7 @@ const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsMenu() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsMenuBarPart() const { @@ -549,7 +549,7 @@ const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsMenuBa } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsToolBarPart( sal_uInt32 nIndex ) const { @@ -560,7 +560,7 @@ const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsToolBa } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** const ::rtl::OUString AddonsOptions_Impl::GetAddonsToolbarResourceName( sal_uInt32 nIndex ) const { @@ -571,15 +571,15 @@ const ::rtl::OUString AddonsOptions_Impl::GetAddonsToolbarResourceName( sal_uInt } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** -const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsHelpMenu () const +const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsHelpMenu () const { return m_aCachedHelpMenuProperties; } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** const MergeMenuInstructionContainer& AddonsOptions_Impl::GetMergeMenuInstructions() const { @@ -587,7 +587,7 @@ const MergeMenuInstructionContainer& AddonsOptions_Impl::GetMergeMenuInstruction } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** bool AddonsOptions_Impl::GetMergeToolbarInstructions( const ::rtl::OUString& rToolbarName, @@ -604,7 +604,7 @@ bool AddonsOptions_Impl::GetMergeToolbarInstructions( } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** Image AddonsOptions_Impl::GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast, sal_Bool bNoScale ) const { @@ -633,26 +633,26 @@ Image AddonsOptions_Impl::GetImageFromURL( const rtl::OUString& aURL, sal_Bool b } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** sal_Bool AddonsOptions_Impl::ReadAddonMenuSet( Sequence< Sequence< PropertyValue > >& rAddonMenuSeq ) { // Read the AddonMenu set and fill property sequences - ::rtl::OUString aAddonMenuNodeName( RTL_CONSTASCII_USTRINGPARAM( "AddonUI/AddonMenu" )); - Sequence< ::rtl::OUString > aAddonMenuNodeSeq = GetNodeNames( aAddonMenuNodeName ); - ::rtl::OUString aAddonMenuItemNode( aAddonMenuNodeName + m_aPathDelimiter ); + ::rtl::OUString aAddonMenuNodeName( RTL_CONSTASCII_USTRINGPARAM( "AddonUI/AddonMenu" )); + Sequence< ::rtl::OUString > aAddonMenuNodeSeq = GetNodeNames( aAddonMenuNodeName ); + ::rtl::OUString aAddonMenuItemNode( aAddonMenuNodeName + m_aPathDelimiter ); - sal_uInt32 nCount = aAddonMenuNodeSeq.getLength(); - sal_uInt32 nIndex = 0; + sal_uInt32 nCount = aAddonMenuNodeSeq.getLength(); + sal_uInt32 nIndex = 0; Sequence< PropertyValue > aMenuItem( PROPERTYCOUNT_MENUITEM ); // Init the property value sequence - aMenuItem[ OFFSET_MENUITEM_URL ].Name = m_aPropNames[ INDEX_URL ]; - aMenuItem[ OFFSET_MENUITEM_TITLE ].Name = m_aPropNames[ INDEX_TITLE ]; - aMenuItem[ OFFSET_MENUITEM_TARGET ].Name = m_aPropNames[ INDEX_TARGET ]; - aMenuItem[ OFFSET_MENUITEM_IMAGEIDENTIFIER ].Name = m_aPropNames[ INDEX_IMAGEIDENTIFIER]; - aMenuItem[ OFFSET_MENUITEM_CONTEXT ].Name = m_aPropNames[ INDEX_CONTEXT ]; - aMenuItem[ OFFSET_MENUITEM_SUBMENU ].Name = m_aPropNames[ INDEX_SUBMENU ]; // Submenu set! + aMenuItem[ OFFSET_MENUITEM_URL ].Name = m_aPropNames[ INDEX_URL ]; + aMenuItem[ OFFSET_MENUITEM_TITLE ].Name = m_aPropNames[ INDEX_TITLE ]; + aMenuItem[ OFFSET_MENUITEM_TARGET ].Name = m_aPropNames[ INDEX_TARGET ]; + aMenuItem[ OFFSET_MENUITEM_IMAGEIDENTIFIER ].Name = m_aPropNames[ INDEX_IMAGEIDENTIFIER]; + aMenuItem[ OFFSET_MENUITEM_CONTEXT ].Name = m_aPropNames[ INDEX_CONTEXT ]; + aMenuItem[ OFFSET_MENUITEM_SUBMENU ].Name = m_aPropNames[ INDEX_SUBMENU ]; // Submenu set! for ( sal_uInt32 n = 0; n < nCount; n++ ) { @@ -672,26 +672,26 @@ sal_Bool AddonsOptions_Impl::ReadAddonMenuSet( Sequence< Sequence< PropertyValue } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** sal_Bool AddonsOptions_Impl::ReadOfficeHelpSet( Sequence< Sequence< PropertyValue > >& rAddonOfficeHelpMenuSeq ) { // Read the AddonMenu set and fill property sequences - ::rtl::OUString aAddonHelpMenuNodeName( RTL_CONSTASCII_USTRINGPARAM( "AddonUI/OfficeHelp" )); - Sequence< ::rtl::OUString > aAddonHelpMenuNodeSeq = GetNodeNames( aAddonHelpMenuNodeName ); - ::rtl::OUString aAddonHelpMenuItemNode( aAddonHelpMenuNodeName + m_aPathDelimiter ); + ::rtl::OUString aAddonHelpMenuNodeName( RTL_CONSTASCII_USTRINGPARAM( "AddonUI/OfficeHelp" )); + Sequence< ::rtl::OUString > aAddonHelpMenuNodeSeq = GetNodeNames( aAddonHelpMenuNodeName ); + ::rtl::OUString aAddonHelpMenuItemNode( aAddonHelpMenuNodeName + m_aPathDelimiter ); - sal_uInt32 nCount = aAddonHelpMenuNodeSeq.getLength(); - sal_uInt32 nIndex = 0; + sal_uInt32 nCount = aAddonHelpMenuNodeSeq.getLength(); + sal_uInt32 nIndex = 0; Sequence< PropertyValue > aMenuItem( PROPERTYCOUNT_MENUITEM ); // Init the property value sequence - aMenuItem[ OFFSET_MENUITEM_URL ].Name = m_aPropNames[ INDEX_URL ]; - aMenuItem[ OFFSET_MENUITEM_TITLE ].Name = m_aPropNames[ INDEX_TITLE ]; - aMenuItem[ OFFSET_MENUITEM_TARGET ].Name = m_aPropNames[ INDEX_TARGET ]; - aMenuItem[ OFFSET_MENUITEM_IMAGEIDENTIFIER ].Name = m_aPropNames[ INDEX_IMAGEIDENTIFIER]; - aMenuItem[ OFFSET_MENUITEM_CONTEXT ].Name = m_aPropNames[ INDEX_CONTEXT ]; - aMenuItem[ OFFSET_MENUITEM_SUBMENU ].Name = m_aPropNames[ INDEX_SUBMENU ]; // Submenu set! + aMenuItem[ OFFSET_MENUITEM_URL ].Name = m_aPropNames[ INDEX_URL ]; + aMenuItem[ OFFSET_MENUITEM_TITLE ].Name = m_aPropNames[ INDEX_TITLE ]; + aMenuItem[ OFFSET_MENUITEM_TARGET ].Name = m_aPropNames[ INDEX_TARGET ]; + aMenuItem[ OFFSET_MENUITEM_IMAGEIDENTIFIER ].Name = m_aPropNames[ INDEX_IMAGEIDENTIFIER]; + aMenuItem[ OFFSET_MENUITEM_CONTEXT ].Name = m_aPropNames[ INDEX_CONTEXT ]; + aMenuItem[ OFFSET_MENUITEM_SUBMENU ].Name = m_aPropNames[ INDEX_SUBMENU ]; // Submenu set! for ( sal_uInt32 n = 0; n < nCount; n++ ) { @@ -711,24 +711,24 @@ sal_Bool AddonsOptions_Impl::ReadOfficeHelpSet( Sequence< Sequence< PropertyValu } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** sal_Bool AddonsOptions_Impl::ReadOfficeMenuBarSet( Sequence< Sequence< PropertyValue > >& rAddonOfficeMenuBarSeq ) { // Read the OfficeMenuBar set and fill property sequences - ::rtl::OUString aAddonMenuBarNodeName( RTL_CONSTASCII_USTRINGPARAM( "AddonUI/OfficeMenuBar" )); - Sequence< ::rtl::OUString > aAddonMenuBarNodeSeq = GetNodeNames( aAddonMenuBarNodeName ); - ::rtl::OUString aAddonMenuBarNode( aAddonMenuBarNodeName + m_aPathDelimiter ); + ::rtl::OUString aAddonMenuBarNodeName( RTL_CONSTASCII_USTRINGPARAM( "AddonUI/OfficeMenuBar" )); + Sequence< ::rtl::OUString > aAddonMenuBarNodeSeq = GetNodeNames( aAddonMenuBarNodeName ); + ::rtl::OUString aAddonMenuBarNode( aAddonMenuBarNodeName + m_aPathDelimiter ); - sal_uInt32 nCount = aAddonMenuBarNodeSeq.getLength(); - sal_uInt32 nIndex = 0; + sal_uInt32 nCount = aAddonMenuBarNodeSeq.getLength(); + sal_uInt32 nIndex = 0; Sequence< PropertyValue > aPopupMenu( PROPERTYCOUNT_POPUPMENU ); // Init the property value sequence - aPopupMenu[ OFFSET_POPUPMENU_TITLE ].Name = m_aPropNames[ INDEX_TITLE ]; - aPopupMenu[ OFFSET_POPUPMENU_CONTEXT ].Name = m_aPropNames[ INDEX_CONTEXT]; - aPopupMenu[ OFFSET_POPUPMENU_SUBMENU ].Name = m_aPropNames[ INDEX_SUBMENU]; - aPopupMenu[ OFFSET_POPUPMENU_URL ].Name = m_aPropNames[ INDEX_URL ]; + aPopupMenu[ OFFSET_POPUPMENU_TITLE ].Name = m_aPropNames[ INDEX_TITLE ]; + aPopupMenu[ OFFSET_POPUPMENU_CONTEXT ].Name = m_aPropNames[ INDEX_CONTEXT]; + aPopupMenu[ OFFSET_POPUPMENU_SUBMENU ].Name = m_aPropNames[ INDEX_SUBMENU]; + aPopupMenu[ OFFSET_POPUPMENU_URL ].Name = m_aPropNames[ INDEX_URL ]; StringToIndexMap aTitleToIndexMap; @@ -767,7 +767,7 @@ sal_Bool AddonsOptions_Impl::ReadOfficeMenuBarSet( Sequence< Sequence< PropertyV } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** sal_Bool AddonsOptions_Impl::ReadOfficeToolBarSet( AddonToolBars& rAddonOfficeToolBars, std::vector< rtl::OUString >& rAddonOfficeToolBarResNames ) { @@ -791,24 +791,24 @@ sal_Bool AddonsOptions_Impl::ReadOfficeToolBarSet( AddonToolBars& rAddonOfficeTo //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** sal_Bool AddonsOptions_Impl::ReadToolBarItemSet( const rtl::OUString rToolBarItemSetNodeName, Sequence< Sequence< PropertyValue > >& rAddonOfficeToolBarSeq ) { - sal_Bool bInsertSeparator = sal_False; - sal_uInt32 nToolBarItemCount = rAddonOfficeToolBarSeq.getLength(); - ::rtl::OUString aAddonToolBarItemSetNode( rToolBarItemSetNodeName + m_aPathDelimiter ); - Sequence< ::rtl::OUString > aAddonToolBarItemSetNodeSeq = GetNodeNames( rToolBarItemSetNodeName ); - Sequence< PropertyValue > aToolBarItem( PROPERTYCOUNT_TOOLBARITEM ); + sal_Bool bInsertSeparator = sal_False; + sal_uInt32 nToolBarItemCount = rAddonOfficeToolBarSeq.getLength(); + ::rtl::OUString aAddonToolBarItemSetNode( rToolBarItemSetNodeName + m_aPathDelimiter ); + Sequence< ::rtl::OUString > aAddonToolBarItemSetNodeSeq = GetNodeNames( rToolBarItemSetNodeName ); + Sequence< PropertyValue > aToolBarItem( PROPERTYCOUNT_TOOLBARITEM ); // Init the property value sequence - aToolBarItem[ OFFSET_TOOLBARITEM_URL ].Name = m_aPropNames[ INDEX_URL ]; - aToolBarItem[ OFFSET_TOOLBARITEM_TITLE ].Name = m_aPropNames[ INDEX_TITLE ]; - aToolBarItem[ OFFSET_TOOLBARITEM_IMAGEIDENTIFIER ].Name = m_aPropNames[ INDEX_IMAGEIDENTIFIER]; - aToolBarItem[ OFFSET_TOOLBARITEM_TARGET ].Name = m_aPropNames[ INDEX_TARGET ]; - aToolBarItem[ OFFSET_TOOLBARITEM_CONTEXT ].Name = m_aPropNames[ INDEX_CONTEXT ]; - aToolBarItem[ OFFSET_TOOLBARITEM_CONTROLTYPE ].Name = m_aPropNames[ INDEX_CONTROLTYPE ]; - aToolBarItem[ OFFSET_TOOLBARITEM_WIDTH ].Name = m_aPropNames[ INDEX_WIDTH ]; + aToolBarItem[ OFFSET_TOOLBARITEM_URL ].Name = m_aPropNames[ INDEX_URL ]; + aToolBarItem[ OFFSET_TOOLBARITEM_TITLE ].Name = m_aPropNames[ INDEX_TITLE ]; + aToolBarItem[ OFFSET_TOOLBARITEM_IMAGEIDENTIFIER ].Name = m_aPropNames[ INDEX_IMAGEIDENTIFIER]; + aToolBarItem[ OFFSET_TOOLBARITEM_TARGET ].Name = m_aPropNames[ INDEX_TARGET ]; + aToolBarItem[ OFFSET_TOOLBARITEM_CONTEXT ].Name = m_aPropNames[ INDEX_CONTEXT ]; + aToolBarItem[ OFFSET_TOOLBARITEM_CONTROLTYPE ].Name = m_aPropNames[ INDEX_CONTROLTYPE ]; + aToolBarItem[ OFFSET_TOOLBARITEM_WIDTH ].Name = m_aPropNames[ INDEX_WIDTH ]; sal_uInt32 nCount = aAddonToolBarItemSetNodeSeq.getLength(); for ( sal_uInt32 n = 0; n < nCount; n++ ) @@ -835,23 +835,23 @@ sal_Bool AddonsOptions_Impl::ReadToolBarItemSet( const rtl::OUString rToolBarIte } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** void AddonsOptions_Impl::InsertToolBarSeparator( Sequence< Sequence< PropertyValue > >& rAddonOfficeToolBarSeq ) { - Sequence< PropertyValue > aToolBarItem( PROPERTYCOUNT_TOOLBARITEM ); + Sequence< PropertyValue > aToolBarItem( PROPERTYCOUNT_TOOLBARITEM ); - aToolBarItem[ OFFSET_TOOLBARITEM_URL ].Name = m_aPropNames[ INDEX_URL ]; - aToolBarItem[ OFFSET_TOOLBARITEM_TITLE ].Name = m_aPropNames[ INDEX_TITLE ]; - aToolBarItem[ OFFSET_TOOLBARITEM_IMAGEIDENTIFIER ].Name = m_aPropNames[ INDEX_IMAGEIDENTIFIER]; - aToolBarItem[ OFFSET_TOOLBARITEM_TARGET ].Name = m_aPropNames[ INDEX_TARGET ]; - aToolBarItem[ OFFSET_TOOLBARITEM_CONTEXT ].Name = m_aPropNames[ INDEX_CONTEXT ]; + aToolBarItem[ OFFSET_TOOLBARITEM_URL ].Name = m_aPropNames[ INDEX_URL ]; + aToolBarItem[ OFFSET_TOOLBARITEM_TITLE ].Name = m_aPropNames[ INDEX_TITLE ]; + aToolBarItem[ OFFSET_TOOLBARITEM_IMAGEIDENTIFIER ].Name = m_aPropNames[ INDEX_IMAGEIDENTIFIER]; + aToolBarItem[ OFFSET_TOOLBARITEM_TARGET ].Name = m_aPropNames[ INDEX_TARGET ]; + aToolBarItem[ OFFSET_TOOLBARITEM_CONTEXT ].Name = m_aPropNames[ INDEX_CONTEXT ]; - aToolBarItem[ OFFSET_TOOLBARITEM_URL ].Value <<= SEPARATOR_URL; - aToolBarItem[ OFFSET_TOOLBARITEM_TITLE ].Value <<= m_aEmpty; - aToolBarItem[ OFFSET_TOOLBARITEM_TARGET ].Value <<= m_aEmpty; - aToolBarItem[ OFFSET_TOOLBARITEM_IMAGEIDENTIFIER ].Value <<= m_aEmpty; - aToolBarItem[ OFFSET_TOOLBARITEM_CONTEXT ].Value <<= m_aEmpty; + aToolBarItem[ OFFSET_TOOLBARITEM_URL ].Value <<= SEPARATOR_URL; + aToolBarItem[ OFFSET_TOOLBARITEM_TITLE ].Value <<= m_aEmpty; + aToolBarItem[ OFFSET_TOOLBARITEM_TARGET ].Value <<= m_aEmpty; + aToolBarItem[ OFFSET_TOOLBARITEM_IMAGEIDENTIFIER ].Value <<= m_aEmpty; + aToolBarItem[ OFFSET_TOOLBARITEM_CONTEXT ].Value <<= m_aEmpty; sal_uInt32 nToolBarItemCount = rAddonOfficeToolBarSeq.getLength(); rAddonOfficeToolBarSeq.realloc( nToolBarItemCount+1 ); @@ -859,19 +859,19 @@ void AddonsOptions_Impl::InsertToolBarSeparator( Sequence< Sequence< PropertyVal } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** sal_Bool AddonsOptions_Impl::ReadImages( ImageManager& aImageManager ) { // Read the user-defined Images set and fill image manager ::rtl::OUString aAddonImagesNodeName( RTL_CONSTASCII_USTRINGPARAM( "AddonUI/Images" )); - Sequence< ::rtl::OUString > aAddonImagesNodeSeq = GetNodeNames( aAddonImagesNodeName ); + Sequence< ::rtl::OUString > aAddonImagesNodeSeq = GetNodeNames( aAddonImagesNodeName ); ::rtl::OUString aAddonImagesNode( aAddonImagesNodeName + m_aPathDelimiter ); sal_uInt32 nCount = aAddonImagesNodeSeq.getLength(); // Init the property value sequence - Sequence< ::rtl::OUString > aAddonImageItemNodePropNames( 1 ); + Sequence< ::rtl::OUString > aAddonImageItemNodePropNames( 1 ); ::rtl::OUString aURL; for ( sal_uInt32 n = 0; n < nCount; n++ ) @@ -913,7 +913,7 @@ sal_Bool AddonsOptions_Impl::ReadImages( ImageManager& aImageManager ) } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** ::rtl::OUString AddonsOptions_Impl::GeneratePrefixURL() @@ -929,20 +929,20 @@ sal_Bool AddonsOptions_Impl::ReadImages( ImageManager& aImageManager ) } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** sal_Bool AddonsOptions_Impl::ReadMenuMergeInstructions( MergeMenuInstructionContainer& aContainer ) { const ::rtl::OUString aMenuMergeRootName( RTL_CONSTASCII_USTRINGPARAM( "AddonUI/OfficeMenuBarMerging/" )); - Sequence< ::rtl::OUString > aAddonMergeNodesSeq = GetNodeNames( aMenuMergeRootName ); + Sequence< ::rtl::OUString > aAddonMergeNodesSeq = GetNodeNames( aMenuMergeRootName ); ::rtl::OUString aAddonMergeNode( aMenuMergeRootName ); sal_uInt32 nCount = aAddonMergeNodesSeq.getLength(); // Init the property value sequence - Sequence< ::rtl::OUString > aNodePropNames( 5 ); + Sequence< ::rtl::OUString > aNodePropNames( 5 ); ::rtl::OUString aURL; for ( sal_uInt32 i = 0; i < nCount; i++ ) @@ -1000,7 +1000,7 @@ sal_Bool AddonsOptions_Impl::ReadMenuMergeInstructions( MergeMenuInstructionCont } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** sal_Bool AddonsOptions_Impl::ReadMergeMenuData( const ::rtl::OUString& aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeMenu ) { @@ -1017,19 +1017,19 @@ sal_Bool AddonsOptions_Impl::ReadMergeMenuData( const ::rtl::OUString& aMergeAdd } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** sal_Bool AddonsOptions_Impl::ReadToolbarMergeInstructions( ToolbarMergingInstructions& rCachedToolbarMergingInstructions ) { const ::rtl::OUString aToolbarMergeRootName( RTL_CONSTASCII_USTRINGPARAM( "AddonUI/OfficeToolbarMerging/" )); - Sequence< ::rtl::OUString > aAddonMergeNodesSeq = GetNodeNames( aToolbarMergeRootName ); + Sequence< ::rtl::OUString > aAddonMergeNodesSeq = GetNodeNames( aToolbarMergeRootName ); ::rtl::OUString aAddonMergeNode( aToolbarMergeRootName ); sal_uInt32 nCount = aAddonMergeNodesSeq.getLength(); // Init the property value sequence - Sequence< ::rtl::OUString > aNodePropNames( 6 ); + Sequence< ::rtl::OUString > aNodePropNames( 6 ); ::rtl::OUString aURL; for ( sal_uInt32 i = 0; i < nCount; i++ ) @@ -1093,7 +1093,7 @@ sal_Bool AddonsOptions_Impl::ReadToolbarMergeInstructions( ToolbarMergingInstruc } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** sal_Bool AddonsOptions_Impl::ReadMergeToolbarData( const ::rtl::OUString& aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeToolbarItems ) { @@ -1106,14 +1106,14 @@ sal_Bool AddonsOptions_Impl::ReadMergeToolbarData( const ::rtl::OUString& aMerge } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** sal_Bool AddonsOptions_Impl::ReadMenuItem( const ::rtl::OUString& aMenuNodeName, Sequence< PropertyValue >& aMenuItem, sal_Bool bIgnoreSubMenu ) { - sal_Bool bResult = sal_False; - ::rtl::OUString aStrValue; - ::rtl::OUString aAddonMenuItemTreeNode( aMenuNodeName + m_aPathDelimiter ); - Sequence< Any > aMenuItemNodePropValues; + sal_Bool bResult = sal_False; + ::rtl::OUString aStrValue; + ::rtl::OUString aAddonMenuItemTreeNode( aMenuNodeName + m_aPathDelimiter ); + Sequence< Any > aMenuItemNodePropValues; aMenuItemNodePropValues = GetProperties( GetPropertyNamesMenuItem( aAddonMenuItemTreeNode ) ); if (( aMenuItemNodePropValues[ OFFSET_MENUITEM_TITLE ] >>= aStrValue ) && aStrValue.getLength() > 0 ) @@ -1133,10 +1133,10 @@ sal_Bool AddonsOptions_Impl::ReadMenuItem( const ::rtl::OUString& aMenuNodeName, // A popup menu must have a title and can have a URL and ImageIdentifier // Set the other property values to empty - aMenuItem[ OFFSET_MENUITEM_URL ].Value <<= aPopupMenuURL; - aMenuItem[ OFFSET_MENUITEM_TARGET ].Value <<= m_aEmpty; - aMenuItem[ OFFSET_MENUITEM_IMAGEIDENTIFIER ].Value <<= aPopupMenuImageId; - aMenuItem[ OFFSET_MENUITEM_CONTEXT ].Value <<= aMenuItemNodePropValues[ OFFSET_MENUITEM_CONTEXT ]; + aMenuItem[ OFFSET_MENUITEM_URL ].Value <<= aPopupMenuURL; + aMenuItem[ OFFSET_MENUITEM_TARGET ].Value <<= m_aEmpty; + aMenuItem[ OFFSET_MENUITEM_IMAGEIDENTIFIER ].Value <<= aPopupMenuImageId; + aMenuItem[ OFFSET_MENUITEM_CONTEXT ].Value <<= aMenuItemNodePropValues[ OFFSET_MENUITEM_CONTEXT ]; // Continue to read the sub menu nodes Sequence< Sequence< PropertyValue > > aSubMenuSeq; @@ -1155,11 +1155,11 @@ sal_Bool AddonsOptions_Impl::ReadMenuItem( const ::rtl::OUString& aMenuNodeName, aMenuItemNodePropValues[ OFFSET_MENUITEM_IMAGEIDENTIFIER ] >>= aMenuImageId; ReadAndAssociateImages( aStrValue, aMenuImageId ); - aMenuItem[ OFFSET_MENUITEM_URL ].Value <<= aStrValue; - aMenuItem[ OFFSET_MENUITEM_TARGET ].Value <<= aMenuItemNodePropValues[ OFFSET_MENUITEM_TARGET ]; - aMenuItem[ OFFSET_MENUITEM_IMAGEIDENTIFIER ].Value <<= aMenuImageId; - aMenuItem[ OFFSET_MENUITEM_CONTEXT ].Value <<= aMenuItemNodePropValues[ OFFSET_MENUITEM_CONTEXT ]; - aMenuItem[ OFFSET_MENUITEM_SUBMENU ].Value <<= Sequence< Sequence< PropertyValue > >(); // Submenu set! + aMenuItem[ OFFSET_MENUITEM_URL ].Value <<= aStrValue; + aMenuItem[ OFFSET_MENUITEM_TARGET ].Value <<= aMenuItemNodePropValues[ OFFSET_MENUITEM_TARGET ]; + aMenuItem[ OFFSET_MENUITEM_IMAGEIDENTIFIER ].Value <<= aMenuImageId; + aMenuItem[ OFFSET_MENUITEM_CONTEXT ].Value <<= aMenuItemNodePropValues[ OFFSET_MENUITEM_CONTEXT ]; + aMenuItem[ OFFSET_MENUITEM_SUBMENU ].Value <<= Sequence< Sequence< PropertyValue > >(); // Submenu set! bResult = sal_True; } @@ -1168,11 +1168,11 @@ sal_Bool AddonsOptions_Impl::ReadMenuItem( const ::rtl::OUString& aMenuNodeName, aStrValue.equalsAsciiL( SEPARATOR_URL_STR, SEPARATOR_URL_LEN )) { // Separator - aMenuItem[ OFFSET_MENUITEM_URL ].Value <<= aStrValue; - aMenuItem[ OFFSET_MENUITEM_TARGET ].Value <<= m_aEmpty; - aMenuItem[ OFFSET_MENUITEM_IMAGEIDENTIFIER ].Value <<= m_aEmpty; - aMenuItem[ OFFSET_MENUITEM_CONTEXT ].Value <<= m_aEmpty; - aMenuItem[ OFFSET_MENUITEM_SUBMENU ].Value <<= Sequence< Sequence< PropertyValue > >(); // Submenu set! + aMenuItem[ OFFSET_MENUITEM_URL ].Value <<= aStrValue; + aMenuItem[ OFFSET_MENUITEM_TARGET ].Value <<= m_aEmpty; + aMenuItem[ OFFSET_MENUITEM_IMAGEIDENTIFIER ].Value <<= m_aEmpty; + aMenuItem[ OFFSET_MENUITEM_CONTEXT ].Value <<= m_aEmpty; + aMenuItem[ OFFSET_MENUITEM_SUBMENU ].Value <<= Sequence< Sequence< PropertyValue > >(); // Submenu set! bResult = sal_True; } @@ -1180,14 +1180,14 @@ sal_Bool AddonsOptions_Impl::ReadMenuItem( const ::rtl::OUString& aMenuNodeName, } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** sal_Bool AddonsOptions_Impl::ReadPopupMenu( const ::rtl::OUString& aPopupMenuNodeName, Sequence< PropertyValue >& aPopupMenu ) { - sal_Bool bResult = sal_False; - ::rtl::OUString aStrValue; - ::rtl::OUString aAddonPopupMenuTreeNode( aPopupMenuNodeName + m_aPathDelimiter ); - Sequence< Any > aPopupMenuNodePropValues; + sal_Bool bResult = sal_False; + ::rtl::OUString aStrValue; + ::rtl::OUString aAddonPopupMenuTreeNode( aPopupMenuNodeName + m_aPathDelimiter ); + Sequence< Any > aPopupMenuNodePropValues; aPopupMenuNodePropValues = GetProperties( GetPropertyNamesPopupMenu( aAddonPopupMenuTreeNode ) ); if (( aPopupMenuNodePropValues[ OFFSET_POPUPMENU_TITLE ] >>= aStrValue ) && @@ -1203,8 +1203,8 @@ sal_Bool AddonsOptions_Impl::ReadPopupMenu( const ::rtl::OUString& aPopupMenuNod // Set a unique prefixed Add-On popup menu URL so it can be identified later ::rtl::OUString aPopupMenuURL = GeneratePrefixURL(); - aPopupMenu[ OFFSET_POPUPMENU_URL ].Value <<= aPopupMenuURL; - aPopupMenu[ OFFSET_POPUPMENU_CONTEXT ].Value <<= aPopupMenuNodePropValues[ OFFSET_POPUPMENU_CONTEXT ]; + aPopupMenu[ OFFSET_POPUPMENU_URL ].Value <<= aPopupMenuURL; + aPopupMenu[ OFFSET_POPUPMENU_CONTEXT ].Value <<= aPopupMenuNodePropValues[ OFFSET_POPUPMENU_CONTEXT ]; // Continue to read the sub menu nodes Sequence< Sequence< PropertyValue > > aSubMenuSeq; @@ -1221,7 +1221,7 @@ sal_Bool AddonsOptions_Impl::ReadPopupMenu( const ::rtl::OUString& aPopupMenuNod } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** sal_Bool AddonsOptions_Impl::AppendPopupMenu( Sequence< PropertyValue >& rTargetPopupMenu, const Sequence< PropertyValue >& rSourcePopupMenu ) { @@ -1242,15 +1242,15 @@ sal_Bool AddonsOptions_Impl::AppendPopupMenu( Sequence< PropertyValue >& rTarget } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** sal_Bool AddonsOptions_Impl::ReadToolBarItem( const ::rtl::OUString& aToolBarItemNodeName, Sequence< PropertyValue >& aToolBarItem ) { - sal_Bool bResult = sal_False; - ::rtl::OUString aTitle; - ::rtl::OUString aURL; - ::rtl::OUString aAddonToolBarItemTreeNode( aToolBarItemNodeName + m_aPathDelimiter ); - Sequence< Any > aToolBarItemNodePropValues; + sal_Bool bResult = sal_False; + ::rtl::OUString aTitle; + ::rtl::OUString aURL; + ::rtl::OUString aAddonToolBarItemTreeNode( aToolBarItemNodeName + m_aPathDelimiter ); + Sequence< Any > aToolBarItemNodePropValues; aToolBarItemNodePropValues = GetProperties( GetPropertyNamesToolBarItem( aAddonToolBarItemTreeNode ) ); @@ -1260,17 +1260,17 @@ sal_Bool AddonsOptions_Impl::ReadToolBarItem( const ::rtl::OUString& aToolBarIte if ( aURL.equals( SEPARATOR_URL )) { // A speparator toolbar item only needs a URL - aToolBarItem[ OFFSET_TOOLBARITEM_URL ].Value <<= aURL; - aToolBarItem[ OFFSET_TOOLBARITEM_TITLE ].Value <<= m_aEmpty; - aToolBarItem[ OFFSET_TOOLBARITEM_TARGET ].Value <<= m_aEmpty; - aToolBarItem[ OFFSET_TOOLBARITEM_IMAGEIDENTIFIER ].Value <<= m_aEmpty; - aToolBarItem[ OFFSET_TOOLBARITEM_CONTEXT ].Value <<= m_aEmpty; - aToolBarItem[ OFFSET_TOOLBARITEM_CONTROLTYPE ].Value <<= m_aEmpty; - aToolBarItem[ OFFSET_TOOLBARITEM_WIDTH ].Value <<= sal_Int32( 0 ); + aToolBarItem[ OFFSET_TOOLBARITEM_URL ].Value <<= aURL; + aToolBarItem[ OFFSET_TOOLBARITEM_TITLE ].Value <<= m_aEmpty; + aToolBarItem[ OFFSET_TOOLBARITEM_TARGET ].Value <<= m_aEmpty; + aToolBarItem[ OFFSET_TOOLBARITEM_IMAGEIDENTIFIER ].Value <<= m_aEmpty; + aToolBarItem[ OFFSET_TOOLBARITEM_CONTEXT ].Value <<= m_aEmpty; + aToolBarItem[ OFFSET_TOOLBARITEM_CONTROLTYPE ].Value <<= m_aEmpty; + aToolBarItem[ OFFSET_TOOLBARITEM_WIDTH ].Value <<= sal_Int32( 0 ); bResult = sal_True; } - else if (( aToolBarItemNodePropValues[ OFFSET_TOOLBARITEM_TITLE ] >>= aTitle ) && aTitle.getLength() > 0 ) + else if (( aToolBarItemNodePropValues[ OFFSET_TOOLBARITEM_TITLE ] >>= aTitle ) && aTitle.getLength() > 0 ) { // A normal toolbar item must also have title => read the other properties; ::rtl::OUString aImageId; @@ -1279,17 +1279,17 @@ sal_Bool AddonsOptions_Impl::ReadToolBarItem( const ::rtl::OUString& aToolBarIte aToolBarItemNodePropValues[ OFFSET_TOOLBARITEM_IMAGEIDENTIFIER ] >>= aImageId; ReadAndAssociateImages( aURL, aImageId ); - aToolBarItem[ OFFSET_TOOLBARITEM_URL ].Value <<= aURL; - aToolBarItem[ OFFSET_TOOLBARITEM_TITLE ].Value <<= aTitle; - aToolBarItem[ OFFSET_TOOLBARITEM_TARGET ].Value <<= aToolBarItemNodePropValues[ OFFSET_TOOLBARITEM_TARGET ]; - aToolBarItem[ OFFSET_TOOLBARITEM_IMAGEIDENTIFIER ].Value <<= aImageId; - aToolBarItem[ OFFSET_TOOLBARITEM_CONTEXT ].Value <<= aToolBarItemNodePropValues[ OFFSET_TOOLBARITEM_CONTEXT ]; - aToolBarItem[ OFFSET_TOOLBARITEM_CONTROLTYPE ].Value <<= aToolBarItemNodePropValues[ OFFSET_TOOLBARITEM_CONTROLTYPE ]; + aToolBarItem[ OFFSET_TOOLBARITEM_URL ].Value <<= aURL; + aToolBarItem[ OFFSET_TOOLBARITEM_TITLE ].Value <<= aTitle; + aToolBarItem[ OFFSET_TOOLBARITEM_TARGET ].Value <<= aToolBarItemNodePropValues[ OFFSET_TOOLBARITEM_TARGET ]; + aToolBarItem[ OFFSET_TOOLBARITEM_IMAGEIDENTIFIER ].Value <<= aImageId; + aToolBarItem[ OFFSET_TOOLBARITEM_CONTEXT ].Value <<= aToolBarItemNodePropValues[ OFFSET_TOOLBARITEM_CONTEXT ]; + aToolBarItem[ OFFSET_TOOLBARITEM_CONTROLTYPE ].Value <<= aToolBarItemNodePropValues[ OFFSET_TOOLBARITEM_CONTROLTYPE ]; // Configuration uses hyper for long. Therefore transform into sal_Int32 sal_Int64 nValue( 0 ); aToolBarItemNodePropValues[ OFFSET_TOOLBARITEM_WIDTH ] >>= nValue; - aToolBarItem[ OFFSET_TOOLBARITEM_WIDTH ].Value <<= sal_Int32( nValue ); + aToolBarItem[ OFFSET_TOOLBARITEM_WIDTH ].Value <<= sal_Int32( nValue ); bResult = sal_True; } @@ -1299,19 +1299,19 @@ sal_Bool AddonsOptions_Impl::ReadToolBarItem( const ::rtl::OUString& aToolBarIte } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** sal_Bool AddonsOptions_Impl::ReadSubMenuEntries( const Sequence< ::rtl::OUString >& aSubMenuNodeNames, Sequence< Sequence< PropertyValue > >& rSubMenuSeq ) { Sequence< PropertyValue > aMenuItem( PROPERTYCOUNT_MENUITEM ); // Init the property value sequence - aMenuItem[ OFFSET_MENUITEM_URL ].Name = PROPERTYNAME_URL; - aMenuItem[ OFFSET_MENUITEM_TITLE ].Name = PROPERTYNAME_TITLE; - aMenuItem[ OFFSET_MENUITEM_TARGET ].Name = PROPERTYNAME_TARGET; - aMenuItem[ OFFSET_MENUITEM_IMAGEIDENTIFIER ].Name = PROPERTYNAME_IMAGEIDENTIFIER; - aMenuItem[ OFFSET_MENUITEM_CONTEXT ].Name = PROPERTYNAME_CONTEXT; - aMenuItem[ OFFSET_MENUITEM_SUBMENU ].Name = PROPERTYNAME_SUBMENU; // Submenu set! + aMenuItem[ OFFSET_MENUITEM_URL ].Name = PROPERTYNAME_URL; + aMenuItem[ OFFSET_MENUITEM_TITLE ].Name = PROPERTYNAME_TITLE; + aMenuItem[ OFFSET_MENUITEM_TARGET ].Name = PROPERTYNAME_TARGET; + aMenuItem[ OFFSET_MENUITEM_IMAGEIDENTIFIER ].Name = PROPERTYNAME_IMAGEIDENTIFIER; + aMenuItem[ OFFSET_MENUITEM_CONTEXT ].Name = PROPERTYNAME_CONTEXT; + aMenuItem[ OFFSET_MENUITEM_SUBMENU ].Name = PROPERTYNAME_SUBMENU; // Submenu set! sal_uInt32 nIndex = 0; sal_uInt32 nCount = aSubMenuNodeNames.getLength(); @@ -1329,7 +1329,7 @@ sal_Bool AddonsOptions_Impl::ReadSubMenuEntries( const Sequence< ::rtl::OUString } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** sal_Bool AddonsOptions_Impl::HasAssociatedImages( const ::rtl::OUString& aURL ) { @@ -1338,7 +1338,7 @@ sal_Bool AddonsOptions_Impl::HasAssociatedImages( const ::rtl::OUString& aURL ) } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** void AddonsOptions_Impl::SubstituteVariables( ::rtl::OUString& aURL ) { @@ -1356,7 +1356,7 @@ void AddonsOptions_Impl::SubstituteVariables( ::rtl::OUString& aURL ) } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** void AddonsOptions_Impl::ReadImageFromURL( ImageSize nImageSize, const ::rtl::OUString& aImageURL, Image& aImage, Image& aImageNoScale ) { @@ -1401,7 +1401,7 @@ void AddonsOptions_Impl::ReadImageFromURL( ImageSize nImageSize, const ::rtl::OU } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** void AddonsOptions_Impl::ReadAndAssociateImages( const ::rtl::OUString& aURL, const ::rtl::OUString& aImageId ) { @@ -1458,12 +1458,12 @@ void AddonsOptions_Impl::ReadAndAssociateImages( const ::rtl::OUString& aURL, co } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** AddonsOptions_Impl::ImageEntry* AddonsOptions_Impl::ReadImageData( const ::rtl::OUString& aImagesNodeName ) { Sequence< ::rtl::OUString > aImageDataNodeNames = GetPropertyNamesImages( aImagesNodeName ); - Sequence< Any > aPropertyData; + Sequence< Any > aPropertyData; Sequence< sal_Int8 > aImageDataSeq; ::rtl::OUString aImageURL; @@ -1546,17 +1546,17 @@ AddonsOptions_Impl::ImageEntry* AddonsOptions_Impl::ReadImageData( const ::rtl:: } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** sal_Bool AddonsOptions_Impl::CreateImageFromSequence( Image& rImage, sal_Bool bBig, Sequence< sal_Int8 >& rBitmapDataSeq ) const { - sal_Bool bResult = sal_False; - Size aSize = bBig ? aImageSizeBig : aImageSizeSmall; // Sizes used for menu/toolbox images + sal_Bool bResult = sal_False; + Size aSize = bBig ? aImageSizeBig : aImageSizeSmall; // Sizes used for menu/toolbox images if ( rBitmapDataSeq.getLength() > 0 ) { - SvMemoryStream aMemStream( rBitmapDataSeq.getArray(), rBitmapDataSeq.getLength(), STREAM_STD_READ ); - BitmapEx aBitmapEx; + SvMemoryStream aMemStream( rBitmapDataSeq.getArray(), rBitmapDataSeq.getLength(), STREAM_STD_READ ); + BitmapEx aBitmapEx; aMemStream >> aBitmapEx; @@ -1578,7 +1578,7 @@ sal_Bool AddonsOptions_Impl::CreateImageFromSequence( Image& rImage, sal_Bool bB } //***************************************************************************************************************** -// private methods +// private methods //***************************************************************************************************************** Sequence< ::rtl::OUString > AddonsOptions_Impl::GetPropertyNamesMergeMenuInstruction( const ::rtl::OUString& aPropertyRootNode ) const { @@ -1600,18 +1600,18 @@ Sequence< ::rtl::OUString > AddonsOptions_Impl::GetPropertyNamesMenuItem( const Sequence< ::rtl::OUString > lResult( PROPERTYCOUNT_MENUITEM ); // Create property names dependent from the root node name - lResult[OFFSET_MENUITEM_URL] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_URL ] ); - lResult[OFFSET_MENUITEM_TITLE] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_TITLE ] ); + lResult[OFFSET_MENUITEM_URL] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_URL ] ); + lResult[OFFSET_MENUITEM_TITLE] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_TITLE ] ); lResult[OFFSET_MENUITEM_IMAGEIDENTIFIER] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_IMAGEIDENTIFIER ] ); - lResult[OFFSET_MENUITEM_TARGET] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_TARGET ] ); - lResult[OFFSET_MENUITEM_CONTEXT] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_CONTEXT ] ); - lResult[OFFSET_MENUITEM_SUBMENU] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_SUBMENU ] ); + lResult[OFFSET_MENUITEM_TARGET] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_TARGET ] ); + lResult[OFFSET_MENUITEM_CONTEXT] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_CONTEXT ] ); + lResult[OFFSET_MENUITEM_SUBMENU] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_SUBMENU ] ); return lResult; } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** Sequence< ::rtl::OUString > AddonsOptions_Impl::GetPropertyNamesPopupMenu( const ::rtl::OUString& aPropertyRootNode ) const { @@ -1619,62 +1619,62 @@ Sequence< ::rtl::OUString > AddonsOptions_Impl::GetPropertyNamesPopupMenu( const Sequence< ::rtl::OUString > lResult( PROPERTYCOUNT_POPUPMENU-1 ); // Create property names dependent from the root node name - lResult[OFFSET_POPUPMENU_TITLE] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_TITLE ] ); - lResult[OFFSET_POPUPMENU_CONTEXT] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_CONTEXT ] ); - lResult[OFFSET_POPUPMENU_SUBMENU] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_SUBMENU ] ); + lResult[OFFSET_POPUPMENU_TITLE] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_TITLE ] ); + lResult[OFFSET_POPUPMENU_CONTEXT] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_CONTEXT ] ); + lResult[OFFSET_POPUPMENU_SUBMENU] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_SUBMENU ] ); return lResult; } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** Sequence< ::rtl::OUString > AddonsOptions_Impl::GetPropertyNamesToolBarItem( const ::rtl::OUString& aPropertyRootNode ) const { Sequence< ::rtl::OUString > lResult( PROPERTYCOUNT_TOOLBARITEM ); // Create property names dependent from the root node name - lResult[0] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_URL ] ); - lResult[1] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_TITLE ] ); + lResult[0] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_URL ] ); + lResult[1] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_TITLE ] ); lResult[2] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_IMAGEIDENTIFIER] ); - lResult[3] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_TARGET ] ); - lResult[4] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_CONTEXT ] ); - lResult[5] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_CONTROLTYPE ] ); - lResult[6] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_WIDTH ] ); + lResult[3] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_TARGET ] ); + lResult[4] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_CONTEXT ] ); + lResult[5] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_CONTROLTYPE ] ); + lResult[6] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_WIDTH ] ); return lResult; } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** Sequence< ::rtl::OUString > AddonsOptions_Impl::GetPropertyNamesImages( const ::rtl::OUString& aPropertyRootNode ) const { Sequence< ::rtl::OUString > lResult( PROPERTYCOUNT_IMAGES ); // Create property names dependent from the root node name - lResult[0] = ::rtl::OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_SMALL ] ); - lResult[1] = ::rtl::OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_BIG ] ); - lResult[2] = ::rtl::OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_SMALLHC ] ); - lResult[3] = ::rtl::OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_BIGHC ] ); + lResult[0] = ::rtl::OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_SMALL ] ); + lResult[1] = ::rtl::OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_BIG ] ); + lResult[2] = ::rtl::OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_SMALLHC ] ); + lResult[3] = ::rtl::OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_BIGHC ] ); lResult[4] = ::rtl::OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_SMALL_URL ] ); - lResult[5] = ::rtl::OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_BIG_URL ] ); + lResult[5] = ::rtl::OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_BIG_URL ] ); lResult[6] = ::rtl::OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_SMALLHC_URL] ); - lResult[7] = ::rtl::OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_BIGHC_URL ] ); + lResult[7] = ::rtl::OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_BIGHC_URL ] ); return lResult; } //***************************************************************************************************************** -// initialize static member -// DON'T DO IT IN YOUR HEADER! -// see definition for further informations +// initialize static member +// DON'T DO IT IN YOUR HEADER! +// see definition for further informations //***************************************************************************************************************** -AddonsOptions_Impl* AddonsOptions::m_pDataContainer = NULL ; -sal_Int32 AddonsOptions::m_nRefCount = 0 ; +AddonsOptions_Impl* AddonsOptions::m_pDataContainer = NULL ; +sal_Int32 AddonsOptions::m_nRefCount = 0 ; //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** AddonsOptions::AddonsOptions() { @@ -1690,7 +1690,7 @@ AddonsOptions::AddonsOptions() } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** AddonsOptions::~AddonsOptions() { @@ -1708,7 +1708,7 @@ AddonsOptions::~AddonsOptions() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Bool AddonsOptions::HasAddonsMenu() const { @@ -1717,7 +1717,7 @@ sal_Bool AddonsOptions::HasAddonsMenu() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Bool AddonsOptions::HasAddonsHelpMenu() const @@ -1727,7 +1727,7 @@ sal_Bool AddonsOptions::HasAddonsHelpMenu() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Int32 AddonsOptions::GetAddonsToolBarCount() const @@ -1737,7 +1737,7 @@ sal_Int32 AddonsOptions::GetAddonsToolBarCount() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** const Sequence< Sequence< PropertyValue > >& AddonsOptions::GetAddonsMenu() const { @@ -1746,7 +1746,7 @@ const Sequence< Sequence< PropertyValue > >& AddonsOptions::GetAddonsMenu() cons } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** const Sequence< Sequence< PropertyValue > >& AddonsOptions::GetAddonsMenuBarPart() const { @@ -1755,7 +1755,7 @@ const Sequence< Sequence< PropertyValue > >& AddonsOptions::GetAddonsMenuBarPart } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** const Sequence< Sequence< PropertyValue > >& AddonsOptions::GetAddonsToolBarPart( sal_uInt32 nIndex ) const { @@ -1764,7 +1764,7 @@ const Sequence< Sequence< PropertyValue > >& AddonsOptions::GetAddonsToolBarPart } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** const ::rtl::OUString AddonsOptions::GetAddonsToolbarResourceName( sal_uInt32 nIndex ) const { @@ -1773,7 +1773,7 @@ const ::rtl::OUString AddonsOptions::GetAddonsToolbarResourceName( sal_uInt32 nI } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** const Sequence< Sequence< PropertyValue > >& AddonsOptions::GetAddonsHelpMenu() const { @@ -1782,7 +1782,7 @@ const Sequence< Sequence< PropertyValue > >& AddonsOptions::GetAddonsHelpMenu() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** const MergeMenuInstructionContainer& AddonsOptions::GetMergeMenuInstructions() const { @@ -1791,7 +1791,7 @@ const MergeMenuInstructionContainer& AddonsOptions::GetMergeMenuInstructions() c } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** bool AddonsOptions::GetMergeToolbarInstructions( const ::rtl::OUString& rToolbarName, @@ -1803,7 +1803,7 @@ bool AddonsOptions::GetMergeToolbarInstructions( } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** Image AddonsOptions::GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast, sal_Bool bNoScale ) const { @@ -1812,7 +1812,7 @@ Image AddonsOptions::GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** Image AddonsOptions::GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast ) const { @@ -1820,7 +1820,7 @@ Image AddonsOptions::GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** Mutex& AddonsOptions::GetOwnStaticMutex() { @@ -1845,7 +1845,7 @@ Mutex& AddonsOptions::GetOwnStaticMutex() } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** IMPL_STATIC_LINK_NOINSTANCE( AddonsOptions, Notify, void*, EMPTYARG ) { diff --git a/framework/source/classes/bmkmenu.cxx b/framework/source/classes/bmkmenu.cxx index b595cce880b1..aa2aef3b9d2b 100644 --- a/framework/source/classes/bmkmenu.cxx +++ b/framework/source/classes/bmkmenu.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <limits.h> @@ -41,7 +41,7 @@ #include <xml/menuconfiguration.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/uno/Reference.h> #include <com/sun/star/util/URL.hpp> @@ -54,7 +54,7 @@ #include <com/sun/star/util/DateTime.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <tools/config.hxx> #include <vcl/svapp.hxx> @@ -63,7 +63,7 @@ #include <rtl/logfile.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ using namespace ::comphelper; @@ -77,26 +77,26 @@ namespace framework { void GetMenuEntry( - Sequence< PropertyValue >& aDynamicMenuEntry, - ::rtl::OUString& rTitle, - ::rtl::OUString& rURL, - ::rtl::OUString& rFrame, - ::rtl::OUString& rImageId ); + Sequence< PropertyValue >& aDynamicMenuEntry, + ::rtl::OUString& rTitle, + ::rtl::OUString& rURL, + ::rtl::OUString& rFrame, + ::rtl::OUString& rImageId ); class BmkMenu_Impl { private: - static USHORT m_nMID; + static USHORT m_nMID; public: - BmkMenu* m_pRoot; + BmkMenu* m_pRoot; BOOL m_bInitialized; BmkMenu_Impl( BmkMenu* pRoot ); BmkMenu_Impl(); ~BmkMenu_Impl(); - static USHORT GetMID(); + static USHORT GetMID(); }; USHORT BmkMenu_Impl::m_nMID = BMKMENU_ITEMID_START; @@ -186,8 +186,8 @@ void BmkMenu::Initialize() InsertSeparator(); else { - sal_Bool bImageSet = sal_False; - USHORT nId = CreateMenuId(); + sal_Bool bImageSet = sal_False; + USHORT nId = CreateMenuId(); if ( bShowMenuImages ) { diff --git a/framework/source/classes/converter.cxx b/framework/source/classes/converter.cxx index 72fdb5d33306..d70b099c9e03 100644 --- a/framework/source/classes/converter.cxx +++ b/framework/source/classes/converter.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -154,7 +154,7 @@ css::uno::Sequence< ::rtl::OUString > Converter::convert_OUStringList2seqOUStrin css::uno::Sequence< css::beans::PropertyValue > Converter::convert_OUStringHash2seqProp( const OUStringHash& lSource ) { css::uno::Sequence< css::beans::PropertyValue > lDestination (lSource.size()); - css::beans::PropertyValue* pDestination = lDestination.getArray(); + css::beans::PropertyValue* pDestination = lDestination.getArray(); sal_Int32 nItem = 0; for (OUStringHash::const_iterator pItem=lSource.begin(); pItem!=lSource.end(); ++pItem) { @@ -172,7 +172,7 @@ css::uno::Sequence< css::beans::PropertyValue > Converter::convert_OUStringHash2 OUStringHash Converter::convert_seqProp2OUStringHash( const css::uno::Sequence< css::beans::PropertyValue >& lSource ) { OUStringHash lDestination; - sal_Int32 nCount = lSource.getLength(); + sal_Int32 nCount = lSource.getLength(); const css::beans::PropertyValue* pSource = lSource.getConstArray(); for (sal_Int32 nItem=0; nItem<nCount; ++nItem) { @@ -313,4 +313,4 @@ DateTime Converter::convert_String2DateTime( /*IN*/ const ::rtl::OUString& sSour return sBuffer.makeStringAndClear(); } -} // namespace framework +} // namespace framework diff --git a/framework/source/classes/droptargetlistener.cxx b/framework/source/classes/droptargetlistener.cxx index 1223b05ff593..69226cba3162 100644 --- a/framework/source/classes/droptargetlistener.cxx +++ b/framework/source/classes/droptargetlistener.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <classes/droptargetlistener.hxx> #include <threadhelp/readguard.hxx> @@ -38,7 +38,7 @@ #include <services.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/datatransfer/dnd/DNDConstants.hpp> #include <com/sun/star/frame/XDispatch.hpp> @@ -47,7 +47,7 @@ #include <com/sun/star/util/XURLTransformer.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <svtools/transfer.hxx> #include <unotools/localfilehelper.hxx> @@ -57,7 +57,7 @@ #include <vcl/svapp.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework diff --git a/framework/source/classes/framecontainer.cxx b/framework/source/classes/framecontainer.cxx index 3b48c715054e..af25e786dbf1 100644 --- a/framework/source/classes/framecontainer.cxx +++ b/framework/source/classes/framecontainer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #ifndef __FRAMEWORK_FRAMECONTAINER_HXX_ @@ -43,7 +43,7 @@ #endif //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #ifndef _COM_SUN_STAR_FRAME_FRAMESEARCH_FLAG_HPP_ @@ -51,26 +51,26 @@ #endif //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// non exported const +// non exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// non exported definitions +// non exported definitions //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ /**-*************************************************************************************************************** diff --git a/framework/source/classes/framelistanalyzer.cxx b/framework/source/classes/framelistanalyzer.cxx index 80702d8108e0..22f019e78df5 100644 --- a/framework/source/classes/framelistanalyzer.cxx +++ b/framework/source/classes/framelistanalyzer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ #include "classes/framelistanalyzer.hxx" //_______________________________________________ -// my own includes +// my own includes #include <threadhelp/writeguard.hxx> #include <threadhelp/readguard.hxx> #include <targets.h> @@ -39,29 +39,29 @@ #include <services.h> //_______________________________________________ -// interface includes +// interface includes #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XModuleManager.hpp> //_______________________________________________ -// includes of other projects +// includes of other projects #include <unotools/processfactory.hxx> #include <vcl/svapp.hxx> //_______________________________________________ -// namespace +// namespace namespace framework{ //_______________________________________________ -// non exported const +// non exported const //_______________________________________________ -// non exported definitions +// non exported definitions //_______________________________________________ -// declarations +// declarations //_______________________________________________ diff --git a/framework/source/classes/fwkresid.cxx b/framework/source/classes/fwkresid.cxx index 43e03b67594f..54b37da6dbf7 100644 --- a/framework/source/classes/fwkresid.cxx +++ b/framework/source/classes/fwkresid.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,19 +38,19 @@ namespace framework { -ResMgr* FwkResId::GetResManager() +ResMgr* FwkResId::GetResManager() { - static ResMgr* pResMgr = NULL; - + static ResMgr* pResMgr = NULL; + if ( !pResMgr ) { rtl::OStringBuffer aBuf( 32 ); aBuf.append( "fwe" ); - + vos::OGuard aSolarGuard( Application::GetSolarMutex() ); pResMgr = ResMgr::CreateResMgr( aBuf.getStr() ); } - + return pResMgr; } diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx index f463a6c499d7..aa550807460c 100644 --- a/framework/source/classes/fwktabwindow.cxx +++ b/framework/source/classes/fwktabwindow.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -118,7 +118,7 @@ void FwkTabPage::CreateDialog() m_xPage = uno::Reference < awt::XWindow >( m_xWinProvider->createContainerWindow( m_sPageURL, rtl::OUString(), xParent, xHandler ), uno::UNO_QUERY ); - + uno::Reference< awt::XControl > xPageControl( m_xPage, uno::UNO_QUERY ); if ( xPageControl.is() ) { @@ -376,7 +376,7 @@ FwkTabPage* FwkTabWindow::AddTabPage( sal_Int32 nIndex, const uno::Sequence< bea m_aTabCtrl.SetPageImage( nIdx, Image( xImage ) ); if ( bDisabled ) m_aTabCtrl.EnablePage( nIdx, false ); - + return pEntry->m_pPage; } diff --git a/framework/source/classes/fwlresid.cxx b/framework/source/classes/fwlresid.cxx index 0dbc626faddc..e3f3e26ce995 100755 --- a/framework/source/classes/fwlresid.cxx +++ b/framework/source/classes/fwlresid.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,19 +38,19 @@ namespace framework { -ResMgr* FwlResId::GetResManager() +ResMgr* FwlResId::GetResManager() { - static ResMgr* pResMgr = NULL; - + static ResMgr* pResMgr = NULL; + if ( !pResMgr ) { rtl::OStringBuffer aBuf( 32 ); aBuf.append( "fwe" ); - + vos::OGuard aSolarGuard( Application::GetSolarMutex() ); pResMgr = ResMgr::CreateResMgr( aBuf.getStr() ); } - + return pResMgr; } diff --git a/framework/source/classes/imagewrapper.cxx b/framework/source/classes/imagewrapper.cxx index b348e0cb9069..82a7f684413c 100644 --- a/framework/source/classes/imagewrapper.cxx +++ b/framework/source/classes/imagewrapper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ static Sequence< sal_Int8 > impl_getStaticIdentifier() ImageWrapper::ImageWrapper( const Image& aImage ) : ThreadHelpBase( &Application::GetSolarMutex() ) - , m_aImage( aImage ) + , m_aImage( aImage ) { } @@ -69,17 +69,17 @@ Sequence< sal_Int8 > ImageWrapper::GetUnoTunnelId() // XBitmap com::sun::star::awt::Size SAL_CALL ImageWrapper::getSize() throw ( RuntimeException ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); - BitmapEx aBitmapEx( m_aImage.GetBitmapEx() ); - Size aBitmapSize( aBitmapEx.GetSizePixel() ); + BitmapEx aBitmapEx( m_aImage.GetBitmapEx() ); + Size aBitmapSize( aBitmapEx.GetSizePixel() ); return com::sun::star::awt::Size( aBitmapSize.Width(), aBitmapSize.Height() ); } Sequence< sal_Int8 > SAL_CALL ImageWrapper::getDIB() throw ( RuntimeException ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); SvMemoryStream aMem; aMem << m_aImage.GetBitmapEx().GetBitmap(); @@ -88,8 +88,8 @@ Sequence< sal_Int8 > SAL_CALL ImageWrapper::getDIB() throw ( RuntimeException ) Sequence< sal_Int8 > SAL_CALL ImageWrapper::getMaskDIB() throw ( RuntimeException ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); - BitmapEx aBmpEx( m_aImage.GetBitmapEx() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); + BitmapEx aBmpEx( m_aImage.GetBitmapEx() ); if ( aBmpEx.IsAlpha() ) { diff --git a/framework/source/classes/menuextensionsupplier.cxx b/framework/source/classes/menuextensionsupplier.cxx index d6ed70103bf8..07991c61f90f 100644 --- a/framework/source/classes/menuextensionsupplier.cxx +++ b/framework/source/classes/menuextensionsupplier.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ namespace framework pfunc_setMenuExtensionSupplier SAL_CALL SetMenuExtensionSupplier( pfunc_setMenuExtensionSupplier pMenuExtensionSupplierFuncArg ) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); - + pfunc_setMenuExtensionSupplier pOldMenuExtensionSupplierFunc = pMenuExtensionSupplierFunc; pMenuExtensionSupplierFunc = pMenuExtensionSupplierFuncArg; return pOldMenuExtensionSupplierFunc; @@ -47,7 +47,7 @@ pfunc_setMenuExtensionSupplier SAL_CALL SetMenuExtensionSupplier( pfunc_setMenuE MenuExtensionItem SAL_CALL GetMenuExtension() { MenuExtensionItem aItem; - + pfunc_setMenuExtensionSupplier pLocalMenuExtensionSupplierFunc( 0 ); { diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx index 825a4b278c90..61cb8eb4a253 100644 --- a/framework/source/classes/menumanager.cxx +++ b/framework/source/classes/menumanager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,7 +30,7 @@ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <classes/menumanager.hxx> #include <xml/menuconfiguration.hxx> @@ -44,7 +44,7 @@ #include "classes/resource.hrc" //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/frame/XDispatch.hpp> @@ -57,7 +57,7 @@ #include <com/sun/star/util/XStringWidth.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <comphelper/processfactory.hxx> @@ -80,7 +80,7 @@ #include <cppuhelper/implbase1.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ using namespace ::cppu; @@ -111,15 +111,15 @@ namespace framework { // special menu ids/command ids for dynamic popup menus -#define SID_SFX_START 5000 -#define SID_NEWDOCDIRECT (SID_SFX_START + 537) -#define SID_AUTOPILOTMENU (SID_SFX_START + 1381) -#define SID_PICKLIST (SID_SFX_START + 510) -#define SID_MDIWINDOWLIST (SID_SFX_START + 610) -#define SID_ADDONLIST (SID_SFX_START + 1677) -#define SID_HELPMENU (SID_SFX_START + 410) +#define SID_SFX_START 5000 +#define SID_NEWDOCDIRECT (SID_SFX_START + 537) +#define SID_AUTOPILOTMENU (SID_SFX_START + 1381) +#define SID_PICKLIST (SID_SFX_START + 510) +#define SID_MDIWINDOWLIST (SID_SFX_START + 610) +#define SID_ADDONLIST (SID_SFX_START + 1677) +#define SID_HELPMENU (SID_SFX_START + 410) -#define SFX_REFERER_USER "private:user" +#define SFX_REFERER_USER "private:user" const ::rtl::OUString aSlotNewDocDirect( RTL_CONSTASCII_USTRINGPARAM( "slot:5537" )); const ::rtl::OUString aSlotAutoPilot( RTL_CONSTASCII_USTRINGPARAM( "slot:6381" )); @@ -140,22 +140,22 @@ const ::rtl::OUString UNO_COMMAND( RTL_CONSTASCII_USTRINGPARAM( ".uno:" )); MenuManager::MenuManager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, REFERENCE< XFRAME >& rFrame, Menu* pMenu, sal_Bool bDelete, sal_Bool bDeleteChildren ) -: // #110897# +: // #110897# ThreadHelpBase( &Application::GetSolarMutex() ), mxServiceFactory(xServiceFactory) { - m_bActive = sal_False; - m_bDeleteMenu = bDelete; - m_bDeleteChildren = bDeleteChildren; - m_pVCLMenu = pMenu; - m_xFrame = rFrame; - m_bInitialized = sal_False; - m_bIsBookmarkMenu = sal_False; + m_bActive = sal_False; + m_bDeleteMenu = bDelete; + m_bDeleteChildren = bDeleteChildren; + m_pVCLMenu = pMenu; + m_xFrame = rFrame; + m_bInitialized = sal_False; + m_bIsBookmarkMenu = sal_False; SAL_STATIC_CAST( ::com::sun::star::uno::XInterface*, (OWeakObject*)this )->acquire(); const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); - m_bWasHiContrast = rSettings.GetHighContrastMode(); - m_bShowMenuImages = rSettings.GetUseImagesInMenus(); + m_bWasHiContrast = rSettings.GetHighContrastMode(); + m_bShowMenuImages = rSettings.GetUseImagesInMenus(); sal_Int32 nAddonsURLPrefixLength = ADDONSPOPUPMENU_URL_PREFIX.getLength(); #if 0 @@ -251,7 +251,7 @@ MenuManager::MenuManager( if ( pMenu->GetItemText( nItemId ).Len() == 0 ) aQueryLabelItemIdVector.push_back( nItemId ); #endif - + if ( bShowMenuImages && !pMenu->GetItemImage( nItemId )) { Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE, m_bWasHiContrast ); @@ -276,7 +276,7 @@ MenuManager::MenuManager( if ( pMenu->GetItemText( nItemId ).Len() == 0 ) aQueryLabelItemIdVector.push_back( nItemId ); #endif - + if ( bShowMenuImages && !pMenu->GetItemImage( nItemId )) { Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE, m_bWasHiContrast ); @@ -362,20 +362,20 @@ MenuManager::MenuManager( MenuManager::MenuManager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, REFERENCE< XFRAME >& rFrame, AddonMenu* pAddonMenu, sal_Bool bDelete, sal_Bool bDeleteChildren ) -: // #110897# +: // #110897# ThreadHelpBase( &Application::GetSolarMutex() ), mxServiceFactory(xServiceFactory) { - m_bActive = sal_False; - m_bDeleteMenu = bDelete; - m_bDeleteChildren = bDeleteChildren; - m_pVCLMenu = pAddonMenu; - m_xFrame = rFrame; - m_bInitialized = sal_False; - m_bIsBookmarkMenu = sal_True; + m_bActive = sal_False; + m_bDeleteMenu = bDelete; + m_bDeleteChildren = bDeleteChildren; + m_pVCLMenu = pAddonMenu; + m_xFrame = rFrame; + m_bInitialized = sal_False; + m_bIsBookmarkMenu = sal_True; const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); - m_bWasHiContrast = rSettings.GetHighContrastMode(); + m_bWasHiContrast = rSettings.GetHighContrastMode(); SAL_STATIC_CAST( ::com::sun::star::uno::XInterface*, (OWeakObject*)this )->acquire(); @@ -483,13 +483,13 @@ throw ( RuntimeException ) if ( pStatusChangedMenu ) { - OGuard aSolarGuard( Application::GetSolarMutex() ); + OGuard aSolarGuard( Application::GetSolarMutex() ); { ResetableGuard aGuard( m_aLock ); sal_Bool bSetCheckmark = sal_False; - sal_Bool bCheckmark = sal_False; - sal_Bool bMenuItemEnabled = m_pVCLMenu->IsItemEnabled( pStatusChangedMenu->nItemId ); + sal_Bool bCheckmark = sal_False; + sal_Bool bMenuItemEnabled = m_pVCLMenu->IsItemEnabled( pStatusChangedMenu->nItemId ); if ( Event.IsEnabled != bMenuItemEnabled ) m_pVCLMenu->EnableItem( pStatusChangedMenu->nItemId, Event.IsEnabled ); @@ -515,8 +515,8 @@ throw ( RuntimeException ) if ( xMenuItemDispatch.is() ) { - pStatusChangedMenu->xMenuItemDispatch = xMenuItemDispatch; - pStatusChangedMenu->aMenuItemURL = aTargetURL.Complete; + pStatusChangedMenu->xMenuItemDispatch = xMenuItemDispatch; + pStatusChangedMenu->aMenuItemURL = aTargetURL.Complete; xMenuItemDispatch->addStatusListener( SAL_STATIC_CAST( XSTATUSLISTENER*, this ), aTargetURL ); } } @@ -543,7 +543,7 @@ void MenuManager::ClearMenuDispatch(const EVENTOBJECT& Source,bool _bRemoveOnly) if ( pItemHandler->xMenuItemDispatch.is() ) { URL aTargetURL; - aTargetURL.Complete = pItemHandler->aMenuItemURL; + aTargetURL.Complete = pItemHandler->aMenuItemURL; m_xURLTransformer->parseStrict( aTargetURL ); pItemHandler->xMenuItemDispatch->removeStatusListener( @@ -591,7 +591,7 @@ void SAL_CALL MenuManager::disposing( const EVENTOBJECT& Source ) throw ( RUNTIM if ( pMenuItemDisposing ) { URL aTargetURL; - aTargetURL.Complete = pMenuItemDisposing->aMenuItemURL; + aTargetURL.Complete = pMenuItemDisposing->aMenuItemURL; // #110897# m_xURLTransformer->parseStrict( aTargetURL ); @@ -611,8 +611,8 @@ void MenuManager::UpdateSpecialFileMenu( Menu* pMenu ) ::std::vector< MenuItemHandler* > aNewPickVector; Reference< XStringWidth > xStringLength( new StringLength ); - USHORT nPickItemId = START_ITEMID_PICKLIST; - int nPickListMenuItems = ( aHistoryList.getLength() > 99 ) ? 99 : aHistoryList.getLength(); + USHORT nPickItemId = START_ITEMID_PICKLIST; + int nPickListMenuItems = ( aHistoryList.getLength() > 99 ) ? 99 : aHistoryList.getLength(); aNewPickVector.reserve(nPickListMenuItems); for ( int i = 0; i < nPickListMenuItems; i++ ) @@ -669,15 +669,15 @@ void MenuManager::UpdateSpecialFileMenu( Menu* pMenu ) if ( xMenuItemDispatch.is() ) { pMenuItemHandler->xMenuItemDispatch = xMenuItemDispatch; - pMenuItemHandler->aMenuItemURL = aTargetURL.Complete; + pMenuItemHandler->aMenuItemURL = aTargetURL.Complete; } } { ResetableGuard aGuard( m_aLock ); - int nRemoveItemCount = 0; - int nItemCount = pMenu->GetItemCount(); + int nRemoveItemCount = 0; + int nItemCount = pMenu->GetItemCount(); if ( nItemCount > 0 ) { @@ -730,10 +730,10 @@ void MenuManager::UpdateSpecialFileMenu( Menu* pMenu ) } // Abbreviate URL - rtl::OUString aURLString( aNewPickVector.at( i )->aMenuItemURL ); - rtl::OUString aTipHelpText; - rtl::OUString aMenuTitle; - INetURLObject aURL( aURLString ); + rtl::OUString aURLString( aNewPickVector.at( i )->aMenuItemURL ); + rtl::OUString aTipHelpText; + rtl::OUString aMenuTitle; + INetURLObject aURL( aURLString ); if ( aURL.GetProtocol() == INET_PROT_FILE ) { @@ -741,8 +741,8 @@ void MenuManager::UpdateSpecialFileMenu( Menu* pMenu ) // path and abbreviate it with a special function: String aFileSystemPath( aURL.getFSysPath( INetURLObject::FSYS_DETECT ) ); - ::rtl::OUString aSystemPath( aFileSystemPath ); - ::rtl::OUString aCompactedSystemPath; + ::rtl::OUString aSystemPath( aFileSystemPath ); + ::rtl::OUString aCompactedSystemPath; aTipHelpText = aSystemPath; oslFileError nError = osl_abbreviateSystemPath( aSystemPath.pData, &aCompactedSystemPath.pData, 46, NULL ); @@ -754,7 +754,7 @@ void MenuManager::UpdateSpecialFileMenu( Menu* pMenu ) else { // Use INetURLObject to abbreviate all other URLs - String aShortURL; + String aShortURL; aShortURL = aURL.getAbbreviated( xStringLength, 46, INetURLObject::DECODE_UNAMBIGUOUS ); aMenuTitle += aShortURL; aTipHelpText = aURLString; @@ -779,8 +779,8 @@ void MenuManager::UpdateSpecialWindowMenu( Menu* pMenu,const Reference< XMultiSe // #110897# Reference< XDesktop > xDesktop( xServiceFactory->createInstance( SERVICENAME_DESKTOP ), UNO_QUERY ); - USHORT nActiveItemId = 0; - USHORT nItemId = START_ITEMID_WINDOWLIST; + USHORT nActiveItemId = 0; + USHORT nItemId = START_ITEMID_WINDOWLIST; if ( xDesktop.is() ) { @@ -812,7 +812,7 @@ void MenuManager::UpdateSpecialWindowMenu( Menu* pMenu,const Reference< XMultiSe { ResetableGuard aGuard( _rMutex ); - int nItemCount = pMenu->GetItemCount(); + int nItemCount = pMenu->GetItemCount(); if ( nItemCount > 0 ) { @@ -891,9 +891,9 @@ IMPL_LINK( MenuManager, Activate, Menu *, pMenu ) if ( pMenu == m_pVCLMenu ) { // set/unset hiding disabled menu entries - sal_Bool bDontHide = SvtMenuOptions().IsEntryHidingEnabled(); + sal_Bool bDontHide = SvtMenuOptions().IsEntryHidingEnabled(); const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); - sal_Bool bShowMenuImages = rSettings.GetUseImagesInMenus(); + sal_Bool bShowMenuImages = rSettings.GetUseImagesInMenus(); sal_uInt16 nFlag = pMenu->GetMenuFlags(); if ( bDontHide ) @@ -929,8 +929,8 @@ IMPL_LINK( MenuManager, Activate, Menu *, pMenu ) if ( m_bWasHiContrast != bIsHiContrast || bShowMenuImages != m_bShowMenuImages ) { // The mode changed so we have to replace all images - m_bWasHiContrast = bIsHiContrast; - m_bShowMenuImages = bShowMenuImages; + m_bWasHiContrast = bIsHiContrast; + m_bShowMenuImages = bShowMenuImages; FillMenuImages(m_xFrame,pMenu,bIsHiContrast,bShowMenuImages); } @@ -981,7 +981,7 @@ IMPL_LINK( MenuManager, Activate, Menu *, pMenu ) if ( xMenuItemDispatch.is() ) { pMenuItemHandler->xMenuItemDispatch = xMenuItemDispatch; - pMenuItemHandler->aMenuItemURL = aTargetURL.Complete; + pMenuItemHandler->aMenuItemURL = aTargetURL.Complete; xMenuItemDispatch->addStatusListener( SAL_STATIC_CAST( XSTATUSLISTENER*, this ), aTargetURL ); } else @@ -1008,9 +1008,9 @@ IMPL_LINK( MenuManager, Deactivate, Menu *, pMenu ) IMPL_LINK( MenuManager, Select, Menu *, pMenu ) { - URL aTargetURL; - Sequence<PropertyValue> aArgs; - REFERENCE< XDISPATCH > xDispatch; + URL aTargetURL; + Sequence<PropertyValue> aArgs; + REFERENCE< XDISPATCH > xDispatch; { ResetableGuard aGuard( m_aLock ); @@ -1026,7 +1026,7 @@ IMPL_LINK( MenuManager, Select, Menu *, pMenu ) // #110897# // Reference< XFramesSupplier > xDesktop( ::comphelper::getProcessServiceFactory()->createInstance( - // DESKTOP_SERVICE ), UNO_QUERY ); + // DESKTOP_SERVICE ), UNO_QUERY ); Reference< XFramesSupplier > xDesktop( getServiceFactory()->createInstance( SERVICENAME_DESKTOP ), UNO_QUERY ); if ( xDesktop.is() ) @@ -1129,7 +1129,7 @@ USHORT MenuManager::FillItemCommand(::rtl::OUString& _rItemCommand,Menu* _pMenu, } void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame,Menu* _pMenu,sal_Bool bIsHiContrast,sal_Bool bShowMenuImages) { - AddonsOptions aAddonOptions; + AddonsOptions aAddonOptions; for ( USHORT nPos = 0; nPos < _pMenu->GetItemCount(); nPos++ ) { @@ -1144,7 +1144,7 @@ void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame,Menu* _pMenu,sal_B if ( bTmpShowMenuImages ) { - sal_Bool bImageSet = sal_False; + sal_Bool bImageSet = sal_False; ::rtl::OUString aImageId; ::framework::MenuConfiguration::Attributes* pMenuAttributes = diff --git a/framework/source/classes/propertysethelper.cxx b/framework/source/classes/propertysethelper.cxx index 7f05c15c1d38..2e41106a9ceb 100644 --- a/framework/source/classes/propertysethelper.cxx +++ b/framework/source/classes/propertysethelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes #include <classes/propertysethelper.hxx> #include <threadhelp/transactionguard.hxx> @@ -37,13 +37,13 @@ #include <threadhelp/writeguard.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ -// namespace +// namespace namespace framework{ diff --git a/framework/source/classes/protocolhandlercache.cxx b/framework/source/classes/protocolhandlercache.cxx index 82fded63fc51..266100ce4f43 100644 --- a/framework/source/classes/protocolhandlercache.cxx +++ b/framework/source/classes/protocolhandlercache.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ */ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <classes/protocolhandlercache.hxx> @@ -45,18 +45,18 @@ #include <threadhelp/lockhelper.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <tools/wldcrd.hxx> #include <unotools/configpathes.hxx> #include <rtl/ustrbuf.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ @@ -234,7 +234,7 @@ void HandlerCache::takeOver(HandlerHash* pHandler, PatternHash* pPattern) HandlerHash* pOldHandler = m_pHandler; PatternHash* pOldPattern = m_pPattern; - + m_pHandler = pHandler; m_pPattern = pPattern; @@ -242,7 +242,7 @@ void HandlerCache::takeOver(HandlerHash* pHandler, PatternHash* pPattern) pOldPattern->free(); delete pOldHandler; delete pOldPattern; - + aWriteLock.unlock(); // <- SAFE } @@ -343,7 +343,7 @@ void HandlerCFGAccess::Notify(const css::uno::Sequence< rtl::OUString >& /*lProp { HandlerHash* pHandler = new HandlerHash; PatternHash* pPattern = new PatternHash; - + read(&pHandler, &pPattern); if (m_pCache) m_pCache->takeOver(pHandler, pPattern); diff --git a/framework/source/classes/resource.src b/framework/source/classes/resource.src index 5c0f7d087ab7..2f8e1bdf2f16 100644 --- a/framework/source/classes/resource.src +++ b/framework/source/classes/resource.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -159,14 +159,14 @@ String STR_STATUSBAR_LOGOTEXT #define LICENSE_COL_4 (LICENSE_DIALOG_WIDTH - LICENSE_RIGHT_BORDER - PD_WIDTH) #define LICENSE_WIDTH (LICENSE_DIALOG_WIDTH - LICENSE_RIGHT_BORDER - LICENSE_ROW_1) -#define COL3_WIDTH (LICENSE_COL_4 - LICENSE_COL_3) +#define COL3_WIDTH (LICENSE_COL_4 - LICENSE_COL_3) ModalDialog DLG_LICENSE { HelpId = HID_LICENSEDIALOG; - Moveable = TRUE ; - Closeable = TRUE ; + Moveable = TRUE ; + Closeable = TRUE ; OutputSize = TRUE ; SVLook = TRUE ; Hide = TRUE ; @@ -293,7 +293,7 @@ String STR_FULL_DISC_MSG String STR_RESTORE_TOOLBARS { - Text [ en-US ] = "~Reset" ; + Text [ en-US ] = "~Reset" ; }; String STR_CORRUPT_UICFG_SHARE @@ -324,31 +324,31 @@ String STR_LANGSTATUS_MULTIPLE_LANGUAGES }; String STR_LANGSTATUS_NONE { - Text [ en-US ] = "None (Do not check spelling)" ; - Text [ x-comment ] = " "; + Text [ en-US ] = "None (Do not check spelling)" ; + Text [ x-comment ] = " "; }; String STR_RESET_TO_DEFAULT_LANGUAGE { - Text [ en-US ] = "Reset to Default Language" ; - Text [ x-comment ] = " "; + Text [ en-US ] = "Reset to Default Language" ; + Text [ x-comment ] = " "; }; String STR_LANGSTATUS_MORE { - Text [ en-US ] = "More..." ; - Text [ x-comment ] = " "; + Text [ en-US ] = "More..." ; + Text [ x-comment ] = " "; }; String STR_SET_LANGUAGE_FOR_SELECTION { - Text [ en-US ] = "Set Language for Selection" ; - Text [ x-comment ] = " "; + Text [ en-US ] = "Set Language for Selection" ; + Text [ x-comment ] = " "; }; String STR_SET_LANGUAGE_FOR_PARAGRAPH { - Text [ en-US ] = "Set Language for Paragraph" ; - Text [ x-comment ] = " "; + Text [ en-US ] = "Set Language for Paragraph" ; + Text [ x-comment ] = " "; }; String STR_SET_LANGUAGE_FOR_ALL_TEXT { - Text [ en-US ] = "Set Language for all Text" ; - Text [ x-comment ] = " "; + Text [ en-US ] = "Set Language for all Text" ; + Text [ x-comment ] = " "; }; diff --git a/framework/source/classes/rootactiontriggercontainer.cxx b/framework/source/classes/rootactiontriggercontainer.cxx index 9af6a4dfeb6e..c78d398b39a7 100644 --- a/framework/source/classes/rootactiontriggercontainer.cxx +++ b/framework/source/classes/rootactiontriggercontainer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,9 +59,9 @@ static Sequence< sal_Int8 > impl_getStaticIdentifier() RootActionTriggerContainer::RootActionTriggerContainer( const Menu* pMenu, const ::rtl::OUString* pMenuIdentifier, const Reference< XMultiServiceFactory >& rServiceManager ) : PropertySetContainer( rServiceManager ) - , m_bContainerCreated( sal_False ) - , m_bContainerChanged( sal_False ) - , m_bInContainerCreation( sal_False ) + , m_bContainerCreated( sal_False ) + , m_bContainerChanged( sal_False ) + , m_bInContainerCreation( sal_False ) , m_pMenu( pMenu ) , m_pMenuIdentifier( pMenuIdentifier ) { @@ -101,9 +101,9 @@ throw ( RuntimeException ) { Any a = ::cppu::queryInterface( aType , - SAL_STATIC_CAST( XMultiServiceFactory* , this ), - SAL_STATIC_CAST( XServiceInfo* , this ), - SAL_STATIC_CAST( XUnoTunnel* , this ), + SAL_STATIC_CAST( XMultiServiceFactory* , this ), + SAL_STATIC_CAST( XServiceInfo* , this ), + SAL_STATIC_CAST( XUnoTunnel* , this ), SAL_STATIC_CAST( XTypeProvider* , this ), SAL_STATIC_CAST( XNamed* , this )); @@ -307,12 +307,12 @@ Sequence< Type > SAL_CALL RootActionTriggerContainer::getTypes() throw ( Runtime { // Create a static typecollection ... static ::cppu::OTypeCollection aTypeCollection( - ::getCppuType(( const Reference< XMultiServiceFactory >*)NULL ) , - ::getCppuType(( const Reference< XIndexContainer >*)NULL ) , - ::getCppuType(( const Reference< XIndexAccess >*)NULL ) , - ::getCppuType(( const Reference< XIndexReplace >*)NULL ) , - ::getCppuType(( const Reference< XServiceInfo >*)NULL ) , - ::getCppuType(( const Reference< XTypeProvider >*)NULL ) , + ::getCppuType(( const Reference< XMultiServiceFactory >*)NULL ) , + ::getCppuType(( const Reference< XIndexContainer >*)NULL ) , + ::getCppuType(( const Reference< XIndexAccess >*)NULL ) , + ::getCppuType(( const Reference< XIndexReplace >*)NULL ) , + ::getCppuType(( const Reference< XServiceInfo >*)NULL ) , + ::getCppuType(( const Reference< XTypeProvider >*)NULL ) , ::getCppuType(( const Reference< XUnoTunnel >*)NULL ) , ::getCppuType(( const Reference< XNamed >*)NULL )) ; @@ -363,7 +363,7 @@ void RootActionTriggerContainer::FillContainer() m_pMenu ); m_bInContainerCreation = sal_False; } -::rtl::OUString RootActionTriggerContainer::getName() throw ( RuntimeException ) +::rtl::OUString RootActionTriggerContainer::getName() throw ( RuntimeException ) { ::rtl::OUString sRet; if( m_pMenuIdentifier ) @@ -373,7 +373,7 @@ void RootActionTriggerContainer::FillContainer() void RootActionTriggerContainer::setName( const ::rtl::OUString& ) throw ( RuntimeException) { - throw RuntimeException(); + throw RuntimeException(); } } diff --git a/framework/source/classes/sfxhelperfunctions.cxx b/framework/source/classes/sfxhelperfunctions.cxx index d6acc6a879b0..c6953b1ea2b9 100644 --- a/framework/source/classes/sfxhelperfunctions.cxx +++ b/framework/source/classes/sfxhelperfunctions.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,8 +36,8 @@ static pfunc_setToolBoxControllerCreator pToolBoxControllerCreator = NULL; static pfunc_setStatusBarControllerCreator pStatusBarControllerCreator = NULL; -static pfunc_getRefreshToolbars pRefreshToolbars = NULL; -static pfunc_createDockingWindow pCreateDockingWindow = NULL; +static pfunc_getRefreshToolbars pRefreshToolbars = NULL; +static pfunc_createDockingWindow pCreateDockingWindow = NULL; static pfunc_isDockingWindowVisible pIsDockingWindowVisible = NULL; static pfunc_activateToolPanel pActivateToolPanel = NULL; @@ -64,7 +64,7 @@ svt::ToolboxController* SAL_CALL CreateToolBoxController( const Reference< XFram ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); pFactory = pToolBoxControllerCreator; } - + if ( pFactory ) return (*pFactory)( rFrame, pToolbox, nID, aCommandURL ); else @@ -86,7 +86,7 @@ svt::StatusbarController* SAL_CALL CreateStatusBarController( const Reference< X ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); pFactory = pStatusBarControllerCreator; } - + if ( pFactory ) return (*pFactory)( rFrame, pStatusBar, nID, aCommandURL ); else @@ -109,7 +109,7 @@ void SAL_CALL RefreshToolbars( ::com::sun::star::uno::Reference< ::com::sun::sta ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); pCallback = pRefreshToolbars; } - + if ( pCallback ) (*pCallback)( rFrame ); } @@ -130,7 +130,7 @@ void SAL_CALL CreateDockingWindow( const ::com::sun::star::uno::Reference< ::com ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); pFactory = pCreateDockingWindow; } - + if ( pFactory ) (*pFactory)( rFrame, rResourceURL ); } @@ -151,7 +151,7 @@ bool SAL_CALL IsDockingWindowVisible( const ::com::sun::star::uno::Reference< :: ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); pCall = pIsDockingWindowVisible; } - + if ( pIsDockingWindowVisible ) return (*pIsDockingWindowVisible)( rFrame, rResourceURL ); else diff --git a/framework/source/classes/taskcreator.cxx b/framework/source/classes/taskcreator.cxx index cdf19a25a832..162c10e5cfa0 100644 --- a/framework/source/classes/taskcreator.cxx +++ b/framework/source/classes/taskcreator.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <classes/taskcreator.hxx> #include "services/taskcreatorsrv.hxx" @@ -38,37 +38,37 @@ #include <services.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/beans/NamedValue.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <comphelper/configurationhelper.hxx> #include <vcl/svapp.hxx> //_________________________________________________________________________________________________________________ -// includes of my own project +// includes of my own project //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// non exported const +// non exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// non exported definitions +// non exported definitions //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ /*-****************************************************************************************************//** @@ -140,30 +140,30 @@ css::uno::Reference< css::frame::XFrame > TaskCreator::createTask( const ::rtl:: if ( ! xCreator.is()) xCreator = css::uno::Reference< css::lang::XSingleServiceFactory >( xSMGR->createInstance(IMPLEMENTATIONNAME_FWK_TASKCREATOR), css::uno::UNO_QUERY_THROW); - + css::uno::Sequence< css::uno::Any > lArgs(5); css::beans::NamedValue aArg ; - + aArg.Name = TaskCreatorService::ARGUMENT_PARENTFRAME; aArg.Value <<= css::uno::Reference< css::frame::XFrame >(xSMGR->createInstance(SERVICENAME_DESKTOP), css::uno::UNO_QUERY_THROW); lArgs[0] <<= aArg; - + aArg.Name = TaskCreatorService::ARGUMENT_CREATETOPWINDOW; aArg.Value <<= sal_True; lArgs[1] <<= aArg; - + aArg.Name = TaskCreatorService::ARGUMENT_MAKEVISIBLE; aArg.Value <<= bVisible; lArgs[2] <<= aArg; - + aArg.Name = TaskCreatorService::ARGUMENT_SUPPORTPERSISTENTWINDOWSTATE; aArg.Value <<= sal_True; lArgs[3] <<= aArg; - + aArg.Name = TaskCreatorService::ARGUMENT_FRAMENAME; aArg.Value <<= sName; lArgs[4] <<= aArg; - + css::uno::Reference< css::frame::XFrame > xTask(xCreator->createInstanceWithArguments(lArgs), css::uno::UNO_QUERY_THROW); return xTask; } diff --git a/framework/source/constant/containerquery.cxx b/framework/source/constant/containerquery.cxx index 75f77c626195..5468e2fe721b 100644 --- a/framework/source/constant/containerquery.cxx +++ b/framework/source/constant/containerquery.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/source/constant/contenthandler.cxx b/framework/source/constant/contenthandler.cxx index 22565cc65219..239b365f565b 100644 --- a/framework/source/constant/contenthandler.cxx +++ b/framework/source/constant/contenthandler.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/source/constant/frameloader.cxx b/framework/source/constant/frameloader.cxx index b42c1b082af2..bfa125aa04cb 100644 --- a/framework/source/constant/frameloader.cxx +++ b/framework/source/constant/frameloader.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx index 8bec3e8c8d46..ee84de9d7dd4 100644 --- a/framework/source/dispatch/closedispatcher.cxx +++ b/framework/source/dispatch/closedispatcher.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -632,7 +632,7 @@ css::uno::Reference< css::frame::XFrame > CloseDispatcher::static_impl_searchRig ::vos::OGuard aSolarLock(&Application::GetSolarMutex()); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( - (pWindow ) && + (pWindow ) && (pWindow->IsSystemWindow()) ) return xTarget; diff --git a/framework/source/dispatch/dispatchinformationprovider.cxx b/framework/source/dispatch/dispatchinformationprovider.cxx index 5f7cd37076f7..e8447c04c3c7 100644 --- a/framework/source/dispatch/dispatchinformationprovider.cxx +++ b/framework/source/dispatch/dispatchinformationprovider.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <dispatch/dispatchinformationprovider.hxx> #include <dispatch/closedispatcher.hxx> @@ -39,30 +39,30 @@ #include <services.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/frame/CommandGroup.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <comphelper/sequenceasvector.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ - -namespace css = ::com::sun::star; + +namespace css = ::com::sun::star; //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ DEFINE_XINTERFACE_1(DispatchInformationProvider , OWeakObject , DIRECT_INTERFACE(css::frame::XDispatchInformationProvider)) - + //_________________________________________________________________________________________________________________ DispatchInformationProvider::DispatchInformationProvider(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR , const css::uno::Reference< css::frame::XFrame >& xFrame) @@ -84,9 +84,9 @@ css::uno::Sequence< sal_Int16 > SAL_CALL DispatchInformationProvider::getSupport css::uno::Sequence< css::uno::Reference< css::frame::XDispatchInformationProvider > > lProvider = implts_getAllSubProvider(); sal_Int32 c1 = lProvider.getLength(); sal_Int32 i1 = 0; - + ::comphelper::SequenceAsVector< sal_Int16 > lGroups; - + for (i1=0; i1<c1; ++i1) { // ignore controller, which doesnt implement the right interface @@ -105,7 +105,7 @@ css::uno::Sequence< sal_Int16 > SAL_CALL DispatchInformationProvider::getSupport lGroups.push_back(rGroup); } } - + return lGroups.getAsConstList(); } @@ -147,7 +147,7 @@ css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL DispatchInformati c1 = (sal_Int32)lInfos.size(); i1 = 0; - + css::uno::Sequence< css::frame::DispatchInformation > lReturn(c1); BaseHash< css::frame::DispatchInformation >::const_iterator pStepp ; for ( pStepp = lInfos.begin() ; @@ -168,23 +168,23 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatchInformationProvide css::uno::Reference< css::frame::XFrame > xFrame(m_xFrame.get(), css::uno::UNO_QUERY); aReadLock.unlock(); // <- SAFE ---------------------------------- - + if (!xFrame.is()) return css::uno::Sequence< css::uno::Reference< css::frame::XDispatchInformationProvider > >(); - + CloseDispatcher* pCloser = new CloseDispatcher(xSMGR, xFrame, ::rtl::OUString::createFromAscii("_self")); // explicit "_self" ... not "" ... see implementation of close dispatcher itself! css::uno::Reference< css::uno::XInterface > xCloser(static_cast< css::frame::XDispatch* >(pCloser), css::uno::UNO_QUERY); css::uno::Reference< css::frame::XDispatchInformationProvider > xCloseDispatch(xCloser , css::uno::UNO_QUERY); css::uno::Reference< css::frame::XDispatchInformationProvider > xController (xFrame->getController() , css::uno::UNO_QUERY); css::uno::Reference< css::frame::XDispatchInformationProvider > xAppDispatcher(xSMGR->createInstance(IMPLEMENTATIONNAME_APPDISPATCHPROVIDER), css::uno::UNO_QUERY); - + css::uno::Sequence< css::uno::Reference< css::frame::XDispatchInformationProvider > > lProvider(3); - lProvider[0] = xController ; + lProvider[0] = xController ; lProvider[1] = xCloseDispatch; lProvider[2] = xAppDispatcher; - return lProvider; + return lProvider; } } // namespace framework diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx index e97ada73c23f..d28839f1d440 100644 --- a/framework/source/dispatch/dispatchprovider.cxx +++ b/framework/source/dispatch/dispatchprovider.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <stdio.h> @@ -52,7 +52,7 @@ #include <general.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/uno/Exception.hpp> @@ -61,7 +61,7 @@ #include <com/sun/star/lang/XInitialization.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <osl/diagnose.h> #include <rtl/string.h> @@ -69,25 +69,25 @@ #include <vcl/svapp.hxx> #include <rtl/ustrbuf.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// non exported const +// non exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// non exported definitions +// non exported definitions //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// XInterface, XTypeProvider +// XInterface, XTypeProvider //***************************************************************************************************************** DEFINE_XINTERFACE_2( DispatchProvider , OWeakObject , @@ -120,7 +120,7 @@ DEFINE_XTYPEPROVIDER_2( DispatchProvider , */ DispatchProvider::DispatchProvider( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory , const css::uno::Reference< css::frame::XFrame >& xFrame ) - // Init baseclasses first + // Init baseclasses first : ThreadHelpBase( &Application::GetSolarMutex() ) , OWeakObject ( ) // Init member @@ -181,7 +181,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL DispatchProvider::queryDis xDispatcher = implts_queryDesktopDispatch(xOwner, aURL, sTargetFrameName, nSearchFlags); else xDispatcher = implts_queryFrameDispatch(xOwner, aURL, sTargetFrameName, nSearchFlags); - + return xDispatcher; } @@ -283,7 +283,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryDeskt { if (implts_isLoadableContent(aURL)) xDispatcher = implts_getOrCreateDispatchHelper( E_DEFAULTDISPATCHER, xDesktop ); - + if (lcl_isStartModuleDispatch(aURL)) xDispatcher = implts_getOrCreateDispatchHelper( E_STARTMODULEDISPATCHER, xDesktop ); } @@ -482,7 +482,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame { css::uno::Reference< css::frame::XDispatchProvider > xParent( xFrame->getCreator(), css::uno::UNO_QUERY ); // In case the frame is not a top one, is not based on system window and has a parent, - // the parent frame should to be queried for the correct dispatcher. + // the parent frame should to be queried for the correct dispatcher. // See i93473 if ( !WindowHelper::isTopWindow(xFrame->getContainerWindow()) && @@ -759,7 +759,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_getOrCreat xDispatchHelper = css::uno::Reference< css::frame::XDispatch >( static_cast< ::cppu::OWeakObject* >(pDispatcher), css::uno::UNO_QUERY ); } break; - + case E_STARTMODULEDISPATCHER : { StartModuleDispatcher* pDispatcher = new StartModuleDispatcher( xFactory, xOwner, sTarget ); diff --git a/framework/source/dispatch/helpagentdispatcher.cxx b/framework/source/dispatch/helpagentdispatcher.cxx index 3ae47562daea..efc373338cf8 100644 --- a/framework/source/dispatch/helpagentdispatcher.cxx +++ b/framework/source/dispatch/helpagentdispatcher.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,12 +60,12 @@ DEFINE_XTYPEPROVIDER_2(HelpAgentDispatcher , //-------------------------------------------------------------------- HelpAgentDispatcher::HelpAgentDispatcher( const css::uno::Reference< css::frame::XFrame >& xParentFrame) - : ThreadHelpBase (&Application::GetSolarMutex()) - , m_sCurrentURL ( ) - , m_xContainerWindow( ) - , m_xAgentWindow ( ) - , m_aTimer ( ) - , m_xSelfHold ( ) + : ThreadHelpBase (&Application::GetSolarMutex()) + , m_sCurrentURL ( ) + , m_xContainerWindow( ) + , m_xAgentWindow ( ) + , m_aTimer ( ) + , m_xSelfHold ( ) { // It's required that this class has to be contructed with a valid frame. // And "valid" means: the frame must already bound to a valid container window. @@ -77,7 +77,7 @@ HelpAgentDispatcher::~HelpAgentDispatcher() { implts_stopTimer(); implts_ignoreCurrentURL(); - + // Needed ... because it was create as "new VCLWindow()" ! Such windows must be disposed explicitly. css::uno::Reference< css::lang::XComponent > xAgentWindow(m_xAgentWindow, css::uno::UNO_QUERY); if (xAgentWindow.is()) @@ -85,7 +85,7 @@ HelpAgentDispatcher::~HelpAgentDispatcher() } //-------------------------------------------------------------------- -void SAL_CALL HelpAgentDispatcher::dispatch(const css::util::URL& aURL , +void SAL_CALL HelpAgentDispatcher::dispatch(const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >&) throw(css::uno::RuntimeException) { @@ -98,13 +98,13 @@ void SAL_CALL HelpAgentDispatcher::dispatch(const css::util::URL& aUR // The timer will add the old URL to the list of ignorable URLs. // So m_sCurrentURL must be set AFTER the timer was stopped !!! implts_stopTimer(); - + // SAFE -> WriteGuard aWriteLock(m_aLock); m_sCurrentURL = aURL.Complete; aWriteLock.unlock(); // <- SAFE - + // start the expiration timer for the new URL implts_startTimer(); @@ -162,24 +162,24 @@ void SAL_CALL HelpAgentDispatcher::disposing(const css::lang::EventObject& aEven { // SAFE -> WriteGuard aWriteLock(m_aLock); - + // Already disposed ?! if (! m_xContainerWindow.is()) return; // Wrong broadcaster ?! if (aEvent.Source != m_xContainerWindow) return; - + css::uno::Reference< css::uno::XInterface > xSelfHoldUntilMethodEnds(static_cast< css::frame::XDispatch* >(this), css::uno::UNO_QUERY_THROW); m_xSelfHold.clear(); - + aWriteLock.unlock(); // <- SAFE - + implts_stopTimer(); implts_hideAgentWindow(); implts_ignoreCurrentURL(); - + // SAFE -> aWriteLock.lock(); m_xContainerWindow.clear(); @@ -187,7 +187,7 @@ void SAL_CALL HelpAgentDispatcher::disposing(const css::lang::EventObject& aEven m_xAgentWindow.clear(); aWriteLock.unlock(); // <- SAFE - + // Needed ... because it was create as "new VCLWindow()" ! Such windows must be disposed explicitly. if (xAgentWindow.is()) xAgentWindow->dispose(); @@ -214,13 +214,13 @@ void HelpAgentDispatcher::implts_acceptCurrentURL() { // SAFE -> WriteGuard aWriteLock(m_aLock); - + ::rtl::OUString sAcceptedURL = m_sCurrentURL; m_sCurrentURL = ::rtl::OUString(); - + aWriteLock.unlock(); // <- SAFE - + // We must make sure that this URL isnt marked as ignored by the user. // Otherwhise the user wont see the corresponding help content in the future. SvtHelpOptions().resetAgentIgnoreURLCounter(sAcceptedURL); @@ -241,13 +241,13 @@ void HelpAgentDispatcher::implts_ignoreCurrentURL() { // SAFE -> WriteGuard aWriteLock(m_aLock); - + ::rtl::OUString sIgnoredURL = m_sCurrentURL; m_sCurrentURL = ::rtl::OUString(); - + aWriteLock.unlock(); // <- SAFE - + if (sIgnoredURL.getLength()) SvtHelpOptions().decAgentIgnoreURLCounter(sIgnoredURL); } @@ -260,7 +260,7 @@ void HelpAgentDispatcher::implts_stopTimer() m_xSelfHold.clear(); aWriteLock.unlock(); // <- SAFE - + // SOLAR SAFE -> // Timer access needs no "own lock" ! It lives if we live ... // But it requires locking of the solar mutex ... because it's a vcl based timer. @@ -285,7 +285,7 @@ void HelpAgentDispatcher::implts_startTimer() return; } // <- SOLAR SAFE - + // SAFE -> // Timer uses pointer to this help agent dispatcher ... // But normaly we are ref counted. So we must make sure that this @@ -294,9 +294,9 @@ void HelpAgentDispatcher::implts_startTimer() m_xSelfHold = css::uno::Reference< css::uno::XInterface >(static_cast< css::frame::XDispatch* >(this), css::uno::UNO_QUERY_THROW); aWriteLock.unlock(); // <- SAFE - + sal_Int32 nTime = SvtHelpOptions().GetHelpAgentTimeoutPeriod(); - + // SOLAR SAFE -> // Timer access needs no "own lock" ! It lives if we live ... // But it requires locking of the solar mutex ... because it's a vcl based timer. @@ -323,7 +323,7 @@ IMPL_LINK(HelpAgentDispatcher, implts_timerExpired, void*,) implts_hideAgentWindow(); implts_ignoreCurrentURL(); - + return 0; } @@ -335,12 +335,12 @@ void HelpAgentDispatcher::implts_showAgentWindow() css::uno::Reference< css::awt::XWindow2 > xContainerWindow(m_xContainerWindow, css::uno::UNO_QUERY_THROW); aReadLock.unlock(); // <- SAFE - + css::uno::Reference< css::awt::XWindow > xAgentWindow = implts_ensureAgentWindow(); - + if ( - (xContainerWindow.is() ) && - (xAgentWindow.is() ) && + (xContainerWindow.is() ) && + (xAgentWindow.is() ) && (xContainerWindow->isVisible()) ) { @@ -366,17 +366,17 @@ void HelpAgentDispatcher::implts_positionAgentWindow() css::uno::Reference< css::awt::XWindow > xContainerWindow = m_xContainerWindow; aReadLock.unlock(); // <- SAFE - + css::uno::Reference< css::awt::XWindow > xAgentWindow = implts_ensureAgentWindow(); if ( (! xContainerWindow.is()) || (! xAgentWindow.is() ) ) return; - + ::svt::HelpAgentWindow* pAgentWindow = (::svt::HelpAgentWindow*)VCLUnoHelper::GetWindow(xAgentWindow); - const css::awt::Rectangle aContainerSize = xContainerWindow->getPosSize(); - const Size aAgentSize = pAgentWindow->getPreferredSizePixel(); + const css::awt::Rectangle aContainerSize = xContainerWindow->getPosSize(); + const Size aAgentSize = pAgentWindow->getPreferredSizePixel(); sal_Int32 nW = aAgentSize.Width() ; sal_Int32 nH = aAgentSize.Height(); @@ -403,28 +403,28 @@ css::uno::Reference< css::awt::XWindow > HelpAgentDispatcher::implts_ensureAgent css::uno::Reference< css::awt::XWindow > xContainerWindow = m_xContainerWindow; aReadLock.unlock(); // <- SAFE - + if (!xContainerWindow.is()) return css::uno::Reference< css::awt::XWindow >(); - + ::svt::HelpAgentWindow* pAgentWindow = 0; // SOLAR SAFE -> { ::vos::OGuard aSolarLock(Application::GetSolarMutex()); // create the agent window - Window* pContainerWindow = VCLUnoHelper::GetWindow(xContainerWindow); - pAgentWindow = new ::svt::HelpAgentWindow(pContainerWindow); + Window* pContainerWindow = VCLUnoHelper::GetWindow(xContainerWindow); + pAgentWindow = new ::svt::HelpAgentWindow(pContainerWindow); pAgentWindow->setCallback(this); } // <- SOLAR SAFE - + // SAFE -> WriteGuard aWriteLock(m_aLock); m_xAgentWindow = VCLUnoHelper::GetInterface(pAgentWindow); css::uno::Reference< css::awt::XWindow > xAgentWindow = m_xAgentWindow; aWriteLock.unlock(); // <- SAFE - + // add as window listener to the container window so we can maintain the property position of the agent window xContainerWindow->addWindowListener(this); @@ -436,7 +436,7 @@ css::uno::Reference< css::awt::XWindow > HelpAgentDispatcher::implts_ensureAgent m_aTimer.SetTimeoutHdl(LINK(this, HelpAgentDispatcher, implts_timerExpired)); } // <- SOLAR SAFE - + return xAgentWindow; } diff --git a/framework/source/dispatch/interaction.cxx b/framework/source/dispatch/interaction.cxx index 9cca0bb922cf..d1d14740956b 100644 --- a/framework/source/dispatch/interaction.cxx +++ b/framework/source/dispatch/interaction.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,35 +29,35 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <dispatch/interaction.hxx> #include <general.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// non exported const +// non exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// non exported definitions +// non exported definitions //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ //--------------------------------------------------------------------------------------------------------- @@ -93,7 +93,7 @@ RequestFilterSelect::RequestFilterSelect( const ::rtl::OUString& sURL ) ::rtl::OUString temp; css::uno::Reference< css::uno::XInterface > temp2; css::document::NoSuchFilterRequest aFilterRequest( temp , - temp2 , + temp2 , sURL ); m_aRequest <<= aFilterRequest; diff --git a/framework/source/dispatch/interceptionhelper.cxx b/framework/source/dispatch/interceptionhelper.cxx index 2688aaf0ef93..17a29902466f 100644 --- a/framework/source/dispatch/interceptionhelper.cxx +++ b/framework/source/dispatch/interceptionhelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,35 +29,35 @@ #include "precompiled_framework.hxx" //_______________________________________________ -// my own includes +// my own includes #ifndef __FRAMEWORK_DISPATCH_INTERCEPTIONHELPER_HXX_ #include <dispatch/interceptionhelper.hxx> #endif //_______________________________________________ -// interface includes +// interface includes #include <com/sun/star/frame/XInterceptorInfo.hpp> //_______________________________________________ -// includes of other projects +// includes of other projects #include <vcl/svapp.hxx> //_______________________________________________ -// namespace +// namespace namespace framework{ //_______________________________________________ -// non exported const +// non exported const sal_Bool InterceptionHelper::m_bPreferrFirstInterceptor = sal_True; //_______________________________________________ -// non exported definitions +// non exported definitions //_______________________________________________ -// declarations +// declarations /*----------------------------------------------------------------------------- 31.03.2003 09:02 diff --git a/framework/source/dispatch/loaddispatcher.cxx b/framework/source/dispatch/loaddispatcher.cxx index 51787d19204c..2791ee9402a9 100644 --- a/framework/source/dispatch/loaddispatcher.cxx +++ b/framework/source/dispatch/loaddispatcher.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -169,12 +169,12 @@ css::uno::Any LoadDispatcher::impl_dispatch( const css::util::URL& rURL, m_aLoader.startLoading(); m_aLoader.waitWhileLoading(); // wait for ever! xComponent = m_aLoader.getTargetComponent(); - + // TODO thinking about asynchronous operations and listener support } catch(const LoadEnvException&) { xComponent.clear(); } - + if (xListener.is()) { if (xComponent.is()) diff --git a/framework/source/dispatch/mailtodispatcher.cxx b/framework/source/dispatch/mailtodispatcher.cxx index 4064179e587e..d8aa310d6351 100644 --- a/framework/source/dispatch/mailtodispatcher.cxx +++ b/framework/source/dispatch/mailtodispatcher.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <dispatch/mailtodispatcher.hxx> #include <threadhelp/readguard.hxx> @@ -37,37 +37,37 @@ #include <services.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/system/XSystemShellExecute.hpp> #include <com/sun/star/system/SystemShellExecuteFlags.hpp> #include <com/sun/star/frame/DispatchResultState.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// non exported const +// non exported const //_________________________________________________________________________________________________________________ #define PROTOCOL_VALUE "mailto:" #define PROTOCOL_LENGTH 7 //_________________________________________________________________________________________________________________ -// non exported definitions +// non exported definitions //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ @@ -115,7 +115,7 @@ DEFINE_INIT_SERVICE(MailToDispatcher, @modified 30.04.2002 14:10, as96863 */ MailToDispatcher::MailToDispatcher( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ) - // Init baseclasses first + // Init baseclasses first : ThreadHelpBase( &Application::GetSolarMutex() ) , OWeakObject ( ) // Init member diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx index 1688a8be77a3..718830545db2 100644 --- a/framework/source/dispatch/menudispatcher.cxx +++ b/framework/source/dispatch/menudispatcher.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <dispatch/menudispatcher.hxx> #include <general.h> @@ -38,7 +38,7 @@ #include <services.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/awt/XToolkit.hpp> @@ -63,50 +63,50 @@ #include <rtl/logfile.hxx> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <ucbhelper/content.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ using namespace ::com::sun::star ; -using namespace ::com::sun::star::awt ; -using namespace ::com::sun::star::beans ; -using namespace ::com::sun::star::container ; -using namespace ::com::sun::star::frame ; -using namespace ::com::sun::star::lang ; -using namespace ::com::sun::star::uno ; -using namespace ::com::sun::star::util ; -using namespace ::cppu ; -using namespace ::osl ; -using namespace ::rtl ; -using namespace ::vos ; +using namespace ::com::sun::star::awt ; +using namespace ::com::sun::star::beans ; +using namespace ::com::sun::star::container ; +using namespace ::com::sun::star::frame ; +using namespace ::com::sun::star::lang ; +using namespace ::com::sun::star::uno ; +using namespace ::com::sun::star::util ; +using namespace ::cppu ; +using namespace ::osl ; +using namespace ::rtl ; +using namespace ::vos ; //_________________________________________________________________________________________________________________ -// non exported const +// non exported const //_________________________________________________________________________________________________________________ const USHORT SLOTID_MDIWINDOWLIST = 5610; //_________________________________________________________________________________________________________________ -// non exported definitions +// non exported definitions //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** MenuDispatcher::MenuDispatcher( const uno::Reference< XMultiServiceFactory >& xFactory , - const uno::Reference< XFrame >& xOwner ) - // Init baseclasses first + const uno::Reference< XFrame >& xOwner ) + // Init baseclasses first : ThreadHelpBase ( &Application::GetSolarMutex() ) , OWeakObject ( ) // Init member @@ -126,7 +126,7 @@ MenuDispatcher::MenuDispatcher( const uno::Reference< XMultiServiceFactory > } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** MenuDispatcher::~MenuDispatcher() { @@ -136,37 +136,37 @@ MenuDispatcher::~MenuDispatcher() } //***************************************************************************************************************** -// XInterface, XTypeProvider +// XInterface, XTypeProvider //***************************************************************************************************************** DEFINE_XINTERFACE_4 ( MenuDispatcher , - OWeakObject , - DIRECT_INTERFACE( XTypeProvider ), - DIRECT_INTERFACE( XDispatch ), - DIRECT_INTERFACE( XEventListener ), - DERIVED_INTERFACE( XFrameActionListener, XEventListener ) + OWeakObject , + DIRECT_INTERFACE( XTypeProvider ), + DIRECT_INTERFACE( XDispatch ), + DIRECT_INTERFACE( XEventListener ), + DERIVED_INTERFACE( XFrameActionListener, XEventListener ) ) DEFINE_XTYPEPROVIDER_4 ( MenuDispatcher , - XTypeProvider , - XDispatch , - XEventListener , + XTypeProvider , + XDispatch , + XEventListener , XFrameActionListener ) //***************************************************************************************************************** -// XDispatch +// XDispatch //***************************************************************************************************************** void SAL_CALL MenuDispatcher::dispatch( const URL& /*aURL*/ , - const Sequence< PropertyValue >& /*seqProperties*/ ) throw( RuntimeException ) + const Sequence< PropertyValue >& /*seqProperties*/ ) throw( RuntimeException ) { } //***************************************************************************************************************** -// XDispatch +// XDispatch //***************************************************************************************************************** void SAL_CALL MenuDispatcher::addStatusListener( const uno::Reference< XStatusListener >& xControl, - const URL& aURL ) throw( RuntimeException ) + const URL& aURL ) throw( RuntimeException ) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); @@ -178,10 +178,10 @@ void SAL_CALL MenuDispatcher::addStatusListener( const uno::Reference< XStat } //***************************************************************************************************************** -// XDispatch +// XDispatch //***************************************************************************************************************** void SAL_CALL MenuDispatcher::removeStatusListener( const uno::Reference< XStatusListener >& xControl, - const URL& aURL ) throw( RuntimeException ) + const URL& aURL ) throw( RuntimeException ) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); @@ -193,7 +193,7 @@ void SAL_CALL MenuDispatcher::removeStatusListener( const uno::Reference< X } //***************************************************************************************************************** -// XFrameActionListener +// XFrameActionListener //***************************************************************************************************************** void SAL_CALL MenuDispatcher::frameAction( const FrameActionEvent& aEvent ) throw ( RuntimeException ) @@ -232,7 +232,7 @@ void SAL_CALL MenuDispatcher::frameAction( const FrameActionEvent& aEvent ) thro } //***************************************************************************************************************** -// XEventListener +// XEventListener //***************************************************************************************************************** void SAL_CALL MenuDispatcher::disposing( const EventObject& ) throw( RuntimeException ) { @@ -271,7 +271,7 @@ void SAL_CALL MenuDispatcher::disposing( const EventObject& ) throw( RuntimeExce } //***************************************************************************************************************** -// private method +// private method // // //***************************************************************************************************************** @@ -293,7 +293,7 @@ void MenuDispatcher::impl_setAccelerators( Menu* pMenu, const Accelerator& aAcce } //***************************************************************************************************************** -// private method +// private method // // //***************************************************************************************************************** @@ -341,8 +341,8 @@ sal_Bool MenuDispatcher::impl_setMenuBar( MenuBar* pMenuBar, sal_Bool bMenuFromR { OUString aNoContext; - uno::Reference< XModel > xModel; - uno::Reference< XController > xController( xFrame->getController(), UNO_QUERY ); + uno::Reference< XModel > xModel; + uno::Reference< XController > xController( xFrame->getController(), UNO_QUERY ); if ( xController.is() ) xModel = uno::Reference< XModel >( xController->getModel(), UNO_QUERY ); @@ -406,7 +406,7 @@ IMPL_LINK( MenuDispatcher, Close_Impl, void*, EMPTYARG ) //_________________________________________________________________________________________________________________ -// debug methods +// debug methods //_________________________________________________________________________________________________________________ /*----------------------------------------------------------------------------------------------------------------- @@ -423,16 +423,16 @@ IMPL_LINK( MenuDispatcher, Close_Impl, void*, EMPTYARG ) //***************************************************************************************************************** sal_Bool MenuDispatcher::impldbg_checkParameter_MenuDispatcher( const uno::Reference< XMultiServiceFactory >& xFactory , - const uno::Reference< XFrame >& xOwner ) + const uno::Reference< XFrame >& xOwner ) { // Set default return value. sal_Bool bOK = sal_True; // Check parameter. - if ( - ( &xFactory == NULL ) || - ( &xOwner == NULL ) || - ( xFactory.is() == sal_False ) || - ( xOwner.is() == sal_False ) + if ( + ( &xFactory == NULL ) || + ( &xOwner == NULL ) || + ( xFactory.is() == sal_False ) || + ( xOwner.is() == sal_False ) ) { bOK = sal_False ; @@ -445,15 +445,15 @@ sal_Bool MenuDispatcher::impldbg_checkParameter_MenuDispatcher( const uno::R // We need a valid URL. What is meaning with "register for nothing"?! // xControl must correct to - nobody can advised otherwise! sal_Bool MenuDispatcher::impldbg_checkParameter_addStatusListener( const uno::Reference< XStatusListener >& xControl, - const URL& aURL ) + const URL& aURL ) { // Set default return value. sal_Bool bOK = sal_True; // Check parameter. - if ( - ( &xControl == NULL ) || - ( &aURL == NULL ) || - ( aURL.Complete.getLength() < 1 ) + if ( + ( &xControl == NULL ) || + ( &aURL == NULL ) || + ( aURL.Complete.getLength() < 1 ) ) { bOK = sal_False ; @@ -466,15 +466,15 @@ sal_Bool MenuDispatcher::impldbg_checkParameter_addStatusListener( const uno:: // The same goes for these case! We have added valid listener for correct URL only. // We can't remove invalid listener for nothing! sal_Bool MenuDispatcher::impldbg_checkParameter_removeStatusListener( const uno::Reference< XStatusListener >& xControl, - const URL& aURL ) + const URL& aURL ) { // Set default return value. sal_Bool bOK = sal_True; // Check parameter. - if ( - ( &xControl == NULL ) || - ( &aURL == NULL ) || - ( aURL.Complete.getLength() < 1 ) + if ( + ( &xControl == NULL ) || + ( &aURL == NULL ) || + ( aURL.Complete.getLength() < 1 ) ) { bOK = sal_False ; @@ -483,6 +483,6 @@ sal_Bool MenuDispatcher::impldbg_checkParameter_removeStatusListener( const u return bOK ; } -#endif // #ifdef ENABLE_ASSERTIONS +#endif // #ifdef ENABLE_ASSERTIONS -} // namespace framework +} // namespace framework diff --git a/framework/source/dispatch/oxt_handler.cxx b/framework/source/dispatch/oxt_handler.cxx index 0a46de752a9f..54228db4b670 100644 --- a/framework/source/dispatch/oxt_handler.cxx +++ b/framework/source/dispatch/oxt_handler.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #ifndef __FRAMEWORK_DISPATCH_OXT_HANDLER_HXX_ @@ -60,7 +60,7 @@ #endif //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/io/XInputStream.hpp> @@ -68,7 +68,7 @@ #include <com/sun/star/task/XJobExecutor.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #ifndef _COMPHELPER_SEQUENCEASHASHMAP_HXX_ @@ -80,23 +80,23 @@ #endif //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// non exported const +// non exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// non exported definitions +// non exported definitions //_________________________________________________________________________________________________________________ #define UNISTRING(s) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s)) //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ //***************************************************************************************************************** @@ -143,7 +143,7 @@ DEFINE_INIT_SERVICE ( Oxt_Handler, @threadsafe yes *//*-*************************************************************************************************************/ Oxt_Handler::Oxt_Handler( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ) - // Init baseclasses first + // Init baseclasses first : ThreadHelpBase ( ) , ::cppu::OWeakObject ( ) // Init member @@ -207,7 +207,7 @@ void SAL_CALL Oxt_Handler::dispatchWithNotification( const css::util::URL& aURL, rtl::OUString sServiceName = UNISTRING( "com.sun.star.deployment.ui.PackageManagerDialog" ); css::uno::Sequence< css::uno::Any > lParams(1); lParams[0] <<= aURL.Main; - + css::uno::Reference< css::uno::XInterface > xService; xService = m_xFactory->createInstanceWithArguments( sServiceName, lParams ); diff --git a/framework/source/dispatch/popupmenudispatcher.cxx b/framework/source/dispatch/popupmenudispatcher.cxx index d9ef9ed12dbf..834d11017ec8 100644 --- a/framework/source/dispatch/popupmenudispatcher.cxx +++ b/framework/source/dispatch/popupmenudispatcher.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ //#include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <dispatch/popupmenudispatcher.hxx> @@ -40,7 +40,7 @@ #include <properties.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/awt/XToolkit.hpp> @@ -54,7 +54,7 @@ #include <com/sun/star/container/XEnumeration.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <ucbhelper/content.hxx> @@ -63,44 +63,44 @@ #include <vcl/svapp.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ -using namespace ::com::sun::star ; -using namespace ::com::sun::star::awt ; -using namespace ::com::sun::star::beans ; -using namespace ::com::sun::star::container ; -using namespace ::com::sun::star::frame ; -using namespace ::com::sun::star::lang ; -using namespace ::com::sun::star::uno ; -using namespace ::com::sun::star::util ; -using namespace ::cppu ; -using namespace ::osl ; -using namespace ::rtl ; -using namespace ::vos ; +using namespace ::com::sun::star ; +using namespace ::com::sun::star::awt ; +using namespace ::com::sun::star::beans ; +using namespace ::com::sun::star::container ; +using namespace ::com::sun::star::frame ; +using namespace ::com::sun::star::lang ; +using namespace ::com::sun::star::uno ; +using namespace ::com::sun::star::util ; +using namespace ::cppu ; +using namespace ::osl ; +using namespace ::rtl ; +using namespace ::vos ; //_________________________________________________________________________________________________________________ -// non exported const +// non exported const //_________________________________________________________________________________________________________________ const char* PROTOCOL_VALUE = "vnd.sun.star.popup:"; const sal_Int32 PROTOCOL_LENGTH = 19; //_________________________________________________________________________________________________________________ -// non exported definitions +// non exported definitions //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** -PopupMenuDispatcher::PopupMenuDispatcher( +PopupMenuDispatcher::PopupMenuDispatcher( const uno::Reference< XMultiServiceFactory >& xFactory ) - // Init baseclasses first + // Init baseclasses first : ThreadHelpBase ( &Application::GetSolarMutex() ) , OWeakObject ( ) // Init member @@ -112,7 +112,7 @@ PopupMenuDispatcher::PopupMenuDispatcher( } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** PopupMenuDispatcher::~PopupMenuDispatcher() { @@ -122,25 +122,25 @@ PopupMenuDispatcher::~PopupMenuDispatcher() } //***************************************************************************************************************** -// XInterface, XTypeProvider +// XInterface, XTypeProvider //***************************************************************************************************************** DEFINE_XINTERFACE_7 ( PopupMenuDispatcher , - ::cppu::OWeakObject , - DIRECT_INTERFACE( XTypeProvider ), + ::cppu::OWeakObject , + DIRECT_INTERFACE( XTypeProvider ), DIRECT_INTERFACE( XServiceInfo ), DIRECT_INTERFACE( XDispatchProvider ), - DIRECT_INTERFACE( XDispatch ), + DIRECT_INTERFACE( XDispatch ), DIRECT_INTERFACE( XEventListener ), DIRECT_INTERFACE( XInitialization ), DERIVED_INTERFACE( XFrameActionListener, XEventListener ) ) DEFINE_XTYPEPROVIDER_7 ( PopupMenuDispatcher , - XTypeProvider , + XTypeProvider , XServiceInfo , XDispatchProvider , - XDispatch , - XEventListener , + XDispatch , + XEventListener , XInitialization , XFrameActionListener ) @@ -161,14 +161,14 @@ DEFINE_INIT_SERVICE(PopupMenuDispatcher, ) //***************************************************************************************************************** -// XInitialization +// XInitialization //***************************************************************************************************************** -void SAL_CALL PopupMenuDispatcher::initialize( - const css::uno::Sequence< css::uno::Any >& lArguments ) +void SAL_CALL PopupMenuDispatcher::initialize( + const css::uno::Sequence< css::uno::Any >& lArguments ) throw( css::uno::Exception, css::uno::RuntimeException) { css::uno::Reference< css::frame::XFrame > xFrame; - + /* SAFE { */ WriteGuard aWriteLock(m_aLock); @@ -180,7 +180,7 @@ throw( css::uno::Exception, css::uno::RuntimeException) m_xWeakFrame = xFrame; m_bActivateListener = sal_True; - uno::Reference< css::frame::XFrameActionListener > xFrameActionListener( + uno::Reference< css::frame::XFrameActionListener > xFrameActionListener( (OWeakObject *)this, css::uno::UNO_QUERY ); xFrame->addFrameActionListener( xFrameActionListener ); } @@ -191,29 +191,29 @@ throw( css::uno::Exception, css::uno::RuntimeException) } //***************************************************************************************************************** -// XDispatchProvider +// XDispatchProvider //***************************************************************************************************************** -css::uno::Reference< css::frame::XDispatch > -SAL_CALL PopupMenuDispatcher::queryDispatch( +css::uno::Reference< css::frame::XDispatch > +SAL_CALL PopupMenuDispatcher::queryDispatch( const css::util::URL& rURL , const ::rtl::OUString& sTarget , - sal_Int32 nFlags ) + sal_Int32 nFlags ) throw( css::uno::RuntimeException ) { css::uno::Reference< css::frame::XDispatch > xDispatch; - + if ( rURL.Complete.compareToAscii( PROTOCOL_VALUE, PROTOCOL_LENGTH ) == 0 ) { // --- SAFE --- ResetableGuard aGuard( m_aLock ); impl_RetrievePopupControllerQuery(); impl_CreateUriRefFactory(); - + css::uno::Reference< css::container::XNameAccess > xPopupCtrlQuery( m_xPopupCtrlQuery ); css::uno::Reference< css::uri::XUriReferenceFactory > xUriRefFactory( m_xUriRefFactory ); aGuard.unlock(); // --- SAFE --- - + if ( xPopupCtrlQuery.is() ) { try @@ -223,9 +223,9 @@ throw( css::uno::RuntimeException ) sal_Int32 nSchemePart( 0 ); rtl::OUString aBaseURL( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.popup:" )); rtl::OUString aURL( rURL.Complete ); - + nSchemePart = aURL.indexOf( ':' ); - if (( nSchemePart > 0 ) && + if (( nSchemePart > 0 ) && ( aURL.getLength() > ( nSchemePart+1 ))) { nQueryPart = aURL.indexOf( '?', nSchemePart ); @@ -234,13 +234,13 @@ throw( css::uno::RuntimeException ) else if ( nQueryPart == -1 ) aBaseURL += aURL.copy( nSchemePart+1 ); } - + css::uno::Reference< css::frame::XDispatchProvider > xDispatchProvider; - + // Find popup menu controller using the base URL xPopupCtrlQuery->getByName( aBaseURL ) >>= xDispatchProvider; aGuard.unlock(); - + // Ask popup menu dispatch provider for dispatch object if ( xDispatchProvider.is() ) xDispatch = xDispatchProvider->queryDispatch( rURL, sTarget, nFlags ); @@ -257,9 +257,9 @@ throw( css::uno::RuntimeException ) return xDispatch; } -css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL -PopupMenuDispatcher::queryDispatches( - const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) +css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL +PopupMenuDispatcher::queryDispatches( + const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) throw( css::uno::RuntimeException ) { sal_Int32 nCount = lDescriptor.getLength(); @@ -275,23 +275,23 @@ throw( css::uno::RuntimeException ) } //***************************************************************************************************************** -// XDispatch +// XDispatch //***************************************************************************************************************** -void +void SAL_CALL PopupMenuDispatcher::dispatch( const URL& /*aURL*/ , - const Sequence< PropertyValue >& /*seqProperties*/ ) + const Sequence< PropertyValue >& /*seqProperties*/ ) throw( RuntimeException ) { } //***************************************************************************************************************** -// XDispatch +// XDispatch //***************************************************************************************************************** -void +void SAL_CALL PopupMenuDispatcher::addStatusListener( const uno::Reference< XStatusListener >& xControl, - const URL& aURL ) + const URL& aURL ) throw( RuntimeException ) { // Ready for multithreading @@ -302,12 +302,12 @@ throw( RuntimeException ) } //***************************************************************************************************************** -// XDispatch +// XDispatch //***************************************************************************************************************** -void +void SAL_CALL PopupMenuDispatcher::removeStatusListener( const uno::Reference< XStatusListener >& xControl, - const URL& aURL ) + const URL& aURL ) throw( RuntimeException ) { // Ready for multithreading @@ -318,12 +318,12 @@ throw( RuntimeException ) } //***************************************************************************************************************** -// XFrameActionListener +// XFrameActionListener //***************************************************************************************************************** -void -SAL_CALL PopupMenuDispatcher::frameAction( - const FrameActionEvent& aEvent ) +void +SAL_CALL PopupMenuDispatcher::frameAction( + const FrameActionEvent& aEvent ) throw ( RuntimeException ) { ResetableGuard aGuard( m_aLock ); @@ -337,9 +337,9 @@ throw ( RuntimeException ) } //***************************************************************************************************************** -// XEventListener +// XEventListener //***************************************************************************************************************** -void +void SAL_CALL PopupMenuDispatcher::disposing( const EventObject& ) throw( RuntimeException ) { // Ready for multithreading @@ -372,7 +372,7 @@ void PopupMenuDispatcher::impl_RetrievePopupControllerQuery() { css::uno::Reference< css::frame::XLayoutManager > xLayoutManager; css::uno::Reference< css::frame::XFrame > xFrame( m_xWeakFrame ); - + if ( xFrame.is() ) { css::uno::Reference< css::beans::XPropertySet > xPropSet( xFrame, css::uno::UNO_QUERY ); @@ -388,7 +388,7 @@ void PopupMenuDispatcher::impl_RetrievePopupControllerQuery() rtl::OUString aMenuBar( RTL_CONSTASCII_USTRINGPARAM( "private:resource/menubar/menubar" )); xMenuBar = xLayoutManager->getElement( aMenuBar ); - m_xPopupCtrlQuery = css::uno::Reference< css::container::XNameAccess >( + m_xPopupCtrlQuery = css::uno::Reference< css::container::XNameAccess >( xMenuBar, css::uno::UNO_QUERY ); } } @@ -408,14 +408,14 @@ void PopupMenuDispatcher::impl_CreateUriRefFactory() { if ( !m_xUriRefFactory.is() ) { - rtl::OUString aUriRefFactoryService( + rtl::OUString aUriRefFactoryService( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.uri.UriReferenceFactory" )); - + m_xUriRefFactory = css::uno::Reference< css::uri::XUriReferenceFactory >( m_xFactory->createInstance( aUriRefFactoryService ), css::uno::UNO_QUERY); - + } } -} // namespace framework +} // namespace framework diff --git a/framework/source/dispatch/servicehandler.cxx b/framework/source/dispatch/servicehandler.cxx index e26ade6d7017..0316decd2b89 100644 --- a/framework/source/dispatch/servicehandler.cxx +++ b/framework/source/dispatch/servicehandler.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <dispatch/servicehandler.hxx> #include <threadhelp/readguard.hxx> @@ -37,36 +37,36 @@ #include <services.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/frame/DispatchResultState.hpp> #include <com/sun/star/task/XJobExecutor.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// non exported const +// non exported const //_________________________________________________________________________________________________________________ #define PROTOCOL_VALUE "service:" #define PROTOCOL_LENGTH 8 //_________________________________________________________________________________________________________________ -// non exported definitions +// non exported definitions //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ @@ -114,7 +114,7 @@ DEFINE_INIT_SERVICE(ServiceHandler, @modified 02.05.2002 08:16, as96863 */ ServiceHandler::ServiceHandler( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ) - // Init baseclasses first + // Init baseclasses first : ThreadHelpBase( &Application::GetSolarMutex() ) , OWeakObject ( ) // Init member @@ -274,7 +274,7 @@ css::uno::Reference< css::uno::XInterface > ServiceHandler::implts_dispatch( con if (!xFactory.is()) return css::uno::Reference< css::uno::XInterface >(); - + // extract service name and may optional given parameters from given URL // and use it to create and start the component ::rtl::OUString sServiceAndArguments = aURL.Complete.copy(PROTOCOL_LENGTH); @@ -295,7 +295,7 @@ css::uno::Reference< css::uno::XInterface > ServiceHandler::implts_dispatch( con if (!sServiceName.getLength()) return css::uno::Reference< css::uno::XInterface >(); - + // If a service doesnt support an optional job executor interface - he can't get // any given parameters! // Because we can't know if we must call createInstanceWithArguments() or XJobExecutor::trigger() ... diff --git a/framework/source/dispatch/startmoduledispatcher.cxx b/framework/source/dispatch/startmoduledispatcher.cxx index 48096762ecba..40def3f98488 100644 --- a/framework/source/dispatch/startmoduledispatcher.cxx +++ b/framework/source/dispatch/startmoduledispatcher.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -165,24 +165,24 @@ void SAL_CALL StartModuleDispatcher::removeStatusListener(const css::uno::Refere { if ( ! SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::E_SSTARTMODULE)) return sal_False; - + // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = m_xSMGR; aReadLock.unlock(); // <- SAFE ---------------------------------- - + css::uno::Reference< css::frame::XFramesSupplier > xDesktop( xSMGR->createInstance(SERVICENAME_DESKTOP), css::uno::UNO_QUERY); - + FrameListAnalyzer aCheck( xDesktop, css::uno::Reference< css::frame::XFrame >(), FrameListAnalyzer::E_HELP | FrameListAnalyzer::E_BACKINGCOMPONENT); - + ::sal_Bool bIsPossible = sal_False; ::sal_Int32 nVisibleFrames = aCheck.m_lOtherVisibleFrames.getLength (); - + if ( ( ! aCheck.m_xBackingComponent.is ()) && ( nVisibleFrames < 1 ) @@ -190,7 +190,7 @@ void SAL_CALL StartModuleDispatcher::removeStatusListener(const css::uno::Refere { bIsPossible = sal_True; } - + return bIsPossible; } diff --git a/framework/source/dispatch/systemexec.cxx b/framework/source/dispatch/systemexec.cxx index ce3288edf248..2cdf28380480 100644 --- a/framework/source/dispatch/systemexec.cxx +++ b/framework/source/dispatch/systemexec.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <dispatch/systemexec.hxx> #include <threadhelp/readguard.hxx> @@ -37,7 +37,7 @@ #include <services.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/system/XSystemShellExecute.hpp> #include <com/sun/star/util/XStringSubstitution.hpp> @@ -45,30 +45,30 @@ #include <com/sun/star/frame/DispatchResultState.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// non exported const +// non exported const //_________________________________________________________________________________________________________________ #define PROTOCOL_VALUE "systemexecute:" #define PROTOCOL_LENGTH 14 //_________________________________________________________________________________________________________________ -// non exported definitions +// non exported definitions //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ @@ -107,7 +107,7 @@ DEFINE_INIT_SERVICE(SystemExec, //_________________________________________________________________________________________________________________ SystemExec::SystemExec( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ) - // Init baseclasses first + // Init baseclasses first : ThreadHelpBase( &Application::GetSolarMutex() ) , OWeakObject ( ) // Init member diff --git a/framework/source/dispatch/windowcommanddispatch.cxx b/framework/source/dispatch/windowcommanddispatch.cxx index 3baeb1ab9c13..789e07b58c52 100755 --- a/framework/source/dispatch/windowcommanddispatch.cxx +++ b/framework/source/dispatch/windowcommanddispatch.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -122,7 +122,7 @@ IMPL_LINK(WindowCommandDispatch, impl_notifyCommand, void*, pParam) { if ( ! pParam) return 0L; - + const VclWindowEvent* pEvent = (VclWindowEvent*)pParam; if (pEvent->GetId() != VCLEVENT_WINDOW_COMMAND) return 0L; @@ -134,20 +134,20 @@ IMPL_LINK(WindowCommandDispatch, impl_notifyCommand, void*, pParam) const CommandDialogData* pData = pCommand->GetDialogData(); if ( ! pData) return 0L; - + const int nCommand = pData->GetDialogId(); ::rtl::OUString sCommand; - + switch (nCommand) { case SHOWDIALOG_ID_PREFERENCES : sCommand = WindowCommandDispatch::COMMAND_PREFERENCES; break; - + case SHOWDIALOG_ID_ABOUT : sCommand = WindowCommandDispatch::COMMAND_ABOUTBOX; break; - + default : return 0L; } @@ -170,16 +170,16 @@ void WindowCommandDispatch::impl_dispatchCommand(const ::rtl::OUString& sCommand css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = m_xSMGR; aReadLock.unlock(); // <- SYNCHRONIZED - + // check provider ... we know it's weak reference only if ( ! xProvider.is()) return; - + css::uno::Reference< css::util::XURLTransformer > xParser(xSMGR->createInstance(SERVICENAME_URLTRANSFORMER), css::uno::UNO_QUERY_THROW); css::util::URL aCommand; aCommand.Complete = sCommand; xParser->parseStrict(aCommand); - + css::uno::Reference< css::frame::XDispatch > xDispatch = xProvider->queryDispatch(aCommand, SPECIALTARGET_SELF, 0); if (xDispatch.is()) xDispatch->dispatch(aCommand, css::uno::Sequence< css::beans::PropertyValue >()); diff --git a/framework/source/helper/acceleratorinfo.cxx b/framework/source/helper/acceleratorinfo.cxx index e3b22da2411b..3db17cf1db89 100644 --- a/framework/source/helper/acceleratorinfo.cxx +++ b/framework/source/helper/acceleratorinfo.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,12 +33,12 @@ namespace framework { -static pfunc_getCommandURLFromKeyCode _pGetCommandURLFromKeyCode = NULL; -static pfunc_getKeyCodeFromCommandURL _pGetKeyCodeFromCommandURL = NULL; +static pfunc_getCommandURLFromKeyCode _pGetCommandURLFromKeyCode = NULL; +static pfunc_getKeyCodeFromCommandURL _pGetKeyCodeFromCommandURL = NULL; pfunc_getCommandURLFromKeyCode SAL_CALL SetCommandURLFromKeyCode( pfunc_getCommandURLFromKeyCode pNewFunc ) { - pfunc_getCommandURLFromKeyCode pOldFunc = _pGetCommandURLFromKeyCode; + pfunc_getCommandURLFromKeyCode pOldFunc = _pGetCommandURLFromKeyCode; _pGetCommandURLFromKeyCode = pNewFunc; return pOldFunc; @@ -54,7 +54,7 @@ pfunc_getCommandURLFromKeyCode SAL_CALL SetCommandURLFromKeyCode( pfunc_getComma pfunc_getKeyCodeFromCommandURL SAL_CALL SetKeyCodeFromCommandURL( pfunc_getKeyCodeFromCommandURL pNewFunc ) { - pfunc_getKeyCodeFromCommandURL pOldFunc = _pGetKeyCodeFromCommandURL; + pfunc_getKeyCodeFromCommandURL pOldFunc = _pGetKeyCodeFromCommandURL; _pGetKeyCodeFromCommandURL = pNewFunc; return pOldFunc; diff --git a/framework/source/helper/actiontriggerhelper.cxx b/framework/source/helper/actiontriggerhelper.cxx index 1102ae57ac4d..b1c4e50dfe00 100644 --- a/framework/source/helper/actiontriggerhelper.cxx +++ b/framework/source/helper/actiontriggerhelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -117,7 +117,7 @@ void InsertSubMenuItems( Menu* pSubMenu, USHORT& nItemId, Reference< XIndexConta AddonsOptions aAddonOptions; const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); sal_Bool bHiContrast = rSettings.GetHighContrastMode(); - + OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" )); for ( sal_Int32 i = 0; i < xIndexAccess->getCount(); i++ ) @@ -193,8 +193,8 @@ void InsertSubMenuItems( Menu* pSubMenu, USHORT& nItemId, Reference< XIndexConta { // This is an unknown implementation of a XBitmap interface. We have to // use a more time consuming way to build an Image! - Image aImage; - Bitmap aBitmap; + Image aImage; + Bitmap aBitmap; Sequence< sal_Int8 > aDIBSeq; { @@ -213,7 +213,7 @@ void InsertSubMenuItems( Menu* pSubMenu, USHORT& nItemId, Reference< XIndexConta } else aImage = Image( aBitmap ); - + if ( !!aImage ) pSubMenu->SetItemImage( nNewItemId, aImage ); } @@ -266,7 +266,7 @@ Reference< XPropertySet > CreateActionTrigger( USHORT nItemId, const Menu* pMenu Reference< XMultiServiceFactory > xMultiServiceFactory( rActionTriggerContainer, UNO_QUERY ); if ( xMultiServiceFactory.is() ) { - xPropSet = Reference< XPropertySet >( xMultiServiceFactory->createInstance( + xPropSet = Reference< XPropertySet >( xMultiServiceFactory->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.ActionTrigger" )) ), UNO_QUERY ); @@ -312,7 +312,7 @@ Reference< XPropertySet > CreateActionTriggerSeparator( const Reference< XIndexC Reference< XMultiServiceFactory > xMultiServiceFactory( rActionTriggerContainer, UNO_QUERY ); if ( xMultiServiceFactory.is() ) { - return Reference< XPropertySet >( xMultiServiceFactory->createInstance( + return Reference< XPropertySet >( xMultiServiceFactory->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.ActionTriggerSeparator" )) ), UNO_QUERY ); } @@ -339,8 +339,8 @@ void FillActionTriggerContainerWithMenu( const Menu* pMenu, Reference< XIndexCon for ( USHORT nPos = 0; nPos < pMenu->GetItemCount(); nPos++ ) { - USHORT nItemId = pMenu->GetItemId( nPos ); - MenuItemType nType = pMenu->GetItemType( nPos ); + USHORT nItemId = pMenu->GetItemId( nPos ); + MenuItemType nType = pMenu->GetItemType( nPos ); try { @@ -396,7 +396,7 @@ void ActionTriggerHelper::FillActionTriggerContainerFromMenu( FillActionTriggerContainerWithMenu( pMenu, xActionTriggerContainer ); } -Reference< XIndexContainer > ActionTriggerHelper::CreateActionTriggerContainerFromMenu( +Reference< XIndexContainer > ActionTriggerHelper::CreateActionTriggerContainerFromMenu( // #110897# const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, const Menu* pMenu, diff --git a/framework/source/helper/configimporter.cxx b/framework/source/helper/configimporter.cxx index a94db6d8dfe7..6f2c402da1e8 100644 --- a/framework/source/helper/configimporter.cxx +++ b/framework/source/helper/configimporter.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ using namespace ::com::sun::star; namespace framework { -sal_Bool UIConfigurationImporterOOo1x::ImportCustomToolbars( +sal_Bool UIConfigurationImporterOOo1x::ImportCustomToolbars( const uno::Reference< ui::XUIConfigurationManager >& rContainerFactory, uno::Sequence< uno::Reference< container::XIndexContainer > >& rSeqContainer, const uno::Reference< lang::XMultiServiceFactory >& rServiceManager, diff --git a/framework/source/helper/dockingareadefaultacceptor.cxx b/framework/source/helper/dockingareadefaultacceptor.cxx index 91dbe941d279..91cfc451fadd 100644 --- a/framework/source/helper/dockingareadefaultacceptor.cxx +++ b/framework/source/helper/dockingareadefaultacceptor.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,70 +29,70 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <helper/dockingareadefaultacceptor.hxx> #include <threadhelp/resetableguard.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/awt/PosSize.hpp> #include <com/sun/star/awt/XLayoutConstrains.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ -using namespace ::com::sun::star::container ; -using namespace ::com::sun::star::frame ; -using namespace ::com::sun::star::lang ; -using namespace ::com::sun::star::uno ; -using namespace ::cppu ; -using namespace ::osl ; -using namespace ::rtl ; +using namespace ::com::sun::star::container ; +using namespace ::com::sun::star::frame ; +using namespace ::com::sun::star::lang ; +using namespace ::com::sun::star::uno ; +using namespace ::cppu ; +using namespace ::osl ; +using namespace ::rtl ; //_________________________________________________________________________________________________________________ -// non exported const +// non exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// non exported definitions +// non exported definitions //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** -DockingAreaDefaultAcceptor::DockingAreaDefaultAcceptor( const Reference< XFrame >& xOwner ) - // Init baseclasses first - : ThreadHelpBase ( &Application::GetSolarMutex() ) +DockingAreaDefaultAcceptor::DockingAreaDefaultAcceptor( const Reference< XFrame >& xOwner ) + // Init baseclasses first + : ThreadHelpBase ( &Application::GetSolarMutex() ) // Init member - , m_xOwner ( xOwner ) + , m_xOwner ( xOwner ) { } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** DockingAreaDefaultAcceptor::~DockingAreaDefaultAcceptor() { } //***************************************************************************************************************** -// XDockingAreaAcceptor +// XDockingAreaAcceptor //***************************************************************************************************************** css::uno::Reference< css::awt::XWindow > SAL_CALL DockingAreaDefaultAcceptor::getContainerWindow() throw (css::uno::RuntimeException) { @@ -114,7 +114,7 @@ sal_Bool SAL_CALL DockingAreaDefaultAcceptor::requestDockingAreaSpace( const css // Try to "lock" the frame for access to taskscontainer. Reference< XFrame > xFrame( m_xOwner.get(), UNO_QUERY ); aGuard.unlock(); - + if ( xFrame.is() == sal_True ) { Reference< css::awt::XWindow > xContainerWindow( xFrame->getContainerWindow() ); diff --git a/framework/source/helper/imageproducer.cxx b/framework/source/helper/imageproducer.cxx index 4e0e312578c3..c4cf5921ee11 100644 --- a/framework/source/helper/imageproducer.cxx +++ b/framework/source/helper/imageproducer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,11 +33,11 @@ namespace framework { -static pfunc_getImage _pGetImageFunc = NULL; +static pfunc_getImage _pGetImageFunc = NULL; pfunc_getImage SAL_CALL SetImageProducer( pfunc_getImage pNewGetImageFunc ) { - pfunc_getImage pOldFunc = _pGetImageFunc; + pfunc_getImage pOldFunc = _pGetImageFunc; _pGetImageFunc = pNewGetImageFunc; return pOldFunc; diff --git a/framework/source/helper/mischelper.cxx b/framework/source/helper/mischelper.cxx index 6fce055238cc..deb5aa023c1b 100644 --- a/framework/source/helper/mischelper.cxx +++ b/framework/source/helper/mischelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -71,14 +71,14 @@ uno::Reference< linguistic2::XLanguageGuessing > LanguageGuessingHelper::GetGues { (void) r; DBG_ASSERT( 0, "failed to get language guessing component" ); - } + } } return m_xLanguageGuesser; } //////////////////////////////////////////////////////////// -::rtl::OUString RetrieveLabelFromCommand( +::rtl::OUString RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL, const uno::Reference< lang::XMultiServiceFactory >& _xServiceFactory, uno::Reference< container::XNameAccess >& _xUICommandLabels, @@ -148,10 +148,10 @@ uno::Reference< linguistic2::XLanguageGuessing > LanguageGuessingHelper::GetGues return aLabel; } - + //////////////////////////////////////////////////////////// -void FillLangItems( std::set< OUString > &rLangItems, +void FillLangItems( std::set< OUString > &rLangItems, const SvtLanguageTable & rLanguageTable, const uno::Reference< frame::XFrame > & rxFrame, const LanguageGuessingHelper & rLangGuessHelper, @@ -233,7 +233,7 @@ void FillLangItems( std::set< OUString > &rLangItems, } } } - + } // namespace framework diff --git a/framework/source/helper/networkdomain.cxx b/framework/source/helper/networkdomain.cxx index d1a74b16e801..fcc966402944 100644 --- a/framework/source/helper/networkdomain.cxx +++ b/framework/source/helper/networkdomain.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ namespace framework #ifdef WNT //_________________________________________________________________________________________________________________ -// Windows +// Windows //_________________________________________________________________________________________________________________ #define UNICODE @@ -47,7 +47,7 @@ namespace framework #endif //_________________________________________________________________________________________________________________ -// Win NT, Win 2000, Win XP +// Win NT, Win 2000, Win XP //_________________________________________________________________________________________________________________ static DWORD WINAPI GetUserDomainW_NT( LPWSTR lpBuffer, DWORD nSize ) @@ -56,37 +56,37 @@ static DWORD WINAPI GetUserDomainW_NT( LPWSTR lpBuffer, DWORD nSize ) } //_________________________________________________________________________________________________________________ -// Win 9x,Win ME +// Win 9x,Win ME //_________________________________________________________________________________________________________________ static DWORD WINAPI GetUserDomainW_WINDOWS( LPWSTR lpBuffer, DWORD nSize ) { - HKEY hkeyLogon; - HKEY hkeyWorkgroup; - DWORD dwResult = 0; + HKEY hkeyLogon; + HKEY hkeyWorkgroup; + DWORD dwResult = 0; - if ( ERROR_SUCCESS == RegOpenKeyEx( - HKEY_LOCAL_MACHINE, - TEXT("Network\\Logon"), - 0, KEY_READ, &hkeyLogon ) ) + if ( ERROR_SUCCESS == RegOpenKeyEx( + HKEY_LOCAL_MACHINE, + TEXT("Network\\Logon"), + 0, KEY_READ, &hkeyLogon ) ) { - DWORD dwLogon = 0; - DWORD dwLogonSize = sizeof(dwLogon); + DWORD dwLogon = 0; + DWORD dwLogonSize = sizeof(dwLogon); RegQueryValueEx( hkeyLogon, TEXT("LMLogon"), 0, NULL, (LPBYTE)&dwLogon, &dwLogonSize ); RegCloseKey( hkeyLogon ); if ( dwLogon ) { - HKEY hkeyNetworkProvider; + HKEY hkeyNetworkProvider; - if ( ERROR_SUCCESS == RegOpenKeyEx( - HKEY_LOCAL_MACHINE, - TEXT("SYSTEM\\CurrentControlSet\\Services\\MSNP32\\NetworkProvider"), + if ( ERROR_SUCCESS == RegOpenKeyEx( + HKEY_LOCAL_MACHINE, + TEXT("SYSTEM\\CurrentControlSet\\Services\\MSNP32\\NetworkProvider"), 0, KEY_READ, &hkeyNetworkProvider ) ) { - DWORD dwBufferSize = nSize; - LONG lResult = RegQueryValueEx( hkeyNetworkProvider, TEXT("AuthenticatingAgent"), 0, NULL, (LPBYTE)lpBuffer, &dwBufferSize ); + DWORD dwBufferSize = nSize; + LONG lResult = RegQueryValueEx( hkeyNetworkProvider, TEXT("AuthenticatingAgent"), 0, NULL, (LPBYTE)lpBuffer, &dwBufferSize ); if ( ERROR_SUCCESS == lResult || ERROR_MORE_DATA == lResult ) dwResult = dwBufferSize / sizeof(TCHAR); @@ -100,8 +100,8 @@ static DWORD WINAPI GetUserDomainW_WINDOWS( LPWSTR lpBuffer, DWORD nSize ) TEXT("SYSTEM\\CurrentControlSet\\Services\\VxD\\VNETSUP"), 0, KEY_READ, &hkeyWorkgroup ) ) { - DWORD dwBufferSize = nSize; - LONG lResult = RegQueryValueEx( hkeyWorkgroup, TEXT("Workgroup"), 0, NULL, (LPBYTE)lpBuffer, &dwBufferSize ); + DWORD dwBufferSize = nSize; + LONG lResult = RegQueryValueEx( hkeyWorkgroup, TEXT("Workgroup"), 0, NULL, (LPBYTE)lpBuffer, &dwBufferSize ); if ( ERROR_SUCCESS == lResult || ERROR_MORE_DATA == lResult ) dwResult = dwBufferSize / sizeof(TCHAR); @@ -115,16 +115,16 @@ static DWORD WINAPI GetUserDomainW_WINDOWS( LPWSTR lpBuffer, DWORD nSize ) static rtl::OUString GetUserDomain() { - sal_Unicode aBuffer[256]; + sal_Unicode aBuffer[256]; - long nVersion = GetVersion(); - DWORD nResult; + long nVersion = GetVersion(); + DWORD nResult; if ( nVersion < 0 ) nResult = GetUserDomainW_WINDOWS( reinterpret_cast<LPWSTR>(aBuffer), sizeof( aBuffer ) ); else nResult = GetUserDomainW_NT( reinterpret_cast<LPWSTR>(aBuffer), sizeof( aBuffer ) ); - + if ( nResult > 0 ) return rtl::OUString( aBuffer ); else @@ -132,7 +132,7 @@ static rtl::OUString GetUserDomain() } //_________________________________________________________________________________________________________________ -// Windows +// Windows //_________________________________________________________________________________________________________________ rtl::OUString NetworkDomain::GetYPDomainName() @@ -153,13 +153,13 @@ rtl::OUString NetworkDomain::GetNTDomainName() #include <osl/thread.h> //_________________________________________________________________________________________________________________ -// Unix +// Unix //_________________________________________________________________________________________________________________ #if defined( SOLARIS ) //_________________________________________________________________________________________________________________ -// Solaris +// Solaris //_________________________________________________________________________________________________________________ #include <sys/systeminfo.h> @@ -168,44 +168,44 @@ rtl::OUString NetworkDomain::GetNTDomainName() static rtl_uString *getDomainName() { /* Initialize and assume failure */ - rtl_uString *ustrDomainName = NULL; - - char szBuffer[256]; - - long nCopied = sizeof(szBuffer); - char *pBuffer = szBuffer; - long nBufSize; - + rtl_uString *ustrDomainName = NULL; + + char szBuffer[256]; + + long nCopied = sizeof(szBuffer); + char *pBuffer = szBuffer; + long nBufSize; + do { nBufSize = nCopied; - nCopied = sysinfo( SI_SRPC_DOMAIN, pBuffer, nBufSize ); - - /* If nCopied is greater than buffersize we need to allocate + nCopied = sysinfo( SI_SRPC_DOMAIN, pBuffer, nBufSize ); + + /* If nCopied is greater than buffersize we need to allocate a buffer with suitable size */ - + if ( nCopied > nBufSize ) pBuffer = (char *)alloca( nCopied ); - + } while ( nCopied > nBufSize ); - if ( -1 != nCopied ) + if ( -1 != nCopied ) { - rtl_string2UString( + rtl_string2UString( &ustrDomainName, - pBuffer, - nCopied - 1, - osl_getThreadTextEncoding(), + pBuffer, + nCopied - 1, + osl_getThreadTextEncoding(), OSTRING_TO_OUSTRING_CVTFLAGS ); } - + return ustrDomainName; } #elif defined( LINUX ) /* endif SOLARIS */ //_________________________________________________________________________________________________________________ -// Linux +// Linux //_________________________________________________________________________________________________________________ #include <unistd.h> @@ -214,12 +214,12 @@ static rtl_uString *getDomainName() static rtl_uString *getDomainName() { /* Initialize and assume failure */ - rtl_uString *ustrDomainName = NULL; - - char *pBuffer; - int result; - size_t nBufSize = 0; - + rtl_uString *ustrDomainName = NULL; + + char *pBuffer; + int result; + size_t nBufSize = 0; + do { nBufSize += 256; /* Increase buffer size by steps of 256 bytes */ @@ -229,24 +229,24 @@ static rtl_uString *getDomainName() is set to EINVAL. This only applies to libc. With glibc the name is truncated. */ } while ( -1 == result && EINVAL == errno ); - + if ( 0 == result ) { - rtl_string2UString( + rtl_string2UString( &ustrDomainName, - pBuffer, - strlen( pBuffer ), - osl_getThreadTextEncoding(), + pBuffer, + strlen( pBuffer ), + osl_getThreadTextEncoding(), OSTRING_TO_OUSTRING_CVTFLAGS ); } - + return ustrDomainName; } -#else /* LINUX */ +#else /* LINUX */ //_________________________________________________________________________________________________________________ -// Other Unix +// Other Unix //_________________________________________________________________________________________________________________ static rtl_uString *getDomainName() @@ -257,12 +257,12 @@ static rtl_uString *getDomainName() #endif //_________________________________________________________________________________________________________________ -// Unix +// Unix //_________________________________________________________________________________________________________________ rtl::OUString NetworkDomain::GetYPDomainName() { - rtl_uString* pResult = getDomainName(); + rtl_uString* pResult = getDomainName(); if ( pResult ) return rtl::OUString( pResult ); else @@ -277,7 +277,7 @@ rtl::OUString NetworkDomain::GetNTDomainName() #else /* UNIX */ //_________________________________________________________________________________________________________________ -// Other operating systems (non-Windows and non-Unix) +// Other operating systems (non-Windows and non-Unix) //_________________________________________________________________________________________________________________ rtl::OUString NetworkDomain::GetYPDomainName() diff --git a/framework/source/helper/ocomponentaccess.cxx b/framework/source/helper/ocomponentaccess.cxx index b0baf1bcf81c..ce25ac0796fc 100644 --- a/framework/source/helper/ocomponentaccess.cxx +++ b/framework/source/helper/ocomponentaccess.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <helper/ocomponentaccess.hxx> #include <helper/ocomponentenumeration.hxx> @@ -39,46 +39,46 @@ #endif //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/frame/FrameSearchFlag.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ -using namespace ::com::sun::star::container ; -using namespace ::com::sun::star::frame ; -using namespace ::com::sun::star::lang ; -using namespace ::com::sun::star::uno ; -using namespace ::cppu ; -using namespace ::osl ; -using namespace ::rtl ; +using namespace ::com::sun::star::container ; +using namespace ::com::sun::star::frame ; +using namespace ::com::sun::star::lang ; +using namespace ::com::sun::star::uno ; +using namespace ::cppu ; +using namespace ::osl ; +using namespace ::rtl ; //_________________________________________________________________________________________________________________ -// non exported const +// non exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// non exported definitions +// non exported definitions //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** OComponentAccess::OComponentAccess( const Reference< XDesktop >& xOwner ) - // Init baseclasses first + // Init baseclasses first : ThreadHelpBase ( &Application::GetSolarMutex() ) // Init member , m_xOwner ( xOwner ) @@ -88,14 +88,14 @@ OComponentAccess::OComponentAccess( const Reference< XDesktop >& xOwner ) } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** OComponentAccess::~OComponentAccess() { } //***************************************************************************************************************** -// XEnumerationAccess +// XEnumerationAccess //***************************************************************************************************************** Reference< XEnumeration > SAL_CALL OComponentAccess::createEnumeration() throw( RuntimeException ) { @@ -125,7 +125,7 @@ Reference< XEnumeration > SAL_CALL OComponentAccess::createEnumeration() throw( } //***************************************************************************************************************** -// XElementAccess +// XElementAccess //***************************************************************************************************************** Type SAL_CALL OComponentAccess::getElementType() throw( RuntimeException ) { @@ -135,7 +135,7 @@ Type SAL_CALL OComponentAccess::getElementType() throw( RuntimeException ) } //***************************************************************************************************************** -// XElementAccess +// XElementAccess //***************************************************************************************************************** sal_Bool SAL_CALL OComponentAccess::hasElements() throw( RuntimeException ) { @@ -158,10 +158,10 @@ sal_Bool SAL_CALL OComponentAccess::hasElements() throw( RuntimeException ) } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** -void OComponentAccess::impl_collectAllChildComponents( const Reference< XFramesSupplier >& xNode , - Sequence< Reference< XComponent > >& seqComponents ) +void OComponentAccess::impl_collectAllChildComponents( const Reference< XFramesSupplier >& xNode , + Sequence< Reference< XComponent > >& seqComponents ) { // If valid node was given ... if( xNode.is() == sal_True ) @@ -173,8 +173,8 @@ void OComponentAccess::impl_collectAllChildComponents( const Reference< XFramesS sal_Int32 nComponentCount = seqComponents.getLength(); - const Reference< XFrames > xContainer = xNode->getFrames(); - const Sequence< Reference< XFrame > > seqFrames = xContainer->queryFrames( FrameSearchFlag::CHILDREN ); + const Reference< XFrames > xContainer = xNode->getFrames(); + const Sequence< Reference< XFrame > > seqFrames = xContainer->queryFrames( FrameSearchFlag::CHILDREN ); const sal_Int32 nFrameCount = seqFrames.getLength(); for( sal_Int32 nFrame=0; nFrame<nFrameCount; ++nFrame ) @@ -192,7 +192,7 @@ void OComponentAccess::impl_collectAllChildComponents( const Reference< XFramesS } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** Reference< XComponent > OComponentAccess::impl_getFrameComponent( const Reference< XFrame >& xFrame ) const { @@ -225,7 +225,7 @@ Reference< XComponent > OComponentAccess::impl_getFrameComponent( const Referenc } //_________________________________________________________________________________________________________________ -// debug methods +// debug methods //_________________________________________________________________________________________________________________ /*----------------------------------------------------------------------------------------------------------------- @@ -246,9 +246,9 @@ sal_Bool OComponentAccess::impldbg_checkParameter_OComponentAccessCtor( const // Set default return value. sal_Bool bOK = sal_True; // Check parameter. - if ( - ( &xOwner == NULL ) || - ( xOwner.is() == sal_False ) + if ( + ( &xOwner == NULL ) || + ( xOwner.is() == sal_False ) ) { bOK = sal_False ; @@ -257,6 +257,6 @@ sal_Bool OComponentAccess::impldbg_checkParameter_OComponentAccessCtor( const return bOK ; } -#endif // #ifdef ENABLE_ASSERTIONS +#endif // #ifdef ENABLE_ASSERTIONS -} // namespace framework +} // namespace framework diff --git a/framework/source/helper/ocomponentenumeration.cxx b/framework/source/helper/ocomponentenumeration.cxx index 912d80c75d05..68237179d70d 100644 --- a/framework/source/helper/ocomponentenumeration.cxx +++ b/framework/source/helper/ocomponentenumeration.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <helper/ocomponentenumeration.hxx> @@ -38,49 +38,49 @@ #endif //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ -using namespace ::com::sun::star::container ; -using namespace ::com::sun::star::lang ; -using namespace ::com::sun::star::uno ; -using namespace ::cppu ; -using namespace ::osl ; -using namespace ::rtl ; +using namespace ::com::sun::star::container ; +using namespace ::com::sun::star::lang ; +using namespace ::com::sun::star::uno ; +using namespace ::cppu ; +using namespace ::osl ; +using namespace ::rtl ; //_________________________________________________________________________________________________________________ -// non exported const +// non exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// non exported definitions +// non exported definitions //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** OComponentEnumeration::OComponentEnumeration( const Sequence< Reference< XComponent > >& seqComponents ) - // Init baseclasses first - // Attention: - // Don't change order of initialization! + // Init baseclasses first + // Attention: + // Don't change order of initialization! // ThreadHelpBase is a struct with a mutex as member. We can't use a mutex as member, while - // we must garant right initialization and a valid value of this! First initialize - // baseclasses and then members. And we need the mutex for other baseclasses !!! + // we must garant right initialization and a valid value of this! First initialize + // baseclasses and then members. And we need the mutex for other baseclasses !!! : ThreadHelpBase ( &Application::GetSolarMutex() ) // Init member , m_nPosition ( 0 ) // 0 is the first position for a valid list and the right value for an invalid list to! @@ -92,7 +92,7 @@ OComponentEnumeration::OComponentEnumeration( const Sequence< Reference< XCompon } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** OComponentEnumeration::~OComponentEnumeration() { @@ -101,7 +101,7 @@ OComponentEnumeration::~OComponentEnumeration() } //***************************************************************************************************************** -// XEventListener +// XEventListener //***************************************************************************************************************** void SAL_CALL OComponentEnumeration::disposing( const EventObject& #if OSL_DEBUG_LEVEL > 0 @@ -121,7 +121,7 @@ aEvent } //***************************************************************************************************************** -// XEnumeration +// XEnumeration //***************************************************************************************************************** sal_Bool SAL_CALL OComponentEnumeration::hasMoreElements() throw( RuntimeException ) { @@ -136,11 +136,11 @@ sal_Bool SAL_CALL OComponentEnumeration::hasMoreElements() throw( RuntimeExcepti } //***************************************************************************************************************** -// XEnumeration +// XEnumeration //***************************************************************************************************************** -Any SAL_CALL OComponentEnumeration::nextElement() throw( NoSuchElementException , - WrappedTargetException , - RuntimeException ) +Any SAL_CALL OComponentEnumeration::nextElement() throw( NoSuchElementException , + WrappedTargetException , + RuntimeException ) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); @@ -163,7 +163,7 @@ Any SAL_CALL OComponentEnumeration::nextElement() throw( NoSuchElementException } //***************************************************************************************************************** -// proteced method +// proteced method //***************************************************************************************************************** void OComponentEnumeration::impl_resetObject() { @@ -183,7 +183,7 @@ void OComponentEnumeration::impl_resetObject() } //_________________________________________________________________________________________________________________ -// debug methods +// debug methods //_________________________________________________________________________________________________________________ /*----------------------------------------------------------------------------------------------------------------- @@ -205,7 +205,7 @@ sal_Bool OComponentEnumeration::impldbg_checkParameter_OComponentEnumerationCtor // Set default return value. sal_Bool bOK = sal_True; // Check parameter. - if ( + if ( ( &seqComponents == NULL ) ) { @@ -221,9 +221,9 @@ sal_Bool OComponentEnumeration::impldbg_checkParameter_disposing( const EventObj // Set default return value. sal_Bool bOK = sal_True; // Check parameter. - if ( - ( &aEvent == NULL ) || - ( aEvent.Source.is() == sal_False ) + if ( + ( &aEvent == NULL ) || + ( aEvent.Source.is() == sal_False ) ) { bOK = sal_False ; @@ -232,6 +232,6 @@ sal_Bool OComponentEnumeration::impldbg_checkParameter_disposing( const EventObj return bOK ; } -#endif // #ifdef ENABLE_ASSERTIONS +#endif // #ifdef ENABLE_ASSERTIONS -} // namespace framework +} // namespace framework diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx index 405da6d91a6e..62f4b30de749 100644 --- a/framework/source/helper/oframes.cxx +++ b/framework/source/helper/oframes.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <helper/oframes.hxx> @@ -38,51 +38,51 @@ #endif //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/frame/XDesktop.hpp> #include <com/sun/star/frame/FrameSearchFlag.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ -using namespace ::com::sun::star::container ; -using namespace ::com::sun::star::frame ; -using namespace ::com::sun::star::lang ; -using namespace ::com::sun::star::uno ; -using namespace ::cppu ; -using namespace ::osl ; -using namespace ::rtl ; -using namespace ::std ; -using namespace ::vos ; +using namespace ::com::sun::star::container ; +using namespace ::com::sun::star::frame ; +using namespace ::com::sun::star::lang ; +using namespace ::com::sun::star::uno ; +using namespace ::cppu ; +using namespace ::osl ; +using namespace ::rtl ; +using namespace ::std ; +using namespace ::vos ; //_________________________________________________________________________________________________________________ -// non exported const +// non exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// non exported definitions +// non exported definitions //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** -OFrames::OFrames( const Reference< XMultiServiceFactory >& xFactory , - const Reference< XFrame >& xOwner , - FrameContainer* pFrameContainer ) - // Init baseclasses first +OFrames::OFrames( const Reference< XMultiServiceFactory >& xFactory , + const Reference< XFrame >& xOwner , + FrameContainer* pFrameContainer ) + // Init baseclasses first : ThreadHelpBase ( &Application::GetSolarMutex() ) // Init member , m_xFactory ( xFactory ) @@ -96,7 +96,7 @@ OFrames::OFrames( const Reference< XMultiServiceFactory >& xFactory , } //***************************************************************************************************************** -// (proteced!) destructor +// (proteced!) destructor //***************************************************************************************************************** OFrames::~OFrames() { @@ -105,7 +105,7 @@ OFrames::~OFrames() } //***************************************************************************************************************** -// XFrames +// XFrames //***************************************************************************************************************** void SAL_CALL OFrames::append( const Reference< XFrame >& xFrame ) throw( RuntimeException ) { @@ -131,7 +131,7 @@ void SAL_CALL OFrames::append( const Reference< XFrame >& xFrame ) throw( Runtim } //***************************************************************************************************************** -// XFrames +// XFrames //***************************************************************************************************************** void SAL_CALL OFrames::remove( const Reference< XFrame >& xFrame ) throw( RuntimeException ) { @@ -158,7 +158,7 @@ void SAL_CALL OFrames::remove( const Reference< XFrame >& xFrame ) throw( Runtim } //***************************************************************************************************************** -// XFrames +// XFrames //***************************************************************************************************************** Sequence< Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int32 nSearchFlags ) throw( RuntimeException ) { @@ -196,8 +196,8 @@ Sequence< Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int32 nSearch //_____________________________________________________________________________________________________________ // Search for ALL and GLOBAL is superflous! // We support all necessary flags, from which these two flags are derived. - // ALL = PARENT + SELF + CHILDREN + SIBLINGS - // GLOBAL = ALL + TASKS + // ALL = PARENT + SELF + CHILDREN + SIBLINGS + // GLOBAL = ALL + TASKS //_____________________________________________________________________________________________________________ // Add parent to list ... if any exist! @@ -268,7 +268,7 @@ Sequence< Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int32 nSearch } //***************************************************************************************************************** -// XIndexAccess +// XIndexAccess //***************************************************************************************************************** sal_Int32 SAL_CALL OFrames::getCount() throw( RuntimeException ) { @@ -292,11 +292,11 @@ sal_Int32 SAL_CALL OFrames::getCount() throw( RuntimeException ) } //***************************************************************************************************************** -// XIndexAccess +// XIndexAccess //***************************************************************************************************************** -Any SAL_CALL OFrames::getByIndex( sal_Int32 nIndex ) throw( IndexOutOfBoundsException , - WrappedTargetException , - RuntimeException ) +Any SAL_CALL OFrames::getByIndex( sal_Int32 nIndex ) throw( IndexOutOfBoundsException , + WrappedTargetException , + RuntimeException ) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); @@ -324,7 +324,7 @@ Any SAL_CALL OFrames::getByIndex( sal_Int32 nIndex ) throw( IndexOutOfBoundsExce } //***************************************************************************************************************** -// XElementAccess +// XElementAccess //***************************************************************************************************************** Type SAL_CALL OFrames::getElementType() throw( RuntimeException ) { @@ -333,7 +333,7 @@ Type SAL_CALL OFrames::getElementType() throw( RuntimeException ) } //***************************************************************************************************************** -// XElementAccess +// XElementAccess //***************************************************************************************************************** sal_Bool SAL_CALL OFrames::hasElements() throw( RuntimeException ) { @@ -359,7 +359,7 @@ sal_Bool SAL_CALL OFrames::hasElements() throw( RuntimeException ) } //***************************************************************************************************************** -// proteced method +// proteced method //***************************************************************************************************************** void OFrames::impl_resetObject() { @@ -376,21 +376,21 @@ void OFrames::impl_resetObject() } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** -void OFrames::impl_appendSequence( Sequence< Reference< XFrame > >& seqDestination , - const Sequence< Reference< XFrame > >& seqSource ) +void OFrames::impl_appendSequence( Sequence< Reference< XFrame > >& seqDestination , + const Sequence< Reference< XFrame > >& seqSource ) { // Get some informations about the sequences. - sal_Int32 nSourceCount = seqSource.getLength(); - sal_Int32 nDestinationCount = seqDestination.getLength(); - const Reference< XFrame >* pSourceAccess = seqSource.getConstArray(); - Reference< XFrame >* pDestinationAccess = seqDestination.getArray(); + sal_Int32 nSourceCount = seqSource.getLength(); + sal_Int32 nDestinationCount = seqDestination.getLength(); + const Reference< XFrame >* pSourceAccess = seqSource.getConstArray(); + Reference< XFrame >* pDestinationAccess = seqDestination.getArray(); // Get memory for result list. - Sequence< Reference< XFrame > > seqResult ( nSourceCount + nDestinationCount ); - Reference< XFrame >* pResultAccess = seqResult.getArray(); - sal_Int32 nResultPosition = 0; + Sequence< Reference< XFrame > > seqResult ( nSourceCount + nDestinationCount ); + Reference< XFrame >* pResultAccess = seqResult.getArray(); + sal_Int32 nResultPosition = 0; // Copy all items from first sequence. for ( sal_Int32 nSourcePosition=0; nSourcePosition<nSourceCount; ++nSourcePosition ) @@ -415,7 +415,7 @@ void OFrames::impl_appendSequence( Sequence< Reference< XFrame > >& seqDestina } //_________________________________________________________________________________________________________________ -// debug methods +// debug methods //_________________________________________________________________________________________________________________ /*----------------------------------------------------------------------------------------------------------------- @@ -434,19 +434,19 @@ void OFrames::impl_appendSequence( Sequence< Reference< XFrame > >& seqDestina // An instance of this class can only work with valid initialization. // We share the mutex with ouer owner class, need a valid factory to instanciate new services and // use the access to ouer owner for some operations. -sal_Bool OFrames::impldbg_checkParameter_OFramesCtor( const Reference< XMultiServiceFactory >& xFactory , - const Reference< XFrame >& xOwner , - FrameContainer* pFrameContainer ) +sal_Bool OFrames::impldbg_checkParameter_OFramesCtor( const Reference< XMultiServiceFactory >& xFactory , + const Reference< XFrame >& xOwner , + FrameContainer* pFrameContainer ) { // Set default return value. sal_Bool bOK = sal_True; // Check parameter. - if ( - ( &xFactory == NULL ) || - ( &xOwner == NULL ) || - ( xFactory.is() == sal_False ) || - ( xOwner.is() == sal_False ) || - ( pFrameContainer == NULL ) + if ( + ( &xFactory == NULL ) || + ( &xOwner == NULL ) || + ( xFactory.is() == sal_False ) || + ( xOwner.is() == sal_False ) || + ( pFrameContainer == NULL ) ) { bOK = sal_False ; @@ -463,9 +463,9 @@ sal_Bool OFrames::impldbg_checkParameter_append( const Reference< XFrame >& xFra // Set default return value. sal_Bool bOK = sal_True; // Check parameter. - if ( - ( &xFrame == NULL ) || - ( xFrame.is() == sal_False ) + if ( + ( &xFrame == NULL ) || + ( xFrame.is() == sal_False ) ) { bOK = sal_False ; @@ -482,9 +482,9 @@ sal_Bool OFrames::impldbg_checkParameter_remove( const Reference< XFrame >& xFra // Set default return value. sal_Bool bOK = sal_True; // Check parameter. - if ( - ( &xFrame == NULL ) || - ( xFrame.is() == sal_False ) + if ( + ( &xFrame == NULL ) || + ( xFrame.is() == sal_False ) ) { bOK = sal_False ; @@ -501,16 +501,16 @@ sal_Bool OFrames::impldbg_checkParameter_queryFrames( sal_Int32 nSearchFlags ) // Set default return value. sal_Bool bOK = sal_True; // Check parameter. - if ( - ( nSearchFlags != FrameSearchFlag::AUTO ) && - ( !( nSearchFlags & FrameSearchFlag::PARENT ) ) && - ( !( nSearchFlags & FrameSearchFlag::SELF ) ) && - ( !( nSearchFlags & FrameSearchFlag::CHILDREN ) ) && - ( !( nSearchFlags & FrameSearchFlag::CREATE ) ) && - ( !( nSearchFlags & FrameSearchFlag::SIBLINGS ) ) && - ( !( nSearchFlags & FrameSearchFlag::TASKS ) ) && - ( !( nSearchFlags & FrameSearchFlag::ALL ) ) && - ( !( nSearchFlags & FrameSearchFlag::GLOBAL ) ) + if ( + ( nSearchFlags != FrameSearchFlag::AUTO ) && + ( !( nSearchFlags & FrameSearchFlag::PARENT ) ) && + ( !( nSearchFlags & FrameSearchFlag::SELF ) ) && + ( !( nSearchFlags & FrameSearchFlag::CHILDREN ) ) && + ( !( nSearchFlags & FrameSearchFlag::CREATE ) ) && + ( !( nSearchFlags & FrameSearchFlag::SIBLINGS ) ) && + ( !( nSearchFlags & FrameSearchFlag::TASKS ) ) && + ( !( nSearchFlags & FrameSearchFlag::ALL ) ) && + ( !( nSearchFlags & FrameSearchFlag::GLOBAL ) ) ) { bOK = sal_False ; @@ -519,6 +519,6 @@ sal_Bool OFrames::impldbg_checkParameter_queryFrames( sal_Int32 nSearchFlags ) return bOK ; } -#endif // #ifdef ENABLE_ASSERTIONS +#endif // #ifdef ENABLE_ASSERTIONS -} // namespace framework +} // namespace framework diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx index 23a638ea4ed1..ee0fceeebc7a 100644 --- a/framework/source/helper/persistentwindowstate.cxx +++ b/framework/source/helper/persistentwindowstate.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <pattern/window.hxx> #include <helper/persistentwindowstate.hxx> @@ -39,7 +39,7 @@ #include <services.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/awt/XWindow.hpp> @@ -50,7 +50,7 @@ #include <com/sun/star/frame/XModuleManager.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <comphelper/configurationhelper.hxx> #include <vcl/window.hxx> @@ -63,12 +63,12 @@ #include <vcl/wrkwin.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace namespace framework{ //_________________________________________________________________________________________________________________ -// definitions +// definitions //***************************************************************************************************************** // XInterface, XTypeProvider @@ -111,21 +111,21 @@ void SAL_CALL PersistentWindowState::initialize(const css::uno::Sequence< css::u DECLARE_ASCII("Empty argument list!"), static_cast< ::cppu::OWeakObject* >(this), 1); - + lArguments[0] >>= xFrame; if (!xFrame.is()) throw css::lang::IllegalArgumentException( DECLARE_ASCII("No valid frame specified!"), static_cast< ::cppu::OWeakObject* >(this), 1); - + // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); // hold the frame as weak reference(!) so it can die everytimes :-) m_xFrame = xFrame; aWriteLock.unlock(); // <- SAFE ---------------------------------- - + // start listening xFrame->addFrameActionListener(this); } @@ -145,12 +145,12 @@ void SAL_CALL PersistentWindowState::frameAction(const css::frame::FrameActionEv // frame already gone ? We hold it weak only ... if (!xFrame.is()) return; - + // no window -> no position and size available css::uno::Reference< css::awt::XWindow > xWindow = xFrame->getContainerWindow(); if (!xWindow.is()) return; - + // unknown module -> no configuration available! ::rtl::OUString sModuleName = PersistentWindowState::implst_identifyModule(xSMGR, xFrame); if (!sModuleName.getLength()) @@ -172,14 +172,14 @@ void SAL_CALL PersistentWindowState::frameAction(const css::frame::FrameActionEv } } break; - + case css::frame::FrameAction_COMPONENT_REATTACHED : { // nothing todo here, because its not allowed to change position and size // of an alredy existing frame! } break; - + case css::frame::FrameAction_COMPONENT_DETACHING : { ::rtl::OUString sWindowState = PersistentWindowState::implst_getWindowStateFromWindow(xWindow); @@ -187,7 +187,7 @@ void SAL_CALL PersistentWindowState::frameAction(const css::frame::FrameActionEv } break; default: - break; + break; } } @@ -203,11 +203,11 @@ void SAL_CALL PersistentWindowState::disposing(const css::lang::EventObject&) const css::uno::Reference< css::frame::XFrame >& xFrame) { ::rtl::OUString sModuleName; - + css::uno::Reference< css::frame::XModuleManager > xModuleManager( xSMGR->createInstance(SERVICENAME_MODULEMANAGER), css::uno::UNO_QUERY_THROW); - + try { sModuleName = xModuleManager->identify(xFrame); @@ -216,25 +216,25 @@ void SAL_CALL PersistentWindowState::disposing(const css::lang::EventObject&) { throw exRun; } catch(const css::uno::Exception&) { sModuleName = ::rtl::OUString(); } - + return sModuleName; } - + //***************************************************************************************************************** ::rtl::OUString PersistentWindowState::implst_getWindowStateFromConfig(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR , const ::rtl::OUString& sModuleName) { ::rtl::OUString sWindowState; - + ::rtl::OUStringBuffer sRelPathBuf(256); sRelPathBuf.appendAscii("Office/Factories/*[\""); sRelPathBuf.append (sModuleName ); sRelPathBuf.appendAscii("\"]" ); - + ::rtl::OUString sPackage = ::rtl::OUString::createFromAscii("org.openoffice.Setup/"); ::rtl::OUString sRelPath = sRelPathBuf.makeStringAndClear(); ::rtl::OUString sKey = ::rtl::OUString::createFromAscii("ooSetupFactoryWindowAttributes"); - + try { ::comphelper::ConfigurationHelper::readDirectKey(xSMGR, @@ -247,8 +247,8 @@ void SAL_CALL PersistentWindowState::disposing(const css::lang::EventObject&) { throw exRun; } catch(const css::uno::Exception&) { sWindowState = ::rtl::OUString(); } - - return sWindowState; + + return sWindowState; } //***************************************************************************************************************** @@ -260,11 +260,11 @@ void PersistentWindowState::implst_setWindowStateOnConfig(const css::uno::Refere sRelPathBuf.appendAscii("Office/Factories/*[\""); sRelPathBuf.append (sModuleName ); sRelPathBuf.appendAscii("\"]" ); - + ::rtl::OUString sPackage = ::rtl::OUString::createFromAscii("org.openoffice.Setup/"); ::rtl::OUString sRelPath = sRelPathBuf.makeStringAndClear(); ::rtl::OUString sKey = ::rtl::OUString::createFromAscii("ooSetupFactoryWindowAttributes"); - + try { ::comphelper::ConfigurationHelper::writeDirectKey(xSMGR, @@ -284,12 +284,12 @@ void PersistentWindowState::implst_setWindowStateOnConfig(const css::uno::Refere ::rtl::OUString PersistentWindowState::implst_getWindowStateFromWindow(const css::uno::Reference< css::awt::XWindow >& xWindow) { ::rtl::OUString sWindowState; - + if (xWindow.is()) { // SOLAR SAFE -> ------------------------ ::vos::OClearableGuard aSolarLock(Application::GetSolarMutex()); - + Window* pWindow = VCLUnoHelper::GetWindow(xWindow); // check for system window is neccessary to guarantee correct pointer cast! if ( @@ -303,14 +303,14 @@ void PersistentWindowState::implst_setWindowStateOnConfig(const css::uno::Refere ((SystemWindow*)pWindow)->GetWindowState(nMask), RTL_TEXTENCODING_UTF8); } - + aSolarLock.clear(); // <- SOLAR SAFE ------------------------ } - + return sWindowState; } - + //********************************************************************************************************* void PersistentWindowState::implst_setWindowStateOnWindow(const css::uno::Reference< css::awt::XWindow >& xWindow , @@ -324,27 +324,27 @@ void PersistentWindowState::implst_setWindowStateOnWindow(const css::uno::Refere // SOLAR SAFE -> ------------------------ ::vos::OClearableGuard aSolarLock(Application::GetSolarMutex()); - + Window* pWindow = VCLUnoHelper::GetWindow(xWindow); if (!pWindow) return; - + // check for system and work window - its neccessary to guarantee correct pointer cast! - sal_Bool bSystemWindow = pWindow->IsSystemWindow(); - sal_Bool bWorkWindow = (pWindow->GetType() == WINDOW_WORKWINDOW); + sal_Bool bSystemWindow = pWindow->IsSystemWindow(); + sal_Bool bWorkWindow = (pWindow->GetType() == WINDOW_WORKWINDOW); if (!bSystemWindow && !bWorkWindow) return; SystemWindow* pSystemWindow = (SystemWindow*)pWindow; WorkWindow* pWorkWindow = (WorkWindow* )pWindow; - + // dont save this special state! if (pWorkWindow->IsMinimized()) return; - + pSystemWindow->SetWindowState(U2B_ENC(sWindowState,RTL_TEXTENCODING_UTF8)); - + aSolarLock.clear(); // <- SOLAR SAFE ------------------------ } diff --git a/framework/source/helper/propertysetcontainer.cxx b/framework/source/helper/propertysetcontainer.cxx index 4f8eec9c2f80..0fe750f92fd9 100644 --- a/framework/source/helper/propertysetcontainer.cxx +++ b/framework/source/helper/propertysetcontainer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ #include <vcl/svapp.hxx> -#define WRONG_TYPE_EXCEPTION "Only XPropertSet allowed!" +#define WRONG_TYPE_EXCEPTION "Only XPropertSet allowed!" using namespace rtl; using namespace vos; @@ -47,7 +47,7 @@ namespace framework PropertySetContainer::PropertySetContainer( const Reference< XMultiServiceFactory >& ) : ThreadHelpBase( &Application::GetSolarMutex() ) - , OWeakObject() + , OWeakObject() { } @@ -60,7 +60,7 @@ PropertySetContainer::~PropertySetContainer() // XInterface void SAL_CALL PropertySetContainer::acquire() throw () -{ +{ OWeakObject::acquire(); } @@ -69,26 +69,26 @@ void SAL_CALL PropertySetContainer::release() throw () OWeakObject::release(); } -Any SAL_CALL PropertySetContainer::queryInterface( const Type& rType ) +Any SAL_CALL PropertySetContainer::queryInterface( const Type& rType ) throw ( RuntimeException ) { - Any a = ::cppu::queryInterface( + Any a = ::cppu::queryInterface( rType , SAL_STATIC_CAST( XIndexContainer*, this ), SAL_STATIC_CAST( XIndexReplace*, this ), SAL_STATIC_CAST( XIndexAccess*, this ), SAL_STATIC_CAST( XElementAccess*, this ) ); - + if( a.hasValue() ) { return a; } - + return OWeakObject::queryInterface( rType ); } // XIndexContainer -void SAL_CALL PropertySetContainer::insertByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) +void SAL_CALL PropertySetContainer::insertByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) { ResetableGuard aGuard( m_aLock ); @@ -98,7 +98,7 @@ void SAL_CALL PropertySetContainer::insertByIndex( sal_Int32 Index, const ::com: if ( nSize >= Index ) { Reference< XPropertySet > aPropertySetElement; - + if ( Element >>= aPropertySetElement ) { if ( nSize == Index ) @@ -112,7 +112,7 @@ void SAL_CALL PropertySetContainer::insertByIndex( sal_Int32 Index, const ::com: } else { - throw IllegalArgumentException( + throw IllegalArgumentException( OUString( RTL_CONSTASCII_USTRINGPARAM( WRONG_TYPE_EXCEPTION )), (OWeakObject *)this, 2 ); } @@ -121,7 +121,7 @@ void SAL_CALL PropertySetContainer::insertByIndex( sal_Int32 Index, const ::com: throw IndexOutOfBoundsException( OUString(), (OWeakObject *)this ); } -void SAL_CALL PropertySetContainer::removeByIndex( sal_Int32 Index ) +void SAL_CALL PropertySetContainer::removeByIndex( sal_Int32 Index ) throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) { ResetableGuard aGuard( m_aLock ); @@ -137,20 +137,20 @@ void SAL_CALL PropertySetContainer::removeByIndex( sal_Int32 Index ) } // XIndexReplace -void SAL_CALL PropertySetContainer::replaceByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) +void SAL_CALL PropertySetContainer::replaceByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException) { if ( (sal_Int32)m_aPropertySetVector.size() > Index ) { Reference< XPropertySet > aPropertySetElement; - + if ( Element >>= aPropertySetElement ) { m_aPropertySetVector[ Index ] = aPropertySetElement; } else { - throw IllegalArgumentException( + throw IllegalArgumentException( OUString( RTL_CONSTASCII_USTRINGPARAM( WRONG_TYPE_EXCEPTION )), (OWeakObject *)this, 2 ); } @@ -160,15 +160,15 @@ void SAL_CALL PropertySetContainer::replaceByIndex( sal_Int32 Index, const ::com } // XIndexAccess -sal_Int32 SAL_CALL PropertySetContainer::getCount() +sal_Int32 SAL_CALL PropertySetContainer::getCount() throw ( RuntimeException ) { ResetableGuard aGuard( m_aLock ); - + return m_aPropertySetVector.size(); } -Any SAL_CALL PropertySetContainer::getByIndex( sal_Int32 Index ) +Any SAL_CALL PropertySetContainer::getByIndex( sal_Int32 Index ) throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) { ResetableGuard aGuard( m_aLock ); @@ -185,11 +185,11 @@ Any SAL_CALL PropertySetContainer::getByIndex( sal_Int32 Index ) } // XElementAccess -sal_Bool SAL_CALL PropertySetContainer::hasElements() +sal_Bool SAL_CALL PropertySetContainer::hasElements() throw (::com::sun::star::uno::RuntimeException) { ResetableGuard aGuard( m_aLock ); - + return !( m_aPropertySetVector.empty() ); } diff --git a/framework/source/helper/shareablemutex.cxx b/framework/source/helper/shareablemutex.cxx index bdc5f131aa62..b173c6c34a4f 100644 --- a/framework/source/helper/shareablemutex.cxx +++ b/framework/source/helper/shareablemutex.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ ShareableMutex::ShareableMutex( const ShareableMutex& rShareableMutex ) if ( pMutexRef ) pMutexRef->acquire(); } - + const ShareableMutex& ShareableMutex::operator=( const ShareableMutex& rShareableMutex ) { if ( rShareableMutex.pMutexRef ) @@ -61,8 +61,8 @@ ShareableMutex::~ShareableMutex() pMutexRef->release(); } -void ShareableMutex::acquire() -{ +void ShareableMutex::acquire() +{ if ( pMutexRef ) pMutexRef->m_oslMutex.acquire(); } diff --git a/framework/source/helper/statusindicator.cxx b/framework/source/helper/statusindicator.cxx index 9e2c1e794632..f38a84fdb75f 100644 --- a/framework/source/helper/statusindicator.cxx +++ b/framework/source/helper/statusindicator.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx index ecfe81a03498..4c0738b9fe85 100644 --- a/framework/source/helper/statusindicatorfactory.cxx +++ b/framework/source/helper/statusindicatorfactory.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -76,7 +76,7 @@ namespace framework{ //----------------------------------------------- // definitions -sal_Int32 StatusIndicatorFactory::m_nInReschedule = 0; /// static counter for rescheduling +sal_Int32 StatusIndicatorFactory::m_nInReschedule = 0; /// static counter for rescheduling static ::rtl::OUString PROGRESS_RESOURCE = ::rtl::OUString::createFromAscii("private:resource/progressbar/progressbar"); //----------------------------------------------- @@ -519,7 +519,7 @@ void StatusIndicatorFactory::impl_showProgress() // <- SAFE ---------------------------------- css::uno::Reference< css::task::XStatusIndicator > xProgress; - + if (xFrame.is()) { // use frame layouted progress implementation @@ -535,7 +535,7 @@ void StatusIndicatorFactory::impl_showProgress() // CreateElement does nothing if there is already a valid progress. xLayoutManager->createElement( PROGRESS_RESOURCE ); xLayoutManager->showElement( PROGRESS_RESOURCE ); - + css::uno::Reference< css::ui::XUIElement > xProgressBar = xLayoutManager->getElement(PROGRESS_RESOURCE); if (xProgressBar.is()) xProgress = css::uno::Reference< css::task::XStatusIndicator >(xProgressBar->getRealInterface(), css::uno::UNO_QUERY); diff --git a/framework/source/helper/tagwindowasmodified.cxx b/framework/source/helper/tagwindowasmodified.cxx index 089cf3061e29..a71c5263455b 100644 --- a/framework/source/helper/tagwindowasmodified.cxx +++ b/framework/source/helper/tagwindowasmodified.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <helper/tagwindowasmodified.hxx> #include <pattern/window.hxx> @@ -39,7 +39,7 @@ #include <services.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/awt/XWindow.hpp> @@ -51,7 +51,7 @@ #include <com/sun/star/frame/FrameAction.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ @@ -64,12 +64,12 @@ #include <vcl/wintypes.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace namespace framework{ //_________________________________________________________________________________________________________________ -// definitions +// definitions //***************************************************************************************************************** // XInterface, XTypeProvider @@ -108,16 +108,16 @@ void SAL_CALL TagWindowAsModified::initialize(const css::uno::Sequence< css::uno if (lArguments.getLength() > 0) lArguments[0] >>= xFrame; - + if ( ! xFrame.is ()) return; - + // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); m_xFrame = xFrame ; aWriteLock.unlock(); // <- SAFE ---------------------------------- - + xFrame->addFrameActionListener(this); impl_update (xFrame); } @@ -137,21 +137,21 @@ void SAL_CALL TagWindowAsModified::modified(const css::lang::EventObject& aEvent (aEvent.Source != xModel) ) return; - + aReadLock.unlock(); // <- SAFE ---------------------------------- - + ::sal_Bool bModified = xModel->isModified (); - + // SYNCHRONIZED -> ::vos::OClearableGuard aSolarGuard(Application::GetSolarMutex()); - + Window* pWindow = VCLUnoHelper::GetWindow(xWindow); if ( ! pWindow) return; - - sal_Bool bSystemWindow = pWindow->IsSystemWindow(); - sal_Bool bWorkWindow = (pWindow->GetType() == WINDOW_WORKWINDOW); + + sal_Bool bSystemWindow = pWindow->IsSystemWindow(); + sal_Bool bWorkWindow = (pWindow->GetType() == WINDOW_WORKWINDOW); if (!bSystemWindow && !bWorkWindow) return; @@ -159,7 +159,7 @@ void SAL_CALL TagWindowAsModified::modified(const css::lang::EventObject& aEvent pWindow->SetExtendedStyle(WB_EXT_DOCMODIFIED); else pWindow->SetExtendedStyle( ! WB_EXT_DOCMODIFIED); - + aSolarGuard.clear(); // <- SYNCHRONIZED } @@ -183,10 +183,10 @@ void SAL_CALL TagWindowAsModified::frameAction(const css::frame::FrameActionEven (aEvent.Source != xFrame) ) return; - + aWriteLock.unlock(); // <- SAFE ---------------------------------- - + impl_update (xFrame); } @@ -206,7 +206,7 @@ void SAL_CALL TagWindowAsModified::disposing(const css::lang::EventObject& aEven m_xFrame = css::uno::Reference< css::frame::XFrame >(); return; } - + css::uno::Reference< css::frame::XModel > xModel(m_xModel.get(), css::uno::UNO_QUERY); if ( (xModel.is () ) && @@ -232,13 +232,13 @@ void TagWindowAsModified::impl_update (const css::uno::Reference< css::frame::XF css::uno::Reference< css::frame::XModel > xModel ; if (xController.is ()) xModel = xController->getModel (); - + if ( ( ! xWindow.is ()) || ( ! xModel.is ()) ) return; - + // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); // Note: frame was set as member outside ! we have to refresh connections @@ -247,7 +247,7 @@ void TagWindowAsModified::impl_update (const css::uno::Reference< css::frame::XF m_xModel = xModel ; aWriteLock.unlock(); // <- SAFE ---------------------------------- - + css::uno::Reference< css::util::XModifyBroadcaster > xModifiable(xModel, css::uno::UNO_QUERY); if (xModifiable.is ()) xModifiable->addModifyListener (this); diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx index e2250f3faa66..9b6501af4c20 100644 --- a/framework/source/helper/titlebarupdate.cxx +++ b/framework/source/helper/titlebarupdate.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ #endif //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #ifndef __FRAMEWORK_PATTERN_WINDOW_HXX_ @@ -61,7 +61,7 @@ #endif //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #ifndef _COM_SUN_STAR_AWT_XWINDOW_HPP_ @@ -101,7 +101,7 @@ #endif //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #ifndef _COMPHELPER_SEQUENCEASHASHMAP_HXX @@ -137,18 +137,18 @@ #endif //_________________________________________________________________________________________________________________ -// namespace +// namespace namespace framework{ //_________________________________________________________________________________________________________________ -// const +// const static const ::sal_Int32 INVALID_ICON_ID = -1; static const ::sal_Int32 DEFAULT_ICON_ID = 0; //_________________________________________________________________________________________________________________ -// definitions +// definitions //***************************************************************************************************************** // XInterface, XTypeProvider @@ -193,21 +193,21 @@ void SAL_CALL TitleBarUpdate::initialize(const css::uno::Sequence< css::uno::Any DECLARE_ASCII("Empty argument list!"), static_cast< ::cppu::OWeakObject* >(this), 1); - + lArguments[0] >>= xFrame; if (!xFrame.is()) throw css::lang::IllegalArgumentException( DECLARE_ASCII("No valid frame specified!"), static_cast< ::cppu::OWeakObject* >(this), 1); - + // SYNCHRONIZED -> WriteGuard aWriteLock(m_aLock); // hold the frame as weak reference(!) so it can die everytimes :-) m_xFrame = xFrame; aWriteLock.unlock(); // <- SYNCHRONIZED - + // start listening xFrame->addFrameActionListener(this); @@ -258,23 +258,23 @@ void SAL_CALL TitleBarUpdate::disposing(const css::lang::EventObject&) css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = m_xSMGR; aReadLock.unlock(); // <- SYNCHRONIZED - + try { css::uno::Reference< css::frame::XModuleManager > xModuleManager( xSMGR->createInstance(SERVICENAME_MODULEMANAGER), css::uno::UNO_QUERY_THROW); - + css::uno::Reference< css::container::XNameAccess > xConfig( xModuleManager, css::uno::UNO_QUERY_THROW); - + rInfo.sID = xModuleManager->identify(xFrame); ::comphelper::SequenceAsHashMap lProps = xConfig->getByName (rInfo.sID); - + rInfo.sUIName = lProps.getUnpackedValueOrDefault (OFFICEFACTORY_PROPNAME_UINAME, ::rtl::OUString()); rInfo.nIcon = lProps.getUnpackedValueOrDefault (OFFICEFACTORY_PROPNAME_ICON , INVALID_ICON_ID ); - + // Note: If we could retrieve a module id ... everything is OK. // UIName and Icon ID are optional values ! ::sal_Bool bSuccess = (rInfo.sID.getLength () > 0); @@ -282,7 +282,7 @@ void SAL_CALL TitleBarUpdate::disposing(const css::lang::EventObject&) } catch(const css::uno::Exception&) {} - + return sal_False; } @@ -299,7 +299,7 @@ void TitleBarUpdate::impl_forceUpdate() // frame already gone ? We hold it weak only ... if ( ! xFrame.is()) return; - + // no window -> no chance to set/update title and icon css::uno::Reference< css::awt::XWindow > xWindow = xFrame->getContainerWindow(); if ( ! xWindow.is()) @@ -320,7 +320,7 @@ void TitleBarUpdate::impl_updateIcon(const css::uno::Reference< css::frame::XFra ( ! xWindow.is() ) ) return; - + // a) set default value to an invalid one. So we can start further searches for right icon id, if // first steps failed! sal_Int32 nIcon = INVALID_ICON_ID; @@ -355,10 +355,10 @@ void TitleBarUpdate::impl_updateIcon(const css::uno::Reference< css::frame::XFra // e) set icon on container window now // Don't forget SolarMutex! We use vcl directly :-( // Check window pointer for right WorkWindow class too!!! - + // VCL SYNCHRONIZED -> ::vos::OClearableGuard aSolarLock( Application::GetSolarMutex() ); - + Window* pWindow = (VCLUnoHelper::GetWindow( xWindow )); if ( ( pWindow ) && @@ -367,7 +367,7 @@ void TitleBarUpdate::impl_updateIcon(const css::uno::Reference< css::frame::XFra { WorkWindow* pWorkWindow = (WorkWindow*)pWindow; pWorkWindow->SetIcon( (sal_uInt16)nIcon ); - + css::uno::Reference< css::frame::XModel > xModel = xController->getModel(); rtl::OUString aURL; if( xModel.is() ) @@ -386,7 +386,7 @@ void TitleBarUpdate::impl_updateTitle(const css::uno::Reference< css::frame::XFr css::uno::Reference< css::awt::XWindow > xWindow = xFrame->getContainerWindow (); if ( ! xWindow.is() ) return; - + css::uno::Reference< css::frame::XTitle > xTitle(xFrame, css::uno::UNO_QUERY); if ( ! xTitle.is() ) return; @@ -395,7 +395,7 @@ void TitleBarUpdate::impl_updateTitle(const css::uno::Reference< css::frame::XFr // VCL SYNCHRONIZED -> ::vos::OClearableGuard aSolarLock( Application::GetSolarMutex() ); - + Window* pWindow = (VCLUnoHelper::GetWindow( xWindow )); if ( ( pWindow ) && diff --git a/framework/source/helper/titlehelper.cxx b/framework/source/helper/titlehelper.cxx index e95617064bab..1ca884c27ca7 100644 --- a/framework/source/helper/titlehelper.cxx +++ b/framework/source/helper/titlehelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -98,7 +98,7 @@ void TitleHelper::setOwner(const css::uno::Reference< css::uno::XInterface >& xO impl_startListeningForModel (xModel); return; } - + css::uno::Reference< css::frame::XController > xController(xOwner, css::uno::UNO_QUERY); if (xController.is ()) { @@ -126,14 +126,14 @@ void TitleHelper::setOwner(const css::uno::Reference< css::uno::XInterface >& xO // Even an empty string will be accepted as valid title ! if (m_bExternalTitle) return m_sTitle; - + // Title seams to be up-to-date. Return it directly. if (m_sTitle.getLength() > 0) return m_sTitle; - + // Title seams to be unused till now ... do bootstraping impl_updateTitle (); - + return m_sTitle; // <- SYNCHRONIZED @@ -173,7 +173,7 @@ void SAL_CALL TitleHelper::addTitleChangeListener(const css::uno::Reference< css // container is threadsafe by himself m_aListener.addInterface( ::getCppuType( (const css::uno::Reference< css::frame::XTitleChangeListener >*)NULL ), xListener ); } - + //----------------------------------------------- void SAL_CALL TitleHelper::removeTitleChangeListener(const css::uno::Reference< css::frame::XTitleChangeListener >& xListener) throw (css::uno::RuntimeException) @@ -196,7 +196,7 @@ void SAL_CALL TitleHelper::titleChanged(const css::frame::TitleChangedEvent& aEv if (aEvent.Source != xSubTitle) return; - + impl_updateTitle (); } @@ -207,7 +207,7 @@ void SAL_CALL TitleHelper::notifyEvent(const css::document::EventObject& aEvent) if ( ! aEvent.EventName.equalsIgnoreAsciiCaseAscii ("OnSaveAsDone") && ! aEvent.EventName.equalsIgnoreAsciiCaseAscii ("OnTitleChanged")) return; - + // SYNCHRONIZED -> ::osl::ResettableMutexGuard aLock(m_aMutex); @@ -218,12 +218,12 @@ void SAL_CALL TitleHelper::notifyEvent(const css::document::EventObject& aEvent) if ( aEvent.Source != xOwner || - (aEvent.EventName.equalsIgnoreAsciiCaseAscii ("OnTitleChanged") && !xOwner.is()) + (aEvent.EventName.equalsIgnoreAsciiCaseAscii ("OnTitleChanged") && !xOwner.is()) ) { return; } - + impl_updateTitle (); } @@ -305,7 +305,7 @@ void TitleHelper::impl_sendTitleChangedEvent () ::cppu::OInterfaceContainerHelper* pContainer = m_aListener.getContainer( ::getCppuType( ( const css::uno::Reference< css::frame::XTitleChangeListener >*) NULL ) ); if ( ! pContainer) return; - + ::cppu::OInterfaceIteratorHelper pIt( *pContainer ); while ( pIt.hasMoreElements() ) { @@ -325,7 +325,7 @@ void TitleHelper::impl_updateTitle () { // SYNCHRONIZED -> ::osl::ResettableMutexGuard aLock(m_aMutex); - + css::uno::Reference< css::frame::XModel > xModel (m_xOwner.get(), css::uno::UNO_QUERY); css::uno::Reference< css::frame::XController > xController(m_xOwner.get(), css::uno::UNO_QUERY); css::uno::Reference< css::frame::XFrame > xFrame (m_xOwner.get(), css::uno::UNO_QUERY); @@ -338,7 +338,7 @@ void TitleHelper::impl_updateTitle () impl_updateTitleForModel (xModel); return; } - + if (xController.is ()) { impl_updateTitleForController (xController); @@ -357,33 +357,33 @@ void TitleHelper::impl_updateTitleForModel (const css::uno::Reference< css::fram { // SYNCHRONIZED -> ::osl::ResettableMutexGuard aLock(m_aMutex); - + // external title wont be updated internaly ! // It has to be set from outside new. if (m_bExternalTitle) return; - + css::uno::Reference< css::uno::XInterface > xOwner (m_xOwner.get() , css::uno::UNO_QUERY); css::uno::Reference< css::frame::XUntitledNumbers > xNumbers (m_xUntitledNumbers.get(), css::uno::UNO_QUERY); ::sal_Int32 nLeasedNumber = m_nLeasedNumber; - + aLock.clear (); // <- SYNCHRONIZED - + if ( ( ! xOwner.is ()) || ( ! xNumbers.is ()) || ( ! xModel.is ()) ) return; - + ::rtl::OUString sTitle; ::rtl::OUString sURL ; - + css::uno::Reference< css::frame::XStorable > xURLProvider(xModel , css::uno::UNO_QUERY); if (xURLProvider.is()) sURL = xURLProvider->getLocation (); - + if (sURL.getLength () > 0) { sTitle = impl_convertURL2Title(sURL); @@ -395,14 +395,14 @@ void TitleHelper::impl_updateTitleForModel (const css::uno::Reference< css::fram { if (nLeasedNumber == css::frame::UntitledNumbersConst::INVALID_NUMBER) nLeasedNumber = xNumbers->leaseNumber (xOwner); - + ::rtl::OUStringBuffer sNewTitle(256); sNewTitle.append (xNumbers->getUntitledPrefix ()); if (nLeasedNumber != css::frame::UntitledNumbersConst::INVALID_NUMBER) sNewTitle.append ((::sal_Int32)nLeasedNumber); else sNewTitle.appendAscii ("?"); - + sTitle = sNewTitle.makeStringAndClear (); } @@ -428,31 +428,31 @@ void TitleHelper::impl_updateTitleForController (const css::uno::Reference< css: { // SYNCHRONIZED -> ::osl::ResettableMutexGuard aLock(m_aMutex); - + // external title wont be updated internaly ! // It has to be set from outside new. if (m_bExternalTitle) return; - + css::uno::Reference< css::uno::XInterface > xOwner (m_xOwner.get() , css::uno::UNO_QUERY); css::uno::Reference< css::frame::XUntitledNumbers > xNumbers (m_xUntitledNumbers.get(), css::uno::UNO_QUERY); ::sal_Int32 nLeasedNumber = m_nLeasedNumber; - + aLock.clear (); // <- SYNCHRONIZED - + if ( ( ! xOwner.is ()) || ( ! xNumbers.is ()) || ( ! xController.is ()) ) return; - + ::rtl::OUStringBuffer sTitle(256); - + if (nLeasedNumber == css::frame::UntitledNumbersConst::INVALID_NUMBER) nLeasedNumber = xNumbers->leaseNumber (xOwner); - + css::uno::Reference< css::frame::XTitle > xModelTitle(xController->getModel (), css::uno::UNO_QUERY); if (!xModelTitle.is ()) xModelTitle.set(xController, css::uno::UNO_QUERY); @@ -481,7 +481,7 @@ void TitleHelper::impl_updateTitleForController (const css::uno::Reference< css: sal_Bool bChanged = (! m_sTitle.equals(sNewTitle)); m_sTitle = sNewTitle; m_nLeasedNumber = nLeasedNumber; - + aLock.clear (); // <- SYNCHRONIZED @@ -494,23 +494,23 @@ void TitleHelper::impl_updateTitleForFrame (const css::uno::Reference< css::fram { if ( ! xFrame.is ()) return; - + // SYNCHRONIZED -> ::osl::ResettableMutexGuard aLock(m_aMutex); - + // external title wont be updated internaly ! // It has to be set from outside new. if (m_bExternalTitle) return; - + aLock.clear (); // <- SYNCHRONIZED - + css::uno::Reference< css::uno::XInterface > xComponent; xComponent = xFrame->getController (); if ( ! xComponent.is ()) xComponent = xFrame->getComponentWindow (); - + ::rtl::OUStringBuffer sTitle (256); impl_appendComponentTitle (sTitle, xComponent); @@ -519,14 +519,14 @@ void TitleHelper::impl_updateTitleForFrame (const css::uno::Reference< css::fram impl_appendProductExtension (sTitle); //impl_appendEvalVersion (sTitle); impl_appendDebugVersion (sTitle); - + // SYNCHRONIZED -> aLock.reset (); ::rtl::OUString sNewTitle = sTitle.makeStringAndClear (); sal_Bool bChanged = (! m_sTitle.equals(sNewTitle)); m_sTitle = sNewTitle; - + aLock.clear (); // <- SYNCHRONIZED @@ -555,7 +555,7 @@ void TitleHelper::impl_appendProductName (::rtl::OUStringBuffer& sTitle) { if (sTitle.getLength() > 0) sTitle.appendAscii (" - "); - + sTitle.append (sProductName); } } @@ -590,15 +590,15 @@ void TitleHelper::impl_appendModuleName (::rtl::OUStringBuffer& sTitle) css::uno::Reference< css::frame::XModuleManager > xModuleManager( xSMGR->createInstance(SERVICENAME_MODULEMANAGER), css::uno::UNO_QUERY_THROW); - + css::uno::Reference< css::container::XNameAccess > xConfig( xModuleManager, css::uno::UNO_QUERY_THROW); - + const ::rtl::OUString sID = xModuleManager->identify(xOwner); ::comphelper::SequenceAsHashMap lProps = xConfig->getByName (sID); const ::rtl::OUString sUIName = lProps.getUnpackedValueOrDefault (OFFICEFACTORY_PROPNAME_UINAME, ::rtl::OUString()); - + // An UIname property is an optional value ! // So please add it to the title in case it does realy exists only. if (sUIName.getLength() > 0) @@ -639,18 +639,18 @@ void TitleHelper::impl_appendEvalVersion (::rtl::OUStringBuffer& /*sTitle*/) //css::uno::Reference< css::beans::XMaterialHolder > xHolder( // xSMGR->createInstance(SERVICENAME_TABREG), - // css::uno::UNO_QUERY); + // css::uno::UNO_QUERY); // if ( ! xHolder.is()) - // return; + // return; - // ::comphelper::SequenceAsHashMap aMaterial(xHolder->getMaterial()); - //const ::rtl::OUString sEvalTitle = aMaterial.getUnpackedValueOrDefault(TABREG_PROPNAME_TITLE, ::rtl::OUString()); + // ::comphelper::SequenceAsHashMap aMaterial(xHolder->getMaterial()); + //const ::rtl::OUString sEvalTitle = aMaterial.getUnpackedValueOrDefault(TABREG_PROPNAME_TITLE, ::rtl::OUString()); //if (sEvalTitle.getLength()) //{ - // sTitle.appendAscii (" " ); - // sTitle.append (sEvalTitle); + // sTitle.appendAscii (" " ); + // sTitle.append (sEvalTitle); //} } @@ -660,7 +660,7 @@ void TitleHelper::impl_startListeningForModel (const css::uno::Reference< css::f css::uno::Reference< css::document::XEventBroadcaster > xBroadcaster(xModel, css::uno::UNO_QUERY); if ( ! xBroadcaster.is ()) return; - + xBroadcaster->addEventListener (static_cast< css::document::XEventListener* >(this)); } @@ -697,17 +697,17 @@ void TitleHelper::impl_setSubTitle (const css::uno::Reference< css::frame::XTitl return; m_xSubTitle = xSubTitle; - + aLock.clear (); // <- SYNCHRONIZED - + css::uno::Reference< css::frame::XTitleChangeBroadcaster > xOldBroadcaster(xOldSubTitle , css::uno::UNO_QUERY ); css::uno::Reference< css::frame::XTitleChangeBroadcaster > xNewBroadcaster(xSubTitle , css::uno::UNO_QUERY ); css::uno::Reference< css::frame::XTitleChangeListener > xThis (static_cast< css::frame::XTitleChangeListener* >(this), css::uno::UNO_QUERY_THROW); - + if (xOldBroadcaster.is()) xOldBroadcaster->removeTitleChangeListener (xThis); - + if (xNewBroadcaster.is()) xNewBroadcaster->addTitleChangeListener (xThis); } @@ -725,7 +725,7 @@ void TitleHelper::impl_setSubTitle (const css::uno::Reference< css::frame::XTitl if (xSubTitle.is ()) return xSubTitle->getTitle (); - + return ::rtl::OUString (); } @@ -739,7 +739,7 @@ void TitleHelper::impl_setSubTitle (const css::uno::Reference< css::frame::XTitl { if (aURL.HasMark()) aURL = INetURLObject(aURL.GetURLNoMark()); - + sTitle = aURL.getName(INetURLObject::LAST_SEGMENT, sal_True, INetURLObject::DECODE_WITH_CHARSET); } else diff --git a/framework/source/helper/uiconfigelementwrapperbase.cxx b/framework/source/helper/uiconfigelementwrapperbase.cxx index b982c3ea5985..030ec5bf8cf6 100644 --- a/framework/source/helper/uiconfigelementwrapperbase.cxx +++ b/framework/source/helper/uiconfigelementwrapperbase.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <helper/uiconfigelementwrapperbase.hxx> #include <general.h> @@ -39,7 +39,7 @@ #include <uielement/rootitemcontainer.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -47,7 +47,7 @@ #include <com/sun/star/ui/XUIConfiguration.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> #include <rtl/logfile.hxx> @@ -82,16 +82,16 @@ namespace framework { //***************************************************************************************************************** -// XInterface, XTypeProvider +// XInterface, XTypeProvider //***************************************************************************************************************** DEFINE_XINTERFACE_10 ( UIConfigElementWrapperBase , OWeakObject , DIRECT_INTERFACE( ::com::sun::star::lang::XTypeProvider ), DIRECT_INTERFACE( ::com::sun::star::ui::XUIElement ), DIRECT_INTERFACE( ::com::sun::star::ui::XUIElementSettings ), - DIRECT_INTERFACE( ::com::sun::star::beans::XMultiPropertySet ), - DIRECT_INTERFACE( ::com::sun::star::beans::XFastPropertySet ), - DIRECT_INTERFACE( ::com::sun::star::beans::XPropertySet ), + DIRECT_INTERFACE( ::com::sun::star::beans::XMultiPropertySet ), + DIRECT_INTERFACE( ::com::sun::star::beans::XFastPropertySet ), + DIRECT_INTERFACE( ::com::sun::star::beans::XPropertySet ), DIRECT_INTERFACE( ::com::sun::star::lang::XInitialization ), DIRECT_INTERFACE( ::com::sun::star::lang::XComponent ), DIRECT_INTERFACE( ::com::sun::star::util::XUpdatable ), @@ -218,8 +218,8 @@ sal_Bool SAL_CALL UIConfigElementWrapperBase::convertFastPropertyValue( Any& sal_Int32 nHandle , const Any& aValue ) throw( com::sun::star::lang::IllegalArgumentException ) { - // Initialize state with FALSE !!! - // (Handle can be invalid) + // Initialize state with FALSE !!! + // (Handle can be invalid) sal_Bool bReturn = sal_False; switch( nHandle ) @@ -545,7 +545,7 @@ Reference< XIndexAccess > SAL_CALL UIConfigElementWrapperBase::getSettings( sal_ if ( bWriteable ) return Reference< XIndexAccess >( static_cast< OWeakObject * >( new RootItemContainer( m_xConfigData ) ), UNO_QUERY ); - + return m_xConfigData; } diff --git a/framework/source/helper/uielementwrapperbase.cxx b/framework/source/helper/uielementwrapperbase.cxx index 4d4d2e4fdbb8..6329f94b3063 100644 --- a/framework/source/helper/uielementwrapperbase.cxx +++ b/framework/source/helper/uielementwrapperbase.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <helper/uielementwrapperbase.hxx> #include <general.h> @@ -37,14 +37,14 @@ #include <threadhelp/resetableguard.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> #include <rtl/logfile.hxx> @@ -66,15 +66,15 @@ namespace framework { //***************************************************************************************************************** -// XInterface, XTypeProvider +// XInterface, XTypeProvider //***************************************************************************************************************** DEFINE_XINTERFACE_8 ( UIElementWrapperBase , OWeakObject , DIRECT_INTERFACE( ::com::sun::star::lang::XTypeProvider ), DIRECT_INTERFACE( ::com::sun::star::ui::XUIElement ), - DIRECT_INTERFACE( ::com::sun::star::beans::XMultiPropertySet ), - DIRECT_INTERFACE( ::com::sun::star::beans::XFastPropertySet ), - DIRECT_INTERFACE( ::com::sun::star::beans::XPropertySet ), + DIRECT_INTERFACE( ::com::sun::star::beans::XMultiPropertySet ), + DIRECT_INTERFACE( ::com::sun::star::beans::XFastPropertySet ), + DIRECT_INTERFACE( ::com::sun::star::beans::XPropertySet ), DIRECT_INTERFACE( ::com::sun::star::lang::XInitialization ), DIRECT_INTERFACE( ::com::sun::star::util::XUpdatable ), DIRECT_INTERFACE( ::com::sun::star::lang::XComponent ) @@ -128,7 +128,7 @@ void SAL_CALL UIElementWrapperBase::initialize( const Sequence< Any >& aArgument throw ( Exception, RuntimeException ) { ResetableGuard aLock( m_aLock ); - + if ( !m_bInitialized ) { for ( sal_Int32 n = 0; n < aArguments.getLength(); n++ ) @@ -180,8 +180,8 @@ sal_Bool SAL_CALL UIElementWrapperBase::convertFastPropertyValue( Any& /*a sal_Int32 /*nHandle*/ , const Any& /*aValue*/ ) throw( com::sun::star::lang::IllegalArgumentException ) { - // Initialize state with FALSE !!! - // (Handle can be invalid) + // Initialize state with FALSE !!! + // (Handle can be invalid) return sal_False ; } @@ -195,10 +195,10 @@ void SAL_CALL UIElementWrapperBase::getFastPropertyValue( com::sun::star::uno::A { switch( nHandle ) { - case UIELEMENT_PROPHANDLE_RESOURCEURL: + case UIELEMENT_PROPHANDLE_RESOURCEURL: aValue <<= m_aResourceURL; break; - case UIELEMENT_PROPHANDLE_TYPE: + case UIELEMENT_PROPHANDLE_TYPE: aValue <<= m_nType; break; case UIELEMENT_PROPHANDLE_FRAME: diff --git a/framework/source/helper/vclstatusindicator.cxx b/framework/source/helper/vclstatusindicator.cxx index 40f278d14832..3845c09ffb6f 100644 --- a/framework/source/helper/vclstatusindicator.cxx +++ b/framework/source/helper/vclstatusindicator.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,17 +66,17 @@ VCLStatusIndicator::VCLStatusIndicator(const css::uno::Reference< css::lang::XMu , m_xSMGR (xSMGR ) , m_xParentWindow (xParentWindow ) , m_pStatusBar (0 ) - , m_nRange (0 ) - , m_nValue (0 ) + , m_nRange (0 ) + , m_nValue (0 ) { if (!m_xParentWindow.is()) throw css::uno::RuntimeException( ::rtl::OUString::createFromAscii("Cant work without a parent window!"), static_cast< css::task::XStatusIndicator* >(this)); } - + //----------------------------------------------- -VCLStatusIndicator::~VCLStatusIndicator() +VCLStatusIndicator::~VCLStatusIndicator() { } @@ -90,28 +90,28 @@ void SAL_CALL VCLStatusIndicator::start(const ::rtl::OUString& sText , css::uno::Reference< css::awt::XWindow > xParentWindow = m_xParentWindow; aReadLock.unlock(); // <- SAFE ---------------------------------- - + // SOLAR SAFE -> ---------------------------- ::vos::OClearableGuard aSolarLock(Application::GetSolarMutex()); - + Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow); if (!m_pStatusBar) m_pStatusBar = new StatusBar(pParentWindow, WB_3DLOOK|WB_BORDER); - + VCLStatusIndicator::impl_recalcLayout(m_pStatusBar, pParentWindow); - + m_pStatusBar->Show(); m_pStatusBar->StartProgressMode(sText); m_pStatusBar->SetProgressValue(0); - + // force repaint! pParentWindow->Show(); pParentWindow->Invalidate(INVALIDATE_CHILDREN); pParentWindow->Flush(); - + aSolarLock.clear(); // <- SOLAR SAFE ---------------------------- - + // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); m_sText = sText; @@ -120,7 +120,7 @@ void SAL_CALL VCLStatusIndicator::start(const ::rtl::OUString& sText , aWriteLock.unlock(); // <- SAFE ---------------------------------- } - + //----------------------------------------------- void SAL_CALL VCLStatusIndicator::reset() throw(css::uno::RuntimeException) @@ -135,7 +135,7 @@ void SAL_CALL VCLStatusIndicator::reset() aSolarLock.clear(); // <- SOLAR SAFE ---------------------------- } - + //----------------------------------------------- void SAL_CALL VCLStatusIndicator::end() throw(css::uno::RuntimeException) @@ -147,21 +147,21 @@ void SAL_CALL VCLStatusIndicator::end() m_nValue = 0; aWriteLock.unlock(); // <- SAFE ---------------------------------- - + // SOLAR SAFE -> ---------------------------- ::vos::OClearableGuard aSolarLock(Application::GetSolarMutex()); if (m_pStatusBar) { m_pStatusBar->EndProgressMode(); m_pStatusBar->Show(sal_False); - + delete m_pStatusBar; m_pStatusBar = 0; } aSolarLock.clear(); // <- SOLAR SAFE ---------------------------- } - + //----------------------------------------------- void SAL_CALL VCLStatusIndicator::setText(const ::rtl::OUString& sText) throw(css::uno::RuntimeException) @@ -171,7 +171,7 @@ void SAL_CALL VCLStatusIndicator::setText(const ::rtl::OUString& sText) m_sText = sText; aWriteLock.unlock(); // <- SAFE ---------------------------------- - + // SOLAR SAFE -> ---------------------------- ::vos::OClearableGuard aSolarLock(Application::GetSolarMutex()); if (m_pStatusBar) @@ -179,22 +179,22 @@ void SAL_CALL VCLStatusIndicator::setText(const ::rtl::OUString& sText) aSolarLock.clear(); // <- SOLAR SAFE ---------------------------- } - + //----------------------------------------------- void SAL_CALL VCLStatusIndicator::setValue(sal_Int32 nValue) throw(css::uno::RuntimeException) { // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); - + if (nValue <= m_nRange) m_nValue = nValue; else m_nValue = m_nRange; - + sal_Int32 nRange = m_nRange; nValue = m_nValue; - + aWriteLock.unlock(); // <- SAFE ---------------------------------- @@ -202,7 +202,7 @@ void SAL_CALL VCLStatusIndicator::setValue(sal_Int32 nValue) USHORT nPercent = sal::static_int_cast< USHORT >( ::std::min( ((nValue*100) / ::std::max(nRange,(sal_Int32)1)), (sal_Int32)100)); - + // SOLAR SAFE -> ---------------------------- ::vos::OClearableGuard aSolarLock(Application::GetSolarMutex()); if (m_pStatusBar) @@ -210,7 +210,7 @@ void SAL_CALL VCLStatusIndicator::setValue(sal_Int32 nValue) aSolarLock.clear(); // <- SOLAR SAFE ---------------------------- } - + //----------------------------------------------- void VCLStatusIndicator::impl_recalcLayout(Window* pStatusBar , Window* pParentWindow) @@ -220,12 +220,12 @@ void VCLStatusIndicator::impl_recalcLayout(Window* pStatusBar , (!pParentWindow) ) return; - + Size aParentSize = pParentWindow->GetSizePixel(); pStatusBar->SetPosSizePixel(0, 0, aParentSize.Width(), aParentSize.Height()); } - + } // namespace framework diff --git a/framework/source/helper/wakeupthread.cxx b/framework/source/helper/wakeupthread.cxx index 8682dcd2ed19..0899611b4c03 100644 --- a/framework/source/helper/wakeupthread.cxx +++ b/framework/source/helper/wakeupthread.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,7 +53,7 @@ WakeUpThread::WakeUpThread(const css::uno::Reference< css::util::XUpdatable >& x void SAL_CALL WakeUpThread::run() { ::osl::Condition aSleeper; - + TimeValue aTime; aTime.Seconds = 0; aTime.Nanosec = 25000000; // 25 msec @@ -62,13 +62,13 @@ void SAL_CALL WakeUpThread::run() { aSleeper.reset(); aSleeper.wait(&aTime); - + // SAFE -> ReadGuard aReadLock(m_aLock); css::uno::Reference< css::util::XUpdatable > xListener(m_xListener.get(), css::uno::UNO_QUERY); aReadLock.unlock(); // <- SAFE - + if (xListener.is()) xListener->update(); } diff --git a/framework/source/inc/accelerators/acceleratorcache.hxx b/framework/source/inc/accelerators/acceleratorcache.hxx index 2462ce455f3d..23ec86df8a00 100644 --- a/framework/source/inc/accelerators/acceleratorcache.hxx +++ b/framework/source/inc/accelerators/acceleratorcache.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,11 +55,11 @@ namespace framework //__________________________________________ /** @short implements a cache for any accelerator configuration. - + @descr Its implemented threadsafe, supports copy-on-write pattern and a flush mechansim to support concurrent access to the same configuration. - + copy-on-write ... How? Do the following: */ class AcceleratorCache : public ThreadHelpBase // attention! Must be the first base class to guarentee right initialize lock ... @@ -68,14 +68,14 @@ class AcceleratorCache : public ThreadHelpBase // attention! Must be the first b // const, types public: - + //--------------------------------------- /** TODO document me commands -> keys */ typedef ::comphelper::SequenceAsVector< css::awt::KeyEvent > TKeyList; typedef BaseHash< TKeyList > TCommand2Keys; - + //--------------------------------------- /** TODO document me keys -> commands @@ -84,21 +84,21 @@ class AcceleratorCache : public ThreadHelpBase // attention! Must be the first b ::rtl::OUString , KeyEventHashCode , KeyEventEqualsFunc > TKey2Commands; - + //______________________________________ // member private: - + //--------------------------------------- /** map commands to keys in relation 1:n. First key is interpreted as preferred one! */ TCommand2Keys m_lCommand2Keys; - + //--------------------------------------- /** map keys to commands in relation 1:1. */ TKey2Commands m_lKey2Commands; - + //______________________________________ // interface @@ -107,20 +107,20 @@ class AcceleratorCache : public ThreadHelpBase // attention! Must be the first b //--------------------------------------- /** @short creates a new - but empty - cache instance. */ AcceleratorCache(); - + //--------------------------------------- /** @short make a copy of this cache. - @descr Used for the copy-on-write feature. + @descr Used for the copy-on-write feature. */ AcceleratorCache(const AcceleratorCache& rCopy); - + //--------------------------------------- /** @short does nothing real. */ virtual ~AcceleratorCache(); //--------------------------------------- /** @short write changes back to the original container. - + @param rCopy the (changed!) copy, which should be written back to this original container. @@ -130,30 +130,30 @@ class AcceleratorCache : public ThreadHelpBase // attention! Must be the first b //--------------------------------------- /** TODO document me */ virtual AcceleratorCache& operator=(const AcceleratorCache& rCopy); - + //--------------------------------------- /** @short checks if the specified key exists. @param aKey the key, which should be checked. - + @return [bool] TRUE if the speicfied key exists inside this container. */ virtual sal_Bool hasKey(const css::awt::KeyEvent& aKey) const; virtual sal_Bool hasCommand(const ::rtl::OUString& sCommand) const; - + //--------------------------------------- /** TODO document me */ virtual TKeyList getAllKeys() const; - + //--------------------------------------- /** @short add a new or change an existing key-command pair of this container. - + @param aKey describe the key. - + @param sCommand describe the command. */ @@ -163,7 +163,7 @@ class AcceleratorCache : public ThreadHelpBase // attention! Must be the first b //--------------------------------------- /** @short returns the list of keys, which are registered for this command. - + @param sCommand describe the command. @@ -171,11 +171,11 @@ class AcceleratorCache : public ThreadHelpBase // attention! Must be the first b the list of registered keys. Can be empty! */ virtual TKeyList getKeysByCommand(const ::rtl::OUString& sCommand) const; - + //--------------------------------------- /** TODO */ virtual ::rtl::OUString getCommandByKey(const css::awt::KeyEvent& aKey) const; - + //--------------------------------------- /** TODO */ virtual void removeKey(const css::awt::KeyEvent& aKey); diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx index 8fa0902b2d06..36eed6a6d534 100644 --- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx +++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,18 +75,18 @@ namespace framework //----------------------------------------------- // Accelerators.xcu -static const ::rtl::OUString CFG_ENTRY_PRIMARY = ::rtl::OUString::createFromAscii("PrimaryKeys"); -static const ::rtl::OUString CFG_ENTRY_SECONDARY = ::rtl::OUString::createFromAscii("SecondaryKeys"); +static const ::rtl::OUString CFG_ENTRY_PRIMARY = ::rtl::OUString::createFromAscii("PrimaryKeys"); +static const ::rtl::OUString CFG_ENTRY_SECONDARY = ::rtl::OUString::createFromAscii("SecondaryKeys"); -static const ::rtl::OUString CFG_ENTRY_GLOBAL = ::rtl::OUString::createFromAscii("Global"); +static const ::rtl::OUString CFG_ENTRY_GLOBAL = ::rtl::OUString::createFromAscii("Global"); static const ::rtl::OUString CFG_ENTRY_MODULES = ::rtl::OUString::createFromAscii("Modules"); static const ::rtl::OUString CFG_PROP_COMMAND = ::rtl::OUString::createFromAscii("Command"); /** "global" type to make accelerator presets unique, so they can be used in combination with the salhelper::SingletonRef mechanism! */ -typedef PresetHandler AcceleratorPresets; - +typedef PresetHandler AcceleratorPresets; + //__________________________________________ /** implements a read/write access to the accelerator configuration. @@ -207,7 +207,7 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase virtual void SAL_CALL removeConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& xListener) throw(css::uno::RuntimeException); - // XReset + // XReset // TODO use XPresetHandler instead if available virtual void SAL_CALL reset() throw(css::uno::RuntimeException); @@ -233,7 +233,7 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase for changes on the configuration layer ... @return ::comphelper::Locale - The current office locale. + The current office locale. */ ::comphelper::Locale impl_ts_getLocale() const; @@ -271,7 +271,7 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase used to locate the sub storage. @param sSubStorage - relativ path of the sub storage. + relativ path of the sub storage. @param bOutStream force open of the sub storage in @@ -280,7 +280,7 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase @return [XInterface] will be a css::io::XInpoutStream or a css::io::XOutputStream. - Depends from the parameter bWriteable! + Depends from the parameter bWriteable! */ css::uno::Reference< css::uno::XInterface > impl_ts_openSubStorage(const css::uno::Reference< css::embed::XStorage >& xRootStorage, const ::rtl::OUString& sSubStorage , @@ -300,10 +300,10 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase @param bWriteAccessRequested if the outside code whish to change the container it must call this method with "TRUE". So the internal - cache can be prepared for that (means copy-on-write ...). + cache can be prepared for that (means copy-on-write ...). @return [AcceleratorCache] - c++ reference(!) to one of our internal caches. + c++ reference(!) to one of our internal caches. */ AcceleratorCache& impl_getCFG(sal_Bool bWriteAccessRequested = sal_False); @@ -312,9 +312,9 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase // attention! Must be the first base class to guarentee right initialize lock ... , public ::cppu::OWeakObject , public css::lang::XTypeProvider - , public css::util::XChangesListener + , public css::util::XChangesListener , public css::form::XReset // TODO use XPresetHandler instead if available - , public css::ui::XAcceleratorConfiguration // => css::ui::XUIConfigurationPersistence + , public css::ui::XAcceleratorConfiguration // => css::ui::XUIConfigurationPersistence // css::ui::XUIConfigurationStorage // css::ui::XUIConfiguration { @@ -420,7 +420,7 @@ class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase virtual void SAL_CALL removeConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& xListener) throw(css::uno::RuntimeException); - // XReset + // XReset // TODO use XPresetHandler instead if available virtual void SAL_CALL reset() throw(css::uno::RuntimeException); @@ -451,7 +451,7 @@ class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase for changes on the configuration layer ... @return ::comphelper::Locale - The current office locale. + The current office locale. */ ::comphelper::Locale impl_ts_getLocale() const; diff --git a/framework/source/inc/accelerators/documentacceleratorconfiguration.hxx b/framework/source/inc/accelerators/documentacceleratorconfiguration.hxx index 3fe80221546c..43714abeee60 100644 --- a/framework/source/inc/accelerators/documentacceleratorconfiguration.hxx +++ b/framework/source/inc/accelerators/documentacceleratorconfiguration.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,29 +65,29 @@ class DocumentAcceleratorConfiguration : public XMLBasedAcceleratorConfiguration { //______________________________________ // member - + private: - + //---------------------------------- /** points to the root storage of the outside document, where we can read/save our configuration data. */ - css::uno::Reference< css::embed::XStorage > m_xDocumentRoot; - + css::uno::Reference< css::embed::XStorage > m_xDocumentRoot; + //______________________________________ // interface public: - + //---------------------------------- /** initialize this instance and fill the internal cache. - + @param xSMGR reference to an uno service manager, which is used internaly. */ DocumentAcceleratorConfiguration(const css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR); virtual ~DocumentAcceleratorConfiguration(); - - // XInterface, XTypeProvider, XServiceInfo + + // XInterface, XTypeProvider, XServiceInfo FWK_DECLARE_XINTERFACE FWK_DECLARE_XTYPEPROVIDER DECLARE_XSERVICEINFO @@ -97,22 +97,22 @@ class DocumentAcceleratorConfiguration : public XMLBasedAcceleratorConfiguration throw(css::uno::Exception , css::uno::RuntimeException); - // XUIConfigurationStorage + // XUIConfigurationStorage virtual void SAL_CALL setStorage(const css::uno::Reference< css::embed::XStorage >& xStorage) throw(css::uno::RuntimeException); virtual sal_Bool SAL_CALL hasStorage() throw(css::uno::RuntimeException); - + //______________________________________ // helper - + private: - + //---------------------------------- /** read all data into the cache. */ void impl_ts_fillCache(); - + //---------------------------------- /** forget all currently cached data AND(!) forget all currently used storages. */ diff --git a/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx b/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx index 05515770ae61..f2b0b1d6afb6 100644 --- a/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx +++ b/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,20 +69,20 @@ class GlobalAcceleratorConfiguration : public XCUBasedAcceleratorConfiguration // interface public: - + //---------------------------------- /** initialize this instance and fill the internal cache. - + @param xSMGR reference to an uno service manager, which is used internaly. */ GlobalAcceleratorConfiguration(const css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR); - + //---------------------------------- /** TODO */ virtual ~GlobalAcceleratorConfiguration(); - - // XInterface, XTypeProvider, XServiceInfo + + // XInterface, XTypeProvider, XServiceInfo FWK_DECLARE_XINTERFACE FWK_DECLARE_XTYPEPROVIDER DECLARE_XSERVICEINFO @@ -94,11 +94,11 @@ class GlobalAcceleratorConfiguration : public XCUBasedAcceleratorConfiguration //______________________________________ // helper - + private: ::rtl::OUString m_sLocale; - + //---------------------------------- /** read all data into the cache. */ void impl_ts_fillCache(); diff --git a/framework/source/inc/accelerators/istoragelistener.hxx b/framework/source/inc/accelerators/istoragelistener.hxx index c11076efcddd..44f0cc3cd5c5 100644 --- a/framework/source/inc/accelerators/istoragelistener.hxx +++ b/framework/source/inc/accelerators/istoragelistener.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,7 +53,7 @@ namespace framework class IStorageListener { public: - + //-------------------------------------- /** @short TODO */ virtual void changesOccured(const ::rtl::OUString& sPath) = 0; diff --git a/framework/source/inc/accelerators/keymapping.hxx b/framework/source/inc/accelerators/keymapping.hxx index 2a58e7fa6137..e254378867b6 100644 --- a/framework/source/inc/accelerators/keymapping.hxx +++ b/framework/source/inc/accelerators/keymapping.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,25 +73,25 @@ class KeyMapping //--------------------------------------- /** @short hash structure to map identifier to key codes. */ typedef BaseHash< sal_Int16 > Identifier2CodeHash; - + //--------------------------------------- /** @short hash structure to map key codes to identifier. */ typedef ::std::hash_map< sal_Int16 , ::rtl::OUString , ShortHashCode , ::std::equal_to< sal_Int16 > > Code2IdentifierHash; - + //______________________________________ // member private: - + static KeyIdentifierInfo KeyIdentifierMap[]; - + //--------------------------------------- /** @short hash to map identifier to key codes. */ Identifier2CodeHash m_lIdentifierHash; - + //--------------------------------------- /** @short hash to map key codes to identifier. */ Code2IdentifierHash m_lCodeHash; @@ -107,51 +107,51 @@ class KeyMapping //---------------------------------- /** @short return a suitable key code for the specified key identifier. - + @param sIdentifier string value, which describe the key. @return [css::awt::KeyEvent] the corresponding key code as short value. - + @throw [css::lang::IllegalArgumentException] if the given identifier does not describe - a well known key code. - */ + a well known key code. + */ virtual sal_uInt16 mapIdentifierToCode(const ::rtl::OUString& sIdentifier) throw(css::lang::IllegalArgumentException); - + //---------------------------------- /** @short return a suitable key identifier for the specified key code. - + @param nCode short value, which describe the key. @return The corresponding string identifier. - */ + */ virtual ::rtl::OUString mapCodeToIdentifier(sal_uInt16 nCode); - + //______________________________________ // helper private: - + //---------------------------------- /** @short check if the given string describe a numeric value ... and convert it. @param sIdentifier the string value, which should be converted. - - + + @param rCode contains the converted code, but is defined only if this method returns TRUE! @return [boolean] - TRUE if convertion was successfully. + TRUE if convertion was successfully. */ sal_Bool impl_st_interpretIdentifierAsPureKeyCode(const ::rtl::OUString& sIdentifier, sal_uInt16& rCode ); diff --git a/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx b/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx index de1a652c6940..8d83dcd459b3 100644 --- a/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx +++ b/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,33 +64,33 @@ class ModuleAcceleratorConfiguration : public XCUBasedAcceleratorConfiguration { //______________________________________ // member - + private: //---------------------------------- /** identify the application module, where this accelerator configuration cache should work on. */ - ::rtl::OUString m_sModule; + ::rtl::OUString m_sModule; ::rtl::OUString m_sLocale; - + //______________________________________ // interface public: - + //---------------------------------- /** initialize this instance and fill the internal cache. - + @param xSMGR reference to an uno service manager, which is used internaly. */ ModuleAcceleratorConfiguration(const css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR); - + //---------------------------------- /** TODO */ virtual ~ModuleAcceleratorConfiguration(); - - // XInterface, XTypeProvider, XServiceInfo + + // XInterface, XTypeProvider, XServiceInfo FWK_DECLARE_XINTERFACE FWK_DECLARE_XTYPEPROVIDER DECLARE_XSERVICEINFO @@ -99,12 +99,12 @@ class ModuleAcceleratorConfiguration : public XCUBasedAcceleratorConfiguration virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , css::uno::RuntimeException); - + //______________________________________ // helper - + private: - + //---------------------------------- /** read all data into the cache. */ void impl_ts_fillCache(); diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx index 7131011827e8..2d8f3ea57920 100644 --- a/framework/source/inc/accelerators/presethandler.hxx +++ b/framework/source/inc/accelerators/presethandler.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ //__________________________________________ // own includes -#include <accelerators/storageholder.hxx> +#include <accelerators/storageholder.hxx> #include <threadhelp/threadhelpbase.hxx> #include <general.h> #include <stdtypes.h> @@ -62,62 +62,62 @@ namespace framework //__________________________________________ /** TODO document me - + <layer>/global/<resourcetype>/<preset>.xml <layer>/modules/<moduleid>/<resourcetype>/<preset>.xml - + RESOURCETYPE PRESET TARGET (share) (user) "accelerator" "default" "current" "word" "excel" - - "menubar" "default" "menubar" - + + "menubar" "default" "menubar" + */ class PresetHandler : private ThreadHelpBase // attention! Must be the first base class to guarentee right initialize lock ... { //------------------------------------------- // const - + public: static ::rtl::OUString PRESET_DEFAULT(); static ::rtl::OUString TARGET_CURRENT(); - + static ::rtl::OUString RESOURCETYPE_MENUBAR(); static ::rtl::OUString RESOURCETYPE_TOOLBAR(); static ::rtl::OUString RESOURCETYPE_ACCELERATOR(); static ::rtl::OUString RESOURCETYPE_STATUSBAR(); - + //------------------------------------------- // types - + public: - + //--------------------------------------- /** @short this handler can provide different types of configuration. - + @descr Means: a global or a module dependend or ... configuration. - */ + */ enum EConfigType { E_GLOBAL, E_MODULES, E_DOCUMENT }; - + private: //--------------------------------------- /** @short because a concurrent access to the same storage from different implementations isnt supported, we have to share it with others. - + @descr This struct makes it possible to use any shared storage in combination with a SingletonRef<> template ... - + Attention: Because these struct is shared it must be used within a synchronized section. Thats why this struct uses a base class ThreadHelpBase and can be locked @@ -126,74 +126,74 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas struct TSharedStorages : public ThreadHelpBase { public: - + StorageHolder m_lStoragesShare; StorageHolder m_lStoragesUser; - + TSharedStorages() : m_lStoragesShare(::comphelper::getProcessServiceFactory()) , m_lStoragesUser (::comphelper::getProcessServiceFactory()) {}; - + virtual ~TSharedStorages() {}; }; - + //------------------------------------------- // member - + private: - + //--------------------------------------- /** @short can be used to create on needed uno resources. */ css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR; - + //--------------------------------------- /** @short knows the type of provided configuration. - + @descr e.g. global, modules, ... */ EConfigType m_eConfigType; - + //--------------------------------------- /** @short specify the type of resource, which configuration sets must be provided here. - - @descr e.g. menubars, toolbars, accelerators + + @descr e.g. menubars, toolbars, accelerators */ ::rtl::OUString m_sResourceType; - + //--------------------------------------- /** @short specify the application module for a module dependend configuration. - + @descr Will be used only, if m_sResourceType is set to "module". Further it must be a valid module identifier then ... */ ::rtl::OUString m_sModule; - + //--------------------------------------- /** @short provides access to the: a) shared root storages b) shared "inbetween" storages of the share and user layer. */ ::salhelper::SingletonRef< TSharedStorages > m_aSharedStorages; - + //--------------------------------------- /** @short if we run in document mode, we cant use the global root storages! We have to use a special document storage explicitly. */ StorageHolder m_lDocumentStorages; - + //--------------------------------------- /** @short holds the folder storage of the share layer alive, where the current configuration set exists. - + @descr Note: If this preset handler works in document mode this member is meaned relative to the document root ... not to the share layer root! - + Further is defined, that m_xWorkingStorageUser - is equals to m_xWorkingStorageShare then! + is equals to m_xWorkingStorageShare then! */ css::uno::Reference< css::embed::XStorage > m_xWorkingStorageShare; @@ -201,108 +201,108 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas /** @short global language-independent storage */ css::uno::Reference< css::embed::XStorage > m_xWorkingStorageNoLang; - + //--------------------------------------- /** @short holds the folder storage of the user layer alive, where the current configuration set exists. - + @descr Note: If this preset handler works in document mode this member is meaned relative to the document root ... not to the user layer root! - + Further is defined, that m_xWorkingStorageUser - is equals to m_xWorkingStorageShare then! + is equals to m_xWorkingStorageShare then! */ css::uno::Reference< css::embed::XStorage > m_xWorkingStorageUser; - + //--------------------------------------- /** @short knows the names of all presets inside the current working storage of the share layer. */ OUStringList m_lPresets; - + //--------------------------------------- /** @short knows the names of all targets inside the current working storage of the user layer. */ OUStringList m_lTargets; - + //--------------------------------------- /** @short its the current office locale and will be used to handle localized presets. - + @descr Default is "x-notranslate" which disable any - localized handling inside this class! */ + localized handling inside this class! */ ::comphelper::Locale m_aLocale; - + //--------------------------------------- /** @short knows the relative path from the root. */ ::rtl::OUString m_sRelPathShare; ::rtl::OUString m_sRelPathNoLang; ::rtl::OUString m_sRelPathUser; - + //------------------------------------------- // native interface - + public: - + //--------------------------------------- /** @short does nothing real. - + @descr Because this class should be useable in combination with ::salhelper::SingletonRef template this ctor cant have any special parameters! - + @param xSMGR points to an uno service manager, which is used internaly - to create own needed uno resources. + to create own needed uno resources. */ - PresetHandler(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR); - + PresetHandler(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR); + //--------------------------------------- /** @short copy ctor */ PresetHandler(const PresetHandler& rCopy); - + //--------------------------------------- /** @short closes all open storages ... if user forgot that .-) */ virtual ~PresetHandler(); - + //--------------------------------------- /** @short free all currently cache(!) storages. */ void forgetCachedStorages(); - + //--------------------------------------- /** @short return access to the internaly used and cached root storage. - + @descr These root storages are the base of all further opened presets and targets. They are provided here only, to support older implementations, which base on them ... - + getOrCreate...() - What does it mean? Such root storage will be created one times only and cached then internaly till the last instance of such PresetHandler dies. - + @return com::sun::star::embed::XStorage - which represent a root storage. + which represent a root storage. */ css::uno::Reference< css::embed::XStorage > getOrCreateRootStorageShare(); css::uno::Reference< css::embed::XStorage > getOrCreateRootStorageUser(); - + //--------------------------------------- /** @short provides access to the current working storages. - + @descr Working storages are the "lowest" storages, where the preset and target files exists. - + @return com::sun::star::embed::XStorage which the current working storage. */ css::uno::Reference< css::embed::XStorage > getWorkingStorageShare(); css::uno::Reference< css::embed::XStorage > getWorkingStorageUser(); - + //--------------------------------------- /** @short check if there is a parent storage well known for the specified child storage and return it. - + @param xChild the child storage where a paranet storage should be searched for. @@ -311,76 +311,76 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas */ css::uno::Reference< css::embed::XStorage > getParentStorageShare(const css::uno::Reference< css::embed::XStorage >& xChild); css::uno::Reference< css::embed::XStorage > getParentStorageUser (const css::uno::Reference< css::embed::XStorage >& xChild); - + //--------------------------------------- /** @short free all internal structures and let this handler work on a new type of configuration sets. @param eConfigType differ between global or module dependend configuration. - + @param sResourceType differ between menubar/toolbar/accelerator/... configuration. @param sModule if sResourceType is set to a module dependend configuration, it address the current application module. - + @param xDocumentRoot if sResourceType is set to E_DOCUMENT, this value points to the root storage inside the document, where we can save our configuration files. Note: Thats not the real root of the document ... - its only a sub storage. But we interpret it as our root storage. + its only a sub storage. But we interpret it as our root storage. @param aLocale in case this configuration supports localized entries, the current locale must be set. - + Localzation will be represented as directory structure of provided presets. Means: you call us with a preset name "default"; and we use e.g. "/en-US/default.xml" internaly. - + If no localization exists for this preset set, this class will work in default mode - means "no locale" - automaticly. e.g. "/default.xml" - + @throw com::sun::star::uno::RuntimeException(!) - if the specified resource couldn't be located. + if the specified resource couldn't be located. */ void connectToResource( EConfigType eConfigType , const ::rtl::OUString& sResourceType , const ::rtl::OUString& sModule , const css::uno::Reference< css::embed::XStorage >& xDocumentRoot , - const ::comphelper::Locale& aLocale = ::comphelper::Locale(::comphelper::Locale::X_NOTRANSLATE())); + const ::comphelper::Locale& aLocale = ::comphelper::Locale(::comphelper::Locale::X_NOTRANSLATE())); //--------------------------------------- /** @short try to copy the specified preset from the share layer to the user layer and establish it as the specified target. - + @descr Means: copy share/.../<preset>.xml user/.../<target>.xml Note: The target will be overwritten completly or created as new by this operation! @param sPreset the ALIAS name of an existing preset. - + @param sTarget - the ALIAS name of the target. - + the ALIAS name of the target. + @throw com::sun::star::container::NoSuchElementException if the specified preset does not exists. - + @throw com::sun::star::io::IOException if copying failed. */ void copyPresetToTarget(const ::rtl::OUString& sPreset, const ::rtl::OUString& sTarget); - + //--------------------------------------- /** @short open the specified preset as stream object and return it. - + @descr Note: Because presets resist inside the share layer, they will be opened readonly everytimes. @@ -389,16 +389,16 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas @param bNoLangGlobal access the global language-independent storage instead of the preset storage - - @return The opened preset stream ... or NULL if the preset does not exists. + + @return The opened preset stream ... or NULL if the preset does not exists. */ css::uno::Reference< css::io::XStream > openPreset(const ::rtl::OUString& sPreset, sal_Bool bUseNoLangGlobal = sal_False); - + //--------------------------------------- /** @short open the specified target as stream object and return it. - + @descr Note: Targets resist inside the user layer. Normaly they are opened in read/write mode. But it will be opened readonly automaticly if that isnt possible @@ -406,124 +406,124 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas @param sTarget the ALIAS name of the target. - + @param bCreateIfMissing create target file, if it does not still exists. Note: That does not means reseting of an existing file! - + @return The opened target stream ... or NULL if the target does not exists or couldnt be created as new one. */ css::uno::Reference< css::io::XStream > openTarget(const ::rtl::OUString& sTarget , sal_Bool bCreateIfMissing); - + //--------------------------------------- /** @short do anything which is neccessary to flush all changes back to disk. - + @descr We have to call commit on all cached sub storages on the path from the root storage upside down to the working storage (which are not realy used, but required to be holded alive!). */ void commitUserChanges(); - + //--------------------------------------- /** TODO */ void addStorageListener(IStorageListener* pListener); void removeStorageListener(IStorageListener* pListener); - + //------------------------------------------- // helper - + private: - + //--------------------------------------- /** @short open a config path ignoring errors (catching exceptions). - + @descr We catch only normal exceptions here - no runtime exceptions. - + @param sPath the configuration path, which should be opened. - + @param eMode the open mode (READ/READWRITE) - + @param bShare force using of the share layer instead of the user layer. - - @return An opened storage in case method was successfully - null otherwise. + + @return An opened storage in case method was successfully - null otherwise. */ css::uno::Reference< css::embed::XStorage > impl_openPathIgnoringErrors(const ::rtl::OUString& sPath , sal_Int32 eMode , sal_Bool bShare); - + //--------------------------------------- /** @short try to find the specified locale inside list of possible ones. - + @descr The lits of possible locale values was e.g. retrieved from the system (configuration, directory listing etcpp). The locale normaly represent the current office locale. This method search for a suitable item by using different algorithm. a) exact search b) search with using fallbacks - + @param lLocalizedValues list of ISO locale codes - + @param aLocale [IN ] the current office locale, which should be searched inside lLocalizedValues. - [OUT] in case fallbacks was allowed, it contains afterwards the fallback locale. - + [OUT] in case fallbacks was allowed, it contains afterwards the fallback locale. + @param bAllowFallbacks enable/disable using of fallbacks - + @return An iterator, which points directly into lLocalizedValue list. As a negative result the special iterator lLocalizedValues.end() will be returned. */ ::std::vector< ::rtl::OUString >::const_iterator impl_findMatchingLocalizedValue(const ::std::vector< ::rtl::OUString >& lLocalizedValues, ::comphelper::Locale& aLocale , sal_Bool bAllowFallbacks ); - + //--------------------------------------- /** @short open a config path ignoring errors (catching exceptions). - + @descr We catch only normal exceptions here - no runtime exceptions. Further the path itself is tries in different versions (using locale specific attributes). e.g. "path/e-US" => "path/en" => "path/de" - + @param sPath the configuration path, which should be opened. Its further used as out parameter too, so we can return the localized path to the calli! - + @param eMode the open mode (READ/READWRITE) - + @param bShare force using of the share layer instead of the user layer. - + @param aLocale [IN ] contains the start locale for searching localized sub dirs. [OUT] contains the locale of a found localized sub dir - + @param bAllowFallback enable/disable fallback handling for locales - - @return An opened storage in case method was successfully - null otherwise. + + @return An opened storage in case method was successfully - null otherwise. */ css::uno::Reference< css::embed::XStorage > impl_openLocalizedPathIgnoringErrors(::rtl::OUString& sPath , sal_Int32 eMode , sal_Bool bShare , ::comphelper::Locale& aLocale , sal_Bool bAllowFallback); - + //--------------------------------------- /** @short returns the names of all sub storages of specified storage. - + @param xFolder the base storage for this operation. - + @return [vector< string >] a list of folder names. */ diff --git a/framework/source/inc/accelerators/storageholder.hxx b/framework/source/inc/accelerators/storageholder.hxx index b604d880d628..291fc29675eb 100644 --- a/framework/source/inc/accelerators/storageholder.hxx +++ b/framework/source/inc/accelerators/storageholder.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,8 +61,8 @@ namespace framework #error "Who defines css? I will use it as namespace alias inside header." #else #define css ::com::sun::star -#endif - +#endif + //=============================================== // definitions @@ -78,21 +78,21 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas /** @short TODO */ typedef ::std::vector< css::uno::Reference< css::embed::XStorage > > TStorageList; - + typedef ::std::vector< IStorageListener* > TStorageListenerList; - + struct TStorageInfo { public: css::uno::Reference< css::embed::XStorage > Storage; sal_Int32 UseCount; TStorageListenerList Listener; - + TStorageInfo() : UseCount(0) - {} + {} }; - + /** @short TODO */ typedef ::std::hash_map< ::rtl::OUString , TStorageInfo , @@ -105,64 +105,64 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas /** @short TODO */ css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR; - + /** @short TODO */ css::uno::Reference< css::embed::XStorage > m_xRoot; - + /** @short TODO */ TPath2StorageInfo m_lStorages; - + //------------------------------------------- // interface public: - + //--------------------------------------- /** @short TODO */ StorageHolder(); - + //--------------------------------------- /** @short TODO */ StorageHolder(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR); - + //--------------------------------------- /** @short TODO */ virtual ~StorageHolder(); - + //--------------------------------------- /** @short TODO */ virtual void forgetCachedStorages(); - + //--------------------------------------- /** @short TODO */ virtual void setRootStorage(const css::uno::Reference< css::embed::XStorage >& xRoot); - + //--------------------------------------- /** @short TODO */ virtual css::uno::Reference< css::embed::XStorage > getRootStorage() const; - + //--------------------------------------- /** @short TODO open or get! */ virtual css::uno::Reference< css::embed::XStorage > openPath(const ::rtl::OUString& sPath , sal_Int32 nOpenMode); - + //--------------------------------------- /** @short TODO */ virtual StorageHolder::TStorageList getAllPathStorages(const ::rtl::OUString& sPath); - + //--------------------------------------- /** @short TODO */ virtual void commitPath(const ::rtl::OUString& sPath); - + //--------------------------------------- /** @short TODO */ @@ -172,19 +172,19 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas /** @short TODO */ virtual void notifyPath(const ::rtl::OUString& sPath); - + //--------------------------------------- /** @short TODO */ virtual void addStorageListener( IStorageListener* pListener, const ::rtl::OUString& sPath ); - + //--------------------------------------- /** @short TODO */ virtual void removeStorageListener( IStorageListener* pListener, const ::rtl::OUString& sPath ); - + //--------------------------------------- /** @short TODO */ @@ -194,7 +194,7 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas /** @short TODO */ virtual css::uno::Reference< css::embed::XStorage > getParentStorage(const css::uno::Reference< css::embed::XStorage >& xChild); - + //--------------------------------------- /** @short TODO */ @@ -204,30 +204,30 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas /** @short TODO */ virtual void operator=(const StorageHolder& rCopy); - + //--------------------------------------- /** @short opens a sub element of the specified base storage. - + @descr First this method try to open the requested sub element using the given open mode. If it failed there is second step, which tries to do the same again ... but removing a might existing WRITE flag from the open mode. The user can supress this fallback handling by setting the parameter bAllowFallback to FALSE. - + @param xBaseStorage the storage, where the sub element should be searched. - + @param sSubElement the full name of the sub element. e.g. "default.xml" - + @param eOpenMode a flag field, which set the open mode for this operation. - + @param bAllowFallback if eOpenMode contains an ELEMENT_WRITE flag this parameter allow to remove it and try it with the rest of eOpenMode flags - again. + again. */ static css::uno::Reference< css::embed::XStorage > openSubStorageWithFallback(const css::uno::Reference< css::embed::XStorage >& xBaseStorage , const ::rtl::OUString& sSubStorage , @@ -238,7 +238,7 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas const ::rtl::OUString& sSubStream , sal_Int32 eOpenMode , sal_Bool bAllowFallback); - + //--------------------------------------- // helper private: @@ -247,11 +247,11 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas /** @short TODO */ static ::rtl::OUString impl_st_normPath(const ::rtl::OUString& sPath); - + //----------------------------------- /** @short TODO */ - static OUStringList impl_st_parsePath(const ::rtl::OUString& sPath); + static OUStringList impl_st_parsePath(const ::rtl::OUString& sPath); }; #undef css // dont let it out! diff --git a/framework/source/inc/constant/containerquery.hxx b/framework/source/inc/constant/containerquery.hxx index c2307d5877bd..4d51b2586efe 100644 --- a/framework/source/inc/constant/containerquery.hxx +++ b/framework/source/inc/constant/containerquery.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/source/inc/constant/contenthandler.hxx b/framework/source/inc/constant/contenthandler.hxx index ed6c92854c75..db10575ce8e7 100644 --- a/framework/source/inc/constant/contenthandler.hxx +++ b/framework/source/inc/constant/contenthandler.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/source/inc/constant/frameloader.hxx b/framework/source/inc/constant/frameloader.hxx index 85beec93e30f..58e03638d3b2 100644 --- a/framework/source/inc/constant/frameloader.hxx +++ b/framework/source/inc/constant/frameloader.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/source/inc/dispatch/loaddispatcher.hxx b/framework/source/inc/dispatch/loaddispatcher.hxx index b0619fb11492..63ec4c4f28f0 100644 --- a/framework/source/inc/dispatch/loaddispatcher.hxx +++ b/framework/source/inc/dispatch/loaddispatcher.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/source/inc/dispatch/uieventloghelper.hxx b/framework/source/inc/dispatch/uieventloghelper.hxx index 18ddb050ecf8..f2f0f6c95025 100644 --- a/framework/source/inc/dispatch/uieventloghelper.hxx +++ b/framework/source/inc/dispatch/uieventloghelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,7 +59,7 @@ namespace framework { try { - static ::rtl::OUString our_aModuleManagerName = SERVICENAME_MODULEMANAGER; + static ::rtl::OUString our_aModuleManagerName = SERVICENAME_MODULEMANAGER; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModuleManager > xModuleManager( rServiceManager->createInstance(our_aModuleManagerName) , ::com::sun::star::uno::UNO_QUERY_THROW); @@ -79,4 +79,4 @@ namespace framework }; } -#endif // __FRAMEWORK_DISPATCH_UIEVENTLOGHELPER_HXX_ +#endif // __FRAMEWORK_DISPATCH_UIEVENTLOGHELPER_HXX_ diff --git a/framework/source/inc/dispatch/windowcommanddispatch.hxx b/framework/source/inc/dispatch/windowcommanddispatch.hxx index 2479e4f19ab1..0844dd74bf02 100755 --- a/framework/source/inc/dispatch/windowcommanddispatch.hxx +++ b/framework/source/inc/dispatch/windowcommanddispatch.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,10 +78,10 @@ class WindowCommandDispatch : private ThreadHelpBase // const private: - + /// dispatch URL to trigger our "Tools->Options" dialog static const ::rtl::OUString COMMAND_PREFERENCES; - + /// dispatch URL to trigger our About box static const ::rtl::OUString COMMAND_ABOUTBOX; @@ -95,17 +95,17 @@ class WindowCommandDispatch : private ThreadHelpBase /// knows the frame, where we dispatch our commands as weak reference css::uno::WeakReference< css::frame::XFrame > m_xFrame; - + /// knows the VCL window (where the hard coded commands occured) as weak XWindow reference css::uno::WeakReference< css::awt::XWindow > m_xWindow; - + //___________________________________________ // native interface public: //_______________________________________ - + /** @short creates a new instance and initialize it with all necessary parameters. @descr Every instance of such MACDispatch can be used for the specified context only. @@ -135,33 +135,33 @@ class WindowCommandDispatch : private ThreadHelpBase // XEventListener virtual void SAL_CALL disposing(const css::lang::EventObject& aSource) throw (css::uno::RuntimeException); - + //___________________________________________ // implementation private: - + //_______________________________________ - + /** @short establish all listener connections we need. - + @descr Those listener connections will be created one times only (see ctor). Afterwards we listen for incoming events till our referred frame/window pair will be closed. All objects die by refcount automatically. Because we hold it weak ... */ void impl_startListening(); - + //_______________________________________ - + /** @short callback from VCL to notify new commands */ DECL_LINK( impl_notifyCommand, void* ); - + //_______________________________________ - + /** @short dispatch right command URLs into our frame context. - + @param sCommand the command for dispatch */ diff --git a/framework/source/inc/loadenv/actionlockguard.hxx b/framework/source/inc/loadenv/actionlockguard.hxx index ff41f0f58467..5e1eaf64036d 100644 --- a/framework/source/inc/loadenv/actionlockguard.hxx +++ b/framework/source/inc/loadenv/actionlockguard.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx index 60c3c317e07d..982f390f8469 100644 --- a/framework/source/inc/loadenv/loadenv.hxx +++ b/framework/source/inc/loadenv/loadenv.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -229,7 +229,7 @@ class LoadEnv : private ThreadHelpBase /** TODO document me ... */ void* m_pCheck; - QuietInteraction* m_pQuietInteraction; + QuietInteraction* m_pQuietInteraction; //___________________________________________ // native interface diff --git a/framework/source/inc/loadenv/loadenvexception.hxx b/framework/source/inc/loadenv/loadenvexception.hxx index 8af58d4c898d..bb26e98f4695 100644 --- a/framework/source/inc/loadenv/loadenvexception.hxx +++ b/framework/source/inc/loadenv/loadenvexception.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/source/inc/loadenv/targethelper.hxx b/framework/source/inc/loadenv/targethelper.hxx index 7fb01a7fd037..179ec117ab19 100644 --- a/framework/source/inc/loadenv/targethelper.hxx +++ b/framework/source/inc/loadenv/targethelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/source/inc/pattern/configuration.hxx b/framework/source/inc/pattern/configuration.hxx index b2de45fef2d5..7cb9280ef0e2 100644 --- a/framework/source/inc/pattern/configuration.hxx +++ b/framework/source/inc/pattern/configuration.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,40 +69,40 @@ class ConfigurationHelper //------------------------------------------- // const public: - + //--------------------------------------- /** @short allow opening of a configuration access in different working modes. - + @descr All enum values must be useable as flags mapped into a int32 value! */ enum EOpenMode { - /// open it readonly (default=readwrite!) + /// open it readonly (default=readwrite!) E_READONLY = 1, /// disable fallback handling for localized cfg nodes E_ALL_LOCALES = 2 }; - + //------------------------------------------- // interface public: - + //--------------------------------------- /** @short opens a configuration access. - + @descr TODO - + @param xSMGR this method need an uno service manager for internal work. - + @param sPackage name the configuration file. e.g. "/.org.openoffice.Setup" Note: It must start with "/" but end without(!) "/"! - + @param sRelPath describe the relativ path of the requested key inside the specified package. @@ -110,7 +110,7 @@ class ConfigurationHelper Note: Its not allowed to start or end with a "/"! Further you must use encoded path elements if e.g. set nodes are involved. - + @param nOpenFlags force opening of the configuration access in special mode. see enum EOpenMode for further informations. @@ -121,50 +121,50 @@ class ConfigurationHelper sal_Int32 nOpenFlags) { static ::rtl::OUString PATH_SEPERATOR = ::rtl::OUString::createFromAscii("/"); - + css::uno::Reference< css::uno::XInterface > xCFG; - + try { css::uno::Reference< css::lang::XMultiServiceFactory > xConfigProvider( xSMGR->createInstance(SERVICENAME_CFGPROVIDER), css::uno::UNO_QUERY_THROW); - + ::rtl::OUStringBuffer sPath(1024); sPath.append(sPackage ); sPath.append(PATH_SEPERATOR); sPath.append(sRelPath ); - sal_Bool bReadOnly = ((nOpenFlags & ConfigurationHelper::E_READONLY ) == ConfigurationHelper::E_READONLY ); - sal_Bool bAllLocales = ((nOpenFlags & ConfigurationHelper::E_ALL_LOCALES) == ConfigurationHelper::E_ALL_LOCALES); - + sal_Bool bReadOnly = ((nOpenFlags & ConfigurationHelper::E_READONLY ) == ConfigurationHelper::E_READONLY ); + sal_Bool bAllLocales = ((nOpenFlags & ConfigurationHelper::E_ALL_LOCALES) == ConfigurationHelper::E_ALL_LOCALES); + sal_Int32 c = 1; if (bAllLocales) c = 2; - + css::uno::Sequence< css::uno::Any > lParams(c); css::beans::PropertyValue aParam; - + aParam.Name = ::rtl::OUString::createFromAscii("nodepath"); aParam.Value <<= sPath.makeStringAndClear(); lParams[0] <<= aParam; - + if (bAllLocales) { aParam.Name = ::rtl::OUString::createFromAscii("*"); aParam.Value <<= sal_True; lParams[1] <<= aParam; } - + if (bReadOnly) xCFG = xConfigProvider->createInstanceWithArguments(SERVICENAME_CFGREADACCESS, lParams); - else + else xCFG = xConfigProvider->createInstanceWithArguments(SERVICENAME_CFGUPDATEACCESS, lParams); } catch(const css::uno::RuntimeException& exRun) { throw exRun; } catch(const css::uno::Exception&) { xCFG.clear(); } - + return xCFG; } }; diff --git a/framework/source/inc/pattern/frame.hxx b/framework/source/inc/pattern/frame.hxx index 1cced6e7b496..3ffbfaeaebdc 100644 --- a/framework/source/inc/pattern/frame.hxx +++ b/framework/source/inc/pattern/frame.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,7 +68,7 @@ inline css::uno::Reference< css::frame::XModel > extractFrameModel(const css::un xController = xFrame->getController(); if (xController.is()) xModel = xController->getModel(); - return xModel; + return xModel; } //----------------------------------------------- @@ -80,26 +80,26 @@ inline css::uno::Reference< css::frame::XModel > extractFrameModel(const css::un needed interface isnt available) dispose() is tried instead. Al possible exception are handled inside. So the user of this method has to look for the return value only. - + @attention The given resource will not be cleared. But later using of it can produce an exception! - + @param xResource the object, which should be closed here. - + @param bDelegateOwnerShip used at the XCloseable->close() method to define the right owner in case closing failed. - + @return [bool] - TRUE if closing failed. + TRUE if closing failed. */ inline sal_Bool closeIt(const css::uno::Reference< css::uno::XInterface >& xResource , sal_Bool bDelegateOwnerShip) { css::uno::Reference< css::util::XCloseable > xClose (xResource, css::uno::UNO_QUERY); css::uno::Reference< css::lang::XComponent > xDispose(xResource, css::uno::UNO_QUERY); - + try { if (xClose.is()) @@ -122,7 +122,7 @@ inline sal_Bool closeIt(const css::uno::Reference< css::uno::XInterface >& xReso return sal_True; } - + } // namespace frame } // namespace pattern } // namespace framework diff --git a/framework/source/inc/pattern/storages.hxx b/framework/source/inc/pattern/storages.hxx index d654bb3572d9..a785e307995d 100644 --- a/framework/source/inc/pattern/storages.hxx +++ b/framework/source/inc/pattern/storages.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,15 +69,15 @@ css::uno::Reference< css::embed::XStorage > createTempStorageBasedOnFolder(const // error during opening the temp file isnt realy a runtime error -> handle it gracefully css::uno::Reference< css::io::XOutputStream > xTempFile(xSMGR->createInstance(SERVICENAME_TEMPFILE), css::uno::UNO_QUERY); if (!xTempFile.is()) - return css::uno::Reference< css::embed::XStorage >(); + return css::uno::Reference< css::embed::XStorage >(); - // creation of needed resources is mandatory -> error = runtime error + // creation of needed resources is mandatory -> error = runtime error css::uno::Reference< css::embed::XPackageStructureCreator > xPackageCreator(xSMGR->createInstance(SERVICENAME_PACKAGESTRUCTURECREATOR), css::uno::UNO_QUERY_THROW); css::uno::Reference< css::lang::XSingleServiceFactory > xStorageFactory(xSMGR->createInstance(SERVICENAME_STORAGEFACTORY) , css::uno::UNO_QUERY_THROW); // create zip package xPackageCreator->convertToPackage(sFolder, xTempFile); - + // seek it back - so it can be used in a defined way. css::uno::Reference< css::io::XSeekable > xSeekable(xTempFile, css::uno::UNO_QUERY_THROW); xSeekable->seek(0); @@ -86,15 +86,15 @@ css::uno::Reference< css::embed::XStorage > createTempStorageBasedOnFolder(const sal_Int32 nOpenMode = css::embed::ElementModes::ELEMENT_READWRITE; if (bReadOnly) nOpenMode = css::embed::ElementModes::ELEMENT_READ; - + css::uno::Sequence< css::uno::Any > lArgs(2); lArgs[0] <<= xTempFile; lArgs[1] <<= nOpenMode; - + css::uno::Reference< css::embed::XStorage > xStorage(xStorageFactory->createInstanceWithArguments(lArgs), css::uno::UNO_QUERY_THROW); return xStorage; } - + } // namespace storages } // namespace pattern } // namespace framework diff --git a/framework/source/inc/pattern/window.hxx b/framework/source/inc/pattern/window.hxx index 49d6ddbb5ef5..619ce140d491 100644 --- a/framework/source/inc/pattern/window.hxx +++ b/framework/source/inc/pattern/window.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ #include <vcl/wrkwin.hxx> #include <vcl/svapp.hxx> #include <vos/mutex.hxx> -#include <rtl/ustring.hxx> +#include <rtl/ustring.hxx> //_______________________________________________ // namespaces @@ -64,7 +64,7 @@ namespace framework{ // definitions class WindowHelper -{ +{ public: //----------------------------------------------- @@ -75,7 +75,7 @@ static ::rtl::OUString getWindowState(const css::uno::Reference< css::awt::XWind // SOLAR SAFE -> ---------------------------- ::vos::OClearableGuard aSolarGuard(Application::GetSolarMutex()); - + ByteString sWindowState; Window* pWindow = VCLUnoHelper::GetWindow(xWindow); // check for system window is neccessary to guarantee correct pointer cast! @@ -104,7 +104,7 @@ static void setWindowState(const css::uno::Reference< css::awt::XWindow >& xWind // SOLAR SAFE -> ---------------------------- ::vos::OClearableGuard aSolarGuard(Application::GetSolarMutex()); - + Window* pWindow = VCLUnoHelper::GetWindow(xWindow); // check for system window is neccessary to guarantee correct pointer cast! if ( @@ -116,10 +116,10 @@ static void setWindowState(const css::uno::Reference< css::awt::XWindow >& xWind (!((WorkWindow*)pWindow)->IsMinimized() ) ) ) - { + { ((SystemWindow*)pWindow)->SetWindowState(U2B_ENC(sWindowState,RTL_TEXTENCODING_UTF8)); } - + aSolarGuard.clear(); // <- SOLAR SAFE ---------------------------- } @@ -139,7 +139,7 @@ static ::sal_Bool isTopWindow(const css::uno::Reference< css::awt::XWindow >& xW ::vos::OGuard aSolarLock(&Application::GetSolarMutex()); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( - (pWindow ) && + (pWindow ) && (pWindow->IsSystemWindow()) ) return sal_True; diff --git a/framework/source/interaction/preventduplicateinteraction.cxx b/framework/source/interaction/preventduplicateinteraction.cxx index d032aa1f24a6..6d0185a48080 100644 --- a/framework/source/interaction/preventduplicateinteraction.cxx +++ b/framework/source/interaction/preventduplicateinteraction.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,21 +31,21 @@ #include "interaction/preventduplicateinteraction.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/task/XInteractionAbort.hpp> #include <com/sun/star/task/XInteractionRetry.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ @@ -53,13 +53,13 @@ namespace framework{ namespace css = ::com::sun::star; //_________________________________________________________________________________________________________________ -// exported const +// exported const //_________________________________________________________________________________________________________________ #define IMPLEMENTATIONNAME_UIINTERACTIONHANDLER ::rtl::OUString::createFromAscii("com.sun.star.comp.uui.UUIInteractionHandler") //_________________________________________________________________________________________________________________ -// exported definitions +// exported definitions //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ diff --git a/framework/source/interaction/quietinteraction.cxx b/framework/source/interaction/quietinteraction.cxx index 14357a8d13bc..d5d11ebc2097 100644 --- a/framework/source/interaction/quietinteraction.cxx +++ b/framework/source/interaction/quietinteraction.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ #include "interaction/quietinteraction.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/readguard.hxx> #include <threadhelp/writeguard.hxx> @@ -39,7 +39,7 @@ #include <macros/debug.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/task/XInteractionAbort.hpp> #include <com/sun/star/task/XInteractionApprove.hpp> @@ -54,7 +54,7 @@ #endif //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> @@ -63,17 +63,17 @@ #endif //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// exported const +// exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// exported definitions +// exported definitions //_________________________________________________________________________________________________________________ DEFINE_XINTERFACE_2( QuietInteraction , diff --git a/framework/source/jobs/configaccess.cxx b/framework/source/jobs/configaccess.cxx index 39ee0f9b66e5..95226268ce2b 100644 --- a/framework/source/jobs/configaccess.cxx +++ b/framework/source/jobs/configaccess.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //________________________________ -// my own includes +// my own includes #include <jobs/configaccess.hxx> #include <threadhelp/readguard.hxx> #include <threadhelp/writeguard.hxx> @@ -38,7 +38,7 @@ #include <services.h> //________________________________ -// interface includes +// interface includes #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XMultiHierarchicalPropertySet.hpp> #include <com/sun/star/container/XNameAccess.hpp> @@ -46,23 +46,23 @@ #include <com/sun/star/util/XChangesBatch.hpp> //________________________________ -// includes of other projects +// includes of other projects #include <unotools/configpathes.hxx> #include <rtl/ustrbuf.hxx> //________________________________ -// namespace +// namespace namespace framework{ //________________________________ -// non exported const +// non exported const //________________________________ -// non exported definitions +// non exported definitions //________________________________ -// declarations +// declarations //________________________________ /** diff --git a/framework/source/jobs/helponstartup.cxx b/framework/source/jobs/helponstartup.cxx index af4675ed354a..93ea64e94cb4 100644 --- a/framework/source/jobs/helponstartup.cxx +++ b/framework/source/jobs/helponstartup.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -98,18 +98,18 @@ DEFINE_INIT_SERVICE(HelpOnStartup, m_xModuleManager = css::uno::Reference< css::frame::XModuleManager >( m_xSMGR->createInstance(SERVICENAME_MODULEMANAGER), css::uno::UNO_QUERY_THROW); - + m_xDesktop = css::uno::Reference< css::frame::XFrame >( m_xSMGR->createInstance(SERVICENAME_DESKTOP), css::uno::UNO_QUERY_THROW); - + m_xConfig = css::uno::Reference< css::container::XNameAccess >( ::comphelper::ConfigurationHelper::openConfig( m_xSMGR, CFG_PACKAGE_MODULES, ::comphelper::ConfigurationHelper::E_READONLY), css::uno::UNO_QUERY_THROW); - + // ask for office locale ::comphelper::ConfigurationHelper::readDirectKey( m_xSMGR, @@ -117,7 +117,7 @@ DEFINE_INIT_SERVICE(HelpOnStartup, CFG_PATH_L10N, CFG_KEY_LOCALE, ::comphelper::ConfigurationHelper::E_READONLY) >>= m_sLocale; - + // detect system ::comphelper::ConfigurationHelper::readDirectKey( m_xSMGR, @@ -125,7 +125,7 @@ DEFINE_INIT_SERVICE(HelpOnStartup, CFG_PATH_HELP, CFG_KEY_HELPSYSTEM, ::comphelper::ConfigurationHelper::E_READONLY) >>= m_sSystem; - + // Start listening for disposing events of these services, // so we can react e.g. for an office shutdown css::uno::Reference< css::lang::XComponent > xComponent; @@ -140,7 +140,7 @@ DEFINE_INIT_SERVICE(HelpOnStartup, xComponent->addEventListener(static_cast< css::lang::XEventListener* >(this)); } ) - + //----------------------------------------------- HelpOnStartup::HelpOnStartup(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR) : ThreadHelpBase( ) @@ -172,7 +172,7 @@ css::uno::Any SAL_CALL HelpOnStartup::execute(const css::uno::Sequence< css::bea // check current state of the help module // a) help isnt open => show default page for the detected module // b) help shows any other default page(!) => show default page for the detected module - // c) help shows any other content => do nothing (user travelled to any other content and leaved the set of default pages) + // c) help shows any other content => do nothing (user travelled to any other content and leaved the set of default pages) ::rtl::OUString sCurrentHelpURL = its_getCurrentHelpURL(); sal_Bool bCurrentHelpURLIsAnyDefaultURL = its_isHelpUrlADefaultOne(sCurrentHelpURL); sal_Bool bShowIt = sal_False; diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx index e8961b0f9703..7ae2452874be 100644 --- a/framework/source/jobs/job.cxx +++ b/framework/source/jobs/job.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //________________________________ -// my own includes +// my own includes #include <jobs/job.hxx> #include <threadhelp/readguard.hxx> #include <threadhelp/writeguard.hxx> @@ -37,7 +37,7 @@ #include <services.h> //________________________________ -// interface includes +// interface includes #include <com/sun/star/task/XJob.hpp> #include <com/sun/star/task/XAsyncJob.hpp> #include <com/sun/star/util/XCloseBroadcaster.hpp> @@ -45,23 +45,23 @@ #include <com/sun/star/lang/DisposedException.hpp> //________________________________ -// includes of other projects +// includes of other projects #include <rtl/ustrbuf.hxx> #include <vcl/svapp.hxx> //________________________________ -// namespace +// namespace namespace framework{ //________________________________ -// non exported const +// non exported const //________________________________ -// non exported definitions +// non exported definitions //________________________________ -// declarations +// declarations DEFINE_XINTERFACE_4( Job , OWeakObject , diff --git a/framework/source/jobs/jobconst.cxx b/framework/source/jobs/jobconst.cxx index 4b895c60ca77..b71a68342a69 100644 --- a/framework/source/jobs/jobconst.cxx +++ b/framework/source/jobs/jobconst.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,29 +29,29 @@ #include "precompiled_framework.hxx" //________________________________ -// my own includes +// my own includes #include <jobs/jobconst.hxx> //________________________________ -// interface includes +// interface includes //________________________________ -// includes of other projects +// includes of other projects //________________________________ -// namespace +// namespace namespace framework{ //________________________________ -// non exported const +// non exported const //________________________________ -// non exported definitions +// non exported definitions //________________________________ -// declarations +// declarations const ::rtl::OUString JobConst::ANSWER_DEACTIVATE_JOB() { diff --git a/framework/source/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx index 6d48c3c2ac3f..4acbce44f831 100644 --- a/framework/source/jobs/jobdata.cxx +++ b/framework/source/jobs/jobdata.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //________________________________ -// my own includes +// my own includes #include <jobs/jobdata.hxx> #include <threadhelp/readguard.hxx> #include <threadhelp/writeguard.hxx> @@ -38,21 +38,21 @@ #include <services.h> //________________________________ -// interface includes +// interface includes #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XMultiHierarchicalPropertySet.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XHierarchicalNameAccess.hpp> //________________________________ -// includes of other projects +// includes of other projects #include <tools/wldcrd.hxx> #include <unotools/configpathes.hxx> #include <rtl/ustrbuf.hxx> #include <vcl/svapp.hxx> //________________________________ -// namespace +// namespace namespace framework{ @@ -81,10 +81,10 @@ const sal_Char* JobData::PROP_MODEL = "Model" const sal_Char* JobData::PROP_SERVICE = "Service" ; //________________________________ -// non exported definitions +// non exported definitions //________________________________ -// declarations +// declarations //________________________________ /** diff --git a/framework/source/jobs/jobdispatch.cxx b/framework/source/jobs/jobdispatch.cxx index b9e7f6ee1da0..b2c5399d0216 100644 --- a/framework/source/jobs/jobdispatch.cxx +++ b/framework/source/jobs/jobdispatch.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //________________________________ -// my own includes +// my own includes #include <jobs/jobdispatch.hxx> #include <jobs/joburl.hxx> #include <jobs/job.hxx> @@ -41,28 +41,28 @@ #include <services.h> //________________________________ -// interface includes +// interface includes #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/frame/DispatchResultState.hpp> //________________________________ -// includes of other projects +// includes of other projects #include <rtl/ustrbuf.hxx> #include <vcl/svapp.hxx> //________________________________ -// namespace +// namespace namespace framework{ //________________________________ -// non exported const +// non exported const //________________________________ -// non exported definitions +// non exported definitions //________________________________ -// declarations +// declarations DEFINE_XINTERFACE_6( JobDispatch , OWeakObject , diff --git a/framework/source/jobs/jobexecutor.cxx b/framework/source/jobs/jobexecutor.cxx index 5bb7acc7c9f2..e3a6122d4938 100644 --- a/framework/source/jobs/jobexecutor.cxx +++ b/framework/source/jobs/jobexecutor.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //________________________________ -// my own includes +// my own includes #include <jobs/jobexecutor.hxx> #include <jobs/job.hxx> #include <jobs/joburl.hxx> @@ -44,13 +44,13 @@ #include <services.h> //________________________________ -// interface includes +// interface includes #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XContainer.hpp> //________________________________ -// includes of other projects +// includes of other projects #include <unotools/configpathes.hxx> #include <rtl/ustrbuf.hxx> #include <vcl/svapp.hxx> @@ -58,18 +58,18 @@ #include <rtl/logfile.hxx> //________________________________ -// namespace +// namespace namespace framework{ //________________________________ -// non exported const +// non exported const //________________________________ -// non exported definitions +// non exported definitions //________________________________ -// declarations +// declarations DEFINE_XINTERFACE_6( JobExecutor , OWeakObject , @@ -270,7 +270,7 @@ void SAL_CALL JobExecutor::notifyEvent( const css::document::EventObject& aEvent aReadLock.lock(); const JobData::TJob2DocEventBinding& rBinding = *pIt; - + JobData aCfg(m_xSMGR); aCfg.setEvent(rBinding.m_sDocEvent, rBinding.m_sJobName); aCfg.setEnvironment(JobData::E_DOCUMENTEVENT); diff --git a/framework/source/jobs/jobresult.cxx b/framework/source/jobs/jobresult.cxx index 98b657794f03..375a3e5fc4d6 100644 --- a/framework/source/jobs/jobresult.cxx +++ b/framework/source/jobs/jobresult.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //________________________________ -// my own includes +// my own includes #include <jobs/jobresult.hxx> #include <jobs/jobconst.hxx> @@ -39,28 +39,28 @@ #include <services.h> //________________________________ -// interface includes +// interface includes //________________________________ -// includes of other projects +// includes of other projects #include <rtl/ustrbuf.hxx> #include <vcl/svapp.hxx> #include <comphelper/sequenceashashmap.hxx> //________________________________ -// namespace +// namespace namespace framework{ //________________________________ -// non exported const +// non exported const //________________________________ -// non exported definitions +// non exported definitions //________________________________ -// declarations +// declarations //________________________________ /** @@ -139,7 +139,7 @@ JobResult::JobResult( /*IN*/ const css::uno::Any& aResult ) return; ::comphelper::SequenceAsHashMap::const_iterator pIt = aProtocol.end(); - + pIt = aProtocol.find(JobConst::ANSWER_DEACTIVATE_JOB()); if (pIt != aProtocol.end()) { @@ -147,7 +147,7 @@ JobResult::JobResult( /*IN*/ const css::uno::Any& aResult ) if (m_bDeactivate) m_eParts |= E_DEACTIVATE; } - + pIt = aProtocol.find(JobConst::ANSWER_SAVE_ARGUMENTS()); if (pIt != aProtocol.end()) { diff --git a/framework/source/jobs/joburl.cxx b/framework/source/jobs/joburl.cxx index 085fc7d46674..59e6384a0e93 100644 --- a/framework/source/jobs/joburl.cxx +++ b/framework/source/jobs/joburl.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/source/jobs/shelljob.cxx b/framework/source/jobs/shelljob.cxx index e6905f77ed31..b7b6d370bb40 100644 --- a/framework/source/jobs/shelljob.cxx +++ b/framework/source/jobs/shelljob.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -91,7 +91,7 @@ DEFINE_INIT_SERVICE(ShellJob, */ } ) - + //----------------------------------------------- ShellJob::ShellJob(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR) : ThreadHelpBase( ) @@ -120,7 +120,7 @@ css::uno::Any SAL_CALL ShellJob::execute(const css::uno::Sequence< css::beans::N // replace all might existing place holder. ::rtl::OUString sRealCommand = impl_substituteCommandVariables(sCommand); - + // Command is required as minimum. // If it does not exists ... we cant do our job. // Deactivate such miss configured job silently .-) @@ -131,12 +131,12 @@ css::uno::Any SAL_CALL ShellJob::execute(const css::uno::Sequence< css::beans::N ::sal_Bool bDone = impl_execute(sRealCommand, lCommandArguments, bCheckExitCode); if (! bDone) return css::uno::Any(); - + // Job was done ... user configured deactivation of this job // in such case. if (bDeactivateJobIfDone) return ShellJob::impl_generateAnswer4Deactivation(); - + // There was no decision about deactivation of this job. // So we have to return nothing here ! return css::uno::Any(); @@ -164,9 +164,9 @@ css::uno::Any ShellJob::impl_generateAnswer4Deactivation() try { css::uno::Reference< css::util::XStringSubstitution > xSubst ( xSMGR->createInstance(SERVICENAME_SUBSTITUTEPATHVARIABLES), css::uno::UNO_QUERY_THROW); - const ::sal_Bool bSubstRequired = sal_True; - const ::rtl::OUString sCompleteCommand = xSubst->substituteVariables(sCommand, bSubstRequired); - + const ::sal_Bool bSubstRequired = sal_True; + const ::rtl::OUString sCompleteCommand = xSubst->substituteVariables(sCommand, bSubstRequired); + return sCompleteCommand; } catch(const css::uno::Exception&) @@ -187,7 +187,7 @@ css::uno::Any ShellJob::impl_generateAnswer4Deactivation() if (nArgs > 0) pArgs = reinterpret_cast< ::rtl_uString** >(const_cast< ::rtl::OUString* >(lArguments.getConstArray())); - + oslProcessError eError = osl_executeProcess(sCommand.pData, pArgs, nArgs, nOptions, NULL, NULL, NULL, 0, &hProcess); // executable not found or couldnt be started diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 1b0cd5717ad9..f72759891acb 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ // #include <math.h> @@ -54,7 +54,7 @@ #include <uiconfiguration/globalsettings.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> @@ -82,7 +82,7 @@ #include <com/sun/star/lang/DisposedException.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <svtools/imgdef.hxx> #include <tools/diagnose_ex.h> @@ -103,7 +103,7 @@ #include <algorithm> #include <boost/bind.hpp> // ______________________________________________ -// using namespace +// using namespace using namespace ::com::sun::star; using namespace com::sun::star::uno; @@ -130,7 +130,7 @@ bool lcl_checkUIElement(const Reference< XUIElement >& xUIElement,css::awt::Rect bool bRet = xUIElement.is(); if ( bRet ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); _xWindow.set( xUIElement->getRealInterface(), UNO_QUERY ); _rPosSize = _xWindow->getPosSize(); @@ -159,7 +159,7 @@ static WindowAlign ImplConvertAlignment( sal_Int16 aAlignment ) } //_________________________________________________________________________________________________________________ -// Namespace +// Namespace //_________________________________________________________________________________________________________________ // @@ -346,14 +346,14 @@ static void impl_setDockingWindowVisibility( const css::uno::Reference< css::lan } //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** IMPLEMENT_FORWARD_XTYPEPROVIDER2( LayoutManager, LayoutManager_Base, LayoutManager_PBase ) IMPLEMENT_FORWARD_XINTERFACE2( LayoutManager, LayoutManager_Base, LayoutManager_PBase ) -DEFINE_XSERVICEINFO_MULTISERVICE ( LayoutManager , +DEFINE_XSERVICEINFO_MULTISERVICE ( LayoutManager , ::cppu::OWeakObject , - SERVICENAME_LAYOUTMANAGER , + SERVICENAME_LAYOUTMANAGER , IMPLEMENTATIONNAME_LAYOUTMANAGER ) @@ -455,7 +455,7 @@ void LayoutManager::impl_clearUpMenuBar() // Clear up VCL menu bar to prepare shutdown if ( m_xContainerWindow.is() ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Window* pWindow = VCLUnoHelper::GetWindow( m_xContainerWindow ); while ( pWindow && !pWindow->IsSystemWindow() ) @@ -828,7 +828,7 @@ void LayoutManager::implts_createCustomToolBar( const rtl::OUString& aTbxResName Reference< XUIElement > xUIElement = getElement( aTbxResName ); if ( xUIElement.is() ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Reference< css::awt::XWindow > xWindow( xUIElement->getRealInterface(), UNO_QUERY ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); @@ -1011,7 +1011,7 @@ void LayoutManager::implts_createAddonsToolBars() if ( xWindow.is() ) { // Set generic title for add-on toolbar - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow->GetText().Len() == 0 ) pWindow->SetText( aGenericAddonTitle ); @@ -1126,7 +1126,7 @@ void LayoutManager::implts_toggleFloatingUIElementsVisibility( sal_Bool bActive if ( xDockWindow.is() && xWindow.is() ) { sal_Bool bVisible( sal_True ); - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow ) bVisible = pWindow->IsVisible(); @@ -1613,7 +1613,7 @@ void LayoutManager::implts_setElementData( UIElement& rElement, const Reference< if ( xDockWindow.is() && xWindow.is() ) { { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow ) { @@ -1640,7 +1640,7 @@ void LayoutManager::implts_setElementData( UIElement& rElement, const Reference< { if ( pWindow ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); String aText = pWindow->GetText(); if ( aText.Len() == 0 ) pWindow->SetText( rElement.m_aUIName ); @@ -1689,7 +1689,7 @@ void LayoutManager::implts_setElementData( UIElement& rElement, const Reference< implts_writeWindowStateData( rElement.m_aName, rElement ); if ( bShowElement && pWindow ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); pWindow->Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE ); } } @@ -1702,7 +1702,7 @@ void LayoutManager::implts_setElementData( UIElement& rElement, const Reference< if ( pToolBox ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); pToolBox->SetAlign( ImplConvertAlignment(rElement.m_aDockedData.m_nDockedArea ) ); pToolBox->SetLineCount( 1 ); if ( rElement.m_aDockedData.m_bLocked ) @@ -1730,7 +1730,7 @@ void LayoutManager::implts_setElementData( UIElement& rElement, const Reference< if ( bShowElement && pWindow ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); pWindow->Show( sal_True ); } } @@ -1757,7 +1757,7 @@ void LayoutManager::implts_setElementData( UIElement& rElement, const Reference< Window* pContainerWindow( 0 ); if ( xContainerWindow.is() ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow ); if ( pContainerWindow ) aStartPos = pContainerWindow->OutputToScreenPixel( aStartPos ); @@ -1781,7 +1781,7 @@ void LayoutManager::implts_setElementData( UIElement& rElement, const Reference< Reference< css::awt::XWindow > xWindow( xDockWindow, UNO_QUERY ); if ( xDockWindow.is() && xDockWindow->isFloating() ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow && pWindow->IsVisible() ) { @@ -1816,7 +1816,7 @@ void LayoutManager::implts_findNextDockingPos( DockingArea DockingArea, const :: { // Retrieve output size from container Window - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); pDockingWindow = VCLUnoHelper::GetWindow( xDockingWindow ); if ( pDockingWindow ) aDockingWinSize = pDockingWindow->GetOutputSizePixel(); @@ -1961,7 +1961,7 @@ void LayoutManager::implts_findNextDockingPos( DockingArea DockingArea, const :: aReadLock.unlock(); // Retrieve output size from container Window - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow ); if ( pContainerWindow ) return pContainerWindow->GetOutputSizePixel(); @@ -2207,7 +2207,7 @@ void LayoutManager::implts_getDockingAreaElementInfoOnSingleRowCol( DockingArea Reference< css::awt::XWindow > xWindow( xUIElement->getRealInterface(), UNO_QUERY ); if ( xWindow.is() ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); Reference< css::awt::XDockableWindow > xDockWindow( xWindow, UNO_QUERY ); if ( pWindow && pIter->m_bVisible && xDockWindow.is() && !pIter->m_bFloating ) @@ -2383,7 +2383,7 @@ void LayoutManager::implts_getDockingAreaElementInfoOnSingleRowCol( DockingArea aReadLock.unlock(); // Calc correct position of the column/row rectangle to be able to compare it with mouse pos/tracking rect - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); // Retrieve output size from container Window Window* pContainerWindow( VCLUnoHelper::GetWindow( xContainerWindow )); @@ -2518,7 +2518,7 @@ LayoutManager::implts_determineDockingOperation( Window* pDockingAreaWindow( 0 ); Window* pContainerWindow( 0 ); { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); pDockingAreaWindow = VCLUnoHelper::GetWindow( xDockingAreaWindow ); pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow ); nDockPosY = pDockingAreaWindow->ScreenToOutputPixel( @@ -2560,7 +2560,7 @@ void LayoutManager::implts_calcDockingPosSize( { // Retrieve output size from container Window - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow ); aContainerWinSize = pContainerWindow->GetOutputSizePixel(); } @@ -2594,7 +2594,7 @@ void LayoutManager::implts_calcDockingPosSize( aReadLock.unlock(); { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); pDockingAreaWindow = VCLUnoHelper::GetWindow( xDockingAreaWindow ); pDockWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pDockWindow && pDockWindow->GetType() == WINDOW_TOOLBOX ) @@ -2646,7 +2646,7 @@ void LayoutManager::implts_calcDockingPosSize( { // Calc correct position of the column/row rectangle to be able to compare it with mouse pos/tracking rect - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); aRect.SetPos( pContainerWindow->ScreenToOutputPixel( pDockingAreaWindow->OutputToScreenPixel( aRect.TopLeft() ))); } @@ -2745,7 +2745,7 @@ void LayoutManager::implts_calcDockingPosSize( // Set virtual position sal_Int32 nPosY( 0 ); { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); nPosY = pDockingAreaWindow->ScreenToOutputPixel( pContainerWindow->OutputToScreenPixel( aWindowRect.BottomRight() )).Y(); } @@ -2871,7 +2871,7 @@ void LayoutManager::implts_calcDockingPosSize( rTrackingRect.setWidth( nSize ); { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); nPosX = pDockingAreaWindow->ScreenToOutputPixel( pContainerWindow->OutputToScreenPixel( rTrackingRect.TopLeft() )).X(); } @@ -2919,7 +2919,7 @@ void LayoutManager::implts_calcDockingPosSize( rTrackingRect.setHeight( nSize ); { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); nPosY = pDockingAreaWindow->ScreenToOutputPixel( pContainerWindow->OutputToScreenPixel( rTrackingRect.TopLeft() )).Y(); } @@ -3143,7 +3143,7 @@ void LayoutManager::implts_updateUIElementsVisibleState( sal_Bool bSetVisible ) try { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); const sal_uInt32 nCount = aWinVector.size(); for ( sal_uInt32 i = 0; i < nCount; i++ ) { @@ -3166,12 +3166,12 @@ void LayoutManager::implts_updateUIElementsVisibleState( sal_Bool bSetVisible ) Reference< XUIElement > xMenuBar( m_xMenuBar, UNO_QUERY ); Reference< css::awt::XWindow > xContainerWindow( m_xContainerWindow ); Reference< XComponent > xInplaceMenuBar( m_xInplaceMenuBar ); - MenuBarManager* pInplaceMenuBar( m_pInplaceMenuBar ); + MenuBarManager* pInplaceMenuBar( m_pInplaceMenuBar ); aReadLock.unlock(); if (( xMenuBar.is() || xInplaceMenuBar.is() ) && xContainerWindow.is() ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); MenuBar* pMenuBar( 0 ); if ( xInplaceMenuBar.is() ) @@ -3349,7 +3349,7 @@ void LayoutManager::implts_createProgressBar() { Reference< css::awt::XWindow > xStatusBarWindow = pWrapper->getStatusBar(); - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Window* pStatusBarWnd = VCLUnoHelper::GetWindow( xStatusBarWindow ); if ( !pStatusBarWnd ) { @@ -3439,7 +3439,7 @@ void LayoutManager::implts_setStatusBarPosSize( const ::Point& rPos, const ::Siz if ( xWindow.is() ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Window* pParentWindow = VCLUnoHelper::GetWindow( xContainerWindow ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pParentWindow && ( pWindow && pWindow->GetType() == WINDOW_STATUSBAR )) @@ -3480,7 +3480,7 @@ sal_Bool LayoutManager::implts_showProgressBar() } aWriteLock.unlock(); - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow ) { @@ -3522,7 +3522,7 @@ sal_Bool LayoutManager::implts_hideProgressBar() bHideStatusBar = !m_aStatusBarElement.m_bVisible; aWriteLock.unlock(); - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow && pWindow->IsVisible() && ( bHideStatusBar || bInternalStatusBar )) @@ -3549,7 +3549,7 @@ sal_Bool LayoutManager::implts_showStatusBar( sal_Bool bStoreState ) { Reference< css::awt::XWindow > xWindow( xStatusBar->getRealInterface(), UNO_QUERY ); - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow && !pWindow->IsVisible() ) { @@ -3575,7 +3575,7 @@ sal_Bool LayoutManager::implts_hideStatusBar( sal_Bool bStoreState ) { Reference< css::awt::XWindow > xWindow( xStatusBar->getRealInterface(), UNO_QUERY ); - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow && pWindow->IsVisible() ) { @@ -3595,7 +3595,7 @@ throw (::com::sun::star::uno::RuntimeException) if ( !m_bInplaceMenuSet ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); // Reset old inplace menubar! m_pInplaceMenuBar = 0; @@ -3645,7 +3645,7 @@ throw (::com::sun::star::uno::RuntimeException) // if ( m_xMenuBar.is() && if ( m_xContainerWindow.is() ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); MenuBarWrapper* pMenuBarWrapper = SAL_STATIC_CAST( MenuBarWrapper*, m_xMenuBar.get() ); Window* pWindow = VCLUnoHelper::GetWindow( m_xContainerWindow ); while ( pWindow && !pWindow->IsSystemWindow() ) @@ -3832,7 +3832,7 @@ throw ( RuntimeException ) if ( xDockingAreaAcceptor.is() ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); ::DockingAreaWindow* pWindow; pWindow = dynamic_cast< ::DockingAreaWindow* >(VCLUnoHelper::GetWindow( xTopDockWindow ) ); if( pWindow ) pWindow->SetAlign( WINDOWALIGN_TOP ); @@ -3927,7 +3927,7 @@ void LayoutManager::implts_reparentChildWindows() } } - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Window* pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow ); Window* pTopDockWindow = VCLUnoHelper::GetWindow( xTopDockWindow ); Window* pBottomDockWindow = VCLUnoHelper::GetWindow( xBottomDockWindow ); @@ -4182,7 +4182,7 @@ throw (RuntimeException) { if ( aElementName.equalsIgnoreAsciiCaseAscii( "menubar" ) && !bInPlaceMenu ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); // PB 2004-12-15 #i38743# don't create a menubar if frame isn't top if ( !m_xMenuBar.is() && implts_isFrameOrWindowTop(xFrame) ) m_xMenuBar = implts_createElement( aName ); @@ -4437,7 +4437,7 @@ throw (::com::sun::star::uno::RuntimeException) if ( xUIElement.is() ) { // we need VCL here to pass special flags to Show() - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Reference< css::awt::XWindow > xWindow( xUIElement->getRealInterface(), UNO_QUERY ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow ) @@ -4491,7 +4491,7 @@ throw (::com::sun::star::uno::RuntimeException) aWriteLock.unlock(); // we need VCL here to pass special flags to Show() - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if( pWindow && !pWindow->IsReallyVisible() ) { @@ -4680,7 +4680,7 @@ throw (RuntimeException) if ( xDockWindow.is() && bShowElement ) { // we need VCL here to pass special flags to Show() - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if( pWindow ) { @@ -4749,7 +4749,7 @@ throw (RuntimeException) if ( m_xContainerWindow.is() ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Window* pWindow = VCLUnoHelper::GetWindow( m_xContainerWindow ); while ( pWindow && !pWindow->IsSystemWindow() ) pWindow = pWindow->GetParent(); @@ -4864,7 +4864,7 @@ throw (RuntimeException) ToolBox* pToolBox( 0 ); { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX ) { @@ -4883,7 +4883,7 @@ throw (RuntimeException) // we have to find a good place for it. ::Size aSize; - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); { if ( pToolBox ) aSize = pToolBox->CalcWindowSizePixel( 1, ImplConvertAlignment( aUIElement.m_aDockedData.m_nDockedArea ) ); @@ -5224,7 +5224,7 @@ throw (RuntimeException) { aReadLock.unlock(); - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Window* pWindow = VCLUnoHelper::GetWindow( m_xContainerWindow ); while ( pWindow && !pWindow->IsSystemWindow() ) pWindow = pWindow->GetParent(); @@ -5781,7 +5781,7 @@ void LayoutManager::implts_calcWindowPosSizeOnSingleRowColumn( sal_Int32 nDockin css::awt::Rectangle& rWinRect = rRowColumnWindowData.aRowColumnWindowSizes[i]; ::Size aMinSize; - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); { Reference< css::awt::XWindow > xWindow = rRowColumnWindowData.aRowColumnWindows[i]; Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); @@ -5850,7 +5850,7 @@ void LayoutManager::implts_calcWindowPosSizeOnSingleRowColumn( sal_Int32 nDockin else if ( nDockingArea == DockingArea_DOCKINGAREA_BOTTOM ) nStartOffset = pDockAreaWindow->GetSizePixel().Height() - rRowColumnWindowData.nStaticSize; - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); for ( sal_uInt32 i = 0; i < nCount; i++ ) { Reference< css::awt::XWindow > xWindow = rRowColumnWindowData.aRowColumnWindows[i]; @@ -5957,7 +5957,7 @@ css::awt::Rectangle LayoutManager::implts_calcDockingAreaSizes() Reference< css::awt::XDockableWindow > xDockWindow( xWindow, UNO_QUERY ); if ( xWindow.is() && xDockWindow.is() ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow && pWindow->IsVisible() && !xDockWindow->isFloating() ) @@ -6116,7 +6116,7 @@ void LayoutManager::implts_setDockingAreaWindowSizes( const css::awt::Rectangle& } //--------------------------------------------------------------------------------------------------------- -// XMenuCloser +// XMenuCloser //--------------------------------------------------------------------------------------------------------- void LayoutManager::implts_updateMenuBarClose() { @@ -6128,7 +6128,7 @@ void LayoutManager::implts_updateMenuBarClose() if ( xContainerWindow.is() ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Window* pWindow = VCLUnoHelper::GetWindow( xContainerWindow ); while ( pWindow && !pWindow->IsSystemWindow() ) @@ -6175,7 +6175,7 @@ sal_Bool LayoutManager::implts_resetMenuBar() aWriteLock.unlock(); /* SAFE AREA ----------------------------------------------------------------------------------------------- */ - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Window* pWindow = VCLUnoHelper::GetWindow( m_xContainerWindow ); while ( pWindow && !pWindow->IsSystemWindow() ) pWindow = pWindow->GetParent(); @@ -6293,7 +6293,7 @@ IMPL_LINK( LayoutManager, SettingsChanged, void*, EMPTYARG ) } //--------------------------------------------------------------------------------------------------------- -// XDockableWindowListener +// XDockableWindowListener //--------------------------------------------------------------------------------------------------------- void SAL_CALL LayoutManager::startDocking( const ::com::sun::star::awt::DockingEvent& e ) throw (::com::sun::star::uno::RuntimeException) { @@ -6309,7 +6309,7 @@ void SAL_CALL LayoutManager::startDocking( const ::com::sun::star::awt::DockingE Window* pWindow( 0 ); ::Point aMousePos; { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow ); aMousePos = pContainerWindow->ScreenToOutputPixel( ::Point( e.MousePos.X, e.MousePos.Y )); } @@ -6328,7 +6328,7 @@ void SAL_CALL LayoutManager::startDocking( const ::com::sun::star::awt::DockingE aUIElement.m_aFloatingData.m_aPos = ::Point( aPos.X, aPos.Y ); aUIElement.m_aFloatingData.m_aSize = ::Size( aSize.Width, aSize.Height ); - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX ) { @@ -6401,7 +6401,7 @@ throw (::com::sun::star::uno::RuntimeException) { try { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); sal_Int16 eDockingArea( -1 ); // none sal_Int32 nMagneticZone( aUIDockingElement.m_bFloating ? MAGNETIC_DISTANCE_DOCK : MAGNETIC_DISTANCE_UNDOCK ); @@ -6612,7 +6612,7 @@ throw (::com::sun::star::uno::RuntimeException) if ( bDockingInProgress ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Window* pWindow = VCLUnoHelper::GetWindow( Reference< css::awt::XWindow >( e.Source, UNO_QUERY )); ToolBox* pToolBox = 0; if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX ) @@ -6677,7 +6677,7 @@ throw (::com::sun::star::uno::RuntimeException) if ( xDockWindow->isFloating() ) { { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow ) { @@ -6722,7 +6722,7 @@ throw (::com::sun::star::uno::RuntimeException) Reference< css::awt::XWindow2 > xWindow; { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); xWindow = Reference< css::awt::XWindow2 >( e.Source, UNO_QUERY ); pWindow = VCLUnoHelper::GetWindow( xWindow ); @@ -6744,7 +6744,7 @@ throw (::com::sun::star::uno::RuntimeException) if ( aUIDockingElement.m_bFloating ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); if ( pToolBox ) { pToolBox->SetLineCount( aUIDockingElement.m_aFloatingData.m_nLines ); @@ -6787,7 +6787,7 @@ throw (::com::sun::star::uno::RuntimeException) ::Size aSize; { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); if ( pToolBox ) aSize = pToolBox->CalcWindowSizePixel( 1, ImplConvertAlignment( aUIDockingElement.m_aDockedData.m_nDockedArea ) ); else @@ -6801,7 +6801,7 @@ throw (::com::sun::star::uno::RuntimeException) aUIDockingElement.m_aDockedData.m_aPos = aDockPos; } - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); if ( pToolBox ) { pToolBox->SetAlign( ImplConvertAlignment( aUIDockingElement.m_aDockedData.m_nDockedArea) ); @@ -6827,7 +6827,7 @@ throw (::com::sun::star::uno::RuntimeException) } else { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); if ( pToolBox ) { if ( aUIDockingElement.m_bFloating ) @@ -6928,7 +6928,7 @@ void LayoutManager::implts_notifyListeners( short nEvent, ::com::sun::star::uno: } //--------------------------------------------------------------------------------------------------------- -// XWindowListener +// XWindowListener //--------------------------------------------------------------------------------------------------------- void SAL_CALL LayoutManager::windowResized( const css::awt::WindowEvent& aEvent ) throw( css::uno::RuntimeException ) @@ -7121,7 +7121,7 @@ void LayoutManager::implts_checkElementContainer() #endif //--------------------------------------------------------------------------------------------------------- -// XFrameActionListener +// XFrameActionListener //--------------------------------------------------------------------------------------------------------- void SAL_CALL LayoutManager::frameAction( const FrameActionEvent& aEvent ) throw ( RuntimeException ) @@ -7341,7 +7341,7 @@ void SAL_CALL LayoutManager::elementInserted( const ::com::sun::star::ui::Config } { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Reference< css::awt::XWindow > xWindow( xUIElement->getRealInterface(), UNO_QUERY ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow ) @@ -7466,7 +7466,7 @@ void SAL_CALL LayoutManager::elementReplaced( const ::com::sun::star::ui::Config } //--------------------------------------------------------------------------------------------------------- -// OPropertySetHelper +// OPropertySetHelper //--------------------------------------------------------------------------------------------------------- // XPropertySet helper sal_Bool SAL_CALL LayoutManager::convertFastPropertyValue( Any& aConvertedValue , diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index 68683df34cfd..75bcc4c4587f 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -1777,7 +1777,7 @@ void LoadEnv::impl_makeFrameWindowVisible(const css::uno::Reference< css::awt::X else pWindow->Show(sal_True, (bForceFrontAndFocus || bForceToFront) ? SHOW_FOREGROUNDTASK : 0 ); } - + /* #i19976# We tried to prevent a toFront() call in case the user putted the loading document into the background .. diff --git a/framework/source/loadenv/targethelper.cxx b/framework/source/loadenv/targethelper.cxx index 271532f7b08c..6abd17aa0efa 100644 --- a/framework/source/loadenv/targethelper.cxx +++ b/framework/source/loadenv/targethelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/source/recording/dispatchrecorder.cxx b/framework/source/recording/dispatchrecorder.cxx index 11b153298167..7716fb45e791 100644 --- a/framework/source/recording/dispatchrecorder.cxx +++ b/framework/source/recording/dispatchrecorder.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/source/recording/dispatchrecordersupplier.cxx b/framework/source/recording/dispatchrecordersupplier.cxx index beaaa2eb4bd1..5632e950262a 100644 --- a/framework/source/recording/dispatchrecordersupplier.cxx +++ b/framework/source/recording/dispatchrecordersupplier.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -97,11 +97,11 @@ DEFINE_INIT_SERVICE( it's not neccessary to do anything here. */ DispatchRecorderSupplier::DispatchRecorderSupplier( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ) - // init baseclasses first! - // Attention: Don't change order of initialization! + // init baseclasses first! + // Attention: Don't change order of initialization! : ThreadHelpBase ( &Application::GetSolarMutex() ) , ::cppu::OWeakObject( ) - // init member + // init member , m_xDispatchRecorder( NULL ) , m_xFactory ( xFactory ) { @@ -218,4 +218,4 @@ void SAL_CALL DispatchRecorderSupplier::dispatchAndRecord( const css::util::URL& } } -} // namespace framework +} // namespace framework diff --git a/framework/source/register/register3rdcomponents.cxx b/framework/source/register/register3rdcomponents.cxx index e9c63ac04ede..0d93c775ff7e 100644 --- a/framework/source/register/register3rdcomponents.cxx +++ b/framework/source/register/register3rdcomponents.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// includes of my own project +// includes of my own project //_________________________________________________________________________________________________________________ #include <macros/registration.hxx> @@ -47,11 +47,11 @@ COMPONENTGETIMPLEMENTATIONENVIRONMENT - COMPONENTWRITEINFO ( COMPONENTINFO( Service1 ) + COMPONENTWRITEINFO ( COMPONENTINFO( Service1 ) COMPONENTINFO( Service2 ) ) - COMPONENTGETFACTORY ( IFFACTORIE( Service1 ) + COMPONENTGETFACTORY ( IFFACTORIE( Service1 ) else IFFACTORIE( Service2 ) ) @@ -63,14 +63,14 @@ COMPONENTGETIMPLEMENTATIONENVIRONMENT -COMPONENTWRITEINFO ( COMPONENTINFO( ::framework::HelpOnStartup ) - COMPONENTINFO( ::framework::TabWinFactory ) - COMPONENTINFO( ::framework::SystemExec ) - COMPONENTINFO( ::framework::ShellJob ) +COMPONENTWRITEINFO ( COMPONENTINFO( ::framework::HelpOnStartup ) + COMPONENTINFO( ::framework::TabWinFactory ) + COMPONENTINFO( ::framework::SystemExec ) + COMPONENTINFO( ::framework::ShellJob ) ) -COMPONENTGETFACTORY ( IFFACTORY( ::framework::HelpOnStartup ) else - IFFACTORY( ::framework::TabWinFactory ) else - IFFACTORY( ::framework::SystemExec ) else - IFFACTORY( ::framework::ShellJob ) +COMPONENTGETFACTORY ( IFFACTORY( ::framework::HelpOnStartup ) else + IFFACTORY( ::framework::TabWinFactory ) else + IFFACTORY( ::framework::SystemExec ) else + IFFACTORY( ::framework::ShellJob ) ) diff --git a/framework/source/register/registerlogindialog.cxx b/framework/source/register/registerlogindialog.cxx index 166f489b94c0..55e13252570f 100644 --- a/framework/source/register/registerlogindialog.cxx +++ b/framework/source/register/registerlogindialog.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// includes of my own project +// includes of my own project //_________________________________________________________________________________________________________________ #include <macros/registration.hxx> @@ -48,11 +48,11 @@ COMPONENTGETIMPLEMENTATIONENVIRONMENT - COMPONENTWRITEINFO ( COMPONENTINFO( Service1 ) + COMPONENTWRITEINFO ( COMPONENTINFO( Service1 ) COMPONENTINFO( Service2 ) ) - COMPONENTGETFACTORY ( IFFACTORIE( Service1 ) + COMPONENTGETFACTORY ( IFFACTORIE( Service1 ) else IFFACTORIE( Service2 ) ) @@ -64,8 +64,8 @@ COMPONENTGETIMPLEMENTATIONENVIRONMENT -COMPONENTWRITEINFO ( COMPONENTINFO( ::framework::LoginDialog ) +COMPONENTWRITEINFO ( COMPONENTINFO( ::framework::LoginDialog ) ) -COMPONENTGETFACTORY ( IFFACTORY( ::framework::LoginDialog ) +COMPONENTGETFACTORY ( IFFACTORY( ::framework::LoginDialog ) ) diff --git a/framework/source/register/registerservices.cxx b/framework/source/register/registerservices.cxx index 297431d80f1d..6e3fa878bbb1 100644 --- a/framework/source/register/registerservices.cxx +++ b/framework/source/register/registerservices.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// includes of my own project +// includes of my own project //_________________________________________________________________________________________________________________ #include <macros/registration.hxx> @@ -47,11 +47,11 @@ COMPONENTGETIMPLEMENTATIONENVIRONMENT - COMPONENTWRITEINFO ( COMPONENTINFO( Service1 ) + COMPONENTWRITEINFO ( COMPONENTINFO( Service1 ) COMPONENTINFO( Service2 ) ) - COMPONENTGETFACTORY ( IFFACTORIE( Service1 ) + COMPONENTGETFACTORY ( IFFACTORIE( Service1 ) else IFFACTORIE( Service2 ) ) @@ -118,7 +118,7 @@ COMPONENTGETIMPLEMENTATIONENVIRONMENT COMPONENTWRITEINFO ( COMPONENTINFO( ::framework::URLTransformer ) - COMPONENTINFO( ::framework::Desktop ) + COMPONENTINFO( ::framework::Desktop ) COMPONENTINFO( ::framework::Frame ) //COMPONENTINFO( ::framework::Oxt_Handler ) COMPONENTINFO( ::framework::JobExecutor ) @@ -173,12 +173,12 @@ COMPONENTWRITEINFO ( COMPONENTINFO( ::framework::URLTransformer //COMPONENTINFO( ::framework::LanguageSelectionMenuController ) //COMPONENTINFO( ::framework::TabWindowService ) COMPONENTINFO( ::framework::WindowContentFactoryManager ) - COMPONENTINFO( ::framework::SubstitutePathVariables ) - COMPONENTINFO( ::framework::PathSettings ) + COMPONENTINFO( ::framework::SubstitutePathVariables ) + COMPONENTINFO( ::framework::PathSettings ) ) -COMPONENTGETFACTORY ( IFFACTORY( ::framework::URLTransformer ) else - IFFACTORY( ::framework::Desktop ) else +COMPONENTGETFACTORY ( IFFACTORY( ::framework::URLTransformer ) else + IFFACTORY( ::framework::Desktop ) else IFFACTORY( ::framework::Frame ) else //IFFACTORY( ::framework::Oxt_Handler ) else IFFACTORY( ::framework::JobExecutor ) else @@ -187,7 +187,7 @@ COMPONENTGETFACTORY ( IFFACTORY( ::framework::URLTransformer ) else //IFFACTORY( ::framework::MailToDispatcher ) else //IFFACTORY( ::framework::ServiceHandler ) else IFFACTORY( ::framework::JobDispatch ) else - IFFACTORY( ::framework::BackingComp ) else + IFFACTORY( ::framework::BackingComp ) else //IFFACTORY( ::framework::DispatchHelper ) else IFFACTORY( ::framework::LayoutManager ) else //IFFACTORY( ::framework::License ) else @@ -213,18 +213,18 @@ COMPONENTGETFACTORY ( IFFACTORY( ::framework::URLTransformer ) else IFFACTORY( ::framework::AddonsToolBoxFactory ) else IFFACTORY( ::framework::WindowStateConfiguration ) else IFFACTORY( ::framework::ToolbarControllerFactory ) else - //IFFACTORY( ::framework::ToolbarsMenuController ) else + //IFFACTORY( ::framework::ToolbarsMenuController ) else IFFACTORY( ::framework::AutoRecovery ) else - IFFACTORY( ::framework::StatusIndicatorFactory ) else + IFFACTORY( ::framework::StatusIndicatorFactory ) else IFFACTORY( ::framework::RecentFilesMenuController ) else IFFACTORY( ::framework::StatusBarFactory ) else - IFFACTORY( ::framework::UICategoryDescription ) else - IFFACTORY( ::framework::SessionListener ) else + IFFACTORY( ::framework::UICategoryDescription ) else + IFFACTORY( ::framework::SessionListener ) else IFFACTORY( ::framework::StatusbarControllerFactory ) else IFFACTORY( ::framework::SessionListener ) else //IFFACTORY( ::framework::LogoImageStatusbarController ) else - //IFFACTORY( ::framework::LogoTextStatusbarController ) else - IFFACTORY( ::framework::TaskCreatorService ) else + //IFFACTORY( ::framework::LogoTextStatusbarController ) else + IFFACTORY( ::framework::TaskCreatorService ) else //IFFACTORY( ::framework::NewMenuController ) else //IFFACTORY( ::framework::SimpleTextStatusbarController ) else //IFFACTORY( ::framework::UriAbbreviation ) else @@ -234,7 +234,7 @@ COMPONENTGETFACTORY ( IFFACTORY( ::framework::URLTransformer ) else //IFFACTORY( ::framework::LanguageSelectionMenuController ) else IFFACTORY( ::framework::WindowContentFactoryManager ) else //IFFACTORY( ::framework::TabWindowService ) else - IFFACTORY( ::framework::SubstitutePathVariables ) else - IFFACTORY( ::framework::PathSettings ) + IFFACTORY( ::framework::SubstitutePathVariables ) else + IFFACTORY( ::framework::PathSettings ) ) diff --git a/framework/source/register/registertemp.cxx b/framework/source/register/registertemp.cxx index b4a1252ffa70..7382380ef525 100644 --- a/framework/source/register/registertemp.cxx +++ b/framework/source/register/registertemp.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// includes of my own project +// includes of my own project //_________________________________________________________________________________________________________________ #include <macros/registration.hxx> @@ -47,11 +47,11 @@ COMPONENTGETIMPLEMENTATIONENVIRONMENT - COMPONENTWRITEINFO ( COMPONENTINFO( Service1 ) + COMPONENTWRITEINFO ( COMPONENTINFO( Service1 ) COMPONENTINFO( Service2 ) ) - COMPONENTGETFACTORY ( IFFACTORIE( Service1 ) + COMPONENTGETFACTORY ( IFFACTORIE( Service1 ) else IFFACTORIE( Service2 ) ) @@ -82,7 +82,7 @@ COMPONENTGETIMPLEMENTATIONENVIRONMENT -COMPONENTWRITEINFO ( COMPONENTINFO( ::framework::MediaTypeDetectionHelper ) +COMPONENTWRITEINFO ( COMPONENTINFO( ::framework::MediaTypeDetectionHelper ) COMPONENTINFO( ::framework::MailToDispatcher ) COMPONENTINFO( ::framework::NewMenuController ) COMPONENTINFO( ::framework::ToolbarsMenuController ) @@ -104,13 +104,13 @@ COMPONENTWRITEINFO ( COMPONENTINFO( ::framework::MediaTypeDetectionHelper ) COMPONENTINFO( ::framework::DispatchRecorderSupplier ) COMPONENTINFO( ::framework::Oxt_Handler ) COMPONENTINFO( ::framework::License ) - COMPONENTINFO( ::framework::PopupMenuController ) + COMPONENTINFO( ::framework::PopupMenuController ) ) -COMPONENTGETFACTORY ( IFFACTORY( ::framework::MediaTypeDetectionHelper ) +COMPONENTGETFACTORY ( IFFACTORY( ::framework::MediaTypeDetectionHelper ) IFFACTORY( ::framework::MailToDispatcher ) else IFFACTORY( ::framework::ServiceHandler ) else - IFFACTORY( ::framework::LogoTextStatusbarController ) else + IFFACTORY( ::framework::LogoTextStatusbarController ) else IFFACTORY( ::framework::LogoImageStatusbarController ) else IFFACTORY( ::framework::License ) else IFFACTORY( ::framework::PopupMenuDispatcher ) else @@ -119,7 +119,7 @@ COMPONENTGETFACTORY ( IFFACTORY( ::framework::MediaTypeDetectionHelper ) IFFACTORY( ::framework::DispatchRecorder ) else IFFACTORY( ::framework::DispatchRecorderSupplier ) else IFFACTORY( ::framework::SimpleTextStatusbarController ) else - IFFACTORY( ::framework::ToolbarsMenuController ) else + IFFACTORY( ::framework::ToolbarsMenuController ) else IFFACTORY( ::framework::FontMenuController ) else IFFACTORY( ::framework::MacrosMenuController ) else IFFACTORY( ::framework::NewMenuController ) else @@ -128,6 +128,6 @@ COMPONENTGETFACTORY ( IFFACTORY( ::framework::MediaTypeDetectionHelper ) IFFACTORY( ::framework::FooterMenuController ) else IFFACTORY( ::framework::HeaderMenuController ) else IFFACTORY( ::framework::LanguageSelectionMenuController ) else - IFFACTORY( ::framework::Oxt_Handler ) else - IFFACTORY( ::framework::PopupMenuController ) + IFFACTORY( ::framework::Oxt_Handler ) else + IFFACTORY( ::framework::PopupMenuController ) ) diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 41dbe9b6030b..c4cc7149ab6d 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -516,8 +516,8 @@ DEFINE_XINTERFACE_10(AutoRecovery DIRECT_INTERFACE (css::lang::XServiceInfo ), DIRECT_INTERFACE (css::frame::XDispatch ), DIRECT_INTERFACE (css::beans::XMultiPropertySet ), - DIRECT_INTERFACE (css::beans::XFastPropertySet ), - DIRECT_INTERFACE (css::beans::XPropertySet ), + DIRECT_INTERFACE (css::beans::XFastPropertySet ), + DIRECT_INTERFACE (css::beans::XPropertySet ), DIRECT_INTERFACE (css::document::XEventListener ), DIRECT_INTERFACE (css::util::XChangesListener ), DIRECT_INTERFACE (css::util::XModifyListener ), @@ -3343,7 +3343,7 @@ AutoRecovery::EFailureSafeResult AutoRecovery::implts_copyFile(const ::rtl::OUSt //----------------------------------------------- sal_Bool SAL_CALL AutoRecovery::convertFastPropertyValue( css::uno::Any& /*aConvertedValue*/, css::uno::Any& /*aOldValue*/ , - sal_Int32 /*nHandle*/ , + sal_Int32 /*nHandle*/ , const css::uno::Any& /*aValue*/ ) throw(css::lang::IllegalArgumentException) { diff --git a/framework/source/services/backingcomp.cxx b/framework/source/services/backingcomp.cxx index f59ea721ecf2..13c5647341e6 100644 --- a/framework/source/services/backingcomp.cxx +++ b/framework/source/services/backingcomp.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -513,7 +513,7 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f // create the menu bar for the backing component css::uno::Reference< css::beans::XPropertySet > xPropSet(m_xFrame, css::uno::UNO_QUERY_THROW); css::uno::Reference< css::frame::XLayoutManager > xLayoutManager; - xPropSet->getPropertyValue(FRAME_PROPNAME_LAYOUTMANAGER) >>= xLayoutManager; + xPropSet->getPropertyValue(FRAME_PROPNAME_LAYOUTMANAGER) >>= xLayoutManager; if (xLayoutManager.is()) { xLayoutManager->lock(); @@ -525,11 +525,11 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f xLayoutManager->showElement ( DECLARE_ASCII( "private:resource/statusbar/statusbar" )); */ xLayoutManager->unlock(); - } + } // set help ID for our canvas pWindow->SetHelpId(HID_BACKINGWINDOW); - + // inform BackingWindow about frame BackingWindow* pBack = dynamic_cast<BackingWindow*>(pWindow ); if( pBack ) @@ -660,7 +660,7 @@ void SAL_CALL BackingComp::disposing( /*IN*/ const css::lang::EventObject& aEven { // Attention: dont free m_pAccExec here! see comments inside dtor and // keyPressed() for further details. - + /* SAFE { */ WriteGuard aWriteLock(m_aLock); @@ -839,7 +839,7 @@ void SAL_CALL BackingComp::initialize( /*IN*/ const css::uno::Sequence< css::uno xBroadcaster->addEventListener(static_cast< css::lang::XEventListener* >(this)); m_xWindow->setVisible(sal_True); - + aWriteLock.unlock(); /* } SAFE */ } diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx index 8817e60e9273..8bb5ca5cbeaf 100644 --- a/framework/source/services/backingwindow.cxx +++ b/framework/source/services/backingwindow.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -185,7 +185,6 @@ BackingWindow::BackingWindow( Window* i_pParent ) : } String aExtHelpText( FwkResId( STR_BACKING_EXTHELP ) ); - String aRegHelpText( FwkResId( STR_BACKING_REGHELP ) ); String aInfoHelpText( FwkResId( STR_BACKING_INFOHELP ) ); String aTplRepHelpText( FwkResId( STR_BACKING_TPLREP ) ); @@ -214,12 +213,6 @@ BackingWindow::BackingWindow( Window* i_pParent ) : maToolbox.SetItemCommand( nItemId_Extensions, String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:Extensions" ) ) ); maToolbox.ShowItem( nItemId_Extensions ); - maToolbox.InsertItem( nItemId_Reg, Image() ); - maToolbox.SetQuickHelpText( nItemId_Reg, aRegHelpText ); - maToolbox.SetItemText( nItemId_Reg, aRegHelpText ); - maToolbox.SetItemCommand( nItemId_Reg, String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:Register" ) ) ); - maToolbox.ShowItem( nItemId_Reg ); - maToolbox.InsertItem( nItemId_Info, Image() ); maToolbox.SetItemText( nItemId_Info, aInfoHelpText ); maToolbox.SetQuickHelpText( nItemId_Info, aInfoHelpText ); @@ -247,7 +240,7 @@ BackingWindow::BackingWindow( Window* i_pParent ) : // add some breathing space for the images maButtonImageSize.Width() += 12; maButtonImageSize.Height() += 12; - + } @@ -288,12 +281,12 @@ void BackingWindow::prepareRecentFileMenu() mpRecentMenu = new PopupMenu(); mpRecentMenu->Clear(); maRecentFiles.clear(); - + // get recent file list and dispatch arguments Sequence< Sequence< PropertyValue > > aHistoryList( SvtHistoryOptions().GetList( ePICKLIST ) ); sal_Int32 nPickListMenuItems = ( aHistoryList.getLength() > 99 ) ? 99 : aHistoryList.getLength(); - + if( ( nPickListMenuItems > 0 ) ) { maRecentFiles.reserve( nPickListMenuItems ); @@ -301,11 +294,11 @@ void BackingWindow::prepareRecentFileMenu() { Sequence< PropertyValue >& rPickListEntry = aHistoryList[i]; rtl::OUString aURL, aFilter, aFilterOpt, aTitle; - + for ( sal_Int32 j = 0; j < rPickListEntry.getLength(); j++ ) { const Any& a = rPickListEntry[j].Value; - + if ( rPickListEntry[j].Name == HISTORY_PROPERTYNAME_URL ) a >>= aURL; else if ( rPickListEntry[j].Name == HISTORY_PROPERTYNAME_FILTER ) @@ -332,7 +325,7 @@ void BackingWindow::prepareRecentFileMenu() nArgs--; rArgsList[nArgs].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterName" )); rArgsList[nArgs].Value = makeAny( aFilter ); - + if( aFilterOpt.getLength() ) { nArgs--; @@ -348,20 +341,20 @@ void BackingWindow::prepareRecentFileMenu() nArgs--; rArgsList[nArgs].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Referer" )); rArgsList[nArgs].Value = makeAny( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:user" ) ) ); - + // and finally create an entry in the popupmenu - rtl::OUString aMenuTitle; - INetURLObject aURLObj( aURL ); - + rtl::OUString aMenuTitle; + INetURLObject aURLObj( aURL ); + if ( aURLObj.GetProtocol() == INET_PROT_FILE ) { // Do handle file URL differently => convert it to a system // path and abbreviate it with a special function: String aFileSystemPath( aURLObj.getFSysPath( INetURLObject::FSYS_DETECT ) ); - - rtl::OUString aSystemPath( aFileSystemPath ); - rtl::OUString aCompactedSystemPath; - + + rtl::OUString aSystemPath( aFileSystemPath ); + rtl::OUString aCompactedSystemPath; + oslFileError nError = osl_abbreviateSystemPath( aSystemPath.pData, &aCompactedSystemPath.pData, 46, NULL ); if ( !nError ) aMenuTitle = String( aCompactedSystemPath ); @@ -401,9 +394,9 @@ void BackingWindow::initBackground() maWelcomeTextColor = maLabelTextColor = Color( COL_WHITE ); else if( mnLayoutStyle == 1 ) maWelcomeTextColor = maLabelTextColor = Color( COL_BLACK ); - else + else maWelcomeTextColor = maLabelTextColor = Color( 0x26, 0x35, 0x42 ); - + Color aTextBGColor( bDark ? COL_BLACK : COL_WHITE ); // select image set @@ -431,7 +424,6 @@ void BackingWindow::initBackground() maBackgroundRight = BitmapEx( FwkResId( BMP_BACKING_BACKGROUND_RIGHT ) ); } maToolbox.SetItemImage( nItemId_Extensions, BitmapEx( FwkResId( BMP_BACKING_EXT ) ) ); - maToolbox.SetItemImage( nItemId_Reg, BitmapEx( FwkResId( BMP_BACKING_REG ) ) ); maToolbox.SetItemImage( nItemId_Info, BitmapEx( FwkResId( BMP_BACKING_INFO ) ) ); maToolbox.SetItemImage( nItemId_TplRep, BitmapEx( FwkResId( BMP_BACKING_TPLREP ) ) ); @@ -457,7 +449,7 @@ void BackingWindow::initBackground() loadImage( FwkResId( BMP_BACKING_FORMULA ), maMathButton ); loadImage( FwkResId( BMP_BACKING_OPENFILE ), maOpenButton ); loadImage( FwkResId( BMP_BACKING_OPENTEMPLATE ), maTemplateButton ); - + maOpenButton.SetMenuMode( MENUBUTTON_MENUMODE_TIMED ); maOpenButton.SetSelectHdl( LINK( this, BackingWindow, SelectHdl ) ); maOpenButton.SetActivateHdl( LINK( this, BackingWindow, ActivateHdl ) ); @@ -520,7 +512,7 @@ void BackingWindow::initControls() if( mnLayoutStyle == 1 ) { - maWelcome.Show(); + maWelcome.Show(); maProduct.Show(); } @@ -531,7 +523,7 @@ void BackingWindow::initControls() maTextFont.SetWeight( WEIGHT_NORMAL ); // collect the URLs of the entries in the File/New menu - SvtModuleOptions aModuleOptions; + SvtModuleOptions aModuleOptions; std::set< rtl::OUString > aFileNewAppsAvailable; SvtDynamicMenuOptions aOpt; Sequence < Sequence < PropertyValue > > aNewMenu = aOpt.GetMenu( E_NEWMENU ); @@ -591,19 +583,19 @@ void BackingWindow::initControls() maMathButton, aMnemns ); nYPos += 3*maButtonImageSize.Height() / 2; - + layoutButton( NULL, 0, aFileNewAppsAvailable, aModuleOptions, SvtModuleOptions::E_SWRITER, maOpenButton, aMnemns, maOpenString ); layoutButton( NULL, 1, aFileNewAppsAvailable, aModuleOptions, SvtModuleOptions::E_SWRITER, - maTemplateButton, aMnemns, maTemplateString ); + maTemplateButton, aMnemns, maTemplateString ); nYPos += 10; DBG_ASSERT( nYPos < maControlRect.GetHeight(), "misformatting !" ); if( mnColumnWidth[0] + mnColumnWidth[1] + mnBtnPos + 20 > maControlRect.GetWidth() ) maControlRect.Right() = maControlRect.Left() + mnColumnWidth[0] + mnColumnWidth[1] + mnBtnPos + 20; - + mnTextColumnWidth[0] = mnColumnWidth[0]; mnTextColumnWidth[1] = mnColumnWidth[1]; @@ -645,7 +637,7 @@ void BackingWindow::initControls() maBackgroundMiddle = BitmapEx(); Resize(); - + maWriterButton.GrabFocus(); } @@ -684,7 +676,7 @@ void BackingWindow::layoutButton( String aText( i_rStr.Len() ? i_rStr : SvFileInformationManager::GetDescription( INetURLObject( aURL ) ) ); i_rMnemns.CreateMnemonic( aText ); i_rBtn.SetText( aText ); - + long nTextWidth = i_rBtn.GetTextWidth( i_rBtn.GetText() ); nTextWidth += maButtonImageSize.Width() + 8; // add some fuzz to be on the safe side @@ -807,7 +799,7 @@ long BackingWindow::Notify( NotifyEvent& rNEvt ) else if( maDBButton.HasFocus() ) maMathButton.GrabFocus(); else if( maMathButton.HasFocus() ) - maTemplateButton.GrabFocus(); + maTemplateButton.GrabFocus(); return 1; } } @@ -869,7 +861,7 @@ void BackingWindow::Resize() nYPos += nPDelta - nDiff; nYPos += nWDelta/2 - nDiff; - + if( mnLayoutStyle != 1 ) nYPos = maControlRect.Top() + mnBtnTop; @@ -949,7 +941,7 @@ IMPL_LINK( BackingWindow, ToolboxHdl, void*, EMPTYARG ) //throws css::container::NoSuchElementException, css::lang::WrappedTargetException Any value( xNameAccess->getByName(rtl::OUString::createFromAscii(pNode)) ); sURL = value.get<rtl::OUString> (); - + // extend the URLs with Office locale argument INetURLObject aURLObj( sURL ); @@ -964,7 +956,7 @@ IMPL_LINK( BackingWindow, ToolboxHdl, void*, EMPTYARG ) ::rtl::OUString sPackage = ::rtl::OUString::createFromAscii("org.openoffice.Setup"); ::rtl::OUString sRelPath = ::rtl::OUString::createFromAscii("L10N"); ::rtl::OUString sKey = ::rtl::OUString::createFromAscii("ooLocale"); - + try { ::comphelper::ConfigurationHelper::readDirectKey(comphelper::getProcessServiceFactory(), @@ -981,7 +973,7 @@ IMPL_LINK( BackingWindow, ToolboxHdl, void*, EMPTYARG ) aURLBuf.append(sLocale); sParam = aURLBuf.makeStringAndClear(); - + aURLObj.SetParam( sParam ); sURL = aURLObj.GetMainURL( INetURLObject::NO_DECODE ); diff --git a/framework/source/services/backingwindow.hxx b/framework/source/services/backingwindow.hxx index c81c975a3305..958ebfbb243e 100644 --- a/framework/source/services/backingwindow.hxx +++ b/framework/source/services/backingwindow.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -83,7 +83,7 @@ namespace framework rtl::OUString aTargetURL; com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > aArgSeq; }; - + com::sun::star::uno::Reference<com::sun::star::frame::XDesktop> mxDesktop; com::sun::star::uno::Reference<com::sun::star::frame::XDispatchProvider > mxDesktopDispatchProvider; com::sun::star::uno::Reference<com::sun::star::frame::XFrame> mxFrame; @@ -129,7 +129,7 @@ namespace framework svt::AcceleratorExecute* mpAccExec; long mnBtnPos; long mnBtnTop; - + PopupMenu* mpRecentMenu; std::vector< LoadRecentFile > maRecentFiles; diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index 6a07b7fda063..293e03ee655b 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <loadenv/loadenv.hxx> @@ -58,7 +58,7 @@ #include <classes/fwkresid.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/frame/FrameSearchFlag.hpp> @@ -86,7 +86,7 @@ #include <com/sun/star/frame/XTerminateListener2.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <cppuhelper/queryinterface.hxx> #include <cppuhelper/typeprovider.hxx> @@ -102,25 +102,25 @@ #include <comphelper/extract.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// non exported const +// non exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// non exported definitions +// non exported definitions //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** DEFINE_XINTERFACE_15 ( Desktop , OWeakObject , @@ -137,7 +137,7 @@ DEFINE_XINTERFACE_15 ( Desktop DIRECT_INTERFACE( css::frame::XDispatchResultListener ), DIRECT_INTERFACE( css::lang::XEventListener ), DIRECT_INTERFACE( css::task::XInteractionHandler ), - DIRECT_INTERFACE( css::beans::XPropertySet ), + DIRECT_INTERFACE( css::beans::XPropertySet ), DIRECT_INTERFACE( css::frame::XUntitledNumbers ) ) @@ -238,7 +238,7 @@ DEFINE_INIT_SERVICE ( Desktop, @onerror We throw an ASSERT in debug version or do nothing in relaese version. *//*-*************************************************************************************************************/ Desktop::Desktop( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ) - // Init baseclasses first + // Init baseclasses first // Attention: Don't change order of initialization! // ThreadHelpBase is a struct with a lock as member. We can't use a lock as direct member! // We must garant right initialization and a valid value of this to initialize other baseclasses! @@ -259,7 +259,7 @@ Desktop::Desktop( const css::uno::Reference< css::lang::XMultiServiceFactory >& , m_eLoadState ( E_NOTSET ) , m_xLastFrame ( ) , m_aInteractionRequest ( ) - , m_bSuspendQuickstartVeto( sal_False ) + , m_bSuspendQuickstartVeto( sal_False ) , m_aCommandOptions ( ) , m_sName ( ) , m_sTitle ( ) @@ -276,15 +276,15 @@ Desktop::Desktop( const css::uno::Reference< css::lang::XMultiServiceFactory >& } /*-************************************************************************************************************//** - @short standard destructor - @descr This one do NOTHING! Use dispose() instaed of this. + @short standard destructor + @descr This one do NOTHING! Use dispose() instaed of this. - @seealso method dispose() + @seealso method dispose() - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*************************************************************************************************************/ Desktop::~Desktop() { @@ -300,15 +300,15 @@ sal_Bool SAL_CALL Desktop::terminate() SYNCHRONIZED_START ReadGuard aReadLock( m_aLock ); - + css::uno::Reference< css::frame::XTerminateListener > xPipeTerminator = m_xPipeTerminator; css::uno::Reference< css::frame::XTerminateListener > xQuickLauncher = m_xQuickLauncher; css::uno::Reference< css::frame::XTerminateListener > xSWThreadManager = m_xSWThreadManager; css::uno::Reference< css::frame::XTerminateListener > xSfxTerminator = m_xSfxTerminator; - + css::lang::EventObject aEvent ( static_cast< ::cppu::OWeakObject* >(this) ); - ::sal_Bool bAskQuickStart = !m_bSuspendQuickstartVeto ; - + ::sal_Bool bAskQuickStart = !m_bSuspendQuickstartVeto ; + aReadLock.unlock(); SYNCHRONIZED_END @@ -362,25 +362,25 @@ sal_Bool SAL_CALL Desktop::terminate() xQuickLauncher->queryTermination( aEvent ); lCalledTerminationListener.push_back( xQuickLauncher ); } - + if ( xSWThreadManager.is() ) { xSWThreadManager->queryTermination( aEvent ); lCalledTerminationListener.push_back( xSWThreadManager ); } - + if ( xPipeTerminator.is() ) { xPipeTerminator->queryTermination( aEvent ); lCalledTerminationListener.push_back( xPipeTerminator ); } - + if ( xSfxTerminator.is() ) { xSfxTerminator->queryTermination( aEvent ); lCalledTerminationListener.push_back( xSfxTerminator ); } - + bTerminate = sal_True; } catch(const css::frame::TerminationVetoException&) @@ -401,9 +401,9 @@ sal_Bool SAL_CALL Desktop::terminate() aWriteLock.unlock(); /* UNSAFE AREA ------------------------------------------------------------------------------------- */ #endif - + impl_sendNotifyTerminationEvent(); - + if( ( bAskQuickStart ) && ( xQuickLauncher.is() ) @@ -411,19 +411,19 @@ sal_Bool SAL_CALL Desktop::terminate() { xQuickLauncher->notifyTermination( aEvent ); } - + if ( xSWThreadManager.is() ) xSWThreadManager->notifyTermination( aEvent ); - + if ( xPipeTerminator.is() ) xPipeTerminator->notifyTermination( aEvent ); - + // Must be realy the last listener to be called. // Because it shutdown the whole process asynchronous ! if ( xSfxTerminator.is() ) xSfxTerminator->notifyTermination( aEvent ); } - + return bTerminate; } @@ -438,10 +438,10 @@ void SAL_CALL Desktop::addTerminateListener( const css::uno::Reference< css::fra if ( xInfo.is() ) { ::rtl::OUString sImplementationName = xInfo->getImplementationName(); - + // SYCNHRONIZED -> WriteGuard aWriteLock( m_aLock ); - + if( sImplementationName.equals(IMPLEMENTATIONNAME_SFXTERMINATOR) ) { m_xSfxTerminator = xListener; @@ -462,7 +462,7 @@ void SAL_CALL Desktop::addTerminateListener( const css::uno::Reference< css::fra m_xSWThreadManager = xListener; return; } - + aWriteLock.unlock(); // <- SYCNHRONIZED } @@ -481,34 +481,34 @@ void SAL_CALL Desktop::removeTerminateListener( const css::uno::Reference< css:: if ( xInfo.is() ) { ::rtl::OUString sImplementationName = xInfo->getImplementationName(); - + // SYCNHRONIZED -> WriteGuard aWriteLock( m_aLock ); - + if( sImplementationName.equals(IMPLEMENTATIONNAME_SFXTERMINATOR) ) { m_xSfxTerminator.clear(); return; } - + if( sImplementationName.equals(IMPLEMENTATIONNAME_PIPETERMINATOR) ) { m_xPipeTerminator.clear(); return; } - + if( sImplementationName.equals(IMPLEMENTATIONNAME_QUICKLAUNCHER) ) { m_xQuickLauncher.clear(); return; } - + if( sImplementationName.equals(IMPLEMENTATIONNAME_SWTHREADMANAGER) ) { m_xSWThreadManager.clear(); return; } - + aWriteLock.unlock(); // <- SYCNHRONIZED } @@ -1187,11 +1187,11 @@ void SAL_CALL Desktop::dispose() SYNCHRONIZED_START WriteGuard aWriteLock( m_aLock ); - + // Look for multiple calls of this method! // If somewhere call dispose() twice - he will be stopped here realy!!! TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); - + // Now - we are alone and its the first call of this method ... // otherwise call before had thrown a DisposedException / hopefully .-) // But we dont use the transaction object created before ... we reset it immediatly ... @@ -1201,12 +1201,12 @@ void SAL_CALL Desktop::dispose() // are running within the same thread!) So we would block ourself there if aTransaction // will stay registered .-) aTransaction.stop(); - + // Disable this instance for further work. // This will wait for all current running transactions ... // and reject all new incoming requests! m_aTransactionManager.setWorkingMode( E_BEFORECLOSE ); - + aWriteLock.unlock(); SYNCHRONIZED_END @@ -1459,7 +1459,7 @@ void SAL_CALL Desktop::handle( const css::uno::Reference< css::task::XInteractio TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); return m_xTitleNumberGenerator->leaseNumber (xComponent); } - + //----------------------------------------------------------------------------- void SAL_CALL Desktop::releaseNumber( ::sal_Int32 nNumber ) throw (css::lang::IllegalArgumentException, @@ -1519,8 +1519,8 @@ sal_Bool SAL_CALL Desktop::convertFastPropertyValue( css::uno::Any& aCon // Register transaction and reject wrong calls. TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); - // Initialize state with FALSE !!! - // (Handle can be invalid) + // Initialize state with FALSE !!! + // (Handle can be invalid) sal_Bool bReturn = sal_False; switch( nHandle ) @@ -1817,9 +1817,9 @@ void Desktop::impl_sendQueryTerminationEvent(Desktop::TTerminateListenerList& lC ::cppu::OInterfaceContainerHelper* pContainer = m_aListenerContainer.getContainer( ::getCppuType( ( const css::uno::Reference< css::frame::XTerminateListener >*) NULL ) ); if ( ! pContainer ) return; - + css::lang::EventObject aEvent( static_cast< ::cppu::OWeakObject* >(this) ); - + ::cppu::OInterfaceIteratorHelper aIterator( *pContainer ); while ( aIterator.hasMoreElements() ) { @@ -1880,9 +1880,9 @@ void Desktop::impl_sendNotifyTerminationEvent() ::cppu::OInterfaceContainerHelper* pContainer = m_aListenerContainer.getContainer( ::getCppuType( ( const css::uno::Reference< css::frame::XTerminateListener >*) NULL ) ); if ( ! pContainer ) return; - + css::lang::EventObject aEvent( static_cast< ::cppu::OWeakObject* >(this) ); - + ::cppu::OInterfaceIteratorHelper aIterator( *pContainer ); while ( aIterator.hasMoreElements() ) { @@ -1954,7 +1954,7 @@ void Desktop::impl_sendNotifyTerminationEvent() // Any internal process of this frame disagree with our request. // Safe this state but dont break these loop. Other frames has to be closed! ++nNonClosedFrames; - + // Reactivate controller. // It can happen that XController.suspend() returned true ... but a registered close listener // throwed these veto exception. Then the controller has to be reactivated. Otherwise @@ -1965,18 +1965,18 @@ void Desktop::impl_sendNotifyTerminationEvent() ) xController->suspend(sal_False); } - + // If interface XClosable interface exists and was used ... // it's not allowed to use XComponent->dispose() also ! continue; } - + // XClosable not supported ? // Then we have to dispose these frame hardly. css::uno::Reference< css::lang::XComponent > xDispose( xFrame, css::uno::UNO_QUERY ); if ( xDispose.is() ) xDispose->dispose(); - + // Don't remove these frame from our child container! // A frame do it by itself inside close()/dispose() method. } @@ -1991,7 +1991,7 @@ void Desktop::impl_sendNotifyTerminationEvent() } //_________________________________________________________________________________________________________________ -// debug methods +// debug methods //_________________________________________________________________________________________________________________ /*----------------------------------------------------------------------------------------------------------------- @@ -2002,35 +2002,35 @@ void Desktop::impl_sendNotifyTerminationEvent() #ifdef ENABLE_ASSERTIONS //***************************************************************************************************************** -// We work with valid servicemanager only. +// We work with valid servicemanager only. sal_Bool Desktop::implcp_ctor( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ) { return( - ( &xFactory == NULL ) || - ( xFactory.is() == sal_False ) + ( &xFactory == NULL ) || + ( xFactory.is() == sal_False ) ); } //***************************************************************************************************************** -// We work with valid listener only. +// We work with valid listener only. sal_Bool Desktop::implcp_addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) { return( - ( &xListener == NULL ) || - ( xListener.is() == sal_False ) + ( &xListener == NULL ) || + ( xListener.is() == sal_False ) ); } //***************************************************************************************************************** -// We work with valid listener only. +// We work with valid listener only. sal_Bool Desktop::implcp_removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) { return( - ( &xListener == NULL ) || - ( xListener.is() == sal_False ) + ( &xListener == NULL ) || + ( xListener.is() == sal_False ) ); } -#endif // #ifdef ENABLE_ASSERTIONS +#endif // #ifdef ENABLE_ASSERTIONS -} // namespace framework +} // namespace framework diff --git a/framework/source/services/dispatchhelper.cxx b/framework/source/services/dispatchhelper.cxx index d6c7fe628888..be8e666ee9db 100644 --- a/framework/source/services/dispatchhelper.cxx +++ b/framework/source/services/dispatchhelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index b2bd8494170c..08a7c522831b 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <services/frame.hxx> #include <dispatch/dispatchprovider.hxx> @@ -55,7 +55,7 @@ #include <properties.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/DisposedException.hpp> @@ -85,7 +85,7 @@ #endif //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <comphelper/sequenceashashmap.hxx> #include <cppuhelper/queryinterface.hxx> @@ -113,45 +113,45 @@ #include <vcl/menu.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// non exported const +// non exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// non exported definitions +// non exported definitions //_________________________________________________________________________________________________________________ css::uno::WeakReference< css::frame::XFrame > Frame::m_xCloserFrame = css::uno::WeakReference< css::frame::XFrame >(); //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** DEFINE_XINTERFACE_21 ( Frame , - OWeakObject , - DIRECT_INTERFACE(css::lang::XTypeProvider ), - DIRECT_INTERFACE(css::lang::XServiceInfo ), - DIRECT_INTERFACE(css::frame::XFramesSupplier ), - DIRECT_INTERFACE(css::frame::XFrame ), - DIRECT_INTERFACE(css::lang::XComponent ), - DIRECT_INTERFACE(css::task::XStatusIndicatorFactory ), - DIRECT_INTERFACE(css::frame::XDispatchProvider ), - DIRECT_INTERFACE(css::frame::XDispatchInformationProvider ), - DIRECT_INTERFACE(css::frame::XDispatchProviderInterception ), - DIRECT_INTERFACE(css::beans::XPropertySet ), - DIRECT_INTERFACE(css::beans::XPropertySetInfo ), - DIRECT_INTERFACE(css::awt::XWindowListener ), - DIRECT_INTERFACE(css::awt::XTopWindowListener ), - DIRECT_INTERFACE(css::awt::XFocusListener ), - DERIVED_INTERFACE(css::lang::XEventListener, css::awt::XWindowListener ), + OWeakObject , + DIRECT_INTERFACE(css::lang::XTypeProvider ), + DIRECT_INTERFACE(css::lang::XServiceInfo ), + DIRECT_INTERFACE(css::frame::XFramesSupplier ), + DIRECT_INTERFACE(css::frame::XFrame ), + DIRECT_INTERFACE(css::lang::XComponent ), + DIRECT_INTERFACE(css::task::XStatusIndicatorFactory ), + DIRECT_INTERFACE(css::frame::XDispatchProvider ), + DIRECT_INTERFACE(css::frame::XDispatchInformationProvider ), + DIRECT_INTERFACE(css::frame::XDispatchProviderInterception ), + DIRECT_INTERFACE(css::beans::XPropertySet ), + DIRECT_INTERFACE(css::beans::XPropertySetInfo ), + DIRECT_INTERFACE(css::awt::XWindowListener ), + DIRECT_INTERFACE(css::awt::XTopWindowListener ), + DIRECT_INTERFACE(css::awt::XFocusListener ), + DERIVED_INTERFACE(css::lang::XEventListener, css::awt::XWindowListener ), DIRECT_INTERFACE(css::document::XActionLockable ), DIRECT_INTERFACE(css::util::XCloseable ), DIRECT_INTERFACE(css::util::XCloseBroadcaster ), @@ -161,20 +161,20 @@ DEFINE_XINTERFACE_21 ( Frame ) DEFINE_XTYPEPROVIDER_20 ( Frame , - css::lang::XTypeProvider , - css::lang::XServiceInfo , - css::frame::XFramesSupplier , - css::frame::XFrame , - css::lang::XComponent , - css::task::XStatusIndicatorFactory , - css::beans::XPropertySet , - css::beans::XPropertySetInfo , - css::frame::XDispatchProvider , - css::frame::XDispatchInformationProvider , - css::frame::XDispatchProviderInterception , - css::awt::XWindowListener , - css::awt::XTopWindowListener , - css::awt::XFocusListener , + css::lang::XTypeProvider , + css::lang::XServiceInfo , + css::frame::XFramesSupplier , + css::frame::XFrame , + css::lang::XComponent , + css::task::XStatusIndicatorFactory , + css::beans::XPropertySet , + css::beans::XPropertySetInfo , + css::frame::XDispatchProvider , + css::frame::XDispatchInformationProvider , + css::frame::XDispatchProviderInterception , + css::awt::XWindowListener , + css::awt::XTopWindowListener , + css::awt::XFocusListener , css::lang::XEventListener , css::util::XCloseable , css::util::XCloseBroadcaster , @@ -183,9 +183,9 @@ DEFINE_XTYPEPROVIDER_20 ( Frame css::frame::XTitleChangeBroadcaster ) -DEFINE_XSERVICEINFO_MULTISERVICE ( Frame , +DEFINE_XSERVICEINFO_MULTISERVICE ( Frame , ::cppu::OWeakObject , - SERVICENAME_FRAME , + SERVICENAME_FRAME , IMPLEMENTATIONNAME_FRAME ) @@ -254,8 +254,8 @@ DEFINE_INIT_SERVICE ( Frame, ) /*-****************************************************************************************************//** - @short standard constructor to create instance by factory - @descr This constructor initialize a new instance of this class by valid factory, + @short standard constructor to create instance by factory + @descr This constructor initialize a new instance of this class by valid factory, and will be set valid values on his member and baseclasses. @attention a) Don't use your own reference during an UNO-Service-ctor! There is no guarantee, that you @@ -268,11 +268,11 @@ DEFINE_INIT_SERVICE ( Frame, @seealso method DEFINE_INIT_SERVICE() - @param "xFactory" is the multi service manager, which create this instance. + @param "xFactory" is the multi service manager, which create this instance. The value must be different from NULL! - @return - + @return - - @onerror ASSERT in debug version or nothing in relaese version. + @onerror ASSERT in debug version or nothing in relaese version. *//*-*****************************************************************************************************/ Frame::Frame( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ) : ThreadHelpBase ( &Application::GetSolarMutex() ) @@ -282,7 +282,7 @@ Frame::Frame( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFac &m_aTransactionManager, sal_False) // FALSE => dont release shared mutex on calling us! , ::cppu::OWeakObject ( ) - // init member + // init member , m_xFactory ( xFactory ) , m_aListenerContainer ( m_aLock.getShareableOslMutex() ) , m_xParent ( ) @@ -306,15 +306,15 @@ Frame::Frame( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFac } /*-****************************************************************************************************//** - @short standard destructor - @descr This one do NOTHING! Use dispose() instaed of this. + @short standard destructor + @descr This one do NOTHING! Use dispose() instaed of this. - @seealso method dispose() + @seealso method dispose() - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ Frame::~Frame() { @@ -365,17 +365,17 @@ css::uno::Reference< css::lang::XComponent > SAL_CALL Frame::loadComponentFromUR } /*-****************************************************************************************************//** - @short return access to append or remove childs on desktop - @descr We don't implement these interface directly. We use a helper class to do this. + @short return access to append or remove childs on desktop + @descr We don't implement these interface directly. We use a helper class to do this. If you wish to add or delete childs to/from the container, call these method to get a reference to the helper. - @seealso class OFrames + @seealso class OFrames - @param - - @return A reference to the helper which answer your queries. + @param - + @return A reference to the helper which answer your queries. - @onerror A null reference is returned. + @onerror A null reference is returned. *//*-*****************************************************************************************************/ css::uno::Reference< css::frame::XFrames > SAL_CALL Frame::getFrames() throw( css::uno::RuntimeException ) { @@ -400,19 +400,19 @@ css::uno::Reference< css::frame::XFrames > SAL_CALL Frame::getFrames() throw( cs } /*-****************************************************************************************************//** - @short get the current active child frame - @descr It must be a frameto. Direct childs of a frame are frames only! No task or desktop is accepted. + @short get the current active child frame + @descr It must be a frameto. Direct childs of a frame are frames only! No task or desktop is accepted. We don't save this information directly in this class. We use ouer container-helper to do that. - @seealso class OFrameContainer - @seealso method setActiveFrame() + @seealso class OFrameContainer + @seealso method setActiveFrame() - @param - - @return A reference to ouer current active childframe, if anyone exist. - @return A null reference, if nobody is active. + @param - + @return A reference to ouer current active childframe, if anyone exist. + @return A null reference, if nobody is active. - @onerror A null reference is returned. + @onerror A null reference is returned. *//*-*****************************************************************************************************/ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::getActiveFrame() throw( css::uno::RuntimeException ) { @@ -429,16 +429,16 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::getActiveFrame() throw } /*-****************************************************************************************************//** - @short set the new active direct child frame - @descr It must be a frame to. Direct childs of frame are frames only! No task or desktop is accepted. + @short set the new active direct child frame + @descr It must be a frame to. Direct childs of frame are frames only! No task or desktop is accepted. We don't save this information directly in this class. We use ouer container-helper to do that. - @seealso class OFrameContainer - @seealso method getActiveFrame() + @seealso class OFrameContainer + @seealso method getActiveFrame() - @param "xFrame", reference to new active child. It must be an already existing child! - @return - + @param "xFrame", reference to new active child. It must be an already existing child! + @return - @onerror An assertion is thrown and element is ignored, if given frame is'nt already a child of us. *//*-*****************************************************************************************************/ @@ -543,19 +543,19 @@ void lcl_disableLayoutManager(const css::uno::Reference< css::frame::XLayoutMana } /*-****************************************************************************************************//** - @short initialize frame instance - @descr A frame needs a window. This method set a new one ... but should called one times only! + @short initialize frame instance + @descr A frame needs a window. This method set a new one ... but should called one times only! We use this window to listen for window events and forward it to our set component. Its used as parent of component window too. - @seealso method getContainerWindow() - @seealso method setComponent() - @seealso member m_xContainerWindow + @seealso method getContainerWindow() + @seealso method setComponent() + @seealso member m_xContainerWindow - @param "xWindow", reference to new container window - must be valid! - @return - + @param "xWindow", reference to new container window - must be valid! + @return - - @onerror We do nothing. + @onerror We do nothing. *//*-*****************************************************************************************************/ void SAL_CALL Frame::initialize( const css::uno::Reference< css::awt::XWindow >& xWindow ) throw( css::uno::RuntimeException ) { @@ -637,18 +637,18 @@ void SAL_CALL Frame::initialize( const css::uno::Reference< css::awt::XWindow >& } /*-****************************************************************************************************//** - @short returns current set container window - @descr The ContainerWindow property is used as a container for the component + @short returns current set container window + @descr The ContainerWindow property is used as a container for the component in this frame. So this object implements a container interface too. The instantiation of the container window is done by the user of this class. The frame is the owner of its container window. - @seealso method initialize() + @seealso method initialize() - @param - - @return A reference to current set containerwindow. + @param - + @return A reference to current set containerwindow. - @onerror A null reference is returned. + @onerror A null reference is returned. *//*-*****************************************************************************************************/ css::uno::Reference< css::awt::XWindow > SAL_CALL Frame::getContainerWindow() throw( css::uno::RuntimeException ) { @@ -663,8 +663,8 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL Frame::getContainerWindow() th } /*-****************************************************************************************************//** - @short set parent frame - @descr We need a parent to support some functionality! e.g. findFrame() + @short set parent frame + @descr We need a parent to support some functionality! e.g. findFrame() By the way we use the chance to set an internal information about our top state. So we must not check this information during every isTop() call. We are top, if our parent is the desktop instance or we havent any parent. @@ -695,15 +695,15 @@ void SAL_CALL Frame::setCreator( const css::uno::Reference< css::frame::XFramesS } /*-****************************************************************************************************//** - @short returns current parent frame - @descr The Creator is the parent frame container. If it is NULL, the frame is the uppermost one. + @short returns current parent frame + @descr The Creator is the parent frame container. If it is NULL, the frame is the uppermost one. - @seealso method setCreator() + @seealso method setCreator() - @param - - @return A reference to current set parent frame container. + @param - + @return A reference to current set parent frame container. - @onerror A null reference is returned. + @onerror A null reference is returned. *//*-*****************************************************************************************************/ css::uno::Reference< css::frame::XFramesSupplier > SAL_CALL Frame::getCreator() throw( css::uno::RuntimeException ) { @@ -718,15 +718,15 @@ css::uno::Reference< css::frame::XFramesSupplier > SAL_CALL Frame::getCreator() } /*-****************************************************************************************************//** - @short returns current set name of frame - @descr This name is used to find target of findFrame() or queryDispatch() calls. + @short returns current set name of frame + @descr This name is used to find target of findFrame() or queryDispatch() calls. - @seealso method setName() + @seealso method setName() - @param - - @return Current set name of frame. + @param - + @return Current set name of frame. - @onerror An empty string is returned. + @onerror An empty string is returned. *//*-*****************************************************************************************************/ ::rtl::OUString SAL_CALL Frame::getName() throw( css::uno::RuntimeException ) { @@ -737,18 +737,18 @@ css::uno::Reference< css::frame::XFramesSupplier > SAL_CALL Frame::getCreator() } /*-****************************************************************************************************//** - @short set new name for frame - @descr This name is used to find target of findFrame() or queryDispatch() calls. + @short set new name for frame + @descr This name is used to find target of findFrame() or queryDispatch() calls. - @attention Special names like "_blank", "_self" aren't allowed ... + @attention Special names like "_blank", "_self" aren't allowed ... "_beamer" or "_menubar" excepts this rule! - @seealso method getName() + @seealso method getName() - @param "sName", new frame name. - @return - + @param "sName", new frame name. + @return - - @onerror We do nothing. + @onerror We do nothing. *//*-*****************************************************************************************************/ void SAL_CALL Frame::setName( const ::rtl::OUString& sName ) throw( css::uno::RuntimeException ) { @@ -763,8 +763,8 @@ void SAL_CALL Frame::setName( const ::rtl::OUString& sName ) throw( css::uno::Ru } /*-****************************************************************************************************//** - @short search for frames - @descr This method searches for a frame with the specified name. + @short search for frames + @descr This method searches for a frame with the specified name. Frames may contain other frames (e.g. a frameset) and may be contained in other frames. This hierarchie ist searched by this method. @@ -1054,21 +1054,21 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const ::rtl } /*-****************************************************************************************************//** - @short - - @descr Returns sal_True, if this frame is a "top frame", otherwise sal_False. + @short - + @descr Returns sal_True, if this frame is a "top frame", otherwise sal_False. The "m_bIsFrameTop" member must be set in the ctor or setCreator() method. A top frame is a member of the top frame container or a member of the task frame container. Both containers can create new frames if the findFrame() method of their css::frame::XFrame interface is called with a frame name not yet known. - @seealso ctor - @seealso method setCreator() - @seealso method findFrame() + @seealso ctor + @seealso method setCreator() + @seealso method findFrame() - @param - - @return true, if is it a top frame ... false otherwise. + @param - + @return true, if is it a top frame ... false otherwise. - @onerror No error should occure! + @onerror No error should occure! *//*-*****************************************************************************************************/ sal_Bool SAL_CALL Frame::isTop() throw( css::uno::RuntimeException ) { @@ -1085,19 +1085,19 @@ sal_Bool SAL_CALL Frame::isTop() throw( css::uno::RuntimeException ) } /*-****************************************************************************************************//** - @short activate frame in hierarchy - @descr This feature is used to mark active pathes in our frame hierarchy. + @short activate frame in hierarchy + @descr This feature is used to mark active pathes in our frame hierarchy. You can be a listener for this event to react for it ... change some internal states or something else. - @seealso method deactivate() - @seealso method isActivate() - @seealso enum EActiveState - @seealso listener mechanism + @seealso method deactivate() + @seealso method isActivate() + @seealso enum EActiveState + @seealso listener mechanism - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ void SAL_CALL Frame::activate() throw( css::uno::RuntimeException ) { @@ -1185,19 +1185,19 @@ void SAL_CALL Frame::activate() throw( css::uno::RuntimeException ) } /*-****************************************************************************************************//** - @short deactivate frame in hierarchy - @descr This feature is used to deactive pathes in our frame hierarchy. + @short deactivate frame in hierarchy + @descr This feature is used to deactive pathes in our frame hierarchy. You can be a listener for this event to react for it ... change some internal states or something else. - @seealso method activate() - @seealso method isActivate() - @seealso enum EActiveState - @seealso listener mechanism + @seealso method activate() + @seealso method isActivate() + @seealso enum EActiveState + @seealso listener mechanism - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ void SAL_CALL Frame::deactivate() throw( css::uno::RuntimeException ) { @@ -1274,17 +1274,17 @@ void SAL_CALL Frame::deactivate() throw( css::uno::RuntimeException ) } /*-****************************************************************************************************//** - @short returns active state - @descr Call it to get informations about current active state of this frame. + @short returns active state + @descr Call it to get informations about current active state of this frame. - @seealso method activate() - @seealso method deactivate() - @seealso enum EActiveState + @seealso method activate() + @seealso method deactivate() + @seealso enum EActiveState - @param - - @return true if active, false otherwise. + @param - + @return true if active, false otherwise. - @onerror No error should occure. + @onerror No error should occure. *//*-*****************************************************************************************************/ sal_Bool SAL_CALL Frame::isActive() throw( css::uno::RuntimeException ) { @@ -1302,15 +1302,15 @@ sal_Bool SAL_CALL Frame::isActive() throw( css::uno::RuntimeException ) } /*-****************************************************************************************************//** - @short ??? - @descr - + @short ??? + @descr - - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ void SAL_CALL Frame::contextChanged() throw( css::uno::RuntimeException ) { @@ -1323,8 +1323,8 @@ void SAL_CALL Frame::contextChanged() throw( css::uno::RuntimeException ) } /*-****************************************************************************************************//** - @short set new component inside the frame - @descr A frame is a container for a component. Use this method to set, change or realease it! + @short set new component inside the frame + @descr A frame is a container for a component. Use this method to set, change or realease it! We accept null references! The xComponentWindow will be a child of our container window and get all window events from us. @@ -1335,8 +1335,8 @@ void SAL_CALL Frame::contextChanged() throw( css::uno::RuntimeException ) (b2) a full featured component which supports window and controller; (b3) or both to NULL if outside code which to forget this component. - @seealso method getComponentWindow() - @seealso method getController() + @seealso method getComponentWindow() + @seealso method getController() @param xComponentWindow valid reference to new component window which will be a child of internal container window @@ -1501,8 +1501,8 @@ sal_Bool SAL_CALL Frame::setComponent( const css::uno::Reference< css::awt::X } /*-****************************************************************************************************//** - @short returns current set component window - @descr Frames are used to display components. The actual displayed component is + @short returns current set component window + @descr Frames are used to display components. The actual displayed component is held by the m_xComponentWindow property. If the component implements only a XComponent interface, the communication between the frame and the component is very restricted. Better integration is achievable through a @@ -1511,12 +1511,12 @@ sal_Bool SAL_CALL Frame::setComponent( const css::uno::Reference< css::awt::X ResourceDescriptor it has to implement a XModel interface. This frame is the owner of the component window. - @seealso method setComponent() + @seealso method setComponent() - @param - + @param - @return css::uno::Reference to current set component window. - @onerror A null reference is returned. + @onerror A null reference is returned. *//*-*****************************************************************************************************/ css::uno::Reference< css::awt::XWindow > SAL_CALL Frame::getComponentWindow() throw( css::uno::RuntimeException ) { @@ -1531,8 +1531,8 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL Frame::getComponentWindow() th } /*-****************************************************************************************************//** - @short returns current set controller - @descr Frames are used to display components. The actual displayed component is + @short returns current set controller + @descr Frames are used to display components. The actual displayed component is held by the m_xComponentWindow property. If the component implements only a XComponent interface, the communication between the frame and the component is very restricted. Better integration is achievable through a @@ -1541,12 +1541,12 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL Frame::getComponentWindow() th ResourceDescriptor it has to implement a XModel interface. This frame is the owner of the component window. - @seealso method setComponent() + @seealso method setComponent() - @param - + @param - @return css::uno::Reference to current set controller. - @onerror A null reference is returned. + @onerror A null reference is returned. *//*-*****************************************************************************************************/ css::uno::Reference< css::frame::XController > SAL_CALL Frame::getController() throw( css::uno::RuntimeException ) { @@ -1562,17 +1562,17 @@ css::uno::Reference< css::frame::XController > SAL_CALL Frame::getController() t } /*-****************************************************************************************************//** - @short add/remove listener for activate/deactivate/contextChanged events - @descr - + @short add/remove listener for activate/deactivate/contextChanged events + @descr - - @seealso method activate() - @seealso method deactivate() - @seealso method contextChanged() + @seealso method activate() + @seealso method deactivate() + @seealso method contextChanged() - @param "xListener" reference to your listener object - @return - + @param "xListener" reference to your listener object + @return - - @onerror Listener is ignored. + @onerror Listener is ignored. *//*-*****************************************************************************************************/ void SAL_CALL Frame::addFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& xListener ) throw( css::uno::RuntimeException ) { @@ -1716,7 +1716,7 @@ void SAL_CALL Frame::close( sal_Bool bDeliverOwnerShip ) throw( css::util::Close @param xListener reference to your listener object - @onerror Listener is ignored. + @onerror Listener is ignored. @threadsafe yes @modified 06.05.2002 10:03, as96863 @@ -1836,23 +1836,23 @@ void Frame::implts_forgetSubFrames() } /*-****************************************************************************************************//** - @short destroy instance - @descr The owner of this object calles the dispose method if the object + @short destroy instance + @descr The owner of this object calles the dispose method if the object should be destroyed. All other objects and components, that are registered as an EventListener are forced to release their references to this object. Furthermore this frame is removed from its parent frame container to release this reference. The reference attributes are disposed and released also. - @attention Look for globale description at beginning of file too! + @attention Look for globale description at beginning of file too! (DisposedException, FairRWLock ..., initialize, dispose) - @seealso method initialize() - @seealso baseclass FairRWLockBase! + @seealso method initialize() + @seealso baseclass FairRWLockBase! - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ void SAL_CALL Frame::dispose() throw( css::uno::RuntimeException ) { @@ -1979,16 +1979,16 @@ void SAL_CALL Frame::dispose() throw( css::uno::RuntimeException ) } /*-****************************************************************************************************//** - @short Be a listener for dispose events! - @descr Adds/remove an EventListener to this object. If the dispose method is called on + @short Be a listener for dispose events! + @descr Adds/remove an EventListener to this object. If the dispose method is called on this object, the disposing method of the listener is called. - @seealso - + @seealso - - @param "xListener" reference to your listener object. - @return - + @param "xListener" reference to your listener object. + @return - - @onerror Listener is ignored. + @onerror Listener is ignored. *//*-*****************************************************************************************************/ void SAL_CALL Frame::addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw( css::uno::RuntimeException ) { @@ -2019,17 +2019,17 @@ void SAL_CALL Frame::removeEventListener( const css::uno::Reference< css::lang:: } /*-****************************************************************************************************//** - @short create new status indicator - @descr Use returned status indicator to show progresses and some text informations. + @short create new status indicator + @descr Use returned status indicator to show progresses and some text informations. All created objects share the same dialog! Only the last one can show his information. @seealso class StatusIndicatorFactory @seealso class StatusIndicator - @param - - @return A reference to created object. + @param - + @return A reference to created object. - @onerror We return a null reference. + @onerror We return a null reference. *//*-*****************************************************************************************************/ css::uno::Reference< css::task::XStatusIndicator > SAL_CALL Frame::createStatusIndicator() throw( css::uno::RuntimeException ) { @@ -2059,22 +2059,22 @@ css::uno::Reference< css::task::XStatusIndicator > SAL_CALL Frame::createStatusI } /*-****************************************************************************************************//** - @short search for target to load URL - @descr This method searches for a dispatch for the specified DispatchDescriptor. + @short search for target to load URL + @descr This method searches for a dispatch for the specified DispatchDescriptor. The FrameSearchFlags and the FrameName of the DispatchDescriptor are treated as described for findFrame. - @seealso method findFrame() - @seealso method queryDispatches() - @seealso method set/getName() - @seealso class TargetFinder + @seealso method findFrame() + @seealso method queryDispatches() + @seealso method set/getName() + @seealso class TargetFinder - @param "aURL" , URL for loading - @param "sTargetFrameName" , name of target frame - @param "nSearchFlags" , additional flags to regulate search if sTargetFrameName isn't clear + @param "aURL" , URL for loading + @param "sTargetFrameName" , name of target frame + @param "nSearchFlags" , additional flags to regulate search if sTargetFrameName isn't clear @return css::uno::Reference to dispatch handler. - @onerror A null reference is returned. + @onerror A null reference is returned. *//*-*****************************************************************************************************/ css::uno::Reference< css::frame::XDispatch > SAL_CALL Frame::queryDispatch( const css::util::URL& aURL , const ::rtl::OUString& sTargetFrameName, @@ -2104,16 +2104,16 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL Frame::queryDispatch( cons } /*-****************************************************************************************************//** - @short handle more then ones dispatches at same call + @short handle more then ones dispatches at same call @descr Returns a sequence of dispatches. For details see the queryDispatch method. For failed dispatches we return empty items in list! - @seealso method queryDispatch() + @seealso method queryDispatch() - @param "lDescriptor" list of dispatch arguments for queryDispatch()! - @return List of dispatch references. Some elements can be NULL! + @param "lDescriptor" list of dispatch arguments for queryDispatch()! + @return List of dispatch references. Some elements can be NULL! - @onerror An empty list is returned. + @onerror An empty list is returned. *//*-*****************************************************************************************************/ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Frame::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) throw( css::uno::RuntimeException ) { @@ -2127,16 +2127,16 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Fram } /*-****************************************************************************************************//** - @short register/unregister interceptor for dispatch calls - @descr If you whish to handle some dispatches by himself ... you should be + @short register/unregister interceptor for dispatch calls + @descr If you whish to handle some dispatches by himself ... you should be an interceptor for it. Please see class OInterceptionHelper for further informations. - @seealso class OInterceptionHelper + @seealso class OInterceptionHelper - @param "xInterceptor", reference to your interceptor implementation. - @return - + @param "xInterceptor", reference to your interceptor implementation. + @return - - @onerror Interceptor is ignored. + @onerror Interceptor is ignored. *//*-*****************************************************************************************************/ void SAL_CALL Frame::registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor ) throw( css::uno::RuntimeException ) { @@ -2165,7 +2165,7 @@ void SAL_CALL Frame::releaseDispatchProviderInterceptor( const css::uno::Referen } /*-****************************************************************************************************//** - @short provides information about all possible dispatch functions + @short provides information about all possible dispatch functions inside the currnt frame environment *//*-*****************************************************************************************************/ css::uno::Sequence< sal_Int16 > SAL_CALL Frame::getSupportedCommandGroups() @@ -2182,17 +2182,17 @@ css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL Frame::getConfigu } /*-****************************************************************************************************//** - @short notifications for window events - @descr We are a listener on our container window to forward it to our component window. + @short notifications for window events + @descr We are a listener on our container window to forward it to our component window. - @seealso method setComponent() - @seealso member m_xContainerWindow - @seealso member m_xComponentWindow + @seealso method setComponent() + @seealso member m_xContainerWindow + @seealso member m_xComponentWindow - @param "aEvent" describe source of detected event - @return - + @param "aEvent" describe source of detected event + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ void SAL_CALL Frame::windowResized( const css::awt::WindowEvent& #if OSL_DEBUG_LEVEL > 0 @@ -2241,18 +2241,18 @@ aEvent } /*-****************************************************************************************************//** - @short notifications for window events - @descr We are a listener on our container window to forward it to our component window ... + @short notifications for window events + @descr We are a listener on our container window to forward it to our component window ... but a XTopWindowListener we are only if we are a top frame! - @seealso method setComponent() - @seealso member m_xContainerWindow - @seealso member m_xComponentWindow + @seealso method setComponent() + @seealso member m_xContainerWindow + @seealso member m_xComponentWindow - @param "aEvent" describe source of detected event - @return - + @param "aEvent" describe source of detected event + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ void SAL_CALL Frame::windowActivated( const css::lang::EventObject& #if OSL_DEBUG_LEVEL > 0 @@ -2453,19 +2453,19 @@ void SAL_CALL Frame::windowHidden( const css::lang::EventObject& ) throw(css::un } /*-****************************************************************************************************//** - @short called by dispose of our windows! - @descr This object is forced to release all references to the interfaces given + @short called by dispose of our windows! + @descr This object is forced to release all references to the interfaces given by the parameter source. We are a listener at our container window and should listen for his diposing. - @seealso XWindowListener - @seealso XTopWindowListener - @seealso XFocusListener + @seealso XWindowListener + @seealso XTopWindowListener + @seealso XFocusListener - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ void SAL_CALL Frame::disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException ) { @@ -2730,7 +2730,7 @@ css::uno::Any SAL_CALL Frame::impl_getPropertyValue(const ::rtl::OUString& /*sPr @short dispose old container window and forget his reference @descr Sometimes we must repair our "modal dialog parent mechanism" too! - @seealso - + @seealso - @param "xWindow", reference to old container window to dispose it @return An empty reference. @@ -2751,15 +2751,15 @@ void Frame::impl_disposeContainerWindow( css::uno::Reference< css::awt::XWindow } /*-****************************************************************************************************//** - @short send frame action event to our listener - @descr This method is threadsafe AND can be called by our dispose method too! + @short send frame action event to our listener + @descr This method is threadsafe AND can be called by our dispose method too! - @seealso - + @seealso - - @param "aAction", describe the event for sending - @return - + @param "aAction", describe the event for sending + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ void Frame::implts_sendFrameActionEvent( const css::frame::FrameAction& aAction ) { @@ -2801,17 +2801,17 @@ void Frame::implts_sendFrameActionEvent( const css::frame::FrameAction& aAction } /*-****************************************************************************************************//** - @short helper to resize our component window - @descr A frame contains 2 windows - a container ~ and a component window. + @short helper to resize our component window + @descr A frame contains 2 windows - a container ~ and a component window. This method resize inner component window to full size of outer container window. This method is threadsafe AND can be called by our dispose method too! - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ void Frame::implts_resizeComponentWindow() { @@ -3194,7 +3194,7 @@ void Frame::impl_checkMenuCloser() } //_________________________________________________________________________________________________________________ -// debug methods +// debug methods //_________________________________________________________________________________________________________________ /*----------------------------------------------------------------------------------------------------------------- @@ -3208,9 +3208,9 @@ void Frame::impl_checkMenuCloser() // We don't accept null pointer or references! sal_Bool Frame::implcp_ctor( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ) { - return ( - ( &xFactory == NULL ) || - ( xFactory.is() == sal_False ) + return ( + ( &xFactory == NULL ) || + ( xFactory.is() == sal_False ) ); } @@ -3219,7 +3219,7 @@ sal_Bool Frame::implcp_ctor( const css::uno::Reference< css::lang::XMultiService // And we accept frames only! No tasks and desktops! sal_Bool Frame::implcp_setActiveFrame( const css::uno::Reference< css::frame::XFrame >& xFrame ) { - return ( + return ( ( &xFrame == NULL ) || ( css::uno::Reference< css::frame::XDesktop >( xFrame, css::uno::UNO_QUERY ).is() == sal_True ) ); @@ -3228,84 +3228,84 @@ sal_Bool Frame::implcp_setActiveFrame( const css::uno::Reference< css::frame::XF //***************************************************************************************************************** sal_Bool Frame::implcp_addFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& xListener ) { - return ( - ( &xListener == NULL ) || - ( xListener.is() == sal_False ) + return ( + ( &xListener == NULL ) || + ( xListener.is() == sal_False ) ); } //***************************************************************************************************************** sal_Bool Frame::implcp_removeFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& xListener ) { - return ( - ( &xListener == NULL ) || - ( xListener.is() == sal_False ) + return ( + ( &xListener == NULL ) || + ( xListener.is() == sal_False ) ); } //***************************************************************************************************************** sal_Bool Frame::implcp_addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) { - return ( - ( &xListener == NULL ) || - ( xListener.is() == sal_False ) + return ( + ( &xListener == NULL ) || + ( xListener.is() == sal_False ) ); } //***************************************************************************************************************** sal_Bool Frame::implcp_removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) { - return ( - ( &xListener == NULL ) || - ( xListener.is() == sal_False ) + return ( + ( &xListener == NULL ) || + ( xListener.is() == sal_False ) ); } //***************************************************************************************************************** sal_Bool Frame::implcp_windowResized( const css::awt::WindowEvent& aEvent ) { - return ( - ( &aEvent == NULL ) || - ( aEvent.Source.is() == sal_False ) + return ( + ( &aEvent == NULL ) || + ( aEvent.Source.is() == sal_False ) ); } //***************************************************************************************************************** sal_Bool Frame::implcp_focusGained( const css::awt::FocusEvent& aEvent ) { - return ( - ( &aEvent == NULL ) || - ( aEvent.Source.is() == sal_False ) + return ( + ( &aEvent == NULL ) || + ( aEvent.Source.is() == sal_False ) ); } //***************************************************************************************************************** sal_Bool Frame::implcp_windowActivated( const css::lang::EventObject& aEvent ) { - return ( - ( &aEvent == NULL ) || - ( aEvent.Source.is() == sal_False ) + return ( + ( &aEvent == NULL ) || + ( aEvent.Source.is() == sal_False ) ); } //***************************************************************************************************************** sal_Bool Frame::implcp_windowDeactivated( const css::lang::EventObject& aEvent ) { - return ( - ( &aEvent == NULL ) || - ( aEvent.Source.is() == sal_False ) + return ( + ( &aEvent == NULL ) || + ( aEvent.Source.is() == sal_False ) ); } //***************************************************************************************************************** sal_Bool Frame::implcp_disposing( const css::lang::EventObject& aEvent ) { - return ( - ( &aEvent == NULL ) || - ( aEvent.Source.is() == sal_False ) + return ( + ( &aEvent == NULL ) || + ( aEvent.Source.is() == sal_False ) ); } -#endif // #ifdef ENABLE_ASSERTIONS +#endif // #ifdef ENABLE_ASSERTIONS -} // namespace framework +} // namespace framework diff --git a/framework/source/services/fwk_services.src b/framework/source/services/fwk_services.src index ea22db175e4c..ef037c75778a 100644 --- a/framework/source/services/fwk_services.src +++ b/framework/source/services/fwk_services.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx index 064c3b0ac8fb..18f3e21bf67d 100644 --- a/framework/source/services/license.cxx +++ b/framework/source/services/license.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <services/license.hxx> #include <threadhelp/resetableguard.hxx> @@ -41,7 +41,7 @@ #include "classes/resource.hrc" //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/frame/XDesktop.hpp> @@ -54,7 +54,7 @@ //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <rtl/ustrbuf.hxx> @@ -73,21 +73,21 @@ #include <osl/time.h> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ using namespace utl; -using namespace ::osl ; -using namespace ::cppu ; -using namespace ::com::sun::star::uno ; -using namespace ::com::sun::star::beans ; -using namespace ::com::sun::star::lang ; -using namespace ::com::sun::star::util ; -using namespace ::com::sun::star::frame ; +using namespace ::osl ; +using namespace ::cppu ; +using namespace ::com::sun::star::uno ; +using namespace ::com::sun::star::beans ; +using namespace ::com::sun::star::lang ; +using namespace ::com::sun::star::util ; +using namespace ::com::sun::star::frame ; //_________________________________________________________________________________________________________________ -// non exported const +// non exported const //_________________________________________________________________________________________________________________ // license file name @@ -101,23 +101,23 @@ static const char *szWNTLicenseExt = ".txt"; #endif //_________________________________________________________________________________________________________________ -// non exported definitions +// non exported definitions //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** License::License( const Reference< XMultiServiceFactory >& xFactory ) - // Init baseclasses first - // Attention: - // Don't change order of initialization! + // Init baseclasses first + // Attention: + // Don't change order of initialization! // ThreadHelpBase is a struct with a mutex as member. We can't use a mutex as member, while - // we must garant right initialization and a valid value of this! First initialize - // baseclasses and then members. And we need the mutex for other baseclasses !!! + // we must garant right initialization and a valid value of this! First initialize + // baseclasses and then members. And we need the mutex for other baseclasses !!! : ThreadHelpBase ( &Application::GetSolarMutex() ) , OWeakObject ( ) // Init member @@ -127,34 +127,34 @@ License::License( const Reference< XMultiServiceFactory >& xFactory ) } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** License::~License() { } //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** -DEFINE_XINTERFACE_4 ( License , - OWeakObject , +DEFINE_XINTERFACE_4 ( License , + OWeakObject , DIRECT_INTERFACE(XTypeProvider ), DIRECT_INTERFACE(XServiceInfo ), - DIRECT_INTERFACE(XJob ), + DIRECT_INTERFACE(XJob ), DIRECT_INTERFACE(XCloseable ) ) -DEFINE_XTYPEPROVIDER_4 ( License , - XTypeProvider , - XServiceInfo , +DEFINE_XTYPEPROVIDER_4 ( License , + XTypeProvider , + XServiceInfo , XJob , XCloseable ) -DEFINE_XSERVICEINFO_MULTISERVICE ( License, +DEFINE_XSERVICEINFO_MULTISERVICE ( License, OWeakObject , - SERVICENAME_LICENSE , + SERVICENAME_LICENSE , IMPLEMENTATIONNAME_LICENSE ) @@ -627,5 +627,5 @@ void LicenseView::Notify( SfxBroadcaster&, const SfxHint& rHint ) } } -} // namespace framework +} // namespace framework diff --git a/framework/source/services/mediatypedetectionhelper.cxx b/framework/source/services/mediatypedetectionhelper.cxx index f1934193c489..1033cbda7913 100644 --- a/framework/source/services/mediatypedetectionhelper.cxx +++ b/framework/source/services/mediatypedetectionhelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <services/mediatypedetectionhelper.hxx> #include <services.h> @@ -38,25 +38,25 @@ #include <rtl/logfile.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework { -using namespace ::com::sun::star ; -using namespace ::rtl ; +using namespace ::com::sun::star ; +using namespace ::rtl ; //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** MediaTypeDetectionHelper::MediaTypeDetectionHelper( const uno::Reference< lang::XMultiServiceFactory >& xFactory ) : m_xFactory( xFactory ) @@ -64,13 +64,13 @@ MediaTypeDetectionHelper::MediaTypeDetectionHelper( const uno::Reference< lang:: } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** MediaTypeDetectionHelper::~MediaTypeDetectionHelper() { } -DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( MediaTypeDetectionHelper +DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( MediaTypeDetectionHelper , ::cppu::OWeakObject , SERVICENAME_MEDIATYPEDETECTIONHELPER , IMPLEMENTATIONNAME_MEDIATYPEDETECTIONHELPER @@ -82,7 +82,7 @@ DEFINE_INIT_SERVICE ( MediaTypeDetectionHelper, ) //***************************************************************************************************************** -// XStringMapping +// XStringMapping //***************************************************************************************************************** //virtual @@ -107,5 +107,5 @@ sal_Bool SAL_CALL MediaTypeDetectionHelper::mapStrings( return bModified; } -} // namespace framework +} // namespace framework diff --git a/framework/source/services/menudocumenthandler.cxx b/framework/source/services/menudocumenthandler.cxx index 0fb110c3a34e..8741fff39320 100644 --- a/framework/source/services/menudocumenthandler.cxx +++ b/framework/source/services/menudocumenthandler.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ #ifndef __COM_SUN_STAR_XML_SAX_XEXTENDEDDOCUMENTHANDLER_HPP_ #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> -#endif +#endif using namespace ::rtl; @@ -48,43 +48,43 @@ using namespace ::com::sun::star::xml::sax; const int ITEMID_START_VALUE = 1000; -#define XMLNS_MENU "http://openoffice.org/2001/menu" -#define XMLNS_PREFIX "menu:" +#define XMLNS_MENU "http://openoffice.org/2001/menu" +#define XMLNS_PREFIX "menu:" -#define ELEMENT_MENUBAR "http://openoffice.org/2001/menu^menubar" -#define ELEMENT_MENU "http://openoffice.org/2001/menu^menu" -#define ELEMENT_MENUPOPUP "http://openoffice.org/2001/menu^menupopup" -#define ELEMENT_MENUITEM "http://openoffice.org/2001/menu^menuitem" -#define ELEMENT_MENUSEPARATOR "http://openoffice.org/2001/menu^menuseparator" +#define ELEMENT_MENUBAR "http://openoffice.org/2001/menu^menubar" +#define ELEMENT_MENU "http://openoffice.org/2001/menu^menu" +#define ELEMENT_MENUPOPUP "http://openoffice.org/2001/menu^menupopup" +#define ELEMENT_MENUITEM "http://openoffice.org/2001/menu^menuitem" +#define ELEMENT_MENUSEPARATOR "http://openoffice.org/2001/menu^menuseparator" -#define ELEMENT_NS_MENUBAR "menu:menubar" -#define ELEMENT_NS_MENU "menu:menu" -#define ELEMENT_NS_MENUPOPUP "menu:menupopup" -#define ELEMENT_NS_MENUITEM "menu:menuitem" -#define ELEMENT_NS_MENUSEPARATOR "menu:menuseparator" +#define ELEMENT_NS_MENUBAR "menu:menubar" +#define ELEMENT_NS_MENU "menu:menu" +#define ELEMENT_NS_MENUPOPUP "menu:menupopup" +#define ELEMENT_NS_MENUITEM "menu:menuitem" +#define ELEMENT_NS_MENUSEPARATOR "menu:menuseparator" -#define ATTRIBUTE_ID "http://openoffice.org/2001/menu^id" -#define ATTRIBUTE_LABEL "http://openoffice.org/2001/menu^label" -#define ATTRIBUTE_HELPID "http://openoffice.org/2001/menu^helpid" -#define ATTRIBUTE_LINEBREAK "http://openoffice.org/2001/menu^linebreak" +#define ATTRIBUTE_ID "http://openoffice.org/2001/menu^id" +#define ATTRIBUTE_LABEL "http://openoffice.org/2001/menu^label" +#define ATTRIBUTE_HELPID "http://openoffice.org/2001/menu^helpid" +#define ATTRIBUTE_LINEBREAK "http://openoffice.org/2001/menu^linebreak" -#define ATTRIBUTE_NS_ID "menu:id" -#define ATTRIBUTE_NS_LABEL "menu:label" -#define ATTRIBUTE_NS_HELPID "menu:helpid" -#define ATTRIBUTE_NS_LINEBREAK "menu:linebreak" +#define ATTRIBUTE_NS_ID "menu:id" +#define ATTRIBUTE_NS_LABEL "menu:label" +#define ATTRIBUTE_NS_HELPID "menu:helpid" +#define ATTRIBUTE_NS_LINEBREAK "menu:linebreak" -#define ATTRIBUTE_XMLNS_MENU "xmlns:menu" +#define ATTRIBUTE_XMLNS_MENU "xmlns:menu" -#define ATTRIBUTE_TYPE_CDATA "CDATA" +#define ATTRIBUTE_TYPE_CDATA "CDATA" -#define MENUBAR_DOCTYPE "<!DOCTYPE menu:menubar PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"menubar.dtd\">" +#define MENUBAR_DOCTYPE "<!DOCTYPE menu:menubar PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"menubar.dtd\">" // special popup menus (filled during runtime) must be saved as a menuitem!!! // same as in menumanager.cxx - you have to change both files!!! -#define SID_SFX_START 5000 -#define SID_NEWDOCDIRECT (SID_SFX_START + 537) -#define SID_AUTOPILOTMENU (SID_SFX_START + 1381) +#define SID_SFX_START 5000 +#define SID_NEWDOCDIRECT (SID_SFX_START + 537) +#define SID_AUTOPILOTMENU (SID_SFX_START + 1381) #define SID_FORMATMENU (SID_SFX_START + 780) const ::rtl::OUString aSlotProtocol( RTL_CONSTASCII_USTRINGPARAM( "slot:" )); @@ -94,7 +94,7 @@ const ::rtl::OUString aSlotAutoPilot( RTL_CONSTASCII_USTRINGPARAM( "slot:6381" ) const ::rtl::OUString aSpecialFileMenu( RTL_CONSTASCII_USTRINGPARAM( "file" )); const ::rtl::OUString aSpecialWindowMenu( RTL_CONSTASCII_USTRINGPARAM( "window" )); -const ULONG MENU_SAVE_LABEL = 0x00000001; +const ULONG MENU_SAVE_LABEL = 0x00000001; namespace framework { @@ -139,7 +139,7 @@ throw( SAXException, RuntimeException ) void SAL_CALL ReadMenuDocumentHandlerBase::setDocumentLocator( const Reference< XLocator > &xLocator) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { m_xLocator = xLocator; } @@ -160,10 +160,10 @@ throw( SAXException, RuntimeException ) // ----------------------------------------------------------------------------- // #110897# -OReadMenuDocumentHandler::OReadMenuDocumentHandler( +OReadMenuDocumentHandler::OReadMenuDocumentHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, MenuBar* pMenuBar ) -: // #110897# +: // #110897# mxServiceFactory(xServiceFactory), m_pMenuBar( pMenuBar ), m_nElementDepth( 0 ), @@ -215,17 +215,17 @@ throw( SAXException, RuntimeException ) { ++m_nElementDepth; m_bMenuBarMode = sal_True; - + // #110897# m_xReader = Reference< XDocumentHandler >( new OReadMenuBarHandler( m_pMenuBar, &m_nItemId )); m_xReader = Reference< XDocumentHandler >( new OReadMenuBarHandler( getServiceFactory(), m_pMenuBar, &m_nItemId )); - + m_xReader->startDocument(); } } void SAL_CALL OReadMenuDocumentHandler::characters(const rtl::OUString& aChars) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { } @@ -257,10 +257,10 @@ void SAL_CALL OReadMenuDocumentHandler::endElement( const OUString& aName ) // #110897# -OReadMenuBarHandler::OReadMenuBarHandler( +OReadMenuBarHandler::OReadMenuBarHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, - MenuBar* pMenuBar, USHORT* pItemId ) -: // #110897# + MenuBar* pMenuBar, USHORT* pItemId ) +: // #110897# mxServiceFactory( xServiceFactory ), m_pMenuBar( pMenuBar ), m_nElementDepth( 0 ), @@ -306,7 +306,7 @@ throw( SAXException, RuntimeException ) { ++m_nElementDepth; - ULONG nHelpId = 0; + ULONG nHelpId = 0; OUString aCommandId; OUString aLabel; @@ -370,7 +370,7 @@ throw( SAXException, RuntimeException ) void SAL_CALL OReadMenuBarHandler::characters(const rtl::OUString& aChars) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { } @@ -454,7 +454,7 @@ throw( SAXException, RuntimeException ) void SAL_CALL OReadMenuHandler::characters(const rtl::OUString& aChars) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { } @@ -523,7 +523,7 @@ throw( SAXException, RuntimeException ) m_xReader->startElement( aName, xAttrList ); else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENU ))) { - ULONG nHelpId = 0; + ULONG nHelpId = 0; OUString aCommandId; OUString aLabel; @@ -579,7 +579,7 @@ throw( SAXException, RuntimeException ) } else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENUITEM ))) { - ULONG nHelpId = 0; + ULONG nHelpId = 0; OUString aCommandId; OUString aLabel; @@ -636,7 +636,7 @@ throw( SAXException, RuntimeException ) void SAL_CALL OReadMenuPopupHandler::characters(const rtl::OUString& aChars) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { } @@ -696,7 +696,7 @@ OWriteMenuDocumentHandler::OWriteMenuDocumentHandler( MenuBar* pMenu, Reference< m_xWriteDocumentHandler( rxWriteDocumentHandler ) { m_xEmptyList = Reference< XAttributeList >( (XAttributeList *)new AttributeListImpl, UNO_QUERY ); - m_aAttributeType = OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_TYPE_CDATA )); + m_aAttributeType = OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_TYPE_CDATA )); } diff --git a/framework/source/services/modulemanager.cxx b/framework/source/services/modulemanager.cxx index c6320a91c8d3..396a9650e3f7 100644 --- a/framework/source/services/modulemanager.cxx +++ b/framework/source/services/modulemanager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -162,7 +162,7 @@ ModuleManager::~ModuleManager() // Means: model -> controller -> window // No fallbacks to higher components are allowed ! // Note : A frame provides access to module components only ... but it's not a module by himself. - + ::rtl::OUString sModule; if (xModel.is()) sModule = implts_identify(xModel); @@ -172,12 +172,12 @@ ModuleManager::~ModuleManager() else if (xWindow.is()) sModule = implts_identify(xWindow); - + if (sModule.getLength() < 1) throw css::frame::UnknownModuleException( ::rtl::OUString::createFromAscii("Cant find suitable module for the given component."), static_cast< ::cppu::OWeakObject* >(this)); - + return sModule; } @@ -233,7 +233,7 @@ void SAL_CALL ModuleManager::replaceByName(const ::rtl::OUString& sName , { const ::rtl::OUString& sPropName = pProp->first; const css::uno::Any& aPropValue = pProp->second; - + // let "NoSuchElementException" out ! We support the same API ... // and without a flush() at the end all changed data before will be ignored ! xModule->replaceByName(sPropName, aPropValue); @@ -343,14 +343,14 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL ModuleManager::crea { const ::rtl::OUString& sModule = lModules[i]; ::comphelper::SequenceAsHashMap lModuleProps = getByName(sModule); - + if (lModuleProps.match(lSearchProps)) lResult.push_back(css::uno::makeAny(lModuleProps.getAsConstPropertyValueList())); } catch(const css::uno::Exception&) {} } - + ::comphelper::OAnyEnumeration* pEnum = new ::comphelper::OAnyEnumeration(lResult.getAsConstList()); css::uno::Reference< css::container::XEnumeration > xEnum(static_cast< css::container::XEnumeration* >(pEnum), css::uno::UNO_QUERY_THROW); return xEnum; @@ -402,7 +402,7 @@ css::uno::Reference< css::container::XNameAccess > ModuleManager::implts_getConf if (xModule.is()) return xModule->getIdentifier(); - // detect modules in a generic way ... + // detect modules in a generic way ... // comparing service names with configured entries ... css::uno::Reference< css::lang::XServiceInfo > xInfo(xComponent, css::uno::UNO_QUERY); if (!xInfo.is()) @@ -412,7 +412,7 @@ css::uno::Reference< css::container::XNameAccess > ModuleManager::implts_getConf const ::rtl::OUString* pKnownModules = lKnownModules.getConstArray(); sal_Int32 c = lKnownModules.getLength(); sal_Int32 i = 0; - + for (i=0; i<c; ++i) { if (xInfo->supportsService(pKnownModules[i])) diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx index cbdf12fe1643..5227cb9f302c 100644 --- a/framework/source/services/pathsettings.cxx +++ b/framework/source/services/pathsettings.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,7 +58,7 @@ #include <unotools/configpathes.hxx> // ______________________________________________ -// non exported const +// non exported const #define CFG_READONLY_DEFAULT sal_False @@ -91,7 +91,7 @@ sal_Int32 impl_getPropGroup(sal_Int32 nID) } // ______________________________________________ -// namespace +// namespace namespace framework { @@ -99,24 +99,24 @@ namespace framework //----------------------------------------------------------------------------- // XInterface, XTypeProvider, XServiceInfo -DEFINE_XINTERFACE_7 ( PathSettings , +DEFINE_XINTERFACE_7 ( PathSettings , OWeakObject , DIRECT_INTERFACE ( css::lang::XTypeProvider ), DIRECT_INTERFACE ( css::lang::XServiceInfo ), DERIVED_INTERFACE( css::lang::XEventListener, css::util::XChangesListener), DIRECT_INTERFACE ( css::util::XChangesListener ), - DIRECT_INTERFACE ( css::beans::XPropertySet ), - DIRECT_INTERFACE ( css::beans::XFastPropertySet ), - DIRECT_INTERFACE ( css::beans::XMultiPropertySet ) + DIRECT_INTERFACE ( css::beans::XPropertySet ), + DIRECT_INTERFACE ( css::beans::XFastPropertySet ), + DIRECT_INTERFACE ( css::beans::XMultiPropertySet ) ) -DEFINE_XTYPEPROVIDER_7 ( PathSettings , +DEFINE_XTYPEPROVIDER_7 ( PathSettings , css::lang::XTypeProvider , css::lang::XServiceInfo , css::lang::XEventListener , css::util::XChangesListener , - css::beans::XPropertySet , - css::beans::XFastPropertySet , + css::beans::XPropertySet , + css::beans::XFastPropertySet , css::beans::XMultiPropertySet ) @@ -141,7 +141,7 @@ DEFINE_INIT_SERVICE ( PathSettings, //----------------------------------------------------------------------------- PathSettings::PathSettings( const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR ) - // Init baseclasses first + // Init baseclasses first // Attention: Don't change order of initialization! // ThreadHelpBase is a struct with a lock as member. We can't use a lock as direct member! // We must garant right initialization and a valid value of this to initialize other baseclasses! @@ -288,7 +288,7 @@ PathSettings::PathInfo PathSettings::impl_readNewFormat(const ::rtl::OUString& s // read state props xPath->getByName(CFGPROP_ISSINGLEPATH) >>= aPathVal.bIsSinglePath; - + // analyze finalized/mandatory states aPathVal.bIsReadonly = sal_False; css::uno::Reference< css::beans::XProperty > xInfo(xPath, css::uno::UNO_QUERY); @@ -297,7 +297,7 @@ PathSettings::PathInfo PathSettings::impl_readNewFormat(const ::rtl::OUString& s css::beans::Property aInfo = xInfo->getAsProperty(); sal_Bool bFinalized = ((aInfo.Attributes & css::beans::PropertyAttribute::READONLY ) == css::beans::PropertyAttribute::READONLY ); //sal_Bool bMandatory = ((aInfo.Attributes & css::beans::PropertyAttribute::REMOVEABLE) != css::beans::PropertyAttribute::REMOVEABLE); - + // Note: Till we support finalized / mandatory on our API more in detail we handle // all states simple as READONLY ! But because all realy needed pathes are "mandatory" by default // we have to handle "finalized" as the real "readonly" indicator . @@ -657,7 +657,7 @@ void PathSettings::impl_subst(PathSettings::PathInfo& aPath , ::rtl::OUString PathSettings::impl_convertPath2OldStyle(const PathSettings::PathInfo& rPath) const { OUStringList::const_iterator pIt; - OUStringList lTemp; + OUStringList lTemp; lTemp.reserve(rPath.lInternalPaths.size() + rPath.lUserPaths.size() + 1); for ( pIt = rPath.lInternalPaths.begin(); diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx index 82e89010f6cb..42a2637f823e 100644 --- a/framework/source/services/sessionlistener.cxx +++ b/framework/source/services/sessionlistener.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -140,7 +140,7 @@ SessionListener::SessionListener(const css::uno::Reference< css::lang::XMultiSer , m_bSessionStoreRequested( sal_False ) , m_bAllowUserInteractionOnQuit( sal_False ) , m_bTerminated( sal_False ) -{ +{ } SessionListener::~SessionListener() @@ -154,8 +154,8 @@ SessionListener::~SessionListener() void SessionListener::StoreSession( sal_Bool bAsync ) { - ResetableGuard aGuard(m_aLock); - try + ResetableGuard aGuard(m_aLock); + try { // xd create SERVICENAME_AUTORECOVERY -> XDispatch // xd->dispatch("vnd.sun.star.autorecovery:/doSessionSave, async=bAsync @@ -187,8 +187,8 @@ void SessionListener::StoreSession( sal_Bool bAsync ) void SessionListener::QuitSessionQuietly() { - ResetableGuard aGuard(m_aLock); - try + ResetableGuard aGuard(m_aLock); + try { // xd create SERVICENAME_AUTORECOVERY -> XDispatch // xd->dispatch("vnd.sun.star.autorecovery:/doSessionQuietQuit, async=false @@ -311,7 +311,7 @@ void SAL_CALL SessionListener::approveInteraction( sal_Bool bInteractionGranted throw (RuntimeException) { // do AutoSave as the first step - ResetableGuard aGuard(m_aLock); + ResetableGuard aGuard(m_aLock); if ( bInteractionGranted ) { diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index 4e38983ba79b..90c460b74298 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include "services/substitutepathvars.hxx" #include <threadhelp/resetableguard.hxx> @@ -37,12 +37,12 @@ #include "services.h" //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/beans/XPropertySet.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <unotools/configitem.hxx> #include <unotools/localfilehelper.hxx> @@ -69,62 +69,62 @@ #include <string.h> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ // -#define STRPOS_NOTFOUND (sal_Int32)-1 +#define STRPOS_NOTFOUND (sal_Int32)-1 -#define ASCII_STR( val ) rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( val )) +#define ASCII_STR( val ) rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( val )) -#define SEARCHPATH_DELIMITER ';' +#define SEARCHPATH_DELIMITER ';' // Variable start/end characters -#define SIGN_STARTVARIABLE ASCII_STR("$(") -#define SIGN_ENDVARIABLE ASCII_STR(")") +#define SIGN_STARTVARIABLE ASCII_STR("$(") +#define SIGN_ENDVARIABLE ASCII_STR(")") // Length of SUBSTITUTE_... to replace it with real values. -#define REPLACELENGTH_INST 7 -#define REPLACELENGTH_PROG 7 -#define REPLACELENGTH_USER 7 -#define REPLACELENGTH_WORK 7 -#define REPLACELENGTH_HOME 7 -#define REPLACELENGTH_TEMP 7 +#define REPLACELENGTH_INST 7 +#define REPLACELENGTH_PROG 7 +#define REPLACELENGTH_USER 7 +#define REPLACELENGTH_WORK 7 +#define REPLACELENGTH_HOME 7 +#define REPLACELENGTH_TEMP 7 +#define REPLACELENGTH_PATH 7 +#define REPLACELENGTH_INSTPATH 11 +#define REPLACELENGTH_PROGPATH 11 +#define REPLACELENGTH_USERPATH 11 +#define REPLACELENGTH_INSTURL 10 +#define REPLACELENGTH_PROGURL 10 +#define REPLACELENGTH_USERURL 10 #define REPLACELENGTH_PATH 7 -#define REPLACELENGTH_INSTPATH 11 -#define REPLACELENGTH_PROGPATH 11 -#define REPLACELENGTH_USERPATH 11 -#define REPLACELENGTH_INSTURL 10 -#define REPLACELENGTH_PROGURL 10 -#define REPLACELENGTH_USERURL 10 -#define REPLACELENGTH_PATH 7 -#define REPLACELENGTH_LANG 7 -#define REPLACELENGTH_LANGID 9 -#define REPLACELENGTH_VLANG 8 -#define REPLACELENGTH_WORKDIRURL 13 +#define REPLACELENGTH_LANG 7 +#define REPLACELENGTH_LANGID 9 +#define REPLACELENGTH_VLANG 8 +#define REPLACELENGTH_WORKDIRURL 13 // --> PB 2004-10-27 #i32656# - new variable of hierachy service #define REPLACELENGTH_BASEINSTURL 14 #define REPLACELENGTH_USERDATAURL 14 // <-- // Name of the pre defined path variables -#define VARIABLE_INST "$(inst)" -#define VARIABLE_PROG "$(prog)" -#define VARIABLE_USER "$(user)" -#define VARIABLE_WORK "$(work)" -#define VARIABLE_HOME "$(home)" -#define VARIABLE_TEMP "$(temp)" -#define VARIABLE_PATH "$(path)" -#define VARIABLE_LANG "$(lang)" -#define VARIABLE_LANGID "$(langid)" -#define VARIABLE_VLANG "$(vlang)" -#define VARIABLE_INSTPATH "$(instpath)" -#define VARIABLE_PROGPATH "$(progpath)" -#define VARIABLE_USERPATH "$(userpath)" -#define VARIABLE_INSTURL "$(insturl)" -#define VARIABLE_PROGURL "$(progurl)" -#define VARIABLE_USERURL "$(userurl)" -#define VARIABLE_WORKDIRURL "$(workdirurl)" +#define VARIABLE_INST "$(inst)" +#define VARIABLE_PROG "$(prog)" +#define VARIABLE_USER "$(user)" +#define VARIABLE_WORK "$(work)" +#define VARIABLE_HOME "$(home)" +#define VARIABLE_TEMP "$(temp)" +#define VARIABLE_PATH "$(path)" +#define VARIABLE_LANG "$(lang)" +#define VARIABLE_LANGID "$(langid)" +#define VARIABLE_VLANG "$(vlang)" +#define VARIABLE_INSTPATH "$(instpath)" +#define VARIABLE_PROGPATH "$(progpath)" +#define VARIABLE_USERPATH "$(userpath)" +#define VARIABLE_INSTURL "$(insturl)" +#define VARIABLE_PROGURL "$(progurl)" +#define VARIABLE_USERURL "$(userurl)" +#define VARIABLE_WORKDIRURL "$(workdirurl)" // --> PB 2004-10-27 #i32656# - new variable of hierachy service #define VARIABLE_BASEINSTURL "$(baseinsturl)" #define VARIABLE_USERDATAURL "$(userdataurl)" @@ -137,7 +137,7 @@ using namespace com::sun::star::lang; using namespace com::sun::star::container; //_________________________________________________________________________________________________________________ -// Namespace +// Namespace //_________________________________________________________________________________________________________________ // @@ -146,15 +146,15 @@ namespace framework struct FixedVariable { - const char* pVarName; - PreDefVariable nEnumValue; - int nStrLen; + const char* pVarName; + PreDefVariable nEnumValue; + int nStrLen; }; struct TableEntry { const char* pOSString; - int nStrLen; + int nStrLen; }; // Table with valid operating system strings @@ -162,11 +162,11 @@ struct TableEntry // of the string static TableEntry aOSTable[OS_COUNT] = { - { "WINDOWS" , 7 }, - { "UNIX" , 4 }, - { "SOLARIS" , 7 }, - { "LINUX" , 5 }, - { "" , 0 } // unknown + { "WINDOWS" , 7 }, + { "UNIX" , 4 }, + { "SOLARIS" , 7 }, + { "LINUX" , 5 }, + { "" , 0 } // unknown }; // Table with valid environment variables @@ -174,12 +174,12 @@ static TableEntry aOSTable[OS_COUNT] = // the length of the string. static TableEntry aEnvTable[ET_COUNT] = { - { "HOST" , 4 }, - { "YPDOMAIN" , 8 }, - { "DNSDOMAIN" , 9 }, - { "NTDOMAIN" , 8 }, - { "OS" , 2 }, - { "" , 0 } // unknown + { "HOST" , 4 }, + { "YPDOMAIN" , 8 }, + { "DNSDOMAIN" , 9 }, + { "NTDOMAIN" , 8 }, + { "OS" , 2 }, + { "" , 0 } // unknown }; // Priority table for the environment types. Lower numbers define @@ -187,33 +187,33 @@ static TableEntry aEnvTable[ET_COUNT] = // that the first match wins!! static sal_Int16 aEnvPrioTable[ET_COUNT] = { - 1, // ET_HOST - 2, // ET_IPDOMAIN - 2, // ET_DNSDOMAIN - 2, // ET_NTDOMAIN - 3, // ET_OS - 99, // ET_UNKNOWN + 1, // ET_HOST + 2, // ET_IPDOMAIN + 2, // ET_DNSDOMAIN + 2, // ET_NTDOMAIN + 3, // ET_OS + 99, // ET_UNKNOWN }; // Table with all fixed/predefined variables supported. static FixedVariable aFixedVarTable[] = { - { VARIABLE_INST, PREDEFVAR_INST, REPLACELENGTH_INST }, - { VARIABLE_PROG, PREDEFVAR_PROG, REPLACELENGTH_PROG }, - { VARIABLE_USER, PREDEFVAR_USER, REPLACELENGTH_USER }, - { VARIABLE_WORK, PREDEFVAR_WORK, REPLACELENGTH_WORK }, // Special variable (transient)! - { VARIABLE_HOME, PREDEFVAR_HOME, REPLACELENGTH_HOME }, - { VARIABLE_TEMP, PREDEFVAR_TEMP, REPLACELENGTH_TEMP }, + { VARIABLE_INST, PREDEFVAR_INST, REPLACELENGTH_INST }, + { VARIABLE_PROG, PREDEFVAR_PROG, REPLACELENGTH_PROG }, + { VARIABLE_USER, PREDEFVAR_USER, REPLACELENGTH_USER }, + { VARIABLE_WORK, PREDEFVAR_WORK, REPLACELENGTH_WORK }, // Special variable (transient)! + { VARIABLE_HOME, PREDEFVAR_HOME, REPLACELENGTH_HOME }, + { VARIABLE_TEMP, PREDEFVAR_TEMP, REPLACELENGTH_TEMP }, { VARIABLE_PATH, PREDEFVAR_PATH, REPLACELENGTH_PATH }, - { VARIABLE_LANG, PREDEFVAR_LANG, REPLACELENGTH_LANG }, - { VARIABLE_LANGID, PREDEFVAR_LANGID, REPLACELENGTH_LANGID }, - { VARIABLE_VLANG, PREDEFVAR_VLANG, REPLACELENGTH_VLANG }, - { VARIABLE_INSTPATH, PREDEFVAR_INSTPATH, REPLACELENGTH_INSTPATH }, - { VARIABLE_PROGPATH, PREDEFVAR_PROGPATH, REPLACELENGTH_PROGPATH }, - { VARIABLE_USERPATH, PREDEFVAR_USERPATH, REPLACELENGTH_USERPATH }, - { VARIABLE_INSTURL, PREDEFVAR_INSTURL, REPLACELENGTH_INSTURL }, - { VARIABLE_PROGURL, PREDEFVAR_PROGURL, REPLACELENGTH_PROGURL }, - { VARIABLE_USERURL, PREDEFVAR_USERURL, REPLACELENGTH_USERURL }, + { VARIABLE_LANG, PREDEFVAR_LANG, REPLACELENGTH_LANG }, + { VARIABLE_LANGID, PREDEFVAR_LANGID, REPLACELENGTH_LANGID }, + { VARIABLE_VLANG, PREDEFVAR_VLANG, REPLACELENGTH_VLANG }, + { VARIABLE_INSTPATH, PREDEFVAR_INSTPATH, REPLACELENGTH_INSTPATH }, + { VARIABLE_PROGPATH, PREDEFVAR_PROGPATH, REPLACELENGTH_PROGPATH }, + { VARIABLE_USERPATH, PREDEFVAR_USERPATH, REPLACELENGTH_USERPATH }, + { VARIABLE_INSTURL, PREDEFVAR_INSTURL, REPLACELENGTH_INSTURL }, + { VARIABLE_PROGURL, PREDEFVAR_PROGURL, REPLACELENGTH_PROGURL }, + { VARIABLE_USERURL, PREDEFVAR_USERURL, REPLACELENGTH_USERURL }, { VARIABLE_WORKDIRURL, PREDEFVAR_WORKDIRURL, REPLACELENGTH_WORKDIRURL }, // Special variable (transient) and don't use for resubstitution! // --> PB 2004-10-27 #i32656# - new variable of hierachy service { VARIABLE_BASEINSTURL, PREDEFVAR_BASEINSTURL, REPLACELENGTH_BASEINSTURL }, @@ -224,7 +224,7 @@ static FixedVariable aFixedVarTable[] = }; //_________________________________________________________________________________________________________________ -// Implementation helper classes +// Implementation helper classes //_________________________________________________________________________________________________________________ // @@ -322,7 +322,7 @@ void SubstitutePathVariables_Impl::Commit() //_________________________________________________________________________________________________________________ -// private methods +// private methods //_________________________________________________________________________________________________________________ // @@ -362,8 +362,8 @@ const rtl::OUString& SubstitutePathVariables_Impl::GetDNSDomainName() { if ( !m_bDNSDomainRetrieved ) { - rtl::OUString aTemp; - osl::SocketAddr aSockAddr; + rtl::OUString aTemp; + osl::SocketAddr aSockAddr; oslSocketResult aResult; rtl::OUString aHostName = GetHostName(); @@ -398,7 +398,7 @@ const rtl::OUString& SubstitutePathVariables_Impl::GetHostName() { if ( !m_bHostRetrieved ) { - rtl::OUString aHostName; + rtl::OUString aHostName; oslSocketResult aSocketResult; m_aHost = osl::SocketAddr::getLocalHostname( &aSocketResult ).toAsciiLowerCase(); @@ -413,12 +413,12 @@ sal_Bool SubstitutePathVariables_Impl::FilterRuleSet( const SubstituteRuleVector if ( !aRuleSet.empty() ) { - sal_Int16 nPrioCurrentRule = aEnvPrioTable[ ET_UNKNOWN ]; + sal_Int16 nPrioCurrentRule = aEnvPrioTable[ ET_UNKNOWN ]; const sal_uInt32 nCount = aRuleSet.size(); for ( sal_uInt32 nIndex = 0; nIndex < nCount; nIndex++ ) { const SubstituteRule& aRule = aRuleSet[nIndex]; - EnvironmentType eEnvType = aRule.aEnvType; + EnvironmentType eEnvType = aRule.aEnvType; // Check if environment type has a higher priority than current one! if ( nPrioCurrentRule > aEnvPrioTable[eEnvType] ) @@ -437,9 +437,9 @@ sal_Bool SubstitutePathVariables_Impl::FilterRuleSet( const SubstituteRuleVector sal_Bool bMatch = aPattern.Matches(aHost); if ( bMatch ) { - aActiveRule = aRule; - bResult = sal_True; - nPrioCurrentRule = aEnvPrioTable[eEnvType]; + aActiveRule = aRule; + bResult = sal_True; + nPrioCurrentRule = aEnvPrioTable[eEnvType]; } } break; @@ -448,8 +448,8 @@ sal_Bool SubstitutePathVariables_Impl::FilterRuleSet( const SubstituteRuleVector case ET_DNSDOMAIN: case ET_NTDOMAIN: { - rtl::OUString aDomain; - rtl::OUString aDomainStr; + rtl::OUString aDomain; + rtl::OUString aDomainStr; aRule.aEnvValue >>= aDomainStr; aDomainStr = aDomainStr.toAsciiLowerCase(); @@ -466,9 +466,9 @@ sal_Bool SubstitutePathVariables_Impl::FilterRuleSet( const SubstituteRuleVector sal_Bool bMatch = aPattern.Matches(aDomain); if ( bMatch ) { - aActiveRule = aRule; - bResult = sal_True; - nPrioCurrentRule = aEnvPrioTable[eEnvType]; + aActiveRule = aRule; + bResult = sal_True; + nPrioCurrentRule = aEnvPrioTable[eEnvType]; } } break; @@ -476,20 +476,20 @@ sal_Bool SubstitutePathVariables_Impl::FilterRuleSet( const SubstituteRuleVector case ET_OS: { // No pattern matching for OS type - OperatingSystem eOSType = GetOperatingSystem(); + OperatingSystem eOSType = GetOperatingSystem(); sal_Int16 nValue = 0; aRule.aEnvValue >>= nValue; - sal_Bool bUnix = ( eOSType == OS_LINUX ) || ( eOSType == OS_SOLARIS ); - OperatingSystem eRuleOSType = (OperatingSystem)nValue; + sal_Bool bUnix = ( eOSType == OS_LINUX ) || ( eOSType == OS_SOLARIS ); + OperatingSystem eRuleOSType = (OperatingSystem)nValue; // Match if OS identical or rule is set to UNIX and OS is LINUX/SOLARIS! if (( eRuleOSType == eOSType ) || ( eRuleOSType == OS_UNIX && bUnix )) { - aActiveRule = aRule; - bResult = sal_True; - nPrioCurrentRule = aEnvPrioTable[eEnvType]; + aActiveRule = aRule; + bResult = sal_True; + nPrioCurrentRule = aEnvPrioTable[eEnvType]; } } break; @@ -569,7 +569,7 @@ void SubstitutePathVariables_Impl::ReadSharePointRuleSetFromConfiguration( } // Decode the environment and optional the operatng system settings - Any aEnvValue; + Any aEnvValue; EnvironmentType eEnvType = GetEnvTypeFromString( aEnvUsed ); if ( eEnvType == ET_OS ) { @@ -588,11 +588,11 @@ void SubstitutePathVariables_Impl::ReadSharePointRuleSetFromConfiguration( } //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** -DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( SubstitutePathVariables , - ::cppu::OWeakObject , - SERVICENAME_SUBSTITUTEPATHVARIABLES , +DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( SubstitutePathVariables , + ::cppu::OWeakObject , + SERVICENAME_SUBSTITUTEPATHVARIABLES , IMPLEMENTATIONNAME_SUBSTITUTEPATHVARIABLES ) @@ -634,8 +634,8 @@ SubstitutePathVariables::SubstitutePathVariables( const Reference< XMultiService // and it could be possible that it will be resubstituted by itself!! // Example: WORK_PATH=c:\test, $(workdirurl)=WORK_PATH => WORK_PATH=$(workdirurl) and this cannot be substituted! ReSubstFixedVarOrder aFixedVar; - aFixedVar.eVariable = aFixedVarTable[i].nEnumValue; - aFixedVar.nVarValueLength = m_aPreDefVars.m_FixedVar[(sal_Int32)aFixedVar.eVariable].getLength(); + aFixedVar.eVariable = aFixedVarTable[i].nEnumValue; + aFixedVar.nVarValueLength = m_aPreDefVars.m_FixedVar[(sal_Int32)aFixedVar.eVariable].getLength(); m_aReSubstFixedVarOrder.push_back( aFixedVar ); } } @@ -650,8 +650,8 @@ SubstitutePathVariables::SubstitutePathVariables( const Reference< XMultiService aStrBuffer.append( m_aVarStart ); aStrBuffer.append( pIter->second.aSubstVariable ); aStrBuffer.append( m_aVarEnd ); - aUserOrderVar.aVarName = aStrBuffer.makeStringAndClear(); - aUserOrderVar.nVarValueLength = pIter->second.aSubstVariable.getLength(); + aUserOrderVar.aVarName = aStrBuffer.makeStringAndClear(); + aUserOrderVar.nVarValueLength = pIter->second.aSubstVariable.getLength(); m_aReSubstUserVarOrder.push_back( aUserOrderVar ); } m_aReSubstUserVarOrder.sort(); @@ -687,7 +687,7 @@ throw ( NoSuchElementException, RuntimeException ) } //_________________________________________________________________________________________________________________ -// protected methods +// protected methods //_________________________________________________________________________________________________________________ // @@ -702,8 +702,8 @@ IMPL_LINK( SubstitutePathVariables, implts_ConfigurationNotify, SubstitutePathNo rtl::OUString SubstitutePathVariables::ConvertOSLtoUCBURL( const rtl::OUString& aOSLCompliantURL ) const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "SubstitutePathVariables::ConvertOSLtoUCBURL" ); - String aResult; - rtl::OUString aTemp; + String aResult; + rtl::OUString aTemp; osl::FileBase::getSystemPathFromFileURL( aOSLCompliantURL, aTemp ); utl::LocalFileHelper::ConvertPhysicalNameToURL( aTemp, aResult ); @@ -738,7 +738,7 @@ rtl::OUString SubstitutePathVariables::GetWorkVariableValue() const ::rtl::OUString::createFromAscii("Variables"), ::rtl::OUString::createFromAscii("Work"), ::comphelper::ConfigurationHelper::E_READONLY) >>= aWorkPath; - + // fallback to $HOME in case platform dependend config layer does not return // an usuable work dir value. if (aWorkPath.getLength() < 1) @@ -752,8 +752,8 @@ rtl::OUString SubstitutePathVariables::GetWorkVariableValue() const rtl::OUString SubstitutePathVariables::GetHomeVariableValue() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "SubstitutePathVariables::GetHomeVariableValue" ); - osl::Security aSecurity; - rtl::OUString aHomePath; + osl::Security aSecurity; + rtl::OUString aHomePath; aSecurity.getHomeDir( aHomePath ); return ConvertOSLtoUCBURL( aHomePath ); @@ -802,18 +802,18 @@ throw ( NoSuchElementException, RuntimeException ) // This is maximal recursive depth supported! const sal_Int32 nMaxRecursiveDepth = 8; - rtl::OUString aWorkText = rText; - rtl::OUString aResult; + rtl::OUString aWorkText = rText; + rtl::OUString aResult; // Use vector with strings to detect endless recursions! std::vector< rtl::OUString > aEndlessRecursiveDetector; // Search for first occure of "$(...". - sal_Int32 nDepth = 0; - sal_Int32 bSubstitutionCompleted = sal_False; - sal_Int32 nPosition = aWorkText.indexOf( m_aVarStart ); // = first position of "$(" in string - sal_Int32 nLength = 0; // = count of letters from "$(" to ")" in string - sal_Bool bVarNotSubstituted = sal_False; + sal_Int32 nDepth = 0; + sal_Int32 bSubstitutionCompleted = sal_False; + sal_Int32 nPosition = aWorkText.indexOf( m_aVarStart ); // = first position of "$(" in string + sal_Int32 nLength = 0; // = count of letters from "$(" to ")" in string + sal_Bool bVarNotSubstituted = sal_False; // Have we found any variable like "$(...)"? if ( nPosition != STRPOS_NOTFOUND ) @@ -826,17 +826,17 @@ throw ( NoSuchElementException, RuntimeException ) } // Is there something to replace ? - sal_Bool bWorkRetrieved = sal_False; - sal_Bool bWorkDirURLRetrieved = sal_False; + sal_Bool bWorkRetrieved = sal_False; + sal_Bool bWorkDirURLRetrieved = sal_False; while ( !bSubstitutionCompleted && nDepth < nMaxRecursiveDepth ) { while ( ( nPosition != STRPOS_NOTFOUND ) && ( nLength > 3 ) ) // "$(" ")" { // YES; Get the next variable for replace. - sal_Int32 nReplaceLength = 0; - rtl::OUString aReplacement; - rtl::OUString aSubString = aWorkText.copy( nPosition, nLength ); - rtl::OUString aSubVarString; + sal_Int32 nReplaceLength = 0; + rtl::OUString aReplacement; + rtl::OUString aSubString = aWorkText.copy( nPosition, nLength ); + rtl::OUString aSubVarString; // Path variables are not case sensitive! aSubVarString = aSubString.toAsciiLowerCase(); @@ -909,7 +909,7 @@ throw ( NoSuchElementException, RuntimeException ) if ( nPosition != STRPOS_NOTFOUND ) { // Yes; Get length of found variable. If no ")" was found - nLength must set to 0! - nLength = 0; + nLength = 0; sal_Int32 nEndPosition = aWorkText.indexOf( m_aVarEnd, nPosition ); if ( nEndPosition != STRPOS_NOTFOUND ) nLength = nEndPosition - nPosition + 1; @@ -1017,8 +1017,8 @@ throw ( RuntimeException ) } // Due to a recursive definition this code must exchange variables with variables! - sal_Bool bResubstitutionCompleted = sal_False; - sal_Bool bVariableFound = sal_False; + sal_Bool bResubstitutionCompleted = sal_False; + sal_Bool bVariableFound = sal_False; // Get transient predefined path variable $(work) value before starting resubstitution m_aPreDefVars.m_FixedVar[ PREDEFVAR_WORK ] = GetWorkVariableValue(); @@ -1178,15 +1178,15 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable } // Set $(inst), $(instpath), $(insturl) - aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INSTURL ] = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INSTPATH ]; - aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INST ] = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INSTPATH ]; + aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INSTURL ] = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INSTPATH ]; + aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INST ] = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INSTPATH ]; // --> PB 2004-10-27 #i32656# - new variable of hierachy service aPreDefPathVariables.m_FixedVar[ PREDEFVAR_BASEINSTURL ]= aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INSTPATH ]; // <-- // Set $(user), $(userpath), $(userurl) - aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USERURL ] = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USERPATH ]; - aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USER ] = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USERPATH ]; + aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USERURL ] = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USERPATH ]; + aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USER ] = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USERPATH ]; // --> PB 2004-11-11 #i32656# - new variable of hierachy service aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USERDATAURL ]= aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USERPATH ]; // <-- @@ -1199,9 +1199,9 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable aProgObj.insertName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("program")) ) ) { - aPreDefPathVariables.m_FixedVar[ PREDEFVAR_PROGPATH ] = aProgObj.GetMainURL(INetURLObject::NO_DECODE); - aPreDefPathVariables.m_FixedVar[ PREDEFVAR_PROGURL ] = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_PROGPATH ]; - aPreDefPathVariables.m_FixedVar[ PREDEFVAR_PROG ] = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_PROGPATH ]; + aPreDefPathVariables.m_FixedVar[ PREDEFVAR_PROGPATH ] = aProgObj.GetMainURL(INetURLObject::NO_DECODE); + aPreDefPathVariables.m_FixedVar[ PREDEFVAR_PROGURL ] = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_PROGPATH ]; + aPreDefPathVariables.m_FixedVar[ PREDEFVAR_PROG ] = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_PROGPATH ]; } // Detect the language type of the current office diff --git a/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx index 6775e6d478a3..9af8581652d3 100644 --- a/framework/source/services/tabwindowservice.cxx +++ b/framework/source/services/tabwindowservice.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <services/tabwindowservice.hxx> @@ -39,14 +39,14 @@ #include <properties.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/awt/PosSize.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <toolkit/helper/vclunohelper.hxx> @@ -55,21 +55,21 @@ #include <vcl/svapp.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// non exported definitions +// non exported definitions //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// css::uno::XInterface, XTypeProvider, XServiceInfo +// css::uno::XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** DEFINE_XINTERFACE_6 ( TabWindowService , @@ -103,17 +103,17 @@ DEFINE_INIT_SERVICE ( TabWindowService, m_aTransactionManager.setWorkingMode( E_WORK ); } ) - + //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** TabWindowService::TabWindowService( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ) - // Init baseclasses first - // Attention: - // Don't change order of initialization! + // Init baseclasses first + // Attention: + // Don't change order of initialization! // ThreadHelpBase is a struct with a mutex as member. We can't use a mutex as member, while - // we must garant right initialization and a valid value of this! First initialize - // baseclasses and then members. And we need the mutex for other baseclasses !!! + // we must garant right initialization and a valid value of this! First initialize + // baseclasses and then members. And we need the mutex for other baseclasses !!! : ThreadHelpBase ( &Application::GetSolarMutex() ) , TransactionBase ( ) , PropertySetHelper ( xFactory , @@ -137,7 +137,7 @@ TabWindowService::TabWindowService( const css::uno::Reference< css::lang::XMulti } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** TabWindowService::~TabWindowService() { @@ -292,7 +292,7 @@ void SAL_CALL TabWindowService::dispose() if (m_pTabWin) m_pTabWin->RemoveEventListener( LINK( this, TabWindowService, EventListener ) ); - + m_pTabWin = NULL; m_xTabWin.clear(); } @@ -367,13 +367,13 @@ IMPL_LINK( TabWindowService, EventListener, VclSimpleEvent*, pEvent ) if ( !pEvent && !pEvent->ISA(VclWindowEvent)) return 0; - + ULONG nEventId = pEvent->GetId(); VclWindowEvent* pWinEvt = static_cast< VclWindowEvent* >(pEvent); css::uno::Reference< css::uno::XInterface > xThis ( static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY ); css::lang::EventObject aEvent( xThis ); - + if (nEventId == VCLEVENT_OBJECT_DYING) { m_lListener.disposeAndClear (aEvent); @@ -388,14 +388,14 @@ IMPL_LINK( TabWindowService, EventListener, VclSimpleEvent*, pEvent ) ::cppu::OInterfaceContainerHelper* pContainer = m_lListener.getContainer(::getCppuType((const css::uno::Reference< css::awt::XTabListener >*) NULL)); if ( ! pContainer) return 0; - + ::cppu::OInterfaceIteratorHelper pIterator(*pContainer); while (pIterator.hasMoreElements()) { try { css::awt::XTabListener* pListener = (css::awt::XTabListener*)pIterator.next(); - + switch (nEventId) { case VCLEVENT_TABPAGE_ACTIVATE : @@ -469,17 +469,17 @@ FwkTabWindow* TabWindowService::mem_TabWin () if ( ! m_xTabWin.is ()) { Window* pFakeParent = dynamic_cast< Window* >(Application::GetDefaultDevice ()); - + m_pTabWin = new FwkTabWindow (pFakeParent); m_xTabWin = VCLUnoHelper::GetInterface (m_pTabWin); - + m_pTabWin->AddEventListener( LINK( this, TabWindowService, EventListener ) ); } if (m_xTabWin.is ()) pWin = m_pTabWin; - + return pWin; } -} // namespace framework +} // namespace framework diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx index 869a65dc429d..90bcdb93efbf 100644 --- a/framework/source/services/taskcreatorsrv.cxx +++ b/framework/source/services/taskcreatorsrv.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,7 +75,7 @@ const ::rtl::OUString TaskCreatorService::ARGUMENT_POSSIZE const ::rtl::OUString TaskCreatorService::ARGUMENT_CONTAINERWINDOW = ::rtl::OUString::createFromAscii("ContainerWindow" ); // XWindow const ::rtl::OUString TaskCreatorService::ARGUMENT_SUPPORTPERSISTENTWINDOWSTATE = ::rtl::OUString::createFromAscii("SupportPersistentWindowState" ); // sal_Bool const ::rtl::OUString TaskCreatorService::ARGUMENT_ENABLE_TITLEBARUPDATE = ::rtl::OUString::createFromAscii("EnableTitleBarUpdate" ); // sal_Bool - + //----------------------------------------------- DEFINE_XINTERFACE_3(TaskCreatorService , OWeakObject , @@ -175,7 +175,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL TaskCreatorService::createI xContainerWindow = implts_createContainerWindow(xParentWindow, aPosSize, bCreateTopWindow); } - + //-------------------> // HACK #125187# + #i53630# // Mark all document windows as "special ones", so VCL can bind @@ -196,27 +196,27 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL TaskCreatorService::createI // create the new frame css::uno::Reference< css::frame::XFrame > xFrame = implts_createFrame(xParentFrame, xContainerWindow, sRightName); - + // special freature: // A special listener will restore pos/size states in case // a component was loaded into the frame first time. if (bSupportPersistentWindowState) implts_establishWindowStateListener(xFrame); - + // special feature: On Mac we need tagging the window in case // the underlying model was modified. // VCL will ignore our calls in case different platform then Mac // is used ... if (bTopLevelDocumentWindow) implts_establishDocModifyListener (xFrame); - + // special freature: // A special listener will update title bar (text and icon) // if component of frame will be changed. if (bEnableTitleBarUpdate) implts_establishTitleBarUpdate(xFrame); - - // Make it visible directly here ... + + // Make it visible directly here ... // if its required from outside. if (bVisible) xContainerWindow->setVisible(bVisible); @@ -246,7 +246,7 @@ css::uno::Reference< css::awt::XWindow > TaskCreatorService::implts_createContai css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = m_xSMGR; aReadLock.unlock(); // <- SAFE - + // get toolkit to create task container window css::uno::Reference< css::awt::XToolkit > xToolkit( xSMGR->createInstance( SERVICENAME_VCLTOOLKIT ), css::uno::UNO_QUERY_THROW); @@ -259,7 +259,7 @@ css::uno::Reference< css::awt::XWindow > TaskCreatorService::implts_createContai else xParentWindowPeer = css::uno::Reference< css::awt::XWindowPeer >(xParentWindow, css::uno::UNO_QUERY_THROW); } - + // describe window properties. css::awt::WindowDescriptor aDescriptor; if (bTopWindow) @@ -284,7 +284,7 @@ css::uno::Reference< css::awt::XWindow > TaskCreatorService::implts_createContai aDescriptor.Bounds = aPosSize ; aDescriptor.WindowAttributes = css::awt::VclWindowPeerAttribute::CLIPCHILDREN ; } - + // create a new blank container window and get access to parent container to append new created task. css::uno::Reference< css::awt::XWindowPeer > xPeer = xToolkit->createWindow( aDescriptor ); css::uno::Reference< css::awt::XWindow > xWindow ( xPeer, css::uno::UNO_QUERY ); @@ -295,7 +295,7 @@ css::uno::Reference< css::awt::XWindow > TaskCreatorService::implts_createContai xPeer->setBackground(::svtools::ColorConfig().GetColorValue(::svtools::APPBACKGROUND).nColor); else xPeer->setBackground(0xffffffff); - + return xWindow; } @@ -309,7 +309,7 @@ css::uno::Reference< css::frame::XFrame > TaskCreatorService::implts_createFrame css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = m_xSMGR; aReadLock.unlock(); // <- SAFE - + // create new frame. css::uno::Reference< css::frame::XFrame > xNewFrame( xSMGR->createInstance( SERVICENAME_FRAME ), css::uno::UNO_QUERY_THROW ); diff --git a/framework/source/services/uriabbreviation.cxx b/framework/source/services/uriabbreviation.cxx index c88cdf9e2136..1c89870c429d 100644 --- a/framework/source/services/uriabbreviation.cxx +++ b/framework/source/services/uriabbreviation.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,15 +46,15 @@ namespace framework namespace css = ::com::sun::star; //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** -DEFINE_XSERVICEINFO_MULTISERVICE_2 ( UriAbbreviation , +DEFINE_XSERVICEINFO_MULTISERVICE_2 ( UriAbbreviation , ::cppu::OWeakObject , - SERVICENAME_STRINGABBREVIATION , + SERVICENAME_STRINGABBREVIATION , IMPLEMENTATIONNAME_URIABBREVIATION ) diff --git a/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx index 8ee168bda752..cac8e7e359ca 100644 --- a/framework/source/services/urltransformer.cxx +++ b/framework/source/services/urltransformer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <services/urltransformer.hxx> #include <threadhelp/resetableguard.hxx> @@ -37,42 +37,42 @@ #include <services.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <tools/urlobj.hxx> #include <rtl/ustrbuf.hxx> #include <vcl/svapp.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ -using namespace ::osl ; -using namespace ::cppu ; -using namespace ::com::sun::star::uno ; -using namespace ::com::sun::star::lang ; -using namespace ::com::sun::star::util ; +using namespace ::osl ; +using namespace ::cppu ; +using namespace ::com::sun::star::uno ; +using namespace ::com::sun::star::lang ; +using namespace ::com::sun::star::util ; //_________________________________________________________________________________________________________________ -// non exported const +// non exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// non exported definitions +// non exported definitions //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** URLTransformer::URLTransformer( const Reference< XMultiServiceFactory >& /*xFactory*/ ) { @@ -82,19 +82,19 @@ URLTransformer::URLTransformer( const Reference< XMultiServiceFactory >& /*xFact } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** URLTransformer::~URLTransformer() { } //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** -DEFINE_XSERVICEINFO_MULTISERVICE ( URLTransformer , +DEFINE_XSERVICEINFO_MULTISERVICE ( URLTransformer , OWeakObject , - SERVICENAME_URLTRANSFORMER , + SERVICENAME_URLTRANSFORMER , IMPLEMENTATIONNAME_URLTRANSFORMER ) @@ -108,11 +108,11 @@ namespace void lcl_ParserHelper(INetURLObject& _rParser,URL& _rURL,bool _bUseIntern) { // Get all information about this URL. - _rURL.Protocol = INetURLObject::GetScheme( _rParser.GetProtocol() ); - _rURL.User = _rParser.GetUser ( INetURLObject::DECODE_WITH_CHARSET ); - _rURL.Password = _rParser.GetPass ( INetURLObject::DECODE_WITH_CHARSET ); - _rURL.Server = _rParser.GetHost ( INetURLObject::DECODE_WITH_CHARSET ); - _rURL.Port = (sal_Int16)_rParser.GetPort(); + _rURL.Protocol = INetURLObject::GetScheme( _rParser.GetProtocol() ); + _rURL.User = _rParser.GetUser ( INetURLObject::DECODE_WITH_CHARSET ); + _rURL.Password = _rParser.GetPass ( INetURLObject::DECODE_WITH_CHARSET ); + _rURL.Server = _rParser.GetHost ( INetURLObject::DECODE_WITH_CHARSET ); + _rURL.Port = (sal_Int16)_rParser.GetPort(); sal_Int32 nCount = _rParser.getSegmentCount( false ); if ( nCount > 0 ) @@ -136,32 +136,32 @@ namespace else { _rURL.Path = _rParser.GetURLPath( INetURLObject::NO_DECODE ); - _rURL.Name = _rParser.GetName ( ); + _rURL.Name = _rParser.GetName ( ); } _rURL.Arguments = _rParser.GetParam ( INetURLObject::NO_DECODE ); - _rURL.Mark = _rParser.GetMark ( INetURLObject::DECODE_WITH_CHARSET ); + _rURL.Mark = _rParser.GetMark ( INetURLObject::DECODE_WITH_CHARSET ); // INetURLObject supports only an intelligent method of parsing URL's. So write // back Complete to have a valid encoded URL in all cases! - _rURL.Complete = _rParser.GetMainURL( INetURLObject::NO_DECODE ); + _rURL.Complete = _rParser.GetMainURL( INetURLObject::NO_DECODE ); if ( _bUseIntern ) _rURL.Complete = _rURL.Complete.intern(); - _rParser.SetMark ( ::rtl::OUString() ); + _rParser.SetMark ( ::rtl::OUString() ); _rParser.SetParam( ::rtl::OUString() ); _rURL.Main = _rParser.GetMainURL( INetURLObject::NO_DECODE ); } } //***************************************************************************************************************** -// XURLTransformer +// XURLTransformer //***************************************************************************************************************** sal_Bool SAL_CALL URLTransformer::parseStrict( URL& aURL ) throw( RuntimeException ) { // Safe impossible cases. - if (( &aURL == NULL ) || - ( aURL.Complete.getLength() < 1 ) ) + if (( &aURL == NULL ) || + ( aURL.Complete.getLength() < 1 ) ) { return sal_False; } @@ -195,9 +195,9 @@ sal_Bool SAL_CALL URLTransformer::parseStrict( URL& aURL ) throw( RuntimeExcepti { // Minmal support for unknown protocols. This is mandatory to support the "Protocol Handlers" implemented // in framework! - aURL.Protocol = aProtocol; - aURL.Main = aURL.Complete; - aURL.Path = aURL.Complete.copy( nURLIndex+1 );; + aURL.Protocol = aProtocol; + aURL.Main = aURL.Complete; + aURL.Path = aURL.Complete.copy( nURLIndex+1 );; // Return "URL is parsed". return sal_True; @@ -208,14 +208,14 @@ sal_Bool SAL_CALL URLTransformer::parseStrict( URL& aURL ) throw( RuntimeExcepti } //***************************************************************************************************************** -// XURLTransformer +// XURLTransformer //***************************************************************************************************************** -sal_Bool SAL_CALL URLTransformer::parseSmart( URL& aURL , - const ::rtl::OUString& sSmartProtocol ) throw( RuntimeException ) +sal_Bool SAL_CALL URLTransformer::parseSmart( URL& aURL , + const ::rtl::OUString& sSmartProtocol ) throw( RuntimeException ) { // Safe impossible cases. - if (( &aURL == NULL ) || - ( aURL.Complete.getLength() < 1 ) ) + if (( &aURL == NULL ) || + ( aURL.Complete.getLength() < 1 ) ) { return sal_False; } @@ -264,12 +264,12 @@ sal_Bool SAL_CALL URLTransformer::parseSmart( URL& aURL , } //***************************************************************************************************************** -// XURLTransformer +// XURLTransformer //***************************************************************************************************************** sal_Bool SAL_CALL URLTransformer::assemble( URL& aURL ) throw( RuntimeException ) { // Safe impossible cases. - if ( &aURL == NULL ) + if ( &aURL == NULL ) return sal_False ; // Initialize parser. @@ -293,12 +293,12 @@ sal_Bool SAL_CALL URLTransformer::assemble( URL& aURL ) throw( RuntimeException } bool bResult = aParser.ConcatData( - INetURLObject::CompareProtocolScheme( aURL.Protocol ) , - aURL.User , - aURL.Password , - aURL.Server , - aURL.Port , - aCompletePath.makeStringAndClear() ); + INetURLObject::CompareProtocolScheme( aURL.Protocol ) , + aURL.User , + aURL.Password , + aURL.Server , + aURL.Port , + aCompletePath.makeStringAndClear() ); if ( !bResult ) return sal_False; @@ -318,8 +318,8 @@ sal_Bool SAL_CALL URLTransformer::assemble( URL& aURL ) throw( RuntimeException // Minimal support for unknown protocols ::rtl::OUStringBuffer aBuffer( aURL.Protocol ); aBuffer.append( aURL.Path ); - aURL.Complete = aBuffer.makeStringAndClear(); - aURL.Main = aURL.Complete; + aURL.Complete = aBuffer.makeStringAndClear(); + aURL.Main = aURL.Complete; return sal_True; } @@ -327,16 +327,16 @@ sal_Bool SAL_CALL URLTransformer::assemble( URL& aURL ) throw( RuntimeException } //***************************************************************************************************************** -// XURLTransformer +// XURLTransformer //***************************************************************************************************************** -::rtl::OUString SAL_CALL URLTransformer::getPresentation( const URL& aURL , - sal_Bool bWithPassword ) throw( RuntimeException ) +::rtl::OUString SAL_CALL URLTransformer::getPresentation( const URL& aURL , + sal_Bool bWithPassword ) throw( RuntimeException ) { // Safe impossible cases. - if (( &aURL == NULL ) || - ( aURL.Complete.getLength() < 1 ) || - (( bWithPassword != sal_True ) && - ( bWithPassword != sal_False ) ) ) + if (( &aURL == NULL ) || + ( aURL.Complete.getLength() < 1 ) || + (( bWithPassword != sal_True ) && + ( bWithPassword != sal_False ) ) ) { return ::rtl::OUString(); } @@ -364,9 +364,9 @@ sal_Bool SAL_CALL URLTransformer::assemble( URL& aURL ) throw( RuntimeException } //_________________________________________________________________________________________________________________ -// debug methods +// debug methods //_________________________________________________________________________________________________________________ -} // namespace framework +} // namespace framework diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx index a9fdf6f8defa..107dccc80dc7 100644 --- a/framework/source/tabwin/tabwindow.cxx +++ b/framework/source/tabwin/tabwindow.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,12 +31,12 @@ #include <properties.h> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/awt/PosSize.hpp> @@ -44,7 +44,7 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/lang/DisposedException.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <rtl/ustrbuf.hxx> #include <tools/urlobj.hxx> @@ -57,7 +57,7 @@ #include <comphelper/sequenceashashmap.hxx> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ // @@ -68,40 +68,40 @@ namespace framework { //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** -DEFINE_XINTERFACE_11 ( TabWindow , +DEFINE_XINTERFACE_11 ( TabWindow , ::cppu::OWeakObject , - DIRECT_INTERFACE( css::lang::XTypeProvider ), - DIRECT_INTERFACE( css::lang::XServiceInfo ), - DIRECT_INTERFACE( css::lang::XInitialization ), + DIRECT_INTERFACE( css::lang::XTypeProvider ), + DIRECT_INTERFACE( css::lang::XServiceInfo ), + DIRECT_INTERFACE( css::lang::XInitialization ), DIRECT_INTERFACE( css::lang::XComponent ), - DIRECT_INTERFACE( css::awt::XWindowListener ), + DIRECT_INTERFACE( css::awt::XWindowListener ), DIRECT_INTERFACE( css::awt::XTopWindowListener ), DIRECT_INTERFACE( css::awt::XSimpleTabController ), DERIVED_INTERFACE( css::lang::XEventListener, css::awt::XWindowListener ), - DIRECT_INTERFACE( css::beans::XMultiPropertySet ), - DIRECT_INTERFACE( css::beans::XFastPropertySet ), - DIRECT_INTERFACE( css::beans::XPropertySet ) + DIRECT_INTERFACE( css::beans::XMultiPropertySet ), + DIRECT_INTERFACE( css::beans::XFastPropertySet ), + DIRECT_INTERFACE( css::beans::XPropertySet ) ) -DEFINE_XTYPEPROVIDER_11 ( TabWindow , - css::lang::XTypeProvider , - css::lang::XServiceInfo , - css::lang::XInitialization , +DEFINE_XTYPEPROVIDER_11 ( TabWindow , + css::lang::XTypeProvider , + css::lang::XServiceInfo , + css::lang::XInitialization , css::lang::XComponent , - css::awt::XWindowListener , + css::awt::XWindowListener , css::awt::XTopWindowListener , css::awt::XSimpleTabController , - css::lang::XEventListener , + css::lang::XEventListener , css::beans::XMultiPropertySet , css::beans::XFastPropertySet , css::beans::XPropertySet ) -DEFINE_XSERVICEINFO_MULTISERVICE ( TabWindow , +DEFINE_XSERVICEINFO_MULTISERVICE ( TabWindow , ::cppu::OWeakObject , - SERVICENAME_TABWINDOW , + SERVICENAME_TABWINDOW , IMPLEMENTATIONNAME_TABWINDOW ) @@ -310,7 +310,7 @@ throw (css::uno::Exception, css::uno::RuntimeException) if ( !bInitalized ) { - css::beans::PropertyValue aPropValue; + css::beans::PropertyValue aPropValue; css::uno::Reference< css::awt::XTopWindow > xTopWindow; css::uno::Reference< css::awt::XToolkit > xToolkit; css::awt::WindowDescriptor aDescriptor; @@ -400,12 +400,12 @@ throw (css::uno::Exception, css::uno::RuntimeException) xContainerWindow = css::uno::Reference< css::awt::XWindow >( xToolkit->createWindow( aDescriptor ), css::uno::UNO_QUERY ); // create a tab control window properties - aDescriptor.Type = css::awt::WindowClass_SIMPLE; + aDescriptor.Type = css::awt::WindowClass_SIMPLE; aDescriptor.WindowServiceName = DECLARE_ASCII("tabcontrol"); - aDescriptor.ParentIndex = -1; - aDescriptor.Parent = css::uno::Reference< css::awt::XWindowPeer >( xTopWindow, css::uno::UNO_QUERY ); - aDescriptor.Bounds = css::awt::Rectangle( 0,0,0,0 ); - aDescriptor.WindowAttributes = 0; + aDescriptor.ParentIndex = -1; + aDescriptor.Parent = css::uno::Reference< css::awt::XWindowPeer >( xTopWindow, css::uno::UNO_QUERY ); + aDescriptor.Bounds = css::awt::Rectangle( 0,0,0,0 ); + aDescriptor.WindowAttributes = 0; xTabControl = css::uno::Reference< css::awt::XWindow >( xToolkit->createWindow( aDescriptor ), css::uno::UNO_QUERY ); @@ -421,7 +421,7 @@ throw (css::uno::Exception, css::uno::RuntimeException) xWindow->setPosSize( 0, 0, aSize.Width, aSize.Height, css::awt::PosSize::POSSIZE ); - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if( pWindow ) pWindow->Show( TRUE ); @@ -447,7 +447,7 @@ throw (css::uno::Exception, css::uno::RuntimeException) } //--------------------------------------------------------------------------------------------------------- -// XComponent +// XComponent //--------------------------------------------------------------------------------------------------------- void SAL_CALL TabWindow::dispose() throw (css::uno::RuntimeException) { @@ -613,7 +613,7 @@ throw (css::uno::RuntimeException) } //--------------------------------------------------------------------------------------------------------- -// XSimpleTabController +// XSimpleTabController //--------------------------------------------------------------------------------------------------------- ::sal_Int32 SAL_CALL TabWindow::insertTab() @@ -839,18 +839,18 @@ throw (css::uno::RuntimeException) } //--------------------------------------------------------------------------------------------------------- -// OPropertySetHelper +// OPropertySetHelper //--------------------------------------------------------------------------------------------------------- // XPropertySet helper sal_Bool SAL_CALL TabWindow::convertFastPropertyValue( css::uno::Any& aConvertedValue , css::uno::Any& aOldValue , - sal_Int32 nHandle , + sal_Int32 nHandle , const css::uno::Any& aValue ) throw( css::lang::IllegalArgumentException ) { - // Initialize state with FALSE !!! - // (Handle can be invalid) + // Initialize state with FALSE !!! + // (Handle can be invalid) sal_Bool bReturn = sal_False; switch( nHandle ) @@ -966,7 +966,7 @@ const css::uno::Sequence< css::beans::Property > TabWindow::impl_getStaticProper TABWINDOW_PROPHANDLE_TOPWINDOW, ::getCppuType((const css::uno::Reference< css::awt::XWindow >*)NULL), com::sun::star::beans::PropertyAttribute::READONLY ) - }; // Use it to initialize sequence! + }; // Use it to initialize sequence! static const com::sun::star::uno::Sequence< com::sun::star::beans::Property > lPropertyDescriptor( pProperties, TABWINDOW_PROPCOUNT ); // Return static "PropertyDescriptor" diff --git a/framework/source/tabwin/tabwinfactory.cxx b/framework/source/tabwin/tabwinfactory.cxx index e9a7e65cb552..87d48ddac7aa 100644 --- a/framework/source/tabwin/tabwinfactory.cxx +++ b/framework/source/tabwin/tabwinfactory.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,12 +31,12 @@ #include <tabwin/tabwindow.hxx> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/lang/XInitialization.hpp> @@ -44,14 +44,14 @@ #include <com/sun/star/awt/WindowAttribute.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> #include <tools/urlobj.hxx> #include <rtl/ustrbuf.hxx> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ // @@ -65,11 +65,11 @@ namespace framework { //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** -DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( TabWinFactory , - ::cppu::OWeakObject , - SERVICENAME_TABWINFACTORY , +DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( TabWinFactory , + ::cppu::OWeakObject , + SERVICENAME_TABWINFACTORY , IMPLEMENTATIONNAME_TABWINFACTORY ) @@ -139,9 +139,9 @@ throw ( css::uno::Exception, css::uno::RuntimeException ) { // describe window properties. css::awt::WindowDescriptor aDescriptor; - aDescriptor.Type = css::awt::WindowClass_TOP ; - aDescriptor.ParentIndex = -1 ; - aDescriptor.Parent = css::uno::Reference< css::awt::XWindowPeer >() ; + aDescriptor.Type = css::awt::WindowClass_TOP ; + aDescriptor.ParentIndex = -1 ; + aDescriptor.Parent = css::uno::Reference< css::awt::XWindowPeer >() ; aDescriptor.Bounds = css::awt::Rectangle(0,0,0,0) ; aDescriptor.WindowAttributes = css::awt::WindowAttribute::BORDER| css::awt::WindowAttribute::SIZEABLE| @@ -161,7 +161,7 @@ throw ( css::uno::Exception, css::uno::RuntimeException ) css::uno::Sequence< css::uno::Any > aArgs( 1 ); - aPropValue.Name = aTopWindowArgName; + aPropValue.Name = aTopWindowArgName; aPropValue.Value = css::uno::makeAny( xTopWindow ); aArgs[0] = css::uno::makeAny( aPropValue ); pTabWindow->initialize( aArgs ); diff --git a/framework/source/threadhelp/lockhelper.cxx b/framework/source/threadhelp/lockhelper.cxx index c69906dacc74..4c5ebb7a5d91 100644 --- a/framework/source/threadhelp/lockhelper.cxx +++ b/framework/source/threadhelp/lockhelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/lockhelper.hxx> #include <general.h> @@ -38,26 +38,26 @@ #include <macros/generic.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <vos/process.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** diff --git a/framework/source/threadhelp/transactionmanager.cxx b/framework/source/threadhelp/transactionmanager.cxx index 0c09f309a629..a42c871c176e 100644 --- a/framework/source/threadhelp/transactionmanager.cxx +++ b/framework/source/threadhelp/transactionmanager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/transactionmanager.hxx> #include <threadhelp/resetableguard.hxx> @@ -38,33 +38,33 @@ #include <macros/generic.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/DisposedException.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ namespace framework{ //_________________________________________________________________________________________________________________ -// non exported const +// non exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// non exported declarations +// non exported declarations //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// definitions +// definitions //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** @@ -99,7 +99,7 @@ TransactionManager::TransactionManager() TransactionManager::~TransactionManager() { } - + /*-****************************************************************************************************//** @interface ITransactionManager @short set new working mode @@ -365,9 +365,9 @@ void TransactionManager::impl_throwExceptions( EExceptionMode eMode, ERejectReas LOG_ERROR( "TransactionManager...", "Impossible case E_NOREASON!" ) } break; - default: break; // nothing to do + default: break; // nothing to do } } } -} // namespace framework +} // namespace framework diff --git a/framework/source/uiconfiguration/globalsettings.cxx b/framework/source/uiconfiguration/globalsettings.cxx index 6dcb3604c138..6e3b8d85e662 100644 --- a/framework/source/uiconfiguration/globalsettings.cxx +++ b/framework/source/uiconfiguration/globalsettings.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,14 +29,14 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include "uiconfiguration/globalsettings.hxx" #include <threadhelp/resetableguard.hxx> #include "services.h" //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -47,7 +47,7 @@ #include <com/sun/star/lang/XEventListener.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <rtl/ustrbuf.hxx> #include <rtl/instance.hxx> @@ -55,17 +55,17 @@ #include <tools/debug.hxx> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ -// +// using namespace rtl; using namespace ::com::sun::star; //_________________________________________________________________________________________________________________ -// Namespace +// Namespace //_________________________________________________________________________________________________________________ -// +// static const char GLOBALSETTINGS_ROOT_ACCESS[] = "/org.openoffice.Office.UI.GlobalSettings/Toolbars"; @@ -78,12 +78,12 @@ namespace framework { //***************************************************************************************************************** -// Configuration access class for WindowState supplier implementation +// Configuration access class for WindowState supplier implementation //***************************************************************************************************************** -class GlobalSettings_Access : public ::com::sun::star::lang::XComponent , +class GlobalSettings_Access : public ::com::sun::star::lang::XComponent , public ::com::sun::star::lang::XEventListener , - private ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. + private ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. public ::cppu::OWeakObject { public: @@ -104,7 +104,7 @@ class GlobalSettings_Access : public ::com::sun::star::lang::XComponent , // settings access sal_Bool HasStatesInfo( GlobalSettings::UIElementType eElementType ); sal_Bool GetStateInfo( GlobalSettings::UIElementType eElementType, GlobalSettings::StateInfo eStateInfo, ::com::sun::star::uno::Any& aValue ); - + private: sal_Bool impl_initConfigAccess(); @@ -121,7 +121,7 @@ class GlobalSettings_Access : public ::com::sun::star::lang::XComponent , //***************************************************************************************************************** -// XInterface +// XInterface //***************************************************************************************************************** DEFINE_XINTERFACE_2 ( GlobalSettings_Access , OWeakObject , @@ -147,28 +147,28 @@ GlobalSettings_Access::~GlobalSettings_Access() } // XComponent -void SAL_CALL GlobalSettings_Access::dispose() +void SAL_CALL GlobalSettings_Access::dispose() throw ( css::uno::RuntimeException ) { // SAFE ResetableGuard aLock( m_aLock ); - + m_xConfigAccess.clear(); m_bDisposed = sal_True; } - -void SAL_CALL GlobalSettings_Access::addEventListener( const css::uno::Reference< css::lang::XEventListener >& ) + +void SAL_CALL GlobalSettings_Access::addEventListener( const css::uno::Reference< css::lang::XEventListener >& ) throw (css::uno::RuntimeException) { } -void SAL_CALL GlobalSettings_Access::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& ) +void SAL_CALL GlobalSettings_Access::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& ) throw (css::uno::RuntimeException) { } // XEventListener -void SAL_CALL GlobalSettings_Access::disposing( const css::lang::EventObject& ) +void SAL_CALL GlobalSettings_Access::disposing( const css::lang::EventObject& ) throw (css::uno::RuntimeException) { // SAFE @@ -189,7 +189,7 @@ sal_Bool GlobalSettings_Access::HasStatesInfo( GlobalSettings::UIElementType eEl return sal_False; if ( !m_bConfigRead ) - { + { m_bConfigRead = sal_True; impl_initConfigAccess(); } @@ -225,9 +225,9 @@ sal_Bool GlobalSettings_Access::GetStateInfo( GlobalSettings::UIElementType eEle if ( m_bDisposed ) return sal_False; - + if ( !m_bConfigRead ) - { + { m_bConfigRead = sal_True; impl_initConfigAccess(); } @@ -245,7 +245,7 @@ sal_Bool GlobalSettings_Access::GetStateInfo( GlobalSettings::UIElementType eEle a = xNameAccess->getByName( m_aPropLocked ); else if ( eStateInfo == GlobalSettings::STATEINFO_DOCKED ) a = xNameAccess->getByName( m_aPropDocked ); - + aValue = a; return sal_True; } @@ -265,15 +265,15 @@ sal_Bool GlobalSettings_Access::impl_initConfigAccess() { css::uno::Sequence< css::uno::Any > aArgs( 2 ); css::beans::PropertyValue aPropValue; - + try { css::uno::Reference< css::lang::XMultiServiceFactory > xConfigProvider; if ( m_xServiceManager.is() ) - xConfigProvider = css::uno::Reference< css::lang::XMultiServiceFactory >( - m_xServiceManager->createInstance( SERVICENAME_CFGPROVIDER ), + xConfigProvider = css::uno::Reference< css::lang::XMultiServiceFactory >( + m_xServiceManager->createInstance( SERVICENAME_CFGPROVIDER ), css::uno::UNO_QUERY ); - + if ( xConfigProvider.is() ) { aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" )); @@ -282,16 +282,16 @@ sal_Bool GlobalSettings_Access::impl_initConfigAccess() aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "lazywrite" )); aPropValue.Value = css::uno::makeAny( sal_True ); aArgs[1] = css::uno::makeAny( aPropValue ); - - m_xConfigAccess = css::uno::Reference< css::container::XNameAccess >( - xConfigProvider->createInstanceWithArguments( - SERVICENAME_CFGREADACCESS, aArgs ), + + m_xConfigAccess = css::uno::Reference< css::container::XNameAccess >( + xConfigProvider->createInstanceWithArguments( + SERVICENAME_CFGREADACCESS, aArgs ), css::uno::UNO_QUERY ); css::uno::Reference< css::lang::XComponent > xComponent( xConfigProvider, css::uno::UNO_QUERY ); if ( xComponent.is() ) - xComponent->addEventListener( - css::uno::Reference< css::lang::XEventListener >( + xComponent->addEventListener( + css::uno::Reference< css::lang::XEventListener >( static_cast< cppu::OWeakObject* >( this ), css::uno::UNO_QUERY )); } @@ -309,7 +309,7 @@ sal_Bool GlobalSettings_Access::impl_initConfigAccess() } //***************************************************************************************************************** -// global class +// global class //***************************************************************************************************************** struct mutexGlobalSettings : public rtl::Static< osl::Mutex, mutexGlobalSettings > {}; @@ -318,7 +318,7 @@ static GlobalSettings_Access* pStaticSettings = 0; static GlobalSettings_Access* GetGlobalSettings( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rSrvMgr ) { osl::MutexGuard aGuard(mutexGlobalSettings::get()); - if ( !pStaticSettings ) + if ( !pStaticSettings ) pStaticSettings = new GlobalSettings_Access( rSrvMgr ); return pStaticSettings; } @@ -336,7 +336,7 @@ GlobalSettings::~GlobalSettings() sal_Bool GlobalSettings::HasStatesInfo( UIElementType eElementType ) { GlobalSettings_Access* pSettings( GetGlobalSettings( m_xSrvMgr )); - + if ( pSettings ) return pSettings->HasStatesInfo( eElementType ); else @@ -346,7 +346,7 @@ sal_Bool GlobalSettings::HasStatesInfo( UIElementType eElementType ) sal_Bool GlobalSettings::GetStateInfo( UIElementType eElementType, StateInfo eStateInfo, ::com::sun::star::uno::Any& aValue ) { GlobalSettings_Access* pSettings( GetGlobalSettings( m_xSrvMgr )); - + if ( pSettings ) return pSettings->GetStateInfo( eElementType, eStateInfo, aValue ); else diff --git a/framework/source/uiconfiguration/graphicnameaccess.cxx b/framework/source/uiconfiguration/graphicnameaccess.cxx index 7f41169a747f..3ba90227b2f5 100644 --- a/framework/source/uiconfiguration/graphicnameaccess.cxx +++ b/framework/source/uiconfiguration/graphicnameaccess.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,11 +30,11 @@ #include <uiconfiguration/graphicnameaccess.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <comphelper/sequence.hxx> @@ -51,7 +51,7 @@ GraphicNameAccess::GraphicNameAccess() GraphicNameAccess::~GraphicNameAccess() { } - + void GraphicNameAccess::addElement( const rtl::OUString& rName, const uno::Reference< graphic::XGraphic >& rElement ) { m_aNameToElementMap.insert( NameGraphicHashMap::value_type( rName, rElement )); @@ -59,7 +59,7 @@ void GraphicNameAccess::addElement( const rtl::OUString& rName, const uno::Refer // XNameAccess uno::Any SAL_CALL GraphicNameAccess::getByName( const ::rtl::OUString& aName ) -throw( container::NoSuchElementException, +throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { diff --git a/framework/source/uiconfiguration/imagemanager.cxx b/framework/source/uiconfiguration/imagemanager.cxx index 9e02fb57c334..fc18c2ac95ce 100644 --- a/framework/source/uiconfiguration/imagemanager.cxx +++ b/framework/source/uiconfiguration/imagemanager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ #include "properties.h" //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/ui/UIElementType.hpp> #include <com/sun/star/ui/ConfigurationEvent.hpp> @@ -49,7 +49,7 @@ #include <com/sun/star/ui/ImageType.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> @@ -63,7 +63,7 @@ #include <rtl/logfile.hxx> //_________________________________________________________________________________________________________________ -// namespaces +// namespaces //_________________________________________________________________________________________________________________ using ::rtl::OUString; @@ -95,11 +95,11 @@ namespace framework typedef GraphicNameAccess CmdToXGraphicNameAccess; //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** -DEFINE_XSERVICEINFO_MULTISERVICE ( ImageManager , +DEFINE_XSERVICEINFO_MULTISERVICE ( ImageManager , ::cppu::OWeakObject , - SERVICENAME_IMAGEMANAGER , + SERVICENAME_IMAGEMANAGER , IMPLEMENTATIONNAME_IMAGEMANAGER ) @@ -167,7 +167,7 @@ throw (::com::sun::star::uno::RuntimeException) ::sal_Bool SAL_CALL ImageManager::hasImage( ::sal_Int16 nImageType, const ::rtl::OUString& aCommandURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - return m_pImpl->hasImage(nImageType,aCommandURL); + return m_pImpl->hasImage(nImageType,aCommandURL); } Sequence< uno::Reference< XGraphic > > SAL_CALL ImageManager::getImages( @@ -178,42 +178,42 @@ throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno: return m_pImpl->getImages(nImageType,aCommandURLSequence); } -void SAL_CALL ImageManager::replaceImages( - ::sal_Int16 nImageType, - const Sequence< ::rtl::OUString >& aCommandURLSequence, - const Sequence< uno::Reference< XGraphic > >& aGraphicsSequence ) -throw ( ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::IllegalAccessException, +void SAL_CALL ImageManager::replaceImages( + ::sal_Int16 nImageType, + const Sequence< ::rtl::OUString >& aCommandURLSequence, + const Sequence< uno::Reference< XGraphic > >& aGraphicsSequence ) +throw ( ::com::sun::star::lang::IllegalArgumentException, + ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException) { m_pImpl->replaceImages(nImageType,aCommandURLSequence,aGraphicsSequence); } -void SAL_CALL ImageManager::removeImages( ::sal_Int16 nImageType, const Sequence< ::rtl::OUString >& aCommandURLSequence ) -throw ( ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::IllegalAccessException, +void SAL_CALL ImageManager::removeImages( ::sal_Int16 nImageType, const Sequence< ::rtl::OUString >& aCommandURLSequence ) +throw ( ::com::sun::star::lang::IllegalArgumentException, + ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException) { m_pImpl->removeImages(nImageType,aCommandURLSequence); } -void SAL_CALL ImageManager::insertImages( ::sal_Int16 nImageType, const Sequence< ::rtl::OUString >& aCommandURLSequence, const Sequence< uno::Reference< XGraphic > >& aGraphicSequence ) -throw ( ::com::sun::star::container::ElementExistException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::IllegalAccessException, +void SAL_CALL ImageManager::insertImages( ::sal_Int16 nImageType, const Sequence< ::rtl::OUString >& aCommandURLSequence, const Sequence< uno::Reference< XGraphic > >& aGraphicSequence ) +throw ( ::com::sun::star::container::ElementExistException, + ::com::sun::star::lang::IllegalArgumentException, + ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException) { m_pImpl->insertImages(nImageType,aCommandURLSequence,aGraphicSequence); } // XUIConfiguration -void SAL_CALL ImageManager::addConfigurationListener( const uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) +void SAL_CALL ImageManager::addConfigurationListener( const uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) { m_pImpl->addConfigurationListener(xListener); } -void SAL_CALL ImageManager::removeConfigurationListener( const uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) +void SAL_CALL ImageManager::removeConfigurationListener( const uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ @@ -221,26 +221,26 @@ throw (::com::sun::star::uno::RuntimeException) } // XUIConfigurationPersistence -void SAL_CALL ImageManager::reload() -throw ( ::com::sun::star::uno::Exception, +void SAL_CALL ImageManager::reload() +throw ( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException ) { m_pImpl->reload(); } -void SAL_CALL ImageManager::store() +void SAL_CALL ImageManager::store() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) { m_pImpl->store(); } -void SAL_CALL ImageManager::storeToStorage( const uno::Reference< XStorage >& Storage ) +void SAL_CALL ImageManager::storeToStorage( const uno::Reference< XStorage >& Storage ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) { m_pImpl->storeToStorage(Storage); } -sal_Bool SAL_CALL ImageManager::isModified() +sal_Bool SAL_CALL ImageManager::isModified() throw (::com::sun::star::uno::RuntimeException) { return m_pImpl->isModified(); diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx index ff99b5ae508b..24e19977c680 100755 --- a/framework/source/uiconfiguration/imagemanagerimpl.cxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ #include "properties.h" //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/ui/UIElementType.hpp> #include <com/sun/star/ui/ConfigurationEvent.hpp> @@ -48,7 +48,7 @@ #include <com/sun/star/ui/ImageType.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> @@ -63,7 +63,7 @@ #include "svtools/miscopt.hxx" //_________________________________________________________________________________________________________________ -// namespaces +// namespaces //_________________________________________________________________________________________________________________ using ::rtl::OUString; @@ -161,7 +161,7 @@ static rtl::OUString getCanonicalName( const rtl::OUString& rFileName ) { // map forbidden characters to escape case '/' : if ( !bRemoveSlash ) - aBuf.appendAscii( "%2f" ); + aBuf.appendAscii( "%2f" ); break; case '\\': aBuf.appendAscii( "%5c" ); bRemoveSlash = false; break; case ':' : aBuf.appendAscii( "%3a" ); bRemoveSlash = false; break; @@ -170,7 +170,7 @@ static rtl::OUString getCanonicalName( const rtl::OUString& rFileName ) case '<' : aBuf.appendAscii( "%3c" ); bRemoveSlash = false; break; case '>' : aBuf.appendAscii( "%3e" ); bRemoveSlash = false; break; case '|' : aBuf.appendAscii( "%7c" ); bRemoveSlash = false; break; - default: aBuf.append( c ); bRemoveSlash = false; + default: aBuf.append( c ); bRemoveSlash = false; } } return aBuf.makeStringAndClear(); @@ -255,7 +255,7 @@ void CmdImageList::impl_fillCommandToImageNameMap() { OUString aCommandName( m_aImageCommandNameVector[i] ); String aImageName; - + if ( aCommandName.indexOf( aUNOString ) != 0 ) { INetURLObject aUrlObject( aCommandName, INetURLObject::ENCODE_ALL ); @@ -264,13 +264,13 @@ void CmdImageList::impl_fillCommandToImageNameMap() } else { - // just remove the schema + // just remove the schema if ( aCommandName.getLength() > 5 ) aImageName = aCommandName.copy( 5 ); else aImageName = aEmptyString; - - // Search for query part. + + // Search for query part. sal_Int32 nIndex = aImageName.Search( '?' ); if ( nIndex != STRING_NOTFOUND ) aImageName = getCanonicalName( aImageName ); // convert to valid filename @@ -279,7 +279,7 @@ void CmdImageList::impl_fillCommandToImageNameMap() // reflect this. aImageName += aExt; aImageName.ToLowerAscii(); - + m_aImageNameVector[i] = aImageName; m_aCommandToImageNameMap.insert( CommandToImageNameMap::value_type( aCommandName, aImageName )); } @@ -666,7 +666,7 @@ sal_Bool ImageManagerImpl::implts_storeUserImages( } uno::Reference< XTransactedObject > xTransaction; - + // Commit user image storage xTransaction = uno::Reference< XTransactedObject >( xUserImageStorage, UNO_QUERY ); if ( xTransaction.is() ) @@ -676,7 +676,7 @@ sal_Bool ImageManagerImpl::implts_storeUserImages( xTransaction = uno::Reference< XTransactedObject >( xUserBitmapsStorage, UNO_QUERY ); if ( xTransaction.is() ) xTransaction->commit(); - + return sal_True; } } @@ -708,7 +708,7 @@ ImageManagerImpl::ImageManagerImpl( const uno::Reference< XMultiServiceFactory > , m_xOwner(_xOwner) , m_pDefaultImageList( 0 ) , m_aXMLPostfix( RTL_CONSTASCII_USTRINGPARAM( ".xml" )) - , m_aResourceString( RTL_CONSTASCII_USTRINGPARAM( ModuleImageList )) + , m_aResourceString( RTL_CONSTASCII_USTRINGPARAM( ModuleImageList )) , m_aListenerContainer( m_aLock.getShareableOslMutex() ) , m_bUseGlobal(_bUseGlobal) , m_bReadOnly( true ) @@ -742,7 +742,7 @@ void ImageManagerImpl::dispose() m_bConfigRead = false; m_bModified = false; m_bDisposed = true; - + // delete user and default image list on dispose for ( sal_Int32 n=0; n < ImageType_COUNT; n++ ) { @@ -752,7 +752,7 @@ void ImageManagerImpl::dispose() delete m_pDefaultImageList; m_pDefaultImageList = 0; } - + } void ImageManagerImpl::addEventListener( const uno::Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) { @@ -860,12 +860,12 @@ throw (::com::sun::star::uno::RuntimeException) ImageNameMap aImageCmdNameMap; sal_Int16 nIndex = implts_convertImageTypeToIndex( nImageType ); - + sal_uInt32 i( 0 ); if ( m_bUseGlobal ) { rtl::Reference< GlobalImageList > rGlobalImageList = implts_getGlobalImageList(); - + const std::vector< OUString >& rGlobalImageNameVector = rGlobalImageList->getImageCommandNames(); const sal_uInt32 nGlobalCount = rGlobalImageNameVector.size(); for ( i = 0; i < nGlobalCount; i++ ) @@ -972,20 +972,20 @@ throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno: return aGraphSeq; } -void ImageManagerImpl::replaceImages( - ::sal_Int16 nImageType, - const Sequence< ::rtl::OUString >& aCommandURLSequence, - const Sequence< uno::Reference< XGraphic > >& aGraphicsSequence ) -throw ( ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::IllegalAccessException, +void ImageManagerImpl::replaceImages( + ::sal_Int16 nImageType, + const Sequence< ::rtl::OUString >& aCommandURLSequence, + const Sequence< uno::Reference< XGraphic > >& aGraphicsSequence ) +throw ( ::com::sun::star::lang::IllegalArgumentException, + ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException) { CmdToXGraphicNameAccess* pInsertedImages( 0 ); CmdToXGraphicNameAccess* pReplacedImages( 0 ); - + { ResetableGuard aLock( m_aLock ); - + /* SAFE AREA ----------------------------------------------------------------------------------------------- */ if ( m_bDisposed ) throw DisposedException(); @@ -999,14 +999,14 @@ throw ( ::com::sun::star::lang::IllegalArgumentException, sal_Int16 nIndex = implts_convertImageTypeToIndex( nImageType ); ImageList* pImageList = implts_getUserImageList( ImageType( nIndex )); - + uno::Reference< XGraphic > xGraphic; for ( sal_Int32 i = 0; i < aCommandURLSequence.getLength(); i++ ) { // Check size and scale. If we don't have any graphics ignore it if ( !implts_checkAndScaleGraphic( xGraphic, aGraphicsSequence[i], nIndex )) continue; - + USHORT nPos = pImageList->GetImagePos( aCommandURLSequence[i] ); if ( nPos == IMAGELIST_IMAGE_NOTFOUND ) { @@ -1039,7 +1039,7 @@ throw ( ::com::sun::star::lang::IllegalArgumentException, aInsertEvent.Accessor <<= m_xOwner; aInsertEvent.Source = m_xOwner; aInsertEvent.ResourceURL = m_aResourceString; - aInsertEvent.Element = uno::makeAny( uno::Reference< XNameAccess >( + aInsertEvent.Element = uno::makeAny( uno::Reference< XNameAccess >( static_cast< OWeakObject *>( pInsertedImages ), UNO_QUERY )); implts_notifyContainerListener( aInsertEvent, NotifyOp_Insert ); } @@ -1051,15 +1051,15 @@ throw ( ::com::sun::star::lang::IllegalArgumentException, aReplaceEvent.Source = m_xOwner; aReplaceEvent.ResourceURL = m_aResourceString; aReplaceEvent.ReplacedElement = Any(); - aReplaceEvent.Element = uno::makeAny( uno::Reference< XNameAccess >( + aReplaceEvent.Element = uno::makeAny( uno::Reference< XNameAccess >( static_cast< OWeakObject *>( pReplacedImages ), UNO_QUERY )); implts_notifyContainerListener( aReplaceEvent, NotifyOp_Replace ); } } -void ImageManagerImpl::removeImages( ::sal_Int16 nImageType, const Sequence< ::rtl::OUString >& aCommandURLSequence ) -throw ( ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::IllegalAccessException, +void ImageManagerImpl::removeImages( ::sal_Int16 nImageType, const Sequence< ::rtl::OUString >& aCommandURLSequence ) +throw ( ::com::sun::star::lang::IllegalArgumentException, + ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException) { CmdToXGraphicNameAccess* pRemovedImages( 0 ); @@ -1160,10 +1160,10 @@ throw ( ::com::sun::star::lang::IllegalArgumentException, } } -void ImageManagerImpl::insertImages( ::sal_Int16 nImageType, const Sequence< ::rtl::OUString >& aCommandURLSequence, const Sequence< uno::Reference< XGraphic > >& aGraphicSequence ) -throw ( ::com::sun::star::container::ElementExistException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::IllegalAccessException, +void ImageManagerImpl::insertImages( ::sal_Int16 nImageType, const Sequence< ::rtl::OUString >& aCommandURLSequence, const Sequence< uno::Reference< XGraphic > >& aGraphicSequence ) +throw ( ::com::sun::star::container::ElementExistException, + ::com::sun::star::lang::IllegalArgumentException, + ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException) { replaceImages(nImageType,aCommandURLSequence,aGraphicSequence); @@ -1171,8 +1171,8 @@ throw ( ::com::sun::star::container::ElementExistException, // XUIConfigurationPersistence -void ImageManagerImpl::reload() -throw ( ::com::sun::star::uno::Exception, +void ImageManagerImpl::reload() +throw ( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException ) { ResetableGuard aGuard( m_aLock ); @@ -1180,9 +1180,9 @@ throw ( ::com::sun::star::uno::Exception, if ( m_bDisposed ) throw DisposedException(); - CommandMap aOldUserCmdImageSet; + CommandMap aOldUserCmdImageSet; std::vector< rtl::OUString > aNewUserCmdImageSet; - + if ( m_bModified ) { for ( sal_Int16 i = 0; i < sal_Int16( ImageType_COUNT ); i++ ) @@ -1198,12 +1198,12 @@ throw ( ::com::sun::star::uno::Exception, const sal_uInt32 nOldCount = aOldUserCmdImageVector.size(); for ( j = 0; j < nOldCount; j++ ) aOldUserCmdImageSet.insert( CommandMap::value_type( aOldUserCmdImageVector[j], false )); - + // Attention: This can make the old image list pointer invalid! implts_loadUserImages( (ImageType)i, m_xUserImageStorage, m_xUserBitmapsStorage ); pImageList = implts_getUserImageList( (ImageType)i ); pImageList->GetImageNames( aNewUserCmdImageSet ); - + CmdToXGraphicNameAccess* pInsertedImages( 0 ); CmdToXGraphicNameAccess* pReplacedImages( 0 ); CmdToXGraphicNameAccess* pRemovedImages( 0 ); @@ -1217,20 +1217,20 @@ throw ( ::com::sun::star::uno::Exception, pIter->second = true; // mark entry as replaced if ( !pReplacedImages ) pReplacedImages = new CmdToXGraphicNameAccess(); - pReplacedImages->addElement( aNewUserCmdImageSet[j], + pReplacedImages->addElement( aNewUserCmdImageSet[j], pImageList->GetImage( aNewUserCmdImageSet[j] ).GetXGraphic() ); } else { if ( !pInsertedImages ) pInsertedImages = new CmdToXGraphicNameAccess(); - pInsertedImages->addElement( aNewUserCmdImageSet[j], + pInsertedImages->addElement( aNewUserCmdImageSet[j], pImageList->GetImage( aNewUserCmdImageSet[j] ).GetXGraphic() ); } } - // Search map for unmarked entries => they have been removed from the user list - // through this reload operation. + // Search map for unmarked entries => they have been removed from the user list + // through this reload operation. // We have to search the module and global image list! rtl::Reference< GlobalImageList > rGlobalImageList; CmdImageList* pDefaultImageList = NULL; @@ -1276,9 +1276,9 @@ throw ( ::com::sun::star::uno::Exception, } ++pIter; } - + aGuard.unlock(); - + // Now notify our listeners. Unlock mutex to prevent deadlocks if ( pInsertedImages != 0 ) { @@ -1287,7 +1287,7 @@ throw ( ::com::sun::star::uno::Exception, aInsertEvent.Accessor = uno::makeAny( m_xOwner ); aInsertEvent.Source = m_xOwner; aInsertEvent.ResourceURL = m_aResourceString; - aInsertEvent.Element = uno::makeAny( uno::Reference< XNameAccess >( + aInsertEvent.Element = uno::makeAny( uno::Reference< XNameAccess >( static_cast< OWeakObject *>( pInsertedImages ), UNO_QUERY )); implts_notifyContainerListener( aInsertEvent, NotifyOp_Insert ); } @@ -1299,7 +1299,7 @@ throw ( ::com::sun::star::uno::Exception, aReplaceEvent.Source = m_xOwner; aReplaceEvent.ResourceURL = m_aResourceString; aReplaceEvent.ReplacedElement = Any(); - aReplaceEvent.Element = uno::makeAny( uno::Reference< XNameAccess >( + aReplaceEvent.Element = uno::makeAny( uno::Reference< XNameAccess >( static_cast< OWeakObject *>( pReplacedImages ), UNO_QUERY )); implts_notifyContainerListener( aReplaceEvent, NotifyOp_Replace ); } @@ -1310,7 +1310,7 @@ throw ( ::com::sun::star::uno::Exception, aRemoveEvent.Accessor = uno::makeAny( m_xOwner ); aRemoveEvent.Source = m_xOwner; aRemoveEvent.ResourceURL = m_aResourceString; - aRemoveEvent.Element = uno::makeAny( uno::Reference< XNameAccess >( + aRemoveEvent.Element = uno::makeAny( uno::Reference< XNameAccess >( static_cast< OWeakObject *>( pRemovedImages ), UNO_QUERY )); implts_notifyContainerListener( aRemoveEvent, NotifyOp_Remove ); } @@ -1321,7 +1321,7 @@ throw ( ::com::sun::star::uno::Exception, } } -void ImageManagerImpl::store() +void ImageManagerImpl::store() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) { ResetableGuard aGuard( m_aLock ); @@ -1340,7 +1340,7 @@ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException m_bUserImageListModified[i] = false; } - if ( bWritten && + if ( bWritten && m_xUserConfigStorage.is() ) { uno::Reference< XTransactedObject > xUserConfigStorageCommit( m_xUserConfigStorage, UNO_QUERY ); @@ -1354,7 +1354,7 @@ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException } } -void ImageManagerImpl::storeToStorage( const uno::Reference< XStorage >& Storage ) +void ImageManagerImpl::storeToStorage( const uno::Reference< XStorage >& Storage ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) { ResetableGuard aGuard( m_aLock ); @@ -1366,7 +1366,7 @@ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException { long nModes = ElementModes::READWRITE; - uno::Reference< XStorage > xUserImageStorage = Storage->openStorageElement( OUString::createFromAscii( IMAGE_FOLDER ), + uno::Reference< XStorage > xUserImageStorage = Storage->openStorageElement( OUString::createFromAscii( IMAGE_FOLDER ), nModes ); if ( xUserImageStorage.is() ) { @@ -1377,7 +1377,7 @@ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException implts_getUserImageList( (ImageType)i ); implts_storeUserImages( (ImageType)i, xUserImageStorage, xUserBitmapsStorage ); } - + uno::Reference< XTransactedObject > xTransaction( Storage, UNO_QUERY ); if ( xTransaction.is() ) xTransaction->commit(); @@ -1385,7 +1385,7 @@ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException } } -sal_Bool ImageManagerImpl::isModified() +sal_Bool ImageManagerImpl::isModified() throw (::com::sun::star::uno::RuntimeException) { ResetableGuard aGuard( m_aLock ); @@ -1398,21 +1398,21 @@ sal_Bool ImageManagerImpl::isReadOnly() throw (::com::sun::star::uno::RuntimeExc return m_bReadOnly; } // XUIConfiguration -void ImageManagerImpl::addConfigurationListener( const uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) +void ImageManagerImpl::addConfigurationListener( const uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) { { ResetableGuard aGuard( m_aLock ); - + /* SAFE AREA ----------------------------------------------------------------------------------------------- */ if ( m_bDisposed ) throw DisposedException(); } - + m_aListenerContainer.addInterface( ::getCppuType( ( const uno::Reference< XUIConfigurationListener >* ) NULL ), xListener ); } -void ImageManagerImpl::removeConfigurationListener( const uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) +void ImageManagerImpl::removeConfigurationListener( const uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ @@ -1422,7 +1422,7 @@ throw (::com::sun::star::uno::RuntimeException) void ImageManagerImpl::implts_notifyContainerListener( const ConfigurationEvent& aEvent, NotifyOp eOp ) { - ::cppu::OInterfaceContainerHelper* pContainer = m_aListenerContainer.getContainer( + ::cppu::OInterfaceContainerHelper* pContainer = m_aListenerContainer.getContainer( ::getCppuType( ( const css::uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >*) NULL ) ); if ( pContainer != NULL ) { diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx index 5e213f8a598f..2a3a643731ab 100755 --- a/framework/source/uiconfiguration/imagemanagerimpl.hxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ #include <hash_map> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> @@ -48,7 +48,7 @@ #include <uiconfiguration/imagetype.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> @@ -63,7 +63,7 @@ #include <com/sun/star/ui/XImageManager.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/weak.hxx> #include <cppuhelper/interfacecontainer.hxx> @@ -83,7 +83,7 @@ namespace framework CmdImageList( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rServiceManager, const ::rtl::OUString& aModuleIdentifier ); virtual ~CmdImageList(); - + virtual Image getImageFromCommandURL( sal_Int16 nImageType, const rtl::OUString& rCommandURL ); virtual bool hasImage( sal_Int16 nImageType, const rtl::OUString& rCommandURL ); virtual ::std::vector< rtl::OUString >& getImageNames(); @@ -116,7 +116,7 @@ namespace framework virtual bool hasImage( sal_Int16 nImageType, const rtl::OUString& rCommandURL ); virtual ::std::vector< rtl::OUString >& getImageNames(); virtual ::std::vector< rtl::OUString >& getImageCommandNames(); - + // Reference virtual oslInterlockedCount SAL_CALL acquire(); virtual oslInterlockedCount SAL_CALL release(); @@ -125,7 +125,7 @@ namespace framework oslInterlockedCount m_nRefCount; }; - class ImageManagerImpl : public ThreadHelpBase // Struct for right initalization of mutex member! Must be first of baseclasses. + class ImageManagerImpl : public ThreadHelpBase // Struct for right initalization of mutex member! Must be first of baseclasses. { public: @@ -161,18 +161,18 @@ namespace framework void clear(); - typedef std::hash_map< rtl::OUString, - sal_Bool, + typedef std::hash_map< rtl::OUString, + sal_Bool, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > ImageNameMap; - + enum Layer { LAYER_DEFAULT, LAYER_USERDEFINED, LAYER_COUNT }; - + enum NotifyOp { NotifyOp_Remove, @@ -187,10 +187,10 @@ namespace framework void implts_notifyContainerListener( const ::com::sun::star::ui::ConfigurationEvent& aEvent, NotifyOp eOp ); ImageList* implts_getUserImageList( ImageType nImageType ); sal_Bool implts_loadUserImages( ImageType nImageType, - const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xUserImageStorage, + const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xUserImageStorage, const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xUserBitmapsStorage ); sal_Bool implts_storeUserImages( ImageType nImageType, - const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xUserImageStorage, + const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xUserImageStorage, const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xUserBitmapsStorage ); const rtl::Reference< GlobalImageList >& implts_getGlobalImageList(); CmdImageList* implts_getDefaultImageList(); @@ -206,7 +206,7 @@ namespace framework CmdImageList* m_pDefaultImageList; rtl::OUString m_aXMLPostfix; rtl::OUString m_aModuleIdentifier; - rtl::OUString m_aResourceString; + rtl::OUString m_aResourceString; ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener ImageList* m_pUserImageList[ImageType_COUNT]; bool m_bUserImageListModified[ImageType_COUNT]; @@ -215,7 +215,7 @@ namespace framework bool m_bInitialized; bool m_bModified; bool m_bConfigRead; - bool m_bDisposed; + bool m_bDisposed; }; } diff --git a/framework/source/uiconfiguration/moduleimagemanager.cxx b/framework/source/uiconfiguration/moduleimagemanager.cxx index cd400b7e3f43..d76fdcf4c67f 100644 --- a/framework/source/uiconfiguration/moduleimagemanager.cxx +++ b/framework/source/uiconfiguration/moduleimagemanager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ #include "properties.h" //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/ui/UIElementType.hpp> #include <com/sun/star/ui/ConfigurationEvent.hpp> @@ -53,7 +53,7 @@ #include <com/sun/star/uno/XComponentContext.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> @@ -68,7 +68,7 @@ #include <rtl/logfile.hxx> //_________________________________________________________________________________________________________________ -// namespaces +// namespaces //_________________________________________________________________________________________________________________ using ::rtl::OUString; @@ -139,7 +139,7 @@ throw (::com::sun::star::uno::RuntimeException) ::sal_Bool SAL_CALL ModuleImageManager::hasImage( ::sal_Int16 nImageType, const ::rtl::OUString& aCommandURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - return m_pImpl->hasImage(nImageType,aCommandURL); + return m_pImpl->hasImage(nImageType,aCommandURL); } Sequence< uno::Reference< XGraphic > > SAL_CALL ModuleImageManager::getImages( @@ -167,7 +167,7 @@ throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException) { - m_pImpl->removeImages(nImageType,aCommandURLSequence); + m_pImpl->removeImages(nImageType,aCommandURLSequence); } void SAL_CALL ModuleImageManager::insertImages( ::sal_Int16 nImageType, const Sequence< ::rtl::OUString >& aCommandURLSequence, const Sequence< uno::Reference< XGraphic > >& aGraphicSequence ) @@ -180,39 +180,39 @@ throw ( ::com::sun::star::container::ElementExistException, } // XUIConfiguration -void SAL_CALL ModuleImageManager::addConfigurationListener( const uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) +void SAL_CALL ModuleImageManager::addConfigurationListener( const uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) { m_pImpl->addConfigurationListener(xListener); } -void SAL_CALL ModuleImageManager::removeConfigurationListener( const uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) +void SAL_CALL ModuleImageManager::removeConfigurationListener( const uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) { m_pImpl->removeConfigurationListener(xListener); } // XUIConfigurationPersistence -void SAL_CALL ModuleImageManager::reload() -throw ( ::com::sun::star::uno::Exception, +void SAL_CALL ModuleImageManager::reload() +throw ( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException ) { m_pImpl->reload(); } -void SAL_CALL ModuleImageManager::store() +void SAL_CALL ModuleImageManager::store() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) { m_pImpl->store(); } -void SAL_CALL ModuleImageManager::storeToStorage( const uno::Reference< XStorage >& Storage ) +void SAL_CALL ModuleImageManager::storeToStorage( const uno::Reference< XStorage >& Storage ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) { m_pImpl->storeToStorage(Storage); } -sal_Bool SAL_CALL ModuleImageManager::isModified() +sal_Bool SAL_CALL ModuleImageManager::isModified() throw (::com::sun::star::uno::RuntimeException) { return m_pImpl->isModified(); diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx index 24c0f152e5a3..e4a815faafea 100644 --- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx +++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ #include <services.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -44,7 +44,7 @@ #include <com/sun/star/embed/XPackageStructureCreator.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <rtl/logfile.hxx> #include <cppuhelper/implbase1.hxx> @@ -85,7 +85,7 @@ class RootStorageWrapper : public ::cppu::WeakImplHelper1< com::sun::star::embe }; //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** DEFINE_XINTERFACE_4 ( ModuleUIConfigurationManagerSupplier , OWeakObject , @@ -96,8 +96,8 @@ DEFINE_XINTERFACE_4 ( ModuleUIConfigurationManagerSupplier ) DEFINE_XTYPEPROVIDER_4 ( ModuleUIConfigurationManagerSupplier , - css::lang::XTypeProvider , - css::lang::XServiceInfo , + css::lang::XTypeProvider , + css::lang::XServiceInfo , css::lang::XComponent , ::com::sun::star::ui::XModuleUIConfigurationManagerSupplier ) diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx index 54f8ecf5064f..607efce4d4d6 100644 --- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ #endif //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/ui/UIElementType.hpp> #include <com/sun/star/ui/ConfigurationEvent.hpp> @@ -52,7 +52,7 @@ #include <com/sun/star/io/XStream.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> @@ -60,7 +60,7 @@ #include <comphelper/sequenceashashmap.hxx> //_________________________________________________________________________________________________________________ -// namespaces +// namespaces //_________________________________________________________________________________________________________________ using rtl::OUString; @@ -76,7 +76,7 @@ namespace framework { //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** DEFINE_XINTERFACE_8 ( ModuleUIConfigurationManager , OWeakObject , @@ -91,19 +91,19 @@ DEFINE_XINTERFACE_8 ( ModuleUIConfigurationManager ) DEFINE_XTYPEPROVIDER_8 ( ModuleUIConfigurationManager , - css::lang::XTypeProvider , - css::lang::XServiceInfo , + css::lang::XTypeProvider , + css::lang::XServiceInfo , css::lang::XComponent , css::lang::XInitialization , ::com::sun::star::ui::XUIConfiguration , ::com::sun::star::ui::XUIConfigurationManager , ::com::sun::star::ui::XModuleUIConfigurationManager , - ::com::sun::star::ui::XUIConfigurationPersistence + ::com::sun::star::ui::XUIConfigurationPersistence ) DEFINE_XSERVICEINFO_MULTISERVICE ( ModuleUIConfigurationManager , ::cppu::OWeakObject , - SERVICENAME_MODULEUICONFIGURATIONMANAGER , + SERVICENAME_MODULEUICONFIGURATIONMANAGER , IMPLEMENTATIONNAME_MODULEUICONFIGURATIONMANAGER ) @@ -178,7 +178,7 @@ void ModuleUIConfigurationManager::impl_fillSequenceWithElementTypeInfo( UIEleme sal_Int32 nIndex = pUserIter->second.aResourceURL.indexOf( aCustomUrlPrefix, RESOURCEURL_PREFIX_SIZE ); if ( nIndex > RESOURCEURL_PREFIX_SIZE ) { - // Performance: Retrieve user interface name only for custom user interface elements. + // Performance: Retrieve user interface name only for custom user interface elements. // It's only used by them! UIElementData* pDataSettings = impl_findUIElementData( pUserIter->second.aResourceURL, nElementType ); if ( pDataSettings ) @@ -191,7 +191,7 @@ void ModuleUIConfigurationManager::impl_fillSequenceWithElementTypeInfo( UIEleme Any a = xPropSet->getPropertyValue( m_aPropUIName ); a >>= aUIName; } - + UIElementInfo aInfo( pUserIter->second.aResourceURL, aUIName ); aUIElementInfoCollection.insert( UIElementInfoHashMap::value_type( pUserIter->second.aResourceURL, aInfo )); } @@ -216,7 +216,7 @@ void ModuleUIConfigurationManager::impl_fillSequenceWithElementTypeInfo( UIEleme sal_Int32 nIndex = pDefIter->second.aResourceURL.indexOf( aCustomUrlPrefix, RESOURCEURL_PREFIX_SIZE ); if ( nIndex > RESOURCEURL_PREFIX_SIZE ) { - // Performance: Retrieve user interface name only for custom user interface elements. + // Performance: Retrieve user interface name only for custom user interface elements. // It's only used by them! UIElementData* pDataSettings = impl_findUIElementData( pDefIter->second.aResourceURL, nElementType ); if ( pDataSettings ) @@ -229,7 +229,7 @@ void ModuleUIConfigurationManager::impl_fillSequenceWithElementTypeInfo( UIEleme Any a = xPropSet->getPropertyValue( m_aPropUIName ); a >>= aUIName; } - + UIElementInfo aInfo( pDefIter->second.aResourceURL, aUIName ); aUIElementInfoCollection.insert( UIElementInfoHashMap::value_type( pDefIter->second.aResourceURL, aInfo )); } @@ -241,13 +241,13 @@ void ModuleUIConfigurationManager::impl_fillSequenceWithElementTypeInfo( UIEleme aUIElementInfoCollection.insert( UIElementInfoHashMap::value_type( pDefIter->second.aResourceURL, aInfo )); } } - + ++pDefIter; } } void ModuleUIConfigurationManager::impl_preloadUIElementTypeList( Layer eLayer, sal_Int16 nElementType ) -{ +{ UIElementType& rElementTypeData = m_aUIElements[eLayer][nElementType]; if ( !rElementTypeData.bLoaded ) @@ -267,7 +267,7 @@ void ModuleUIConfigurationManager::impl_preloadUIElementTypeList( Layer eLayer, for ( sal_Int32 n = 0; n < aUIElementNames.getLength(); n++ ) { UIElementData aUIElementData; - + // Resource name must be without ".xml" sal_Int32 nIndex = aUIElementNames[n].lastIndexOf( '.' ); if (( nIndex > 0 ) && ( nIndex < aUIElementNames[n].getLength() )) @@ -275,7 +275,7 @@ void ModuleUIConfigurationManager::impl_preloadUIElementTypeList( Layer eLayer, OUString aExtension( aUIElementNames[n].copy( nIndex+1 )); OUString aUIElementName( aUIElementNames[n].copy( 0, nIndex )); - if (( aUIElementName.getLength() > 0 ) && + if (( aUIElementName.getLength() > 0 ) && ( aExtension.equalsIgnoreAsciiCaseAsciiL( "xml", 3 ))) { aUIElementData.aResourceURL = aResURLPrefix + aUIElementName; @@ -287,7 +287,7 @@ void ModuleUIConfigurationManager::impl_preloadUIElementTypeList( Layer eLayer, aUIElementData.bDefault = false; aUIElementData.bDefaultNode = false; } - + // Create hash_map entries for all user interface elements inside the storage. We don't load the // settings to speed up the process. rHashMap.insert( UIElementDataHashMap::value_type( aUIElementData.aResourceURL, aUIElementData )); @@ -338,7 +338,7 @@ void ModuleUIConfigurationManager::impl_requestUIElementData( sal_Int16 nElement } } break; - + case ::com::sun::star::ui::UIElementType::POPUPMENU: { break; @@ -357,7 +357,7 @@ void ModuleUIConfigurationManager::impl_requestUIElementData( sal_Int16 nElement catch ( ::com::sun::star::lang::WrappedTargetException& ) { } - + break; } @@ -374,7 +374,7 @@ void ModuleUIConfigurationManager::impl_requestUIElementData( sal_Int16 nElement catch ( ::com::sun::star::lang::WrappedTargetException& ) { } - + break; } @@ -388,7 +388,7 @@ void ModuleUIConfigurationManager::impl_requestUIElementData( sal_Int16 nElement catch ( ::com::sun::star::embed::InvalidStorageException& ) { } - catch ( ::com::sun::star::lang::IllegalArgumentException& ) + catch ( ::com::sun::star::lang::IllegalArgumentException& ) { } catch ( ::com::sun::star::io::IOException& ) @@ -422,7 +422,7 @@ ModuleUIConfigurationManager::UIElementData* ModuleUIConfigurationManager::impl return &(pIter->second); } } - + // Not successfull, we have to look into our default vector/hash_map combination UIElementDataHashMap& rDefaultHashMap = m_aUIElements[LAYER_DEFAULT][nElementType].aElementsHashMap; pIter = rDefaultHashMap.find( aResourceURL ); @@ -441,7 +441,7 @@ void ModuleUIConfigurationManager::impl_storeElementTypeData( Reference< XStorag { UIElementDataHashMap& rHashMap = rElementType.aElementsHashMap; UIElementDataHashMap::iterator pIter = rHashMap.begin(); - + while ( pIter != rHashMap.end() ) { UIElementData& rElement = pIter->second; @@ -456,7 +456,7 @@ void ModuleUIConfigurationManager::impl_storeElementTypeData( Reference< XStorag { Reference< XStream > xStream( xStorage->openStreamElement( rElement.aName, ElementModes::WRITE|ElementModes::TRUNCATE ), UNO_QUERY ); Reference< XOutputStream > xOutputStream( xStream->getOutputStream() ); - + if ( xOutputStream.is() ) { switch( rElementType.nElementType ) @@ -497,18 +497,18 @@ void ModuleUIConfigurationManager::impl_storeElementTypeData( Reference< XStorag } } break; - + default: break; } } - + // mark as not modified if we store to our own storage if ( bResetModifyState ) rElement.bModified = sal_False; } } - + ++pIter; } @@ -523,20 +523,20 @@ void ModuleUIConfigurationManager::impl_storeElementTypeData( Reference< XStorag } // This is only allowed to be called on the LAYER_USER_DEFINED! -void ModuleUIConfigurationManager::impl_resetElementTypeData( - UIElementType& rUserElementType, - UIElementType& rDefaultElementType, - ConfigEventNotifyContainer& rRemoveNotifyContainer, +void ModuleUIConfigurationManager::impl_resetElementTypeData( + UIElementType& rUserElementType, + UIElementType& rDefaultElementType, + ConfigEventNotifyContainer& rRemoveNotifyContainer, ConfigEventNotifyContainer& rReplaceNotifyContainer ) { UIElementDataHashMap& rHashMap = rUserElementType.aElementsHashMap; UIElementDataHashMap::iterator pIter = rHashMap.begin(); - + Reference< XUIConfigurationManager > xThis( static_cast< OWeakObject* >( this ), UNO_QUERY ); Reference< XInterface > xIfac( xThis, UNO_QUERY ); Reference< XNameAccess > xDefaultNameAccess( rDefaultElementType.xStorage, UNO_QUERY ); sal_Int16 nType = rUserElementType.nElementType; - + // Make copies of the event structures to be thread-safe. We have to unlock our mutex before calling // our listeners! while ( pIter != rHashMap.end() ) @@ -549,16 +549,16 @@ void ModuleUIConfigurationManager::impl_resetElementTypeData( // Replace settings with data from default layer Reference< XIndexAccess > xOldSettings( rElement.xSettings ); impl_requestUIElementData( nType, LAYER_DEFAULT, rElement ); - + ConfigurationEvent aReplaceEvent; aReplaceEvent.ResourceURL = rElement.aResourceURL; aReplaceEvent.Accessor <<= xThis; aReplaceEvent.Source = xIfac; aReplaceEvent.ReplacedElement <<= xOldSettings; aReplaceEvent.Element <<= rElement.xSettings; - + rReplaceNotifyContainer.push_back( aReplaceEvent ); - + // Mark element as default and not modified. That means "not active" // in the user layer anymore. rElement.bModified = false; @@ -572,16 +572,16 @@ void ModuleUIConfigurationManager::impl_resetElementTypeData( aEvent.Accessor <<= xThis; aEvent.Source = xIfac; aEvent.Element <<= rElement.xSettings; - + rRemoveNotifyContainer.push_back( aEvent ); - + // Mark element as default and not modified. That means "not active" // in the user layer anymore. rElement.bModified = false; rElement.bDefault = true; } } - + ++pIter; } @@ -589,10 +589,10 @@ void ModuleUIConfigurationManager::impl_resetElementTypeData( rHashMap.clear(); } -void ModuleUIConfigurationManager::impl_reloadElementTypeData( - UIElementType& rUserElementType, - UIElementType& rDefaultElementType, - ConfigEventNotifyContainer& rRemoveNotifyContainer, +void ModuleUIConfigurationManager::impl_reloadElementTypeData( + UIElementType& rUserElementType, + UIElementType& rDefaultElementType, + ConfigEventNotifyContainer& rRemoveNotifyContainer, ConfigEventNotifyContainer& rReplaceNotifyContainer ) { UIElementDataHashMap& rHashMap = rUserElementType.aElementsHashMap; @@ -601,11 +601,11 @@ void ModuleUIConfigurationManager::impl_reloadElementTypeData( Reference< XStorage > xDefaultStorage( rDefaultElementType.xStorage ); Reference< XNameAccess > xUserNameAccess( rUserElementType.xStorage, UNO_QUERY ); Reference< XNameAccess > xDefaultNameAccess( rDefaultElementType.xStorage, UNO_QUERY ); - + Reference< XUIConfigurationManager > xThis( static_cast< OWeakObject* >( this ), UNO_QUERY ); Reference< XInterface > xIfac( xThis, UNO_QUERY ); sal_Int16 nType = rUserElementType.nElementType; - + while ( pIter != rHashMap.end() ) { UIElementData& rElement = pIter->second; @@ -617,16 +617,16 @@ void ModuleUIConfigurationManager::impl_reloadElementTypeData( Reference< XIndexAccess > xOldSettings( rElement.xSettings ); impl_requestUIElementData( nType, LAYER_USERDEFINED, rElement ); - + ConfigurationEvent aReplaceEvent; - + aReplaceEvent.ResourceURL = rElement.aResourceURL; aReplaceEvent.Accessor <<= xThis; aReplaceEvent.Source = xIfac; aReplaceEvent.ReplacedElement <<= xOldSettings; aReplaceEvent.Element <<= rElement.xSettings; rReplaceNotifyContainer.push_back( aReplaceEvent ); - + rElement.bModified = false; } else if ( xDefaultNameAccess->hasByName( rElement.aName )) @@ -635,16 +635,16 @@ void ModuleUIConfigurationManager::impl_reloadElementTypeData( Reference< XIndexAccess > xOldSettings( rElement.xSettings ); impl_requestUIElementData( nType, LAYER_DEFAULT, rElement ); - + ConfigurationEvent aReplaceEvent; - + aReplaceEvent.ResourceURL = rElement.aResourceURL; aReplaceEvent.Accessor <<= xThis; aReplaceEvent.Source = xIfac; aReplaceEvent.ReplacedElement <<= xOldSettings; aReplaceEvent.Element <<= rElement.xSettings; rReplaceNotifyContainer.push_back( aReplaceEvent ); - + // Mark element as default and not modified. That means "not active" // in the user layer anymore. rElement.bModified = false; @@ -654,14 +654,14 @@ void ModuleUIConfigurationManager::impl_reloadElementTypeData( { // Element settings are not in any storage => remove ConfigurationEvent aRemoveEvent; - + aRemoveEvent.ResourceURL = rElement.aResourceURL; aRemoveEvent.Accessor <<= xThis; aRemoveEvent.Source = xIfac; aRemoveEvent.Element <<= rElement.xSettings; - + rRemoveNotifyContainer.push_back( aRemoveEvent ); - + // Mark element as default and not modified. That means "not active" // in the user layer anymore. rElement.bModified = false; @@ -755,7 +755,7 @@ ModuleUIConfigurationManager::ModuleUIConfigurationManager( com::sun::star::uno: { for ( int i = 0; i < ::com::sun::star::ui::UIElementType::COUNT; i++ ) m_pStorageHandler[i] = 0; - + // Make sure we have a default initialized entry for every layer and user interface element type! // The following code depends on this! m_aUIElements[LAYER_DEFAULT].resize( ::com::sun::star::ui::UIElementType::COUNT ); @@ -775,7 +775,7 @@ void SAL_CALL ModuleUIConfigurationManager::dispose() throw (::com::sun::star::u css::lang::EventObject aEvent( xThis ); m_aListenerContainer.disposeAndClear( aEvent ); - + /* SAFE AREA ----------------------------------------------------------------------------------------------- */ ResetableGuard aGuard( m_aLock ); Reference< XComponent > xModuleImageManager( m_xModuleImageManager ); @@ -791,7 +791,7 @@ void SAL_CALL ModuleUIConfigurationManager::dispose() throw (::com::sun::star::u m_bDisposed = true; aGuard.unlock(); /* SAFE AREA ----------------------------------------------------------------------------------------------- */ - + try { if ( xModuleImageManager.is() ) @@ -811,7 +811,7 @@ void SAL_CALL ModuleUIConfigurationManager::addEventListener( const Reference< X if ( m_bDisposed ) throw DisposedException(); } - + m_aListenerContainer.addInterface( ::getCppuType( ( const Reference< XEventListener >* ) NULL ), xListener ); } @@ -825,7 +825,7 @@ void SAL_CALL ModuleUIConfigurationManager::removeEventListener( const Reference void SAL_CALL ModuleUIConfigurationManager::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException ) { ResetableGuard aLock( m_aLock ); - + if ( !m_bInitialized ) { ::comphelper::SequenceAsHashMap lArgs(aArguments); @@ -851,15 +851,15 @@ void SAL_CALL ModuleUIConfigurationManager::initialize( const Sequence< Any >& a css::uno::Reference< css::embed::XStorage >()); // no document root used here! } } - + // initialize root storages for all resource types m_xUserRootCommit = css::uno::Reference< css::embed::XTransactedObject >( m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getOrCreateRootStorageUser(), css::uno::UNO_QUERY); // can be empty m_xDefaultConfigStorage = m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getParentStorageShare( - m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getWorkingStorageShare()); + m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getWorkingStorageShare()); m_xUserConfigStorage = m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getParentStorageUser( m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getWorkingStorageUser()); - + if ( m_xUserConfigStorage.is() ) { Reference< XPropertySet > xPropSet( m_xUserConfigStorage, UNO_QUERY ); @@ -871,10 +871,10 @@ void SAL_CALL ModuleUIConfigurationManager::initialize( const Sequence< Any >& a m_bReadOnly = !( nOpenMode & ElementModes::WRITE ); } } - + impl_Initialize(); - m_bInitialized = true; + m_bInitialized = true; } } @@ -883,12 +883,12 @@ void SAL_CALL ModuleUIConfigurationManager::addConfigurationListener( const Refe { { ResetableGuard aGuard( m_aLock ); - + /* SAFE AREA ----------------------------------------------------------------------------------------------- */ if ( m_bDisposed ) throw DisposedException(); } - + m_aListenerContainer.addInterface( ::getCppuType( ( const Reference< XUIConfigurationListener >* ) NULL ), xListener ); } @@ -898,7 +898,7 @@ void SAL_CALL ModuleUIConfigurationManager::removeConfigurationListener( const R m_aListenerContainer.removeInterface( ::getCppuType( ( const Reference< XUIConfigurationListener >* ) NULL ), xListener ); } - + // XUIConfigurationManager void SAL_CALL ModuleUIConfigurationManager::reset() throw (::com::sun::star::uno::RuntimeException) { @@ -907,7 +907,7 @@ void SAL_CALL ModuleUIConfigurationManager::reset() throw (::com::sun::star::uno /* SAFE AREA ----------------------------------------------------------------------------------------------- */ if ( m_bDisposed ) throw DisposedException(); - + bool bResetStorage( false ); if ( !isReadOnly() ) @@ -922,7 +922,7 @@ void SAL_CALL ModuleUIConfigurationManager::reset() throw (::com::sun::star::uno if ( xSubStorage.is() ) { - bool bCommitSubStorage( false ); + bool bCommitSubStorage( false ); Reference< XNameAccess > xSubStorageNameAccess( xSubStorage, UNO_QUERY ); Sequence< OUString > aUIElementStreamNames = xSubStorageNameAccess->getElementNames(); for ( sal_Int32 j = 0; j < aUIElementStreamNames.getLength(); j++ ) @@ -930,7 +930,7 @@ void SAL_CALL ModuleUIConfigurationManager::reset() throw (::com::sun::star::uno xSubStorage->removeElement( aUIElementStreamNames[j] ); bCommitSubStorage = true; } - + if ( bCommitSubStorage ) { Reference< XTransactedObject > xTransactedObject( xSubStorage, UNO_QUERY ); @@ -942,7 +942,7 @@ void SAL_CALL ModuleUIConfigurationManager::reset() throw (::com::sun::star::uno } bResetStorage = true; - + // remove settings from user defined layer and notify listener about removed settings data! ConfigEventNotifyContainer aRemoveEventNotifyContainer; ConfigEventNotifyContainer aReplaceEventNotifyContainer; @@ -952,7 +952,7 @@ void SAL_CALL ModuleUIConfigurationManager::reset() throw (::com::sun::star::uno { UIElementType& rUserElementType = m_aUIElements[LAYER_USERDEFINED][j]; UIElementType& rDefaultElementType = m_aUIElements[LAYER_DEFAULT][j]; - + impl_resetElementTypeData( rUserElementType, rDefaultElementType, aRemoveEventNotifyContainer, aReplaceEventNotifyContainer ); rUserElementType.bModified = sal_False; } @@ -961,12 +961,12 @@ void SAL_CALL ModuleUIConfigurationManager::reset() throw (::com::sun::star::uno throw IOException(); } } - + m_bModified = sal_False; // Unlock mutex before notify our listeners aGuard.unlock(); - + // Notify our listeners sal_uInt32 k = 0; for ( k = 0; k < aRemoveEventNotifyContainer.size(); k++ ) @@ -986,7 +986,7 @@ void SAL_CALL ModuleUIConfigurationManager::reset() throw (::com::sun::star::uno catch ( ::com::sun::star::embed::StorageWrappedTargetException& ) { } - } + } } Sequence< Sequence< PropertyValue > > SAL_CALL ModuleUIConfigurationManager::getUIElementsInfo( sal_Int16 ElementType ) @@ -1032,34 +1032,34 @@ throw ( IllegalArgumentException, RuntimeException ) Reference< XIndexContainer > SAL_CALL ModuleUIConfigurationManager::createSettings() throw (::com::sun::star::uno::RuntimeException) { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); - + // Creates an empty item container which can be filled from outside return Reference< XIndexContainer >( static_cast< OWeakObject * >( new RootItemContainer() ), UNO_QUERY ); } -sal_Bool SAL_CALL ModuleUIConfigurationManager::hasSettings( const ::rtl::OUString& ResourceURL ) +sal_Bool SAL_CALL ModuleUIConfigurationManager::hasSettings( const ::rtl::OUString& ResourceURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); - - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || + + if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); - + UIElementData* pDataSettings = impl_findUIElementData( ResourceURL, nElementType, false ); if ( pDataSettings ) return sal_True; } - + return sal_False; } @@ -1067,17 +1067,17 @@ Reference< XIndexAccess > SAL_CALL ModuleUIConfigurationManager::getSettings( co throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); - - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || + + if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); - + UIElementData* pDataSettings = impl_findUIElementData( ResourceURL, nElementType ); if ( pDataSettings ) { @@ -1088,16 +1088,16 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la return pDataSettings->xSettings; } } - + throw NoSuchElementException(); } -void SAL_CALL ModuleUIConfigurationManager::replaceSettings( const ::rtl::OUString& ResourceURL, const Reference< ::com::sun::star::container::XIndexAccess >& aNewData ) +void SAL_CALL ModuleUIConfigurationManager::replaceSettings( const ::rtl::OUString& ResourceURL, const Reference< ::com::sun::star::container::XIndexAccess >& aNewData ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); - - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || + + if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else if ( m_bReadOnly ) @@ -1105,7 +1105,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la else { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); @@ -1142,9 +1142,9 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la aEvent.Source = xIfac; aEvent.ReplacedElement <<= xOldSettings; aEvent.Element <<= pDataSettings->xSettings; - + aGuard.unlock(); - + implts_notifyContainerListener( aEvent, NotifyOp_Replace ); } else @@ -1169,7 +1169,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la // Modify type container UIElementType& rElementType = m_aUIElements[LAYER_USERDEFINED][nElementType]; rElementType.bModified = true; - + UIElementDataHashMap& rElements = rElementType.aElementsHashMap; // Check our user element settings hash map as it can already contain settings that have been set to default! @@ -1179,21 +1179,21 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la pIter->second = aUIElementData; else rElements.insert( UIElementDataHashMap::value_type( ResourceURL, aUIElementData )); - + Reference< XUIConfigurationManager > xThis( static_cast< OWeakObject* >( this ), UNO_QUERY ); Reference< XInterface > xIfac( xThis, UNO_QUERY ); // Create event to notify listener about replaced element settings ConfigurationEvent aEvent; - + aEvent.ResourceURL = ResourceURL; aEvent.Accessor <<= xThis; aEvent.Source = xIfac; aEvent.ReplacedElement <<= pDataSettings->xSettings; aEvent.Element <<= aUIElementData.xSettings; - + aGuard.unlock(); - + implts_notifyContainerListener( aEvent, NotifyOp_Replace ); } } @@ -1206,8 +1206,8 @@ void SAL_CALL ModuleUIConfigurationManager::removeSettings( const ::rtl::OUStrin throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException, RuntimeException) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); - - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || + + if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else if ( m_bReadOnly ) @@ -1215,10 +1215,10 @@ throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException else { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); - + UIElementData* pDataSettings = impl_findUIElementData( ResourceURL, nElementType ); if ( pDataSettings ) { @@ -1229,7 +1229,7 @@ throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException { Reference< XIndexAccess > xRemovedSettings = pDataSettings->xSettings; pDataSettings->bDefault = true; - + // check if this is a default layer node if ( !pDataSettings->bDefaultNode ) pDataSettings->bModified = true; // we have to remove this node from the user layer! @@ -1249,29 +1249,29 @@ throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException { // Create event to notify listener about replaced element settings ConfigurationEvent aEvent; - + aEvent.ResourceURL = ResourceURL; aEvent.Accessor <<= xThis; aEvent.Source = xIfac; aEvent.Element <<= xRemovedSettings; aEvent.ReplacedElement <<= pDefaultDataSettings->xSettings; - + aGuard.unlock(); - + implts_notifyContainerListener( aEvent, NotifyOp_Replace ); } else { // Create event to notify listener about removed element settings ConfigurationEvent aEvent; - + aEvent.ResourceURL = ResourceURL; aEvent.Accessor <<= xThis; aEvent.Source = xIfac; aEvent.Element <<= xRemovedSettings; - + aGuard.unlock(); - + implts_notifyContainerListener( aEvent, NotifyOp_Remove ); } } @@ -1279,14 +1279,14 @@ throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException else throw NoSuchElementException(); } -} +} void SAL_CALL ModuleUIConfigurationManager::insertSettings( const ::rtl::OUString& NewResourceURL, const Reference< XIndexAccess >& aNewData ) throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, RuntimeException ) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( NewResourceURL ); - - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || + + if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else if ( m_bReadOnly ) @@ -1294,10 +1294,10 @@ throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, else { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); - + UIElementData* pDataSettings = impl_findUIElementData( NewResourceURL, nElementType ); if ( !pDataSettings ) { @@ -1322,21 +1322,21 @@ throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, UIElementDataHashMap& rElements = rElementType.aElementsHashMap; rElements.insert( UIElementDataHashMap::value_type( NewResourceURL, aUIElementData )); - + Reference< XIndexAccess > xInsertSettings( aUIElementData.xSettings ); Reference< XUIConfigurationManager > xThis( static_cast< OWeakObject* >( this ), UNO_QUERY ); Reference< XInterface > xIfac( xThis, UNO_QUERY ); // Create event to notify listener about removed element settings ConfigurationEvent aEvent; - + aEvent.ResourceURL = NewResourceURL; aEvent.Accessor <<= xThis; aEvent.Source = xIfac; aEvent.Element <<= xInsertSettings; - + aGuard.unlock(); - + implts_notifyContainerListener( aEvent, NotifyOp_Insert ); } else @@ -1353,10 +1353,10 @@ Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getImageManager() if ( !m_xModuleImageManager.is() ) { - m_xModuleImageManager = Reference< XComponent >( static_cast< cppu::OWeakObject *>( new ModuleImageManager( m_xServiceManager )), + m_xModuleImageManager = Reference< XComponent >( static_cast< cppu::OWeakObject *>( new ModuleImageManager( m_xServiceManager )), UNO_QUERY ); Reference< XInitialization > xInit( m_xModuleImageManager, UNO_QUERY ); - + Sequence< Any > aPropSeq( 3 ); PropertyValue aPropValue; aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UserConfigStorage" )); @@ -1368,7 +1368,7 @@ Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getImageManager() aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UserRootCommit" )); aPropValue.Value = makeAny( m_xUserRootCommit ); aPropSeq[2] = makeAny( aPropValue ); - + xInit->initialize( aPropSeq ); } @@ -1387,20 +1387,20 @@ Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getShortCutManage if ( !m_xModuleAcceleratorManager.is() ) { - Reference< XInterface > xManager = xSMGR->createInstance(SERVICENAME_MODULEACCELERATORCONFIGURATION); + Reference< XInterface > xManager = xSMGR->createInstance(SERVICENAME_MODULEACCELERATORCONFIGURATION); Reference< XInitialization > xInit (xManager, UNO_QUERY_THROW); - + PropertyValue aProp; aProp.Name = ::rtl::OUString::createFromAscii("ModuleIdentifier"); aProp.Value <<= aModule; - + Sequence< Any > lArgs(1); lArgs[0] <<= aProp; - + xInit->initialize(lArgs); m_xModuleAcceleratorManager = Reference< XInterface >( xManager, UNO_QUERY ); } - + return m_xModuleAcceleratorManager; } @@ -1414,14 +1414,14 @@ sal_Bool SAL_CALL ModuleUIConfigurationManager::isDefaultSettings( const ::rtl:: throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); - - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || + + if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); @@ -1429,22 +1429,22 @@ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno:: if ( pDataSettings && pDataSettings->bDefaultNode ) return sal_True; } - + return sal_False; } -Reference< XIndexAccess > SAL_CALL ModuleUIConfigurationManager::getDefaultSettings( const ::rtl::OUString& ResourceURL ) +Reference< XIndexAccess > SAL_CALL ModuleUIConfigurationManager::getDefaultSettings( const ::rtl::OUString& ResourceURL ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); - - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || + + if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); @@ -1461,7 +1461,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la return pIter->second.xSettings; } } - + // Nothing has been found! throw NoSuchElementException(); } @@ -1485,7 +1485,7 @@ void SAL_CALL ModuleUIConfigurationManager::reload() throw (::com::sun::star::un { UIElementType& rUserElementType = m_aUIElements[LAYER_USERDEFINED][i]; UIElementType& rDefaultElementType = m_aUIElements[LAYER_DEFAULT][i]; - + if ( rUserElementType.bModified ) impl_reloadElementTypeData( rUserElementType, rDefaultElementType, aRemoveNotifyContainer, aReplaceNotifyContainer ); } @@ -1499,7 +1499,7 @@ void SAL_CALL ModuleUIConfigurationManager::reload() throw (::com::sun::star::un // Unlock mutex before notify our listeners aGuard.unlock(); - + // Notify our listeners for ( sal_uInt32 j = 0; j < aRemoveNotifyContainer.size(); j++ ) implts_notifyContainerListener( aRemoveNotifyContainer[j], NotifyOp_Remove ); @@ -1514,7 +1514,7 @@ void SAL_CALL ModuleUIConfigurationManager::store() throw (::com::sun::star::uno if ( m_bDisposed ) throw DisposedException(); - + if ( m_xUserConfigStorage.is() && m_bModified && !m_bReadOnly ) { // Try to access our module sub folder @@ -1524,7 +1524,7 @@ void SAL_CALL ModuleUIConfigurationManager::store() throw (::com::sun::star::uno { UIElementType& rElementType = m_aUIElements[LAYER_USERDEFINED][i]; Reference< XStorage > xStorage( rElementType.xStorage, UNO_QUERY ); - + if ( rElementType.bModified && xStorage.is() ) { impl_storeElementTypeData( xStorage, rElementType ); @@ -1536,7 +1536,7 @@ void SAL_CALL ModuleUIConfigurationManager::store() throw (::com::sun::star::uno throw IOException(); } } - + m_bModified = false; } } @@ -1555,10 +1555,10 @@ void SAL_CALL ModuleUIConfigurationManager::storeToStorage( const Reference< XSt { try { - Reference< XStorage > xElementTypeStorage( Storage->openStorageElement( + Reference< XStorage > xElementTypeStorage( Storage->openStorageElement( OUString::createFromAscii( UIELEMENTTYPENAMES[i] ), ElementModes::READWRITE )); UIElementType& rElementType = m_aUIElements[LAYER_USERDEFINED][i]; - + if ( rElementType.bModified && xElementTypeStorage.is() ) impl_storeElementTypeData( xElementTypeStorage, rElementType, false ); // store data to storage, but don't reset modify flag! } @@ -1567,7 +1567,7 @@ void SAL_CALL ModuleUIConfigurationManager::storeToStorage( const Reference< XSt throw IOException(); } } - + Reference< XTransactedObject > xTransactedObject( Storage, UNO_QUERY ); if ( xTransactedObject.is() ) xTransactedObject->commit(); @@ -1577,14 +1577,14 @@ void SAL_CALL ModuleUIConfigurationManager::storeToStorage( const Reference< XSt sal_Bool SAL_CALL ModuleUIConfigurationManager::isModified() throw (::com::sun::star::uno::RuntimeException) { ResetableGuard aGuard( m_aLock ); - + return m_bModified; } sal_Bool SAL_CALL ModuleUIConfigurationManager::isReadOnly() throw (::com::sun::star::uno::RuntimeException) { ResetableGuard aGuard( m_aLock ); - + return m_bReadOnly; } diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx index a3510df76506..9ff03d3c6b39 100644 --- a/framework/source/uiconfiguration/uicategorydescription.cxx +++ b/framework/source/uiconfiguration/uicategorydescription.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #ifndef __FRAMEWORK_UICONFIGURATION_UICATEGORYDESCRPTION_HXX_ @@ -41,7 +41,7 @@ #include "properties.h" //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -50,7 +50,7 @@ #include <com/sun/star/container/XContainer.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <rtl/ustrbuf.hxx> #include <cppuhelper/implbase2.hxx> @@ -64,7 +64,7 @@ #include <rtl/logfile.hxx> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ // @@ -75,7 +75,7 @@ using namespace com::sun::star::container; using namespace ::com::sun::star::frame; //_________________________________________________________________________________________________________________ -// Namespace +// Namespace //_________________________________________________________________________________________________________________ // @@ -95,7 +95,7 @@ namespace framework { //***************************************************************************************************************** -// Configuration access class for PopupMenuControllerFactory implementation +// Configuration access class for PopupMenuControllerFactory implementation //***************************************************************************************************************** class ConfigurationAccess_UICategory : // Order is neccessary for right initialization! @@ -157,7 +157,7 @@ class ConfigurationAccess_UICategory : // Order is neccessary for right initiali }; //***************************************************************************************************************** -// XInterface, XTypeProvider +// XInterface, XTypeProvider //***************************************************************************************************************** ConfigurationAccess_UICategory::ConfigurationAccess_UICategory( const rtl::OUString& aModuleName, const Reference< XNameAccess >& rGenericUICategories, const Reference< XMultiServiceFactory >& rServiceManager ) : @@ -436,11 +436,11 @@ void SAL_CALL ConfigurationAccess_UICategory::disposing( const EventObject& aEve } //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** -DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( UICategoryDescription , - ::cppu::OWeakObject , - SERVICENAME_UICATEGORYDESCRIPTION , +DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( UICategoryDescription , + ::cppu::OWeakObject , + SERVICENAME_UICATEGORYDESCRIPTION , IMPLEMENTATIONNAME_UICATEGORYDESCRIPTION ) diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx index dd9d42958a36..e704fe680ae9 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ #endif //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/ui/UIElementType.hpp> #include <com/sun/star/ui/ConfigurationEvent.hpp> @@ -54,14 +54,14 @@ #include <com/sun/star/embed/XTransactedObject.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> #include <rtl/ustrbuf.hxx> //_________________________________________________________________________________________________________________ -// namespaces +// namespaces //_________________________________________________________________________________________________________________ using namespace com::sun::star::uno; @@ -76,7 +76,7 @@ namespace framework { //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** DEFINE_XINTERFACE_7 ( UIConfigurationManager , OWeakObject , @@ -90,8 +90,8 @@ DEFINE_XINTERFACE_7 ( UIConfigurationManager ) DEFINE_XTYPEPROVIDER_7 ( UIConfigurationManager , - css::lang::XTypeProvider , - css::lang::XServiceInfo , + css::lang::XTypeProvider , + css::lang::XServiceInfo , css::lang::XComponent , ::com::sun::star::ui::XUIConfiguration , ::com::sun::star::ui::XUIConfigurationManager , @@ -101,7 +101,7 @@ DEFINE_XTYPEPROVIDER_7 ( UIConfigurationManager DEFINE_XSERVICEINFO_MULTISERVICE ( UIConfigurationManager , ::cppu::OWeakObject , - SERVICENAME_UICONFIGURATIONMANAGER , + SERVICENAME_UICONFIGURATIONMANAGER , IMPLEMENTATIONNAME_UICONFIGURATIONMANAGER ) @@ -311,7 +311,7 @@ void UIConfigurationManager::impl_requestUIElementData( sal_Int16 nElementType, catch ( ::com::sun::star::lang::WrappedTargetException& ) { } - + break; } @@ -325,7 +325,7 @@ void UIConfigurationManager::impl_requestUIElementData( sal_Int16 nElementType, catch ( ::com::sun::star::embed::InvalidStorageException& ) { } - catch ( ::com::sun::star::lang::IllegalArgumentException& ) + catch ( ::com::sun::star::lang::IllegalArgumentException& ) { } catch ( ::com::sun::star::io::IOException& ) @@ -425,7 +425,7 @@ void UIConfigurationManager::impl_storeElementTypeData( Reference< XStorage >& x } } break; - + default: break; } @@ -746,16 +746,16 @@ void SAL_CALL UIConfigurationManager::reset() throw (::com::sun::star::uno::Runt for ( sal_Int16 j = 1; j < ::com::sun::star::ui::UIElementType::COUNT; j++ ) { UIElementType& rDocElementType = m_aUIElements[j]; - + impl_resetElementTypeData( rDocElementType, aRemoveEventNotifyContainer ); rDocElementType.bModified = sal_False; } - + m_bModified = sal_False; // Unlock mutex before notify our listeners aGuard.unlock(); - + // Notify our listeners for ( sal_uInt32 k = 0; k < aRemoveEventNotifyContainer.size(); k++ ) implts_notifyContainerListener( aRemoveEventNotifyContainer[k], NotifyOp_Remove ); @@ -771,8 +771,8 @@ void SAL_CALL UIConfigurationManager::reset() throw (::com::sun::star::uno::Runt } catch ( ::com::sun::star::embed::StorageWrappedTargetException& ) { - } - } + } + } } Sequence< Sequence< PropertyValue > > SAL_CALL UIConfigurationManager::getUIElementsInfo( sal_Int16 ElementType ) @@ -818,20 +818,20 @@ throw ( IllegalArgumentException, RuntimeException ) Reference< XIndexContainer > SAL_CALL UIConfigurationManager::createSettings() throw (::com::sun::star::uno::RuntimeException) { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); - + // Creates an empty item container which can be filled from outside return Reference< XIndexContainer >( static_cast< OWeakObject * >( new RootItemContainer()), UNO_QUERY ); } -sal_Bool SAL_CALL UIConfigurationManager::hasSettings( const ::rtl::OUString& ResourceURL ) +sal_Bool SAL_CALL UIConfigurationManager::hasSettings( const ::rtl::OUString& ResourceURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); - - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || + + if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else @@ -840,7 +840,7 @@ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno:: if ( pDataSettings && !pDataSettings->bDefault ) return sal_True; } - + return sal_False; } @@ -848,17 +848,17 @@ Reference< XIndexAccess > SAL_CALL UIConfigurationManager::getSettings( const :: throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); - - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || + + if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); - + UIElementData* pDataSettings = impl_findUIElementData( ResourceURL, nElementType ); if ( pDataSettings && !pDataSettings->bDefault ) { @@ -869,16 +869,16 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la return pDataSettings->xSettings; } } - + throw NoSuchElementException(); } -void SAL_CALL UIConfigurationManager::replaceSettings( const ::rtl::OUString& ResourceURL, const Reference< ::com::sun::star::container::XIndexAccess >& aNewData ) +void SAL_CALL UIConfigurationManager::replaceSettings( const ::rtl::OUString& ResourceURL, const Reference< ::com::sun::star::container::XIndexAccess >& aNewData ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); - - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || + + if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else if ( m_bReadOnly ) @@ -886,7 +886,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la else { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); @@ -922,9 +922,9 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la aEvent.Source = xIfac; aEvent.ReplacedElement <<= xOldSettings; aEvent.Element <<= pDataSettings->xSettings; - + aGuard.unlock(); - + implts_notifyContainerListener( aEvent, NotifyOp_Replace ); } else @@ -936,8 +936,8 @@ void SAL_CALL UIConfigurationManager::removeSettings( const ::rtl::OUString& Res throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException, RuntimeException) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); - - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || + + if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else if ( m_bReadOnly ) @@ -945,10 +945,10 @@ throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException else { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); - + UIElementData* pDataSettings = impl_findUIElementData( ResourceURL, nElementType ); if ( pDataSettings ) { @@ -959,7 +959,7 @@ throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException { Reference< XIndexAccess > xRemovedSettings = pDataSettings->xSettings; pDataSettings->bDefault = true; - + // check if this is a default layer node pDataSettings->bModified = true; // we have to remove this node from the user layer! pDataSettings->xSettings.clear(); @@ -974,28 +974,28 @@ throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException // Create event to notify listener about removed element settings ConfigurationEvent aEvent; - + aEvent.ResourceURL = ResourceURL; aEvent.Accessor <<= xThis; aEvent.Source = xIfac; aEvent.Element <<= xRemovedSettings; - + aGuard.unlock(); - + implts_notifyContainerListener( aEvent, NotifyOp_Remove ); } } else throw NoSuchElementException(); } -} +} void SAL_CALL UIConfigurationManager::insertSettings( const ::rtl::OUString& NewResourceURL, const Reference< XIndexAccess >& aNewData ) throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, RuntimeException ) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( NewResourceURL ); - - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || + + if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else if ( m_bReadOnly ) @@ -1003,23 +1003,23 @@ throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, else { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); - + bool bInsertData( false ); UIElementData aUIElementData; UIElementData* pDataSettings = impl_findUIElementData( NewResourceURL, nElementType ); - + if ( pDataSettings && !pDataSettings->bDefault ) throw ElementExistException(); - + if ( !pDataSettings ) { pDataSettings = &aUIElementData; bInsertData = true; } - + { pDataSettings->bDefault = false; pDataSettings->bModified = true; @@ -1040,25 +1040,25 @@ throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, { pDataSettings->aName = RetrieveNameFromResourceURL( NewResourceURL ) + m_aXMLPostfix; pDataSettings->aResourceURL = NewResourceURL; - + UIElementDataHashMap& rElements = rElementType.aElementsHashMap; rElements.insert( UIElementDataHashMap::value_type( NewResourceURL, *pDataSettings )); } - + Reference< XIndexAccess > xInsertSettings( aUIElementData.xSettings ); Reference< XUIConfigurationManager > xThis( static_cast< OWeakObject* >( this ), UNO_QUERY ); Reference< XInterface > xIfac( xThis, UNO_QUERY ); // Create event to notify listener about removed element settings ConfigurationEvent aEvent; - + aEvent.ResourceURL = NewResourceURL; aEvent.Accessor <<= xThis; aEvent.Source = xIfac; aEvent.Element <<= xInsertSettings; - + aGuard.unlock(); - + implts_notifyContainerListener( aEvent, NotifyOp_Insert ); } } @@ -1071,10 +1071,10 @@ Reference< XInterface > SAL_CALL UIConfigurationManager::getImageManager() throw if ( !m_xImageManager.is() ) { - m_xImageManager = Reference< XComponent >( static_cast< cppu::OWeakObject *>( new ImageManager( m_xServiceManager )), + m_xImageManager = Reference< XComponent >( static_cast< cppu::OWeakObject *>( new ImageManager( m_xServiceManager )), UNO_QUERY ); Reference< XInitialization > xInit( m_xImageManager, UNO_QUERY ); - + Sequence< Any > aPropSeq( 2 ); PropertyValue aPropValue; aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UserConfigStorage" )); @@ -1083,7 +1083,7 @@ Reference< XInterface > SAL_CALL UIConfigurationManager::getImageManager() throw aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ModuleIdentifier" )); aPropValue.Value = makeAny( m_aModuleIdentifier ); aPropSeq[1] = makeAny( aPropValue ); - + xInit->initialize( aPropSeq ); } @@ -1094,34 +1094,34 @@ Reference< XInterface > SAL_CALL UIConfigurationManager::getShortCutManager() th { // SAFE -> ResetableGuard aGuard( m_aLock ); - + if (m_xAccConfig.is()) return m_xAccConfig; - + Reference< XMultiServiceFactory > xSMGR = m_xServiceManager; Reference< XStorage > xDocumentRoot = m_xDocConfigStorage; - + aGuard.unlock(); // <- SAFE - - Reference< XInterface > xAccConfig = xSMGR->createInstance(SERVICENAME_DOCUMENTACCELERATORCONFIGURATION); + + Reference< XInterface > xAccConfig = xSMGR->createInstance(SERVICENAME_DOCUMENTACCELERATORCONFIGURATION); Reference< XInitialization > xInit (xAccConfig, UNO_QUERY_THROW); - + PropertyValue aProp; aProp.Name = ::rtl::OUString::createFromAscii("DocumentRoot"); aProp.Value <<= xDocumentRoot; - + Sequence< Any > lArgs(1); lArgs[0] <<= aProp; - + xInit->initialize(lArgs); - + // SAFE -> aGuard.lock(); - m_xAccConfig = xAccConfig; + m_xAccConfig = xAccConfig; aGuard.unlock(); // <- SAFE - + return xAccConfig; } @@ -1134,10 +1134,10 @@ Reference< XInterface > SAL_CALL UIConfigurationManager::getEventsManager() thro void SAL_CALL UIConfigurationManager::setStorage( const Reference< XStorage >& Storage ) throw (::com::sun::star::uno::RuntimeException) { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); - + if ( m_xDocConfigStorage.is() ) { try @@ -1159,7 +1159,7 @@ void SAL_CALL UIConfigurationManager::setStorage( const Reference< XStorage >& S Reference< XUIConfigurationStorage > xAccUpdate(m_xAccConfig, UNO_QUERY); if ( xAccUpdate.is() ) xAccUpdate->setStorage( m_xDocConfigStorage ); - + if ( m_xImageManager.is() ) { ImageManager* pImageManager = (ImageManager*)m_xImageManager.get(); @@ -1232,7 +1232,7 @@ void SAL_CALL UIConfigurationManager::reload() throw (::com::sun::star::uno::Exc // Unlock mutex before notify our listeners aGuard.unlock(); - + // Notify our listeners for ( sal_uInt32 j = 0; j < aRemoveNotifyContainer.size(); j++ ) implts_notifyContainerListener( aRemoveNotifyContainer[j], NotifyOp_Remove ); @@ -1247,7 +1247,7 @@ void SAL_CALL UIConfigurationManager::store() throw (::com::sun::star::uno::Exce if ( m_bDisposed ) throw DisposedException(); - + if ( m_xDocConfigStorage.is() && m_bModified && !m_bReadOnly ) { // Try to access our module sub folder @@ -1257,7 +1257,7 @@ void SAL_CALL UIConfigurationManager::store() throw (::com::sun::star::uno::Exce { UIElementType& rElementType = m_aUIElements[i]; Reference< XStorage > xStorage( rElementType.xStorage, UNO_QUERY ); - + if ( rElementType.bModified && xStorage.is() ) impl_storeElementTypeData( xStorage, rElementType ); } @@ -1266,7 +1266,7 @@ void SAL_CALL UIConfigurationManager::store() throw (::com::sun::star::uno::Exce throw IOException(); } } - + m_bModified = false; Reference< XTransactedObject > xTransactedObject( m_xDocConfigStorage, UNO_QUERY ); if ( xTransactedObject.is() ) @@ -1288,10 +1288,10 @@ void SAL_CALL UIConfigurationManager::storeToStorage( const Reference< XStorage { try { - Reference< XStorage > xElementTypeStorage( Storage->openStorageElement( + Reference< XStorage > xElementTypeStorage( Storage->openStorageElement( rtl::OUString::createFromAscii( UIELEMENTTYPENAMES[i] ), ElementModes::READWRITE )); UIElementType& rElementType = m_aUIElements[i]; - + if ( rElementType.bModified && xElementTypeStorage.is() ) impl_storeElementTypeData( xElementTypeStorage, rElementType, false ); // store data to storage, but don't reset modify flag! } @@ -1300,7 +1300,7 @@ void SAL_CALL UIConfigurationManager::storeToStorage( const Reference< XStorage throw IOException(); } } - + Reference< XTransactedObject > xTransactedObject( Storage, UNO_QUERY ); if ( xTransactedObject.is() ) xTransactedObject->commit(); @@ -1310,14 +1310,14 @@ void SAL_CALL UIConfigurationManager::storeToStorage( const Reference< XStorage sal_Bool SAL_CALL UIConfigurationManager::isModified() throw (::com::sun::star::uno::RuntimeException) { ResetableGuard aGuard( m_aLock ); - + return m_bModified; } sal_Bool SAL_CALL UIConfigurationManager::isReadOnly() throw (::com::sun::star::uno::RuntimeException) { ResetableGuard aGuard( m_aLock ); - + return m_bReadOnly; } diff --git a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx index d6c7f26b958f..5b875d82f25a 100755 --- a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ #endif //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/ui/UIElementType.hpp> #include <com/sun/star/ui/ConfigurationEvent.hpp> @@ -53,7 +53,7 @@ #include <com/sun/star/io/XStream.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> @@ -62,7 +62,7 @@ #include <boost/bind.hpp> //_________________________________________________________________________________________________________________ -// namespaces +// namespaces //_________________________________________________________________________________________________________________ using rtl::OUString; @@ -147,7 +147,7 @@ void UIConfigurationManagerImpl::impl_fillSequenceWithElementTypeInfo( UIElement sal_Int32 nIndex = pUserIter->second.aResourceURL.indexOf( aCustomUrlPrefix, RESOURCEURL_PREFIX_SIZE ); if ( nIndex > RESOURCEURL_PREFIX_SIZE ) { - // Performance: Retrieve user interface name only for custom user interface elements. + // Performance: Retrieve user interface name only for custom user interface elements. // It's only used by them! UIElementData* pDataSettings = impl_findUIElementData( pUserIter->second.aResourceURL, nElementType ); if ( pDataSettings && ( m_bUseDefault || !pDataSettings->bDefault )) @@ -159,7 +159,7 @@ void UIConfigurationManagerImpl::impl_fillSequenceWithElementTypeInfo( UIElement { xPropSet->getPropertyValue( m_aPropUIName ) >>= aUIName; } - + UIElementInfo aInfo( pUserIter->second.aResourceURL, aUIName ); aUIElementInfoCollection.insert( UIElementInfoHashMap::value_type( pUserIter->second.aResourceURL, aInfo )); } @@ -186,7 +186,7 @@ void UIConfigurationManagerImpl::impl_fillSequenceWithElementTypeInfo( UIElement sal_Int32 nIndex = pDefIter->second.aResourceURL.indexOf( aCustomUrlPrefix, RESOURCEURL_PREFIX_SIZE ); if ( nIndex > RESOURCEURL_PREFIX_SIZE ) { - // Performance: Retrieve user interface name only for custom user interface elements. + // Performance: Retrieve user interface name only for custom user interface elements. // It's only used by them! UIElementData* pDataSettings = impl_findUIElementData( pDefIter->second.aResourceURL, nElementType ); if ( pDataSettings ) @@ -198,7 +198,7 @@ void UIConfigurationManagerImpl::impl_fillSequenceWithElementTypeInfo( UIElement { xPropSet->getPropertyValue( m_aPropUIName ) >>= aUIName; } - + UIElementInfo aInfo( pDefIter->second.aResourceURL, aUIName ); aUIElementInfoCollection.insert( UIElementInfoHashMap::value_type( pDefIter->second.aResourceURL, aInfo )); } @@ -210,14 +210,14 @@ void UIConfigurationManagerImpl::impl_fillSequenceWithElementTypeInfo( UIElement aUIElementInfoCollection.insert( UIElementInfoHashMap::value_type( pDefIter->second.aResourceURL, aInfo )); } } - + ++pDefIter; } // while ( pDefIter != rDefaultElements.end() ) } } void UIConfigurationManagerImpl::impl_preloadUIElementTypeList( Layer eLayer, sal_Int16 nElementType ) -{ +{ UIElementType& rElementTypeData = m_aUIElements[eLayer][nElementType]; if ( !rElementTypeData.bLoaded ) @@ -237,7 +237,7 @@ void UIConfigurationManagerImpl::impl_preloadUIElementTypeList( Layer eLayer, sa for ( sal_Int32 n = 0; n < aUIElementNames.getLength(); n++ ) { UIElementData aUIElementData; - + // Resource name must be without ".xml" sal_Int32 nIndex = aUIElementNames[n].lastIndexOf( '.' ); if (( nIndex > 0 ) && ( nIndex < aUIElementNames[n].getLength() )) @@ -245,7 +245,7 @@ void UIConfigurationManagerImpl::impl_preloadUIElementTypeList( Layer eLayer, sa rtl::OUString aExtension( aUIElementNames[n].copy( nIndex+1 )); rtl::OUString aUIElementName( aUIElementNames[n].copy( 0, nIndex )); - if (( aUIElementName.getLength() > 0 ) && + if (( aUIElementName.getLength() > 0 ) && ( aExtension.equalsIgnoreAsciiCaseAsciiL( "xml", 3 ))) { aUIElementData.aResourceURL = aResURLPrefix + aUIElementName; @@ -257,7 +257,7 @@ void UIConfigurationManagerImpl::impl_preloadUIElementTypeList( Layer eLayer, sa aUIElementData.bDefault = false; aUIElementData.bDefaultNode = false; } - + // Create hash_map entries for all user interface elements inside the storage. We don't load the // settings to speed up the process. rHashMap.insert( UIElementDataHashMap::value_type( aUIElementData.aResourceURL, aUIElementData )); @@ -307,7 +307,7 @@ void UIConfigurationManagerImpl::impl_requestUIElementData( sal_Int16 nElementTy } } break; - + case ::com::sun::star::ui::UIElementType::POPUPMENU: { break; @@ -326,7 +326,7 @@ void UIConfigurationManagerImpl::impl_requestUIElementData( sal_Int16 nElementTy catch ( ::com::sun::star::lang::WrappedTargetException& ) { } - + break; } @@ -343,7 +343,7 @@ void UIConfigurationManagerImpl::impl_requestUIElementData( sal_Int16 nElementTy catch ( ::com::sun::star::lang::WrappedTargetException& ) { } - + break; } @@ -357,7 +357,7 @@ void UIConfigurationManagerImpl::impl_requestUIElementData( sal_Int16 nElementTy catch ( ::com::sun::star::embed::InvalidStorageException& ) { } - catch ( ::com::sun::star::lang::IllegalArgumentException& ) + catch ( ::com::sun::star::lang::IllegalArgumentException& ) { } catch ( ::com::sun::star::io::IOException& ) @@ -392,7 +392,7 @@ UIConfigurationManagerImpl::UIElementData* UIConfigurationManagerImpl::impl_fin return &(pIter->second); } } - + if ( m_bUseDefault ) { // Not successfull, we have to look into our default vector/hash_map combination @@ -414,7 +414,7 @@ void UIConfigurationManagerImpl::impl_storeElementTypeData( Reference< XStorage { UIElementDataHashMap& rHashMap = rElementType.aElementsHashMap; UIElementDataHashMap::iterator pIter = rHashMap.begin(); - + while ( pIter != rHashMap.end() ) { UIElementData& rElement = pIter->second; @@ -429,7 +429,7 @@ void UIConfigurationManagerImpl::impl_storeElementTypeData( Reference< XStorage { Reference< XStream > xStream( xStorage->openStreamElement( rElement.aName, ElementModes::WRITE|ElementModes::TRUNCATE ), UNO_QUERY ); Reference< XOutputStream > xOutputStream( xStream->getOutputStream() ); - + if ( xOutputStream.is() ) { switch( rElementType.nElementType ) @@ -470,18 +470,18 @@ void UIConfigurationManagerImpl::impl_storeElementTypeData( Reference< XStorage } } break; - + default: break; } } - + // mark as not modified if we store to our own storage if ( bResetModifyState ) rElement.bModified = sal_False; } } - + ++pIter; } @@ -496,19 +496,19 @@ void UIConfigurationManagerImpl::impl_storeElementTypeData( Reference< XStorage } // This is only allowed to be called on the LAYER_USER_DEFINED! -void UIConfigurationManagerImpl::impl_resetElementTypeData( - UIElementType& rUserElementType, - UIElementType& rDefaultElementType, - ConfigEventNotifyContainer& rRemoveNotifyContainer, +void UIConfigurationManagerImpl::impl_resetElementTypeData( + UIElementType& rUserElementType, + UIElementType& rDefaultElementType, + ConfigEventNotifyContainer& rRemoveNotifyContainer, ConfigEventNotifyContainer& rReplaceNotifyContainer ) { UIElementDataHashMap& rHashMap = rUserElementType.aElementsHashMap; UIElementDataHashMap::iterator pIter = rHashMap.begin(); - + Reference< XUIConfigurationManager > xThis( m_xOwner, UNO_QUERY ); Reference< XNameAccess > xDefaultNameAccess( rDefaultElementType.xStorage, UNO_QUERY ); sal_Int16 nType = rUserElementType.nElementType; - + // Make copies of the event structures to be thread-safe. We have to unlock our mutex before calling // our listeners! while ( pIter != rHashMap.end() ) @@ -521,16 +521,16 @@ void UIConfigurationManagerImpl::impl_resetElementTypeData( // Replace settings with data from default layer Reference< XIndexAccess > xOldSettings( rElement.xSettings ); impl_requestUIElementData( nType, LAYER_DEFAULT, rElement ); - + ConfigurationEvent aReplaceEvent; aReplaceEvent.ResourceURL = rElement.aResourceURL; aReplaceEvent.Accessor <<= xThis; aReplaceEvent.Source = m_xOwner; aReplaceEvent.ReplacedElement <<= xOldSettings; aReplaceEvent.Element <<= rElement.xSettings; - + rReplaceNotifyContainer.push_back( aReplaceEvent ); - + // Mark element as default and not modified. That means "not active" // in the user layer anymore. rElement.bModified = false; @@ -544,9 +544,9 @@ void UIConfigurationManagerImpl::impl_resetElementTypeData( aEvent.Accessor <<= xThis; aEvent.Source = m_xOwner; aEvent.Element <<= rElement.xSettings; - + rRemoveNotifyContainer.push_back( aEvent ); - + // Mark element as default and not modified. That means "not active" // in the user layer anymore. rElement.bModified = false; @@ -555,7 +555,7 @@ void UIConfigurationManagerImpl::impl_resetElementTypeData( } // if ( !rElement.bDefault ) else rElement.bModified = false; - + ++pIter; } @@ -563,10 +563,10 @@ void UIConfigurationManagerImpl::impl_resetElementTypeData( rHashMap.clear(); } -void UIConfigurationManagerImpl::impl_reloadElementTypeData( - UIElementType& rUserElementType, - UIElementType& rDefaultElementType, - ConfigEventNotifyContainer& rRemoveNotifyContainer, +void UIConfigurationManagerImpl::impl_reloadElementTypeData( + UIElementType& rUserElementType, + UIElementType& rDefaultElementType, + ConfigEventNotifyContainer& rRemoveNotifyContainer, ConfigEventNotifyContainer& rReplaceNotifyContainer ) { UIElementDataHashMap& rHashMap = rUserElementType.aElementsHashMap; @@ -575,10 +575,10 @@ void UIConfigurationManagerImpl::impl_reloadElementTypeData( Reference< XStorage > xDefaultStorage( rDefaultElementType.xStorage ); Reference< XNameAccess > xUserNameAccess( rUserElementType.xStorage, UNO_QUERY ); Reference< XNameAccess > xDefaultNameAccess( rDefaultElementType.xStorage, UNO_QUERY ); - + Reference< XUIConfigurationManager > xThis( m_xOwner, UNO_QUERY ); sal_Int16 nType = rUserElementType.nElementType; - + while ( pIter != rHashMap.end() ) { UIElementData& rElement = pIter->second; @@ -590,16 +590,16 @@ void UIConfigurationManagerImpl::impl_reloadElementTypeData( Reference< XIndexAccess > xOldSettings( rElement.xSettings ); impl_requestUIElementData( nType, LAYER_USERDEFINED, rElement ); - + ConfigurationEvent aReplaceEvent; - + aReplaceEvent.ResourceURL = rElement.aResourceURL; aReplaceEvent.Accessor <<= xThis; aReplaceEvent.Source = m_xOwner; aReplaceEvent.ReplacedElement <<= xOldSettings; aReplaceEvent.Element <<= rElement.xSettings; rReplaceNotifyContainer.push_back( aReplaceEvent ); - + rElement.bModified = false; } else if ( m_bUseDefault && xDefaultNameAccess->hasByName( rElement.aName )) @@ -608,16 +608,16 @@ void UIConfigurationManagerImpl::impl_reloadElementTypeData( Reference< XIndexAccess > xOldSettings( rElement.xSettings ); impl_requestUIElementData( nType, LAYER_DEFAULT, rElement ); - + ConfigurationEvent aReplaceEvent; - + aReplaceEvent.ResourceURL = rElement.aResourceURL; aReplaceEvent.Accessor <<= xThis; aReplaceEvent.Source = m_xOwner; aReplaceEvent.ReplacedElement <<= xOldSettings; aReplaceEvent.Element <<= rElement.xSettings; rReplaceNotifyContainer.push_back( aReplaceEvent ); - + // Mark element as default and not modified. That means "not active" // in the user layer anymore. rElement.bModified = false; @@ -627,14 +627,14 @@ void UIConfigurationManagerImpl::impl_reloadElementTypeData( { // Element settings are not in any storage => remove ConfigurationEvent aRemoveEvent; - + aRemoveEvent.ResourceURL = rElement.aResourceURL; aRemoveEvent.Accessor <<= xThis; aRemoveEvent.Source = m_xOwner; aRemoveEvent.Element <<= rElement.xSettings; - + rRemoveNotifyContainer.push_back( aRemoveEvent ); - + // Mark element as default and not modified. That means "not active" // in the user layer anymore. rElement.bModified = false; @@ -735,7 +735,7 @@ UIConfigurationManagerImpl::UIConfigurationManagerImpl( const Reference< com::su { for ( int i = 0; i < ::com::sun::star::ui::UIElementType::COUNT; i++ ) m_pStorageHandler[i] = 0; - + // Make sure we have a default initialized entry for every layer and user interface element type! // The following code depends on this! m_aUIElements[LAYER_DEFAULT].resize( ::com::sun::star::ui::UIElementType::COUNT ); @@ -753,7 +753,7 @@ void UIConfigurationManagerImpl::dispose() throw (::com::sun::star::uno::Runtime { css::lang::EventObject aEvent( m_xOwner ); m_aListenerContainer.disposeAndClear( aEvent ); - + { ResetableGuard aGuard( m_aLock ); try @@ -764,7 +764,7 @@ void UIConfigurationManagerImpl::dispose() throw (::com::sun::star::uno::Runtime catch ( Exception& ) { } - + m_xModuleImageManager.clear(); m_aUIElements[LAYER_USERDEFINED].clear(); m_aUIElements[LAYER_DEFAULT].clear(); @@ -786,7 +786,7 @@ void UIConfigurationManagerImpl::addEventListener( const Reference< XEventListen if ( m_bDisposed ) throw DisposedException(); } - + m_aListenerContainer.addInterface( ::getCppuType( ( const Reference< XEventListener >* ) NULL ), xListener ); } @@ -800,7 +800,7 @@ void UIConfigurationManagerImpl::removeEventListener( const Reference< XEventLis void UIConfigurationManagerImpl::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException ) { ResetableGuard aLock( m_aLock ); - + if ( !m_bInitialized ) { ::comphelper::SequenceAsHashMap lArgs(aArguments); @@ -826,15 +826,15 @@ void UIConfigurationManagerImpl::initialize( const Sequence< Any >& aArguments ) css::uno::Reference< css::embed::XStorage >()); // no document root used here! } } - + // initialize root storages for all resource types m_xUserRootCommit = css::uno::Reference< css::embed::XTransactedObject >( m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getOrCreateRootStorageUser(), css::uno::UNO_QUERY); // can be empty m_xDefaultConfigStorage = m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getParentStorageShare( - m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getWorkingStorageShare()); + m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getWorkingStorageShare()); m_xUserConfigStorage = m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getParentStorageUser( m_pStorageHandler[::com::sun::star::ui::UIElementType::MENUBAR]->getWorkingStorageUser()); - + if ( m_xUserConfigStorage.is() ) { Reference< XPropertySet > xPropSet( m_xUserConfigStorage, UNO_QUERY ); @@ -845,10 +845,10 @@ void UIConfigurationManagerImpl::initialize( const Sequence< Any >& aArguments ) m_bReadOnly = !( nOpenMode & ElementModes::WRITE ); } } - + impl_Initialize(); - m_bInitialized = true; + m_bInitialized = true; } } @@ -857,12 +857,12 @@ void UIConfigurationManagerImpl::addConfigurationListener( const Reference< ::co { { ResetableGuard aGuard( m_aLock ); - + /* SAFE AREA ----------------------------------------------------------------------------------------------- */ if ( m_bDisposed ) throw DisposedException(); } - + m_aListenerContainer.addInterface( ::getCppuType( ( const Reference< XUIConfigurationListener >* ) NULL ), xListener ); } @@ -872,7 +872,7 @@ void UIConfigurationManagerImpl::removeConfigurationListener( const Reference< : m_aListenerContainer.removeInterface( ::getCppuType( ( const Reference< XUIConfigurationListener >* ) NULL ), xListener ); } - + // XUIConfigurationManager void UIConfigurationManagerImpl::reset() throw (::com::sun::star::uno::RuntimeException) { @@ -881,7 +881,7 @@ void UIConfigurationManagerImpl::reset() throw (::com::sun::star::uno::RuntimeEx /* SAFE AREA ----------------------------------------------------------------------------------------------- */ if ( m_bDisposed ) throw DisposedException(); - + bool bResetStorage( false ); if ( !isReadOnly() ) @@ -896,7 +896,7 @@ void UIConfigurationManagerImpl::reset() throw (::com::sun::star::uno::RuntimeEx if ( xSubStorage.is() ) { - bool bCommitSubStorage( false ); + bool bCommitSubStorage( false ); Reference< XNameAccess > xSubStorageNameAccess( xSubStorage, UNO_QUERY ); Sequence< rtl::OUString > aUIElementStreamNames = xSubStorageNameAccess->getElementNames(); for ( sal_Int32 j = 0; j < aUIElementStreamNames.getLength(); j++ ) @@ -904,7 +904,7 @@ void UIConfigurationManagerImpl::reset() throw (::com::sun::star::uno::RuntimeEx xSubStorage->removeElement( aUIElementStreamNames[j] ); bCommitSubStorage = true; } - + if ( bCommitSubStorage ) { Reference< XTransactedObject > xTransactedObject( xSubStorage, UNO_QUERY ); @@ -916,7 +916,7 @@ void UIConfigurationManagerImpl::reset() throw (::com::sun::star::uno::RuntimeEx } bResetStorage = true; - + // remove settings from user defined layer and notify listener about removed settings data! ConfigEventNotifyContainer aRemoveEventNotifyContainer; ConfigEventNotifyContainer aReplaceEventNotifyContainer; @@ -926,7 +926,7 @@ void UIConfigurationManagerImpl::reset() throw (::com::sun::star::uno::RuntimeEx { UIElementType& rUserElementType = m_aUIElements[LAYER_USERDEFINED][j]; UIElementType& rDefaultElementType = m_aUIElements[LAYER_DEFAULT][j]; - + impl_resetElementTypeData( rUserElementType, rDefaultElementType, aRemoveEventNotifyContainer, aReplaceEventNotifyContainer ); rUserElementType.bModified = sal_False; } @@ -935,12 +935,12 @@ void UIConfigurationManagerImpl::reset() throw (::com::sun::star::uno::RuntimeEx throw IOException(); } } - + m_bModified = sal_False; // Unlock mutex before notify our listeners aGuard.unlock(); - + // Notify our listeners ::std::for_each(aRemoveEventNotifyContainer.begin(),aRemoveEventNotifyContainer.end(),::boost::bind(&UIConfigurationManagerImpl::implts_notifyContainerListener,this,_1,NotifyOp_Remove)); ::std::for_each(aReplaceEventNotifyContainer.begin(),aReplaceEventNotifyContainer.end(),::boost::bind(&UIConfigurationManagerImpl::implts_notifyContainerListener,this,_1,NotifyOp_Replace)); @@ -957,7 +957,7 @@ void UIConfigurationManagerImpl::reset() throw (::com::sun::star::uno::RuntimeEx catch ( ::com::sun::star::embed::StorageWrappedTargetException& ) { } - } + } } Sequence< Sequence< PropertyValue > > UIConfigurationManagerImpl::getUIElementsInfo( sal_Int16 ElementType ) @@ -1003,34 +1003,34 @@ throw ( IllegalArgumentException, RuntimeException ) Reference< XIndexContainer > UIConfigurationManagerImpl::createSettings() throw (::com::sun::star::uno::RuntimeException) { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); - + // Creates an empty item container which can be filled from outside return Reference< XIndexContainer >( static_cast< OWeakObject * >( new RootItemContainer() ), UNO_QUERY ); } -sal_Bool UIConfigurationManagerImpl::hasSettings( const ::rtl::OUString& ResourceURL ) +sal_Bool UIConfigurationManagerImpl::hasSettings( const ::rtl::OUString& ResourceURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); - - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || + + if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); - + UIElementData* pDataSettings = impl_findUIElementData( ResourceURL, nElementType, false ); if ( pDataSettings && ( m_bUseDefault || !pDataSettings->bDefault) ) return sal_True; } - + return sal_False; } @@ -1038,17 +1038,17 @@ Reference< XIndexAccess > UIConfigurationManagerImpl::getSettings( const ::rtl:: throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); - - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || + + if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); - + UIElementData* pDataSettings = impl_findUIElementData( ResourceURL, nElementType ); if ( pDataSettings && ( m_bUseDefault || !pDataSettings->bDefault) ) { @@ -1059,16 +1059,16 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la return pDataSettings->xSettings; } } - + throw NoSuchElementException(); } -void UIConfigurationManagerImpl::replaceSettings( const ::rtl::OUString& ResourceURL, const Reference< ::com::sun::star::container::XIndexAccess >& aNewData ) +void UIConfigurationManagerImpl::replaceSettings( const ::rtl::OUString& ResourceURL, const Reference< ::com::sun::star::container::XIndexAccess >& aNewData ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); - - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || + + if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else if ( m_bReadOnly ) @@ -1076,7 +1076,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la else { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); @@ -1112,9 +1112,9 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la aEvent.Source = m_xOwner; aEvent.ReplacedElement <<= xOldSettings; aEvent.Element <<= pDataSettings->xSettings; - + aGuard.unlock(); - + implts_notifyContainerListener( aEvent, NotifyOp_Replace ); } else @@ -1139,7 +1139,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la // Modify type container UIElementType& rElementType = m_aUIElements[LAYER_USERDEFINED][nElementType]; rElementType.bModified = true; - + UIElementDataHashMap& rElements = rElementType.aElementsHashMap; // Check our user element settings hash map as it can already contain settings that have been set to default! @@ -1149,20 +1149,20 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la pIter->second = aUIElementData; else rElements.insert( UIElementDataHashMap::value_type( ResourceURL, aUIElementData )); - + Reference< XUIConfigurationManager > xThis( m_xOwner, UNO_QUERY ); // Create event to notify listener about replaced element settings ConfigurationEvent aEvent; - + aEvent.ResourceURL = ResourceURL; aEvent.Accessor <<= xThis; aEvent.Source = m_xOwner; aEvent.ReplacedElement <<= pDataSettings->xSettings; aEvent.Element <<= aUIElementData.xSettings; - + aGuard.unlock(); - + implts_notifyContainerListener( aEvent, NotifyOp_Replace ); } } @@ -1175,8 +1175,8 @@ void UIConfigurationManagerImpl::removeSettings( const ::rtl::OUString& Resource throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException, RuntimeException) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); - - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || + + if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else if ( m_bReadOnly ) @@ -1184,10 +1184,10 @@ throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException else { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); - + UIElementData* pDataSettings = impl_findUIElementData( ResourceURL, nElementType ); if ( pDataSettings ) { @@ -1198,7 +1198,7 @@ throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException { Reference< XIndexAccess > xRemovedSettings = pDataSettings->xSettings; pDataSettings->bDefault = true; - + // check if this is a default layer node if ( !m_bUseDefault || !pDataSettings->bDefaultNode ) pDataSettings->bModified = true; // we have to remove this node from the user layer! @@ -1216,29 +1216,29 @@ throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException { // Create event to notify listener about replaced element settings ConfigurationEvent aEvent; - + aEvent.ResourceURL = ResourceURL; aEvent.Accessor <<= xThis; aEvent.Source = m_xOwner; aEvent.Element <<= xRemovedSettings; aEvent.ReplacedElement <<= pDefaultDataSettings->xSettings; - + aGuard.unlock(); - + implts_notifyContainerListener( aEvent, NotifyOp_Replace ); } else { // Create event to notify listener about removed element settings ConfigurationEvent aEvent; - + aEvent.ResourceURL = ResourceURL; aEvent.Accessor <<= xThis; aEvent.Source = m_xOwner; aEvent.Element <<= xRemovedSettings; - + aGuard.unlock(); - + implts_notifyContainerListener( aEvent, NotifyOp_Remove ); } } @@ -1246,14 +1246,14 @@ throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException else throw NoSuchElementException(); } -} +} void UIConfigurationManagerImpl::insertSettings( const ::rtl::OUString& NewResourceURL, const Reference< XIndexAccess >& aNewData ) throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, RuntimeException ) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( NewResourceURL ); - - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || + + if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else if ( m_bReadOnly ) @@ -1261,10 +1261,10 @@ throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, else { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); - + bool bInsertData( false ); UIElementData aUIElementData; UIElementData* pDataSettings = impl_findUIElementData( NewResourceURL, nElementType ); @@ -1291,7 +1291,7 @@ throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( aNewData ) ), UNO_QUERY ); else aUIElementData.xSettings = aNewData; - + m_bModified = true; UIElementType& rElementType = m_aUIElements[LAYER_USERDEFINED][nElementType]; @@ -1304,20 +1304,20 @@ throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, UIElementDataHashMap& rElements = rElementType.aElementsHashMap; rElements.insert( UIElementDataHashMap::value_type( NewResourceURL, aUIElementData )); } - + Reference< XIndexAccess > xInsertSettings( aUIElementData.xSettings ); Reference< XUIConfigurationManager > xThis( m_xOwner, UNO_QUERY ); // Create event to notify listener about removed element settings ConfigurationEvent aEvent; - + aEvent.ResourceURL = NewResourceURL; aEvent.Accessor <<= xThis; aEvent.Source = m_xOwner; aEvent.Element <<= xInsertSettings; - + aGuard.unlock(); - + implts_notifyContainerListener( aEvent, NotifyOp_Insert ); } else @@ -1335,13 +1335,13 @@ Reference< XInterface > UIConfigurationManagerImpl::getImageManager() throw (::c if ( !m_xModuleImageManager.is() ) { if ( m_bUseDefault ) - m_xModuleImageManager = Reference< XComponent >( static_cast< cppu::OWeakObject *>( new ModuleImageManager( m_xServiceManager )), + m_xModuleImageManager = Reference< XComponent >( static_cast< cppu::OWeakObject *>( new ModuleImageManager( m_xServiceManager )), UNO_QUERY ); else - m_xModuleImageManager = Reference< XComponent >( static_cast< cppu::OWeakObject *>( new ImageManager( m_xServiceManager )), + m_xModuleImageManager = Reference< XComponent >( static_cast< cppu::OWeakObject *>( new ImageManager( m_xServiceManager )), UNO_QUERY ); Reference< XInitialization > xInit( m_xModuleImageManager, UNO_QUERY ); - + Sequence< Any > aPropSeq( m_bUseDefault ? 3 : 2 ); PropertyValue aPropValue; aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UserConfigStorage" )); @@ -1356,7 +1356,7 @@ Reference< XInterface > UIConfigurationManagerImpl::getImageManager() throw (::c aPropValue.Value <<= m_xUserRootCommit; aPropSeq[2] <<= aPropValue; } - + xInit->initialize( aPropSeq ); } @@ -1375,9 +1375,9 @@ Reference< XInterface > UIConfigurationManagerImpl::getShortCutManager() throw ( ::rtl::OUString aModule = m_aModuleIdentifier; Reference< XStorage > xDocumentRoot = m_xUserConfigStorage; aGuard.unlock(); - Reference< XInterface > xManager = xSMGR->createInstance(m_bUseDefault ? SERVICENAME_MODULEACCELERATORCONFIGURATION : SERVICENAME_DOCUMENTACCELERATORCONFIGURATION ); + Reference< XInterface > xManager = xSMGR->createInstance(m_bUseDefault ? SERVICENAME_MODULEACCELERATORCONFIGURATION : SERVICENAME_DOCUMENTACCELERATORCONFIGURATION ); Reference< XInitialization > xInit (xManager, UNO_QUERY_THROW); - + PropertyValue aProp; Sequence< Any > lArgs(1); if ( m_bUseDefault ) @@ -1397,11 +1397,11 @@ Reference< XInterface > UIConfigurationManagerImpl::getShortCutManager() throw ( { // SAFE -> aGuard.lock(); - m_xAccConfig = xManager; + m_xAccConfig = xManager; aGuard.unlock(); // <- SAFE } - + return xManager; } @@ -1413,10 +1413,10 @@ Reference< XInterface > UIConfigurationManagerImpl::getEventsManager() throw (:: void UIConfigurationManagerImpl::setStorage( const Reference< XStorage >& Storage ) throw (::com::sun::star::uno::RuntimeException) { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); - + if ( m_xUserConfigStorage.is() ) { try @@ -1438,7 +1438,7 @@ void UIConfigurationManagerImpl::setStorage( const Reference< XStorage >& Storag Reference< XUIConfigurationStorage > xAccUpdate(m_xAccConfig, UNO_QUERY); if ( xAccUpdate.is() ) xAccUpdate->setStorage( m_xUserConfigStorage ); - + if ( m_xModuleImageManager.is() ) { ImageManager* pImageManager = (ImageManager*)m_xModuleImageManager.get(); @@ -1465,7 +1465,7 @@ void UIConfigurationManagerImpl::setStorage( const Reference< XStorage >& Storag m_pStorageHandler[i]->connectToResource( PresetHandler::E_DOCUMENT, rtl::OUString::createFromAscii( UIELEMENTTYPENAMES[i] ), // this path wont be used later ... seee next lines! sEmpty, - m_xUserConfigStorage); + m_xUserConfigStorage); } } Reference< XPropertySet > xPropSet( m_xUserConfigStorage, UNO_QUERY ); @@ -1504,14 +1504,14 @@ sal_Bool UIConfigurationManagerImpl::isDefaultSettings( const ::rtl::OUString& R throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); - - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || + + if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); @@ -1519,22 +1519,22 @@ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno:: if ( pDataSettings && pDataSettings->bDefaultNode ) return sal_True; } - + return sal_False; } -Reference< XIndexAccess > UIConfigurationManagerImpl::getDefaultSettings( const ::rtl::OUString& ResourceURL ) +Reference< XIndexAccess > UIConfigurationManagerImpl::getDefaultSettings( const ::rtl::OUString& ResourceURL ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); - - if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || + + if (( nElementType == ::com::sun::star::ui::UIElementType::UNKNOWN ) || ( nElementType >= ::com::sun::star::ui::UIElementType::COUNT )) throw IllegalArgumentException(); else { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); @@ -1551,7 +1551,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la return pIter->second.xSettings; } } - + // Nothing has been found! throw NoSuchElementException(); } @@ -1575,7 +1575,7 @@ void UIConfigurationManagerImpl::reload() throw (::com::sun::star::uno::Exceptio { UIElementType& rUserElementType = m_aUIElements[LAYER_USERDEFINED][i]; UIElementType& rDefaultElementType = m_aUIElements[LAYER_DEFAULT][i]; - + if ( rUserElementType.bModified ) impl_reloadElementTypeData( rUserElementType, rDefaultElementType, aRemoveNotifyContainer, aReplaceNotifyContainer ); } @@ -1589,7 +1589,7 @@ void UIConfigurationManagerImpl::reload() throw (::com::sun::star::uno::Exceptio // Unlock mutex before notify our listeners aGuard.unlock(); - + // Notify our listeners ::std::for_each(aRemoveNotifyContainer.begin(),aRemoveNotifyContainer.end(),::boost::bind(&UIConfigurationManagerImpl::implts_notifyContainerListener,this,_1,NotifyOp_Remove)); ::std::for_each(aReplaceNotifyContainer.begin(),aReplaceNotifyContainer.end(),::boost::bind(&UIConfigurationManagerImpl::implts_notifyContainerListener,this,_1,NotifyOp_Replace)); @@ -1602,7 +1602,7 @@ void UIConfigurationManagerImpl::store() throw (::com::sun::star::uno::Exception if ( m_bDisposed ) throw DisposedException(); - + if ( m_xUserConfigStorage.is() && m_bModified && !m_bReadOnly ) { // Try to access our module sub folder @@ -1612,7 +1612,7 @@ void UIConfigurationManagerImpl::store() throw (::com::sun::star::uno::Exception { UIElementType& rElementType = m_aUIElements[LAYER_USERDEFINED][i]; Reference< XStorage > xStorage( rElementType.xStorage, UNO_QUERY ); - + if ( rElementType.bModified && xStorage.is() ) { impl_storeElementTypeData( xStorage, rElementType ); @@ -1624,7 +1624,7 @@ void UIConfigurationManagerImpl::store() throw (::com::sun::star::uno::Exception throw IOException(); } } - + m_bModified = false; } } @@ -1643,10 +1643,10 @@ void UIConfigurationManagerImpl::storeToStorage( const Reference< XStorage >& St { try { - Reference< XStorage > xElementTypeStorage( Storage->openStorageElement( + Reference< XStorage > xElementTypeStorage( Storage->openStorageElement( rtl::OUString::createFromAscii( UIELEMENTTYPENAMES[i] ), ElementModes::READWRITE )); UIElementType& rElementType = m_aUIElements[LAYER_USERDEFINED][i]; - + if ( rElementType.bModified && xElementTypeStorage.is() ) impl_storeElementTypeData( xElementTypeStorage, rElementType, false ); // store data to storage, but don't reset modify flag! } @@ -1655,7 +1655,7 @@ void UIConfigurationManagerImpl::storeToStorage( const Reference< XStorage >& St throw IOException(); } } - + Reference< XTransactedObject > xTransactedObject( Storage, UNO_QUERY ); if ( xTransactedObject.is() ) xTransactedObject->commit(); @@ -1665,14 +1665,14 @@ void UIConfigurationManagerImpl::storeToStorage( const Reference< XStorage >& St sal_Bool UIConfigurationManagerImpl::isModified() throw (::com::sun::star::uno::RuntimeException) { ResetableGuard aGuard( m_aLock ); - + return m_bModified; } sal_Bool UIConfigurationManagerImpl::isReadOnly() throw (::com::sun::star::uno::RuntimeException) { ResetableGuard aGuard( m_aLock ); - + return m_bReadOnly; } diff --git a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx index c5854daae955..bc35def8036c 100755 --- a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx +++ b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ #include <hash_map> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <accelerators/presethandler.hxx> #include <threadhelp/threadhelpbase.hxx> @@ -49,7 +49,7 @@ #include <uiconfiguration/moduleimagemanager.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> @@ -64,7 +64,7 @@ #include <com/sun/star/container/XIndexContainer.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/weak.hxx> #include <cppuhelper/interfacecontainer.hxx> @@ -73,7 +73,7 @@ namespace framework { - class UIConfigurationManagerImpl : public ThreadHelpBase // Struct for right initalization of mutex member! Must be first of baseclasses. + class UIConfigurationManagerImpl : public ThreadHelpBase // Struct for right initalization of mutex member! Must be first of baseclasses. { public: // XInterface, XTypeProvider, XServiceInfo @@ -128,7 +128,7 @@ namespace framework LAYER_USERDEFINED, LAYER_COUNT }; - + enum NotifyOp { NotifyOp_Remove, @@ -143,7 +143,7 @@ namespace framework rtl::OUString aResourceURL; rtl::OUString aUIName; }; - + struct UIElementData { UIElementData() : bModified( false ), bDefault( true ), bDefaultNode( true ) {}; @@ -159,14 +159,14 @@ namespace framework struct UIElementType; friend struct UIElementType; typedef ::std::hash_map< rtl::OUString, UIElementData, OUStringHashCode, ::std::equal_to< rtl::OUString > > UIElementDataHashMap; - + struct UIElementType { UIElementType() : bModified( false ), - bLoaded( false ), + bLoaded( false ), bDefaultLayer( false ), nElementType( ::com::sun::star::ui::UIElementType::UNKNOWN ) {} - + bool bModified; bool bLoaded; diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx index 5d5fa60f140b..4ac316b73ab0 100644 --- a/framework/source/uiconfiguration/windowstateconfiguration.cxx +++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,14 +29,14 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include "uiconfiguration/windowstateconfiguration.hxx" #include <threadhelp/resetableguard.hxx> #include "services.h" //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -49,14 +49,14 @@ #include <com/sun/star/util/XChangesBatch.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <rtl/ustrbuf.hxx> #include <cppuhelper/weak.hxx> #include <tools/debug.hxx> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ // @@ -69,7 +69,7 @@ using namespace ::com::sun::star::frame; using namespace ::com::sun::star::ui; //_________________________________________________________________________________________________________________ -// Namespace +// Namespace //_________________________________________________________________________________________________________________ // @@ -137,7 +137,7 @@ namespace framework { //***************************************************************************************************************** -// Configuration access class for WindowState supplier implementation +// Configuration access class for WindowState supplier implementation //***************************************************************************************************************** class ConfigurationAccess_WindowState : // interfaces @@ -270,7 +270,7 @@ class ConfigurationAccess_WindowState : // interfaces }; //***************************************************************************************************************** -// XInterface, XTypeProvider +// XInterface, XTypeProvider //***************************************************************************************************************** DEFINE_XINTERFACE_7 ( ConfigurationAccess_WindowState , OWeakObject , @@ -1340,26 +1340,26 @@ sal_Bool ConfigurationAccess_WindowState::impl_initializeConfigAccess() //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** DEFINE_XINTERFACE_4 ( WindowStateConfiguration , OWeakObject , DIRECT_INTERFACE( css::lang::XTypeProvider ), DIRECT_INTERFACE( css::lang::XServiceInfo ), - DIRECT_INTERFACE( css::container::XNameAccess ), + DIRECT_INTERFACE( css::container::XNameAccess ), DERIVED_INTERFACE( css::container::XElementAccess, css::container::XNameAccess ) ) -DEFINE_XTYPEPROVIDER_4 ( WindowStateConfiguration , - css::lang::XTypeProvider , - css::lang::XServiceInfo , +DEFINE_XTYPEPROVIDER_4 ( WindowStateConfiguration , + css::lang::XTypeProvider , + css::lang::XServiceInfo , css::container::XNameAccess , css::container::XElementAccess ) -DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( WindowStateConfiguration , - ::cppu::OWeakObject , - SERVICENAME_WINDOWSTATECONFIGURATION , +DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( WindowStateConfiguration , + ::cppu::OWeakObject , + SERVICENAME_WINDOWSTATECONFIGURATION , IMPLEMENTATIONNAME_WINDOWSTATECONFIGURATION ) diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx index 63caa7380fd2..0c4c610bd4b0 100644 --- a/framework/source/uielement/addonstoolbarmanager.cxx +++ b/framework/source/uielement/addonstoolbarmanager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ #include <uielement/toolbarmerger.hxx> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ @@ -66,7 +66,7 @@ #include <uielement/toolbarmerger.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/ui/ItemType.hpp> #include <com/sun/star/frame/XToolbarController.hpp> @@ -82,7 +82,7 @@ #include <com/sun/star/lang/XMultiComponentFactory.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <svtools/imgdef.hxx> #include <svtools/toolboxcontroller.hxx> @@ -97,7 +97,7 @@ #include <vcl/taskpanelist.hxx> //_________________________________________________________________________________________________________________ -// namespaces +// namespaces //_________________________________________________________________________________________________________________ using namespace ::com::sun::star; @@ -278,13 +278,13 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue Reference< XWindow > xToolbarWindow = VCLUnoHelper::GetInterface( m_pToolBar ); for ( sal_uInt32 n = 0; n < (sal_uInt32)rAddonToolbar.getLength(); n++ ) { - rtl::OUString aValueName; + rtl::OUString aValueName; - rtl::OUString aURL; - rtl::OUString aTitle; - rtl::OUString aImageId; - rtl::OUString aContext; - rtl::OUString aTarget; + rtl::OUString aURL; + rtl::OUString aTitle; + rtl::OUString aImageId; + rtl::OUString aContext; + rtl::OUString aTarget; rtl::OUString aControlType; sal_uInt16 nWidth( 0 ); @@ -321,8 +321,8 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue // Create TbRuntimeItemData to hold additional information we will need in the future AddonsParams* pRuntimeItemData = new AddonsParams; - pRuntimeItemData->aImageId = aImageId; - pRuntimeItemData->aTarget = aTarget; + pRuntimeItemData->aImageId = aImageId; + pRuntimeItemData->aTarget = aTarget; m_pToolBar->SetItemData( nId, pRuntimeItemData ); m_pToolBar->SetItemCommand( nId, aURL ); @@ -533,9 +533,9 @@ IMPL_LINK( AddonsToolBarManager, StateChanged, StateChangedType*, pStateChangedT IMPL_LINK( AddonsToolBarManager, DataChanged, DataChangedEvent*, pDataChangedEvent ) { - if ((( pDataChangedEvent->GetType() == DATACHANGED_SETTINGS ) || - ( pDataChangedEvent->GetType() == DATACHANGED_DISPLAY )) && - ( pDataChangedEvent->GetFlags() & SETTINGS_STYLE )) + if ((( pDataChangedEvent->GetType() == DATACHANGED_SETTINGS ) || + ( pDataChangedEvent->GetType() == DATACHANGED_DISPLAY )) && + ( pDataChangedEvent->GetFlags() & SETTINGS_STYLE )) { // Check if we need to get new images for normal/high contrast mode CheckAndUpdateImages(); diff --git a/framework/source/uielement/addonstoolbarwrapper.cxx b/framework/source/uielement/addonstoolbarwrapper.cxx index 813567008411..315d1b6e0bf8 100644 --- a/framework/source/uielement/addonstoolbarwrapper.cxx +++ b/framework/source/uielement/addonstoolbarwrapper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ @@ -45,7 +45,7 @@ #endif //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/DisposedException.hpp> @@ -57,7 +57,7 @@ #include <com/sun/star/ui/UIElementType.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ diff --git a/framework/source/uielement/buttontoolbarcontroller.cxx b/framework/source/uielement/buttontoolbarcontroller.cxx index d98caee191ae..4f55448d65d1 100644 --- a/framework/source/uielement/buttontoolbarcontroller.cxx +++ b/framework/source/uielement/buttontoolbarcontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -199,7 +199,7 @@ throw (::com::sun::star::uno::RuntimeException) } // XUpdatable -void SAL_CALL ButtonToolbarController::update() +void SAL_CALL ButtonToolbarController::update() throw (::com::sun::star::uno::RuntimeException) { vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); @@ -208,8 +208,8 @@ throw (::com::sun::star::uno::RuntimeException) } // XEventListener -void SAL_CALL ButtonToolbarController::disposing( - const com::sun::star::lang::EventObject& Source ) +void SAL_CALL ButtonToolbarController::disposing( + const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException ) { uno::Reference< uno::XInterface > xSource( Source.Source ); @@ -224,7 +224,7 @@ throw ( ::com::sun::star::uno::RuntimeException ) m_xFrame.clear(); } -void SAL_CALL ButtonToolbarController::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& ) +void SAL_CALL ButtonToolbarController::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& ) throw ( ::com::sun::star::uno::RuntimeException ) { // do nothing @@ -233,7 +233,7 @@ throw ( ::com::sun::star::uno::RuntimeException ) } // XToolbarController -void SAL_CALL ButtonToolbarController::execute( sal_Int16 KeyModifier ) +void SAL_CALL ButtonToolbarController::execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException) { uno::Reference< frame::XDispatch > xDispatch; @@ -241,25 +241,25 @@ throw (::com::sun::star::uno::RuntimeException) uno::Reference< util::XURLTransformer > xURLTransformer; rtl::OUString aCommandURL; ::com::sun::star::util::URL aTargetURL; - + { vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); - + if ( m_bDisposed ) throw DisposedException(); - if ( m_bInitialized && + if ( m_bInitialized && m_xFrame.is() && m_xServiceManager.is() && m_aCommandURL.getLength() ) { if ( !m_xURLTransformer.is() ) { - m_xURLTransformer = uno::Reference< util::XURLTransformer >( + m_xURLTransformer = uno::Reference< util::XURLTransformer >( m_xServiceManager->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), uno::UNO_QUERY_THROW ); } - + xFrame = m_xFrame; aCommandURL = m_aCommandURL; xURLTransformer = m_xURLTransformer; @@ -283,7 +283,7 @@ throw (::com::sun::star::uno::RuntimeException) // Provide key modifier information to dispatch function aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "KeyModifier" )); aArgs[0].Value <<= KeyModifier; - + if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# UiEventLogHelper(::rtl::OUString::createFromAscii("ButtonToolbarController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs); xDispatch->dispatch( aTargetURL, aArgs ); @@ -291,22 +291,22 @@ throw (::com::sun::star::uno::RuntimeException) catch ( DisposedException& ) { } - } + } } -void SAL_CALL ButtonToolbarController::click() +void SAL_CALL ButtonToolbarController::click() throw (::com::sun::star::uno::RuntimeException) { vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); - + if ( m_bDisposed ) throw DisposedException(); - + sal_Int16 nKeyModifier( (sal_Int16)m_pToolbar->GetModifier() ); execute( nKeyModifier ); } -void SAL_CALL ButtonToolbarController::doubleClick() +void SAL_CALL ButtonToolbarController::doubleClick() throw (::com::sun::star::uno::RuntimeException) { // do nothing @@ -314,22 +314,22 @@ throw (::com::sun::star::uno::RuntimeException) throw DisposedException(); } -uno::Reference< awt::XWindow > SAL_CALL ButtonToolbarController::createPopupWindow() +uno::Reference< awt::XWindow > SAL_CALL ButtonToolbarController::createPopupWindow() throw (::com::sun::star::uno::RuntimeException) { if ( m_bDisposed ) throw DisposedException(); - + return uno::Reference< awt::XWindow >(); } -uno::Reference< awt::XWindow > SAL_CALL ButtonToolbarController::createItemWindow( - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& ) +uno::Reference< awt::XWindow > SAL_CALL ButtonToolbarController::createItemWindow( + const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& ) throw (::com::sun::star::uno::RuntimeException) { if ( m_bDisposed ) throw DisposedException(); - + return uno::Reference< awt::XWindow >(); } diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx index 6a0516e25881..058005ffdc40 100644 --- a/framework/source/uielement/comboboxtoolbarcontroller.cxx +++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ #endif //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #ifndef __FRAMEWORK_TOOLBAR_HXX_ @@ -41,7 +41,7 @@ #endif //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> @@ -53,7 +53,7 @@ #include <com/sun/star/util/Color.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <svtools/toolboxcontroller.hxx> #include <vos/mutex.hxx> diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx index 328d68fd8003..2e1c88740750 100644 --- a/framework/source/uielement/complextoolbarcontroller.cxx +++ b/framework/source/uielement/complextoolbarcontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ #endif //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #ifndef __FRAMEWORK_TOOLBAR_HXX_ @@ -41,7 +41,7 @@ #endif //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> @@ -53,7 +53,7 @@ #include <com/sun/star/frame/XControlNotificationListener.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <svtools/toolboxcontroller.hxx> #include <vos/mutex.hxx> diff --git a/framework/source/uielement/constitemcontainer.cxx b/framework/source/uielement/constitemcontainer.cxx index 979c6085bdc9..9ef9a72e5093 100644 --- a/framework/source/uielement/constitemcontainer.cxx +++ b/framework/source/uielement/constitemcontainer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <uielement/constitemcontainer.hxx> #include <uielement/rootitemcontainer.hxx> @@ -36,12 +36,12 @@ #include <threadhelp/resetableguard.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/beans/PropertyAttribute.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/implbase1.hxx> @@ -133,15 +133,15 @@ sal_Bool OPropertySetHelperInfo_Impl::hasPropertyByName( const ::rtl::OUString & } //***************************************************************************************************************** -// XInterface, XTypeProvider +// XInterface, XTypeProvider //***************************************************************************************************************** DEFINE_XINTERFACE_6 ( ConstItemContainer , OWeakObject , DIRECT_INTERFACE( ::com::sun::star::lang::XTypeProvider ), DIRECT_INTERFACE( ::com::sun::star::container::XElementAccess ), DIRECT_INTERFACE( ::com::sun::star::container::XIndexAccess ), - DIRECT_INTERFACE( ::com::sun::star::beans::XFastPropertySet ), - DIRECT_INTERFACE( ::com::sun::star::beans::XPropertySet ), + DIRECT_INTERFACE( ::com::sun::star::beans::XFastPropertySet ), + DIRECT_INTERFACE( ::com::sun::star::beans::XPropertySet ), DIRECT_INTERFACE( ::com::sun::star::lang::XUnoTunnel ) ) diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index 546d141e0fb6..49501194a014 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,13 +30,13 @@ #include <uielement/controlmenucontroller.hxx> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> #include "services.h" //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -47,7 +47,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <vcl/menu.hxx> @@ -66,56 +66,56 @@ // Copied from svx // Function-Id's #define RID_FMSHELL_CONVERSIONMENU (RID_FORMS_START + 4) -#define RID_SVXIMGLIST_FMEXPL (RID_FORMS_START + 0) +#define RID_SVXIMGLIST_FMEXPL (RID_FORMS_START + 0) #define RID_SVXIMGLIST_FMEXPL_HC (RID_FORMS_START + 2) // Forms - Ids, used to address images from image list -#define SID_FMSLOTS_START (SID_SVX_START + 592) -#define SID_MORE_FMSLOTS_START (SID_SVX_START + 702) - -#define SID_FM_CONVERTTO_EDIT (SID_MORE_FMSLOTS_START + 32) -#define SID_FM_CONVERTTO_BUTTON (SID_MORE_FMSLOTS_START + 33) -#define SID_FM_CONVERTTO_FIXEDTEXT (SID_MORE_FMSLOTS_START + 34) -#define SID_FM_CONVERTTO_LISTBOX (SID_MORE_FMSLOTS_START + 35) -#define SID_FM_CONVERTTO_CHECKBOX (SID_MORE_FMSLOTS_START + 36) -#define SID_FM_CONVERTTO_RADIOBUTTON (SID_MORE_FMSLOTS_START + 37) -#define SID_FM_CONVERTTO_GROUPBOX (SID_MORE_FMSLOTS_START + 38) -#define SID_FM_CONVERTTO_COMBOBOX (SID_MORE_FMSLOTS_START + 39) -#define SID_FM_CONVERTTO_GRID (SID_MORE_FMSLOTS_START + 40) -#define SID_FM_CONVERTTO_IMAGEBUTTON (SID_MORE_FMSLOTS_START + 41) -#define SID_FM_CONVERTTO_FILECONTROL (SID_MORE_FMSLOTS_START + 42) -#define SID_FM_CONVERTTO_DATE (SID_MORE_FMSLOTS_START + 43) -#define SID_FM_CONVERTTO_TIME (SID_MORE_FMSLOTS_START + 44) -#define SID_FM_CONVERTTO_NUMERIC (SID_MORE_FMSLOTS_START + 45) -#define SID_FM_CONVERTTO_CURRENCY (SID_MORE_FMSLOTS_START + 46) -#define SID_FM_CONVERTTO_PATTERN (SID_MORE_FMSLOTS_START + 47) -#define SID_FM_CONVERTTO_IMAGECONTROL (SID_MORE_FMSLOTS_START + 48) -#define SID_FM_CONVERTTO_FORMATTED (SID_MORE_FMSLOTS_START + 49) +#define SID_FMSLOTS_START (SID_SVX_START + 592) +#define SID_MORE_FMSLOTS_START (SID_SVX_START + 702) + +#define SID_FM_CONVERTTO_EDIT (SID_MORE_FMSLOTS_START + 32) +#define SID_FM_CONVERTTO_BUTTON (SID_MORE_FMSLOTS_START + 33) +#define SID_FM_CONVERTTO_FIXEDTEXT (SID_MORE_FMSLOTS_START + 34) +#define SID_FM_CONVERTTO_LISTBOX (SID_MORE_FMSLOTS_START + 35) +#define SID_FM_CONVERTTO_CHECKBOX (SID_MORE_FMSLOTS_START + 36) +#define SID_FM_CONVERTTO_RADIOBUTTON (SID_MORE_FMSLOTS_START + 37) +#define SID_FM_CONVERTTO_GROUPBOX (SID_MORE_FMSLOTS_START + 38) +#define SID_FM_CONVERTTO_COMBOBOX (SID_MORE_FMSLOTS_START + 39) +#define SID_FM_CONVERTTO_GRID (SID_MORE_FMSLOTS_START + 40) +#define SID_FM_CONVERTTO_IMAGEBUTTON (SID_MORE_FMSLOTS_START + 41) +#define SID_FM_CONVERTTO_FILECONTROL (SID_MORE_FMSLOTS_START + 42) +#define SID_FM_CONVERTTO_DATE (SID_MORE_FMSLOTS_START + 43) +#define SID_FM_CONVERTTO_TIME (SID_MORE_FMSLOTS_START + 44) +#define SID_FM_CONVERTTO_NUMERIC (SID_MORE_FMSLOTS_START + 45) +#define SID_FM_CONVERTTO_CURRENCY (SID_MORE_FMSLOTS_START + 46) +#define SID_FM_CONVERTTO_PATTERN (SID_MORE_FMSLOTS_START + 47) +#define SID_FM_CONVERTTO_IMAGECONTROL (SID_MORE_FMSLOTS_START + 48) +#define SID_FM_CONVERTTO_FORMATTED (SID_MORE_FMSLOTS_START + 49) #define SID_FM_CONVERTTO_SCROLLBAR (SID_MORE_FMSLOTS_START + 68) #define SID_FM_CONVERTTO_SPINBUTTON (SID_MORE_FMSLOTS_START + 69) -#define SID_FM_DATEFIELD (SID_MORE_FMSLOTS_START + 2) -#define SID_FM_TIMEFIELD (SID_MORE_FMSLOTS_START + 3) -#define SID_FM_NUMERICFIELD (SID_MORE_FMSLOTS_START + 4) -#define SID_FM_CURRENCYFIELD (SID_MORE_FMSLOTS_START + 5) -#define SID_FM_PATTERNFIELD (SID_MORE_FMSLOTS_START + 6) -#define SID_FM_IMAGECONTROL (SID_MORE_FMSLOTS_START + 8) -#define SID_FM_FORMATTEDFIELD (SID_MORE_FMSLOTS_START + 26) +#define SID_FM_DATEFIELD (SID_MORE_FMSLOTS_START + 2) +#define SID_FM_TIMEFIELD (SID_MORE_FMSLOTS_START + 3) +#define SID_FM_NUMERICFIELD (SID_MORE_FMSLOTS_START + 4) +#define SID_FM_CURRENCYFIELD (SID_MORE_FMSLOTS_START + 5) +#define SID_FM_PATTERNFIELD (SID_MORE_FMSLOTS_START + 6) +#define SID_FM_IMAGECONTROL (SID_MORE_FMSLOTS_START + 8) +#define SID_FM_FORMATTEDFIELD (SID_MORE_FMSLOTS_START + 26) #define SID_FM_SCROLLBAR (SID_MORE_FMSLOTS_START + 66) #define SID_FM_SPINBUTTON (SID_MORE_FMSLOTS_START + 67) -#define SID_FM_CONFIG (SID_FMSLOTS_START + 1) -#define SID_FM_PUSHBUTTON (SID_FMSLOTS_START + 2) -#define SID_FM_RADIOBUTTON (SID_FMSLOTS_START + 3) -#define SID_FM_CHECKBOX (SID_FMSLOTS_START + 4) -#define SID_FM_FIXEDTEXT (SID_FMSLOTS_START + 5) -#define SID_FM_GROUPBOX (SID_FMSLOTS_START + 6) -#define SID_FM_EDIT (SID_FMSLOTS_START + 7) -#define SID_FM_LISTBOX (SID_FMSLOTS_START + 8) -#define SID_FM_COMBOBOX (SID_FMSLOTS_START + 9) -#define SID_FM_URLBUTTON (SID_FMSLOTS_START + 10) -#define SID_FM_DBGRID (SID_FMSLOTS_START + 11) -#define SID_FM_IMAGEBUTTON (SID_FMSLOTS_START + 12) -#define SID_FM_FILECONTROL (SID_FMSLOTS_START + 13) +#define SID_FM_CONFIG (SID_FMSLOTS_START + 1) +#define SID_FM_PUSHBUTTON (SID_FMSLOTS_START + 2) +#define SID_FM_RADIOBUTTON (SID_FMSLOTS_START + 3) +#define SID_FM_CHECKBOX (SID_FMSLOTS_START + 4) +#define SID_FM_FIXEDTEXT (SID_FMSLOTS_START + 5) +#define SID_FM_GROUPBOX (SID_FMSLOTS_START + 6) +#define SID_FM_EDIT (SID_FMSLOTS_START + 7) +#define SID_FM_LISTBOX (SID_FMSLOTS_START + 8) +#define SID_FM_COMBOBOX (SID_FMSLOTS_START + 9) +#define SID_FM_URLBUTTON (SID_FMSLOTS_START + 10) +#define SID_FM_DBGRID (SID_FMSLOTS_START + 11) +#define SID_FM_IMAGEBUTTON (SID_FMSLOTS_START + 12) +#define SID_FM_FILECONTROL (SID_FMSLOTS_START + 13) sal_Int16 nConvertSlots[] = { @@ -127,7 +127,7 @@ sal_Int16 nConvertSlots[] = SID_FM_CONVERTTO_RADIOBUTTON, SID_FM_CONVERTTO_GROUPBOX, SID_FM_CONVERTTO_COMBOBOX, -// SID_FM_CONVERTTO_GRID, +// SID_FM_CONVERTTO_GRID, SID_FM_CONVERTTO_IMAGEBUTTON, SID_FM_CONVERTTO_FILECONTROL, SID_FM_CONVERTTO_DATE, @@ -151,7 +151,7 @@ sal_Int16 nCreateSlots[] = SID_FM_RADIOBUTTON, SID_FM_GROUPBOX, SID_FM_COMBOBOX, -// SID_FM_DBGRID, +// SID_FM_DBGRID, SID_FM_IMAGEBUTTON, SID_FM_FILECONTROL, SID_FM_DATEFIELD, @@ -190,9 +190,9 @@ const char* aCommands[] = }; //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ -// +// using namespace com::sun::star::uno; using namespace com::sun::star::lang; @@ -205,9 +205,9 @@ using namespace com::sun::star::container; namespace framework { -DEFINE_XSERVICEINFO_MULTISERVICE ( ControlMenuController , +DEFINE_XSERVICEINFO_MULTISERVICE ( ControlMenuController , OWeakObject , - SERVICENAME_POPUPMENUCONTROLLER , + SERVICENAME_POPUPMENUCONTROLLER , IMPLEMENTATIONNAME_CONTROLMENUCONTROLLER ) @@ -231,11 +231,11 @@ ControlMenuController::~ControlMenuController() void ControlMenuController::updateImagesPopupMenu( PopupMenu* pPopupMenu ) { rtl::OUString aResName( RTL_CONSTASCII_USTRINGPARAM( "svx" )); - + ResMgr* pResMgr = ResMgr::CreateResMgr( rtl::OUStringToOString( aResName, RTL_TEXTENCODING_ASCII_US )); ResId aResId( m_bWasHiContrast ? RID_SVXIMGLIST_FMEXPL_HC : RID_SVXIMGLIST_FMEXPL, *pResMgr ); aResId.SetRT( RSC_IMAGELIST ); - + if ( pResMgr->IsAvailable( aResId )) { ImageList aImageList( aResId ); @@ -257,13 +257,13 @@ void ControlMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rP { VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( rPopupMenu ); PopupMenu* pVCLPopupMenu = 0; - + vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); - + resetPopupMenu( rPopupMenu ); if ( pPopupMenu ) pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu(); - + if ( pVCLPopupMenu && m_pResPopupMenu ) *pVCLPopupMenu = *m_pResPopupMenu; } @@ -277,7 +277,7 @@ void SAL_CALL ControlMenuController::disposing( const EventObject& ) throw ( Run m_xFrame.clear(); m_xDispatch.clear(); m_xServiceManager.clear(); - + if ( m_xPopupMenu.is() ) m_xPopupMenu->removeMenuListener( Reference< css::awt::XMenuListener >(( OWeakObject *)this, UNO_QUERY )); m_xPopupMenu.clear(); @@ -288,8 +288,8 @@ void SAL_CALL ControlMenuController::disposing( const EventObject& ) throw ( Run void SAL_CALL ControlMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException ) { osl::ResettableMutexGuard aLock( m_aMutex ); - - USHORT nMenuId = 0; + + USHORT nMenuId = 0; for (sal_uInt32 i=0; i < sizeof(aCommands)/sizeof(aCommands[0]); ++i) { if ( Event.FeatureURL.Complete.equalsAscii( aCommands[i] )) @@ -302,9 +302,9 @@ void SAL_CALL ControlMenuController::statusChanged( const FeatureStateEvent& Eve if ( nMenuId ) { VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( m_xPopupMenu ); - + vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); - + PopupMenu* pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu(); if ( !Event.IsEnabled && pVCLPopupMenu->GetItemPos( nMenuId ) != MENU_ITEM_NOTFOUND ) @@ -323,11 +323,11 @@ void SAL_CALL ControlMenuController::statusChanged( const FeatureStateEvent& Eve if ( nPrevInConversion != MENU_ITEM_NOTFOUND ) break; } - + if ( MENU_ITEM_NOTFOUND == nPrevInConversion ) // none of the items which precede the nSID-slot in the source menu are present in our conversion menu - nPrevInConversion = sal::static_int_cast< sal_uInt16 >(-1); // put the item at the first position - + nPrevInConversion = sal::static_int_cast< sal_uInt16 >(-1); // put the item at the first position + pVCLPopupMenu->InsertItem( nMenuId, m_pResPopupMenu->GetItemText( nMenuId ), m_pResPopupMenu->GetItemBits( nMenuId ), ++nPrevInConversion ); pVCLPopupMenu->SetItemImage( nMenuId, m_pResPopupMenu->GetItemImage( nMenuId )); pVCLPopupMenu->SetHelpId( nMenuId, m_pResPopupMenu->GetHelpId( nMenuId )); @@ -341,7 +341,7 @@ void ControlMenuController::impl_select(const Reference< XDispatch >& /*_xDispat UrlToDispatchMap::iterator pIter = m_aURLToDispatchMap.find( aURL.Complete ); if ( pIter != m_aURLToDispatchMap.end() ) { - Sequence<PropertyValue> aArgs; + Sequence<PropertyValue> aArgs; Reference< XDispatch > xDispatch = pIter->second; if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# UiEventLogHelper(::rtl::OUString::createFromAscii("ControlMenuController")).log(m_xServiceManager, m_xFrame, aURL, aArgs); @@ -353,11 +353,11 @@ void ControlMenuController::impl_select(const Reference< XDispatch >& /*_xDispat void SAL_CALL ControlMenuController::activate( const css::awt::MenuEvent& ) throw (RuntimeException) { osl::ResettableMutexGuard aLock( m_aMutex ); - + if ( m_xPopupMenu.is() ) { vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); - + // Check if some modes have changed so we have to update our menu images const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); sal_Bool bIsHiContrast = rSettings.GetHighContrastMode(); @@ -367,8 +367,8 @@ void SAL_CALL ControlMenuController::activate( const css::awt::MenuEvent& ) thro if ( bUpdateImages ) { // The mode has changed or the complete menu so we have to retrieve all images again - m_bWasHiContrast = bIsHiContrast; - m_bShowMenuImages = bShowMenuImages; + m_bWasHiContrast = bIsHiContrast; + m_bShowMenuImages = bShowMenuImages; VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXPopupMenu::GetImplementation( m_xPopupMenu ); if ( pPopupMenu ) @@ -402,25 +402,25 @@ void ControlMenuController::impl_setPopupMenu() } } // if ( m_pResPopupMenu == 0 ) } - + void SAL_CALL ControlMenuController::updatePopupMenu() throw (::com::sun::star::uno::RuntimeException) { osl::ResettableMutexGuard aLock( m_aMutex ); throwIfDisposed(); - + if ( m_xFrame.is() && m_xPopupMenu.is() ) { URL aTargetURL; Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY ); fillPopupMenu( m_xPopupMenu ); m_aURLToDispatchMap.free(); - + for (sal_uInt32 i=0; i<sizeof(aCommands)/sizeof(aCommands[0]); ++i) { aTargetURL.Complete = rtl::OUString::createFromAscii( aCommands[i] ); m_xURLTransformer->parseStrict( aTargetURL ); - + Reference< XDispatch > xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 ); if ( xDispatch.is() ) { @@ -437,7 +437,7 @@ void SAL_CALL ControlMenuController::initialize( const Sequence< Any >& aArgumen { osl::ResettableMutexGuard aLock( m_aMutex ); svt::PopupMenuControllerBase::initialize(aArguments); - m_aBaseURL = ::rtl::OUString(); + m_aBaseURL = ::rtl::OUString(); } } diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx index 0325817d8ec2..0800103c743e 100644 --- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx +++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ #endif //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #ifndef __FRAMEWORK_TOOLBAR_HXX_ @@ -41,7 +41,7 @@ #endif //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> @@ -52,7 +52,7 @@ #include <com/sun/star/frame/XControlNotificationListener.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <svtools/toolboxcontroller.hxx> #include <vos/mutex.hxx> diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx index 23e5eea145db..387213d7c3eb 100644 --- a/framework/source/uielement/edittoolbarcontroller.cxx +++ b/framework/source/uielement/edittoolbarcontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ #endif //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #ifndef __FRAMEWORK_TOOLBAR_HXX_ @@ -41,7 +41,7 @@ #endif //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> @@ -52,7 +52,7 @@ #include <com/sun/star/frame/XControlNotificationListener.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <svtools/toolboxcontroller.hxx> #include <vos/mutex.hxx> diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx index 6a885e972d4e..c2625a951efb 100644 --- a/framework/source/uielement/fontmenucontroller.cxx +++ b/framework/source/uielement/fontmenucontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,13 +30,13 @@ #include <uielement/fontmenucontroller.hxx> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> #include "services.h" //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -45,7 +45,7 @@ //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #ifndef _VCL_MENU_HXX_ @@ -62,9 +62,9 @@ #include <vos/mutex.hxx> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ -// +// using namespace com::sun::star::uno; using namespace com::sun::star::lang; @@ -83,9 +83,9 @@ bool lcl_I18nCompareString(const rtl::OUString& rStr1, const rtl::OUString& rStr namespace framework { -DEFINE_XSERVICEINFO_MULTISERVICE ( FontMenuController , +DEFINE_XSERVICEINFO_MULTISERVICE ( FontMenuController , OWeakObject , - SERVICENAME_POPUPMENUCONTROLLER , + SERVICENAME_POPUPMENUCONTROLLER , IMPLEMENTATIONNAME_FONTMENUCONTROLLER ) @@ -106,13 +106,13 @@ void FontMenuController::fillPopupMenu( const Sequence< ::rtl::OUString >& rFont const rtl::OUString* pFontNameArray = rFontNameSeq.getConstArray(); VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( rPopupMenu ); PopupMenu* pVCLPopupMenu = 0; - + vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); - + resetPopupMenu( rPopupMenu ); if ( pPopupMenu ) pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu(); - + if ( pVCLPopupMenu ) { vector<rtl::OUString> aVector; @@ -179,7 +179,7 @@ void SAL_CALL FontMenuController::statusChanged( const FeatureStateEvent& Event // XMenuListener void FontMenuController::impl_select(const Reference< XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aTargetURL) { - Sequence<PropertyValue> aArgs; + Sequence<PropertyValue> aArgs; if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# UiEventLogHelper(::rtl::OUString::createFromAscii("FontMenuController")).log( m_xServiceManager, @@ -194,7 +194,7 @@ void FontMenuController::impl_select(const Reference< XDispatch >& _xDispatch,co void SAL_CALL FontMenuController::activate( const css::awt::MenuEvent& ) throw (RuntimeException) { osl::MutexGuard aLock( m_aMutex ); - + if ( m_xPopupMenu.is() ) { // find new font name and set check mark! @@ -232,14 +232,14 @@ void SAL_CALL FontMenuController::activate( const css::awt::MenuEvent& ) throw ( void FontMenuController::impl_setPopupMenu() { Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY ); - + com::sun::star::util::URL aTargetURL; // Register for font list updates to get the current font list from the controller aTargetURL.Complete = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontNameList" )); m_xURLTransformer->parseStrict( aTargetURL ); m_xFontListDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 ); } - + void SAL_CALL FontMenuController::updatePopupMenu() throw ( ::com::sun::star::uno::RuntimeException ) { svt::PopupMenuControllerBase::updatePopupMenu(); diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx index 24fb1abc15b0..58cf3a3b02be 100644 --- a/framework/source/uielement/fontsizemenucontroller.cxx +++ b/framework/source/uielement/fontsizemenucontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,13 +30,13 @@ #include <uielement/fontsizemenucontroller.hxx> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> #include "services.h" //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -45,7 +45,7 @@ #include <com/sun/star/view/XPrintable.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #ifndef _VCL_MENU_HXX_ @@ -67,9 +67,9 @@ #include <vos/mutex.hxx> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ -// +// using namespace com::sun::star::uno; using namespace com::sun::star::lang; @@ -82,9 +82,9 @@ using namespace com::sun::star::beans; namespace framework { -DEFINE_XSERVICEINFO_MULTISERVICE ( FontSizeMenuController , +DEFINE_XSERVICEINFO_MULTISERVICE ( FontSizeMenuController , OWeakObject , - SERVICENAME_POPUPMENUCONTROLLER , + SERVICENAME_POPUPMENUCONTROLLER , IMPLEMENTATIONNAME_FONTSIZEMENUCONTROLLER ) @@ -106,7 +106,7 @@ FontSizeMenuController::~FontSizeMenuController() rtl::OUString FontSizeMenuController::retrievePrinterName( com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame ) { rtl::OUString aPrinterName; - + if ( rFrame.is() ) { Reference< XController > xController = m_xFrame->getController(); @@ -127,7 +127,7 @@ rtl::OUString FontSizeMenuController::retrievePrinterName( com::sun::star::uno:: } } } - + return aPrinterName; } @@ -135,9 +135,9 @@ rtl::OUString FontSizeMenuController::retrievePrinterName( com::sun::star::uno:: void FontSizeMenuController::setCurHeight( long nHeight, Reference< css::awt::XPopupMenu >& rPopupMenu ) { // check menu item - rtl::OUString aHeight = Application::GetSettings().GetUILocaleI18nHelper().GetNum( nHeight, 1, TRUE, FALSE ); - USHORT nChecked = 0; - USHORT nItemCount = rPopupMenu->getItemCount(); + rtl::OUString aHeight = Application::GetSettings().GetUILocaleI18nHelper().GetNum( nHeight, 1, TRUE, FALSE ); + USHORT nChecked = 0; + USHORT nItemCount = rPopupMenu->getItemCount(); for( USHORT i = 0; i < nItemCount; i++ ) { USHORT nItemId = rPopupMenu->getItemId( i ); @@ -162,19 +162,19 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r const rtl::OUString aFontNameCommand( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontHeight?FontHeight=" )); VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( rPopupMenu ); PopupMenu* pVCLPopupMenu = 0; - + resetPopupMenu( rPopupMenu ); if ( pPopupMenu ) pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu(); - + if ( pVCLPopupMenu ) { FontList* pFontList = 0; Printer* pInfoPrinter = 0; rtl::OUString aPrinterName; - + vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); - + // try to retrieve printer name of document aPrinterName = retrievePrinterName( m_xFrame ); if ( aPrinterName.getLength() > 0 ) @@ -183,12 +183,12 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r if ( pInfoPrinter && pInfoPrinter->GetDevFontCount() > 0 ) pFontList = new FontList( pInfoPrinter ); } - + if ( pFontList == 0 ) pFontList = new FontList( Application::GetDefaultDevice() ); FontInfo aFntInfo = pFontList->Get( m_aFontDescriptor.Name, m_aFontDescriptor.StyleName ); - + // setup font size array if ( m_pHeightArray ) delete m_pHeightArray; @@ -201,14 +201,14 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r USHORT nPos = 0; const rtl::OUString aFontHeightCommand( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontHeight?FontHeight.Height:float=" )); - + // first insert font size names (for simplified/traditional chinese) float fPoint; rtl::OUString aHeightString; FontSizeNames aFontSizeNames( Application::GetSettings().GetUILanguage() ); m_pHeightArray = new long[nSizeCount+aFontSizeNames.Count()]; rtl::OUString aCommand; - + if ( !aFontSizeNames.IsEmpty() ) { if ( pAry == pFontList->GetStdSizeAry() ) @@ -217,13 +217,13 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r ULONG nCount = aFontSizeNames.Count(); for( ULONG i = 0; i < nCount; i++ ) { - String aSizeName = aFontSizeNames.GetIndexName( i ); - long nSize = aFontSizeNames.GetIndexSize( i ); + String aSizeName = aFontSizeNames.GetIndexName( i ); + long nSize = aFontSizeNames.GetIndexSize( i ); m_pHeightArray[nPos] = nSize; nPos++; // Id is nPos+1 pVCLPopupMenu->InsertItem( nPos, aSizeName, MIB_RADIOCHECK | MIB_AUTOCHECK ); fPoint = float( m_pHeightArray[nPos-1] ) / 10; - + // Create dispatchable .uno command and set it aCommand = aFontHeightCommand + rtl::OUString::valueOf( fPoint ); pVCLPopupMenu->SetItemCommand( nPos, aCommand ); @@ -246,7 +246,7 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r // Create dispatchable .uno command and set it aCommand = aFontHeightCommand + rtl::OUString::valueOf( fPoint ); pVCLPopupMenu->SetItemCommand( nPos, aCommand ); - } + } pTempAry++; } } @@ -265,12 +265,12 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r // Create dispatchable .uno command and set it aCommand = aFontHeightCommand + rtl::OUString::valueOf( fPoint ); pVCLPopupMenu->SetItemCommand( nPos, aCommand ); - + pTempAry++; } setCurHeight( long( m_aFontHeight.Height * 10), rPopupMenu ); - + delete pFontList; delete pInfoPrinter; } @@ -300,7 +300,7 @@ void SAL_CALL FontSizeMenuController::statusChanged( const FeatureStateEvent& Ev { osl::MutexGuard aLock( m_aMutex ); m_aFontDescriptor = aFontDescriptor; - + if ( m_xPopupMenu.is() ) fillPopupMenu( m_xPopupMenu ); @@ -321,7 +321,7 @@ void SAL_CALL FontSizeMenuController::statusChanged( const FeatureStateEvent& Ev // XMenuListener void FontSizeMenuController::impl_select(const Reference< XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aTargetURL) { - Sequence<PropertyValue> aArgs; + Sequence<PropertyValue> aArgs; if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# UiEventLogHelper(::rtl::OUString::createFromAscii("FontSizeMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs); OSL_ENSURE(_xDispatch.is(),"FontSizeMenuController::impl_select: No dispatch"); @@ -339,13 +339,13 @@ void FontSizeMenuController::impl_setPopupMenu() m_xURLTransformer->parseStrict( aTargetURL ); m_xCurrentFontDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 ); } - + void SAL_CALL FontSizeMenuController::updatePopupMenu() throw ( ::com::sun::star::uno::RuntimeException ) { osl::ClearableMutexGuard aLock( m_aMutex ); throwIfDisposed(); - + Reference< XDispatch > xDispatch( m_xCurrentFontDispatch ); com::sun::star::util::URL aTargetURL; aTargetURL.Complete = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CharFontName" )); diff --git a/framework/source/uielement/footermenucontroller.cxx b/framework/source/uielement/footermenucontroller.cxx index fb74197e8ef2..16f26404697c 100644 --- a/framework/source/uielement/footermenucontroller.cxx +++ b/framework/source/uielement/footermenucontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,7 +30,7 @@ #include <uielement/footermenucontroller.hxx> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> #include "services.h" @@ -40,7 +40,7 @@ #include <classes/fwlresid.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -52,7 +52,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #ifndef _VCL_MENU_HXX_ @@ -65,9 +65,9 @@ #include <dispatch/uieventloghelper.hxx> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ -// +// using namespace com::sun::star::uno; using namespace com::sun::star::lang; @@ -80,9 +80,9 @@ using namespace com::sun::star::container; namespace framework { -DEFINE_XSERVICEINFO_MULTISERVICE ( FooterMenuController , +DEFINE_XSERVICEINFO_MULTISERVICE ( FooterMenuController , OWeakObject , - SERVICENAME_POPUPMENUCONTROLLER , + SERVICENAME_POPUPMENUCONTROLLER , IMPLEMENTATIONNAME_FOOTERMENUCONTROLLER ) diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx index 53ea643e379d..3f37050e6780 100644 --- a/framework/source/uielement/generictoolbarcontroller.cxx +++ b/framework/source/uielement/generictoolbarcontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -344,7 +344,7 @@ MenuToolbarController::~MenuToolbarController() delete pMenu; pMenu = NULL; } - + } class Toolbarmenu : public PopupMenu @@ -369,10 +369,10 @@ void SAL_CALL MenuToolbarController::click() throw (RuntimeException) createPopupWindow(); } -Reference< XWindow > SAL_CALL +Reference< XWindow > SAL_CALL MenuToolbarController::createPopupWindow() throw (::com::sun::star::uno::RuntimeException) { - if ( !pMenu ) + if ( !pMenu ) { Reference< XDispatchProvider > xDispatch; Reference< XURLTransformer > xURLTransformer( m_xServiceManager->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), UNO_QUERY ); @@ -387,7 +387,7 @@ MenuToolbarController::createPopupWindow() throw (::com::sun::star::uno::Runtime ::Rectangle aRect( m_pToolbar->GetItemRect( m_nID ) ); pMenu->Execute( m_pToolbar, aRect, POPUPMENU_EXECUTE_DOWN ); - return NULL; + return NULL; } } // namespace diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx index f10507f73435..c0d7b48a401b 100644 --- a/framework/source/uielement/headermenucontroller.cxx +++ b/framework/source/uielement/headermenucontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,7 +30,7 @@ #include <uielement/headermenucontroller.hxx> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> #include "services.h" @@ -41,7 +41,7 @@ #include <classes/fwlresid.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -52,7 +52,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #ifndef _VCL_MENU_HXX_ @@ -67,9 +67,9 @@ #include <vos/mutex.hxx> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ -// +// using namespace com::sun::star::uno; using namespace com::sun::star::lang; @@ -88,9 +88,9 @@ const USHORT ALL_MENUITEM_ID = 1; namespace framework { -DEFINE_XSERVICEINFO_MULTISERVICE ( HeaderMenuController , +DEFINE_XSERVICEINFO_MULTISERVICE ( HeaderMenuController , OWeakObject , - SERVICENAME_POPUPMENUCONTROLLER , + SERVICENAME_POPUPMENUCONTROLLER , IMPLEMENTATIONNAME_HEADERMENUCONTROLLER ) @@ -111,18 +111,18 @@ void HeaderMenuController::fillPopupMenu( const Reference< ::com::sun::star::fra { VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( rPopupMenu ); PopupMenu* pVCLPopupMenu = 0; - + vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); - + resetPopupMenu( rPopupMenu ); if ( pPopupMenu ) pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu(); - + Reference< XStyleFamiliesSupplier > xStyleFamiliesSupplier( rModel, UNO_QUERY ); if ( pVCLPopupMenu && xStyleFamiliesSupplier.is()) { Reference< XNameAccess > xStyleFamilies = xStyleFamiliesSupplier->getStyleFamilies(); - + rtl::OUString aCmd( RTL_CONSTASCII_USTRINGPARAM( ".uno:InsertPageHeader" )); rtl::OUString aHeaderFooterIsOnStr(RTL_CONSTASCII_USTRINGPARAM( "HeaderIsOn" )); if ( m_bFooter ) @@ -132,7 +132,7 @@ void HeaderMenuController::fillPopupMenu( const Reference< ::com::sun::star::fra } const rtl::OUString aIsPhysicalStr( RTL_CONSTASCII_USTRINGPARAM( "IsPhysical" )); const rtl::OUString aDisplayNameStr( RTL_CONSTASCII_USTRINGPARAM( "DisplayName" )); - + try { Reference< XNameContainer > xNameContainer; @@ -158,8 +158,8 @@ void HeaderMenuController::fillPopupMenu( const Reference< ::com::sun::star::fra rtl::OUString aDisplayName; sal_Bool bHeaderIsOn( sal_False ); xPropSet->getPropertyValue( aDisplayNameStr ) >>= aDisplayName; - xPropSet->getPropertyValue( aHeaderFooterIsOnStr ) >>= bHeaderIsOn; - + xPropSet->getPropertyValue( aHeaderFooterIsOnStr ) >>= bHeaderIsOn; + rtl::OUStringBuffer aStrBuf( aCmd ); aStrBuf.appendAscii( "?PageStyle:string="); aStrBuf.append( aDisplayName ); @@ -175,13 +175,13 @@ void HeaderMenuController::fillPopupMenu( const Reference< ::com::sun::star::fra bFirstItemInserted = sal_True; bFirstChecked = bHeaderIsOn; } - + pVCLPopupMenu->SetItemCommand( nId, aCommand ); if ( bHeaderIsOn ) pVCLPopupMenu->CheckItem( nId, sal_True ); ++nId; - + // Check if all entries have the same state if( bAllOneState && n && bHeaderIsOn != bLastCheck ) bAllOneState = FALSE; @@ -198,7 +198,7 @@ void HeaderMenuController::fillPopupMenu( const Reference< ::com::sun::star::fra rtl::OUStringBuffer aStrBuf( aCmd ); aStrBuf.appendAscii( "?On:bool=" ); - + // Command depends on check state of first menu item entry if ( !bFirstChecked ) aStrBuf.appendAscii( "true" ); @@ -225,7 +225,7 @@ void SAL_CALL HeaderMenuController::disposing( const EventObject& ) throw ( Runt m_xFrame.clear(); m_xDispatch.clear(); m_xServiceManager.clear(); - + if ( m_xPopupMenu.is() ) m_xPopupMenu->removeMenuListener( Reference< css::awt::XMenuListener >(( OWeakObject *)this, UNO_QUERY )); m_xPopupMenu.clear(); @@ -248,7 +248,7 @@ void SAL_CALL HeaderMenuController::statusChanged( const FeatureStateEvent& Even // XMenuListener void HeaderMenuController::impl_select(const Reference< XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aTargetURL) { - Sequence<PropertyValue> aArgs; + Sequence<PropertyValue> aArgs; if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(m_bFooter ? "FooterMenuController" : "HeaderMenuController"))).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs); OSL_ENSURE(_xDispatch.is(),"HeaderMenuController::impl_select: No dispatch"); @@ -259,15 +259,15 @@ void HeaderMenuController::impl_select(const Reference< XDispatch >& _xDispatch, void SAL_CALL HeaderMenuController::updatePopupMenu() throw (::com::sun::star::uno::RuntimeException) { osl::ResettableMutexGuard aLock( m_aMutex ); - + throwIfDisposed(); Reference< com::sun::star::frame::XModel > xModel( m_xModel ); aLock.clear(); - + if ( !xModel.is() ) svt::PopupMenuControllerBase::updatePopupMenu(); - + aLock.reset(); if ( m_xPopupMenu.is() && m_xModel.is() ) fillPopupMenu( m_xModel, m_xPopupMenu ); diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx index 0100618dd58b..5126ffdd253a 100644 --- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ #endif //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <classes/addonsoptions.hxx> #ifndef __FRAMEWORK_TOOLBAR_HXX_ @@ -41,7 +41,7 @@ #endif //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> @@ -52,7 +52,7 @@ #include "com/sun/star/beans/XPropertySet.hpp" //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <rtl/uri.hxx> diff --git a/framework/source/uielement/itemcontainer.cxx b/framework/source/uielement/itemcontainer.cxx index d1358e54a4c0..943a5abe2f03 100644 --- a/framework/source/uielement/itemcontainer.cxx +++ b/framework/source/uielement/itemcontainer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,14 +28,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <uielement/itemcontainer.hxx> #include <uielement/constitemcontainer.hxx> #include <threadhelp/resetableguard.hxx> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ using namespace cppu; @@ -50,10 +50,10 @@ namespace framework { //***************************************************************************************************************** -// XInterface, XTypeProvider +// XInterface, XTypeProvider //***************************************************************************************************************** -ItemContainer::ItemContainer( const ShareableMutex& rMutex ) : +ItemContainer::ItemContainer( const ShareableMutex& rMutex ) : m_aShareMutex( rMutex ) { } @@ -64,7 +64,7 @@ ItemContainer::ItemContainer( const ConstItemContainer& rConstItemContainer, con copyItemContainer( rConstItemContainer.m_aItemVector, rMutex ); } -ItemContainer::ItemContainer( const Reference< XIndexAccess >& rSourceContainer, const ShareableMutex& rMutex ) : +ItemContainer::ItemContainer( const Reference< XIndexAccess >& rSourceContainer, const ShareableMutex& rMutex ) : m_aShareMutex( rMutex ) { if ( rSourceContainer.is() ) diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx index 22154db37252..651c9bbfdc86 100644 --- a/framework/source/uielement/langselectionmenucontroller.cxx +++ b/framework/source/uielement/langselectionmenucontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,13 +31,13 @@ #include <uielement/langselectionmenucontroller.hxx> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> #include "services.h" //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -45,7 +45,7 @@ #include <com/sun/star/frame/XDispatchProvider.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #ifndef _VCL_MENU_HXX_ @@ -83,7 +83,7 @@ #include <set> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ // using namespace ::com::sun::star; @@ -98,9 +98,9 @@ using ::rtl::OUString; namespace framework { -DEFINE_XSERVICEINFO_MULTISERVICE ( LanguageSelectionMenuController , +DEFINE_XSERVICEINFO_MULTISERVICE ( LanguageSelectionMenuController , OWeakObject , - SERVICENAME_POPUPMENUCONTROLLER , + SERVICENAME_POPUPMENUCONTROLLER , IMPLEMENTATIONNAME_LANGUAGESELECTIONMENUCONTROLLER ) @@ -161,7 +161,7 @@ void SAL_CALL LanguageSelectionMenuController::statusChanged( const FeatureState } else if ( !Event.State.hasValue() ) { - m_bShowMenu = sal_False; // no language -> no sub-menu entries -> disable menu + m_bShowMenu = sal_False; // no language -> no sub-menu entries -> disable menu } } @@ -171,15 +171,15 @@ void LanguageSelectionMenuController::impl_select(const Reference< XDispatch >& Reference< XDispatch > xDispatch = _xDispatch; if ( aTargetURL.Complete == m_aMenuCommandURL_Font ) - { //open format/character dialog for current selection + { //open format/character dialog for current selection xDispatch = m_xMenuDispatch_Font; } else if ( aTargetURL.Complete == m_aMenuCommandURL_Lang ) - { //open language tab-page in tools/options dialog + { //open language tab-page in tools/options dialog xDispatch = m_xMenuDispatch_Lang; } else if ( aTargetURL.Complete == m_aMenuCommandURL_CharDlgForParagraph ) - { //open format/character dialog for current selection + { //open format/character dialog for current selection xDispatch = m_xMenuDispatch_CharDlgForParagraph; } @@ -191,8 +191,8 @@ void LanguageSelectionMenuController::impl_select(const Reference< XDispatch >& } if ( xDispatch.is() ) - { - Sequence<PropertyValue> aArgs; + { + Sequence<PropertyValue> aArgs; if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# UiEventLogHelper( OUString::createFromAscii("LanguageSelectionMenuController")).log( m_xServiceManager, m_xFrame, aTargetURL, aArgs ); xDispatch->dispatch( aTargetURL, aArgs ); @@ -264,7 +264,7 @@ void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopup // get languages to be displayed in the menu std::set< OUString > aLangItems; - FillLangItems( aLangItems, aLanguageTable, m_xFrame, m_aLangGuessHelper, + FillLangItems( aLangItems, aLanguageTable, m_xFrame, m_aLangGuessHelper, m_nScriptType, m_aCurLang, m_aKeyboardLang, m_aGuessedTextLang ); // @@ -366,9 +366,9 @@ void SAL_CALL LanguageSelectionMenuController::initialize( const Sequence< Any > if ( m_bInitialized ) { - m_aLangStatusCommandURL = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:LanguageStatus" )); - m_aMenuCommandURL_Lang = m_aLangStatusCommandURL; - m_aMenuCommandURL_Font = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontDialog" )); + m_aLangStatusCommandURL = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:LanguageStatus" )); + m_aMenuCommandURL_Lang = m_aLangStatusCommandURL; + m_aMenuCommandURL_Font = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontDialog" )); m_aMenuCommandURL_CharDlgForParagraph = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontDialogForParagraph" )); } } diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx index cc408eb6f263..021ee4e8f8df 100644 --- a/framework/source/uielement/langselectionstatusbarcontroller.cxx +++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -92,9 +92,9 @@ namespace framework //////////////////////////////////////////////////////////// -DEFINE_XSERVICEINFO_MULTISERVICE ( LangSelectionStatusbarController , +DEFINE_XSERVICEINFO_MULTISERVICE ( LangSelectionStatusbarController , OWeakObject , - SERVICENAME_STATUSBARCONTROLLER , + SERVICENAME_STATUSBARCONTROLLER , IMPLEMENTATIONNAME_LANGSELECTIONSTATUSBARCONTROLLER ) @@ -199,10 +199,10 @@ throw (::com::sun::star::uno::RuntimeException) Reference< awt::XPopupMenu > subPopupMenu(m_xServiceManager->createInstance( s_sPopupMenu ), UNO_QUERY ); SvtLanguageTable aLanguageTable; - + // get languages to be displayed in the menu std::set< OUString > aLangItems; - FillLangItems( aLangItems, aLanguageTable, m_xFrame, m_aLangGuessHelper, + FillLangItems( aLangItems, aLanguageTable, m_xFrame, m_aLangGuessHelper, m_nScriptType, m_aCurLang, m_aKeyboardLang, m_aGuessedTextLang ); // @@ -431,7 +431,7 @@ throw ( RuntimeException ) else if ( !Event.State.hasValue() ) { pStatusBar->SetItemText( m_nID, String() ); - m_bShowMenu = sal_False; // no language -> no menu + m_bShowMenu = sal_False; // no language -> no menu } } } diff --git a/framework/source/uielement/logoimagestatusbarcontroller.cxx b/framework/source/uielement/logoimagestatusbarcontroller.cxx index 602d2dc6dd4c..10dc8489e592 100644 --- a/framework/source/uielement/logoimagestatusbarcontroller.cxx +++ b/framework/source/uielement/logoimagestatusbarcontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,9 +50,9 @@ using namespace ::com::sun::star::frame; namespace framework { -DEFINE_XSERVICEINFO_MULTISERVICE ( LogoImageStatusbarController , +DEFINE_XSERVICEINFO_MULTISERVICE ( LogoImageStatusbarController , OWeakObject , - SERVICENAME_STATUSBARCONTROLLER , + SERVICENAME_STATUSBARCONTROLLER , IMPLEMENTATIONNAME_LOGOIMAGESTATUSBARCONTROLLER ) @@ -85,12 +85,12 @@ void SAL_CALL LogoImageStatusbarController::release() throw () { svt::StatusbarController::release(); } - -void SAL_CALL LogoImageStatusbarController::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) + +void SAL_CALL LogoImageStatusbarController::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); - + vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + svt::StatusbarController::initialize( aArguments ); } @@ -100,14 +100,14 @@ throw (::com::sun::star::uno::RuntimeException) { svt::StatusbarController::dispose(); } - + // XEventListener void SAL_CALL LogoImageStatusbarController::disposing( const EventObject& Source ) throw ( RuntimeException ) { svt::StatusbarController::disposing( Source ); } - + // XStatusListener void SAL_CALL LogoImageStatusbarController::statusChanged( const FeatureStateEvent& ) throw ( RuntimeException ) diff --git a/framework/source/uielement/logotextstatusbarcontroller.cxx b/framework/source/uielement/logotextstatusbarcontroller.cxx index 925127fc0316..606c644eeba9 100644 --- a/framework/source/uielement/logotextstatusbarcontroller.cxx +++ b/framework/source/uielement/logotextstatusbarcontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,9 +51,9 @@ using namespace ::com::sun::star::frame; namespace framework { -DEFINE_XSERVICEINFO_MULTISERVICE ( LogoTextStatusbarController , +DEFINE_XSERVICEINFO_MULTISERVICE ( LogoTextStatusbarController , OWeakObject , - SERVICENAME_STATUSBARCONTROLLER , + SERVICENAME_STATUSBARCONTROLLER , IMPLEMENTATIONNAME_LOGOTEXTSTATUSBARCONTROLLER ) @@ -85,12 +85,12 @@ void SAL_CALL LogoTextStatusbarController::release() throw () { svt::StatusbarController::release(); } - -void SAL_CALL LogoTextStatusbarController::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) + +void SAL_CALL LogoTextStatusbarController::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); - + vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + svt::StatusbarController::initialize( aArguments ); if ( m_xParentWindow.is() && m_nID > 0 ) @@ -110,14 +110,14 @@ throw (::com::sun::star::uno::RuntimeException) { svt::StatusbarController::dispose(); } - + // XEventListener void SAL_CALL LogoTextStatusbarController::disposing( const EventObject& Source ) throw ( RuntimeException ) { svt::StatusbarController::disposing( Source ); } - + // XStatusListener void SAL_CALL LogoTextStatusbarController::statusChanged( const FeatureStateEvent& ) throw ( RuntimeException ) diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx index 7c82e2e8257a..30b0fe5fec1c 100644 --- a/framework/source/uielement/macrosmenucontroller.cxx +++ b/framework/source/uielement/macrosmenucontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,10 +61,10 @@ using namespace ::com::sun::star::frame; namespace framework { -class -DEFINE_XSERVICEINFO_MULTISERVICE ( MacrosMenuController , +class +DEFINE_XSERVICEINFO_MULTISERVICE ( MacrosMenuController , OWeakObject , - SERVICENAME_POPUPMENUCONTROLLER , + SERVICENAME_POPUPMENUCONTROLLER , IMPLEMENTATIONNAME_MACROSMENUCONTROLLER ) @@ -86,16 +86,16 @@ void MacrosMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPo { VCLXPopupMenu* pVCLPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( rPopupMenu ); PopupMenu* pPopupMenu = 0; - + vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); - + resetPopupMenu( rPopupMenu ); if ( pVCLPopupMenu ) pPopupMenu = (PopupMenu *)pVCLPopupMenu->GetMenu(); if (!pPopupMenu) return; - + // insert basic String aCommand = String::CreateFromAscii( ".uno:MacroDialog" ); String aDisplayName = RetrieveLabelFromCommand( aCommand ); @@ -118,7 +118,7 @@ void SAL_CALL MacrosMenuController::disposing( const EventObject& ) throw ( Runt m_xFrame.clear(); m_xDispatch.clear(); m_xServiceManager.clear(); - + if ( m_xPopupMenu.is() ) { m_xPopupMenu->removeMenuListener( Reference< css::awt::XMenuListener >(( OWeakObject *)this, UNO_QUERY )); @@ -149,11 +149,11 @@ void MacrosMenuController::impl_select(const Reference< XDispatch >& /*_xDispatc ExecuteInfo* pExecuteInfo = new ExecuteInfo; pExecuteInfo->xDispatch = xDispatch; pExecuteInfo->aTargetURL = aTargetURL; - //pExecuteInfo->aArgs = aArgs; + //pExecuteInfo->aArgs = aArgs; if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# UiEventLogHelper(::rtl::OUString::createFromAscii("MacrosMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, pExecuteInfo->aArgs); // xDispatch->dispatch( aTargetURL, aArgs ); - Application::PostUserEvent( STATIC_LINK(0, MacrosMenuController , ExecuteHdl_Impl), pExecuteInfo ); + Application::PostUserEvent( STATIC_LINK(0, MacrosMenuController , ExecuteHdl_Impl), pExecuteInfo ); } else { @@ -175,7 +175,7 @@ IMPL_STATIC_LINK_NOINSTANCE( MacrosMenuController, ExecuteHdl_Impl, ExecuteInfo* } delete pExecuteInfo; return 0; -} +} String MacrosMenuController::RetrieveLabelFromCommand( const String& aCmdURL ) { @@ -190,7 +190,7 @@ void MacrosMenuController::addScriptItems( PopupMenu* pPopupMenu, USHORT startIt const ::rtl::OUString providerKey = ::rtl::OUString::createFromAscii("com.sun.star.script.provider.ScriptProviderFor" ); const ::rtl::OUString languageProviderName = - ::rtl::OUString::createFromAscii("com.sun.star.script.provider.LanguageScriptProvider" ); + ::rtl::OUString::createFromAscii("com.sun.star.script.provider.LanguageScriptProvider" ); USHORT itemId = startItemId; Reference< XContentEnumerationAccess > xEnumAccess = Reference< XContentEnumerationAccess >( m_xServiceManager, UNO_QUERY_THROW ); Reference< XEnumeration > xEnum = xEnumAccess->createContentEnumeration ( languageProviderName ); @@ -203,7 +203,7 @@ void MacrosMenuController::addScriptItems( PopupMenu* pPopupMenu, USHORT startIt break; } Sequence< ::rtl::OUString > serviceNames = xServiceInfo->getSupportedServiceNames(); - + if ( serviceNames.getLength() > 0 ) { for ( sal_Int32 index = 0; index < serviceNames.getLength(); index++ ) diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index b76ab6f697e6..9d8aa9205c90 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,7 +30,7 @@ //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <uielement/menubarmanager.hxx> #include <xml/menuconfiguration.hxx> @@ -48,7 +48,7 @@ #include <services.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -75,7 +75,7 @@ #include <com/sun/star/frame/status/Visibility.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <comphelper/processfactory.hxx> #include <comphelper/extract.hxx> @@ -112,7 +112,7 @@ struct SystemMenuData }; //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ using namespace ::cppu; @@ -165,15 +165,15 @@ namespace framework { // special menu ids/command ids for dynamic popup menus -#define SID_SFX_START 5000 -#define SID_NEWDOCDIRECT (SID_SFX_START + 537) -#define SID_AUTOPILOTMENU (SID_SFX_START + 1381) -#define SID_PICKLIST (SID_SFX_START + 510) -#define SID_MDIWINDOWLIST (SID_SFX_START + 610) -#define SID_ADDONLIST (SID_SFX_START + 1677) -#define SID_HELPMENU (SID_SFX_START + 410) +#define SID_SFX_START 5000 +#define SID_NEWDOCDIRECT (SID_SFX_START + 537) +#define SID_AUTOPILOTMENU (SID_SFX_START + 1381) +#define SID_PICKLIST (SID_SFX_START + 510) +#define SID_MDIWINDOWLIST (SID_SFX_START + 610) +#define SID_ADDONLIST (SID_SFX_START + 1677) +#define SID_HELPMENU (SID_SFX_START + 410) -#define SFX_REFERER_USER "private:user" +#define SFX_REFERER_USER "private:user" const ::rtl::OUString aCmdHelpIndex( RTL_CONSTASCII_USTRINGPARAM( ".uno:HelpIndex" )); const ::rtl::OUString aCmdToolsMenu( RTL_CONSTASCII_USTRINGPARAM( ".uno:ToolsMenu" )); @@ -315,7 +315,7 @@ Any SAL_CALL MenuBarManager::getMenuHandle( const Sequence< sal_Int8 >& /*Proces if ( m_pVCLMenu ) { - OGuard aSolarGuard( Application::GetSolarMutex() ); + OGuard aSolarGuard( Application::GetSolarMutex() ); SystemMenuData aSystemMenuData; aSystemMenuData.nSize = sizeof( SystemMenuData ); @@ -352,7 +352,7 @@ MenuBarManager::~MenuBarManager() void MenuBarManager::Destroy() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::Destroy" ); - OGuard aGuard( Application::GetSolarMutex() ); + OGuard aGuard( Application::GetSolarMutex() ); if ( !m_bDisposed ) { @@ -511,7 +511,7 @@ throw ( RuntimeException ) RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::statusChanged" ); ::rtl::OUString aFeatureURL = Event.FeatureURL.Complete; - OGuard aSolarGuard( Application::GetSolarMutex() ); + OGuard aSolarGuard( Application::GetSolarMutex() ); { ResetableGuard aGuard( m_aLock ); @@ -660,7 +660,7 @@ void MenuBarManager::RemoveListener() if ( pItemHandler->xMenuItemDispatch.is() ) { URL aTargetURL; - aTargetURL.Complete = pItemHandler->aMenuItemURL; + aTargetURL.Complete = pItemHandler->aMenuItemURL; m_xURLTransformer->parseStrict( aTargetURL ); pItemHandler->xMenuItemDispatch->removeStatusListener( @@ -672,7 +672,7 @@ void MenuBarManager::RemoveListener() { { // Remove popup menu from menu structure - OGuard aGuard2( Application::GetSolarMutex() ); + OGuard aGuard2( Application::GetSolarMutex() ); m_pVCLMenu->SetPopupMenu( pItemHandler->nItemId, 0 ); } @@ -749,7 +749,7 @@ void SAL_CALL MenuBarManager::disposing( const EventObject& Source ) throw ( Run { // Release references to the dispatch object URL aTargetURL; - aTargetURL.Complete = pMenuItemDisposing->aMenuItemURL; + aTargetURL.Complete = pMenuItemDisposing->aMenuItemURL; // Check reference of service manager before we use it. Reference could // be cleared due to RemoveListener call! @@ -770,7 +770,7 @@ void SAL_CALL MenuBarManager::disposing( const EventObject& Source ) throw ( Run { // Remove popup menu from menu structure as we release our reference to // the controller. - OGuard aGuard2( Application::GetSolarMutex() ); + OGuard aGuard2( Application::GetSolarMutex() ); m_pVCLMenu->SetPopupMenu( pMenuItemDisposing->nItemId, 0 ); } @@ -847,9 +847,9 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu ) if ( pMenu == m_pVCLMenu ) { // set/unset hiding disabled menu entries - sal_Bool bDontHide = SvtMenuOptions().IsEntryHidingEnabled(); + sal_Bool bDontHide = SvtMenuOptions().IsEntryHidingEnabled(); const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); - sal_Bool bShowMenuImages = rSettings.GetUseImagesInMenus(); + sal_Bool bShowMenuImages = rSettings.GetUseImagesInMenus(); sal_Bool bHasDisabledEntries = SvtCommandOptions().HasEntries( SvtCommandOptions::CMDOPTION_DISABLED ); ResetableGuard aGuard( m_aLock ); @@ -882,10 +882,10 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu ) nSymbolsStyle != m_nSymbolsStyle ) { // The mode changed so we have to replace all images - m_bWasHiContrast = bIsHiContrast; - m_bShowMenuImages = bShowMenuImages; - m_bRetrieveImages = sal_False; - m_nSymbolsStyle = nSymbolsStyle; + m_bWasHiContrast = bIsHiContrast; + m_bShowMenuImages = bShowMenuImages; + m_bRetrieveImages = sal_False; + m_nSymbolsStyle = nSymbolsStyle; MenuManager::FillMenuImages(m_xFrame,pMenu,bIsHiContrast,bShowMenuImages); } @@ -995,7 +995,7 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu ) if ( xMenuItemDispatch.is() ) { pMenuItemHandler->xMenuItemDispatch = xMenuItemDispatch; - pMenuItemHandler->aMenuItemURL = aTargetURL.Complete; + pMenuItemHandler->aMenuItemURL = aTargetURL.Complete; if ( !bPopupMenu ) { @@ -1064,7 +1064,7 @@ IMPL_LINK( MenuBarManager, Deactivate, Menu *, pMenu ) IMPL_LINK( MenuBarManager, AsyncSettingsHdl, Timer*,) { - OGuard aGuard( Application::GetSolarMutex() ); + OGuard aGuard( Application::GetSolarMutex() ); Reference< XInterface > xSelfHold( static_cast< ::cppu::OWeakObject* >( this ), UNO_QUERY_THROW ); @@ -1081,9 +1081,9 @@ IMPL_LINK( MenuBarManager, AsyncSettingsHdl, Timer*,) IMPL_LINK( MenuBarManager, Select, Menu *, pMenu ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::Select" ); - URL aTargetURL; - Sequence<PropertyValue> aArgs; - Reference< XDispatch > xDispatch; + URL aTargetURL; + Sequence<PropertyValue> aArgs; + Reference< XDispatch > xDispatch; { ResetableGuard aGuard( m_aLock ); @@ -1260,18 +1260,18 @@ sal_Bool MenuBarManager::CreatePopupMenuController( MenuItemHandler* pMenuItemHa void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rFrame, const Reference< XDispatchProvider >& rDispatchProvider, const rtl::OUString& rModuleIdentifier, sal_Bool bDelete, sal_Bool bDeleteChildren ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::FillMenuManager" ); - m_xFrame = rFrame; - m_bActive = sal_False; - m_bDeleteMenu = bDelete; - m_bDeleteChildren = bDeleteChildren; - m_pVCLMenu = pMenu; - m_bInitialized = sal_False; - m_bIsBookmarkMenu = sal_False; + m_xFrame = rFrame; + m_bActive = sal_False; + m_bDeleteMenu = bDelete; + m_bDeleteChildren = bDeleteChildren; + m_pVCLMenu = pMenu; + m_bInitialized = sal_False; + m_bIsBookmarkMenu = sal_False; m_xDispatchProvider = rDispatchProvider; const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); - m_bWasHiContrast = rSettings.GetHighContrastMode(); - m_bShowMenuImages = rSettings.GetUseImagesInMenus(); + m_bWasHiContrast = rSettings.GetHighContrastMode(); + m_bShowMenuImages = rSettings.GetUseImagesInMenus(); m_bRetrieveImages = sal_False; sal_Int32 nAddonsURLPrefixLength = ADDONSPOPUPMENU_URL_PREFIX.getLength(); @@ -1291,8 +1291,8 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF aCommand == aSpecialWindowCommand ) { // Retrieve addon popup menus and add them to our menu bar - Reference< com::sun::star::frame::XModel > xModel; - Reference< com::sun::star::frame::XController > xController( rFrame->getController(), UNO_QUERY ); + Reference< com::sun::star::frame::XModel > xModel; + Reference< com::sun::star::frame::XController > xController( rFrame->getController(), UNO_QUERY ); if ( xController.is() ) xModel = Reference< com::sun::star::frame::XModel >( xController->getModel(), UNO_QUERY ); framework::AddonMenuManager::MergeAddonPopupMenus( rFrame, xModel, nPos, (MenuBar *)pMenu ); @@ -1811,7 +1811,7 @@ void MenuBarManager::FillMenu( if ( nStyle & ::com::sun::star::ui::ItemStyle::RADIO_CHECK ) nBits |= MIB_RADIOCHECK; pMenu->SetItemBits( nId, nBits ); - } + } if ( xIndexContainer.is() ) { PopupMenu* pNewPopupMenu = new PopupMenu; @@ -2055,13 +2055,13 @@ USHORT MenuBarManager::FillItemCommand(::rtl::OUString& _rItemCommand,Menu* _pMe void MenuBarManager::Init(const Reference< XFrame >& rFrame,AddonMenu* pAddonMenu,sal_Bool bDelete,sal_Bool bDeleteChildren,bool _bHandlePopUp) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::Init" ); - m_bActive = sal_False; - m_bDeleteMenu = bDelete; - m_bDeleteChildren = bDeleteChildren; - m_pVCLMenu = pAddonMenu; - m_xFrame = rFrame; - m_bInitialized = sal_False; - m_bIsBookmarkMenu = sal_True; + m_bActive = sal_False; + m_bDeleteMenu = bDelete; + m_bDeleteChildren = bDeleteChildren; + m_pVCLMenu = pAddonMenu; + m_xFrame = rFrame; + m_bInitialized = sal_False; + m_bIsBookmarkMenu = sal_True; rtl::OUString aModuleIdentifier; m_xPopupMenuControllerRegistration = Reference< ::com::sun::star::frame::XUIControllerRegistration >( @@ -2069,7 +2069,7 @@ void MenuBarManager::Init(const Reference< XFrame >& rFrame,AddonMenu* pAddonMen UNO_QUERY ); const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); - m_bWasHiContrast = rSettings.GetHighContrastMode(); + m_bWasHiContrast = rSettings.GetHighContrastMode(); Reference< XStatusListener > xStatusListener; Reference< XDispatch > xDispatch; diff --git a/framework/source/uielement/menubarmerger.cxx b/framework/source/uielement/menubarmerger.cxx index 51f87a400a9e..f82253345778 100644 --- a/framework/source/uielement/menubarmerger.cxx +++ b/framework/source/uielement/menubarmerger.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -204,7 +204,7 @@ bool MenuBarMerger::CreateSubMenu( return true; } -bool MenuBarMerger::MergeMenuItems( +bool MenuBarMerger::MergeMenuItems( Menu* pMenu, sal_uInt16 nPos, sal_uInt16 nModIndex, @@ -233,7 +233,7 @@ bool MenuBarMerger::MergeMenuItems( PopupMenu* pSubMenu = new PopupMenu(); pMenu->SetPopupMenu( nItemId, pSubMenu ); ++nItemId; - + CreateSubMenu( pSubMenu, nItemId, rModuleIdentifier, rMenuItem.aSubMenu ); } else @@ -246,11 +246,11 @@ bool MenuBarMerger::MergeMenuItems( return true; } -bool MenuBarMerger::ReplaceMenuItem( - Menu* pMenu, - sal_uInt16 nPos, - sal_uInt16& rItemId, - const ::rtl::OUString& rModuleIdentifier, +bool MenuBarMerger::ReplaceMenuItem( + Menu* pMenu, + sal_uInt16 nPos, + sal_uInt16& rItemId, + const ::rtl::OUString& rModuleIdentifier, const AddonMenuContainer& rAddonMenuItems ) { // There is no replace available. Therfore we first have to @@ -261,15 +261,15 @@ bool MenuBarMerger::ReplaceMenuItem( } bool MenuBarMerger::RemoveMenuItems( - Menu* pMenu, - sal_uInt16 nPos, + Menu* pMenu, + sal_uInt16 nPos, const ::rtl::OUString& rMergeCommandParameter ) { const sal_uInt16 nParam( sal_uInt16( rMergeCommandParameter.toInt32() )); sal_uInt16 nCount( 1 ); - + nCount = std::max( nParam, nCount ); - + sal_uInt16 i = 0; while (( nPos < pMenu->GetItemCount() ) && ( i < nCount )) { @@ -280,8 +280,8 @@ bool MenuBarMerger::RemoveMenuItems( return true; } -bool MenuBarMerger::ProcessMergeOperation( - Menu* pMenu, +bool MenuBarMerger::ProcessMergeOperation( + Menu* pMenu, sal_uInt16 nPos, sal_uInt16& nItemId, const ::rtl::OUString& rMergeCommand, @@ -334,7 +334,7 @@ bool MenuBarMerger::ProcessFallbackOperation( sal_Int32 nLevel( aRefPathInfo.nLevel ); const sal_Int32 nSize( rReferencePath.size() ); bool bFirstLevel( true ); - + while ( nLevel < nSize ) { if ( nLevel == nSize-1 ) @@ -359,10 +359,10 @@ bool MenuBarMerger::ProcessFallbackOperation( else { const ::rtl::OUString aCmd( rReferencePath[nLevel] ); - + sal_uInt16 nInsPos( MENU_APPEND ); PopupMenu* pPopupMenu( new PopupMenu ); - + if ( bFirstLevel && ( aRefPathInfo.eResult == RP_MENUITEM_INSTEAD_OF_POPUPMENU_FOUND )) { // special case: menu item without popup @@ -371,14 +371,14 @@ bool MenuBarMerger::ProcessFallbackOperation( pCurrMenu->SetItemCommand( nSetItemId, aCmd ); pCurrMenu->SetPopupMenu( nSetItemId, pPopupMenu ); } - else + else { // normal case: insert a new item with popup pCurrMenu->InsertItem( rItemId, ::rtl::OUString(), 0, MENU_APPEND ); pCurrMenu->SetItemCommand( rItemId, aCmd ); pCurrMenu->SetPopupMenu( rItemId, pPopupMenu ); } - + pCurrMenu = pPopupMenu; ++rItemId; bFirstLevel = false; @@ -391,13 +391,13 @@ bool MenuBarMerger::ProcessFallbackOperation( return false; } -void MenuBarMerger::GetMenuEntry( +void MenuBarMerger::GetMenuEntry( const uno::Sequence< beans::PropertyValue >& rAddonMenuEntry, AddonMenuItem& rAddonMenuItem ) { // Reset submenu member rAddonMenuItem.aSubMenu.clear(); - + for ( sal_Int32 i = 0; i < rAddonMenuEntry.getLength(); i++ ) { ::rtl::OUString aMenuEntryPropName = rAddonMenuEntry[i].Name; @@ -425,14 +425,14 @@ void MenuBarMerger::GetSubMenu( AddonMenuContainer& rSubMenu ) { rSubMenu.clear(); - + const sal_Int32 nCount = rSubMenuEntries.getLength(); rSubMenu.reserve(rSubMenu.size() + nCount); for ( sal_Int32 i = 0; i < nCount; i++ ) { const uno::Sequence< beans::PropertyValue >& rMenuEntry = rSubMenuEntries[ i ]; - AddonMenuItem aMenuItem; + AddonMenuItem aMenuItem; GetMenuEntry( rMenuEntry, aMenuItem ); rSubMenu.push_back( aMenuItem ); } diff --git a/framework/source/uielement/menubarwrapper.cxx b/framework/source/uielement/menubarwrapper.cxx index 44e133934c9a..da3092c2c725 100644 --- a/framework/source/uielement/menubarwrapper.cxx +++ b/framework/source/uielement/menubarwrapper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <uielement/menubarwrapper.hxx> #include <threadhelp/resetableguard.hxx> @@ -37,7 +37,7 @@ #include <services.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -49,7 +49,7 @@ #include <com/sun/star/frame/XModuleManager.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <comphelper/processfactory.hxx> #include <tools/solar.h> @@ -70,7 +70,7 @@ namespace framework { //***************************************************************************************************************** -// XInterface, XTypeProvider +// XInterface, XTypeProvider //***************************************************************************************************************** DEFINE_XINTERFACE_11 ( MenuBarWrapper , UIConfigElementWrapperBase , diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx index fd04594c4ecc..786795ff1d14 100644 --- a/framework/source/uielement/newmenucontroller.cxx +++ b/framework/source/uielement/newmenucontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,7 +30,7 @@ #include <uielement/newmenucontroller.hxx> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> #include "services.h" @@ -43,7 +43,7 @@ #include <xml/menuconfiguration.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -55,7 +55,7 @@ #include <com/sun/star/document/CorruptedFilterConfigurationException.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> #include <vcl/i18nhelp.hxx> @@ -70,7 +70,7 @@ #include <vos/mutex.hxx> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ // @@ -89,7 +89,7 @@ namespace framework DEFINE_XSERVICEINFO_MULTISERVICE ( NewMenuController , OWeakObject , - SERVICENAME_POPUPMENUCONTROLLER , + SERVICENAME_POPUPMENUCONTROLLER , IMPLEMENTATIONNAME_NEWMENUCONTROLLER ) diff --git a/framework/source/uielement/objectmenucontroller.cxx b/framework/source/uielement/objectmenucontroller.cxx index 5c06d1b7a179..80dccb76db05 100644 --- a/framework/source/uielement/objectmenucontroller.cxx +++ b/framework/source/uielement/objectmenucontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,13 +30,13 @@ #include <uielement/objectmenucontroller.hxx> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> #include "services.h" //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -48,7 +48,7 @@ #endif //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #ifndef _VCL_MENU_HXX_ @@ -62,7 +62,7 @@ #include <vos/mutex.hxx> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ // @@ -75,9 +75,9 @@ using namespace com::sun::star::util; namespace framework { -DEFINE_XSERVICEINFO_MULTISERVICE ( ObjectMenuController , +DEFINE_XSERVICEINFO_MULTISERVICE ( ObjectMenuController , OWeakObject , - SERVICENAME_POPUPMENUCONTROLLER , + SERVICENAME_POPUPMENUCONTROLLER , IMPLEMENTATIONNAME_OBJECTMENUCONTROLLER ) @@ -155,7 +155,7 @@ void SAL_CALL ObjectMenuController::statusChanged( const FeatureStateEvent& Even // XMenuListener void ObjectMenuController::impl_select(const Reference< XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aTargetURL) { - Sequence<PropertyValue> aArgs; + Sequence<PropertyValue> aArgs; if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# UiEventLogHelper(::rtl::OUString::createFromAscii("ObjectMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs); OSL_ENSURE(_xDispatch.is(),"ObjectMenuController::impl_select: No dispatch"); diff --git a/framework/source/uielement/popupmenucontroller.cxx b/framework/source/uielement/popupmenucontroller.cxx index 5f6e21c22ee8..328777db2b79 100644 --- a/framework/source/uielement/popupmenucontroller.cxx +++ b/framework/source/uielement/popupmenucontroller.cxx @@ -59,7 +59,7 @@ namespace framework DEFINE_XSERVICEINFO_MULTISERVICE ( PopupMenuController , OWeakObject , - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController" ) ) , + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController" ) ) , ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.framework.PopupMenuController" ) ) ) @@ -93,7 +93,7 @@ Any SAL_CALL PopupMenuController::queryInterface( const Type& aType ) throw (Ru Any a( ToolboxController::queryInterface( aType ) ); if ( a.hasValue() ) return a; - + return ::cppu::queryInterface( aType, static_cast< lang::XServiceInfo* >( this )); } @@ -137,7 +137,7 @@ void SAL_CALL PopupMenuController::dispose() throw (RuntimeException) void SAL_CALL PopupMenuController::statusChanged( const frame::FeatureStateEvent& rEvent ) throw ( RuntimeException ) { svt::ToolboxController::statusChanged(rEvent); - enable( rEvent.IsEnabled ); + enable( rEvent.IsEnabled ); } // -------------------------------------------------------------------- diff --git a/framework/source/uielement/progressbarwrapper.cxx b/framework/source/uielement/progressbarwrapper.cxx index 5693bd6346ab..a20f107ea22e 100644 --- a/framework/source/uielement/progressbarwrapper.cxx +++ b/framework/source/uielement/progressbarwrapper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,41 +33,41 @@ #endif //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <helper/statusindicator.hxx> #include <threadhelp/resetableguard.hxx> #include <uielement/statusindicatorinterfacewrapper.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/ui/UIElementType.hpp> #include <com/sun/star/lang/DisposedException.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> #include <toolkit/helper/vclunohelper.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ using namespace ::com::sun::star; namespace framework{ //_________________________________________________________________________________________________________________ -// non exported const +// non exported const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// non exported definitions +// non exported definitions //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ ProgressBarWrapper::ProgressBarWrapper() : @@ -120,7 +120,7 @@ uno::Reference< awt::XWindow > ProgressBarWrapper::getStatusBar() const } // wrapped methods of ::com::sun::star::task::XStatusIndicator -void ProgressBarWrapper::start( const ::rtl::OUString& Text, ::sal_Int32 Range ) +void ProgressBarWrapper::start( const ::rtl::OUString& Text, ::sal_Int32 Range ) throw (uno::RuntimeException) { uno::Reference< awt::XWindow > xWindow; @@ -131,7 +131,7 @@ throw (uno::RuntimeException) if ( m_bDisposed ) return; - + xWindow = m_xStatusBar; m_nValue = 0; m_nRange = Range; @@ -152,7 +152,7 @@ throw (uno::RuntimeException) pStatusBar->SetUpdateMode( FALSE ); pStatusBar->EndProgressMode(); pStatusBar->StartProgressMode( Text ); - pStatusBar->SetProgressValue( USHORT( nValue )); + pStatusBar->SetProgressValue( USHORT( nValue )); pStatusBar->SetUpdateMode( TRUE ); } pStatusBar->Show( TRUE, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE ); @@ -160,7 +160,7 @@ throw (uno::RuntimeException) } } -void ProgressBarWrapper::end() +void ProgressBarWrapper::end() throw (uno::RuntimeException) { uno::Reference< awt::XWindow > xWindow; @@ -170,7 +170,7 @@ throw (uno::RuntimeException) if ( m_bDisposed ) return; - + xWindow = m_xStatusBar; m_nRange = 100; m_nValue = 0; @@ -189,7 +189,7 @@ throw (uno::RuntimeException) } } -void ProgressBarWrapper::setText( const ::rtl::OUString& Text ) +void ProgressBarWrapper::setText( const ::rtl::OUString& Text ) throw (uno::RuntimeException) { uno::Reference< awt::XWindow > xWindow; @@ -200,7 +200,7 @@ throw (uno::RuntimeException) if ( m_bDisposed ) return; - + xWindow = m_xStatusBar; m_aText = Text; nValue = m_nValue; @@ -218,7 +218,7 @@ throw (uno::RuntimeException) pStatusBar->SetUpdateMode( FALSE ); pStatusBar->EndProgressMode(); pStatusBar->StartProgressMode( Text ); - pStatusBar->SetProgressValue( USHORT( nValue )); + pStatusBar->SetProgressValue( USHORT( nValue )); pStatusBar->SetUpdateMode( TRUE ); } else @@ -227,7 +227,7 @@ throw (uno::RuntimeException) } } -void ProgressBarWrapper::setValue( ::sal_Int32 nValue ) +void ProgressBarWrapper::setValue( ::sal_Int32 nValue ) throw (uno::RuntimeException) { uno::Reference< awt::XWindow > xWindow; @@ -239,7 +239,7 @@ throw (uno::RuntimeException) if ( m_bDisposed ) return; - + xWindow = m_xStatusBar; double fVal( 0 ); @@ -248,7 +248,7 @@ throw (uno::RuntimeException) fVal = ( double( nValue ) / double( m_nRange )) * 100; fVal = std::max( double( 0 ), std::min( fVal, double( 100 ))); } - + if ( m_nValue != sal_Int32( fVal )) { m_nValue = sal_Int32( fVal ); @@ -273,7 +273,7 @@ throw (uno::RuntimeException) } } -void ProgressBarWrapper::reset() +void ProgressBarWrapper::reset() throw (uno::RuntimeException) { setText( rtl::OUString() ); @@ -281,30 +281,30 @@ throw (uno::RuntimeException) } // XInitialization -void SAL_CALL ProgressBarWrapper::initialize( const uno::Sequence< uno::Any >& ) +void SAL_CALL ProgressBarWrapper::initialize( const uno::Sequence< uno::Any >& ) throw (uno::Exception, uno::RuntimeException) { // dummy - do nothing } // XUpdatable -void SAL_CALL ProgressBarWrapper::update() +void SAL_CALL ProgressBarWrapper::update() throw (uno::RuntimeException) { // dummy - do nothing } // XComponent -void SAL_CALL ProgressBarWrapper::dispose() +void SAL_CALL ProgressBarWrapper::dispose() throw (uno::RuntimeException) { - uno::Reference< lang::XComponent > xThis( - static_cast< cppu::OWeakObject* >(this), + uno::Reference< lang::XComponent > xThis( + static_cast< cppu::OWeakObject* >(this), uno::UNO_QUERY ); { ResetableGuard aLock( m_aLock ); - + if ( m_bDisposed ) return; } @@ -312,7 +312,7 @@ throw (uno::RuntimeException) { lang::EventObject aEvent( xThis ); m_aListenerContainer.disposeAndClear( aEvent ); - + ResetableGuard aLock( m_aLock ); if ( m_bOwnsInstance ) { @@ -326,14 +326,14 @@ throw (uno::RuntimeException) { } } - + m_xStatusBar.clear(); m_bDisposed = sal_True; } } // XUIElement -uno::Reference< uno::XInterface > SAL_CALL ProgressBarWrapper::getRealInterface() +uno::Reference< uno::XInterface > SAL_CALL ProgressBarWrapper::getRealInterface() throw (uno::RuntimeException) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ @@ -347,19 +347,19 @@ throw (uno::RuntimeException) uno::Reference< uno::XInterface > xComp( m_xProgressBarIfacWrapper ); if ( !xComp.is() ) { - StatusIndicatorInterfaceWrapper* pWrapper = - new StatusIndicatorInterfaceWrapper( - uno::Reference< lang::XComponent >( - static_cast< cppu::OWeakObject* >( this ), + StatusIndicatorInterfaceWrapper* pWrapper = + new StatusIndicatorInterfaceWrapper( + uno::Reference< lang::XComponent >( + static_cast< cppu::OWeakObject* >( this ), uno::UNO_QUERY )); xComp = uno::Reference< uno::XInterface >( - static_cast< cppu::OWeakObject* >( pWrapper ), + static_cast< cppu::OWeakObject* >( pWrapper ), uno::UNO_QUERY ); m_xProgressBarIfacWrapper = xComp; } - + return xComp; } } -} // namespace framework +} // namespace framework diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx index a61cbf882393..2e36a319efb6 100644 --- a/framework/source/uielement/recentfilesmenucontroller.cxx +++ b/framework/source/uielement/recentfilesmenucontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,7 +30,7 @@ #include <uielement/recentfilesmenucontroller.hxx> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> #include "services.h" @@ -41,14 +41,14 @@ #include <classes/fwkresid.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/awt/MenuItemStyle.hpp> #include <com/sun/star/util/XStringWidth.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #ifndef _VCL_MENU_HXX_ @@ -71,7 +71,7 @@ #include <vos/mutex.hxx> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ // @@ -103,7 +103,7 @@ class RecentFilesStringLength : public ::cppu::WeakImplHelper1< ::com::sun::star DEFINE_XSERVICEINFO_MULTISERVICE ( RecentFilesMenuController , OWeakObject , - SERVICENAME_POPUPMENUCONTROLLER , + SERVICENAME_POPUPMENUCONTROLLER , IMPLEMENTATIONNAME_RECENTFILESMENUCONTROLLER ) @@ -194,10 +194,10 @@ void RecentFilesMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu > } // Abbreviate URL - rtl::OUString aURLString( aCmdPrefix + rtl::OUString::valueOf( sal_Int32( i ))); - rtl::OUString aTipHelpText; - rtl::OUString aMenuTitle; - INetURLObject aURL( m_aRecentFilesItems[i].aURL ); + rtl::OUString aURLString( aCmdPrefix + rtl::OUString::valueOf( sal_Int32( i ))); + rtl::OUString aTipHelpText; + rtl::OUString aMenuTitle; + INetURLObject aURL( m_aRecentFilesItems[i].aURL ); if ( aURL.GetProtocol() == INET_PROT_FILE ) { @@ -205,8 +205,8 @@ void RecentFilesMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu > // path and abbreviate it with a special function: String aFileSystemPath( aURL.getFSysPath( INetURLObject::FSYS_DETECT ) ); - ::rtl::OUString aSystemPath( aFileSystemPath ); - ::rtl::OUString aCompactedSystemPath; + ::rtl::OUString aSystemPath( aFileSystemPath ); + ::rtl::OUString aCompactedSystemPath; aTipHelpText = aSystemPath; oslFileError nError = osl_abbreviateSystemPath( aSystemPath.pData, &aCompactedSystemPath.pData, 46, NULL ); @@ -253,7 +253,7 @@ void RecentFilesMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu > else { // Use INetURLObject to abbreviate all other URLs - String aShortURL; + String aShortURL; aShortURL = aURL.getAbbreviated( xStringLength, 46, INetURLObject::DECODE_UNAMBIGUOUS ); aMenuTitle += aShortURL; aTipHelpText = aURLString; diff --git a/framework/source/uielement/rootitemcontainer.cxx b/framework/source/uielement/rootitemcontainer.cxx index eeeb6216138a..8c81f31f2394 100644 --- a/framework/source/uielement/rootitemcontainer.cxx +++ b/framework/source/uielement/rootitemcontainer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <uielement/rootitemcontainer.hxx> @@ -44,12 +44,12 @@ #include <properties.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/beans/PropertyAttribute.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ using namespace cppu; @@ -68,7 +68,7 @@ namespace framework { //***************************************************************************************************************** -// XInterface, XTypeProvider +// XInterface, XTypeProvider //***************************************************************************************************************** DEFINE_XINTERFACE_10 ( RootItemContainer , OWeakObject , @@ -76,9 +76,9 @@ DEFINE_XINTERFACE_10 ( RootItemContainer DIRECT_INTERFACE( ::com::sun::star::container::XIndexContainer ), DIRECT_INTERFACE( ::com::sun::star::lang::XUnoTunnel ), DIRECT_INTERFACE( ::com::sun::star::lang::XSingleComponentFactory ), - DIRECT_INTERFACE( ::com::sun::star::beans::XMultiPropertySet ), - DIRECT_INTERFACE( ::com::sun::star::beans::XFastPropertySet ), - DIRECT_INTERFACE( ::com::sun::star::beans::XPropertySet ), + DIRECT_INTERFACE( ::com::sun::star::beans::XMultiPropertySet ), + DIRECT_INTERFACE( ::com::sun::star::beans::XFastPropertySet ), + DIRECT_INTERFACE( ::com::sun::star::beans::XPropertySet ), DERIVED_INTERFACE( ::com::sun::star::container::XIndexReplace, com::sun::star::container::XIndexContainer ), DERIVED_INTERFACE( ::com::sun::star::container::XIndexAccess, com::sun::star::container::XIndexReplace ), DERIVED_INTERFACE( ::com::sun::star::container::XElementAccess, ::com::sun::star::container::XIndexAccess ) @@ -348,8 +348,8 @@ sal_Bool SAL_CALL RootItemContainer::convertFastPropertyValue( Any& aConve const Any& aValue ) throw( com::sun::star::lang::IllegalArgumentException ) { - // Initialize state with FALSE !!! - // (Handle can be invalid) + // Initialize state with FALSE !!! + // (Handle can be invalid) sal_Bool bReturn = sal_False; switch( nHandle ) diff --git a/framework/source/uielement/simpletextstatusbarcontroller.cxx b/framework/source/uielement/simpletextstatusbarcontroller.cxx index e5fae0992fa8..4e7855fb4900 100644 --- a/framework/source/uielement/simpletextstatusbarcontroller.cxx +++ b/framework/source/uielement/simpletextstatusbarcontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,9 +51,9 @@ using namespace ::com::sun::star::frame; namespace framework { -DEFINE_XSERVICEINFO_MULTISERVICE ( SimpleTextStatusbarController , +DEFINE_XSERVICEINFO_MULTISERVICE ( SimpleTextStatusbarController , OWeakObject , - SERVICENAME_STATUSBARCONTROLLER , + SERVICENAME_STATUSBARCONTROLLER , IMPLEMENTATIONNAME_SIMPLETEXTSTATUSBARCONTROLLER ) @@ -84,19 +84,19 @@ void SAL_CALL SimpleTextStatusbarController::release() throw () { svt::StatusbarController::release(); } - -void SAL_CALL SimpleTextStatusbarController::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) + +void SAL_CALL SimpleTextStatusbarController::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) { const rtl::OUString aPropValueName( RTL_CONSTASCII_USTRINGPARAM( "Value" )); - - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); - + + vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + svt::StatusbarController::initialize( aArguments ); rtl::OUString aValue; beans::PropertyValue aPropValue; - + // Check arguments for optional "Value" property. We need it // to set our internal simple text. for ( int i = 0; i < aArguments.getLength(); i++ ) @@ -106,8 +106,8 @@ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException aPropValue.Value >>= aValue; break; } - } - + } + m_aText = aValue; if ( m_xParentWindow.is() && m_nID > 0 ) { @@ -126,14 +126,14 @@ throw (::com::sun::star::uno::RuntimeException) { svt::StatusbarController::dispose(); } - + // XEventListener void SAL_CALL SimpleTextStatusbarController::disposing( const EventObject& Source ) throw ( RuntimeException ) { svt::StatusbarController::disposing( Source ); } - + // XStatusListener void SAL_CALL SimpleTextStatusbarController::statusChanged( const FeatureStateEvent& ) throw ( RuntimeException ) diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx index d5d64a32c91e..dad2775dc453 100644 --- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx +++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ #endif //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #ifndef __FRAMEWORK_TOOLBAR_HXX_ @@ -44,7 +44,7 @@ #endif //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> @@ -55,7 +55,7 @@ #include <com/sun/star/frame/XControlNotificationListener.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <svtools/toolboxcontroller.hxx> #include <vos/mutex.hxx> diff --git a/framework/source/uielement/statusbar.cxx b/framework/source/uielement/statusbar.cxx index 502253255c00..132a42456d1e 100644 --- a/framework/source/uielement/statusbar.cxx +++ b/framework/source/uielement/statusbar.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,11 +30,11 @@ #include <uielement/statusbar.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> @@ -42,7 +42,7 @@ namespace framework { -FrameworkStatusBar::FrameworkStatusBar( +FrameworkStatusBar::FrameworkStatusBar( Window* pParent, WinBits nWinBits ) : StatusBar( pParent, nWinBits ), @@ -57,7 +57,7 @@ FrameworkStatusBar::FrameworkStatusBar( FrameworkStatusBar::~FrameworkStatusBar() { } - + void FrameworkStatusBar::SetStatusBarManager( StatusBarManager* pStatusBarManager ) { vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx index 957857fe3ec1..0bbdbc339a34 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/framework/source/uielement/statusbarmanager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ #include <uielement/statusbarmanager.hxx> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> #include <threadhelp/resetableguard.hxx> @@ -46,7 +46,7 @@ #include <helper/mischelper.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XStatusListener.hpp> @@ -59,7 +59,7 @@ #include <com/sun/star/lang/DisposedException.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ @@ -115,12 +115,12 @@ static USHORT impl_convertItemStyleToItemBits( sal_Int16 nStyle ) nItemBits |= SIB_AUTOSIZE; if ( nStyle & css_ui::ItemStyle::OWNER_DRAW ) nItemBits |= SIB_USERDRAW; - + return nItemBits; } - + //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** DEFINE_XINTERFACE_5 ( StatusBarManager , ::cppu::OWeakObject , @@ -132,16 +132,16 @@ DEFINE_XINTERFACE_5 ( StatusBarManager ) DEFINE_XTYPEPROVIDER_5 ( StatusBarManager , - lang::XTypeProvider , + lang::XTypeProvider , lang::XComponent , css::ui::XUIConfigurationListener , frame::XFrameActionListener , lang::XEventListener ) -StatusBarManager::StatusBarManager( - const uno::Reference< lang::XMultiServiceFactory >& rServiceManager, - const uno::Reference< frame::XFrame >& rFrame, +StatusBarManager::StatusBarManager( + const uno::Reference< lang::XMultiServiceFactory >& rServiceManager, + const uno::Reference< frame::XFrame >& rFrame, const rtl::OUString& rResourceName, StatusBar* pStatusBar ) : ThreadHelpBase( &Application::GetSolarMutex() ), @@ -159,8 +159,8 @@ StatusBarManager::StatusBarManager( RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::StatusBarManager" ); if ( m_xServiceManager.is() ) - m_xStatusbarControllerRegistration = uno::Reference< css::frame::XUIControllerRegistration >( - m_xServiceManager->createInstance( SERVICENAME_STATUSBARCONTROLLERFACTORY ), + m_xStatusbarControllerRegistration = uno::Reference< css::frame::XUIControllerRegistration >( + m_xServiceManager->createInstance( SERVICENAME_STATUSBARCONTROLLERFACTORY ), uno::UNO_QUERY ); m_pStatusBar->SetClickHdl( LINK( this, StatusBarManager, Click ) ); @@ -177,7 +177,7 @@ StatusBar* StatusBarManager::GetStatusBar() const ResetableGuard aGuard( m_aLock ); return m_pStatusBar; } - + void StatusBarManager::frameAction( const frame::FrameActionEvent& Action ) throw ( uno::RuntimeException ) { @@ -202,7 +202,7 @@ void SAL_CALL StatusBarManager::disposing( const lang::EventObject& Source ) thr ResetableGuard aGuard( m_aLock ); if ( Source.Source == uno::Reference< uno::XInterface >( m_xFrame, uno::UNO_QUERY )) m_xFrame.clear(); - + m_xServiceManager.clear(); } } @@ -211,18 +211,18 @@ void SAL_CALL StatusBarManager::disposing( const lang::EventObject& Source ) thr void SAL_CALL StatusBarManager::dispose() throw( uno::RuntimeException ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::dispose" ); - uno::Reference< lang::XComponent > xThis( + uno::Reference< lang::XComponent > xThis( static_cast< OWeakObject* >(this), uno::UNO_QUERY ); lang::EventObject aEvent( xThis ); m_aListenerContainer.disposeAndClear( aEvent ); - + { ResetableGuard aGuard( m_aLock ); if ( !m_bDisposed ) { RemoveControllers(); - + delete m_pStatusBar; m_pStatusBar = 0; @@ -230,8 +230,8 @@ void SAL_CALL StatusBarManager::dispose() throw( uno::RuntimeException ) { try { - m_xFrame->removeFrameActionListener( uno::Reference< frame::XFrameActionListener >( - static_cast< ::cppu::OWeakObject *>( this ), + m_xFrame->removeFrameActionListener( uno::Reference< frame::XFrameActionListener >( + static_cast< ::cppu::OWeakObject *>( this ), uno::UNO_QUERY )); } catch ( uno::Exception& ) @@ -255,15 +255,15 @@ void SAL_CALL StatusBarManager::addEventListener( const uno::Reference< lang::XE /* SAFE AREA ----------------------------------------------------------------------------------------------- */ if ( m_bDisposed ) throw lang::DisposedException(); - - m_aListenerContainer.addInterface( ::getCppuType( + + m_aListenerContainer.addInterface( ::getCppuType( ( const uno::Reference< lang::XEventListener >* ) NULL ), xListener ); } void SAL_CALL StatusBarManager::removeEventListener( const uno::Reference< lang::XEventListener >& xListener ) throw( uno::RuntimeException ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::removeEventListener" ); - m_aListenerContainer.removeInterface( ::getCppuType( + m_aListenerContainer.removeInterface( ::getCppuType( ( const uno::Reference< lang::XEventListener >* ) NULL ), xListener ); } @@ -272,7 +272,7 @@ void SAL_CALL StatusBarManager::elementInserted( const css::ui::ConfigurationEve { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::elementInserted" ); ResetableGuard aGuard( m_aLock ); - + /* SAFE AREA ----------------------------------------------------------------------------------------------- */ if ( m_bDisposed ) return; @@ -282,17 +282,17 @@ void SAL_CALL StatusBarManager::elementRemoved( const css::ui::ConfigurationEven { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::elementRemoved" ); ResetableGuard aGuard( m_aLock ); - + /* SAFE AREA ----------------------------------------------------------------------------------------------- */ if ( m_bDisposed ) return; } - + void SAL_CALL StatusBarManager::elementReplaced( const css::ui::ConfigurationEvent& ) throw ( uno::RuntimeException ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::elementReplaced" ); ResetableGuard aGuard( m_aLock ); - + /* SAFE AREA ----------------------------------------------------------------------------------------------- */ if ( m_bDisposed ) return; @@ -334,7 +334,7 @@ void StatusBarManager::RemoveControllers() { try { - uno::Reference< lang::XComponent > xComponent( + uno::Reference< lang::XComponent > xComponent( m_aControllerVector[n], uno::UNO_QUERY ); if ( xComponent.is() ) xComponent->dispose(); @@ -342,7 +342,7 @@ void StatusBarManager::RemoveControllers() catch ( uno::Exception& ) { } - + m_aControllerVector[n].clear(); } } @@ -359,30 +359,30 @@ void StatusBarManager::CreateControllers() uno::Reference< uno::XComponentContext > xComponentContext; uno::Reference< beans::XPropertySet > xProps( m_xServiceManager, uno::UNO_QUERY ); uno::Reference< awt::XWindow > xStatusbarWindow = VCLUnoHelper::GetInterface( m_pStatusBar ); - + if ( xProps.is() ) xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>= xComponentContext; - + for ( USHORT i = 0; i < m_pStatusBar->GetItemCount(); i++ ) { USHORT nId = m_pStatusBar->GetItemId( i ); if ( nId == 0 ) continue; - + rtl::OUString aCommandURL( m_pStatusBar->GetItemCommand( nId )); sal_Bool bInit( sal_True ); uno::Reference< frame::XStatusListener > xController; - + svt::StatusbarController* pController( 0 ); - - if ( m_xStatusbarControllerRegistration.is() && + + if ( m_xStatusbarControllerRegistration.is() && m_xStatusbarControllerRegistration->hasController( aCommandURL, m_aModuleIdentifier )) { if ( xStatusbarControllerFactory.is() ) { - uno::Sequence< uno::Any > aSeq( 5 ); + uno::Sequence< uno::Any > aSeq( 5 ); beans::PropertyValue aPropValue; - + aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ModuleName" )); aPropValue.Value = uno::makeAny( m_aModuleIdentifier ); aSeq[0] = uno::makeAny( aPropValue ); @@ -399,29 +399,29 @@ void StatusBarManager::CreateControllers() aPropValue.Value = uno::makeAny( nId ); aSeq[4] = uno::makeAny( aPropValue ); - xController = uno::Reference< frame::XStatusListener >( - xStatusbarControllerFactory->createInstanceWithArgumentsAndContext( - aCommandURL, aSeq, xComponentContext ), + xController = uno::Reference< frame::XStatusListener >( + xStatusbarControllerFactory->createInstanceWithArgumentsAndContext( + aCommandURL, aSeq, xComponentContext ), uno::UNO_QUERY ); bInit = sal_False; // Initialization is done through the factory service } } - + if ( !xController.is() ) { pController = CreateStatusBarController( m_xFrame, m_pStatusBar, nId, aCommandURL ); if ( !pController ) pController = new svt::StatusbarController( m_xServiceManager, m_xFrame, aCommandURL, nId ); - + if ( pController ) - xController = uno::Reference< frame::XStatusListener >( - static_cast< ::cppu::OWeakObject *>( pController ), + xController = uno::Reference< frame::XStatusListener >( + static_cast< ::cppu::OWeakObject *>( pController ), uno::UNO_QUERY ); } - + m_aControllerVector.push_back( xController ); uno::Reference< lang::XInitialization > xInit( xController, uno::UNO_QUERY ); - + if ( xInit.is() ) { if ( bInit ) @@ -450,22 +450,22 @@ void StatusBarManager::CreateControllers() AddFrameActionListener(); } - + void StatusBarManager::AddFrameActionListener() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::AddFrameActionListener" ); if ( !m_bFrameActionRegistered && m_xFrame.is() ) { m_bFrameActionRegistered = sal_True; - m_xFrame->addFrameActionListener( uno::Reference< frame::XFrameActionListener >( + m_xFrame->addFrameActionListener( uno::Reference< frame::XFrameActionListener >( static_cast< ::cppu::OWeakObject *>( this ), uno::UNO_QUERY )); } } void StatusBarManager::FillStatusBar( const uno::Reference< container::XIndexAccess >& rItemContainer ) -{ +{ RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::StatusBarManager::FillStatusbar" ); - + ResetableGuard aGuard( m_aLock ); if ( m_bDisposed || !m_pStatusBar ) @@ -476,7 +476,7 @@ void StatusBarManager::FillStatusBar( const uno::Reference< container::XIndexAcc RemoveControllers(); - // reset and fill command map + // reset and fill command map m_pStatusBar->Clear(); m_aControllerVector.clear(); @@ -527,12 +527,12 @@ void StatusBarManager::FillStatusBar( const uno::Reference< container::XIndexAcc { rtl::OUString aString( RetrieveLabelFromCommand( aCommandURL )); USHORT nItemBits( impl_convertItemStyleToItemBits( nStyle )); - + m_pStatusBar->InsertItem( nId, nWidth, nItemBits, nOffset ); m_pStatusBar->SetItemCommand( nId, aCommandURL ); m_pStatusBar->SetAccessibleName( nId, aString ); // m_pStatusBar->SetHelpText( nId, aString ); - + if ( aHelpURL.indexOf( aHelpIdPrefix ) == 0 ) { rtl::OUString aId( aHelpURL.copy( HELPID_PREFIX_LENGTH )); @@ -540,7 +540,7 @@ void StatusBarManager::FillStatusBar( const uno::Reference< container::XIndexAcc if ( nHelpId > 0 ) m_pStatusBar->SetHelpId( nId, nHelpId ); } - + ++nId; } } @@ -567,12 +567,12 @@ void StatusBarManager::DataChanged( const DataChangedEvent& rDCEvt ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::DataChanged" ); ResetableGuard aGuard( m_aLock ); - - if ((( rDCEvt.GetType() == DATACHANGED_SETTINGS ) || + + if ((( rDCEvt.GetType() == DATACHANGED_SETTINGS ) || ( rDCEvt.GetType() == DATACHANGED_FONTS ) || ( rDCEvt.GetType() == DATACHANGED_FONTSUBSTITUTION ) || - ( rDCEvt.GetType() == DATACHANGED_DISPLAY )) && - ( rDCEvt.GetFlags() & SETTINGS_STYLE )) + ( rDCEvt.GetType() == DATACHANGED_DISPLAY )) && + ( rDCEvt.GetFlags() & SETTINGS_STYLE )) { css::uno::Reference< css::frame::XLayoutManager > xLayoutManager; css::uno::Reference< css::beans::XPropertySet > xPropSet( m_xFrame, css::uno::UNO_QUERY ); @@ -590,23 +590,23 @@ void StatusBarManager::UserDraw( const UserDrawEvent& rUDEvt ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::UserDraw" ); ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) return; - + USHORT nId( rUDEvt.GetItemId() ); if (( nId > 0 ) && ( nId <= m_aControllerVector.size() )) { - uno::Reference< frame::XStatusbarController > xController( + uno::Reference< frame::XStatusbarController > xController( m_aControllerVector[nId-1], uno::UNO_QUERY ); if ( xController.is() && rUDEvt.GetDevice() ) { - uno::Reference< awt::XGraphics > xGraphics = + uno::Reference< awt::XGraphics > xGraphics = rUDEvt.GetDevice()->CreateUnoGraphics(); - awt::Rectangle aRect( rUDEvt.GetRect().Left(), + awt::Rectangle aRect( rUDEvt.GetRect().Left(), rUDEvt.GetRect().Top(), - rUDEvt.GetRect().GetWidth(), + rUDEvt.GetRect().GetWidth(), rUDEvt.GetRect().GetHeight() ); aGuard.unlock(); xController->paint( xGraphics, aRect, rUDEvt.GetItemId(), rUDEvt.GetStyle() ); @@ -618,10 +618,10 @@ void StatusBarManager::Command( const CommandEvent& rEvt ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::Command" ); ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) return; - + if ( rEvt.GetCommand() == COMMAND_CONTEXTMENU ) { USHORT nId = m_pStatusBar->GetItemId( rEvt.GetMousePosPixel() ); @@ -649,13 +649,13 @@ void StatusBarManager::MouseButton( const MouseEvent& rMEvt ,sal_Bool ( SAL_CALL { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::MouseButton" ); ResetableGuard aGuard( m_aLock ); - + if ( !m_bDisposed ) { USHORT nId = m_pStatusBar->GetItemId( rMEvt.GetPosPixel() ); if (( nId > 0 ) && ( nId <= m_aControllerVector.size() )) { - uno::Reference< frame::XStatusbarController > xController( + uno::Reference< frame::XStatusbarController > xController( m_aControllerVector[nId-1], uno::UNO_QUERY ); if ( xController.is() ) { @@ -684,29 +684,29 @@ void StatusBarManager::MouseButtonUp( const MouseEvent& rMEvt ) IMPL_LINK( StatusBarManager, Click, StatusBar*, EMPTYARG ) { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) return 1; - + USHORT nId = m_pStatusBar->GetCurItemId(); if (( nId > 0 ) && ( nId <= m_aControllerVector.size() )) { - uno::Reference< frame::XStatusbarController > xController( + uno::Reference< frame::XStatusbarController > xController( m_aControllerVector[nId-1], uno::UNO_QUERY ); if ( xController.is() ) xController->click(); } - + return 1; } IMPL_LINK( StatusBarManager, DoubleClick, StatusBar*, EMPTYARG ) { ResetableGuard aGuard( m_aLock ); - + if ( m_bDisposed ) return 1; - + USHORT nId = m_pStatusBar->GetCurItemId(); if (( nId > 0 ) && ( nId <= m_aControllerVector.size() )) { @@ -715,7 +715,7 @@ IMPL_LINK( StatusBarManager, DoubleClick, StatusBar*, EMPTYARG ) if ( xController.is() ) xController->doubleClick(); } - + return 1; } diff --git a/framework/source/uielement/statusbarwrapper.cxx b/framework/source/uielement/statusbarwrapper.cxx index 18bef609fa06..030a790b35e3 100644 --- a/framework/source/uielement/statusbarwrapper.cxx +++ b/framework/source/uielement/statusbarwrapper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ #include <uielement/statusbarwrapper.hxx> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> #include <helper/actiontriggerhelper.hxx> @@ -41,7 +41,7 @@ #include <helpid.hrc> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -52,7 +52,7 @@ #include <com/sun/star/ui/UIElementType.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <comphelper/processfactory.hxx> #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ @@ -77,7 +77,7 @@ namespace framework StatusBarWrapper::StatusBarWrapper( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) - : UIConfigElementWrapperBase( UIElementType::STATUSBAR,xServiceManager ) + : UIConfigElementWrapperBase( UIElementType::STATUSBAR,xServiceManager ) { } diff --git a/framework/source/uielement/statusindicatorinterfacewrapper.cxx b/framework/source/uielement/statusindicatorinterfacewrapper.cxx index 5f9d979e368c..7be64c053b4e 100644 --- a/framework/source/uielement/statusindicatorinterfacewrapper.cxx +++ b/framework/source/uielement/statusindicatorinterfacewrapper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,14 +29,14 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <uielement/statusindicatorinterfacewrapper.hxx> #include <uielement/progressbarwrapper.hxx> #include <threadhelp/resetableguard.hxx> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx index 1055a3ef061f..cf39edec2a7c 100644 --- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ #endif //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <classes/addonsoptions.hxx> #ifndef __FRAMEWORK_TOOLBAR_HXX_ @@ -41,7 +41,7 @@ #endif //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> @@ -52,7 +52,7 @@ #include "com/sun/star/beans/XPropertySet.hpp" //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <rtl/uri.hxx> diff --git a/framework/source/uielement/toolbar.cxx b/framework/source/uielement/toolbar.cxx index b99fed9e5ffb..48716b89f0cd 100644 --- a/framework/source/uielement/toolbar.cxx +++ b/framework/source/uielement/toolbar.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <uielement/toolbar.hxx> #include <uielement/toolbarmanager.hxx> @@ -47,7 +47,7 @@ ToolBar::ToolBar( Window* pParent, WinBits nWinBits ) : ToolBar::~ToolBar() { } - + void ToolBar::SetToolBarManager( ToolBarManager* pTbMgr ) { m_pToolBarManager = pTbMgr; diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 4a1f2fe98403..8152ea8519ce 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,7 +30,7 @@ #include <uielement/toolbarmanager.hxx> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ @@ -55,7 +55,7 @@ #include <helper/acceleratorinfo.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/ui/ItemType.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> @@ -79,7 +79,7 @@ #include <com/sun/star/lang/DisposedException.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <svtools/imgdef.hxx> #include <svtools/toolboxcontroller.hxx> @@ -102,7 +102,7 @@ #include <svtools/acceleratorexecute.hxx> //_________________________________________________________________________________________________________________ -// namespaces +// namespaces //_________________________________________________________________________________________________________________ using rtl::OUString; @@ -220,7 +220,7 @@ static ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager } //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** DEFINE_XINTERFACE_6 ( ToolBarManager , OWeakObject , @@ -232,8 +232,8 @@ DEFINE_XINTERFACE_6 ( ToolBarManager DERIVED_INTERFACE( ::com::sun::star::lang::XEventListener, ::com::sun::star::frame::XFrameActionListener ) ) -DEFINE_XTYPEPROVIDER_6 ( ToolBarManager , - ::com::sun::star::lang::XTypeProvider , +DEFINE_XTYPEPROVIDER_6 ( ToolBarManager , + ::com::sun::star::lang::XTypeProvider , ::com::sun::star::lang::XComponent , ::com::sun::star::ui::XUIConfigurationListener , ::com::sun::star::frame::XFrameActionListener , @@ -352,7 +352,7 @@ void ToolBarManager::Destroy() /* #i99167# removed change for i93173 since there is some weird crash */ // #i93173# delete toolbar lazily as we can still be in one of its handlers m_pToolBar->doLazyDelete(); - + Link aEmpty; m_pToolBar->SetSelectHdl( aEmpty ); m_pToolBar->SetActivateHdl( aEmpty ); @@ -874,7 +874,7 @@ void ToolBarManager::RemoveControllers() uno::Sequence< beans::PropertyValue > ToolBarManager::GetPropsForCommand( const ::rtl::OUString& rCmdURL ) { Sequence< PropertyValue > aPropSeq; - + // Retrieve properties for command try { @@ -882,7 +882,7 @@ uno::Sequence< beans::PropertyValue > ToolBarManager::GetPropsForCommand( const { Reference< XModuleManager > xModuleManager( m_xServiceManager->createInstance( SERVICENAME_MODULEMANAGER ), UNO_QUERY_THROW ); Reference< XInterface > xIfac( m_xFrame, UNO_QUERY ); - + m_bModuleIdentified = sal_True; m_aModuleIdentifier = xModuleManager->identify( xIfac ); @@ -893,7 +893,7 @@ uno::Sequence< beans::PropertyValue > ToolBarManager::GetPropsForCommand( const xNameAccess->getByName( m_aModuleIdentifier ) >>= m_xUICommandLabels; } } - + if ( m_xUICommandLabels.is() ) { if ( rCmdURL.getLength() > 0 ) @@ -952,7 +952,7 @@ void ToolBarManager::CreateControllers() Reference< XPropertySet > xProps( m_xServiceManager, UNO_QUERY ); Reference< XWindow > xToolbarWindow = VCLUnoHelper::GetInterface( m_pToolBar ); - css::util::URL aURL; + css::util::URL aURL; sal_Bool bHasDisabledEntries = SvtCommandOptions().HasEntries( SvtCommandOptions::CMDOPTION_DISABLED ); SvtCommandOptions aCmdOptions; @@ -1052,9 +1052,9 @@ void ToolBarManager::CreateControllers() MenuDescriptionMap::iterator it = m_aMenuMap.find( nId ); if ( it == m_aMenuMap.end() ) { - xController = Reference< XStatusListener >( + xController = Reference< XStatusListener >( new GenericToolbarController( m_xServiceManager, m_xFrame, m_pToolBar, nId, aCommandURL )); - + // Accessibility support: Set toggle button role for specific commands sal_Int32 nProps = RetrievePropertiesFromCommand( aCommandURL ); if ( nProps & UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON ) @@ -1116,7 +1116,7 @@ void ToolBarManager::CreateControllers() aPropertyVector.push_back( makeAny( aPropValue )); aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ParentWindow" )); aPropValue.Value <<= xToolbarWindow; - aPropertyVector.push_back( makeAny( aPropValue )); + aPropertyVector.push_back( makeAny( aPropValue )); aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ModuleName" )); aPropValue.Value <<= m_aModuleIdentifier; aPropertyVector.push_back( makeAny( aPropValue )); @@ -1131,17 +1131,17 @@ void ToolBarManager::CreateControllers() Sequence< Any > aArgs( comphelper::containerToSequence( aPropertyVector )); xInit->initialize( aArgs ); //for Support Visiblitly by shizhoubo - if (pController) + if (pController) { - // rtl::OUString aCommandURL = pController->m_aCommandURL; - if(aCommandURL == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:SwitchXFormsDesignMode" )) || - aCommandURL == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ViewDataSourceBrowser" )) || - aCommandURL == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ParaLeftToRight" )) || - aCommandURL == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ParaRightToLeft" )) + // rtl::OUString aCommandURL = pController->m_aCommandURL; + if(aCommandURL == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:SwitchXFormsDesignMode" )) || + aCommandURL == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ViewDataSourceBrowser" )) || + aCommandURL == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ParaLeftToRight" )) || + aCommandURL == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ParaRightToLeft" )) ) pController->setFastPropertyValue_NoBroadcast(1,makeAny(sal_True)); } - + //end } @@ -1341,7 +1341,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine xMenuContainer = m_xUICfgMgr->getSettings( aCommandURL, sal_False ); if ( xMenuContainer.is() && xMenuContainer->getCount() ) { - Sequence< PropertyValue > aProps; + Sequence< PropertyValue > aProps; // drop down menu info is currently // the first ( and only ) menu // in the menusettings container @@ -1349,7 +1349,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine for ( sal_Int32 index=0; index<aProps.getLength(); ++index ) { if ( aProps[ index ].Name.equalsAsciiL( ITEM_DESCRIPTOR_CONTAINER, ITEM_DESCRIPTOR_CONTAINER_LEN )) - + { aProps[ index ].Value >>= aMenuDesc; break; @@ -2161,9 +2161,9 @@ IMPL_LINK( ToolBarManager, StateChanged, StateChangedType*, pStateChangedType ) IMPL_LINK( ToolBarManager, DataChanged, DataChangedEvent*, pDataChangedEvent ) { - if ((( pDataChangedEvent->GetType() == DATACHANGED_SETTINGS ) || - ( pDataChangedEvent->GetType() == DATACHANGED_DISPLAY )) && - ( pDataChangedEvent->GetFlags() & SETTINGS_STYLE )) + if ((( pDataChangedEvent->GetType() == DATACHANGED_SETTINGS ) || + ( pDataChangedEvent->GetType() == DATACHANGED_DISPLAY )) && + ( pDataChangedEvent->GetFlags() & SETTINGS_STYLE )) { // Check if we need to get new images for normal/high contrast mode CheckAndUpdateImages(); @@ -2241,7 +2241,7 @@ IMPL_STATIC_LINK_NOINSTANCE( ToolBarManager, ExecuteHdl_Impl, ExecuteInfo*, pExe { pExecuteInfo->xLayoutManager->dockAllWindows( UIElementType::TOOLBAR ); } - } + } catch ( Exception& ) { } diff --git a/framework/source/uielement/toolbarmerger.cxx b/framework/source/uielement/toolbarmerger.cxx index 43f9068513a2..83f280cb46a7 100644 --- a/framework/source/uielement/toolbarmerger.cxx +++ b/framework/source/uielement/toolbarmerger.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index d9ae3cfbe1df..65162b96561f 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ #include <algorithm> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> #include "services.h" @@ -45,7 +45,7 @@ #include <classes/sfxhelperfunctions.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -60,7 +60,7 @@ #include <com/sun/star/ui/UIElementType.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #ifndef _VCL_MENU_HXX_ @@ -82,7 +82,7 @@ #include <svtools/miscopt.hxx> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ // @@ -104,7 +104,7 @@ static const char CMD_FORMULABAR[] = ".uno:InsertFormula"; static const char CMD_INPUTLINEBAR[] = ".uno:InputLineVisible"; static const char CMD_RESTOREVISIBILITY[] = ".cmd:RestoreVisibility"; static const char ITEM_DESCRIPTOR_RESOURCEURL[] = "ResourceURL"; -static const char ITEM_DESCRIPTOR_UINAME[] = "UIName"; +static const char ITEM_DESCRIPTOR_UINAME[] = "UIName"; static const char STATIC_PRIVATE_TB_RESOURCE[] = "private:resource/toolbar/"; static const char STATIC_CMD_PART[] = ".uno:AvailableToolbars?Toolbar:string="; @@ -158,9 +158,9 @@ struct ToolBarInfo rtl::OUString aToolBarUIName; }; -DEFINE_XSERVICEINFO_MULTISERVICE ( ToolbarsMenuController , +DEFINE_XSERVICEINFO_MULTISERVICE ( ToolbarsMenuController , OWeakObject , - SERVICENAME_POPUPMENUCONTROLLER , + SERVICENAME_POPUPMENUCONTROLLER , IMPLEMENTATIONNAME_TOOLBARSMENUCONTROLLER ) @@ -225,7 +225,7 @@ void ToolbarsMenuController::addCommand( Reference< XDispatch > ToolbarsMenuController::getDispatchFromCommandURL( const rtl::OUString& rCommandURL ) { URL aTargetURL; - Sequence<PropertyValue> aArgs; + Sequence<PropertyValue> aArgs; Reference< XURLTransformer > xURLTransformer; Reference< XFrame > xFrame; @@ -339,7 +339,7 @@ Sequence< Sequence< com::sun::star::beans::PropertyValue > > ToolbarsMenuControl aToolBarInfo.aToolBarResName = aResName; - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); Reference< css::awt::XWindow > xWindow( xUIElement->getRealInterface(), UNO_QUERY ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow ) @@ -481,7 +481,7 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r m_xPopupMenu->checkItem( nIndex, sal_True ); { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); VCLXPopupMenu* pXPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( m_xPopupMenu ); PopupMenu* pVCLPopupMenu = (PopupMenu *)pXPopupMenu->GetMenu(); @@ -585,7 +585,7 @@ void SAL_CALL ToolbarsMenuController::statusChanged( const FeatureStateEvent& Ev // All other status events will be processed here sal_Bool bSetCheckmark = sal_False; - sal_Bool bCheckmark = sal_False; + sal_Bool bCheckmark = sal_False; osl::ClearableMutexGuard aLock( m_aMutex ); Reference< css::awt::XPopupMenu > xPopupMenu( m_xPopupMenu ); @@ -593,7 +593,7 @@ void SAL_CALL ToolbarsMenuController::statusChanged( const FeatureStateEvent& Ev if ( xPopupMenu.is() ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); VCLXPopupMenu* pXPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( xPopupMenu ); PopupMenu* pVCLPopupMenu = (PopupMenu *)pXPopupMenu->GetMenu(); @@ -737,7 +737,7 @@ void SAL_CALL ToolbarsMenuController::select( const css::awt::MenuEvent& rEvent else if ( aCmd.indexOf( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( STATIC_CMD_PART ))) < 0 ) { URL aTargetURL; - Sequence<PropertyValue> aArgs; + Sequence<PropertyValue> aArgs; aTargetURL.Complete = aCmd; xURLTransformer->parseStrict( aTargetURL ); diff --git a/framework/source/uielement/toolbarwrapper.cxx b/framework/source/uielement/toolbarwrapper.cxx index bc3c5a752c40..5a4fb7cddde4 100644 --- a/framework/source/uielement/toolbarwrapper.cxx +++ b/framework/source/uielement/toolbarwrapper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ @@ -44,7 +44,7 @@ #endif //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -56,7 +56,7 @@ #include <com/sun/star/lang/DisposedException.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx index a6fedb662469..0d50aa4c36d4 100644 --- a/framework/source/uielement/uicommanddescription.cxx +++ b/framework/source/uielement/uicommanddescription.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include "uielement/uicommanddescription.hxx" #include <threadhelp/resetableguard.hxx> @@ -38,7 +38,7 @@ #include "properties.h" //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -47,7 +47,7 @@ #include <com/sun/star/container/XContainer.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <rtl/ustrbuf.hxx> #include <cppuhelper/implbase2.hxx> @@ -61,7 +61,7 @@ #include <rtl/logfile.hxx> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ // @@ -72,7 +72,7 @@ using namespace com::sun::star::container; using namespace ::com::sun::star::frame; //_________________________________________________________________________________________________________________ -// Namespace +// Namespace //_________________________________________________________________________________________________________________ // @@ -107,7 +107,7 @@ namespace framework { //***************************************************************************************************************** -// Configuration access class for PopupMenuControllerFactory implementation +// Configuration access class for PopupMenuControllerFactory implementation //***************************************************************************************************************** class ConfigurationAccess_UICommand : // Order is neccessary for right initialization! @@ -207,7 +207,7 @@ class ConfigurationAccess_UICommand : // Order is neccessary for right initializ }; //***************************************************************************************************************** -// XInterface, XTypeProvider +// XInterface, XTypeProvider //***************************************************************************************************************** ConfigurationAccess_UICommand::ConfigurationAccess_UICommand( const rtl::OUString& aModuleName, const Reference< XNameAccess >& rGenericUICommands, const Reference< XMultiServiceFactory >& rServiceManager ) : ThreadHelpBase(), @@ -627,11 +627,11 @@ void SAL_CALL ConfigurationAccess_UICommand::disposing( const EventObject& aEven } //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** -DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( UICommandDescription , - ::cppu::OWeakObject , - SERVICENAME_UICOMMANDDESCRIPTION , +DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( UICommandDescription , + ::cppu::OWeakObject , + SERVICENAME_UICOMMANDDESCRIPTION , IMPLEMENTATIONNAME_UICOMMANDDESCRIPTION ) diff --git a/framework/source/uifactory/addonstoolboxfactory.cxx b/framework/source/uifactory/addonstoolboxfactory.cxx index c324284fdc1f..68331e1e0e97 100644 --- a/framework/source/uifactory/addonstoolboxfactory.cxx +++ b/framework/source/uifactory/addonstoolboxfactory.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,13 +30,13 @@ #include <uifactory/addonstoolboxfactory.hxx> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <uielement/addonstoolbarwrapper.hxx> #include <threadhelp/resetableguard.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XFrame.hpp> @@ -49,14 +49,14 @@ #endif //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> #include <tools/urlobj.hxx> #include <rtl/ustrbuf.hxx> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ // @@ -71,11 +71,11 @@ namespace framework { //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** -DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( AddonsToolBoxFactory , - ::cppu::OWeakObject , - SERVICENAME_TOOLBARFACTORY , +DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( AddonsToolBoxFactory , + ::cppu::OWeakObject , + SERVICENAME_TOOLBARFACTORY , IMPLEMENTATIONNAME_ADDONSTOOLBARFACTORY ) @@ -207,7 +207,7 @@ throw ( ::com::sun::star::container::NoSuchElementException, aPropValue.Value <<= aResourceURL; aPropSeq[2] <<= aPropValue; - vos::OGuard aGuard( Application::GetSolarMutex() ); + vos::OGuard aGuard( Application::GetSolarMutex() ); AddonsToolBarWrapper* pToolBarWrapper = new AddonsToolBarWrapper( m_xServiceManager ); xToolBar = Reference< ::com::sun::star::ui::XUIElement >( (OWeakObject *)pToolBarWrapper, UNO_QUERY ); Reference< XInitialization > xInit( xToolBar, UNO_QUERY ); diff --git a/framework/source/uifactory/factoryconfiguration.cxx b/framework/source/uifactory/factoryconfiguration.cxx index dc2ff7e78b23..505f3418ed8c 100755 --- a/framework/source/uifactory/factoryconfiguration.cxx +++ b/framework/source/uifactory/factoryconfiguration.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,14 +29,14 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include "uifactory/factoryconfiguration.hxx" #include <threadhelp/resetableguard.hxx> #include "services.h" //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -45,16 +45,16 @@ #include <com/sun/star/container/XContainer.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <rtl/ustrbuf.hxx> #include <cppuhelper/weak.hxx> #include <rtl/logfile.hxx> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ -// +// using namespace com::sun::star; using namespace com::sun::star::uno; using namespace com::sun::star::lang; @@ -63,9 +63,9 @@ using namespace com::sun::star::container; using namespace ::com::sun::star::frame; //_________________________________________________________________________________________________________________ -// Namespace +// Namespace //_________________________________________________________________________________________________________________ -// +// namespace framework { @@ -78,7 +78,7 @@ rtl::OUString getHashKeyFromStrings( const rtl::OUString& aCommandURL, const rtl } //***************************************************************************************************************** -// XInterface, XTypeProvider +// XInterface, XTypeProvider //***************************************************************************************************************** ConfigurationAccess_ControllerFactory::ConfigurationAccess_ControllerFactory( Reference< XMultiServiceFactory >& rServiceManager,const ::rtl::OUString& _sRoot,bool _bAskValue ) : ThreadHelpBase(), @@ -87,7 +87,7 @@ ConfigurationAccess_ControllerFactory::ConfigurationAccess_ControllerFactory( Re m_aPropController( RTL_CONSTASCII_USTRINGPARAM( "Controller" )), m_aPropValue( RTL_CONSTASCII_USTRINGPARAM( "Value" )), m_sRoot(_sRoot), - m_xServiceManager( rServiceManager ), + m_xServiceManager( rServiceManager ), m_bConfigAccessInitialized( sal_False ), m_bAskValue(_bAskValue) { @@ -99,7 +99,7 @@ ConfigurationAccess_ControllerFactory::~ConfigurationAccess_ControllerFactory() { // SAFE ResetableGuard aLock( m_aLock ); - + Reference< XContainer > xContainer( m_xConfigAccess, UNO_QUERY ); if ( xContainer.is() ) xContainer->removeContainerListener( this ); @@ -111,18 +111,18 @@ rtl::OUString ConfigurationAccess_ControllerFactory::getServiceFromCommandModule // SAFE ResetableGuard aLock( m_aLock ); MenuControllerMap::const_iterator pIter = m_aMenuControllerMap.find( getHashKeyFromStrings( rCommandURL, rModule )); - + if ( pIter != m_aMenuControllerMap.end() ) return pIter->second.m_aImplementationName; else if ( rModule.getLength() ) { // Try to detect if we have a generic popup menu controller pIter = m_aMenuControllerMap.find( getHashKeyFromStrings( rCommandURL, rtl::OUString() )); - + if ( pIter != m_aMenuControllerMap.end() ) return pIter->second.m_aImplementationName; } - + return rtl::OUString(); } rtl::OUString ConfigurationAccess_ControllerFactory::getValueFromCommandModule( const rtl::OUString& rCommandURL, const rtl::OUString& rModule ) const @@ -130,27 +130,27 @@ rtl::OUString ConfigurationAccess_ControllerFactory::getValueFromCommandModule( RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_ControllerFactory::getValueFromCommandModule" ); // SAFE ResetableGuard aLock( m_aLock ); - + MenuControllerMap::const_iterator pIter = m_aMenuControllerMap.find( getHashKeyFromStrings( rCommandURL, rModule )); - + if ( pIter != m_aMenuControllerMap.end() ) return pIter->second.m_aValue; else if ( rModule.getLength() ) { // Try to detect if we have a generic popup menu controller pIter = m_aMenuControllerMap.find( getHashKeyFromStrings( rCommandURL, rtl::OUString() )); - + if ( pIter != m_aMenuControllerMap.end() ) return pIter->second.m_aValue; } - + return rtl::OUString(); } -void ConfigurationAccess_ControllerFactory::addServiceToCommandModule( - const rtl::OUString& rCommandURL, - const rtl::OUString& rModule, +void ConfigurationAccess_ControllerFactory::addServiceToCommandModule( + const rtl::OUString& rCommandURL, + const rtl::OUString& rModule, const rtl::OUString& rServiceSpecifier ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_ControllerFactory::addServiceToCommandModule" ); @@ -161,14 +161,14 @@ void ConfigurationAccess_ControllerFactory::addServiceToCommandModule( m_aMenuControllerMap.insert( MenuControllerMap::value_type( aHashKey,ControllerInfo(rServiceSpecifier,::rtl::OUString()) )); } -void ConfigurationAccess_ControllerFactory::removeServiceFromCommandModule( - const rtl::OUString& rCommandURL, +void ConfigurationAccess_ControllerFactory::removeServiceFromCommandModule( + const rtl::OUString& rCommandURL, const rtl::OUString& rModule ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_ControllerFactory::removeServiceFromCommandModule" ); // SAFE ResetableGuard aLock( m_aLock ); - + rtl::OUString aHashKey = getHashKeyFromStrings( rCommandURL, rModule ); m_aMenuControllerMap.erase( aHashKey ); } @@ -181,7 +181,7 @@ void SAL_CALL ConfigurationAccess_ControllerFactory::elementInserted( const Cont rtl::OUString aModule; rtl::OUString aService; rtl::OUString aValue; - + // SAFE ResetableGuard aLock( m_aLock ); @@ -203,10 +203,10 @@ void SAL_CALL ConfigurationAccess_ControllerFactory::elementRemoved ( const Cont rtl::OUString aModule; rtl::OUString aService; rtl::OUString aValue; - + // SAFE ResetableGuard aLock( m_aLock ); - + if ( impl_getElementProps( aEvent.Element, aCommand, aModule, aService, aValue )) { // Create hash key from command and module as they are together a primary key to @@ -229,7 +229,7 @@ void SAL_CALL ConfigurationAccess_ControllerFactory::disposing( const EventObjec // SAFE // remove our reference to the config access ResetableGuard aLock( m_aLock ); - m_xConfigAccess.clear(); + m_xConfigAccess.clear(); } void ConfigurationAccess_ControllerFactory::readConfigurationData() @@ -237,16 +237,16 @@ void ConfigurationAccess_ControllerFactory::readConfigurationData() RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_ControllerFactory::readConfigurationData" ); // SAFE ResetableGuard aLock( m_aLock ); - + if ( !m_bConfigAccessInitialized ) { Sequence< Any > aArgs( 1 ); PropertyValue aPropValue; - + aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" )); aPropValue.Value <<= m_sRoot; aArgs[0] <<= aPropValue; - + try { m_xConfigAccess = Reference< XNameAccess >( m_xConfigProvider->createInstanceWithArguments(SERVICENAME_CFGREADACCESS,aArgs ), UNO_QUERY ); @@ -254,10 +254,10 @@ void ConfigurationAccess_ControllerFactory::readConfigurationData() catch ( WrappedTargetException& ) { } - + m_bConfigAccessInitialized = sal_True; } - + if ( m_xConfigAccess.is() ) { // Read and update configuration data @@ -280,13 +280,13 @@ void ConfigurationAccess_ControllerFactory::updateConfigurationData() if ( m_xConfigAccess.is() ) { Sequence< rtl::OUString > aPopupMenuControllers = m_xConfigAccess->getElementNames(); - + rtl::OUString aCommand; rtl::OUString aModule; rtl::OUString aService; rtl::OUString aHashKey; rtl::OUString aValue; - + m_aMenuControllerMap.clear(); for ( sal_Int32 i = 0; i < aPopupMenuControllers.getLength(); i++ ) { diff --git a/framework/source/uifactory/menubarfactory.cxx b/framework/source/uifactory/menubarfactory.cxx index e897ce5d2492..3cc132d9cb48 100644 --- a/framework/source/uifactory/menubarfactory.cxx +++ b/framework/source/uifactory/menubarfactory.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,14 +30,14 @@ #include <uifactory/menubarfactory.hxx> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> #include "services.h" #include <uielement/menubarwrapper.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XFrame.hpp> @@ -50,7 +50,7 @@ #endif //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #ifndef _VCL_MENU_HXX_ @@ -62,9 +62,9 @@ #include <rtl/logfile.hxx> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ -// +// using namespace com::sun::star::uno; using namespace com::sun::star::lang; @@ -77,11 +77,11 @@ namespace framework { //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** -DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( MenuBarFactory , - ::cppu::OWeakObject , - SERVICENAME_MENUBARFACTORY , +DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( MenuBarFactory , + ::cppu::OWeakObject , + SERVICENAME_MENUBARFACTORY , IMPLEMENTATIONNAME_MENUBARFACTORY ) @@ -105,8 +105,8 @@ MenuBarFactory::~MenuBarFactory() } // XUIElementFactory -Reference< XUIElement > SAL_CALL MenuBarFactory::createUIElement( - const ::rtl::OUString& ResourceURL, +Reference< XUIElement > SAL_CALL MenuBarFactory::createUIElement( + const ::rtl::OUString& ResourceURL, const Sequence< PropertyValue >& Args ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ) { @@ -127,7 +127,7 @@ void MenuBarFactory::CreateUIElement(const ::rtl::OUString& ResourceURL ,const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModuleManager >& _xModuleManager ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xServiceManager) { - Reference< XUIConfigurationManager > xCfgMgr; + Reference< XUIConfigurationManager > xCfgMgr; Reference< XUIConfigurationManager > xConfigSource; Reference< XFrame > xFrame; rtl::OUString aResourceURL( ResourceURL ); @@ -182,7 +182,7 @@ void MenuBarFactory::CreateUIElement(const ::rtl::OUString& ResourceURL } } } - + PropertyValue aPropValue; Sequence< Any > aPropSeq( _pExtraMode ? 5 : 4); aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Frame" )); @@ -203,8 +203,8 @@ void MenuBarFactory::CreateUIElement(const ::rtl::OUString& ResourceURL aPropValue.Value <<= bExtraMode; aPropSeq[4] <<= aPropValue; } - - vos::OGuard aGuard( Application::GetSolarMutex() ); + + vos::OGuard aGuard( Application::GetSolarMutex() ); Reference< XInitialization > xInit( _xMenuBar, UNO_QUERY ); xInit->initialize( aPropSeq ); } diff --git a/framework/source/uifactory/popupmenucontrollerfactory.cxx b/framework/source/uifactory/popupmenucontrollerfactory.cxx index 586ada8907fa..8736aa5dcf80 100644 --- a/framework/source/uifactory/popupmenucontrollerfactory.cxx +++ b/framework/source/uifactory/popupmenucontrollerfactory.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include "uifactory/popupmenucontrollerfactory.hxx" #include <threadhelp/resetableguard.hxx> @@ -37,7 +37,7 @@ #include "uifactory/factoryconfiguration.hxx" //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -46,16 +46,16 @@ #include <com/sun/star/container/XContainer.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <rtl/ustrbuf.hxx> #include <cppuhelper/weak.hxx> #include <rtl/logfile.hxx> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ -// +// using namespace com::sun::star::uno; using namespace com::sun::star::lang; @@ -64,19 +64,19 @@ using namespace com::sun::star::container; using namespace ::com::sun::star::frame; //_________________________________________________________________________________________________________________ -// Namespace +// Namespace //_________________________________________________________________________________________________________________ -// +// namespace framework { //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** -DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( PopupMenuControllerFactory , - ::cppu::OWeakObject , - SERVICENAME_POPUPMENUCONTROLLERFACTORY , +DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( PopupMenuControllerFactory , + ::cppu::OWeakObject , + SERVICENAME_POPUPMENUCONTROLLERFACTORY , IMPLEMENTATIONNAME_POPUPMENUCONTROLLERFACTORY ) diff --git a/framework/source/uifactory/statusbarcontrollerfactory.cxx b/framework/source/uifactory/statusbarcontrollerfactory.cxx index e11b435d9a01..cfbfcd49e23f 100644 --- a/framework/source/uifactory/statusbarcontrollerfactory.cxx +++ b/framework/source/uifactory/statusbarcontrollerfactory.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include "uifactory/statusbarcontrollerfactory.hxx" #include "uifactory/factoryconfiguration.hxx" @@ -37,7 +37,7 @@ #include "services.h" //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -46,15 +46,15 @@ #include <com/sun/star/container/XContainer.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <rtl/ustrbuf.hxx> #include <cppuhelper/weak.hxx> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ -// +// using namespace com::sun::star::uno; using namespace com::sun::star::lang; @@ -63,18 +63,18 @@ using namespace com::sun::star::container; using namespace ::com::sun::star::frame; //_________________________________________________________________________________________________________________ -// Namespace +// Namespace //_________________________________________________________________________________________________________________ -// +// namespace framework { //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** -DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( StatusbarControllerFactory , - ::cppu::OWeakObject , - SERVICENAME_STATUSBARCONTROLLERFACTORY , +DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( StatusbarControllerFactory , + ::cppu::OWeakObject , + SERVICENAME_STATUSBARCONTROLLERFACTORY , IMPLEMENTATIONNAME_STATUSBARCONTROLLERFACTORY ) @@ -85,7 +85,7 @@ StatusbarControllerFactory::StatusbarControllerFactory( const Reference< XMultiS { m_pConfigAccess = new ConfigurationAccess_ControllerFactory( m_xServiceManager,rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.UI.Controller/Registered/StatusBar" )),true ); m_pConfigAccess->acquire(); -} +} } // namespace framework diff --git a/framework/source/uifactory/statusbarfactory.cxx b/framework/source/uifactory/statusbarfactory.cxx index 8841b7c577e8..ddbe47912a0e 100644 --- a/framework/source/uifactory/statusbarfactory.cxx +++ b/framework/source/uifactory/statusbarfactory.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,13 +31,13 @@ #include <uifactory/menubarfactory.hxx> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <uielement/statusbarwrapper.hxx> #include <threadhelp/resetableguard.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XFrame.hpp> @@ -50,14 +50,14 @@ #endif //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> #include <tools/urlobj.hxx> #include <rtl/ustrbuf.hxx> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ // @@ -72,11 +72,11 @@ namespace framework { //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** -DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( StatusBarFactory , - ::cppu::OWeakObject , - SERVICENAME_STATUSBARFACTORY , +DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( StatusBarFactory , + ::cppu::OWeakObject , + SERVICENAME_STATUSBARFACTORY , IMPLEMENTATIONNAME_STATUSBARFACTORY ) diff --git a/framework/source/uifactory/toolbarcontrollerfactory.cxx b/framework/source/uifactory/toolbarcontrollerfactory.cxx index 896b6b44db33..1905375f7022 100644 --- a/framework/source/uifactory/toolbarcontrollerfactory.cxx +++ b/framework/source/uifactory/toolbarcontrollerfactory.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include "uifactory/toolbarcontrollerfactory.hxx" #include "uifactory/factoryconfiguration.hxx" @@ -37,7 +37,7 @@ #include "services.h" //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -46,15 +46,15 @@ #include <com/sun/star/container/XContainer.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <rtl/ustrbuf.hxx> #include <cppuhelper/weak.hxx> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ -// +// using namespace com::sun::star::uno; using namespace com::sun::star::lang; @@ -63,19 +63,19 @@ using namespace com::sun::star::container; using namespace ::com::sun::star::frame; //_________________________________________________________________________________________________________________ -// Namespace +// Namespace //_________________________________________________________________________________________________________________ -// +// namespace framework { //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** -DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( ToolbarControllerFactory , - ::cppu::OWeakObject , - SERVICENAME_TOOLBARCONTROLLERFACTORY , +DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( ToolbarControllerFactory , + ::cppu::OWeakObject , + SERVICENAME_TOOLBARCONTROLLERFACTORY , IMPLEMENTATIONNAME_TOOLBARCONTROLLERFACTORY ) @@ -101,26 +101,26 @@ ToolbarControllerFactory::ToolbarControllerFactory( const Reference< XMultiServi ToolbarControllerFactory::~ToolbarControllerFactory() { ResetableGuard aLock( m_aLock ); - + // reduce reference count m_pConfigAccess->release(); } // XMultiComponentFactory -Reference< XInterface > SAL_CALL ToolbarControllerFactory::createInstanceWithContext( - const ::rtl::OUString& aServiceSpecifier, +Reference< XInterface > SAL_CALL ToolbarControllerFactory::createInstanceWithContext( + const ::rtl::OUString& aServiceSpecifier, const Reference< XComponentContext >& ) throw (Exception, RuntimeException) { // SAFE ResetableGuard aLock( m_aLock ); - + if ( !m_bConfigRead ) { m_bConfigRead = sal_True; m_pConfigAccess->readConfigurationData(); } - + rtl::OUString aServiceName = m_pConfigAccess->getServiceFromCommandModule( aServiceSpecifier, rtl::OUString() ); if ( aServiceName.getLength() > 0 ) return m_xServiceManager->createInstance( aServiceName ); @@ -129,18 +129,18 @@ throw (Exception, RuntimeException) // SAFE } -Reference< XInterface > SAL_CALL ToolbarControllerFactory::createInstanceWithArgumentsAndContext( - const ::rtl::OUString& ServiceSpecifier, - const Sequence< Any >& Arguments, +Reference< XInterface > SAL_CALL ToolbarControllerFactory::createInstanceWithArgumentsAndContext( + const ::rtl::OUString& ServiceSpecifier, + const Sequence< Any >& Arguments, const Reference< XComponentContext >& ) throw (Exception, RuntimeException) { const rtl::OUString aPropModuleName( RTL_CONSTASCII_USTRINGPARAM( "ModuleName" )); const rtl::OUString aPropValueName( RTL_CONSTASCII_USTRINGPARAM( "Value" )); - + rtl::OUString aPropName; PropertyValue aPropValue; - + // Retrieve the optional module name form the Arguments sequence. It is used as a part of // the hash map key to support different controller implementation for the same URL but different // module!! @@ -152,9 +152,9 @@ throw (Exception, RuntimeException) break; } } - + Sequence< Any > aNewArgs( Arguments ); - + sal_Int32 nAppendIndex = aNewArgs.getLength(); bool bHasValue = m_pConfigAccess->hasValue(); aNewArgs.realloc( aNewArgs.getLength() + (bHasValue ? 2 : 1) ); @@ -164,7 +164,7 @@ throw (Exception, RuntimeException) aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CommandURL" )); aPropValue.Value <<= ServiceSpecifier; aNewArgs[nAppendIndex] <<= aPropValue; - + if ( bHasValue ) { // Append the optional value argument. It's an empty string if no additional info @@ -178,20 +178,20 @@ throw (Exception, RuntimeException) { // SAFE ResetableGuard aLock( m_aLock ); - + if ( !m_bConfigRead ) { m_bConfigRead = sal_True; m_pConfigAccess->readConfigurationData(); } - + rtl::OUString aServiceName = m_pConfigAccess->getServiceFromCommandModule( ServiceSpecifier, aPropName ); Reference< XMultiServiceFactory > xServiceManager( m_xServiceManager ); - + aLock.unlock(); // SAFE - + if ( aServiceName.getLength() > 0 ) return xServiceManager->createInstanceWithArguments( aServiceName, aNewArgs ); else @@ -206,9 +206,9 @@ throw (RuntimeException) } // XUIControllerRegistration -sal_Bool SAL_CALL ToolbarControllerFactory::hasController( - const ::rtl::OUString& aCommandURL, - const rtl::OUString& aModuleName ) +sal_Bool SAL_CALL ToolbarControllerFactory::hasController( + const ::rtl::OUString& aCommandURL, + const rtl::OUString& aModuleName ) throw (::com::sun::star::uno::RuntimeException) { ResetableGuard aLock( m_aLock ); @@ -218,19 +218,19 @@ throw (::com::sun::star::uno::RuntimeException) m_bConfigRead = sal_True; m_pConfigAccess->readConfigurationData(); } - + return ( m_pConfigAccess->getServiceFromCommandModule( aCommandURL, aModuleName ).getLength() > 0 ); } -void SAL_CALL ToolbarControllerFactory::registerController( - const ::rtl::OUString& aCommandURL, - const ::rtl::OUString& aModuleName, - const ::rtl::OUString& aControllerImplementationName ) +void SAL_CALL ToolbarControllerFactory::registerController( + const ::rtl::OUString& aCommandURL, + const ::rtl::OUString& aModuleName, + const ::rtl::OUString& aControllerImplementationName ) throw (RuntimeException) { // SAFE ResetableGuard aLock( m_aLock ); - + if ( !m_bConfigRead ) { m_bConfigRead = sal_True; @@ -241,14 +241,14 @@ throw (RuntimeException) // SAFE } -void SAL_CALL ToolbarControllerFactory::deregisterController( - const ::rtl::OUString& aCommandURL, - const rtl::OUString& aModuleName ) +void SAL_CALL ToolbarControllerFactory::deregisterController( + const ::rtl::OUString& aCommandURL, + const rtl::OUString& aModuleName ) throw (RuntimeException) { // SAFE ResetableGuard aLock( m_aLock ); - + if ( !m_bConfigRead ) { m_bConfigRead = sal_True; diff --git a/framework/source/uifactory/toolboxfactory.cxx b/framework/source/uifactory/toolboxfactory.cxx index 502ee251dff9..f2e9aa9bc0d2 100644 --- a/framework/source/uifactory/toolboxfactory.cxx +++ b/framework/source/uifactory/toolboxfactory.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,13 +30,13 @@ #include <uifactory/toolboxfactory.hxx> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <uielement/toolbarwrapper.hxx> #include <threadhelp/resetableguard.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XFrame.hpp> @@ -49,14 +49,14 @@ #endif //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> #include <tools/urlobj.hxx> #include <rtl/ustrbuf.hxx> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ // @@ -71,11 +71,11 @@ namespace framework { //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** -DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( ToolBoxFactory , - ::cppu::OWeakObject , - SERVICENAME_TOOLBARFACTORY , +DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( ToolBoxFactory , + ::cppu::OWeakObject , + SERVICENAME_TOOLBARFACTORY , IMPLEMENTATIONNAME_TOOLBARFACTORY ) diff --git a/framework/source/uifactory/uielementfactorymanager.cxx b/framework/source/uifactory/uielementfactorymanager.cxx index 6579d985eb00..171acce9cb72 100644 --- a/framework/source/uifactory/uielementfactorymanager.cxx +++ b/framework/source/uifactory/uielementfactorymanager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <uifactory/uielementfactorymanager.hxx> #include <uifactory/windowcontentfactorymanager.hxx> @@ -37,7 +37,7 @@ #include "services.h" //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -47,7 +47,7 @@ #include <com/sun/star/frame/XFrame.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <rtl/ustrbuf.hxx> #include <cppuhelper/weak.hxx> @@ -55,9 +55,9 @@ #include <vcl/svapp.hxx> #include <rtl/logfile.hxx> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ -// +// using namespace com::sun::star::uno; using namespace com::sun::star::lang; @@ -68,9 +68,9 @@ using namespace ::com::sun::star::ui; using namespace ::com::sun::star::frame; //_________________________________________________________________________________________________________________ -// Namespace +// Namespace //_________________________________________________________________________________________________________________ -// +// namespace framework { @@ -88,7 +88,7 @@ rtl::OUString getHashKeyFromStrings( const rtl::OUString& aType, const rtl::OUSt //***************************************************************************************************************** -// Configuration access class for UIElementFactoryManager implementation +// Configuration access class for UIElementFactoryManager implementation //***************************************************************************************************************** @@ -111,7 +111,7 @@ ConfigurationAccess_FactoryManager::~ConfigurationAccess_FactoryManager() { // SAFE ResetableGuard aLock( m_aLock ); - + Reference< XContainer > xContainer( m_xConfigAccess, UNO_QUERY ); if ( xContainer.is() ) xContainer->removeContainerListener( this ); @@ -123,7 +123,7 @@ rtl::OUString ConfigurationAccess_FactoryManager::getFactorySpecifierFromTypeNam // SAFE ResetableGuard aLock( m_aLock ); - FactoryManagerMap::const_iterator pIter = + FactoryManagerMap::const_iterator pIter = m_aFactoryManagerMap.find( getHashKeyFromStrings( rType, rName, rModule )); if ( pIter != m_aFactoryManagerMap.end() ) return pIter->second; @@ -149,7 +149,7 @@ rtl::OUString ConfigurationAccess_FactoryManager::getFactorySpecifierFromTypeNam return pIter->second; } } - + return rtl::OUString(); } @@ -162,7 +162,7 @@ void ConfigurationAccess_FactoryManager::addFactorySpecifierToTypeNameModule( co rtl::OUString aHashKey = getHashKeyFromStrings( rType, rName, rModule ); FactoryManagerMap::const_iterator pIter = m_aFactoryManagerMap.find( aHashKey ); - + if ( pIter != m_aFactoryManagerMap.end() ) throw ElementExistException(); else @@ -175,11 +175,11 @@ void ConfigurationAccess_FactoryManager::removeFactorySpecifierFromTypeNameModul RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::removeFactorySpecifierFromTypeNameModule" ); // SAFE ResetableGuard aLock( m_aLock ); - + rtl::OUString aHashKey = getHashKeyFromStrings( rType, rName, rModule ); FactoryManagerMap::const_iterator pIter = m_aFactoryManagerMap.find( aHashKey ); - + if ( pIter == m_aFactoryManagerMap.end() ) throw NoSuchElementException(); else @@ -191,7 +191,7 @@ Sequence< Sequence< PropertyValue > > ConfigurationAccess_FactoryManager::getFac RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::getFactoriesDescription" ); // SAFE ResetableGuard aLock( m_aLock ); - + Sequence< Sequence< PropertyValue > > aSeqSeq; sal_Int32 nIndex( 0 ); @@ -219,10 +219,10 @@ Sequence< Sequence< PropertyValue > > ConfigurationAccess_FactoryManager::getFac aSeq[2].Value = makeAny( aFactory.getToken( 0, '^', nToken )); } } - + aSeqSeq[nIndex++] = aSeq; } - + ++pIter; } @@ -237,7 +237,7 @@ void SAL_CALL ConfigurationAccess_FactoryManager::elementInserted( const Contain rtl::OUString aName; rtl::OUString aModule; rtl::OUString aService; - + // SAFE ResetableGuard aLock( m_aLock ); @@ -257,10 +257,10 @@ void SAL_CALL ConfigurationAccess_FactoryManager::elementRemoved ( const Contain rtl::OUString aName; rtl::OUString aModule; rtl::OUString aService; - + // SAFE ResetableGuard aLock( m_aLock ); - + if ( impl_getElementProps( aEvent.Element, aType, aName, aModule, aService )) { // Create hash key from command and model as they are together a primary key to @@ -277,7 +277,7 @@ void SAL_CALL ConfigurationAccess_FactoryManager::elementReplaced( const Contain rtl::OUString aName; rtl::OUString aModule; rtl::OUString aService; - + // SAFE ResetableGuard aLock( m_aLock ); @@ -298,7 +298,7 @@ void SAL_CALL ConfigurationAccess_FactoryManager::disposing( const EventObject& // SAFE // remove our reference to the config access ResetableGuard aLock( m_aLock ); - m_xConfigAccess.clear(); + m_xConfigAccess.clear(); } void ConfigurationAccess_FactoryManager::readConfigurationData() @@ -306,16 +306,16 @@ void ConfigurationAccess_FactoryManager::readConfigurationData() RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::readConfigurationData" ); // SAFE ResetableGuard aLock( m_aLock ); - + if ( !m_bConfigAccessInitialized ) { Sequence< Any > aArgs( 1 ); PropertyValue aPropValue; - + aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" )); aPropValue.Value <<= m_sRoot; aArgs[0] <<= aPropValue; - + try { m_xConfigAccess.set( m_xConfigProvider->createInstanceWithArguments(SERVICENAME_CFGREADACCESS,aArgs ), UNO_QUERY ); @@ -323,14 +323,14 @@ void ConfigurationAccess_FactoryManager::readConfigurationData() catch ( WrappedTargetException& ) { } - + m_bConfigAccessInitialized = sal_True; } - + if ( m_xConfigAccess.is() ) { Sequence< rtl::OUString > aUIElementFactories = m_xConfigAccess->getElementNames(); - + rtl::OUString aType; rtl::OUString aName; rtl::OUString aModule; @@ -347,7 +347,7 @@ void ConfigurationAccess_FactoryManager::readConfigurationData() m_aFactoryManagerMap.insert( FactoryManagerMap::value_type( aHashKey, aService )); } } - + Reference< XContainer > xContainer( m_xConfigAccess, UNO_QUERY ); aLock.unlock(); // UNSAFE @@ -385,10 +385,10 @@ sal_Bool ConfigurationAccess_FactoryManager::impl_getElementProps( const Any& aE } //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** -DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( UIElementFactoryManager , - ::cppu::OWeakObject , +DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( UIElementFactoryManager , + ::cppu::OWeakObject , SERVICENAME_UIELEMENTFACTORYMANAGER , IMPLEMENTATIONNAME_UIELEMENTFACTORYMANAGER ) @@ -409,33 +409,33 @@ UIElementFactoryManager::UIElementFactoryManager( const Reference< XMultiService UIElementFactoryManager::~UIElementFactoryManager() { ResetableGuard aLock( m_aLock ); - + // reduce reference count m_pConfigAccess->release(); } // XUIElementFactory -Reference< XUIElement > SAL_CALL UIElementFactoryManager::createUIElement( - const ::rtl::OUString& ResourceURL, +Reference< XUIElement > SAL_CALL UIElementFactoryManager::createUIElement( + const ::rtl::OUString& ResourceURL, const Sequence< PropertyValue >& Args ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::createUIElement" ); // SAFE ResetableGuard aLock( m_aLock ); - + if ( !m_bConfigRead ) { m_bConfigRead = sal_True; m_pConfigAccess->readConfigurationData(); } - + const rtl::OUString aPropFrame( RTL_CONSTASCII_USTRINGPARAM( "Frame" )); - + rtl::OUString aModuleId; PropertyValue aPropValue; Reference< XFrame > xFrame; - + // Retrieve the frame instance from the arguments to determine the module identifier. This must be provided // to the search function. An empty module identifier is provided if the frame is missing or the module id cannot // retrieve from it. @@ -444,7 +444,7 @@ throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::l if ( Args[i].Name.equals( aPropFrame )) Args[i].Value >>= xFrame; } - + Reference< XModuleManager > xManager( m_xModuleManager ); aLock.unlock(); @@ -453,7 +453,7 @@ throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::l { if ( xFrame.is() && xManager.is() ) aModuleId = xManager->identify( Reference< XInterface >( xFrame, UNO_QUERY ) ); - + Reference< XUIElementFactory > xUIElementFactory = getFactory( ResourceURL, aModuleId ); if ( xUIElementFactory.is() ) return xUIElementFactory->createUIElement( ResourceURL, Args ); @@ -466,19 +466,19 @@ throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::l } // XUIElementFactoryRegistration -Sequence< Sequence< PropertyValue > > SAL_CALL UIElementFactoryManager::getRegisteredFactories() +Sequence< Sequence< PropertyValue > > SAL_CALL UIElementFactoryManager::getRegisteredFactories() throw ( RuntimeException ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::getRegisteredFactories" ); // SAFE ResetableGuard aLock( m_aLock ); - + if ( !m_bConfigRead ) { m_bConfigRead = sal_True; m_pConfigAccess->readConfigurationData(); } - + return m_pConfigAccess->getFactoriesDescription(); } @@ -493,16 +493,16 @@ throw ( RuntimeException ) m_bConfigRead = sal_True; m_pConfigAccess->readConfigurationData(); } - + rtl::OUString aType; rtl::OUString aName; - + WindowContentFactoryManager::RetrieveTypeNameFromResourceURL( aResourceURL, aType, aName ); - + Reference< XMultiServiceFactory > xSManager( m_xServiceManager ); - + rtl::OUString aServiceSpecifier = m_pConfigAccess->getFactorySpecifierFromTypeNameModule( aType, aName, aModuleId ); - + aLock.unlock(); if ( aServiceSpecifier.getLength() ) return Reference< XUIElementFactory >( xSManager->createInstance( aServiceSpecifier ), UNO_QUERY ); @@ -510,13 +510,13 @@ throw ( RuntimeException ) return Reference< XUIElementFactory >(); } -void SAL_CALL UIElementFactoryManager::registerFactory( const ::rtl::OUString& aType, const ::rtl::OUString& aName, const ::rtl::OUString& aModuleId, const ::rtl::OUString& aFactoryImplementationName ) +void SAL_CALL UIElementFactoryManager::registerFactory( const ::rtl::OUString& aType, const ::rtl::OUString& aName, const ::rtl::OUString& aModuleId, const ::rtl::OUString& aFactoryImplementationName ) throw ( ElementExistException, RuntimeException ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::registerFactory" ); // SAFE ResetableGuard aLock( m_aLock ); - + if ( !m_bConfigRead ) { m_bConfigRead = sal_True; @@ -533,7 +533,7 @@ throw ( NoSuchElementException, RuntimeException ) RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::deregisterFactory" ); // SAFE ResetableGuard aLock( m_aLock ); - + if ( !m_bConfigRead ) { m_bConfigRead = sal_True; diff --git a/framework/source/uifactory/windowcontentfactorymanager.cxx b/framework/source/uifactory/windowcontentfactorymanager.cxx index fb70fdb942b5..352fc1ad21f7 100644 --- a/framework/source/uifactory/windowcontentfactorymanager.cxx +++ b/framework/source/uifactory/windowcontentfactorymanager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <uifactory/windowcontentfactorymanager.hxx> #include <uifactory/uielementfactorymanager.hxx> @@ -37,7 +37,7 @@ #include "services.h" //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -50,7 +50,7 @@ #include <com/sun/star/awt/XControl.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <rtl/ustrbuf.hxx> #include <cppuhelper/weak.hxx> @@ -58,25 +58,25 @@ #include <vcl/svapp.hxx> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ -// +// using namespace ::com::sun::star; //_________________________________________________________________________________________________________________ -// Namespace +// Namespace //_________________________________________________________________________________________________________________ -// +// namespace framework { //***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo +// XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** -DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( WindowContentFactoryManager , - ::cppu::OWeakObject , +DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( WindowContentFactoryManager , + ::cppu::OWeakObject , SERVICENAME_WINDOWCONTENTFACTORYMANAGER , IMPLEMENTATIONNAME_WINDOWCONTENTFACTORYMANAGER ) @@ -96,7 +96,7 @@ WindowContentFactoryManager::WindowContentFactoryManager( const uno::Reference< WindowContentFactoryManager::~WindowContentFactoryManager() { ResetableGuard aLock( m_aLock ); - + // reduce reference count m_pConfigAccess->release(); } @@ -131,8 +131,8 @@ void WindowContentFactoryManager::RetrieveTypeNameFromResourceURL( const rtl::OU } // XSingleComponentFactory -uno::Reference< uno::XInterface > SAL_CALL WindowContentFactoryManager::createInstanceWithContext( - const uno::Reference< uno::XComponentContext >& /*xContext*/ ) +uno::Reference< uno::XInterface > SAL_CALL WindowContentFactoryManager::createInstanceWithContext( + const uno::Reference< uno::XComponentContext >& /*xContext*/ ) throw (uno::Exception, uno::RuntimeException) { /* @@ -140,10 +140,10 @@ throw (uno::Exception, uno::RuntimeException) code to get a handle to the dialog model. uno::Reference< lang::XMultiServiceFactory > xServiceManager( xContext->getServiceManager(), uno::UNO_QUERY ); - + const ::rtl::OUString sToolkitService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.Toolkit")); uno::Reference< awt::XToolkit > xToolkit( xServiceManager->createInstance( sToolkitService ), uno::UNO_QUERY_THROW ); - + const ::rtl::OUString sDialogModelService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlDialogModel")); uno::Reference< awt::XControlModel > xDialogModel( xServiceManager->createInstance( sDialogModelService ), uno::UNO_QUERY_THROW ); @@ -155,7 +155,7 @@ throw (uno::Exception, uno::RuntimeException) uno::Reference< awt::XControl > xDialogControl( xServiceManager->createInstance( sDialogService ), uno::UNO_QUERY_THROW ); xDialogControl->setModel( xDialogModel ); - + uno::Reference< awt::XWindowPeer > xWindowParentPeer( xToolkit->getDesktopWindow(), uno::UNO_QUERY ); xDialogControl->createPeer( xToolkit, xWindowParentPeer ); uno::Reference< uno::XInterface > xWindow( xDialogControl->getPeer(), uno::UNO_QUERY ); @@ -164,8 +164,8 @@ throw (uno::Exception, uno::RuntimeException) return xWindow; } -uno::Reference< uno::XInterface > SAL_CALL WindowContentFactoryManager::createInstanceWithArgumentsAndContext( - const uno::Sequence< uno::Any >& Arguments, const uno::Reference< uno::XComponentContext >& Context ) +uno::Reference< uno::XInterface > SAL_CALL WindowContentFactoryManager::createInstanceWithArgumentsAndContext( + const uno::Sequence< uno::Any >& Arguments, const uno::Reference< uno::XComponentContext >& Context ) throw (uno::Exception, uno::RuntimeException) { uno::Reference< uno::XInterface > xWindow; @@ -185,13 +185,13 @@ throw (uno::Exception, uno::RuntimeException) } uno::Reference< frame::XModuleManager > xModuleManager; - // SAFE + // SAFE { ResetableGuard aLock( m_aLock ); xModuleManager = m_xModuleManager; } // UNSAFE - + // Determine the module identifier ::rtl::OUString aType; ::rtl::OUString aName; @@ -206,16 +206,16 @@ throw (uno::Exception, uno::RuntimeException) } RetrieveTypeNameFromResourceURL( aResourceURL, aType, aName ); - if ( aType.getLength() > 0 && - aName.getLength() > 0 && + if ( aType.getLength() > 0 && + aName.getLength() > 0 && aModuleId.getLength() > 0 ) { ::rtl::OUString aImplementationName; uno::Reference< uno::XInterface > xHolder( static_cast<cppu::OWeakObject*>(this), uno::UNO_QUERY ); - + // Detetmine the implementation name of the window content factory dependent on the // module identifier, user interface element type and name - // SAFE + // SAFE ResetableGuard aLock( m_aLock ); if ( !m_bConfigRead ) @@ -233,7 +233,7 @@ throw (uno::Exception, uno::RuntimeException) uno::Reference< lang::XMultiServiceFactory > xServiceManager( Context->getServiceManager(), uno::UNO_QUERY ); if ( xServiceManager.is() ) { - uno::Reference< lang::XSingleComponentFactory > xFactory( + uno::Reference< lang::XSingleComponentFactory > xFactory( xServiceManager->createInstance( aImplementationName ), uno::UNO_QUERY ); if ( xFactory.is() ) { @@ -252,7 +252,7 @@ throw (uno::Exception, uno::RuntimeException) } } } - + // UNSAFE if ( !xWindow.is()) { diff --git a/framework/source/unotypes/fwk.xml b/framework/source/unotypes/fwk.xml index f9274345909f..1cd72a64fa87 100644 --- a/framework/source/unotypes/fwk.xml +++ b/framework/source/unotypes/fwk.xml @@ -132,7 +132,7 @@ <status value="final"/> <supported-service> com.sun.star.frame.ProtocolHandler </supported-service> </component-description> - + <component-description> <author> Carsten Driesner </author> <name> com.sun.star.comp.framework.LayoutManager </name> @@ -144,7 +144,7 @@ <status value="final"/> <supported-service> com.sun.star.frame.LayoutManager </supported-service> </component-description> - + <component-description> <author> Carsten Driesner </author> <name> com.sun.star.comp.framework.PopupMenuControllerFactory </name> @@ -156,7 +156,7 @@ <status value="final"/> <supported-service> com.sun.star.frame.PopupMenuControllerFactory </supported-service> </component-description> - + <component-description> <author> Carsten Driesner </author> <name> com.sun.star.comp.framework.FontMenuController </name> @@ -290,7 +290,7 @@ <status value="final"/> <supported-service> com.sun.star.frame.ModuleManager </supported-service> </component-description> - + <component-description> <author> Carsten Driesner </author> <name> com.sun.star.comp.framework.UIConfigurationManager </name> @@ -303,7 +303,7 @@ <status value="final"/> <supported-service> com.sun.star.ui.UIConfigurationManager </supported-service> </component-description> - + <component-description> <author> Carsten Driesner </author> <name> com.sun.star.comp.framework.ModuleUIConfigurationManagerSupplier </name> @@ -391,7 +391,7 @@ <status value="final"/> <supported-service> com.sun.star.ui.ToolBarFactory </supported-service> </component-description> - + <component-description> <author> Carsten Driesner </author> <name> com.sun.star.comp.framework.ToolBarControllerFactory </name> @@ -403,7 +403,7 @@ <status value="final"/> <supported-service> com.sun.star.frame.ToolBarControllerFactory </supported-service> </component-description> - + <component-description> <author> Carsten Driesner </author> <name> com.sun.star.comp.framework.StatusbarFactory </name> @@ -415,7 +415,7 @@ <status value="final"/> <supported-service> com.sun.star.ui.StatusbarFactory </supported-service> </component-description> - + <component-description> <author> Carsten Driesner </author> <name> com.sun.star.comp.framework.StatusbarControllerFactory </name> @@ -428,32 +428,32 @@ <supported-service> com.sun.star.frame.StatusbarControllerFactory </supported-service> </component-description> - <project-build-dependency> cppu </project-build-dependency> - <project-build-dependency> cppuhelper </project-build-dependency> - <project-build-dependency> vos </project-build-dependency> - <project-build-dependency> sal </project-build-dependency> - <project-build-dependency> tools </project-build-dependency> - <project-build-dependency> svtools </project-build-dependency> - <project-build-dependency> toolkit </project-build-dependency> - <project-build-dependency> sv </project-build-dependency> - <project-build-dependency> comphelper </project-build-dependency> - <project-build-dependency> unotools </project-build-dependency> - <project-build-dependency> ucbhelper </project-build-dependency> - <project-build-dependency> svl </project-build-dependency> - <project-build-dependency> sot </project-build-dependency> - - <runtime-module-dependency> cppu2 </runtime-module-dependency> - <runtime-module-dependency> cppuhelper </runtime-module-dependency> - <runtime-module-dependency> vos2$(COM) </runtime-module-dependency> - <runtime-module-dependency> sal2 </runtime-module-dependency> - <runtime-module-dependency> tl </runtime-module-dependency> - <runtime-module-dependency> svt </runtime-module-dependency> - <runtime-module-dependency> svl </runtime-module-dependency> - <runtime-module-dependency> tk </runtime-module-dependency> - <runtime-module-dependency> sv </runtime-module-dependency> - <runtime-module-dependency> comphelp2 </runtime-module-dependency> - <runtime-module-dependency> utl </runtime-module-dependency> - <runtime-module-dependency> ucb </runtime-module-dependency> - <runtime-module-dependency> sot </runtime-module-dependency> + <project-build-dependency> cppu </project-build-dependency> + <project-build-dependency> cppuhelper </project-build-dependency> + <project-build-dependency> vos </project-build-dependency> + <project-build-dependency> sal </project-build-dependency> + <project-build-dependency> tools </project-build-dependency> + <project-build-dependency> svtools </project-build-dependency> + <project-build-dependency> toolkit </project-build-dependency> + <project-build-dependency> sv </project-build-dependency> + <project-build-dependency> comphelper </project-build-dependency> + <project-build-dependency> unotools </project-build-dependency> + <project-build-dependency> ucbhelper </project-build-dependency> + <project-build-dependency> svl </project-build-dependency> + <project-build-dependency> sot </project-build-dependency> + + <runtime-module-dependency> cppu2 </runtime-module-dependency> + <runtime-module-dependency> cppuhelper </runtime-module-dependency> + <runtime-module-dependency> vos2$(COM) </runtime-module-dependency> + <runtime-module-dependency> sal2 </runtime-module-dependency> + <runtime-module-dependency> tl </runtime-module-dependency> + <runtime-module-dependency> svt </runtime-module-dependency> + <runtime-module-dependency> svl </runtime-module-dependency> + <runtime-module-dependency> tk </runtime-module-dependency> + <runtime-module-dependency> sv </runtime-module-dependency> + <runtime-module-dependency> comphelp2 </runtime-module-dependency> + <runtime-module-dependency> utl </runtime-module-dependency> + <runtime-module-dependency> ucb </runtime-module-dependency> + <runtime-module-dependency> sot </runtime-module-dependency> </module-description> diff --git a/framework/source/unotypes/fwl.xml b/framework/source/unotypes/fwl.xml index f91b01c22cf8..4d652ef7b0ec 100644 --- a/framework/source/unotypes/fwl.xml +++ b/framework/source/unotypes/fwl.xml @@ -78,20 +78,20 @@ <supported-service> com.sun.star.util.PathSettings </supported-service> </component-description> - <project-build-dependency> cppu </project-build-dependency> - <project-build-dependency> cppuhelper </project-build-dependency> - <project-build-dependency> comphelper </project-build-dependency> - <project-build-dependency> tools </project-build-dependency> - <project-build-dependency> vos </project-build-dependency> - <project-build-dependency> sal </project-build-dependency> - <project-build-dependency> svl </project-build-dependency> + <project-build-dependency> cppu </project-build-dependency> + <project-build-dependency> cppuhelper </project-build-dependency> + <project-build-dependency> comphelper </project-build-dependency> + <project-build-dependency> tools </project-build-dependency> + <project-build-dependency> vos </project-build-dependency> + <project-build-dependency> sal </project-build-dependency> + <project-build-dependency> svl </project-build-dependency> - <runtime-module-dependency> cppu2 </runtime-module-dependency> - <runtime-module-dependency> cppuhelper </runtime-module-dependency> - <runtime-module-dependency> comphelp2 </runtime-module-dependency> - <runtime-module-dependency> tl </runtime-module-dependency> - <runtime-module-dependency> vos2$(COM) </runtime-module-dependency> - <runtime-module-dependency> sal2 </runtime-module-dependency> - <runtime-module-dependency> svl </runtime-module-dependency> + <runtime-module-dependency> cppu2 </runtime-module-dependency> + <runtime-module-dependency> cppuhelper </runtime-module-dependency> + <runtime-module-dependency> comphelp2 </runtime-module-dependency> + <runtime-module-dependency> tl </runtime-module-dependency> + <runtime-module-dependency> vos2$(COM) </runtime-module-dependency> + <runtime-module-dependency> sal2 </runtime-module-dependency> + <runtime-module-dependency> svl </runtime-module-dependency> </module-description> diff --git a/framework/source/unotypes/lgd.xml b/framework/source/unotypes/lgd.xml index d62a77c6c09e..278d8f97b3bc 100644 --- a/framework/source/unotypes/lgd.xml +++ b/framework/source/unotypes/lgd.xml @@ -17,18 +17,18 @@ <supported-service> com.sun.star.comp.framework.LoginDialog </supported-service> </component-description> - <project-build-dependency> cppu </project-build-dependency> - <project-build-dependency> cppuhelper </project-build-dependency> - <project-build-dependency> vos </project-build-dependency> - <project-build-dependency> sal </project-build-dependency> - <project-build-dependency> sv </project-build-dependency> - <project-build-dependency> tools </project-build-dependency> + <project-build-dependency> cppu </project-build-dependency> + <project-build-dependency> cppuhelper </project-build-dependency> + <project-build-dependency> vos </project-build-dependency> + <project-build-dependency> sal </project-build-dependency> + <project-build-dependency> sv </project-build-dependency> + <project-build-dependency> tools </project-build-dependency> - <runtime-module-dependency> cppu2 </runtime-module-dependency> - <runtime-module-dependency> cppuhelper </runtime-module-dependency> - <runtime-module-dependency> vos2$(COM) </runtime-module-dependency> - <runtime-module-dependency> sal2 </runtime-module-dependency> - <runtime-module-dependency> tl </runtime-module-dependency> - <runtime-module-dependency> sv </runtime-module-dependency> + <runtime-module-dependency> cppu2 </runtime-module-dependency> + <runtime-module-dependency> cppuhelper </runtime-module-dependency> + <runtime-module-dependency> vos2$(COM) </runtime-module-dependency> + <runtime-module-dependency> sal2 </runtime-module-dependency> + <runtime-module-dependency> tl </runtime-module-dependency> + <runtime-module-dependency> sv </runtime-module-dependency> </module-description> diff --git a/framework/source/xml/acceleratorconfigurationreader.cxx b/framework/source/xml/acceleratorconfigurationreader.cxx index 8ab3a1bc0e63..418280360bf0 100644 --- a/framework/source/xml/acceleratorconfigurationreader.cxx +++ b/framework/source/xml/acceleratorconfigurationreader.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,13 +57,13 @@ namespace framework{ //----------------------------------------------- /* Throws a SaxException in case a wrong formated XML structure was detected. - + This macro combined the given comment with a generic way to find out the XML line (where the error occured) to format a suitable message. - + @param COMMENT - an ascii string, which describe the problem. + an ascii string, which describe the problem. */ #define THROW_PARSEEXCEPTION(COMMENT) \ { \ @@ -77,12 +77,12 @@ namespace framework{ css::uno::Any()); \ } -//----------------------------------------------- +//----------------------------------------------- // XInterface DEFINE_XINTERFACE_1(AcceleratorConfigurationReader , OWeakObject , DIRECT_INTERFACE(css::xml::sax::XDocumentHandler)) - + //----------------------------------------------- AcceleratorConfigurationReader::AcceleratorConfigurationReader(AcceleratorCache& rContainer) : ThreadHelpBase (&Application::GetSolarMutex()) @@ -92,12 +92,12 @@ AcceleratorConfigurationReader::AcceleratorConfigurationReader(AcceleratorCache& , m_bInsideAcceleratorItem(sal_False ) { } - + //----------------------------------------------- AcceleratorConfigurationReader::~AcceleratorConfigurationReader() { } - + //----------------------------------------------- void SAL_CALL AcceleratorConfigurationReader::startDocument() throw(css::xml::sax::SAXException, @@ -129,7 +129,7 @@ void SAL_CALL AcceleratorConfigurationReader::startElement(const ::rtl::OUString css::uno::RuntimeException ) { EXMLElement eElement = AcceleratorConfigurationReader::implst_classifyElement(sElement); - + // Note: We handle "accel:item" before "accel:acceleratorlist" to perform this operation. // Because an item occures very often ... a list should occure one times only! if (eElement == E_ELEMENT_ITEM) @@ -139,10 +139,10 @@ void SAL_CALL AcceleratorConfigurationReader::startElement(const ::rtl::OUString if (m_bInsideAcceleratorItem) THROW_PARSEEXCEPTION("An element \"accel:item\" is not a container.") m_bInsideAcceleratorItem = sal_True; - - ::rtl::OUString sCommand; + + ::rtl::OUString sCommand; css::awt::KeyEvent aEvent ; - + sal_Int16 c = xAttributeList->getLength(); sal_Int16 i = 0; for (i=0; i<c; ++i) @@ -155,19 +155,19 @@ void SAL_CALL AcceleratorConfigurationReader::startElement(const ::rtl::OUString case E_ATTRIBUTE_URL : sCommand = sValue.intern(); break; - + case E_ATTRIBUTE_KEYCODE : aEvent.KeyCode = m_rKeyMapping->mapIdentifierToCode(sValue); break; - + case E_ATTRIBUTE_MOD_SHIFT : aEvent.Modifiers |= css::awt::KeyModifier::SHIFT; break; - + case E_ATTRIBUTE_MOD_MOD1 : aEvent.Modifiers |= css::awt::KeyModifier::MOD1; break; - + case E_ATTRIBUTE_MOD_MOD2 : aEvent.Modifiers |= css::awt::KeyModifier::MOD2; break; @@ -176,7 +176,7 @@ void SAL_CALL AcceleratorConfigurationReader::startElement(const ::rtl::OUString aEvent.Modifiers |= css::awt::KeyModifier::MOD3; } } - + // validate command and key event. if ( (!sCommand.getLength()) || @@ -185,7 +185,7 @@ void SAL_CALL AcceleratorConfigurationReader::startElement(const ::rtl::OUString { THROW_PARSEEXCEPTION("XML element does not describe a valid accelerator nor a valid command.") } - + // register key event + command inside cache ... // Check for already existing items there. if (!m_rContainer.hasKey(aEvent)) @@ -207,7 +207,7 @@ void SAL_CALL AcceleratorConfigurationReader::startElement(const ::rtl::OUString LOG_WARNING("AcceleratorConfigurationReader::startElement()", U2B(sMsg.makeStringAndClear())) } #endif // ENABLE_WARNINGS - } + } if (eElement == E_ELEMENT_ACCELERATORLIST) { @@ -224,7 +224,7 @@ void SAL_CALL AcceleratorConfigurationReader::endElement(const ::rtl::OUString& css::uno::RuntimeException ) { EXMLElement eElement = AcceleratorConfigurationReader::implst_classifyElement(sElement); - + // Note: We handle "accel:item" before "accel:acceleratorlist" to perform this operation. // Because an item occures very often ... a list should occure one times only! if (eElement == E_ELEMENT_ITEM) @@ -233,7 +233,7 @@ void SAL_CALL AcceleratorConfigurationReader::endElement(const ::rtl::OUString& THROW_PARSEEXCEPTION("Found end element 'accel:item', but no start element.") m_bInsideAcceleratorItem = sal_False; } - + if (eElement == E_ELEMENT_ACCELERATORLIST) { if (!m_bInsideAcceleratorList) @@ -276,7 +276,7 @@ void SAL_CALL AcceleratorConfigurationReader::setDocumentLocator(const css::uno: AcceleratorConfigurationReader::EXMLElement AcceleratorConfigurationReader::implst_classifyElement(const ::rtl::OUString& sElement) { AcceleratorConfigurationReader::EXMLElement eElement; - + if (sElement.equals(NS_ELEMENT_ACCELERATORLIST)) eElement = E_ELEMENT_ACCELERATORLIST; else @@ -286,15 +286,15 @@ AcceleratorConfigurationReader::EXMLElement AcceleratorConfigurationReader::impl throw css::uno::RuntimeException( DECLARE_ASCII("Unknown XML element detected!"), css::uno::Reference< css::xml::sax::XDocumentHandler >()); - - return eElement; + + return eElement; } //----------------------------------------------- AcceleratorConfigurationReader::EXMLAttribute AcceleratorConfigurationReader::implst_classifyAttribute(const ::rtl::OUString& sAttribute) { AcceleratorConfigurationReader::EXMLAttribute eAttribute; - + if (sAttribute.equals(NS_ATTRIBUTE_KEYCODE)) eAttribute = E_ATTRIBUTE_KEYCODE; else @@ -316,8 +316,8 @@ AcceleratorConfigurationReader::EXMLAttribute AcceleratorConfigurationReader::im throw css::uno::RuntimeException( DECLARE_ASCII("Unknown XML attribute detected!"), css::uno::Reference< css::xml::sax::XDocumentHandler >()); - - return eAttribute; + + return eAttribute; } //----------------------------------------------- @@ -325,7 +325,7 @@ AcceleratorConfigurationReader::EXMLAttribute AcceleratorConfigurationReader::im { if (!m_xLocator.is()) return DECLARE_ASCII("Error during parsing XML. (No further info available ...)"); - + ::rtl::OUStringBuffer sMsg(256); sMsg.appendAscii("Error during parsing XML in\nline = "); sMsg.append (m_xLocator->getLineNumber() ); diff --git a/framework/source/xml/acceleratorconfigurationwriter.cxx b/framework/source/xml/acceleratorconfigurationwriter.cxx index f08a7c324d38..f372067fa13a 100644 --- a/framework/source/xml/acceleratorconfigurationwriter.cxx +++ b/framework/source/xml/acceleratorconfigurationwriter.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,7 +77,7 @@ void AcceleratorConfigurationWriter::flush() css::uno::Reference< css::xml::sax::XDocumentHandler > xCFG = m_xConfig; css::uno::Reference< css::xml::sax::XExtendedDocumentHandler > xExtendedCFG(m_xConfig, css::uno::UNO_QUERY_THROW); - aReadLock.unlock(); + aReadLock.unlock(); // <- SAFE ---------------------------------- // prepare attribute list @@ -106,7 +106,7 @@ void AcceleratorConfigurationWriter::flush() const css::awt::KeyEvent& rKey = *pKey; const ::rtl::OUString& rCommand = m_rContainer.getCommandByKey(rKey); impl_ts_writeKeyCommandPair(rKey, rCommand, xCFG); - } + } /* TODO write key-command list std::vector< SfxAcceleratorConfigItem>::const_iterator p; diff --git a/framework/source/xml/eventsconfiguration.cxx b/framework/source/xml/eventsconfiguration.cxx index eb79b319844c..75a024eb8405 100644 --- a/framework/source/xml/eventsconfiguration.cxx +++ b/framework/source/xml/eventsconfiguration.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ #endif //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/xml/sax/XParser.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> @@ -44,7 +44,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #ifndef _UNOTOOLS_PROCESSFACTORY_HXX @@ -54,7 +54,7 @@ #include <tools/debug.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ using namespace ::com::sun::star::uno; diff --git a/framework/source/xml/eventsdocumenthandler.cxx b/framework/source/xml/eventsdocumenthandler.cxx index 4cc61462dcfe..a1cc33b02dad 100644 --- a/framework/source/xml/eventsdocumenthandler.cxx +++ b/framework/source/xml/eventsdocumenthandler.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ #include <stdio.h> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> @@ -39,7 +39,7 @@ #include <macros/debug.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #ifndef __COM_SUN_STAR_XML_SAX_XEXTENDEDDOCUMENTHANDLER_HPP_ @@ -47,7 +47,7 @@ #endif //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <sal/config.h> @@ -57,7 +57,7 @@ #include <comphelper/attributelist.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ using namespace ::com::sun::star::uno; @@ -65,40 +65,40 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::xml::sax; -#define XMLNS_EVENT "http://openoffice.org/2001/event" -#define XMLNS_XLINK "http://www.w3.org/1999/xlink" -#define XMLNS_EVENT_PREFIX "event:" -#define XMLNS_XLINK_PREFIX "xlink:" +#define XMLNS_EVENT "http://openoffice.org/2001/event" +#define XMLNS_XLINK "http://www.w3.org/1999/xlink" +#define XMLNS_EVENT_PREFIX "event:" +#define XMLNS_XLINK_PREFIX "xlink:" -#define ATTRIBUTE_XMLNS_EVENT "xmlns:event" -#define ATTRIBUTE_XMLNS_XLINK "xmlns:xlink" +#define ATTRIBUTE_XMLNS_EVENT "xmlns:event" +#define ATTRIBUTE_XMLNS_XLINK "xmlns:xlink" -#define XMLNS_FILTER_SEPARATOR "^" +#define XMLNS_FILTER_SEPARATOR "^" -#define ELEMENT_EVENTS "events" -#define ELEMENT_EVENT "event" +#define ELEMENT_EVENTS "events" +#define ELEMENT_EVENT "event" -#define ATTRIBUTE_LANGUAGE "language" -#define ATTRIBUTE_LIBRARY "library" -#define ATTRIBUTE_NAME "name" -#define ATTRIBUTE_HREF "href" -#define ATTRIBUTE_TYPE "type" -#define ATTRIBUTE_MACRONAME "macro-name" +#define ATTRIBUTE_LANGUAGE "language" +#define ATTRIBUTE_LIBRARY "library" +#define ATTRIBUTE_NAME "name" +#define ATTRIBUTE_HREF "href" +#define ATTRIBUTE_TYPE "type" +#define ATTRIBUTE_MACRONAME "macro-name" -#define ELEMENT_NS_EVENTS "event:events" -#define ELEMENT_NS_EVENT "event:event" +#define ELEMENT_NS_EVENTS "event:events" +#define ELEMENT_NS_EVENT "event:event" -#define ATTRIBUTE_TYPE_CDATA "CDATA" +#define ATTRIBUTE_TYPE_CDATA "CDATA" -#define EVENTS_DOCTYPE "<!DOCTYPE event:events PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"event.dtd\">" +#define EVENTS_DOCTYPE "<!DOCTYPE event:events PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"event.dtd\">" // Property names for events -#define PROP_EVENT_TYPE "EventType" -#define PROP_LIBRARY "Library" -#define PROP_SCRIPT "Script" -#define PROP_MACRO_NAME "MacroName" -#define STAR_BASIC "StarBasic" -#define JAVA_SCRIPT "JavaScript" +#define PROP_EVENT_TYPE "EventType" +#define PROP_LIBRARY "Library" +#define PROP_SCRIPT "Script" +#define PROP_MACRO_NAME "MacroName" +#define STAR_BASIC "StarBasic" +#define JAVA_SCRIPT "JavaScript" namespace framework @@ -106,20 +106,20 @@ namespace framework struct EventEntryProperty { - OReadEventsDocumentHandler::Event_XML_Namespace nNamespace; - char aEntryName[20]; + OReadEventsDocumentHandler::Event_XML_Namespace nNamespace; + char aEntryName[20]; }; static EventEntryProperty EventEntries[OReadEventsDocumentHandler::EV_XML_ENTRY_COUNT] = { - { OReadEventsDocumentHandler::EV_NS_EVENT, ELEMENT_EVENTS }, - { OReadEventsDocumentHandler::EV_NS_EVENT, ELEMENT_EVENT }, - { OReadEventsDocumentHandler::EV_NS_EVENT, ATTRIBUTE_LANGUAGE }, - { OReadEventsDocumentHandler::EV_NS_EVENT, ATTRIBUTE_NAME }, - { OReadEventsDocumentHandler::EV_NS_XLINK, ATTRIBUTE_HREF }, - { OReadEventsDocumentHandler::EV_NS_XLINK, ATTRIBUTE_TYPE }, - { OReadEventsDocumentHandler::EV_NS_EVENT, ATTRIBUTE_MACRONAME }, - { OReadEventsDocumentHandler::EV_NS_EVENT, ATTRIBUTE_LIBRARY } + { OReadEventsDocumentHandler::EV_NS_EVENT, ELEMENT_EVENTS }, + { OReadEventsDocumentHandler::EV_NS_EVENT, ELEMENT_EVENT }, + { OReadEventsDocumentHandler::EV_NS_EVENT, ATTRIBUTE_LANGUAGE }, + { OReadEventsDocumentHandler::EV_NS_EVENT, ATTRIBUTE_NAME }, + { OReadEventsDocumentHandler::EV_NS_XLINK, ATTRIBUTE_HREF }, + { OReadEventsDocumentHandler::EV_NS_XLINK, ATTRIBUTE_TYPE }, + { OReadEventsDocumentHandler::EV_NS_EVENT, ATTRIBUTE_MACRONAME }, + { OReadEventsDocumentHandler::EV_NS_EVENT, ATTRIBUTE_LIBRARY } }; @@ -150,9 +150,9 @@ OReadEventsDocumentHandler::OReadEventsDocumentHandler( EventsConfig& aItems ) : } } - m_bEventsStartFound = sal_False; - m_bEventsEndFound = sal_False; - m_bEventStartFound = sal_False; + m_bEventsStartFound = sal_False; + m_bEventsEndFound = sal_False; + m_bEventStartFound = sal_False; } OReadEventsDocumentHandler::~OReadEventsDocumentHandler() @@ -161,17 +161,17 @@ OReadEventsDocumentHandler::~OReadEventsDocumentHandler() // XDocumentHandler void SAL_CALL OReadEventsDocumentHandler::startDocument(void) -throw ( SAXException, RuntimeException ) +throw ( SAXException, RuntimeException ) { } void SAL_CALL OReadEventsDocumentHandler::endDocument(void) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { ResetableGuard aGuard( m_aLock ); if (( m_bEventsStartFound && !m_bEventsEndFound ) || - ( !m_bEventsStartFound && m_bEventsEndFound ) ) + ( !m_bEventsStartFound && m_bEventsEndFound ) ) { ::rtl::OUString aErrorMessage = getErrorLineString(); aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "No matching start or end element 'event:events' found!" )); @@ -181,7 +181,7 @@ throw( SAXException, RuntimeException ) void SAL_CALL OReadEventsDocumentHandler::startElement( const ::rtl::OUString& aName, const Reference< XAttributeList > &xAttribs ) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { ResetableGuard aGuard( m_aLock ); @@ -227,8 +227,8 @@ throw( SAXException, RuntimeException ) m_bEventStartFound = sal_True; - long nIndex = m_aEventItems.aEventNames.getLength(); - long nPropCount = 2; // every event config entry needs at least 2 properties + long nIndex = m_aEventItems.aEventNames.getLength(); + long nPropCount = 2; // every event config entry needs at least 2 properties Sequence< PropertyValue > aEventProperties( nPropCount ); m_aEventItems.aEventNames.realloc( nIndex + 1 ); @@ -337,7 +337,7 @@ throw( SAXException, RuntimeException ) } void SAL_CALL OReadEventsDocumentHandler::endElement(const ::rtl::OUString& aName) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { ResetableGuard aGuard( m_aLock ); @@ -379,24 +379,24 @@ throw( SAXException, RuntimeException ) } void SAL_CALL OReadEventsDocumentHandler::characters(const ::rtl::OUString&) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { } void SAL_CALL OReadEventsDocumentHandler::ignorableWhitespace(const ::rtl::OUString&) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { } void SAL_CALL OReadEventsDocumentHandler::processingInstruction( const ::rtl::OUString& /*aTarget*/, const ::rtl::OUString& /*aData*/ ) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { } void SAL_CALL OReadEventsDocumentHandler::setDocumentLocator( const Reference< XLocator > &xLocator) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { ResetableGuard aGuard( m_aLock ); @@ -420,7 +420,7 @@ throw( SAXException, RuntimeException ) //_________________________________________________________________________________________________________________ -// OWriteEventsDocumentHandler +// OWriteEventsDocumentHandler //_________________________________________________________________________________________________________________ OWriteEventsDocumentHandler::OWriteEventsDocumentHandler( @@ -431,10 +431,10 @@ OWriteEventsDocumentHandler::OWriteEventsDocumentHandler( m_xWriteDocumentHandler( rWriteDocumentHandler ) { ::comphelper::AttributeList* pList = new ::comphelper::AttributeList; - m_xEmptyList = Reference< XAttributeList >( (XAttributeList *) pList, UNO_QUERY ); - m_aAttributeType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_TYPE_CDATA )); - m_aXMLXlinkNS = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_XLINK_PREFIX )); - m_aXMLEventNS = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_EVENT_PREFIX )); + m_xEmptyList = Reference< XAttributeList >( (XAttributeList *) pList, UNO_QUERY ); + m_aAttributeType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_TYPE_CDATA )); + m_aXMLXlinkNS = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_XLINK_PREFIX )); + m_aXMLEventNS = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_EVENT_PREFIX )); } OWriteEventsDocumentHandler::~OWriteEventsDocumentHandler() @@ -485,7 +485,7 @@ void OWriteEventsDocumentHandler::WriteEventsDocument() throw } //_________________________________________________________________________________________________________________ -// protected member functions +// protected member functions //_________________________________________________________________________________________________________________ void OWriteEventsDocumentHandler::WriteEvent( const ::rtl::OUString& aEventName, const Sequence< PropertyValue >& aPropertyValues ) throw @@ -514,9 +514,9 @@ void OWriteEventsDocumentHandler::WriteEvent( const ::rtl::OUString& aEventName, pList->AddAttribute( m_aAttributeName, m_aAttributeType, aEventName ); - sal_Bool bURLSet = sal_False; - ::rtl::OUString aValue; - ::rtl::OUString aName; + sal_Bool bURLSet = sal_False; + ::rtl::OUString aValue; + ::rtl::OUString aName; // save attributes for ( int i = 0; i < aPropertyValues.getLength(); i++ ) diff --git a/framework/source/xml/imagesconfiguration.cxx b/framework/source/xml/imagesconfiguration.cxx index 55bcd3564bae..75517d2766dd 100644 --- a/framework/source/xml/imagesconfiguration.cxx +++ b/framework/source/xml/imagesconfiguration.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ #include <xml/saxnamespacefilter.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/xml/sax/XParser.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> @@ -44,7 +44,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #ifndef _UNOTOOLS_PROCESSFACTORY_HXX @@ -54,7 +54,7 @@ #include <tools/debug.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ using namespace ::com::sun::star::uno; diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx index e67ec74fa691..83d42b82c539 100644 --- a/framework/source/xml/imagesdocumenthandler.cxx +++ b/framework/source/xml/imagesdocumenthandler.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ #include <stdio.h> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> @@ -39,7 +39,7 @@ #include <macros/debug.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #ifndef __COM_SUN_STAR_XML_SAX_XEXTENDEDDOCUMENTHANDLER_HPP_ @@ -47,7 +47,7 @@ #endif //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> #include <vcl/toolbox.hxx> @@ -56,76 +56,76 @@ #include <comphelper/attributelist.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -#define ELEMENT_IMAGECONTAINER "imagescontainer" -#define ELEMENT_IMAGES "images" -#define ELEMENT_ENTRY "entry" -#define ELEMENT_EXTERNALIMAGES "externalimages" -#define ELEMENT_EXTERNALENTRY "externalentry" +#define ELEMENT_IMAGECONTAINER "imagescontainer" +#define ELEMENT_IMAGES "images" +#define ELEMENT_ENTRY "entry" +#define ELEMENT_EXTERNALIMAGES "externalimages" +#define ELEMENT_EXTERNALENTRY "externalentry" -#define ELEMENT_NS_IMAGESCONTAINER "image:imagescontainer" -#define ELEMENT_NS_IMAGES "image:images" -#define ELEMENT_NS_ENTRY "image:entry" -#define ELEMENT_NS_EXTERNALIMAGES "image:externalimages" -#define ELEMENT_NS_EXTERNALENTRY "image:externalentry" +#define ELEMENT_NS_IMAGESCONTAINER "image:imagescontainer" +#define ELEMENT_NS_IMAGES "image:images" +#define ELEMENT_NS_ENTRY "image:entry" +#define ELEMENT_NS_EXTERNALIMAGES "image:externalimages" +#define ELEMENT_NS_EXTERNALENTRY "image:externalentry" -#define ATTRIBUTE_HREF "href" -#define ATTRIBUTE_MASKCOLOR "maskcolor" -#define ATTRIBUTE_COMMAND "command" -#define ATTRIBUTE_BITMAPINDEX "bitmap-index" -#define ATTRIBUTE_MASKURL "maskurl" -#define ATTRIBUTE_MASKMODE "maskmode" -#define ATTRIBUTE_HIGHCONTRASTURL "highcontrasturl" -#define ATTRIBUTE_HIGHCONTRASTMASKURL "highcontrastmaskurl" -#define ATTRIBUTE_TYPE_CDATA "CDATA" +#define ATTRIBUTE_HREF "href" +#define ATTRIBUTE_MASKCOLOR "maskcolor" +#define ATTRIBUTE_COMMAND "command" +#define ATTRIBUTE_BITMAPINDEX "bitmap-index" +#define ATTRIBUTE_MASKURL "maskurl" +#define ATTRIBUTE_MASKMODE "maskmode" +#define ATTRIBUTE_HIGHCONTRASTURL "highcontrasturl" +#define ATTRIBUTE_HIGHCONTRASTMASKURL "highcontrastmaskurl" +#define ATTRIBUTE_TYPE_CDATA "CDATA" -#define ATTRIBUTE_MASKMODE_BITMAP "maskbitmap" -#define ATTRIBUTE_MASKMODE_COLOR "maskcolor" +#define ATTRIBUTE_MASKMODE_BITMAP "maskbitmap" +#define ATTRIBUTE_MASKMODE_COLOR "maskcolor" -#define ATTRIBUTE_XMLNS_IMAGE "xmlns:image" -#define ATTRIBUTE_XMLNS_XLINK "xmlns:xlink" +#define ATTRIBUTE_XMLNS_IMAGE "xmlns:image" +#define ATTRIBUTE_XMLNS_XLINK "xmlns:xlink" -#define ATTRIBUTE_XLINK_TYPE "xlink:type" -#define ATTRIBUTE_XLINK_TYPE_VALUE "simple" +#define ATTRIBUTE_XLINK_TYPE "xlink:type" +#define ATTRIBUTE_XLINK_TYPE_VALUE "simple" -#define XMLNS_IMAGE "http://openoffice.org/2001/image" -#define XMLNS_XLINK "http://www.w3.org/1999/xlink" -#define XMLNS_IMAGE_PREFIX "image:" -#define XMLNS_XLINK_PREFIX "xlink:" +#define XMLNS_IMAGE "http://openoffice.org/2001/image" +#define XMLNS_XLINK "http://www.w3.org/1999/xlink" +#define XMLNS_IMAGE_PREFIX "image:" +#define XMLNS_XLINK_PREFIX "xlink:" -#define XMLNS_FILTER_SEPARATOR "^" +#define XMLNS_FILTER_SEPARATOR "^" -#define IMAGES_DOCTYPE "<!DOCTYPE image:imagecontainer PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"image.dtd\">" +#define IMAGES_DOCTYPE "<!DOCTYPE image:imagecontainer PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"image.dtd\">" namespace framework { struct ImageXMLEntryProperty { - OReadImagesDocumentHandler::Image_XML_Namespace nNamespace; - char aEntryName[20]; + OReadImagesDocumentHandler::Image_XML_Namespace nNamespace; + char aEntryName[20]; }; ImageXMLEntryProperty ImagesEntries[OReadImagesDocumentHandler::IMG_XML_ENTRY_COUNT] = { - { OReadImagesDocumentHandler::IMG_NS_IMAGE, ELEMENT_IMAGECONTAINER }, - { OReadImagesDocumentHandler::IMG_NS_IMAGE, ELEMENT_IMAGES }, - { OReadImagesDocumentHandler::IMG_NS_IMAGE, ELEMENT_ENTRY }, - { OReadImagesDocumentHandler::IMG_NS_IMAGE, ELEMENT_EXTERNALIMAGES }, - { OReadImagesDocumentHandler::IMG_NS_IMAGE, ELEMENT_EXTERNALENTRY }, - { OReadImagesDocumentHandler::IMG_NS_XLINK, ATTRIBUTE_HREF }, - { OReadImagesDocumentHandler::IMG_NS_IMAGE, ATTRIBUTE_MASKCOLOR }, - { OReadImagesDocumentHandler::IMG_NS_IMAGE, ATTRIBUTE_COMMAND }, - { OReadImagesDocumentHandler::IMG_NS_IMAGE, ATTRIBUTE_BITMAPINDEX }, - { OReadImagesDocumentHandler::IMG_NS_IMAGE, ATTRIBUTE_MASKURL }, - { OReadImagesDocumentHandler::IMG_NS_IMAGE, ATTRIBUTE_MASKMODE }, - { OReadImagesDocumentHandler::IMG_NS_IMAGE, ATTRIBUTE_HIGHCONTRASTURL }, - { OReadImagesDocumentHandler::IMG_NS_IMAGE, ATTRIBUTE_HIGHCONTRASTMASKURL } + { OReadImagesDocumentHandler::IMG_NS_IMAGE, ELEMENT_IMAGECONTAINER }, + { OReadImagesDocumentHandler::IMG_NS_IMAGE, ELEMENT_IMAGES }, + { OReadImagesDocumentHandler::IMG_NS_IMAGE, ELEMENT_ENTRY }, + { OReadImagesDocumentHandler::IMG_NS_IMAGE, ELEMENT_EXTERNALIMAGES }, + { OReadImagesDocumentHandler::IMG_NS_IMAGE, ELEMENT_EXTERNALENTRY }, + { OReadImagesDocumentHandler::IMG_NS_XLINK, ATTRIBUTE_HREF }, + { OReadImagesDocumentHandler::IMG_NS_IMAGE, ATTRIBUTE_MASKCOLOR }, + { OReadImagesDocumentHandler::IMG_NS_IMAGE, ATTRIBUTE_COMMAND }, + { OReadImagesDocumentHandler::IMG_NS_IMAGE, ATTRIBUTE_BITMAPINDEX }, + { OReadImagesDocumentHandler::IMG_NS_IMAGE, ATTRIBUTE_MASKURL }, + { OReadImagesDocumentHandler::IMG_NS_IMAGE, ATTRIBUTE_MASKMODE }, + { OReadImagesDocumentHandler::IMG_NS_IMAGE, ATTRIBUTE_HIGHCONTRASTURL }, + { OReadImagesDocumentHandler::IMG_NS_IMAGE, ATTRIBUTE_HIGHCONTRASTMASKURL } }; @@ -135,11 +135,11 @@ OReadImagesDocumentHandler::OReadImagesDocumentHandler( ImageListsDescriptor& aI m_pImages( 0 ), m_pExternalImages( 0 ) { - m_aImageList.pImageList = NULL; + m_aImageList.pImageList = NULL; m_aImageList.pExternalImageList = NULL; - m_nHashMaskModeBitmap = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_MASKMODE_BITMAP )).hashCode(); - m_nHashMaskModeColor = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_MASKMODE_COLOR )).hashCode(); + m_nHashMaskModeBitmap = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_MASKMODE_BITMAP )).hashCode(); + m_nHashMaskModeColor = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_MASKMODE_COLOR )).hashCode(); // create hash map to speed up lookup for ( int i = 0; i < (int)IMG_XML_ENTRY_COUNT; i++ ) @@ -157,14 +157,14 @@ OReadImagesDocumentHandler::OReadImagesDocumentHandler( ImageListsDescriptor& aI } // reset states - m_bImageContainerStartFound = sal_False; - m_bImageContainerEndFound = sal_False; - m_bImagesStartFound = sal_False; - m_bImagesEndFound = sal_False; - m_bImageStartFound = sal_False; - m_bExternalImagesStartFound = sal_False; - m_bExternalImagesEndFound = sal_False; - m_bExternalImageStartFound = sal_False; + m_bImageContainerStartFound = sal_False; + m_bImageContainerEndFound = sal_False; + m_bImagesStartFound = sal_False; + m_bImagesEndFound = sal_False; + m_bImageStartFound = sal_False; + m_bExternalImagesStartFound = sal_False; + m_bExternalImagesEndFound = sal_False; + m_bExternalImageStartFound = sal_False; } OReadImagesDocumentHandler::~OReadImagesDocumentHandler() @@ -173,17 +173,17 @@ OReadImagesDocumentHandler::~OReadImagesDocumentHandler() // XDocumentHandler void SAL_CALL OReadImagesDocumentHandler::startDocument(void) -throw ( SAXException, RuntimeException ) +throw ( SAXException, RuntimeException ) { } void SAL_CALL OReadImagesDocumentHandler::endDocument(void) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { ResetableGuard aGuard( m_aLock ); if (( m_bImageContainerStartFound && !m_bImageContainerEndFound ) || - ( !m_bImageContainerStartFound && m_bImageContainerEndFound ) ) + ( !m_bImageContainerStartFound && m_bImageContainerEndFound ) ) { ::rtl::OUString aErrorMessage = getErrorLineString(); aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "No matching start or end element 'image:imagecontainer' found!" )); @@ -193,7 +193,7 @@ throw( SAXException, RuntimeException ) void SAL_CALL OReadImagesDocumentHandler::startElement( const ::rtl::OUString& aName, const Reference< XAttributeList > &xAttribs ) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { ResetableGuard aGuard( m_aLock ); @@ -355,13 +355,13 @@ throw( SAXException, RuntimeException ) { case IMG_ATTRIBUTE_COMMAND: { - pItem->aCommandURL = xAttribs->getValueByIndex( n ); + pItem->aCommandURL = xAttribs->getValueByIndex( n ); } break; case IMG_ATTRIBUTE_BITMAPINDEX: { - pItem->nIndex = xAttribs->getValueByIndex( n ).toInt32(); + pItem->nIndex = xAttribs->getValueByIndex( n ).toInt32(); } break; @@ -470,13 +470,13 @@ throw( SAXException, RuntimeException ) { case IMG_ATTRIBUTE_COMMAND: { - pItem->aCommandURL = xAttribs->getValueByIndex( n ); + pItem->aCommandURL = xAttribs->getValueByIndex( n ); } break; case IMG_ATTRIBUTE_HREF: { - pItem->aURL = xAttribs->getValueByIndex( n ); + pItem->aURL = xAttribs->getValueByIndex( n ); } break; @@ -526,7 +526,7 @@ throw( SAXException, RuntimeException ) } void SAL_CALL OReadImagesDocumentHandler::endElement(const ::rtl::OUString& aName) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { ResetableGuard aGuard( m_aLock ); @@ -585,24 +585,24 @@ throw( SAXException, RuntimeException ) } void SAL_CALL OReadImagesDocumentHandler::characters(const ::rtl::OUString&) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { } void SAL_CALL OReadImagesDocumentHandler::ignorableWhitespace(const ::rtl::OUString&) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { } void SAL_CALL OReadImagesDocumentHandler::processingInstruction( const ::rtl::OUString& /*aTarget*/, const ::rtl::OUString& /*aData*/ ) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { } void SAL_CALL OReadImagesDocumentHandler::setDocumentLocator( const Reference< XLocator > &xLocator) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { ResetableGuard aGuard( m_aLock ); @@ -626,7 +626,7 @@ throw( SAXException, RuntimeException ) //_________________________________________________________________________________________________________________ -// OWriteImagesDocumentHandler +// OWriteImagesDocumentHandler //_________________________________________________________________________________________________________________ OWriteImagesDocumentHandler::OWriteImagesDocumentHandler( @@ -637,11 +637,11 @@ OWriteImagesDocumentHandler::OWriteImagesDocumentHandler( m_xWriteDocumentHandler( rWriteDocumentHandler ) { ::comphelper::AttributeList* pList = new ::comphelper::AttributeList; - m_xEmptyList = Reference< XAttributeList >( (XAttributeList *) pList, UNO_QUERY ); - m_aAttributeType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_TYPE_CDATA )); - m_aXMLImageNS = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_IMAGE_PREFIX )); - m_aXMLXlinkNS = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_XLINK_PREFIX )); - m_aAttributeXlinkType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_XLINK_TYPE )); + m_xEmptyList = Reference< XAttributeList >( (XAttributeList *) pList, UNO_QUERY ); + m_aAttributeType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_TYPE_CDATA )); + m_aXMLImageNS = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_IMAGE_PREFIX )); + m_aXMLXlinkNS = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_XLINK_PREFIX )); + m_aAttributeXlinkType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_XLINK_TYPE )); m_aAttributeValueSimple = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_XLINK_TYPE_VALUE )); } @@ -701,7 +701,7 @@ void OWriteImagesDocumentHandler::WriteImagesDocument() throw } //_________________________________________________________________________________________________________________ -// protected member functions +// protected member functions //_________________________________________________________________________________________________________________ void OWriteImagesDocumentHandler::WriteImageList( const ImageListItemDescriptor* pImageList ) throw @@ -738,8 +738,8 @@ void OWriteImagesDocumentHandler::WriteImageList( const ImageListItemDescriptor* } else { - ::rtl::OUStringBuffer aColorStrBuffer( 8 ); - sal_Int64 nValue = pImageList->aMaskColor.GetRGBColor(); + ::rtl::OUStringBuffer aColorStrBuffer( 8 ); + sal_Int64 nValue = pImageList->aMaskColor.GetRGBColor(); aColorStrBuffer.appendAscii( "#" ); aColorStrBuffer.append( ::rtl::OUString::valueOf( nValue, 16 )); diff --git a/framework/source/xml/menuconfiguration.cxx b/framework/source/xml/menuconfiguration.cxx index aac1751b1a14..010c96349d8c 100644 --- a/framework/source/xml/menuconfiguration.cxx +++ b/framework/source/xml/menuconfiguration.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <xml/menuconfiguration.hxx> @@ -46,14 +46,14 @@ #endif //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/xml/sax/XParser.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> #include <com/sun/star/frame/XFrame.hpp> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ using namespace ::com::sun::star::uno; @@ -79,7 +79,7 @@ BOOL MenuConfiguration::IsWindowListItemId( USHORT nId ) MenuConfiguration::MenuConfiguration( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rServiceManager ) -: m_rxServiceManager( rServiceManager ) +: m_rxServiceManager( rServiceManager ) { } diff --git a/framework/source/xml/menudocumenthandler.cxx b/framework/source/xml/menudocumenthandler.cxx index 054fbb146012..3fc5d1775be4 100644 --- a/framework/source/xml/menudocumenthandler.cxx +++ b/framework/source/xml/menudocumenthandler.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,14 +31,14 @@ #include <stdio.h> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <xml/menudocumenthandler.hxx> #include <xml/menuconfiguration.hxx> #include <classes/addonmenu.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> @@ -49,48 +49,48 @@ #include <com/sun/star/beans/XPropertySet.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <comphelper/processfactory.hxx> #include <rtl/logfile.hxx> #include <comphelper/attributelist.hxx> //_________________________________________________________________________________________________________________ -// defines +// defines //_________________________________________________________________________________________________________________ -#define XMLNS_MENU "http://openoffice.org/2001/menu" -#define XMLNS_PREFIX "menu:" +#define XMLNS_MENU "http://openoffice.org/2001/menu" +#define XMLNS_PREFIX "menu:" -#define ELEMENT_MENUBAR "http://openoffice.org/2001/menu^menubar" -#define ELEMENT_MENU "http://openoffice.org/2001/menu^menu" -#define ELEMENT_MENUPOPUP "http://openoffice.org/2001/menu^menupopup" -#define ELEMENT_MENUITEM "http://openoffice.org/2001/menu^menuitem" -#define ELEMENT_MENUSEPARATOR "http://openoffice.org/2001/menu^menuseparator" +#define ELEMENT_MENUBAR "http://openoffice.org/2001/menu^menubar" +#define ELEMENT_MENU "http://openoffice.org/2001/menu^menu" +#define ELEMENT_MENUPOPUP "http://openoffice.org/2001/menu^menupopup" +#define ELEMENT_MENUITEM "http://openoffice.org/2001/menu^menuitem" +#define ELEMENT_MENUSEPARATOR "http://openoffice.org/2001/menu^menuseparator" -#define ELEMENT_NS_MENUBAR "menu:menubar" -#define ELEMENT_NS_MENU "menu:menu" -#define ELEMENT_NS_MENUPOPUP "menu:menupopup" -#define ELEMENT_NS_MENUITEM "menu:menuitem" -#define ELEMENT_NS_MENUSEPARATOR "menu:menuseparator" +#define ELEMENT_NS_MENUBAR "menu:menubar" +#define ELEMENT_NS_MENU "menu:menu" +#define ELEMENT_NS_MENUPOPUP "menu:menupopup" +#define ELEMENT_NS_MENUITEM "menu:menuitem" +#define ELEMENT_NS_MENUSEPARATOR "menu:menuseparator" -#define ATTRIBUTE_ID "http://openoffice.org/2001/menu^id" -#define ATTRIBUTE_LABEL "http://openoffice.org/2001/menu^label" -#define ATTRIBUTE_HELPID "http://openoffice.org/2001/menu^helpid" -#define ATTRIBUTE_LINEBREAK "http://openoffice.org/2001/menu^linebreak" -#define ATTRIBUTE_STYLE "http://openoffice.org/2001/menu^style" +#define ATTRIBUTE_ID "http://openoffice.org/2001/menu^id" +#define ATTRIBUTE_LABEL "http://openoffice.org/2001/menu^label" +#define ATTRIBUTE_HELPID "http://openoffice.org/2001/menu^helpid" +#define ATTRIBUTE_LINEBREAK "http://openoffice.org/2001/menu^linebreak" +#define ATTRIBUTE_STYLE "http://openoffice.org/2001/menu^style" -#define ATTRIBUTE_NS_ID "menu:id" -#define ATTRIBUTE_NS_LABEL "menu:label" -#define ATTRIBUTE_NS_HELPID "menu:helpid" -#define ATTRIBUTE_NS_LINEBREAK "menu:linebreak" -#define ATTRIBUTE_NS_STYLE "menu:style" +#define ATTRIBUTE_NS_ID "menu:id" +#define ATTRIBUTE_NS_LABEL "menu:label" +#define ATTRIBUTE_NS_HELPID "menu:helpid" +#define ATTRIBUTE_NS_LINEBREAK "menu:linebreak" +#define ATTRIBUTE_NS_STYLE "menu:style" -#define ATTRIBUTE_XMLNS_MENU "xmlns:menu" +#define ATTRIBUTE_XMLNS_MENU "xmlns:menu" -#define ATTRIBUTE_TYPE_CDATA "CDATA" +#define ATTRIBUTE_TYPE_CDATA "CDATA" -#define MENUBAR_DOCTYPE "<!DOCTYPE menu:menubar PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"menubar.dtd\">" +#define MENUBAR_DOCTYPE "<!DOCTYPE menu:menubar PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"menubar.dtd\">" #define ATTRIBUTE_ITEMSTYLE_TEXT "text" #define ATTRIBUTE_ITEMSTYLE_IMAGE "image" @@ -113,7 +113,7 @@ static const char FILEMENU_CMD[] = ".uno:Picklist" ; static const char WINDOWMENU_CMD[] = ".uno:WindowList" ; //_________________________________________________________________________________________________________________ -// using namespaces +// using namespaces //_________________________________________________________________________________________________________________ using namespace ::com::sun::star::uno; @@ -213,7 +213,7 @@ throw( SAXException, RuntimeException ) void SAL_CALL ReadMenuDocumentHandlerBase::setDocumentLocator( const Reference< XLocator > &xLocator) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { m_xLocator = xLocator; } @@ -256,7 +256,7 @@ void ReadMenuDocumentHandlerBase::initPropertyCommon( OReadMenuDocumentHandler::OReadMenuDocumentHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, const Reference< XIndexContainer >& rMenuBarContainer ) -: m_nElementDepth( 0 ), +: m_nElementDepth( 0 ), m_bMenuBarMode( sal_False ), m_xMenuBarContainer( rMenuBarContainer ), m_xContainerFactory( rMenuBarContainer, UNO_QUERY ), @@ -317,7 +317,7 @@ throw( SAXException, RuntimeException ) void SAL_CALL OReadMenuDocumentHandler::characters(const rtl::OUString&) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { } @@ -353,7 +353,7 @@ OReadMenuBarHandler::OReadMenuBarHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, const Reference< XIndexContainer >& rMenuBarContainer, const Reference< XSingleComponentFactory >& rFactory ) -: m_nElementDepth( 0 ), +: m_nElementDepth( 0 ), m_bMenuMode( sal_False ), m_xMenuBarContainer( rMenuBarContainer ), m_xContainerFactory( rFactory ), @@ -445,7 +445,7 @@ throw( SAXException, RuntimeException ) nItemBits |= ::com::sun::star::ui::ItemStyle::RADIO_CHECK; } } - while ( nIndex >= 0 ); + while ( nIndex >= 0 ); } } @@ -478,7 +478,7 @@ throw( SAXException, RuntimeException ) void SAL_CALL OReadMenuBarHandler::characters(const rtl::OUString&) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { } @@ -564,7 +564,7 @@ throw( SAXException, RuntimeException ) void SAL_CALL OReadMenuHandler::characters(const rtl::OUString&) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { } @@ -680,7 +680,7 @@ throw( SAXException, RuntimeException ) nItemBits |= ::com::sun::star::ui::ItemStyle::RADIO_CHECK; } } - while ( nIndex >= 0 ); + while ( nIndex >= 0 ); } } @@ -737,7 +737,7 @@ throw( SAXException, RuntimeException ) nItemBits |= ::com::sun::star::ui::ItemStyle::RADIO_CHECK; } } - while ( nIndex >= 0 ); + while ( nIndex >= 0 ); } } @@ -773,7 +773,7 @@ throw( SAXException, RuntimeException ) void SAL_CALL OReadMenuPopupHandler::characters(const rtl::OUString&) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { } @@ -836,7 +836,7 @@ OWriteMenuDocumentHandler::OWriteMenuDocumentHandler( { ::comphelper::AttributeList* pList = new ::comphelper::AttributeList; m_xEmptyList = Reference< XAttributeList >( (XAttributeList *) pList, UNO_QUERY ); - m_aAttributeType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_TYPE_CDATA )); + m_aAttributeType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_TYPE_CDATA )); } diff --git a/framework/source/xml/saxnamespacefilter.cxx b/framework/source/xml/saxnamespacefilter.cxx index 2514e67b216c..a92c58547e06 100644 --- a/framework/source/xml/saxnamespacefilter.cxx +++ b/framework/source/xml/saxnamespacefilter.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,18 +65,18 @@ SaxNamespaceFilter::~SaxNamespaceFilter() // XDocumentHandler void SAL_CALL SaxNamespaceFilter::startDocument(void) - throw ( SAXException, RuntimeException ) + throw ( SAXException, RuntimeException ) { } void SAL_CALL SaxNamespaceFilter::endDocument(void) - throw( SAXException, RuntimeException ) + throw( SAXException, RuntimeException ) { } void SAL_CALL SaxNamespaceFilter::startElement( const rtl::OUString& rName, const Reference< XAttributeList > &xAttribs ) - throw( SAXException, RuntimeException ) + throw( SAXException, RuntimeException ) { XMLNamespaces aXMLNamespaces; if ( !m_aNamespaceStack.empty() ) @@ -107,8 +107,8 @@ void SAL_CALL SaxNamespaceFilter::startElement( aAttributeIndexes.begin()); i != aAttributeIndexes.end(); ++i ) { - ::rtl::OUString aAttributeName = xAttribs->getNameByIndex( *i ); - ::rtl::OUString aValue = xAttribs->getValueByIndex( *i ); + ::rtl::OUString aAttributeName = xAttribs->getNameByIndex( *i ); + ::rtl::OUString aValue = xAttribs->getValueByIndex( *i ); ::rtl::OUString aNamespaceAttributeName = aXMLNamespaces.applyNSToAttributeName( aAttributeName ); pNewList->AddAttribute( aNamespaceAttributeName, aXMLAttributeType, aValue ); } @@ -135,7 +135,7 @@ void SAL_CALL SaxNamespaceFilter::startElement( } void SAL_CALL SaxNamespaceFilter::endElement(const rtl::OUString& aName) - throw( SAXException, RuntimeException ) + throw( SAXException, RuntimeException ) { XMLNamespaces& aXMLNamespaces = m_aNamespaceStack.top(); ::rtl::OUString aNamespaceElementName; @@ -155,27 +155,27 @@ void SAL_CALL SaxNamespaceFilter::endElement(const rtl::OUString& aName) } void SAL_CALL SaxNamespaceFilter::characters(const rtl::OUString& aChars) - throw( SAXException, RuntimeException ) + throw( SAXException, RuntimeException ) { xDocumentHandler->characters( aChars ); } void SAL_CALL SaxNamespaceFilter::ignorableWhitespace(const rtl::OUString& aWhitespaces) - throw( SAXException, RuntimeException ) + throw( SAXException, RuntimeException ) { xDocumentHandler->ignorableWhitespace( aWhitespaces ); } void SAL_CALL SaxNamespaceFilter::processingInstruction( const rtl::OUString& aTarget, const rtl::OUString& aData) - throw( SAXException, RuntimeException ) + throw( SAXException, RuntimeException ) { xDocumentHandler->processingInstruction( aTarget, aData ); } void SAL_CALL SaxNamespaceFilter::setDocumentLocator( const Reference< XLocator > &xLocator) - throw( SAXException, RuntimeException ) + throw( SAXException, RuntimeException ) { m_xLocator = xLocator; xDocumentHandler->setDocumentLocator( xLocator ); diff --git a/framework/source/xml/statusbarconfiguration.cxx b/framework/source/xml/statusbarconfiguration.cxx index 26853a699516..2b9d3e5baa58 100644 --- a/framework/source/xml/statusbarconfiguration.cxx +++ b/framework/source/xml/statusbarconfiguration.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ #include <services.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/xml/sax/XParser.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> @@ -42,7 +42,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #ifndef _UNOTOOLS_PROCESSFACTORY_HXX @@ -52,7 +52,7 @@ #include <tools/debug.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ using namespace ::com::sun::star::uno; diff --git a/framework/source/xml/statusbardocumenthandler.cxx b/framework/source/xml/statusbardocumenthandler.cxx index d6f4caebf08a..370ca6e3f18a 100644 --- a/framework/source/xml/statusbardocumenthandler.cxx +++ b/framework/source/xml/statusbardocumenthandler.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ #include <stdio.h> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> @@ -39,7 +39,7 @@ #include <macros/debug.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #ifndef __COM_SUN_STAR_XML_SAX_XEXTENDEDDOCUMENTHANDLER_HPP_ @@ -50,7 +50,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <vcl/svapp.hxx> #include <vcl/status.hxx> @@ -58,7 +58,7 @@ #include <comphelper/attributelist.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ using namespace ::com::sun::star::uno; @@ -67,45 +67,45 @@ using namespace ::com::sun::star::xml::sax; using namespace ::com::sun::star::ui; using namespace ::com::sun::star::container; -#define XMLNS_STATUSBAR "http://openoffice.org/2001/statusbar" -#define XMLNS_XLINK "http://www.w3.org/1999/xlink" -#define XMLNS_STATUSBAR_PREFIX "statusbar:" -#define XMLNS_XLINK_PREFIX "xlink:" +#define XMLNS_STATUSBAR "http://openoffice.org/2001/statusbar" +#define XMLNS_XLINK "http://www.w3.org/1999/xlink" +#define XMLNS_STATUSBAR_PREFIX "statusbar:" +#define XMLNS_XLINK_PREFIX "xlink:" -#define XMLNS_FILTER_SEPARATOR "^" +#define XMLNS_FILTER_SEPARATOR "^" -#define ELEMENT_STATUSBAR "statusbar" -#define ELEMENT_STATUSBARITEM "statusbaritem" +#define ELEMENT_STATUSBAR "statusbar" +#define ELEMENT_STATUSBARITEM "statusbaritem" -#define ATTRIBUTE_ALIGN "align" -#define ATTRIBUTE_STYLE "style" -#define ATTRIBUTE_URL "href" -#define ATTRIBUTE_WIDTH "width" -#define ATTRIBUTE_OFFSET "offset" -#define ATTRIBUTE_AUTOSIZE "autosize" -#define ATTRIBUTE_OWNERDRAW "ownerdraw" +#define ATTRIBUTE_ALIGN "align" +#define ATTRIBUTE_STYLE "style" +#define ATTRIBUTE_URL "href" +#define ATTRIBUTE_WIDTH "width" +#define ATTRIBUTE_OFFSET "offset" +#define ATTRIBUTE_AUTOSIZE "autosize" +#define ATTRIBUTE_OWNERDRAW "ownerdraw" #define ATTRIBUTE_HELPURL "helpid" -#define ELEMENT_NS_STATUSBAR "statusbar:statusbar" -#define ELEMENT_NS_STATUSBARITEM "statusbar:statusbaritem" +#define ELEMENT_NS_STATUSBAR "statusbar:statusbar" +#define ELEMENT_NS_STATUSBARITEM "statusbar:statusbaritem" -#define ATTRIBUTE_XMLNS_STATUSBAR "xmlns:statusbar" -#define ATTRIBUTE_XMLNS_XLINK "xmlns:xlink" +#define ATTRIBUTE_XMLNS_STATUSBAR "xmlns:statusbar" +#define ATTRIBUTE_XMLNS_XLINK "xmlns:xlink" -#define ATTRIBUTE_TYPE_CDATA "CDATA" +#define ATTRIBUTE_TYPE_CDATA "CDATA" -#define ATTRIBUTE_BOOLEAN_TRUE "true" -#define ATTRIBUTE_BOOLEAN_FALSE "false" +#define ATTRIBUTE_BOOLEAN_TRUE "true" +#define ATTRIBUTE_BOOLEAN_FALSE "false" -#define ATTRIBUTE_ALIGN_LEFT "left" -#define ATTRIBUTE_ALIGN_RIGHT "right" -#define ATTRIBUTE_ALIGN_CENTER "center" +#define ATTRIBUTE_ALIGN_LEFT "left" +#define ATTRIBUTE_ALIGN_RIGHT "right" +#define ATTRIBUTE_ALIGN_CENTER "center" -#define ATTRIBUTE_STYLE_IN "in" -#define ATTRIBUTE_STYLE_OUT "out" -#define ATTRIBUTE_STYLE_FLAT "flat" +#define ATTRIBUTE_STYLE_IN "in" +#define ATTRIBUTE_STYLE_OUT "out" +#define ATTRIBUTE_STYLE_FLAT "flat" -#define STATUSBAR_DOCTYPE "<!DOCTYPE statusbar:statusbar PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"statusbar.dtd\">" +#define STATUSBAR_DOCTYPE "<!DOCTYPE statusbar:statusbar PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"statusbar.dtd\">" namespace framework { @@ -154,21 +154,21 @@ static void ExtractStatusbarItemParameters( struct StatusBarEntryProperty { - OReadStatusBarDocumentHandler::StatusBar_XML_Namespace nNamespace; - char aEntryName[20]; + OReadStatusBarDocumentHandler::StatusBar_XML_Namespace nNamespace; + char aEntryName[20]; }; StatusBarEntryProperty StatusBarEntries[OReadStatusBarDocumentHandler::SB_XML_ENTRY_COUNT] = { - { OReadStatusBarDocumentHandler::SB_NS_STATUSBAR, ELEMENT_STATUSBAR }, - { OReadStatusBarDocumentHandler::SB_NS_STATUSBAR, ELEMENT_STATUSBARITEM }, - { OReadStatusBarDocumentHandler::SB_NS_XLINK, ATTRIBUTE_URL }, - { OReadStatusBarDocumentHandler::SB_NS_STATUSBAR, ATTRIBUTE_ALIGN }, - { OReadStatusBarDocumentHandler::SB_NS_STATUSBAR, ATTRIBUTE_STYLE }, - { OReadStatusBarDocumentHandler::SB_NS_STATUSBAR, ATTRIBUTE_AUTOSIZE }, - { OReadStatusBarDocumentHandler::SB_NS_STATUSBAR, ATTRIBUTE_OWNERDRAW }, - { OReadStatusBarDocumentHandler::SB_NS_STATUSBAR, ATTRIBUTE_WIDTH }, - { OReadStatusBarDocumentHandler::SB_NS_STATUSBAR, ATTRIBUTE_OFFSET }, + { OReadStatusBarDocumentHandler::SB_NS_STATUSBAR, ELEMENT_STATUSBAR }, + { OReadStatusBarDocumentHandler::SB_NS_STATUSBAR, ELEMENT_STATUSBARITEM }, + { OReadStatusBarDocumentHandler::SB_NS_XLINK, ATTRIBUTE_URL }, + { OReadStatusBarDocumentHandler::SB_NS_STATUSBAR, ATTRIBUTE_ALIGN }, + { OReadStatusBarDocumentHandler::SB_NS_STATUSBAR, ATTRIBUTE_STYLE }, + { OReadStatusBarDocumentHandler::SB_NS_STATUSBAR, ATTRIBUTE_AUTOSIZE }, + { OReadStatusBarDocumentHandler::SB_NS_STATUSBAR, ATTRIBUTE_OWNERDRAW }, + { OReadStatusBarDocumentHandler::SB_NS_STATUSBAR, ATTRIBUTE_WIDTH }, + { OReadStatusBarDocumentHandler::SB_NS_STATUSBAR, ATTRIBUTE_OFFSET }, { OReadStatusBarDocumentHandler::SB_NS_STATUSBAR, ATTRIBUTE_HELPURL } }; @@ -201,9 +201,9 @@ OReadStatusBarDocumentHandler::OReadStatusBarDocumentHandler( } } - m_bStatusBarStartFound = sal_False; - m_bStatusBarEndFound = sal_False; - m_bStatusBarItemStartFound = sal_False; + m_bStatusBarStartFound = sal_False; + m_bStatusBarEndFound = sal_False; + m_bStatusBarItemStartFound = sal_False; } OReadStatusBarDocumentHandler::~OReadStatusBarDocumentHandler() @@ -212,17 +212,17 @@ OReadStatusBarDocumentHandler::~OReadStatusBarDocumentHandler() // XDocumentHandler void SAL_CALL OReadStatusBarDocumentHandler::startDocument(void) -throw ( SAXException, RuntimeException ) +throw ( SAXException, RuntimeException ) { } void SAL_CALL OReadStatusBarDocumentHandler::endDocument(void) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { ResetableGuard aGuard( m_aLock ); if (( m_bStatusBarStartFound && !m_bStatusBarEndFound ) || - ( !m_bStatusBarStartFound && m_bStatusBarEndFound ) ) + ( !m_bStatusBarStartFound && m_bStatusBarEndFound ) ) { ::rtl::OUString aErrorMessage = getErrorLineString(); aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "No matching start or end element 'statusbar' found!" )); @@ -232,7 +232,7 @@ throw( SAXException, RuntimeException ) void SAL_CALL OReadStatusBarDocumentHandler::startElement( const ::rtl::OUString& aName, const Reference< XAttributeList > &xAttribs ) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { ResetableGuard aGuard( m_aLock ); @@ -287,7 +287,7 @@ throw( SAXException, RuntimeException ) { case SB_ATTRIBUTE_URL: { - bCommandURL = sal_True; + bCommandURL = sal_True; aCommandURL = xAttribs->getValueByIndex( n ); } break; @@ -431,7 +431,7 @@ throw( SAXException, RuntimeException ) } void SAL_CALL OReadStatusBarDocumentHandler::endElement(const ::rtl::OUString& aName) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { ResetableGuard aGuard( m_aLock ); @@ -473,24 +473,24 @@ throw( SAXException, RuntimeException ) } void SAL_CALL OReadStatusBarDocumentHandler::characters(const ::rtl::OUString&) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { } void SAL_CALL OReadStatusBarDocumentHandler::ignorableWhitespace(const ::rtl::OUString&) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { } void SAL_CALL OReadStatusBarDocumentHandler::processingInstruction( const ::rtl::OUString& /*aTarget*/, const ::rtl::OUString& /*aData*/ ) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { } void SAL_CALL OReadStatusBarDocumentHandler::setDocumentLocator( const Reference< XLocator > &xLocator) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { ResetableGuard aGuard( m_aLock ); @@ -514,7 +514,7 @@ throw( SAXException, RuntimeException ) //_________________________________________________________________________________________________________________ -// OWriteStatusBarDocumentHandler +// OWriteStatusBarDocumentHandler //_________________________________________________________________________________________________________________ OWriteStatusBarDocumentHandler::OWriteStatusBarDocumentHandler( @@ -525,10 +525,10 @@ OWriteStatusBarDocumentHandler::OWriteStatusBarDocumentHandler( m_xWriteDocumentHandler( rWriteDocumentHandler ) { ::comphelper::AttributeList* pList = new ::comphelper::AttributeList; - m_xEmptyList = Reference< XAttributeList >( (XAttributeList *) pList, UNO_QUERY ); - m_aAttributeType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_TYPE_CDATA )); - m_aXMLXlinkNS = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_XLINK_PREFIX )); - m_aXMLStatusBarNS = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_STATUSBAR_PREFIX )); + m_xEmptyList = Reference< XAttributeList >( (XAttributeList *) pList, UNO_QUERY ); + m_aAttributeType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_TYPE_CDATA )); + m_aXMLXlinkNS = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_XLINK_PREFIX )); + m_aXMLStatusBarNS = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_STATUSBAR_PREFIX )); } OWriteStatusBarDocumentHandler::~OWriteStatusBarDocumentHandler() @@ -599,7 +599,7 @@ void OWriteStatusBarDocumentHandler::WriteStatusBarDocument() throw } //_________________________________________________________________________________________________________________ -// protected member functions +// protected member functions //_________________________________________________________________________________________________________________ void OWriteStatusBarDocumentHandler::WriteStatusBarItem( diff --git a/framework/source/xml/toolboxconfiguration.cxx b/framework/source/xml/toolboxconfiguration.cxx index 4ed368af214f..9d1c91aa6849 100644 --- a/framework/source/xml/toolboxconfiguration.cxx +++ b/framework/source/xml/toolboxconfiguration.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ #include <services.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/xml/sax/XParser.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> @@ -42,7 +42,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #ifndef _UNOTOOLS_PROCESSFACTORY_HXX @@ -52,7 +52,7 @@ #include <tools/debug.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ using namespace ::com::sun::star::uno; diff --git a/framework/source/xml/toolboxdocumenthandler.cxx b/framework/source/xml/toolboxdocumenthandler.cxx index deea79beb2b0..acb88ef16e75 100644 --- a/framework/source/xml/toolboxdocumenthandler.cxx +++ b/framework/source/xml/toolboxdocumenthandler.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ #include <stdio.h> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> @@ -40,7 +40,7 @@ #include <xml/toolboxconfigurationdefines.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> #include <com/sun/star/ui/ItemType.hpp> @@ -48,7 +48,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <sal/config.h> @@ -59,7 +59,7 @@ #include <comphelper/attributelist.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ using namespace ::com::sun::star::uno; @@ -68,7 +68,7 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::xml::sax; -#define TOOLBAR_DOCTYPE "<!DOCTYPE toolbar:toolbar PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"toolbar.dtd\">" +#define TOOLBAR_DOCTYPE "<!DOCTYPE toolbar:toolbar PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"toolbar.dtd\">" namespace framework { @@ -138,28 +138,28 @@ sal_Int32 nStyleItemEntries = sizeof( Styles ) / sizeof( Styles[ 0 ] ); struct ToolBarEntryProperty { - OReadToolBoxDocumentHandler::ToolBox_XML_Namespace nNamespace; - char aEntryName[20]; + OReadToolBoxDocumentHandler::ToolBox_XML_Namespace nNamespace; + char aEntryName[20]; }; ToolBarEntryProperty ToolBoxEntries[OReadToolBoxDocumentHandler::TB_XML_ENTRY_COUNT] = { - { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ELEMENT_TOOLBAR }, - { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ELEMENT_TOOLBARITEM }, - { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ELEMENT_TOOLBARSPACE }, - { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ELEMENT_TOOLBARBREAK }, - { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ELEMENT_TOOLBARSEPARATOR }, - { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ATTRIBUTE_TEXT }, - { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ATTRIBUTE_BITMAP }, - { OReadToolBoxDocumentHandler::TB_NS_XLINK, ATTRIBUTE_URL }, - { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ATTRIBUTE_ITEMBITS }, - { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ATTRIBUTE_VISIBLE }, - { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ATTRIBUTE_WIDTH }, - { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ATTRIBUTE_USER }, - { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ATTRIBUTE_HELPID }, - { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ATTRIBUTE_ITEMSTYLE }, + { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ELEMENT_TOOLBAR }, + { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ELEMENT_TOOLBARITEM }, + { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ELEMENT_TOOLBARSPACE }, + { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ELEMENT_TOOLBARBREAK }, + { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ELEMENT_TOOLBARSEPARATOR }, + { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ATTRIBUTE_TEXT }, + { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ATTRIBUTE_BITMAP }, + { OReadToolBoxDocumentHandler::TB_NS_XLINK, ATTRIBUTE_URL }, + { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ATTRIBUTE_ITEMBITS }, + { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ATTRIBUTE_VISIBLE }, + { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ATTRIBUTE_WIDTH }, + { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ATTRIBUTE_USER }, + { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ATTRIBUTE_HELPID }, + { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ATTRIBUTE_ITEMSTYLE }, { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ATTRIBUTE_UINAME }, - { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ATTRIBUTE_TOOLTIP }, + { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ATTRIBUTE_TOOLTIP }, }; OReadToolBoxDocumentHandler::OReadToolBoxDocumentHandler( const Reference< XIndexContainer >& rItemContainer ) : @@ -197,22 +197,22 @@ OReadToolBoxDocumentHandler::OReadToolBoxDocumentHandler( const Reference< XInde } // pre-calculate a hash code for all style strings to speed up xml read process - m_nHashCode_Style_Radio = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_RADIO ).hashCode(); - m_nHashCode_Style_Auto = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_AUTO ).hashCode(); - m_nHashCode_Style_Left = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_LEFT ).hashCode(); - m_nHashCode_Style_AutoSize = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_AUTOSIZE ).hashCode(); - m_nHashCode_Style_DropDown = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_DROPDOWN ).hashCode(); - m_nHashCode_Style_Repeat = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_REPEAT ).hashCode(); + m_nHashCode_Style_Radio = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_RADIO ).hashCode(); + m_nHashCode_Style_Auto = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_AUTO ).hashCode(); + m_nHashCode_Style_Left = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_LEFT ).hashCode(); + m_nHashCode_Style_AutoSize = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_AUTOSIZE ).hashCode(); + m_nHashCode_Style_DropDown = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_DROPDOWN ).hashCode(); + m_nHashCode_Style_Repeat = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_REPEAT ).hashCode(); m_nHashCode_Style_DropDownOnly = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_DROPDOWNONLY ).hashCode(); m_nHashCode_Style_Text = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_TEXT ).hashCode(); m_nHashCode_Style_Image = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_IMAGE ).hashCode(); - m_bToolBarStartFound = sal_False; - m_bToolBarEndFound = sal_False; - m_bToolBarItemStartFound = sal_False; - m_bToolBarSpaceStartFound = sal_False; - m_bToolBarBreakStartFound = sal_False; - m_bToolBarSeparatorStartFound = sal_False; + m_bToolBarStartFound = sal_False; + m_bToolBarEndFound = sal_False; + m_bToolBarItemStartFound = sal_False; + m_bToolBarSpaceStartFound = sal_False; + m_bToolBarBreakStartFound = sal_False; + m_bToolBarSeparatorStartFound = sal_False; } OReadToolBoxDocumentHandler::~OReadToolBoxDocumentHandler() @@ -221,17 +221,17 @@ OReadToolBoxDocumentHandler::~OReadToolBoxDocumentHandler() // XDocumentHandler void SAL_CALL OReadToolBoxDocumentHandler::startDocument(void) -throw ( SAXException, RuntimeException ) +throw ( SAXException, RuntimeException ) { } void SAL_CALL OReadToolBoxDocumentHandler::endDocument(void) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { ResetableGuard aGuard( m_aLock ); if (( m_bToolBarStartFound && !m_bToolBarEndFound ) || - ( !m_bToolBarStartFound && m_bToolBarEndFound ) ) + ( !m_bToolBarStartFound && m_bToolBarEndFound ) ) { ::rtl::OUString aErrorMessage = getErrorLineString(); aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "No matching start or end element 'toolbar' found!" )); @@ -241,7 +241,7 @@ throw( SAXException, RuntimeException ) void SAL_CALL OReadToolBoxDocumentHandler::startElement( const ::rtl::OUString& aName, const Reference< XAttributeList > &xAttribs ) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { ResetableGuard aGuard( m_aLock ); @@ -319,7 +319,7 @@ throw( SAXException, RuntimeException ) } ::rtl::OUString aAttribute; - sal_Bool bAttributeURL = sal_False; + sal_Bool bAttributeURL = sal_False; m_bToolBarItemStartFound = sal_True; ::rtl::OUString aLabel; @@ -353,8 +353,8 @@ throw( SAXException, RuntimeException ) case TB_ATTRIBUTE_URL: { - bAttributeURL = sal_True; - aCommandURL = xAttribs->getValueByIndex( n ).intern(); + bAttributeURL = sal_True; + aCommandURL = xAttribs->getValueByIndex( n ).intern(); } break; @@ -411,7 +411,7 @@ throw( SAXException, RuntimeException ) do { - ::rtl::OUString aToken = aTemp.getToken( 0, ' ', nIndex ); + ::rtl::OUString aToken = aTemp.getToken( 0, ' ', nIndex ); if ( aToken.getLength() > 0 ) { sal_Int32 nHashCode = aToken.hashCode(); @@ -558,7 +558,7 @@ throw( SAXException, RuntimeException ) } void SAL_CALL OReadToolBoxDocumentHandler::endElement(const ::rtl::OUString& aName) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { ResetableGuard aGuard( m_aLock ); @@ -639,24 +639,24 @@ throw( SAXException, RuntimeException ) } void SAL_CALL OReadToolBoxDocumentHandler::characters(const ::rtl::OUString&) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { } void SAL_CALL OReadToolBoxDocumentHandler::ignorableWhitespace(const ::rtl::OUString&) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { } void SAL_CALL OReadToolBoxDocumentHandler::processingInstruction( const ::rtl::OUString& /*aTarget*/, const ::rtl::OUString& /*aData*/ ) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { } void SAL_CALL OReadToolBoxDocumentHandler::setDocumentLocator( const Reference< XLocator > &xLocator) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { ResetableGuard aGuard( m_aLock ); @@ -680,7 +680,7 @@ throw( SAXException, RuntimeException ) //_________________________________________________________________________________________________________________ -// OWriteToolBoxDocumentHandler +// OWriteToolBoxDocumentHandler //_________________________________________________________________________________________________________________ OWriteToolBoxDocumentHandler::OWriteToolBoxDocumentHandler( @@ -691,10 +691,10 @@ OWriteToolBoxDocumentHandler::OWriteToolBoxDocumentHandler( m_rItemAccess( rItemAccess ) { ::comphelper::AttributeList* pList = new ::comphelper::AttributeList; - m_xEmptyList = Reference< XAttributeList >( (XAttributeList *) pList, UNO_QUERY ); - m_aAttributeType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_TYPE_CDATA )); - m_aXMLXlinkNS = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_XLINK_PREFIX )); - m_aXMLToolbarNS = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_TOOLBAR_PREFIX )); + m_xEmptyList = Reference< XAttributeList >( (XAttributeList *) pList, UNO_QUERY ); + m_aAttributeType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_TYPE_CDATA )); + m_aXMLXlinkNS = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_XLINK_PREFIX )); + m_aXMLToolbarNS = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_TOOLBAR_PREFIX )); } OWriteToolBoxDocumentHandler::~OWriteToolBoxDocumentHandler() @@ -785,7 +785,7 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxDocument() throw } //_________________________________________________________________________________________________________________ -// protected member functions +// protected member functions //_________________________________________________________________________________________________________________ void OWriteToolBoxDocumentHandler::WriteToolBoxItem( @@ -851,7 +851,7 @@ throw ( SAXException, RuntimeException ) aValue = aValue.concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(" ") ) ); aValue += rtl::OUString::createFromAscii( pStyle->attrName ); } - } + } pList->AddAttribute( m_aXMLToolbarNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE )), m_aAttributeType, aValue ); diff --git a/framework/source/xml/xmlnamespaces.cxx b/framework/source/xml/xmlnamespaces.cxx index 924fdcfef861..fbaf51613d15 100644 --- a/framework/source/xml/xmlnamespaces.cxx +++ b/framework/source/xml/xmlnamespaces.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -109,7 +109,7 @@ void XMLNamespaces::addNamespace( const ::rtl::OUString& aName, const ::rtl::OUS { // xml draft: there is no default namespace for attributes! - int index; + int index; if (( index = aName.indexOf( ':' )) > 0 ) { if ( aName.getLength() > index+1 ) @@ -130,13 +130,13 @@ void XMLNamespaces::addNamespace( const ::rtl::OUString& aName, const ::rtl::OUS return aName; } -::rtl::OUString XMLNamespaces::applyNSToElementName( const ::rtl::OUString& aName ) const throw( SAXException ) +::rtl::OUString XMLNamespaces::applyNSToElementName( const ::rtl::OUString& aName ) const throw( SAXException ) { // xml draft: element names can have a default namespace - int index = aName.indexOf( ':' ); - ::rtl::OUString aNamespace; - ::rtl::OUString aElementName = aName; + int index = aName.indexOf( ':' ); + ::rtl::OUString aNamespace; + ::rtl::OUString aElementName = aName; if ( index > 0 ) aNamespace = getNamespaceValue( aName.copy( 0, index ) ); diff --git a/framework/test/test.cxx b/framework/test/test.cxx index dc6633c6779b..3750b7c2b0d5 100644 --- a/framework/test/test.cxx +++ b/framework/test/test.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <classes/servicemanager.hxx> #include <classes/filtercache.hxx> @@ -38,7 +38,7 @@ #include <services.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/frame/XDesktop.hpp> #include <com/sun/star/frame/XFrame.hpp> @@ -65,7 +65,7 @@ #include <com/sun/star/frame/XConfigManager.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <comphelper/processfactory.hxx> #include <com/sun/star/uno/Reference.h> @@ -82,37 +82,37 @@ #include <stdio.h> //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ -#define APPLICATIONNAME "FrameWork - Testapplication" +#define APPLICATIONNAME "FrameWork - Testapplication" //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ -using namespace ::rtl ; -using namespace ::comphelper ; -using namespace ::framework ; -using namespace ::cppu ; -using namespace ::com::sun::star::uno ; -using namespace ::com::sun::star::lang ; -using namespace ::com::sun::star::frame ; -using namespace ::com::sun::star::awt ; -using namespace ::com::sun::star::beans ; -using namespace ::com::sun::star::util ; -using namespace ::com::sun::star::task ; -using namespace ::com::sun::star::mozilla ; -using namespace ::com::sun::star::bridge ; -using namespace ::com::sun::star::document ; -using namespace ::com::sun::star::container ; +using namespace ::rtl ; +using namespace ::comphelper ; +using namespace ::framework ; +using namespace ::cppu ; +using namespace ::com::sun::star::uno ; +using namespace ::com::sun::star::lang ; +using namespace ::com::sun::star::frame ; +using namespace ::com::sun::star::awt ; +using namespace ::com::sun::star::beans ; +using namespace ::com::sun::star::util ; +using namespace ::com::sun::star::task ; +using namespace ::com::sun::star::mozilla ; +using namespace ::com::sun::star::bridge ; +using namespace ::com::sun::star::document ; +using namespace ::com::sun::star::container ; //_________________________________________________________________________________________________________________ -// defines +// defines //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ /*-***************************************************************************************************************/ @@ -127,14 +127,14 @@ class TestApplication : public Application private: #ifdef TEST_DESKTOP - void impl_testDesktop ( const Reference< XDesktop >& xDesktop ); - void impl_buildTree ( const Reference< XDesktop >& xDesktop ); - void impl_logTree ( const Reference< XDesktop >& xDesktop ); + void impl_testDesktop ( const Reference< XDesktop >& xDesktop ); + void impl_buildTree ( const Reference< XDesktop >& xDesktop ); + void impl_logTree ( const Reference< XDesktop >& xDesktop ); #endif #ifdef TEST_PLUGIN - void impl_testPlugIn ( const Reference< XDesktop >& xDesktop, const Reference< XMultiServiceFactory >& xFactory ); + void impl_testPlugIn ( const Reference< XDesktop >& xDesktop, const Reference< XMultiServiceFactory >& xFactory ); #endif #ifdef TEST_LOGINDIALOG @@ -163,23 +163,23 @@ class TestApplication : public Application //************************************************************************************************************* private: - Reference< XMultiServiceFactory > m_xFactory; + Reference< XMultiServiceFactory > m_xFactory; -}; // class TestApplication +}; // class TestApplication //_________________________________________________________________________________________________________________ -// global variables +// global variables //_________________________________________________________________________________________________________________ -TestApplication aTestApplication ; +TestApplication aTestApplication ; //_________________________________________________________________________________________________________________ -// main +// main //_________________________________________________________________________________________________________________ void TestApplication::Main() { -// RegistryCache aCache; +// RegistryCache aCache; /**-*********************************************************************************************************** initialize program @@ -191,8 +191,8 @@ void TestApplication::Main() setProcessServiceFactory( m_xFactory ); // Control sucess of operation. - LOG_ASSERT( !(m_xFactory.is() ==sal_False ), "TestApplication::Main()\nCan't create global service manager.\n\n" ) - LOG_ASSERT( !(getProcessServiceFactory()!=m_xFactory), "TestApplication::Main()\nGlobal servicemanager not set in UNOTOOLS.\n\n" ) + LOG_ASSERT( !(m_xFactory.is() ==sal_False ), "TestApplication::Main()\nCan't create global service manager.\n\n" ) + LOG_ASSERT( !(getProcessServiceFactory()!=m_xFactory), "TestApplication::Main()\nGlobal servicemanager not set in UNOTOOLS.\n\n" ) /**-*********************************************************************************************************** test area @@ -238,7 +238,7 @@ void TestApplication::Main() bState = impl_testTreeSearch(); #endif -// Execute(); +// Execute(); // xFrame->dispose(); // delete pMainWindow; if( bState = sal_True ) @@ -252,7 +252,7 @@ void TestApplication::Main() } //_________________________________________________________________________________________________________________ -// test method +// test method //_________________________________________________________________________________________________________________ #ifdef TEST_TYPEDETECTION void TestApplication::impl_testTypeDetection() @@ -268,17 +268,17 @@ void TestApplication::impl_testTypeDetection() if( xTypeDetection.is() == sal_True ) { // a) Check his implementation and his supported interfaces first. - Reference< XInterface > xInterface ( xTypeDetection, UNO_QUERY ); - Reference< XTypeProvider > xTypeProvider ( xTypeDetection, UNO_QUERY ); - Reference< XServiceInfo > xServiceInfo ( xTypeDetection, UNO_QUERY ); - Reference< XNameAccess > xNameAccess ( xTypeDetection, UNO_QUERY ); - Reference< XElementAccess > xElementAccess ( xTypeDetection, UNO_QUERY ); - - LOG_ASSERT( !( xInterface.is() == sal_False || - xTypeProvider.is() == sal_False || - xServiceInfo.is() == sal_False || - xNameAccess.is() == sal_False || - xElementAccess.is() == sal_False ), "TestApplication::impl_testTypeDetection()\nMiss supported for searched interface!\n" ) + Reference< XInterface > xInterface ( xTypeDetection, UNO_QUERY ); + Reference< XTypeProvider > xTypeProvider ( xTypeDetection, UNO_QUERY ); + Reference< XServiceInfo > xServiceInfo ( xTypeDetection, UNO_QUERY ); + Reference< XNameAccess > xNameAccess ( xTypeDetection, UNO_QUERY ); + Reference< XElementAccess > xElementAccess ( xTypeDetection, UNO_QUERY ); + + LOG_ASSERT( !( xInterface.is() == sal_False || + xTypeProvider.is() == sal_False || + xServiceInfo.is() == sal_False || + xNameAccess.is() == sal_False || + xElementAccess.is() == sal_False ), "TestApplication::impl_testTypeDetection()\nMiss supported for searched interface!\n" ) // b) Check OneInstance mode of service. Reference< XTypeDetection > xTypeDetection2( getProcessServiceFactory()->createInstance( SERVICENAME_TYPEDETECTION ), UNO_QUERY ); @@ -289,15 +289,15 @@ void TestApplication::impl_testTypeDetection() // Define list of URLs for checking. OUString pURLs[] = { - DECLARE_ASCII("file://c|/temp/test.sdw" ), - DECLARE_ASCII("private:factory/scalc" ), - DECLARE_ASCII("file://c|/temp/test.txt" ), - DECLARE_ASCII("slot:5000" ), + DECLARE_ASCII("file://c|/temp/test.sdw" ), + DECLARE_ASCII("private:factory/scalc" ), + DECLARE_ASCII("file://c|/temp/test.txt" ), + DECLARE_ASCII("slot:5000" ), }; sal_uInt32 nCount = 4; Sequence< OUString > seqURLs( pURLs, nCount ); - Reference< XMultiServiceFactory > xFilterFactory( getProcessServiceFactory()->createInstance( SERVICENAME_FILTERFACTORY ), UNO_QUERY ); + Reference< XMultiServiceFactory > xFilterFactory( getProcessServiceFactory()->createInstance( SERVICENAME_FILTERFACTORY ), UNO_QUERY ); Reference< XMultiServiceFactory > xLoaderFactory( getProcessServiceFactory()->createInstance( SERVICENAME_FRAMELOADERFACTORY), UNO_QUERY ); LOG_ASSERT( !(xFilterFactory.is()==sal_False), "TestApplication::impl_testTypeDetection()\nCouldn't create filter factory!\n" ) LOG_ASSERT( !(xLoaderFactory.is()==sal_False), "TestApplication::impl_testTypeDetection()\nCouldn't create loader factory!\n" ) @@ -307,11 +307,11 @@ void TestApplication::impl_testTypeDetection() { // Try to get a type name for every URL from list and log search result. OUString sTypeName = xTypeDetection->queryTypeByURL( seqURLs[nURL] ); - sBuffer.appendAscii ( "queryTypeByURL( \"" ); - sBuffer.append ( seqURLs[nURL] ); - sBuffer.appendAscii ( "\" ) returns type \"" ); - sBuffer.append ( sTypeName ); - sBuffer.appendAscii ( "\"\n" ); + sBuffer.appendAscii ( "queryTypeByURL( \"" ); + sBuffer.append ( seqURLs[nURL] ); + sBuffer.appendAscii ( "\" ) returns type \"" ); + sBuffer.append ( sTypeName ); + sBuffer.appendAscii ( "\"\n" ); // If a type was found - try to get a filter and a frame loader for it. if( sTypeName.getLength() > 0 ) { @@ -329,9 +329,9 @@ void TestApplication::impl_testTypeDetection() { OUString sUIName; xFilterProperties->getPropertyValue( DECLARE_ASCII("UIName") ) >>= sUIName; - sBuffer.appendAscii ( "Found filter \"" ); - sBuffer.append ( sUIName ); - sBuffer.appendAscii ( "\"\n" ); + sBuffer.appendAscii ( "Found filter \"" ); + sBuffer.append ( sUIName ); + sBuffer.appendAscii ( "\"\n" ); } Reference< XPropertySet > xLoaderProperties( xLoader, UNO_QUERY ); @@ -340,9 +340,9 @@ void TestApplication::impl_testTypeDetection() { OUString sUIName; xLoaderProperties->getPropertyValue( DECLARE_ASCII("UIName") ) >>= sUIName; - sBuffer.appendAscii ( "Found loader \"" ); - sBuffer.append ( sUIName ); - sBuffer.appendAscii ( "\"\n" ); + sBuffer.appendAscii ( "Found loader \"" ); + sBuffer.append ( sUIName ); + sBuffer.appendAscii ( "\"\n" ); } } } @@ -354,7 +354,7 @@ void TestApplication::impl_testTypeDetection() #endif //_________________________________________________________________________________________________________________ -// test method +// test method //_________________________________________________________________________________________________________________ #ifdef TEST_FILTERCACHE void TestApplication::impl_testFilterCache() @@ -379,38 +379,38 @@ void TestApplication::impl_testFilterCache() const TType* pType = aCache.getTypeByName( seqAllTypeNames[nPosition] ); if( pType == NULL ) { - sBuffer.appendAscii ( "Type [" ); - sBuffer.append ( (sal_Int32)nPosition ); - sBuffer.appendAscii ( "] \"" ); - sBuffer.append ( seqAllTypeNames[nPosition]); - sBuffer.appendAscii ( "\" isn't valid!" ); + sBuffer.appendAscii ( "Type [" ); + sBuffer.append ( (sal_Int32)nPosition ); + sBuffer.appendAscii ( "] \"" ); + sBuffer.append ( seqAllTypeNames[nPosition]); + sBuffer.appendAscii ( "\" isn't valid!" ); } else { - sBuffer.appendAscii ( "Type [" ); - sBuffer.append ( (sal_Int32)nPosition ); - sBuffer.appendAscii ( "] \"" ); - sBuffer.append ( seqAllTypeNames[nPosition] ); - sBuffer.appendAscii ( "\"\n\t\tUIName\t=\t" ); - sBuffer.append ( pType->sUIName ); - sBuffer.appendAscii ( "\n\t\tMediaType\t=\t" ); - sBuffer.append ( pType->sMediaType ); - sBuffer.appendAscii ( "\n\t\tClipboardFormat\t=\t" ); - sBuffer.append ( pType->sClipboardFormat ); - sBuffer.appendAscii ( "\n\t\tURLPattern\t=\t{" ); + sBuffer.appendAscii ( "Type [" ); + sBuffer.append ( (sal_Int32)nPosition ); + sBuffer.appendAscii ( "] \"" ); + sBuffer.append ( seqAllTypeNames[nPosition] ); + sBuffer.appendAscii ( "\"\n\t\tUIName\t=\t" ); + sBuffer.append ( pType->sUIName ); + sBuffer.appendAscii ( "\n\t\tMediaType\t=\t" ); + sBuffer.append ( pType->sMediaType ); + sBuffer.appendAscii ( "\n\t\tClipboardFormat\t=\t" ); + sBuffer.append ( pType->sClipboardFormat ); + sBuffer.appendAscii ( "\n\t\tURLPattern\t=\t{" ); for( TConstStringIterator aIterator=pType->lURLPattern.begin(); aIterator!=pType->lURLPattern.end(); ++aIterator ) { - sBuffer.append ( *aIterator ); - sBuffer.appendAscii ( ";\n\t\t" ); + sBuffer.append ( *aIterator ); + sBuffer.appendAscii ( ";\n\t\t" ); } sBuffer.appendAscii( "}\nExtensions\t=\t" ); for( aIterator=pType->lExtensions.begin(); aIterator!=pType->lExtensions.end(); ++aIterator ) { - sBuffer.append ( *aIterator ); - sBuffer.appendAscii ( ";\n\t\t" ); + sBuffer.append ( *aIterator ); + sBuffer.appendAscii ( ";\n\t\t" ); } - sBuffer.appendAscii ( "}\nDocumentIconID\t=\t" ); - sBuffer.append ( (sal_Int32)pType->nDocumentIconID ); + sBuffer.appendAscii ( "}\nDocumentIconID\t=\t" ); + sBuffer.append ( (sal_Int32)pType->nDocumentIconID ); } } */ @@ -421,9 +421,9 @@ void TestApplication::impl_testFilterCache() const OUString* pType = aCache.searchFirstType( &sURL, NULL, NULL, aIterator ); while( pType != NULL ) { - sBuffer.appendAscii ( "\tfound \"" ); - sBuffer.append ( *pType ); - sBuffer.appendAscii ( "\"\n" ); + sBuffer.appendAscii ( "\tfound \"" ); + sBuffer.append ( *pType ); + sBuffer.appendAscii ( "\"\n" ); pType = aCache.searchType( &sURL, NULL, NULL, aIterator ); } } @@ -433,7 +433,7 @@ void TestApplication::impl_testFilterCache() #endif //_________________________________________________________________________________________________________________ -// test method +// test method //_________________________________________________________________________________________________________________ #ifdef TEST_LOGINDIALOG void TestApplication::impl_testLoginDialog() @@ -446,9 +446,9 @@ void TestApplication::impl_testLoginDialog() LOG_ASSERT( !(xDialog.is()==sal_False), "TestApplication::impl_testLoginDialog()\nCould not create login dialog.\n" ) // Check set/getTitle() /* not implemented yet! */ -// OUString sTitle = DECLARE_ASCII("Login Dialog Test"); -// xDialog->setTitle( sTitle ); -// LOG_ASSERT( !(xDialog->getTitle()!=sTitle), "TestApplication::impl_testLoginDialog()\nset/getTitle don't work correct.\n" ) +// OUString sTitle = DECLARE_ASCII("Login Dialog Test"); +// xDialog->setTitle( sTitle ); +// LOG_ASSERT( !(xDialog->getTitle()!=sTitle), "TestApplication::impl_testLoginDialog()\nset/getTitle don't work correct.\n" ) UniString sInternalURL = DECLARE_ASCII("private:factory/scalc"); UniString sExternalURL = OUString(); @@ -479,24 +479,24 @@ void TestApplication::impl_testLoginDialog() // Work with properties of dialog. Reference< XPropertySet > xPropertySet( xDialog, UNO_QUERY ); LOG_ASSERT( !(xPropertySet.is()==sal_False), "TestApplication::impl_testLoginDialog()\nCan't cast dialog to XPropertySet interface.\n" ) - Any aUserName ; - Any aPassword ; - Any aServer ; - Any aConnectionType ; - Any aPort ; - aUserName <<= DECLARE_ASCII("Andreas"); - aPassword <<= DECLARE_ASCII("Test"); - aServer <<= DECLARE_ASCII("www.yahoo.de:7777"); - aConnectionType <<= DECLARE_ASCII("Bla"); + Any aUserName ; + Any aPassword ; + Any aServer ; + Any aConnectionType ; + Any aPort ; + aUserName <<= DECLARE_ASCII("Andreas"); + aPassword <<= DECLARE_ASCII("Test"); + aServer <<= DECLARE_ASCII("www.yahoo.de:7777"); + aConnectionType <<= DECLARE_ASCII("Bla"); sal_Int32 nPort = 8081; - aPort <<= nPort; + aPort <<= nPort; try { - xPropertySet->setPropertyValue( DECLARE_ASCII("UserName" ), aUserName ); - xPropertySet->setPropertyValue( DECLARE_ASCII("Password" ), aPassword ); - xPropertySet->setPropertyValue( DECLARE_ASCII("Server" ), aServer ); - xPropertySet->setPropertyValue( DECLARE_ASCII("ConnectionType" ), aConnectionType ); - xPropertySet->setPropertyValue( DECLARE_ASCII("Compressed" ), aPort ); + xPropertySet->setPropertyValue( DECLARE_ASCII("UserName" ), aUserName ); + xPropertySet->setPropertyValue( DECLARE_ASCII("Password" ), aPassword ); + xPropertySet->setPropertyValue( DECLARE_ASCII("Server" ), aServer ); + xPropertySet->setPropertyValue( DECLARE_ASCII("ConnectionType" ), aConnectionType ); + xPropertySet->setPropertyValue( DECLARE_ASCII("Compressed" ), aPort ); } catch( ::com::sun::star::beans::UnknownPropertyException& ) { @@ -521,15 +521,15 @@ void TestApplication::impl_testLoginDialog() xDialog->execute(); - OUString sUserName ; - OUString sPassword ; - OUString sServer ; - OUString sConnectionType ; - xPropertySet->getPropertyValue( DECLARE_ASCII("UserName" ) ) >>= sUserName ; - xPropertySet->getPropertyValue( DECLARE_ASCII("Password" ) ) >>= sPassword ; - xPropertySet->getPropertyValue( DECLARE_ASCII("Server" ) ) >>= sServer ; - xPropertySet->getPropertyValue( DECLARE_ASCII("ConnectionType" ) ) >>= sConnectionType ; - xPropertySet->getPropertyValue( sConnectionType ) >>= nPort ; + OUString sUserName ; + OUString sPassword ; + OUString sServer ; + OUString sConnectionType ; + xPropertySet->getPropertyValue( DECLARE_ASCII("UserName" ) ) >>= sUserName ; + xPropertySet->getPropertyValue( DECLARE_ASCII("Password" ) ) >>= sPassword ; + xPropertySet->getPropertyValue( DECLARE_ASCII("Server" ) ) >>= sServer ; + xPropertySet->getPropertyValue( DECLARE_ASCII("ConnectionType" ) ) >>= sConnectionType ; + xPropertySet->getPropertyValue( sConnectionType ) >>= nPort ; LOG_ASSERT( sal_False, OUStringToOString( sUserName, RTL_TEXTENCODING_UTF8 ) ) LOG_ASSERT( sal_False, OUStringToOString( sPassword, RTL_TEXTENCODING_UTF8 ) ) @@ -540,7 +540,7 @@ void TestApplication::impl_testLoginDialog() #endif //_________________________________________________________________________________________________________________ -// test method +// test method //_________________________________________________________________________________________________________________ #ifdef TEST_PLUGIN void TestApplication::impl_testPlugIn( const Reference< XDesktop >& xDesktop, const Reference< XMultiServiceFactory >& xFactory ) @@ -569,137 +569,137 @@ void TestApplication::impl_testPlugIn( const Reference< XDesktop >& xDesktop, co #endif //_________________________________________________________________________________________________________________ -// test method +// test method //_________________________________________________________________________________________________________________ #ifdef TEST_DESKTOP #define LOGFILE_TARGETING "targeting.log" void TestApplication::impl_testDesktop( const Reference< XDesktop >& xDesktop ) { //------------------------------------------------------------------------------------------------------------- - // 1) Test cast to all supported interfaces of Desktop. - - Reference< XInterface > xDesktopInterface ( xDesktop, UNO_QUERY ); - Reference< XTypeProvider > xDesktopTypeProvider ( xDesktop, UNO_QUERY ); - Reference< XServiceInfo > xDesktopServiceInfo ( xDesktop, UNO_QUERY ); - Reference< XComponentLoader > xDesktopComponentLoader ( xDesktop, UNO_QUERY ); - Reference< XTasksSupplier > xDesktopTasksSupplier ( xDesktop, UNO_QUERY ); - Reference< XDispatchProvider > xDesktopDispatchProvider ( xDesktop, UNO_QUERY ); - Reference< XFramesSupplier > xDesktopFramesSupplier ( xDesktop, UNO_QUERY ); - Reference< XFrame > xDesktopFrame ( xDesktop, UNO_QUERY ); - Reference< XComponent > xDesktopComponent ( xDesktop, UNO_QUERY ); - Reference< XStatusIndicatorFactory > xDesktopStatusIndicatorFactory ( xDesktop, UNO_QUERY ); - Reference< XPropertySet > xDesktopPropertySet ( xDesktop, UNO_QUERY ); - Reference< XFastPropertySet > xDesktopFastPropertySet ( xDesktop, UNO_QUERY ); - Reference< XMultiPropertySet > xDesktopMultiPropertySet ( xDesktop, UNO_QUERY ); - - LOG_ASSERT( !(xDesktopInterface.is() ==sal_False), "TestApplication::impl_testDesktop()\nXInterface not supported by Desktop.\n\n" ) - LOG_ASSERT( !(xDesktopTypeProvider.is() ==sal_False), "TestApplication::impl_testDesktop()\nXTypeProvider not supported by Desktop.\n\n" ) - LOG_ASSERT( !(xDesktopServiceInfo.is() ==sal_False), "TestApplication::impl_testDesktop()\nXServiceInfo not supported by Desktop.\n\n" ) - LOG_ASSERT( !(xDesktop.is() ==sal_False), "TestApplication::impl_testDesktop()\nXDesktop not supported by Desktop.\n\n" ) - LOG_ASSERT( !(xDesktopComponentLoader.is() ==sal_False), "TestApplication::impl_testDesktop()\nXComponentLoader not supported by Desktop.\n\n" ) - LOG_ASSERT( !(xDesktopTasksSupplier.is() ==sal_False), "TestApplication::impl_testDesktop()\nXTasksSupplier not supported by Desktop.\n\n" ) - LOG_ASSERT( !(xDesktopDispatchProvider.is() ==sal_False), "TestApplication::impl_testDesktop()\nXDispatchProvider not supported by Desktop.\n\n" ) - LOG_ASSERT( !(xDesktopFramesSupplier.is() ==sal_False), "TestApplication::impl_testDesktop()\nXFramesSupplier not supported by Desktop.\n\n" ) - LOG_ASSERT( !(xDesktopFrame.is() ==sal_False), "TestApplication::impl_testDesktop()\nXFrame not supported by Desktop.\n\n" ) - LOG_ASSERT( !(xDesktopComponent.is() ==sal_False), "TestApplication::impl_testDesktop()\nXComponent not supported by Desktop.\n\n" ) - LOG_ASSERT( !(xDesktopStatusIndicatorFactory.is() ==sal_False), "TestApplication::impl_testDesktop()\nXStatusIndicatorFactory not supported by Desktop.\n\n" ) - LOG_ASSERT( !(xDesktopPropertySet.is() ==sal_False), "TestApplication::impl_testDesktop()\nXPropertySet not supported by Desktop.\n\n" ) - LOG_ASSERT( !(xDesktopFastPropertySet.is() ==sal_False), "TestApplication::impl_testDesktop()\nXFastPropertySet not supported by Desktop.\n\n" ) - LOG_ASSERT( !(xDesktopMultiPropertySet.is() ==sal_False), "TestApplication::impl_testDesktop()\nXMultiPropertySet not supported by Desktop.\n\n" ) + // 1) Test cast to all supported interfaces of Desktop. + + Reference< XInterface > xDesktopInterface ( xDesktop, UNO_QUERY ); + Reference< XTypeProvider > xDesktopTypeProvider ( xDesktop, UNO_QUERY ); + Reference< XServiceInfo > xDesktopServiceInfo ( xDesktop, UNO_QUERY ); + Reference< XComponentLoader > xDesktopComponentLoader ( xDesktop, UNO_QUERY ); + Reference< XTasksSupplier > xDesktopTasksSupplier ( xDesktop, UNO_QUERY ); + Reference< XDispatchProvider > xDesktopDispatchProvider ( xDesktop, UNO_QUERY ); + Reference< XFramesSupplier > xDesktopFramesSupplier ( xDesktop, UNO_QUERY ); + Reference< XFrame > xDesktopFrame ( xDesktop, UNO_QUERY ); + Reference< XComponent > xDesktopComponent ( xDesktop, UNO_QUERY ); + Reference< XStatusIndicatorFactory > xDesktopStatusIndicatorFactory ( xDesktop, UNO_QUERY ); + Reference< XPropertySet > xDesktopPropertySet ( xDesktop, UNO_QUERY ); + Reference< XFastPropertySet > xDesktopFastPropertySet ( xDesktop, UNO_QUERY ); + Reference< XMultiPropertySet > xDesktopMultiPropertySet ( xDesktop, UNO_QUERY ); + + LOG_ASSERT( !(xDesktopInterface.is() ==sal_False), "TestApplication::impl_testDesktop()\nXInterface not supported by Desktop.\n\n" ) + LOG_ASSERT( !(xDesktopTypeProvider.is() ==sal_False), "TestApplication::impl_testDesktop()\nXTypeProvider not supported by Desktop.\n\n" ) + LOG_ASSERT( !(xDesktopServiceInfo.is() ==sal_False), "TestApplication::impl_testDesktop()\nXServiceInfo not supported by Desktop.\n\n" ) + LOG_ASSERT( !(xDesktop.is() ==sal_False), "TestApplication::impl_testDesktop()\nXDesktop not supported by Desktop.\n\n" ) + LOG_ASSERT( !(xDesktopComponentLoader.is() ==sal_False), "TestApplication::impl_testDesktop()\nXComponentLoader not supported by Desktop.\n\n" ) + LOG_ASSERT( !(xDesktopTasksSupplier.is() ==sal_False), "TestApplication::impl_testDesktop()\nXTasksSupplier not supported by Desktop.\n\n" ) + LOG_ASSERT( !(xDesktopDispatchProvider.is() ==sal_False), "TestApplication::impl_testDesktop()\nXDispatchProvider not supported by Desktop.\n\n" ) + LOG_ASSERT( !(xDesktopFramesSupplier.is() ==sal_False), "TestApplication::impl_testDesktop()\nXFramesSupplier not supported by Desktop.\n\n" ) + LOG_ASSERT( !(xDesktopFrame.is() ==sal_False), "TestApplication::impl_testDesktop()\nXFrame not supported by Desktop.\n\n" ) + LOG_ASSERT( !(xDesktopComponent.is() ==sal_False), "TestApplication::impl_testDesktop()\nXComponent not supported by Desktop.\n\n" ) + LOG_ASSERT( !(xDesktopStatusIndicatorFactory.is() ==sal_False), "TestApplication::impl_testDesktop()\nXStatusIndicatorFactory not supported by Desktop.\n\n" ) + LOG_ASSERT( !(xDesktopPropertySet.is() ==sal_False), "TestApplication::impl_testDesktop()\nXPropertySet not supported by Desktop.\n\n" ) + LOG_ASSERT( !(xDesktopFastPropertySet.is() ==sal_False), "TestApplication::impl_testDesktop()\nXFastPropertySet not supported by Desktop.\n\n" ) + LOG_ASSERT( !(xDesktopMultiPropertySet.is() ==sal_False), "TestApplication::impl_testDesktop()\nXMultiPropertySet not supported by Desktop.\n\n" ) //------------------------------------------------------------------------------------------------------------- - // 2) Test set-/getName(). + // 2) Test set-/getName(). - // 2a) Test default value "Desktop". + // 2a) Test default value "Desktop". OUString sName( RTL_CONSTASCII_USTRINGPARAM("Desktop") ); LOG_ASSERT( !(xDesktopFrame->getName()!=sName), "TestApplication::impl_testDesktop()\nDefault value of desktop name is invalid.\n\n" ) - // 2b) Set name and try to get the same name. + // 2b) Set name and try to get the same name. sName = OUString( RTL_CONSTASCII_USTRINGPARAM("New Desktop") ); xDesktopFrame->setName( sName ); LOG_ASSERT( !(xDesktopFrame->getName()!=sName), "TestApplication::impl_testDesktop()\nSetting of name works not correct on desktop.\n\n" ) - // Reset name do default! - // Its neccessary for follow operations. + // Reset name do default! + // Its neccessary for follow operations. sName = OUString( RTL_CONSTASCII_USTRINGPARAM("Desktop") ); xDesktopFrame->setName( sName ); //------------------------------------------------------------------------------------------------------------- - // 3) Test findFrame(). - - // Build new example tree and log initial structure in file. - impl_buildTree ( xDesktop ); - impl_logTree ( xDesktop ); - - OUString sTargetFrameName; - sal_uInt32 nSearchFlags ; - Reference< XFrame > xSearchFrame ; - Reference< XFrame > xTask_4 ; - Reference< XFrame > xFrame_41 ; - Reference< XFrame > xFrame_411 ; - Reference< XFrame > xFrame_112 ; - Reference< XFrame > xFrame_1123 ; - Reference< XFrame > xFrame_11231 ; - Reference< XFrame > xFrame_11221 ; - - // 3a) Search for Desktop + // 3) Test findFrame(). + + // Build new example tree and log initial structure in file. + impl_buildTree ( xDesktop ); + impl_logTree ( xDesktop ); + + OUString sTargetFrameName; + sal_uInt32 nSearchFlags ; + Reference< XFrame > xSearchFrame ; + Reference< XFrame > xTask_4 ; + Reference< XFrame > xFrame_41 ; + Reference< XFrame > xFrame_411 ; + Reference< XFrame > xFrame_112 ; + Reference< XFrame > xFrame_1123 ; + Reference< XFrame > xFrame_11231 ; + Reference< XFrame > xFrame_11221 ; + + // 3a) Search for Desktop WRITE_LOGFILE( LOGFILE_TARGETING, "--------------------------------------------------------------------------------\n" ) WRITE_LOGFILE( LOGFILE_TARGETING, " Search with SELF for \"Desktop\" on Desktop\n" ) WRITE_LOGFILE( LOGFILE_TARGETING, "--------------------------------------------------------------------------------\n" ) - sTargetFrameName = OUString(RTL_CONSTASCII_USTRINGPARAM("Desktop")); - nSearchFlags = FrameSearchFlag::SELF; - xSearchFrame = xDesktopFrame->findFrame(sTargetFrameName, nSearchFlags); + sTargetFrameName = OUString(RTL_CONSTASCII_USTRINGPARAM("Desktop")); + nSearchFlags = FrameSearchFlag::SELF; + xSearchFrame = xDesktopFrame->findFrame(sTargetFrameName, nSearchFlags); LOG_ASSERT( !(xSearchFrame.is()==sal_False), "TestApplication::impl_testDesktop()\nSearch 3a)-1 invalid\n" ); WRITE_LOGFILE( LOGFILE_TARGETING, "--------------------------------------------------------------------------------\n" ) WRITE_LOGFILE( LOGFILE_TARGETING, " Search with ALL for \"Desktop\" on Desktop\n" ) WRITE_LOGFILE( LOGFILE_TARGETING, "--------------------------------------------------------------------------------\n" ) - nSearchFlags = FrameSearchFlag::ALL; - xSearchFrame = xDesktopFrame->findFrame(sTargetFrameName, nSearchFlags); + nSearchFlags = FrameSearchFlag::ALL; + xSearchFrame = xDesktopFrame->findFrame(sTargetFrameName, nSearchFlags); LOG_ASSERT( !(xSearchFrame.is()==sal_False), "TestApplication::impl_testDesktop()\nSearch 3a)-2 invalid\n" ); WRITE_LOGFILE( LOGFILE_TARGETING, "--------------------------------------------------------------------------------\n" ) WRITE_LOGFILE( LOGFILE_TARGETING, " Search with CHILDREN for \"Desktop\" on Desktop\n" ) WRITE_LOGFILE( LOGFILE_TARGETING, "--------------------------------------------------------------------------------\n" ) - nSearchFlags = FrameSearchFlag::CHILDREN; - xSearchFrame = xDesktopFrame->findFrame(sTargetFrameName, nSearchFlags); + nSearchFlags = FrameSearchFlag::CHILDREN; + xSearchFrame = xDesktopFrame->findFrame(sTargetFrameName, nSearchFlags); LOG_ASSERT( !(xSearchFrame.is()==sal_True), "TestApplication::impl_testDesktop()\nSearch 3a)-3 invalid\n" ); WRITE_LOGFILE( LOGFILE_TARGETING, "--------------------------------------------------------------------------------\n" ) WRITE_LOGFILE( LOGFILE_TARGETING, " Search with SIBLINGS for \"Desktop\" on Desktop\n" ) WRITE_LOGFILE( LOGFILE_TARGETING, "--------------------------------------------------------------------------------\n" ) - nSearchFlags = FrameSearchFlag::SIBLINGS; - xSearchFrame = xDesktopFrame->findFrame(sTargetFrameName, nSearchFlags); + nSearchFlags = FrameSearchFlag::SIBLINGS; + xSearchFrame = xDesktopFrame->findFrame(sTargetFrameName, nSearchFlags); LOG_ASSERT( !(xSearchFrame.is()==sal_True), "TestApplication::impl_testDesktop()\nSearch 3a)-4 invalid\n" ); WRITE_LOGFILE( LOGFILE_TARGETING, "--------------------------------------------------------------------------------\n" ) WRITE_LOGFILE( LOGFILE_TARGETING, " Search with AUTO for \"Desktop\" on Desktop\n" ) WRITE_LOGFILE( LOGFILE_TARGETING, "--------------------------------------------------------------------------------\n" ) - nSearchFlags = FrameSearchFlag::AUTO; - xSearchFrame = xDesktopFrame->findFrame(sTargetFrameName, nSearchFlags); + nSearchFlags = FrameSearchFlag::AUTO; + xSearchFrame = xDesktopFrame->findFrame(sTargetFrameName, nSearchFlags); LOG_ASSERT( !(xSearchFrame.is()==sal_True), "TestApplication::impl_testDesktop()\nSearch 3a)-5 invalid\n" ); - // 3b) Search for Task_4 + // 3b) Search for Task_4 WRITE_LOGFILE( LOGFILE_TARGETING, "--------------------------------------------------------------------------------\n" ) WRITE_LOGFILE( LOGFILE_TARGETING, " Search with SELF for \"Task_4\" on Desktop\n" ) WRITE_LOGFILE( LOGFILE_TARGETING, "--------------------------------------------------------------------------------\n" ) - sTargetFrameName = OUString(RTL_CONSTASCII_USTRINGPARAM("Task_4")); - nSearchFlags = FrameSearchFlag::SELF; - xSearchFrame = xDesktopFrame->findFrame(sTargetFrameName, nSearchFlags); + sTargetFrameName = OUString(RTL_CONSTASCII_USTRINGPARAM("Task_4")); + nSearchFlags = FrameSearchFlag::SELF; + xSearchFrame = xDesktopFrame->findFrame(sTargetFrameName, nSearchFlags); LOG_ASSERT( !(xSearchFrame.is()==sal_True), "TestApplication::impl_testDesktop()\nSearch 3b)-1 invalid\n" ); WRITE_LOGFILE( LOGFILE_TARGETING, "--------------------------------------------------------------------------------\n" ) WRITE_LOGFILE( LOGFILE_TARGETING, " Search with SIBLINGS for \"Task_4\" on Desktop\n" ) WRITE_LOGFILE( LOGFILE_TARGETING, "--------------------------------------------------------------------------------\n" ) - nSearchFlags = FrameSearchFlag::SIBLINGS; - xSearchFrame = xDesktopFrame->findFrame(sTargetFrameName, nSearchFlags); + nSearchFlags = FrameSearchFlag::SIBLINGS; + xSearchFrame = xDesktopFrame->findFrame(sTargetFrameName, nSearchFlags); LOG_ASSERT( !(xSearchFrame.is()==sal_True), "TestApplication::impl_testDesktop()\nSearch 3b)-2 invalid\n" ); WRITE_LOGFILE( LOGFILE_TARGETING, "--------------------------------------------------------------------------------\n" ) WRITE_LOGFILE( LOGFILE_TARGETING, " Search with CHILDREN for \"Task_4\" on Desktop\n" ) WRITE_LOGFILE( LOGFILE_TARGETING, "--------------------------------------------------------------------------------\n" ) - nSearchFlags = FrameSearchFlag::CHILDREN; - xSearchFrame = xDesktopFrame->findFrame(sTargetFrameName, nSearchFlags); + nSearchFlags = FrameSearchFlag::CHILDREN; + xSearchFrame = xDesktopFrame->findFrame(sTargetFrameName, nSearchFlags); LOG_ASSERT( !(xSearchFrame.is()==sal_False), "TestApplication::impl_testDesktop()\nSearch 3b)-3 invalid\n" ); xTask_4 = xSearchFrame; @@ -707,79 +707,79 @@ void TestApplication::impl_testDesktop( const Reference< XDesktop >& xDesktop ) WRITE_LOGFILE( LOGFILE_TARGETING, "--------------------------------------------------------------------------------\n" ) WRITE_LOGFILE( LOGFILE_TARGETING, " Search with ALL for \"Task_4\" on Desktop\n" ) WRITE_LOGFILE( LOGFILE_TARGETING, "--------------------------------------------------------------------------------\n" ) - nSearchFlags = FrameSearchFlag::ALL; - xSearchFrame = xDesktopFrame->findFrame(sTargetFrameName, nSearchFlags); + nSearchFlags = FrameSearchFlag::ALL; + xSearchFrame = xDesktopFrame->findFrame(sTargetFrameName, nSearchFlags); LOG_ASSERT( !(xSearchFrame.is()==sal_False), "TestApplication::impl_testDesktop()\nSearch 3b)-4 invalid\n" ); - // 3c) Search for Frame_41 + // 3c) Search for Frame_41 WRITE_LOGFILE( LOGFILE_TARGETING, "--------------------------------------------------------------------------------\n" ) WRITE_LOGFILE( LOGFILE_TARGETING, " Search with SELF for \"Frame_41\" on Desktop\n" ) WRITE_LOGFILE( LOGFILE_TARGETING, "--------------------------------------------------------------------------------\n" ) - sTargetFrameName = OUString(RTL_CONSTASCII_USTRINGPARAM("Frame_41")); - nSearchFlags = FrameSearchFlag::SELF; - xSearchFrame = xDesktopFrame->findFrame(sTargetFrameName, nSearchFlags); + sTargetFrameName = OUString(RTL_CONSTASCII_USTRINGPARAM("Frame_41")); + nSearchFlags = FrameSearchFlag::SELF; + xSearchFrame = xDesktopFrame->findFrame(sTargetFrameName, nSearchFlags); LOG_ASSERT( !(xSearchFrame.is()==sal_True), "TestApplication::impl_testDesktop()\nSearch 3c)-1 invalid\n" ); WRITE_LOGFILE( LOGFILE_TARGETING, "--------------------------------------------------------------------------------\n" ) WRITE_LOGFILE( LOGFILE_TARGETING, " Search with SIBLINGS for \"Frame_41\" on Desktop\n" ) WRITE_LOGFILE( LOGFILE_TARGETING, "--------------------------------------------------------------------------------\n" ) - nSearchFlags = FrameSearchFlag::SIBLINGS; - xSearchFrame = xDesktopFrame->findFrame(sTargetFrameName, nSearchFlags); + nSearchFlags = FrameSearchFlag::SIBLINGS; + xSearchFrame = xDesktopFrame->findFrame(sTargetFrameName, nSearchFlags); LOG_ASSERT( !(xSearchFrame.is()==sal_True), "TestApplication::impl_testDesktop()\nSearch 3c)-2 invalid\n" ); WRITE_LOGFILE( LOGFILE_TARGETING, "--------------------------------------------------------------------------------\n" ) WRITE_LOGFILE( LOGFILE_TARGETING, " Search with CHILDREN for \"Frame_41\" on Desktop\n" ) WRITE_LOGFILE( LOGFILE_TARGETING, "--------------------------------------------------------------------------------\n" ) - nSearchFlags = FrameSearchFlag::CHILDREN; - xSearchFrame = xDesktopFrame->findFrame(sTargetFrameName, nSearchFlags); + nSearchFlags = FrameSearchFlag::CHILDREN; + xSearchFrame = xDesktopFrame->findFrame(sTargetFrameName, nSearchFlags); LOG_ASSERT( !(xSearchFrame.is()==sal_False), "TestApplication::impl_testDesktop()\nSearch 3c)-3 invalid\n" ); WRITE_LOGFILE( LOGFILE_TARGETING, "--------------------------------------------------------------------------------\n" ) WRITE_LOGFILE( LOGFILE_TARGETING, " Search with ALL for \"Frame_41\" on Desktop\n" ) WRITE_LOGFILE( LOGFILE_TARGETING, "--------------------------------------------------------------------------------\n" ) - nSearchFlags = FrameSearchFlag::ALL; - xSearchFrame = xDesktopFrame->findFrame(sTargetFrameName, nSearchFlags); + nSearchFlags = FrameSearchFlag::ALL; + xSearchFrame = xDesktopFrame->findFrame(sTargetFrameName, nSearchFlags); LOG_ASSERT( !(xSearchFrame.is()==sal_False), "TestApplication::impl_testDesktop()\nSearch 3c)-4 invalid\n" ); WRITE_LOGFILE( LOGFILE_TARGETING, "--------------------------------------------------------------------------------\n" ) WRITE_LOGFILE( LOGFILE_TARGETING, " Search with SELF for \"Frame_41\" on Task_4\n" ) WRITE_LOGFILE( LOGFILE_TARGETING, "--------------------------------------------------------------------------------\n" ) - nSearchFlags = FrameSearchFlag::SELF; - xSearchFrame = xTask_4->findFrame(sTargetFrameName, nSearchFlags); + nSearchFlags = FrameSearchFlag::SELF; + xSearchFrame = xTask_4->findFrame(sTargetFrameName, nSearchFlags); LOG_ASSERT( !(xSearchFrame.is()==sal_True), "TestApplication::impl_testDesktop()\nSearch 3c)-5 invalid\n" ); WRITE_LOGFILE( LOGFILE_TARGETING, "--------------------------------------------------------------------------------\n" ) WRITE_LOGFILE( LOGFILE_TARGETING, " Search with SIBLINGS for \"Frame_41\" on Task_4\n" ) WRITE_LOGFILE( LOGFILE_TARGETING, "--------------------------------------------------------------------------------\n" ) - nSearchFlags = FrameSearchFlag::SIBLINGS; - xSearchFrame = xTask_4->findFrame(sTargetFrameName, nSearchFlags); + nSearchFlags = FrameSearchFlag::SIBLINGS; + xSearchFrame = xTask_4->findFrame(sTargetFrameName, nSearchFlags); LOG_ASSERT( !(xSearchFrame.is()==sal_True), "TestApplication::impl_testDesktop()\nSearch 3c)-6 invalid\n" ); WRITE_LOGFILE( LOGFILE_TARGETING, "--------------------------------------------------------------------------------\n" ) WRITE_LOGFILE( LOGFILE_TARGETING, " Search with CHILDREN for \"Frame_41\" on Task_4\n" ) WRITE_LOGFILE( LOGFILE_TARGETING, "--------------------------------------------------------------------------------\n" ) - nSearchFlags = FrameSearchFlag::CHILDREN; - xSearchFrame = xTask_4->findFrame(sTargetFrameName, nSearchFlags); + nSearchFlags = FrameSearchFlag::CHILDREN; + xSearchFrame = xTask_4->findFrame(sTargetFrameName, nSearchFlags); LOG_ASSERT( !(xSearchFrame.is()==sal_False), "TestApplication::impl_testDesktop()\nSearch 3c)-7 invalid\n" ); WRITE_LOGFILE( LOGFILE_TARGETING, "--------------------------------------------------------------------------------\n" ) WRITE_LOGFILE( LOGFILE_TARGETING, " Search with ALL for \"Frame_41\" on Task_4\n" ) WRITE_LOGFILE( LOGFILE_TARGETING, "--------------------------------------------------------------------------------\n" ) - nSearchFlags = FrameSearchFlag::ALL; - xSearchFrame = xTask_4->findFrame(sTargetFrameName, nSearchFlags); + nSearchFlags = FrameSearchFlag::ALL; + xSearchFrame = xTask_4->findFrame(sTargetFrameName, nSearchFlags); LOG_ASSERT( !(xSearchFrame.is()==sal_False), "TestApplication::impl_testDesktop()\nSearch 3c)-8 invalid\n" ); xFrame_41 = xSearchFrame; - // 3d) Search for Frame_411 - // 3e) Search for Frame_112 - // 3f) Search for Frame_1123 - // 3g) Search for Frame_11231 - // 3h) Search for Frame_11221 + // 3d) Search for Frame_411 + // 3e) Search for Frame_112 + // 3f) Search for Frame_1123 + // 3g) Search for Frame_11231 + // 3h) Search for Frame_11221 } //_________________________________________________________________________________________________________________ -// helper method to build a new binaer-tree with desktop as top-frame +// helper method to build a new binaer-tree with desktop as top-frame //_________________________________________________________________________________________________________________ void TestApplication::impl_buildTree( const Reference< XDesktop >& xDesktop ) { @@ -792,33 +792,33 @@ void TestApplication::impl_buildTree( const Reference< XDesktop >& xDesktop ) // Create some tasks and frames. Reference< XMultiServiceFactory > xServiceManager( getProcessServiceFactory() ); - Reference< XTask > xTask_1( xServiceManager->createInstance(SERVICENAME_TASK), UNO_QUERY ); - Reference< XTask > xTask_2( xServiceManager->createInstance(SERVICENAME_TASK), UNO_QUERY ); - Reference< XTask > xTask_3( xServiceManager->createInstance(SERVICENAME_TASK), UNO_QUERY ); - Reference< XTask > xTask_4( xServiceManager->createInstance(SERVICENAME_TASK), UNO_QUERY ); - Reference< XTask > xTask_5( xServiceManager->createInstance(SERVICENAME_TASK), UNO_QUERY ); - Reference< XFrame > xFrame_11( xServiceManager->createInstance(SERVICENAME_FRAME), UNO_QUERY ); - Reference< XFrame > xFrame_12( xServiceManager->createInstance(SERVICENAME_FRAME), UNO_QUERY ); - Reference< XFrame > xFrame_21( xServiceManager->createInstance(SERVICENAME_FRAME), UNO_QUERY ); - Reference< XFrame > xFrame_22( xServiceManager->createInstance(SERVICENAME_FRAME), UNO_QUERY ); - Reference< XFrame > xFrame_31( xServiceManager->createInstance(SERVICENAME_FRAME), UNO_QUERY ); - Reference< XFrame > xFrame_32( xServiceManager->createInstance(SERVICENAME_FRAME), UNO_QUERY ); - Reference< XFrame > xFrame_41( xServiceManager->createInstance(SERVICENAME_FRAME), UNO_QUERY ); - Reference< XFrame > xFrame_42( xServiceManager->createInstance(SERVICENAME_FRAME), UNO_QUERY ); - Reference< XFrame > xFrame_51( xServiceManager->createInstance(SERVICENAME_FRAME), UNO_QUERY ); - Reference< XFrame > xFrame_52( xServiceManager->createInstance(SERVICENAME_FRAME), UNO_QUERY ); - Reference< XFrame > xFrame_111( xServiceManager->createInstance(SERVICENAME_FRAME), UNO_QUERY ); - Reference< XFrame > xFrame_112( xServiceManager->createInstance(SERVICENAME_FRAME), UNO_QUERY ); - Reference< XFrame > xFrame_121( xServiceManager->createInstance(SERVICENAME_FRAME), UNO_QUERY ); - Reference< XFrame > xFrame_411( xServiceManager->createInstance(SERVICENAME_FRAME), UNO_QUERY ); - Reference< XFrame > xFrame_1121( xServiceManager->createInstance(SERVICENAME_FRAME), UNO_QUERY ); - Reference< XFrame > xFrame_1122( xServiceManager->createInstance(SERVICENAME_FRAME), UNO_QUERY ); - Reference< XFrame > xFrame_1123( xServiceManager->createInstance(SERVICENAME_FRAME), UNO_QUERY ); - Reference< XFrame > xFrame_4111( xServiceManager->createInstance(SERVICENAME_FRAME), UNO_QUERY ); - Reference< XFrame > xFrame_4112( xServiceManager->createInstance(SERVICENAME_FRAME), UNO_QUERY ); - Reference< XFrame > xFrame_4113( xServiceManager->createInstance(SERVICENAME_FRAME), UNO_QUERY ); - Reference< XFrame > xFrame_11221( xServiceManager->createInstance(SERVICENAME_FRAME), UNO_QUERY ); - Reference< XFrame > xFrame_11231( xServiceManager->createInstance(SERVICENAME_FRAME), UNO_QUERY ); + Reference< XTask > xTask_1( xServiceManager->createInstance(SERVICENAME_TASK), UNO_QUERY ); + Reference< XTask > xTask_2( xServiceManager->createInstance(SERVICENAME_TASK), UNO_QUERY ); + Reference< XTask > xTask_3( xServiceManager->createInstance(SERVICENAME_TASK), UNO_QUERY ); + Reference< XTask > xTask_4( xServiceManager->createInstance(SERVICENAME_TASK), UNO_QUERY ); + Reference< XTask > xTask_5( xServiceManager->createInstance(SERVICENAME_TASK), UNO_QUERY ); + Reference< XFrame > xFrame_11( xServiceManager->createInstance(SERVICENAME_FRAME), UNO_QUERY ); + Reference< XFrame > xFrame_12( xServiceManager->createInstance(SERVICENAME_FRAME), UNO_QUERY ); + Reference< XFrame > xFrame_21( xServiceManager->createInstance(SERVICENAME_FRAME), UNO_QUERY ); + Reference< XFrame > xFrame_22( xServiceManager->createInstance(SERVICENAME_FRAME), UNO_QUERY ); + Reference< XFrame > xFrame_31( xServiceManager->createInstance(SERVICENAME_FRAME), UNO_QUERY ); + Reference< XFrame > xFrame_32( xServiceManager->createInstance(SERVICENAME_FRAME), UNO_QUERY ); + Reference< XFrame > xFrame_41( xServiceManager->createInstance(SERVICENAME_FRAME), UNO_QUERY ); + Reference< XFrame > xFrame_42( xServiceManager->createInstance(SERVICENAME_FRAME), UNO_QUERY ); + Reference< XFrame > xFrame_51( xServiceManager->createInstance(SERVICENAME_FRAME), UNO_QUERY ); + Reference< XFrame > xFrame_52( xServiceManager->createInstance(SERVICENAME_FRAME), UNO_QUERY ); + Reference< XFrame > xFrame_111( xServiceManager->createInstance(SERVICENAME_FRAME), UNO_QUERY ); + Reference< XFrame > xFrame_112( xServiceManager->createInstance(SERVICENAME_FRAME), UNO_QUERY ); + Reference< XFrame > xFrame_121( xServiceManager->createInstance(SERVICENAME_FRAME), UNO_QUERY ); + Reference< XFrame > xFrame_411( xServiceManager->createInstance(SERVICENAME_FRAME), UNO_QUERY ); + Reference< XFrame > xFrame_1121( xServiceManager->createInstance(SERVICENAME_FRAME), UNO_QUERY ); + Reference< XFrame > xFrame_1122( xServiceManager->createInstance(SERVICENAME_FRAME), UNO_QUERY ); + Reference< XFrame > xFrame_1123( xServiceManager->createInstance(SERVICENAME_FRAME), UNO_QUERY ); + Reference< XFrame > xFrame_4111( xServiceManager->createInstance(SERVICENAME_FRAME), UNO_QUERY ); + Reference< XFrame > xFrame_4112( xServiceManager->createInstance(SERVICENAME_FRAME), UNO_QUERY ); + Reference< XFrame > xFrame_4113( xServiceManager->createInstance(SERVICENAME_FRAME), UNO_QUERY ); + Reference< XFrame > xFrame_11221( xServiceManager->createInstance(SERVICENAME_FRAME), UNO_QUERY ); + Reference< XFrame > xFrame_11231( xServiceManager->createInstance(SERVICENAME_FRAME), UNO_QUERY ); // Initialize tasks and frames with names to support easy finding! Reference< XFrame > xTaskFrame_1( xTask_1, UNO_QUERY ); @@ -914,77 +914,77 @@ void TestApplication::impl_buildTree( const Reference< XDesktop >& xDesktop ) // Create some active paths. // desktop => task_1 => frame_11 => frame_112 => frame_1122 -// xDesktopSupplier->setActiveFrame( xTaskFrame_1 ); -// xTaskFramesSupplier_1->setActiveFrame( xFrame_11 ); -// xFramesSupplier_11->setActiveFrame( xFrame_112 ); -// xFramesSupplier_112->setActiveFrame( xFrame_1122 ); +// xDesktopSupplier->setActiveFrame( xTaskFrame_1 ); +// xTaskFramesSupplier_1->setActiveFrame( xFrame_11 ); +// xFramesSupplier_11->setActiveFrame( xFrame_112 ); +// xFramesSupplier_112->setActiveFrame( xFrame_1122 ); // frame_41 => frame_411 => frame_4111 -// xFramesSupplier_41->setActiveFrame( xFrame_411 ); -// xFramesSupplier_411->setActiveFrame( xFrame_4111 ); +// xFramesSupplier_41->setActiveFrame( xFrame_411 ); +// xFramesSupplier_411->setActiveFrame( xFrame_4111 ); // task_3 => frame_31 -// xTaskFramesSupplier_3->setActiveFrame( xFrame_31 ); +// xTaskFramesSupplier_3->setActiveFrame( xFrame_31 ); // frame_1123 => frame_11231 -// xFramesSupplier_1123->setActiveFrame( xFrame_11231 ); - -// xTask_1->activate(); -// impl_logTree( xDesktop ); -// xFrame_41->activate(); -// impl_logTree( xDesktop ); -// xFrame_52->activate(); -// impl_logTree( xDesktop ); -// WRITE_LOGFILE( LOGFILENAME_TREE, "initiale Hierarchy:" ) +// xFramesSupplier_1123->setActiveFrame( xFrame_11231 ); + +// xTask_1->activate(); +// impl_logTree( xDesktop ); +// xFrame_41->activate(); +// impl_logTree( xDesktop ); +// xFrame_52->activate(); +// impl_logTree( xDesktop ); +// WRITE_LOGFILE( LOGFILENAME_TREE, "initiale Hierarchy:" ) impl_logTree( xDesktop ); -// xFrame_121->activate(); -// impl_logTree( xDesktop ); -// xFrame_41->activate(); -// impl_logTree( xDesktop ); -// xFrame_52->activate(); -// impl_logTree( xDesktop ); -// WRITE_LOGFILE( LOGFILENAME_EVENTS, "nach xFrame_411->activate():" ) +// xFrame_121->activate(); +// impl_logTree( xDesktop ); +// xFrame_41->activate(); +// impl_logTree( xDesktop ); +// xFrame_52->activate(); +// impl_logTree( xDesktop ); +// WRITE_LOGFILE( LOGFILENAME_EVENTS, "nach xFrame_411->activate():" ) xFrame_411->activate(); -// WRITE_LOGFILE( LOGFILENAME_TREE, "nach xFrame_411->activate():" ) +// WRITE_LOGFILE( LOGFILENAME_TREE, "nach xFrame_411->activate():" ) impl_logTree( xDesktop ); -// xFrame_41->deactivate(); -// impl_logTree( xDesktop ); -// xFrame_4113->activate(); -// impl_logTree( xDesktop ); -// xFrame_21->activate(); -// impl_logTree( xDesktop ); -// WRITE_LOGFILE( LOGFILENAME_EVENTS, "nach xFrame_11231->activate():" ) +// xFrame_41->deactivate(); +// impl_logTree( xDesktop ); +// xFrame_4113->activate(); +// impl_logTree( xDesktop ); +// xFrame_21->activate(); +// impl_logTree( xDesktop ); +// WRITE_LOGFILE( LOGFILENAME_EVENTS, "nach xFrame_11231->activate():" ) xFrame_11231->activate(); -// WRITE_LOGFILE( LOGFILENAME_TREE, "nach xFrame_11231->activate():" ) +// WRITE_LOGFILE( LOGFILENAME_TREE, "nach xFrame_11231->activate():" ) impl_logTree( xDesktop ); -// WRITE_LOGFILE( LOGFILENAME_EVENTS, "nach xFrame_11221->activate():" ) +// WRITE_LOGFILE( LOGFILENAME_EVENTS, "nach xFrame_11221->activate():" ) xFrame_11221->activate(); -// WRITE_LOGFILE( LOGFILENAME_TREE, "nach xFrame_11221->activate():" ) +// WRITE_LOGFILE( LOGFILENAME_TREE, "nach xFrame_11221->activate():" ) impl_logTree( xDesktop ); -// WRITE_LOGFILE( LOGFILENAME_EVENTS, "nach xFrame_112->deactivate():" ) -// xFrame_112->getCreator()->setActiveFrame( Reference< XFrame >() ); +// WRITE_LOGFILE( LOGFILENAME_EVENTS, "nach xFrame_112->deactivate():" ) +// xFrame_112->getCreator()->setActiveFrame( Reference< XFrame >() ); xFrame_112->deactivate(); -// WRITE_LOGFILE( LOGFILENAME_TREE, "nach xFrame_112->deactivate():" ) +// WRITE_LOGFILE( LOGFILENAME_TREE, "nach xFrame_112->deactivate():" ) impl_logTree( xDesktop ); -// WRITE_LOGFILE( LOGFILENAME_EVENTS, "nach xFrame_41->activate():" ) +// WRITE_LOGFILE( LOGFILENAME_EVENTS, "nach xFrame_41->activate():" ) xFrame_41->activate(); -// WRITE_LOGFILE( LOGFILENAME_TREE, "nach xFrame_41->activate():" ) +// WRITE_LOGFILE( LOGFILENAME_TREE, "nach xFrame_41->activate():" ) impl_logTree( xDesktop ); -// WRITE_LOGFILE( LOGFILENAME_EVENTS, "nach xTask_4->activate():" ) +// WRITE_LOGFILE( LOGFILENAME_EVENTS, "nach xTask_4->activate():" ) xTask_4->activate(); -// WRITE_LOGFILE( LOGFILENAME_TREE, "nach xTask_4->activate():" ) +// WRITE_LOGFILE( LOGFILENAME_TREE, "nach xTask_4->activate():" ) impl_logTree( xDesktop ); -// WRITE_LOGFILE( LOGFILENAME_EVENTS, "nach xFrame_1123->deactivate():" ) +// WRITE_LOGFILE( LOGFILENAME_EVENTS, "nach xFrame_1123->deactivate():" ) xFrame_1123->deactivate(); -// WRITE_LOGFILE( LOGFILENAME_TREE, "nach xFrame_1123->deactivate():" ) +// WRITE_LOGFILE( LOGFILENAME_TREE, "nach xFrame_1123->deactivate():" ) impl_logTree( xDesktop ); } //_________________________________________________________________________________________________________________ -// helper method to log current tree state +// helper method to log current tree state //_________________________________________________________________________________________________________________ void TestApplication::impl_logTree( const Reference< XDesktop >& xDesktop ) { @@ -997,15 +997,15 @@ void TestApplication::impl_logTree( const Reference< XDesktop >& xDesktop ) OUString sTreeNamesStream = xDebug->dumpVariable( DUMPVARIABLE_TREEINFO, 0 ); // And write it to logfile. OString sOutPut = OUStringToOString( sTreeNamesStream, RTL_TEXTENCODING_UTF8 ); -// WRITE_LOGFILE( LOGFILENAME_TREE, "\nNew tree log:\n\n" ); -// WRITE_LOGFILE( LOGFILENAME_TREE, sOutPut ); -// WRITE_LOGFILE( LOGFILENAME_TREE, "\n" ); +// WRITE_LOGFILE( LOGFILENAME_TREE, "\nNew tree log:\n\n" ); +// WRITE_LOGFILE( LOGFILENAME_TREE, sOutPut ); +// WRITE_LOGFILE( LOGFILENAME_TREE, "\n" ); #endif } #endif // TEST_DESKTOP //_________________________________________________________________________________________________________________ -// test method for registration of new filters in configuration +// test method for registration of new filters in configuration //_________________________________________________________________________________________________________________ #ifdef TEST_FILTERREGISTRATION void TestApplication::impl_testFilterRegistration() @@ -1016,60 +1016,60 @@ void TestApplication::impl_testFilterRegistration() { Sequence< PropertyValue > lProperties( 8 ); - lProperties[0].Name = DECLARE_ASCII("Type" ); - lProperties[0].Value <<= DECLARE_ASCII("component_DB" ); + lProperties[0].Name = DECLARE_ASCII("Type" ); + lProperties[0].Value <<= DECLARE_ASCII("component_DB" ); - lProperties[1].Name = DECLARE_ASCII("UIName" ); - lProperties[1].Value <<= DECLARE_ASCII("Ein neuer Filter-Eintrag"); + lProperties[1].Name = DECLARE_ASCII("UIName" ); + lProperties[1].Value <<= DECLARE_ASCII("Ein neuer Filter-Eintrag"); - lProperties[2].Name = DECLARE_ASCII("DocumentService" ); - lProperties[2].Value <<= DECLARE_ASCII("test.document.service" ); + lProperties[2].Name = DECLARE_ASCII("DocumentService" ); + lProperties[2].Value <<= DECLARE_ASCII("test.document.service" ); - lProperties[3].Name = DECLARE_ASCII("FilterService" ); - lProperties[3].Value <<= DECLARE_ASCII("test.filter.service" ); + lProperties[3].Name = DECLARE_ASCII("FilterService" ); + lProperties[3].Value <<= DECLARE_ASCII("test.filter.service" ); - lProperties[4].Name = DECLARE_ASCII("Flags" ); - lProperties[4].Value <<= (sal_Int32)100; + lProperties[4].Name = DECLARE_ASCII("Flags" ); + lProperties[4].Value <<= (sal_Int32)100; Sequence< OUString > lTempData(1); lTempData[0] = DECLARE_ASCII("meine UserData"); - lProperties[5].Name = DECLARE_ASCII("UserData" ); - lProperties[5].Value <<= lTempData; + lProperties[5].Name = DECLARE_ASCII("UserData" ); + lProperties[5].Value <<= lTempData; - lProperties[6].Name = DECLARE_ASCII("FileFormatVersion" ); - lProperties[6].Value <<= (sal_Int32)1; + lProperties[6].Name = DECLARE_ASCII("FileFormatVersion" ); + lProperties[6].Value <<= (sal_Int32)1; - lProperties[7].Name = DECLARE_ASCII("TemplateName" ); - lProperties[7].Value <<= DECLARE_ASCII("Mein Template Name" ); + lProperties[7].Name = DECLARE_ASCII("TemplateName" ); + lProperties[7].Value <<= DECLARE_ASCII("Mein Template Name" ); Any aProperties; aProperties <<= lProperties; xContainer->insertByName( DECLARE_ASCII("mein_eigener_neuer_Filter"), aProperties ); - lProperties[0].Name = DECLARE_ASCII("Type" ); - lProperties[0].Value <<= DECLARE_ASCII("component_DB" ); + lProperties[0].Name = DECLARE_ASCII("Type" ); + lProperties[0].Value <<= DECLARE_ASCII("component_DB" ); - lProperties[1].Name = DECLARE_ASCII("UIName" ); - lProperties[1].Value <<= DECLARE_ASCII("Ein neuer Filter-Eintrag 2"); + lProperties[1].Name = DECLARE_ASCII("UIName" ); + lProperties[1].Value <<= DECLARE_ASCII("Ein neuer Filter-Eintrag 2"); - lProperties[2].Name = DECLARE_ASCII("DocumentService" ); - lProperties[2].Value <<= DECLARE_ASCII("test.document.service 2" ); + lProperties[2].Name = DECLARE_ASCII("DocumentService" ); + lProperties[2].Value <<= DECLARE_ASCII("test.document.service 2" ); - lProperties[3].Name = DECLARE_ASCII("FilterService" ); - lProperties[3].Value <<= DECLARE_ASCII("test.filter.service 2" ); + lProperties[3].Name = DECLARE_ASCII("FilterService" ); + lProperties[3].Value <<= DECLARE_ASCII("test.filter.service 2" ); - lProperties[4].Name = DECLARE_ASCII("Flags" ); - lProperties[4].Value <<= (sal_Int32)200; + lProperties[4].Name = DECLARE_ASCII("Flags" ); + lProperties[4].Value <<= (sal_Int32)200; lTempData[0] = DECLARE_ASCII("meine UserData 2"); - lProperties[5].Name = DECLARE_ASCII("UserData" ); - lProperties[5].Value <<= lTempData; + lProperties[5].Name = DECLARE_ASCII("UserData" ); + lProperties[5].Value <<= lTempData; - lProperties[6].Name = DECLARE_ASCII("FileFormatVersion" ); - lProperties[6].Value <<= (sal_Int32)2; + lProperties[6].Name = DECLARE_ASCII("FileFormatVersion" ); + lProperties[6].Value <<= (sal_Int32)2; - lProperties[7].Name = DECLARE_ASCII("TemplateName" ); - lProperties[7].Value <<= DECLARE_ASCII("Mein Template Name 2" ); + lProperties[7].Name = DECLARE_ASCII("TemplateName" ); + lProperties[7].Value <<= DECLARE_ASCII("Mein Template Name 2" ); aProperties <<= lProperties; xContainer->insertByName( DECLARE_ASCII("mein_eigener_neuer_Filter_2"), aProperties ); @@ -1080,54 +1080,54 @@ void TestApplication::impl_testFilterRegistration() #endif //_________________________________________________________________________________________________________________ -// test method for search mechanism in our frame tree +// test method for search mechanism in our frame tree //_________________________________________________________________________________________________________________ #ifdef TEST_TREESEARCH sal_Bool TestApplication::impl_testTreeSearch() { // Build an example tree. - Reference< XFrame > xD ( m_xFactory->createInstance( SERVICENAME_DESKTOP ), UNO_QUERY ); - Reference< XFrame > xT1 ( m_xFactory->createInstance( SERVICENAME_TASK ), UNO_QUERY ); - Reference< XFrame > xT2 ( m_xFactory->createInstance( SERVICENAME_TASK ), UNO_QUERY ); - Reference< XFrame > xT3 ( m_xFactory->createInstance( SERVICENAME_TASK ), UNO_QUERY ); - Reference< XFrame > xF11 ( m_xFactory->createInstance( SERVICENAME_FRAME ), UNO_QUERY ); - Reference< XFrame > xF12 ( m_xFactory->createInstance( SERVICENAME_FRAME ), UNO_QUERY ); - Reference< XFrame > xF21 ( m_xFactory->createInstance( SERVICENAME_FRAME ), UNO_QUERY ); - Reference< XFrame > xF22 ( m_xFactory->createInstance( SERVICENAME_FRAME ), UNO_QUERY ); - Reference< XFrame > xF211 ( m_xFactory->createInstance( SERVICENAME_FRAME ), UNO_QUERY ); - Reference< XFrame > xF212 ( m_xFactory->createInstance( SERVICENAME_FRAME ), UNO_QUERY ); - Reference< XFrame > xF221 ( m_xFactory->createInstance( SERVICENAME_FRAME ), UNO_QUERY ); - Reference< XFrame > xF2111 ( m_xFactory->createInstance( SERVICENAME_FRAME ), UNO_QUERY ); - Reference< XFrame > xF2112 ( m_xFactory->createInstance( SERVICENAME_FRAME ), UNO_QUERY ); - Reference< XFrame > xF2121 ( m_xFactory->createInstance( SERVICENAME_FRAME ), UNO_QUERY ); - Reference< XFrame > xF2122 ( m_xFactory->createInstance( SERVICENAME_FRAME ), UNO_QUERY ); - Reference< XFrame > xF2211 ( m_xFactory->createInstance( SERVICENAME_FRAME ), UNO_QUERY ); - Reference< XFrame > xF21111 ( m_xFactory->createInstance( SERVICENAME_FRAME ), UNO_QUERY ); - Reference< XFrame > xF21112 ( m_xFactory->createInstance( SERVICENAME_FRAME ), UNO_QUERY ); - Reference< XFrame > xF21121 ( m_xFactory->createInstance( SERVICENAME_FRAME ), UNO_QUERY ); - Reference< XFrame > xF21122 ( m_xFactory->createInstance( SERVICENAME_FRAME ), UNO_QUERY ); - Reference< XFrame > xF21211 ( m_xFactory->createInstance( SERVICENAME_FRAME ), UNO_QUERY ); - Reference< XFrame > xF21212 ( m_xFactory->createInstance( SERVICENAME_FRAME ), UNO_QUERY ); - Reference< XFrame > xF21221 ( m_xFactory->createInstance( SERVICENAME_FRAME ), UNO_QUERY ); - Reference< XFrame > xF21222 ( m_xFactory->createInstance( SERVICENAME_FRAME ), UNO_QUERY ); - Reference< XFrame > xF22111 ( m_xFactory->createInstance( SERVICENAME_FRAME ), UNO_QUERY ); - - xD->setName ( DECLARE_ASCII("D" ) ); - xT1->setName ( DECLARE_ASCII("T1" ) ); - xT2->setName ( DECLARE_ASCII("T2" ) ); - xT3->setName ( DECLARE_ASCII("T3" ) ); - xF11->setName ( DECLARE_ASCII("F11" ) ); - xF12->setName ( DECLARE_ASCII("F12" ) ); - xF21->setName ( DECLARE_ASCII("F21" ) ); - xF22->setName ( DECLARE_ASCII("F22" ) ); - xF211->setName ( DECLARE_ASCII("F211" ) ); - xF212->setName ( DECLARE_ASCII("F212" ) ); - xF221->setName ( DECLARE_ASCII("F221" ) ); - xF2111->setName ( DECLARE_ASCII("F2111" ) ); - xF2112->setName ( DECLARE_ASCII("F2112" ) ); - xF2121->setName ( DECLARE_ASCII("F2121" ) ); - xF2122->setName ( DECLARE_ASCII("F2122" ) ); - xF2211->setName ( DECLARE_ASCII("F2211" ) ); + Reference< XFrame > xD ( m_xFactory->createInstance( SERVICENAME_DESKTOP ), UNO_QUERY ); + Reference< XFrame > xT1 ( m_xFactory->createInstance( SERVICENAME_TASK ), UNO_QUERY ); + Reference< XFrame > xT2 ( m_xFactory->createInstance( SERVICENAME_TASK ), UNO_QUERY ); + Reference< XFrame > xT3 ( m_xFactory->createInstance( SERVICENAME_TASK ), UNO_QUERY ); + Reference< XFrame > xF11 ( m_xFactory->createInstance( SERVICENAME_FRAME ), UNO_QUERY ); + Reference< XFrame > xF12 ( m_xFactory->createInstance( SERVICENAME_FRAME ), UNO_QUERY ); + Reference< XFrame > xF21 ( m_xFactory->createInstance( SERVICENAME_FRAME ), UNO_QUERY ); + Reference< XFrame > xF22 ( m_xFactory->createInstance( SERVICENAME_FRAME ), UNO_QUERY ); + Reference< XFrame > xF211 ( m_xFactory->createInstance( SERVICENAME_FRAME ), UNO_QUERY ); + Reference< XFrame > xF212 ( m_xFactory->createInstance( SERVICENAME_FRAME ), UNO_QUERY ); + Reference< XFrame > xF221 ( m_xFactory->createInstance( SERVICENAME_FRAME ), UNO_QUERY ); + Reference< XFrame > xF2111 ( m_xFactory->createInstance( SERVICENAME_FRAME ), UNO_QUERY ); + Reference< XFrame > xF2112 ( m_xFactory->createInstance( SERVICENAME_FRAME ), UNO_QUERY ); + Reference< XFrame > xF2121 ( m_xFactory->createInstance( SERVICENAME_FRAME ), UNO_QUERY ); + Reference< XFrame > xF2122 ( m_xFactory->createInstance( SERVICENAME_FRAME ), UNO_QUERY ); + Reference< XFrame > xF2211 ( m_xFactory->createInstance( SERVICENAME_FRAME ), UNO_QUERY ); + Reference< XFrame > xF21111 ( m_xFactory->createInstance( SERVICENAME_FRAME ), UNO_QUERY ); + Reference< XFrame > xF21112 ( m_xFactory->createInstance( SERVICENAME_FRAME ), UNO_QUERY ); + Reference< XFrame > xF21121 ( m_xFactory->createInstance( SERVICENAME_FRAME ), UNO_QUERY ); + Reference< XFrame > xF21122 ( m_xFactory->createInstance( SERVICENAME_FRAME ), UNO_QUERY ); + Reference< XFrame > xF21211 ( m_xFactory->createInstance( SERVICENAME_FRAME ), UNO_QUERY ); + Reference< XFrame > xF21212 ( m_xFactory->createInstance( SERVICENAME_FRAME ), UNO_QUERY ); + Reference< XFrame > xF21221 ( m_xFactory->createInstance( SERVICENAME_FRAME ), UNO_QUERY ); + Reference< XFrame > xF21222 ( m_xFactory->createInstance( SERVICENAME_FRAME ), UNO_QUERY ); + Reference< XFrame > xF22111 ( m_xFactory->createInstance( SERVICENAME_FRAME ), UNO_QUERY ); + + xD->setName ( DECLARE_ASCII("D" ) ); + xT1->setName ( DECLARE_ASCII("T1" ) ); + xT2->setName ( DECLARE_ASCII("T2" ) ); + xT3->setName ( DECLARE_ASCII("T3" ) ); + xF11->setName ( DECLARE_ASCII("F11" ) ); + xF12->setName ( DECLARE_ASCII("F12" ) ); + xF21->setName ( DECLARE_ASCII("F21" ) ); + xF22->setName ( DECLARE_ASCII("F22" ) ); + xF211->setName ( DECLARE_ASCII("F211" ) ); + xF212->setName ( DECLARE_ASCII("F212" ) ); + xF221->setName ( DECLARE_ASCII("F221" ) ); + xF2111->setName ( DECLARE_ASCII("F2111" ) ); + xF2112->setName ( DECLARE_ASCII("F2112" ) ); + xF2121->setName ( DECLARE_ASCII("F2121" ) ); + xF2122->setName ( DECLARE_ASCII("F2122" ) ); + xF2211->setName ( DECLARE_ASCII("F2211" ) ); xF21111->setName( DECLARE_ASCII("F21111") ); xF21112->setName( DECLARE_ASCII("F21112") ); xF21121->setName( DECLARE_ASCII("F21121") ); @@ -1138,86 +1138,86 @@ sal_Bool TestApplication::impl_testTreeSearch() xF21222->setName( DECLARE_ASCII("F21222") ); xF22111->setName( DECLARE_ASCII("F22111") ); - Reference< XFramesSupplier > xSD ( xD , UNO_QUERY ); - Reference< XFramesSupplier > xST1 ( xT1 , UNO_QUERY ); - Reference< XFramesSupplier > xST2 ( xT2 , UNO_QUERY ); - Reference< XFramesSupplier > xST3 ( xT3 , UNO_QUERY ); - Reference< XFramesSupplier > xSF11 ( xF11 , UNO_QUERY ); - Reference< XFramesSupplier > xSF12 ( xF12 , UNO_QUERY ); - Reference< XFramesSupplier > xSF21 ( xF21 , UNO_QUERY ); - Reference< XFramesSupplier > xSF22 ( xF22 , UNO_QUERY ); - Reference< XFramesSupplier > xSF211 ( xF211 , UNO_QUERY ); - Reference< XFramesSupplier > xSF212 ( xF212 , UNO_QUERY ); - Reference< XFramesSupplier > xSF221 ( xF221 , UNO_QUERY ); - Reference< XFramesSupplier > xSF2111 ( xF2111 , UNO_QUERY ); - Reference< XFramesSupplier > xSF2112 ( xF2112 , UNO_QUERY ); - Reference< XFramesSupplier > xSF2121 ( xF2121 , UNO_QUERY ); - Reference< XFramesSupplier > xSF2122 ( xF2122 , UNO_QUERY ); - Reference< XFramesSupplier > xSF2211 ( xF2211 , UNO_QUERY ); - Reference< XFramesSupplier > xSF21111 ( xF21111 , UNO_QUERY ); - Reference< XFramesSupplier > xSF21112 ( xF21112 , UNO_QUERY ); - Reference< XFramesSupplier > xSF21121 ( xF21121 , UNO_QUERY ); - Reference< XFramesSupplier > xSF21122 ( xF21122 , UNO_QUERY ); - Reference< XFramesSupplier > xSF21211 ( xF21211 , UNO_QUERY ); - Reference< XFramesSupplier > xSF21212 ( xF21212 , UNO_QUERY ); - Reference< XFramesSupplier > xSF21221 ( xF21221 , UNO_QUERY ); - Reference< XFramesSupplier > xSF21222 ( xF21222 , UNO_QUERY ); - Reference< XFramesSupplier > xSF22111 ( xF22111 , UNO_QUERY ); - - xSD->getFrames()->append ( xT1 ); - xSD->getFrames()->append ( xT2 ); - xSD->getFrames()->append ( xT3 ); - xST1->getFrames()->append ( xF11 ); - xST1->getFrames()->append ( xF12 ); - xST2->getFrames()->append ( xF21 ); - xST2->getFrames()->append ( xF22 ); - xSF21->getFrames()->append ( xF211 ); - xSF21->getFrames()->append ( xF212 ); - xSF211->getFrames()->append ( xF2111 ); - xSF211->getFrames()->append ( xF2112 ); - xSF212->getFrames()->append ( xF2121 ); - xSF212->getFrames()->append ( xF2122 ); - xSF2111->getFrames()->append ( xF21111 ); - xSF2111->getFrames()->append ( xF21112 ); - xSF2112->getFrames()->append ( xF21121 ); - xSF2112->getFrames()->append ( xF21122 ); - xSF2121->getFrames()->append ( xF21211 ); - xSF2121->getFrames()->append ( xF21212 ); - xSF2122->getFrames()->append ( xF21221 ); - xSF2122->getFrames()->append ( xF21222 ); - xSF22->getFrames()->append ( xF221 ); - xSF221->getFrames()->append ( xF2211 ); - xSF2211->getFrames()->append ( xF22111 ); + Reference< XFramesSupplier > xSD ( xD , UNO_QUERY ); + Reference< XFramesSupplier > xST1 ( xT1 , UNO_QUERY ); + Reference< XFramesSupplier > xST2 ( xT2 , UNO_QUERY ); + Reference< XFramesSupplier > xST3 ( xT3 , UNO_QUERY ); + Reference< XFramesSupplier > xSF11 ( xF11 , UNO_QUERY ); + Reference< XFramesSupplier > xSF12 ( xF12 , UNO_QUERY ); + Reference< XFramesSupplier > xSF21 ( xF21 , UNO_QUERY ); + Reference< XFramesSupplier > xSF22 ( xF22 , UNO_QUERY ); + Reference< XFramesSupplier > xSF211 ( xF211 , UNO_QUERY ); + Reference< XFramesSupplier > xSF212 ( xF212 , UNO_QUERY ); + Reference< XFramesSupplier > xSF221 ( xF221 , UNO_QUERY ); + Reference< XFramesSupplier > xSF2111 ( xF2111 , UNO_QUERY ); + Reference< XFramesSupplier > xSF2112 ( xF2112 , UNO_QUERY ); + Reference< XFramesSupplier > xSF2121 ( xF2121 , UNO_QUERY ); + Reference< XFramesSupplier > xSF2122 ( xF2122 , UNO_QUERY ); + Reference< XFramesSupplier > xSF2211 ( xF2211 , UNO_QUERY ); + Reference< XFramesSupplier > xSF21111 ( xF21111 , UNO_QUERY ); + Reference< XFramesSupplier > xSF21112 ( xF21112 , UNO_QUERY ); + Reference< XFramesSupplier > xSF21121 ( xF21121 , UNO_QUERY ); + Reference< XFramesSupplier > xSF21122 ( xF21122 , UNO_QUERY ); + Reference< XFramesSupplier > xSF21211 ( xF21211 , UNO_QUERY ); + Reference< XFramesSupplier > xSF21212 ( xF21212 , UNO_QUERY ); + Reference< XFramesSupplier > xSF21221 ( xF21221 , UNO_QUERY ); + Reference< XFramesSupplier > xSF21222 ( xF21222 , UNO_QUERY ); + Reference< XFramesSupplier > xSF22111 ( xF22111 , UNO_QUERY ); + + xSD->getFrames()->append ( xT1 ); + xSD->getFrames()->append ( xT2 ); + xSD->getFrames()->append ( xT3 ); + xST1->getFrames()->append ( xF11 ); + xST1->getFrames()->append ( xF12 ); + xST2->getFrames()->append ( xF21 ); + xST2->getFrames()->append ( xF22 ); + xSF21->getFrames()->append ( xF211 ); + xSF21->getFrames()->append ( xF212 ); + xSF211->getFrames()->append ( xF2111 ); + xSF211->getFrames()->append ( xF2112 ); + xSF212->getFrames()->append ( xF2121 ); + xSF212->getFrames()->append ( xF2122 ); + xSF2111->getFrames()->append ( xF21111 ); + xSF2111->getFrames()->append ( xF21112 ); + xSF2112->getFrames()->append ( xF21121 ); + xSF2112->getFrames()->append ( xF21122 ); + xSF2121->getFrames()->append ( xF21211 ); + xSF2121->getFrames()->append ( xF21212 ); + xSF2122->getFrames()->append ( xF21221 ); + xSF2122->getFrames()->append ( xF21222 ); + xSF22->getFrames()->append ( xF221 ); + xSF221->getFrames()->append ( xF2211 ); + xSF2211->getFrames()->append ( xF22111 ); sal_Int32 nFlags = 0; // Test deep down search nFlags = FrameSearchFlag::CHILDREN; - if ( - ( xD->findFrame( DECLARE_ASCII("T1" ), nFlags ) != xT1 ) || - ( xD->findFrame( DECLARE_ASCII("T2" ), nFlags ) != xT2 ) || - ( xD->findFrame( DECLARE_ASCII("T3" ), nFlags ) != xT3 ) || - ( xD->findFrame( DECLARE_ASCII("F11" ), nFlags ) != xF11 ) || - ( xD->findFrame( DECLARE_ASCII("F12" ), nFlags ) != xF12 ) || - ( xD->findFrame( DECLARE_ASCII("F21" ), nFlags ) != xF21 ) || - ( xD->findFrame( DECLARE_ASCII("F22" ), nFlags ) != xF22 ) || - ( xD->findFrame( DECLARE_ASCII("F211" ), nFlags ) != xF211 ) || - ( xD->findFrame( DECLARE_ASCII("F212" ), nFlags ) != xF212 ) || - ( xD->findFrame( DECLARE_ASCII("F2111" ), nFlags ) != xF2111 ) || - ( xD->findFrame( DECLARE_ASCII("F2112" ), nFlags ) != xF2112 ) || - ( xD->findFrame( DECLARE_ASCII("F2121" ), nFlags ) != xF2121 ) || - ( xD->findFrame( DECLARE_ASCII("F2122" ), nFlags ) != xF2122 ) || - ( xD->findFrame( DECLARE_ASCII("F21111" ), nFlags ) != xF21111 ) || - ( xD->findFrame( DECLARE_ASCII("F21112" ), nFlags ) != xF21112 ) || - ( xD->findFrame( DECLARE_ASCII("F21121" ), nFlags ) != xF21121 ) || - ( xD->findFrame( DECLARE_ASCII("F21122" ), nFlags ) != xF21122 ) || - ( xD->findFrame( DECLARE_ASCII("F21211" ), nFlags ) != xF21211 ) || - ( xD->findFrame( DECLARE_ASCII("F21212" ), nFlags ) != xF21212 ) || - ( xD->findFrame( DECLARE_ASCII("F21221" ), nFlags ) != xF21221 ) || - ( xD->findFrame( DECLARE_ASCII("F21222" ), nFlags ) != xF21222 ) || - ( xD->findFrame( DECLARE_ASCII("F221" ), nFlags ) != xF221 ) || - ( xD->findFrame( DECLARE_ASCII("F2211" ), nFlags ) != xF2211 ) || - ( xD->findFrame( DECLARE_ASCII("F22111" ), nFlags ) != xF22111 ) + if ( + ( xD->findFrame( DECLARE_ASCII("T1" ), nFlags ) != xT1 ) || + ( xD->findFrame( DECLARE_ASCII("T2" ), nFlags ) != xT2 ) || + ( xD->findFrame( DECLARE_ASCII("T3" ), nFlags ) != xT3 ) || + ( xD->findFrame( DECLARE_ASCII("F11" ), nFlags ) != xF11 ) || + ( xD->findFrame( DECLARE_ASCII("F12" ), nFlags ) != xF12 ) || + ( xD->findFrame( DECLARE_ASCII("F21" ), nFlags ) != xF21 ) || + ( xD->findFrame( DECLARE_ASCII("F22" ), nFlags ) != xF22 ) || + ( xD->findFrame( DECLARE_ASCII("F211" ), nFlags ) != xF211 ) || + ( xD->findFrame( DECLARE_ASCII("F212" ), nFlags ) != xF212 ) || + ( xD->findFrame( DECLARE_ASCII("F2111" ), nFlags ) != xF2111 ) || + ( xD->findFrame( DECLARE_ASCII("F2112" ), nFlags ) != xF2112 ) || + ( xD->findFrame( DECLARE_ASCII("F2121" ), nFlags ) != xF2121 ) || + ( xD->findFrame( DECLARE_ASCII("F2122" ), nFlags ) != xF2122 ) || + ( xD->findFrame( DECLARE_ASCII("F21111" ), nFlags ) != xF21111 ) || + ( xD->findFrame( DECLARE_ASCII("F21112" ), nFlags ) != xF21112 ) || + ( xD->findFrame( DECLARE_ASCII("F21121" ), nFlags ) != xF21121 ) || + ( xD->findFrame( DECLARE_ASCII("F21122" ), nFlags ) != xF21122 ) || + ( xD->findFrame( DECLARE_ASCII("F21211" ), nFlags ) != xF21211 ) || + ( xD->findFrame( DECLARE_ASCII("F21212" ), nFlags ) != xF21212 ) || + ( xD->findFrame( DECLARE_ASCII("F21221" ), nFlags ) != xF21221 ) || + ( xD->findFrame( DECLARE_ASCII("F21222" ), nFlags ) != xF21222 ) || + ( xD->findFrame( DECLARE_ASCII("F221" ), nFlags ) != xF221 ) || + ( xD->findFrame( DECLARE_ASCII("F2211" ), nFlags ) != xF2211 ) || + ( xD->findFrame( DECLARE_ASCII("F22111" ), nFlags ) != xF22111 ) ) { LOG_ERROR( "TestApplikation::impl_testTreeSearch()", "deep down search failed" ) @@ -1226,31 +1226,31 @@ sal_Bool TestApplication::impl_testTreeSearch() // Test flat down search nFlags = FrameSearchFlag::CHILDREN | FrameSearchFlag::SIBLINGS; - if ( - ( xD->findFrame( DECLARE_ASCII("T1" ), nFlags ) != xT1 ) || - ( xD->findFrame( DECLARE_ASCII("T2" ), nFlags ) != xT2 ) || - ( xD->findFrame( DECLARE_ASCII("T3" ), nFlags ) != xT3 ) || - ( xD->findFrame( DECLARE_ASCII("F11" ), nFlags ) != xF11 ) || - ( xD->findFrame( DECLARE_ASCII("F12" ), nFlags ) != xF12 ) || - ( xD->findFrame( DECLARE_ASCII("F21" ), nFlags ) != xF21 ) || - ( xD->findFrame( DECLARE_ASCII("F22" ), nFlags ) != xF22 ) || - ( xD->findFrame( DECLARE_ASCII("F211" ), nFlags ) != xF211 ) || - ( xD->findFrame( DECLARE_ASCII("F212" ), nFlags ) != xF212 ) || - ( xD->findFrame( DECLARE_ASCII("F2111" ), nFlags ) != xF2111 ) || - ( xD->findFrame( DECLARE_ASCII("F2112" ), nFlags ) != xF2112 ) || - ( xD->findFrame( DECLARE_ASCII("F2121" ), nFlags ) != xF2121 ) || - ( xD->findFrame( DECLARE_ASCII("F2122" ), nFlags ) != xF2122 ) || - ( xD->findFrame( DECLARE_ASCII("F21111" ), nFlags ) != xF21111 ) || - ( xD->findFrame( DECLARE_ASCII("F21112" ), nFlags ) != xF21112 ) || - ( xD->findFrame( DECLARE_ASCII("F21121" ), nFlags ) != xF21121 ) || - ( xD->findFrame( DECLARE_ASCII("F21122" ), nFlags ) != xF21122 ) || - ( xD->findFrame( DECLARE_ASCII("F21211" ), nFlags ) != xF21211 ) || - ( xD->findFrame( DECLARE_ASCII("F21212" ), nFlags ) != xF21212 ) || - ( xD->findFrame( DECLARE_ASCII("F21221" ), nFlags ) != xF21221 ) || - ( xD->findFrame( DECLARE_ASCII("F21222" ), nFlags ) != xF21222 ) || - ( xD->findFrame( DECLARE_ASCII("F221" ), nFlags ) != xF221 ) || - ( xD->findFrame( DECLARE_ASCII("F2211" ), nFlags ) != xF2211 ) || - ( xD->findFrame( DECLARE_ASCII("F22111" ), nFlags ) != xF22111 ) + if ( + ( xD->findFrame( DECLARE_ASCII("T1" ), nFlags ) != xT1 ) || + ( xD->findFrame( DECLARE_ASCII("T2" ), nFlags ) != xT2 ) || + ( xD->findFrame( DECLARE_ASCII("T3" ), nFlags ) != xT3 ) || + ( xD->findFrame( DECLARE_ASCII("F11" ), nFlags ) != xF11 ) || + ( xD->findFrame( DECLARE_ASCII("F12" ), nFlags ) != xF12 ) || + ( xD->findFrame( DECLARE_ASCII("F21" ), nFlags ) != xF21 ) || + ( xD->findFrame( DECLARE_ASCII("F22" ), nFlags ) != xF22 ) || + ( xD->findFrame( DECLARE_ASCII("F211" ), nFlags ) != xF211 ) || + ( xD->findFrame( DECLARE_ASCII("F212" ), nFlags ) != xF212 ) || + ( xD->findFrame( DECLARE_ASCII("F2111" ), nFlags ) != xF2111 ) || + ( xD->findFrame( DECLARE_ASCII("F2112" ), nFlags ) != xF2112 ) || + ( xD->findFrame( DECLARE_ASCII("F2121" ), nFlags ) != xF2121 ) || + ( xD->findFrame( DECLARE_ASCII("F2122" ), nFlags ) != xF2122 ) || + ( xD->findFrame( DECLARE_ASCII("F21111" ), nFlags ) != xF21111 ) || + ( xD->findFrame( DECLARE_ASCII("F21112" ), nFlags ) != xF21112 ) || + ( xD->findFrame( DECLARE_ASCII("F21121" ), nFlags ) != xF21121 ) || + ( xD->findFrame( DECLARE_ASCII("F21122" ), nFlags ) != xF21122 ) || + ( xD->findFrame( DECLARE_ASCII("F21211" ), nFlags ) != xF21211 ) || + ( xD->findFrame( DECLARE_ASCII("F21212" ), nFlags ) != xF21212 ) || + ( xD->findFrame( DECLARE_ASCII("F21221" ), nFlags ) != xF21221 ) || + ( xD->findFrame( DECLARE_ASCII("F21222" ), nFlags ) != xF21222 ) || + ( xD->findFrame( DECLARE_ASCII("F221" ), nFlags ) != xF221 ) || + ( xD->findFrame( DECLARE_ASCII("F2211" ), nFlags ) != xF2211 ) || + ( xD->findFrame( DECLARE_ASCII("F22111" ), nFlags ) != xF22111 ) ) { LOG_ERROR( "TestApplikation::impl_testTreeSearch()", "flat down search failed" ) @@ -1260,47 +1260,47 @@ sal_Bool TestApplication::impl_testTreeSearch() // Test deep up search // All targets must be found. Control search steps in log files! nFlags = FrameSearchFlag::PARENT; - if ( - ( xF11->findFrame ( DECLARE_ASCII("T1"), nFlags ) != xT1 ) || // search for valid targets - ( xF12->findFrame ( DECLARE_ASCII("T1"), nFlags ) != xT1 ) || - ( xF21->findFrame ( DECLARE_ASCII("T2"), nFlags ) != xT2 ) || - ( xF22->findFrame ( DECLARE_ASCII("T2"), nFlags ) != xT2 ) || - ( xF211->findFrame ( DECLARE_ASCII("T2"), nFlags ) != xT2 ) || - ( xF212->findFrame ( DECLARE_ASCII("T2"), nFlags ) != xT2 ) || - ( xF221->findFrame ( DECLARE_ASCII("T2"), nFlags ) != xT2 ) || - ( xF2111->findFrame ( DECLARE_ASCII("T2"), nFlags ) != xT2 ) || - ( xF2121->findFrame ( DECLARE_ASCII("T2"), nFlags ) != xT2 ) || - ( xF2122->findFrame ( DECLARE_ASCII("T2"), nFlags ) != xT2 ) || - ( xF2211->findFrame ( DECLARE_ASCII("T2"), nFlags ) != xT2 ) || - ( xF21111->findFrame( DECLARE_ASCII("T2"), nFlags ) != xT2 ) || - ( xF21112->findFrame( DECLARE_ASCII("T2"), nFlags ) != xT2 ) || - ( xF21121->findFrame( DECLARE_ASCII("T2"), nFlags ) != xT2 ) || - ( xF21122->findFrame( DECLARE_ASCII("T2"), nFlags ) != xT2 ) || - ( xF21211->findFrame( DECLARE_ASCII("T2"), nFlags ) != xT2 ) || - ( xF21212->findFrame( DECLARE_ASCII("T2"), nFlags ) != xT2 ) || - ( xF21221->findFrame( DECLARE_ASCII("T2"), nFlags ) != xT2 ) || - ( xF21222->findFrame( DECLARE_ASCII("T2"), nFlags ) != xT2 ) || - ( xF22111->findFrame( DECLARE_ASCII("T2"), nFlags ) != xT2 ) || - ( xF11->findFrame ( DECLARE_ASCII("T3"), nFlags ).is() == sal_True ) || // search for existing but non valid targets - ( xF12->findFrame ( DECLARE_ASCII("T3"), nFlags ).is() == sal_True ) || - ( xF21->findFrame ( DECLARE_ASCII("T3"), nFlags ).is() == sal_True ) || - ( xF22->findFrame ( DECLARE_ASCII("T3"), nFlags ).is() == sal_True ) || - ( xF211->findFrame ( DECLARE_ASCII("T3"), nFlags ).is() == sal_True ) || - ( xF212->findFrame ( DECLARE_ASCII("T3"), nFlags ).is() == sal_True ) || - ( xF221->findFrame ( DECLARE_ASCII("T3"), nFlags ).is() == sal_True ) || - ( xF2111->findFrame ( DECLARE_ASCII("T3"), nFlags ).is() == sal_True ) || - ( xF2121->findFrame ( DECLARE_ASCII("T3"), nFlags ).is() == sal_True ) || - ( xF2122->findFrame ( DECLARE_ASCII("T3"), nFlags ).is() == sal_True ) || - ( xF2211->findFrame ( DECLARE_ASCII("T3"), nFlags ).is() == sal_True ) || - ( xF21111->findFrame( DECLARE_ASCII("T3"), nFlags ).is() == sal_True ) || - ( xF21112->findFrame( DECLARE_ASCII("T3"), nFlags ).is() == sal_True ) || - ( xF21121->findFrame( DECLARE_ASCII("T3"), nFlags ).is() == sal_True ) || - ( xF21122->findFrame( DECLARE_ASCII("T3"), nFlags ).is() == sal_True ) || - ( xF21211->findFrame( DECLARE_ASCII("T3"), nFlags ).is() == sal_True ) || - ( xF21212->findFrame( DECLARE_ASCII("T3"), nFlags ).is() == sal_True ) || - ( xF21221->findFrame( DECLARE_ASCII("T3"), nFlags ).is() == sal_True ) || - ( xF21222->findFrame( DECLARE_ASCII("T3"), nFlags ).is() == sal_True ) || - ( xF22111->findFrame( DECLARE_ASCII("T3"), nFlags ).is() == sal_True ) + if ( + ( xF11->findFrame ( DECLARE_ASCII("T1"), nFlags ) != xT1 ) || // search for valid targets + ( xF12->findFrame ( DECLARE_ASCII("T1"), nFlags ) != xT1 ) || + ( xF21->findFrame ( DECLARE_ASCII("T2"), nFlags ) != xT2 ) || + ( xF22->findFrame ( DECLARE_ASCII("T2"), nFlags ) != xT2 ) || + ( xF211->findFrame ( DECLARE_ASCII("T2"), nFlags ) != xT2 ) || + ( xF212->findFrame ( DECLARE_ASCII("T2"), nFlags ) != xT2 ) || + ( xF221->findFrame ( DECLARE_ASCII("T2"), nFlags ) != xT2 ) || + ( xF2111->findFrame ( DECLARE_ASCII("T2"), nFlags ) != xT2 ) || + ( xF2121->findFrame ( DECLARE_ASCII("T2"), nFlags ) != xT2 ) || + ( xF2122->findFrame ( DECLARE_ASCII("T2"), nFlags ) != xT2 ) || + ( xF2211->findFrame ( DECLARE_ASCII("T2"), nFlags ) != xT2 ) || + ( xF21111->findFrame( DECLARE_ASCII("T2"), nFlags ) != xT2 ) || + ( xF21112->findFrame( DECLARE_ASCII("T2"), nFlags ) != xT2 ) || + ( xF21121->findFrame( DECLARE_ASCII("T2"), nFlags ) != xT2 ) || + ( xF21122->findFrame( DECLARE_ASCII("T2"), nFlags ) != xT2 ) || + ( xF21211->findFrame( DECLARE_ASCII("T2"), nFlags ) != xT2 ) || + ( xF21212->findFrame( DECLARE_ASCII("T2"), nFlags ) != xT2 ) || + ( xF21221->findFrame( DECLARE_ASCII("T2"), nFlags ) != xT2 ) || + ( xF21222->findFrame( DECLARE_ASCII("T2"), nFlags ) != xT2 ) || + ( xF22111->findFrame( DECLARE_ASCII("T2"), nFlags ) != xT2 ) || + ( xF11->findFrame ( DECLARE_ASCII("T3"), nFlags ).is() == sal_True ) || // search for existing but non valid targets + ( xF12->findFrame ( DECLARE_ASCII("T3"), nFlags ).is() == sal_True ) || + ( xF21->findFrame ( DECLARE_ASCII("T3"), nFlags ).is() == sal_True ) || + ( xF22->findFrame ( DECLARE_ASCII("T3"), nFlags ).is() == sal_True ) || + ( xF211->findFrame ( DECLARE_ASCII("T3"), nFlags ).is() == sal_True ) || + ( xF212->findFrame ( DECLARE_ASCII("T3"), nFlags ).is() == sal_True ) || + ( xF221->findFrame ( DECLARE_ASCII("T3"), nFlags ).is() == sal_True ) || + ( xF2111->findFrame ( DECLARE_ASCII("T3"), nFlags ).is() == sal_True ) || + ( xF2121->findFrame ( DECLARE_ASCII("T3"), nFlags ).is() == sal_True ) || + ( xF2122->findFrame ( DECLARE_ASCII("T3"), nFlags ).is() == sal_True ) || + ( xF2211->findFrame ( DECLARE_ASCII("T3"), nFlags ).is() == sal_True ) || + ( xF21111->findFrame( DECLARE_ASCII("T3"), nFlags ).is() == sal_True ) || + ( xF21112->findFrame( DECLARE_ASCII("T3"), nFlags ).is() == sal_True ) || + ( xF21121->findFrame( DECLARE_ASCII("T3"), nFlags ).is() == sal_True ) || + ( xF21122->findFrame( DECLARE_ASCII("T3"), nFlags ).is() == sal_True ) || + ( xF21211->findFrame( DECLARE_ASCII("T3"), nFlags ).is() == sal_True ) || + ( xF21212->findFrame( DECLARE_ASCII("T3"), nFlags ).is() == sal_True ) || + ( xF21221->findFrame( DECLARE_ASCII("T3"), nFlags ).is() == sal_True ) || + ( xF21222->findFrame( DECLARE_ASCII("T3"), nFlags ).is() == sal_True ) || + ( xF22111->findFrame( DECLARE_ASCII("T3"), nFlags ).is() == sal_True ) ) { LOG_ERROR( "TestApplikation::impl_testTreeSearch()", "deep up search failed" ) @@ -1310,10 +1310,10 @@ sal_Bool TestApplication::impl_testTreeSearch() // Test inside/outside tasks search // No frames outside current task should be found if TASKS flag isnt set. // Otherwise he must be found! - if ( - ( xF21211->findFrame( DECLARE_ASCII("F12" ), FrameSearchFlag::ALL ) == xF12 ) || - ( xF21211->findFrame( DECLARE_ASCII("F22111"), FrameSearchFlag::GLOBAL ) != xF22111 ) || - ( xF21211->findFrame( DECLARE_ASCII("T4" ), FrameSearchFlag::GLOBAL | FrameSearchFlag::CREATE ).is() == sal_False) + if ( + ( xF21211->findFrame( DECLARE_ASCII("F12" ), FrameSearchFlag::ALL ) == xF12 ) || + ( xF21211->findFrame( DECLARE_ASCII("F22111"), FrameSearchFlag::GLOBAL ) != xF22111 ) || + ( xF21211->findFrame( DECLARE_ASCII("T4" ), FrameSearchFlag::GLOBAL | FrameSearchFlag::CREATE ).is() == sal_False) ) { LOG_ERROR( "TestApplikation::impl_testTreeSearch()", "inside/outside task search failed" ) @@ -1323,23 +1323,23 @@ sal_Bool TestApplication::impl_testTreeSearch() // Test SELF // Use the desktop, one task and one frame node to do that. // The desktop must ignore these question ... all other must return himself. - LOG_ASSERT2( (xD->findFrame ( DECLARE_ASCII(""), FrameSearchFlag::SELF ) == xD ), "TestApplication::impl_testTreeSearch()", "SELF search for D failed\n" ) - LOG_ASSERT2( (xT1->findFrame ( DECLARE_ASCII(""), FrameSearchFlag::SELF ) != xT1 ), "TestApplication::impl_testTreeSearch()", "SELF search for T1 failed\n" ) - LOG_ASSERT2( (xF12->findFrame ( DECLARE_ASCII(""), FrameSearchFlag::SELF ) != xF12 ), "TestApplication::impl_testTreeSearch()", "SELF search for F12 failed\n" ) + LOG_ASSERT2( (xD->findFrame ( DECLARE_ASCII(""), FrameSearchFlag::SELF ) == xD ), "TestApplication::impl_testTreeSearch()", "SELF search for D failed\n" ) + LOG_ASSERT2( (xT1->findFrame ( DECLARE_ASCII(""), FrameSearchFlag::SELF ) != xT1 ), "TestApplication::impl_testTreeSearch()", "SELF search for T1 failed\n" ) + LOG_ASSERT2( (xF12->findFrame ( DECLARE_ASCII(""), FrameSearchFlag::SELF ) != xF12 ), "TestApplication::impl_testTreeSearch()", "SELF search for F12 failed\n" ) // Test special task search at desktop // These search allow TASKS and CREATE flags only! // We make no deep search - we work on direct children of desktop only. // Supported for desktop only. - LOG_ASSERT2( (xD->findFrame ( DECLARE_ASCII("T1"), FrameSearchFlag::TASKS ) != xT1 ), "TestApplication::impl_testTreeSearch()", "special TASKS search for T1 failed\n" ) - LOG_ASSERT2( (xD->findFrame ( DECLARE_ASCII("T2"), FrameSearchFlag::TASKS ) != xT2 ), "TestApplication::impl_testTreeSearch()", "special TASKS search for T2 failed\n" ) - LOG_ASSERT2( (xD->findFrame ( DECLARE_ASCII("T3"), FrameSearchFlag::TASKS ) != xT3 ), "TestApplication::impl_testTreeSearch()", "special TASKS search for T3 failed\n" ) + LOG_ASSERT2( (xD->findFrame ( DECLARE_ASCII("T1"), FrameSearchFlag::TASKS ) != xT1 ), "TestApplication::impl_testTreeSearch()", "special TASKS search for T1 failed\n" ) + LOG_ASSERT2( (xD->findFrame ( DECLARE_ASCII("T2"), FrameSearchFlag::TASKS ) != xT2 ), "TestApplication::impl_testTreeSearch()", "special TASKS search for T2 failed\n" ) + LOG_ASSERT2( (xD->findFrame ( DECLARE_ASCII("T3"), FrameSearchFlag::TASKS ) != xT3 ), "TestApplication::impl_testTreeSearch()", "special TASKS search for T3 failed\n" ) // Attention: T4 was created before! - LOG_ASSERT2( (xD->findFrame ( DECLARE_ASCII("T5"), FrameSearchFlag::TASKS ).is() == sal_True ), "TestApplication::impl_testTreeSearch()", "special TASKS search for T5 failed\n" ) - LOG_ASSERT2( (xD->findFrame ( DECLARE_ASCII("T5"), FrameSearchFlag::TASKS | FrameSearchFlag::CREATE ).is() == sal_False ), "TestApplication::impl_testTreeSearch()", "special TASKS+CREATE search for T5 failed\n" ) - LOG_ASSERT2( (xD->findFrame ( DECLARE_ASCII("F12"), FrameSearchFlag::TASKS ).is() == sal_True ), "TestApplication::impl_testTreeSearch()", "special TASKS search for F12 failed\n" ) - LOG_ASSERT2( (xF12->findFrame ( DECLARE_ASCII("T1"), FrameSearchFlag::TASKS ).is() == sal_True ), "TestApplication::impl_testTreeSearch()", "special TASKS search for T1 from F12 failed\n" ) - LOG_ASSERT2( (xF22111->findFrame( DECLARE_ASCII("T1"), FrameSearchFlag::TASKS ).is() == sal_True ), "TestApplication::impl_testTreeSearch()", "special TASKS search for T1 from F22111 failed\n" ) + LOG_ASSERT2( (xD->findFrame ( DECLARE_ASCII("T5"), FrameSearchFlag::TASKS ).is() == sal_True ), "TestApplication::impl_testTreeSearch()", "special TASKS search for T5 failed\n" ) + LOG_ASSERT2( (xD->findFrame ( DECLARE_ASCII("T5"), FrameSearchFlag::TASKS | FrameSearchFlag::CREATE ).is() == sal_False ), "TestApplication::impl_testTreeSearch()", "special TASKS+CREATE search for T5 failed\n" ) + LOG_ASSERT2( (xD->findFrame ( DECLARE_ASCII("F12"), FrameSearchFlag::TASKS ).is() == sal_True ), "TestApplication::impl_testTreeSearch()", "special TASKS search for F12 failed\n" ) + LOG_ASSERT2( (xF12->findFrame ( DECLARE_ASCII("T1"), FrameSearchFlag::TASKS ).is() == sal_True ), "TestApplication::impl_testTreeSearch()", "special TASKS search for T1 from F12 failed\n" ) + LOG_ASSERT2( (xF22111->findFrame( DECLARE_ASCII("T1"), FrameSearchFlag::TASKS ).is() == sal_True ), "TestApplication::impl_testTreeSearch()", "special TASKS search for T1 from F22111 failed\n" ) return sal_True; } diff --git a/framework/test/threadtest.cxx b/framework/test/threadtest.cxx index 744307f4107c..1e70fb31b397 100644 --- a/framework/test/threadtest.cxx +++ b/framework/test/threadtest.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <macros/generic.hxx> #include <macros/debug.hxx> @@ -47,11 +47,11 @@ #include <threadhelp/writeguard.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <rtl/random.h> #include <vos/process.hxx> @@ -71,23 +71,23 @@ #include <stdio.h> //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ -#define LOGFILE "threadtest.log" -#define STATISTICS_FILE "threadtest_statistic.csv" +#define LOGFILE "threadtest.log" +#define STATISTICS_FILE "threadtest_statistic.csv" //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ -using namespace ::rtl ; -using namespace ::osl ; -using namespace ::vos ; -using namespace ::framework ; +using namespace ::rtl ; +using namespace ::osl ; +using namespace ::vos ; +using namespace ::framework ; //_________________________________________________________________________________________________________________ -// defines +// defines //_________________________________________________________________________________________________________________ /*---------------- Use follow defines to enable/disable some special features of this little test program! -------*/ @@ -99,165 +99,165 @@ using namespace ::framework ; /*----------------------------------------------------------------------------------------------------------------*/ #ifdef ENABLE_LOG - #define LOG_SETA_START( NA, NID ) \ - { \ - sal_uInt32 nTimeStamp = osl_getGlobalTimer(); \ - ResetableGuard aLogGuard( m_aLogMutex ); \ - OStringBuffer sLog(256); \ - sLog.append( (sal_Int32)nTimeStamp ); \ - sLog.append( ": Thread[ " ); \ - sLog.append( NID ); \ - sLog.append( " ] call setA( " ); \ - sLog.append( NA ); \ - sLog.append( " )\n" ); \ - WRITE_LOGFILE( LOGFILE, sLog.makeStringAndClear() ) \ + #define LOG_SETA_START( NA, NID ) \ + { \ + sal_uInt32 nTimeStamp = osl_getGlobalTimer(); \ + ResetableGuard aLogGuard( m_aLogMutex ); \ + OStringBuffer sLog(256); \ + sLog.append( (sal_Int32)nTimeStamp ); \ + sLog.append( ": Thread[ " ); \ + sLog.append( NID ); \ + sLog.append( " ] call setA( " ); \ + sLog.append( NA ); \ + sLog.append( " )\n" ); \ + WRITE_LOGFILE( LOGFILE, sLog.makeStringAndClear() ) \ } - #define LOG_SETA_END( NA, EREASON, NID ) \ - { \ - sal_uInt32 nTimeStamp = osl_getGlobalTimer(); \ - ResetableGuard aLogGuard( m_aLogMutex ); \ - OStringBuffer sLog(256); \ - sLog.append( (sal_Int32)nTimeStamp ); \ - sLog.append( ": Thread[ " ); \ - sLog.append( NID ); \ - if( EREASON == E_NOREASON ) \ - sLog.append( " ] finish setA( " ); \ - else \ - sLog.append( " ] was refused at setA( "); \ - sLog.append( NA ); \ - sLog.append( " )\n" ); \ - WRITE_LOGFILE( LOGFILE, sLog.makeStringAndClear() ) \ + #define LOG_SETA_END( NA, EREASON, NID ) \ + { \ + sal_uInt32 nTimeStamp = osl_getGlobalTimer(); \ + ResetableGuard aLogGuard( m_aLogMutex ); \ + OStringBuffer sLog(256); \ + sLog.append( (sal_Int32)nTimeStamp ); \ + sLog.append( ": Thread[ " ); \ + sLog.append( NID ); \ + if( EREASON == E_NOREASON ) \ + sLog.append( " ] finish setA( " ); \ + else \ + sLog.append( " ] was refused at setA( "); \ + sLog.append( NA ); \ + sLog.append( " )\n" ); \ + WRITE_LOGFILE( LOGFILE, sLog.makeStringAndClear() ) \ } - #define LOG_GETA_START( NID ) \ - { \ - sal_uInt32 nTimeStamp = osl_getGlobalTimer(); \ - ResetableGuard aLogGuard( m_aLogMutex ); \ - OStringBuffer sLog(256); \ - sLog.append( (sal_Int32)nTimeStamp ); \ - sLog.append( ": Thread[ " ); \ - sLog.append( NID ); \ - sLog.append( " ] call getA()\n" ); \ - WRITE_LOGFILE( LOGFILE, sLog.makeStringAndClear() ) \ + #define LOG_GETA_START( NID ) \ + { \ + sal_uInt32 nTimeStamp = osl_getGlobalTimer(); \ + ResetableGuard aLogGuard( m_aLogMutex ); \ + OStringBuffer sLog(256); \ + sLog.append( (sal_Int32)nTimeStamp ); \ + sLog.append( ": Thread[ " ); \ + sLog.append( NID ); \ + sLog.append( " ] call getA()\n" ); \ + WRITE_LOGFILE( LOGFILE, sLog.makeStringAndClear() ) \ } - #define LOG_GETA_END( NRETURN, EREASON, NID ) \ - { \ - sal_uInt32 nTimeStamp = osl_getGlobalTimer(); \ - ResetableGuard aLogGuard( m_aLogMutex ); \ - OStringBuffer sLog(256); \ - sLog.append( (sal_Int32)nTimeStamp ); \ - sLog.append( ": Thread[ " ); \ - sLog.append( NID ); \ - if( EREASON == E_NOREASON ) \ - sLog.append( " ] finish getA() with " ); \ - else \ - sLog.append( " ] was refused at getA() with " ); \ - sLog.append( NRETURN ); \ - sLog.append( "\n" ); \ - WRITE_LOGFILE( LOGFILE, sLog.makeStringAndClear() ) \ + #define LOG_GETA_END( NRETURN, EREASON, NID ) \ + { \ + sal_uInt32 nTimeStamp = osl_getGlobalTimer(); \ + ResetableGuard aLogGuard( m_aLogMutex ); \ + OStringBuffer sLog(256); \ + sLog.append( (sal_Int32)nTimeStamp ); \ + sLog.append( ": Thread[ " ); \ + sLog.append( NID ); \ + if( EREASON == E_NOREASON ) \ + sLog.append( " ] finish getA() with " ); \ + else \ + sLog.append( " ] was refused at getA() with " ); \ + sLog.append( NRETURN ); \ + sLog.append( "\n" ); \ + WRITE_LOGFILE( LOGFILE, sLog.makeStringAndClear() ) \ } - #define LOG_WORKA_START( NA, NID ) \ - { \ - sal_uInt32 nTimeStamp = osl_getGlobalTimer(); \ - ResetableGuard aLogGuard( m_aLogMutex ); \ - OStringBuffer sLog(256); \ - sLog.append( (sal_Int32)nTimeStamp ); \ - sLog.append( ": Thread[ " ); \ - sLog.append( NID ); \ - sLog.append( " ] call workA( " ); \ - sLog.append( NA ); \ - sLog.append( " )\n" ); \ - WRITE_LOGFILE( LOGFILE, sLog.makeStringAndClear() ) \ + #define LOG_WORKA_START( NA, NID ) \ + { \ + sal_uInt32 nTimeStamp = osl_getGlobalTimer(); \ + ResetableGuard aLogGuard( m_aLogMutex ); \ + OStringBuffer sLog(256); \ + sLog.append( (sal_Int32)nTimeStamp ); \ + sLog.append( ": Thread[ " ); \ + sLog.append( NID ); \ + sLog.append( " ] call workA( " ); \ + sLog.append( NA ); \ + sLog.append( " )\n" ); \ + WRITE_LOGFILE( LOGFILE, sLog.makeStringAndClear() ) \ } - #define LOG_WORKA_END( NRETURN, EREASON, NID ) \ - { \ - sal_uInt32 nTimeStamp = osl_getGlobalTimer(); \ - ResetableGuard aLogGuard( m_aLogMutex ); \ - OStringBuffer sLog(256); \ - sLog.append( (sal_Int32)nTimeStamp ); \ - sLog.append( ": Thread[ " ); \ - sLog.append( NID ); \ - if( EREASON == E_NOREASON ) \ - sLog.append( " ] finish workA() with " ); \ - else \ - sLog.append( " ] was refused at workA() with " ); \ - sLog.append( NRETURN ); \ - sLog.append( "\n" ); \ - WRITE_LOGFILE( LOGFILE, sLog.makeStringAndClear() ) \ + #define LOG_WORKA_END( NRETURN, EREASON, NID ) \ + { \ + sal_uInt32 nTimeStamp = osl_getGlobalTimer(); \ + ResetableGuard aLogGuard( m_aLogMutex ); \ + OStringBuffer sLog(256); \ + sLog.append( (sal_Int32)nTimeStamp ); \ + sLog.append( ": Thread[ " ); \ + sLog.append( NID ); \ + if( EREASON == E_NOREASON ) \ + sLog.append( " ] finish workA() with " ); \ + else \ + sLog.append( " ] was refused at workA() with " ); \ + sLog.append( NRETURN ); \ + sLog.append( "\n" ); \ + WRITE_LOGFILE( LOGFILE, sLog.makeStringAndClear() ) \ } - #define LOG_INITEXCEPTION( SMETHOD, NID ) \ - { \ - sal_uInt32 nTimeStamp = osl_getGlobalTimer(); \ - ResetableGuard aLogGuard( m_aLogMutex ); \ - OStringBuffer sLog(256); \ - sLog.append( (sal_Int32)nTimeStamp ); \ - sLog.append( ": Thread[ " ); \ - sLog.append( NID ); \ - sLog.append( " ] get EInitException from \"" ); \ - sLog.append( SMETHOD ); \ - sLog.append( "\"\n" ); \ - WRITE_LOGFILE( LOGFILE, sLog.makeStringAndClear() ) \ + #define LOG_INITEXCEPTION( SMETHOD, NID ) \ + { \ + sal_uInt32 nTimeStamp = osl_getGlobalTimer(); \ + ResetableGuard aLogGuard( m_aLogMutex ); \ + OStringBuffer sLog(256); \ + sLog.append( (sal_Int32)nTimeStamp ); \ + sLog.append( ": Thread[ " ); \ + sLog.append( NID ); \ + sLog.append( " ] get EInitException from \"" ); \ + sLog.append( SMETHOD ); \ + sLog.append( "\"\n" ); \ + WRITE_LOGFILE( LOGFILE, sLog.makeStringAndClear() ) \ } - #define LOG_CLOSEEXCEPTION( SMETHOD, NID ) \ - { \ - sal_uInt32 nTimeStamp = osl_getGlobalTimer(); \ - ResetableGuard aLogGuard( m_aLogMutex ); \ - OStringBuffer sLog(256); \ - sLog.append( (sal_Int32)nTimeStamp ); \ - sLog.append( ": Thread[ " ); \ - sLog.append( NID ); \ - sLog.append( " ] get ECloseException from \"" ); \ - sLog.append( SMETHOD ); \ - sLog.append( "\"\n" ); \ - WRITE_LOGFILE( LOGFILE, sLog.makeStringAndClear() ) \ + #define LOG_CLOSEEXCEPTION( SMETHOD, NID ) \ + { \ + sal_uInt32 nTimeStamp = osl_getGlobalTimer(); \ + ResetableGuard aLogGuard( m_aLogMutex ); \ + OStringBuffer sLog(256); \ + sLog.append( (sal_Int32)nTimeStamp ); \ + sLog.append( ": Thread[ " ); \ + sLog.append( NID ); \ + sLog.append( " ] get ECloseException from \"" ); \ + sLog.append( SMETHOD ); \ + sLog.append( "\"\n" ); \ + WRITE_LOGFILE( LOGFILE, sLog.makeStringAndClear() ) \ } - #define LOG_INIT( NA, NID ) \ - { \ - sal_uInt32 nTimeStamp = osl_getGlobalTimer(); \ - ResetableGuard aLogGuard( m_aLogMutex ); \ - OStringBuffer sLog(256); \ - sLog.append( (sal_Int32)nTimeStamp ); \ - sLog.append( ": Thread[ " ); \ - sLog.append( NID ); \ - sLog.append( " ] initialize me with " ); \ - sLog.append( NA ); \ - sLog.append( "\n" ); \ - WRITE_LOGFILE( LOGFILE, sLog.makeStringAndClear() ) \ + #define LOG_INIT( NA, NID ) \ + { \ + sal_uInt32 nTimeStamp = osl_getGlobalTimer(); \ + ResetableGuard aLogGuard( m_aLogMutex ); \ + OStringBuffer sLog(256); \ + sLog.append( (sal_Int32)nTimeStamp ); \ + sLog.append( ": Thread[ " ); \ + sLog.append( NID ); \ + sLog.append( " ] initialize me with " ); \ + sLog.append( NA ); \ + sLog.append( "\n" ); \ + WRITE_LOGFILE( LOGFILE, sLog.makeStringAndClear() ) \ } - #define LOG_CLOSE( NID ) \ - { \ - sal_uInt32 nTimeStamp = osl_getGlobalTimer(); \ - ResetableGuard aLogGuard( m_aLogMutex ); \ - OStringBuffer sLog(256); \ - sLog.append( (sal_Int32)nTimeStamp ); \ - sLog.append( ": Thread[ " ); \ - sLog.append( NID ); \ - sLog.append( " ] close me\n" ); \ - WRITE_LOGFILE( LOGFILE, sLog.makeStringAndClear() ) \ + #define LOG_CLOSE( NID ) \ + { \ + sal_uInt32 nTimeStamp = osl_getGlobalTimer(); \ + ResetableGuard aLogGuard( m_aLogMutex ); \ + OStringBuffer sLog(256); \ + sLog.append( (sal_Int32)nTimeStamp ); \ + sLog.append( ": Thread[ " ); \ + sLog.append( NID ); \ + sLog.append( " ] close me\n" ); \ + WRITE_LOGFILE( LOGFILE, sLog.makeStringAndClear() ) \ } #else - #define LOG_SETA_START( NA, NID ) - #define LOG_SETA_END( NA, EREASON, NID ) - #define LOG_GETA_START( NID ) - #define LOG_GETA_END( NRETURN, EREASON, NID ) - #define LOG_WORKA_START( NA, NID ) - #define LOG_WORKA_END( NRETURN, EREASON, NID ) - #define LOG_INITEXCEPTION( SMETHOD, NID ) - #define LOG_CLOSEEXCEPTION( SMETHOD, NID ) - #define LOG_INIT( NA, NID ) - #define LOG_CLOSE( NID ) + #define LOG_SETA_START( NA, NID ) + #define LOG_SETA_END( NA, EREASON, NID ) + #define LOG_GETA_START( NID ) + #define LOG_GETA_END( NRETURN, EREASON, NID ) + #define LOG_WORKA_START( NA, NID ) + #define LOG_WORKA_END( NRETURN, EREASON, NID ) + #define LOG_INITEXCEPTION( SMETHOD, NID ) + #define LOG_CLOSEEXCEPTION( SMETHOD, NID ) + #define LOG_INIT( NA, NID ) + #define LOG_CLOSE( NID ) #endif //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ sal_uInt16 getRandomValue() @@ -265,21 +265,21 @@ sal_uInt16 getRandomValue() // Get new random value for thread-sleep! // See run() for further informations. // Always calculate a new random number. - sal_uInt16 nValue; - rtlRandomPool aPool = rtl_random_createPool(); - rtl_random_getBytes ( aPool, &nValue, 2 ); - rtl_random_destroyPool ( aPool ); + sal_uInt16 nValue; + rtlRandomPool aPool = rtl_random_createPool(); + rtl_random_getBytes ( aPool, &nValue, 2 ); + rtl_random_destroyPool ( aPool ); return nValue; } /*-************************************************************************************************************//** - @descr This class is used from different threads at the same time. + @descr This class is used from different threads at the same time. We start working after calling init() first(!) ... and finish it by calling close(). It exist two methods for reading/writing an internal variable "A". Another function workA() do both things at the same time. All public methods log information in a file if DO_LOG is defined. - @attention Our public base class FaiRWLockBase is a struct with a RWLock as member. + @attention Our public base class FaiRWLockBase is a struct with a RWLock as member. This member can be used by guards to safe access at internal variables in interface methods. Another baseclass is the TransactionBase. They support rejection of wrong calls at wrong time. @@ -291,37 +291,37 @@ class ThreadSafeClass : private TransactionBase { public: - ThreadSafeClass (); + ThreadSafeClass (); ~ThreadSafeClass(); // This methods are used from differnt threads // to test this class. - void init ( sal_Int32 nA , - sal_Int32 nThreadID ); - void close ( sal_Int32 nThreadID ); - void setA ( sal_Int32 nA , - sal_Int32 nThreadID ); - sal_Int32 getA ( sal_Int32 nThreadID ); - sal_Int32 workA ( sal_Int32 nA , - sal_Int32 nThreadID ); + void init ( sal_Int32 nA , + sal_Int32 nThreadID ); + void close ( sal_Int32 nThreadID ); + void setA ( sal_Int32 nA , + sal_Int32 nThreadID ); + sal_Int32 getA ( sal_Int32 nThreadID ); + sal_Int32 workA ( sal_Int32 nA , + sal_Int32 nThreadID ); #ifdef ENABLE_REQUESTCOUNT // This methods are used for statistics only! - sal_Int32 getReadCount () { return m_nReadCount; } - sal_Int32 getWriteCount() { return m_nWriteCount; } + sal_Int32 getReadCount () { return m_nReadCount; } + sal_Int32 getWriteCount() { return m_nWriteCount; } #endif private: - sal_Int32 m_nA ; /// test member fro reading/writing + sal_Int32 m_nA ; /// test member fro reading/writing #ifdef ENABLE_LOG - ::osl::Mutex m_aLogMutex ; /// mutex to serialize writing log file! + ::osl::Mutex m_aLogMutex ; /// mutex to serialize writing log file! #endif #ifdef ENABLE_REQUESTCOUNT - oslInterlockedCount m_nReadCount ; /// statistic variables to count read/write requests - oslInterlockedCount m_nWriteCount ; + oslInterlockedCount m_nReadCount ; /// statistic variables to count read/write requests + oslInterlockedCount m_nWriteCount ; #endif }; @@ -329,10 +329,10 @@ class ThreadSafeClass : private TransactionBase ThreadSafeClass::ThreadSafeClass() : TransactionBase ( ) , FairRWLockBase ( ) - , m_nA ( 0 ) + , m_nA ( 0 ) #ifdef ENABLE_REQUESTCOUNT - , m_nReadCount ( 0 ) - , m_nWriteCount ( 0 ) + , m_nReadCount ( 0 ) + , m_nWriteCount ( 0 ) #endif { } @@ -400,7 +400,7 @@ void ThreadSafeClass::close( sal_Int32 nThreadID ) } //_________________________________________________________________________________________________________________ -void ThreadSafeClass::setA( sal_Int32 nA, sal_Int32 nThreadID ) +void ThreadSafeClass::setA( sal_Int32 nA, sal_Int32 nThreadID ) { // Make it threadsafe. WriteGuard aWriteLock( m_aLock ); @@ -451,8 +451,8 @@ sal_Int32 ThreadSafeClass::getA( sal_Int32 nThreadID ) } //_________________________________________________________________________________________________________________ -sal_Int32 ThreadSafeClass::workA( sal_Int32 nA , - sal_Int32 nThreadID ) +sal_Int32 ThreadSafeClass::workA( sal_Int32 nA , + sal_Int32 nThreadID ) { // This method test the downgrade-mechanism of used lock implementation! // Make it threadsafe. @@ -488,7 +488,7 @@ sal_Int32 ThreadSafeClass::workA( sal_Int32 nA , } /*-****************************************************************************************************//** - @descr Every thread instance of these class lopp from 0 up to "nLoops". + @descr Every thread instance of these class lopp from 0 up to "nLoops". He sleep for a random time and work with given test class "pClass" then. We use random values for waiting for better results! Otherwise all threads are sychron after first 2,3...5 calls - I think! @@ -498,34 +498,34 @@ class TestThread : public OThread { public: - TestThread( ThreadSafeClass* pClass , - sal_Int32 nLoops , - Condition* pListener , - sal_Bool bOwner = sal_False ); + TestThread( ThreadSafeClass* pClass , + sal_Int32 nLoops , + Condition* pListener , + sal_Bool bOwner = sal_False ); private: - virtual void SAL_CALL run (); - virtual void SAL_CALL onTerminated (); + virtual void SAL_CALL run (); + virtual void SAL_CALL onTerminated (); private: - ThreadSafeClass* m_pClass ; - sal_Int32 m_nLoops ; - sal_Int32 m_nThreadID ; - Condition* m_pListener ; - sal_Bool m_bOwner ; + ThreadSafeClass* m_pClass ; + sal_Int32 m_nLoops ; + sal_Int32 m_nThreadID ; + Condition* m_pListener ; + sal_Bool m_bOwner ; }; //_________________________________________________________________________________________________________________ -TestThread::TestThread( ThreadSafeClass* pClass , - sal_Int32 nLoops , - Condition* pListener , - sal_Bool bOwner ) - : m_pClass ( pClass ) - , m_nLoops ( nLoops ) - , m_pListener ( pListener ) - , m_bOwner ( bOwner ) +TestThread::TestThread( ThreadSafeClass* pClass , + sal_Int32 nLoops , + Condition* pListener , + sal_Bool bOwner ) + : m_pClass ( pClass ) + , m_nLoops ( nLoops ) + , m_pListener ( pListener ) + , m_bOwner ( bOwner ) { } @@ -545,10 +545,10 @@ void SAL_CALL TestThread::run() } #ifdef ENABLE_THREADDELAY - TimeValue nDelay ; + TimeValue nDelay ; #endif - sal_Int32 nA ; + sal_Int32 nA ; for( sal_Int32 nCount=0; nCount<m_nLoops; ++nCount ) { @@ -590,35 +590,35 @@ void SAL_CALL TestThread::onTerminated() // But don't forget to call listener before. m_pListener->set(); - m_pClass = NULL; - m_pListener = NULL; + m_pClass = NULL; + m_pListener = NULL; delete this; } /*-****************************************************************************************************//** - @descr This is our test application. + @descr This is our test application. We create one ThreadSafeClass object and a lot of threads which use it at different times. *//*-*****************************************************************************************************/ struct ThreadInfo { - Condition* pCondition ; - TestThread* pThread ; + Condition* pCondition ; + TestThread* pThread ; }; class TestApplication : public Application { public: - void Main ( ); - sal_Int32 measureTime ( sal_Int32 nThreadCount , - sal_Int32 nOwner , - sal_Int32 nLoops=0 ); + void Main ( ); + sal_Int32 measureTime ( sal_Int32 nThreadCount , + sal_Int32 nOwner , + sal_Int32 nLoops=0 ); }; //_________________________________________________________________________________________________________________ -// definition +// definition //_________________________________________________________________________________________________________________ TestApplication aApplication; @@ -628,17 +628,17 @@ TestApplication aApplication; // You can specify the owner thread of this test class which start/stop it by using "nOwner". [1..nThreadcount]! // If you specify "nLoops" different from 0 we use it as loop count for every started thread. // Otherwise we work with random values. -sal_Int32 TestApplication::measureTime( sal_Int32 nThreadCount , - sal_Int32 nOwner , - sal_Int32 nLoops ) +sal_Int32 TestApplication::measureTime( sal_Int32 nThreadCount , + sal_Int32 nOwner , + sal_Int32 nLoops ) { // This is the class which should be tested. ThreadSafeClass aClass; // Create list of threads. - ThreadInfo* pThreads = new ThreadInfo[nThreadCount]; - sal_Int32 nLoopCount = nLoops ; - sal_Bool bOwner = sal_False ; + ThreadInfo* pThreads = new ThreadInfo[nThreadCount]; + sal_Int32 nLoopCount = nLoops ; + sal_Bool bOwner = sal_False ; for( sal_Int32 nI=1; nI<=nThreadCount; ++nI ) { // If nLoops==0 => we must use random value; otherwise we must use given count ... @@ -659,8 +659,8 @@ sal_Int32 TestApplication::measureTime( sal_Int32 nThreadCount , } // Start clock to get information about used time. - sal_uInt32 nStartTime ; - sal_uInt32 nEndTime ; + sal_uInt32 nStartTime ; + sal_uInt32 nEndTime ; nStartTime = osl_getGlobalTimer(); @@ -690,47 +690,47 @@ sal_Int32 TestApplication::measureTime( sal_Int32 nThreadCount , //_________________________________________________________________________________________________________________ void TestApplication::Main() { - sal_Int32 nTestCount = 0; /// count of calling "measureTime()" - sal_Int32 nThreadCount = 0; /// count of used threads by "measure..." - sal_Int32 nLoops = 0; /// loop count for every thread - sal_Int32 nOwner = 0; /// number of owner thread + sal_Int32 nTestCount = 0; /// count of calling "measureTime()" + sal_Int32 nThreadCount = 0; /// count of used threads by "measure..." + sal_Int32 nLoops = 0; /// loop count for every thread + sal_Int32 nOwner = 0; /// number of owner thread // Parse command line. // Attention: All parameter are required and must exist! // syntax: "threadtest.exe <testcount> <threadcount> <loops> <owner>" - OStartupInfo aInfo ; - OUString sArgument ; - sal_Int32 nArgument ; - sal_Int32 nCount = aInfo.getCommandArgCount(); + OStartupInfo aInfo ; + OUString sArgument ; + sal_Int32 nArgument ; + sal_Int32 nCount = aInfo.getCommandArgCount(); LOG_ASSERT2( nCount!=4 ,"TestApplication::Main()" , "Wrong argument line detected!") for( nArgument=0; nArgument<nCount; ++nArgument ) { aInfo.getCommandArg( nArgument, sArgument ); - if( nArgument== 0 ) nTestCount =sArgument.toInt32(); - if( nArgument== 1 ) nThreadCount=sArgument.toInt32(); - if( nArgument== 2 ) nLoops =sArgument.toInt32(); - if( nArgument== 3 ) nOwner =sArgument.toInt32(); + if( nArgument== 0 ) nTestCount =sArgument.toInt32(); + if( nArgument== 1 ) nThreadCount=sArgument.toInt32(); + if( nArgument== 2 ) nLoops =sArgument.toInt32(); + if( nArgument== 3 ) nOwner =sArgument.toInt32(); } // Start test. - OStringBuffer sBuf(256); - sal_Int32 nTime=0; + OStringBuffer sBuf(256); + sal_Int32 nTime=0; sBuf.append( "Nr.\tTime\tThreadCount\tLoops\tOwner\n" ); for( sal_Int32 nI=1; nI<=nTestCount; ++nI ) { nTime = measureTime( nThreadCount, nOwner, nLoops ); - sBuf.append( nI ); - sBuf.append( "\t" ); - sBuf.append( nTime ); - sBuf.append( "\t" ); - sBuf.append( nThreadCount ); - sBuf.append( "\t" ); - sBuf.append( nLoops ); - sBuf.append( "\t" ); - sBuf.append( nOwner ); - sBuf.append( "\n" ); + sBuf.append( nI ); + sBuf.append( "\t" ); + sBuf.append( nTime ); + sBuf.append( "\t" ); + sBuf.append( nThreadCount ); + sBuf.append( "\t" ); + sBuf.append( nLoops ); + sBuf.append( "\t" ); + sBuf.append( nOwner ); + sBuf.append( "\n" ); } WRITE_LOGFILE( STATISTICS_FILE, sBuf.makeStringAndClear() ); diff --git a/framework/test/threadtest/threadtest.cxx b/framework/test/threadtest/threadtest.cxx index f1b65e5743d8..cb86a7f08358 100644 --- a/framework/test/threadtest/threadtest.cxx +++ b/framework/test/threadtest/threadtest.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> @@ -44,11 +44,11 @@ #include <macros/debug.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <rtl/random.h> #include <vos/process.hxx> @@ -68,23 +68,23 @@ #include <stdio.h> //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ -#define LOGFILE "threadtest.log" -#define STATISTICS_FILE "threadtest_statistic.csv" +#define LOGFILE "threadtest.log" +#define STATISTICS_FILE "threadtest_statistic.csv" //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ -using namespace ::rtl ; -using namespace ::osl ; -using namespace ::vos ; -using namespace ::framework ; +using namespace ::rtl ; +using namespace ::osl ; +using namespace ::vos ; +using namespace ::framework ; //_________________________________________________________________________________________________________________ -// defines +// defines //_________________________________________________________________________________________________________________ /*---------------- Use follow defines to enable/disable some special features of this little test program! -------*/ @@ -96,165 +96,165 @@ using namespace ::framework ; /*----------------------------------------------------------------------------------------------------------------*/ #ifdef ENABLE_LOG - #define LOG_SETA_START( NA, NID ) \ - { \ - sal_uInt32 nTimeStamp = osl_getGlobalTimer(); \ + #define LOG_SETA_START( NA, NID ) \ + { \ + sal_uInt32 nTimeStamp = osl_getGlobalTimer(); \ ::osl::MutexGuard aLogGuard( m_aLogMutex ); \ - OStringBuffer sLog(256); \ - sLog.append( (sal_Int32)nTimeStamp ); \ - sLog.append( ": Thread[ " ); \ - sLog.append( NID ); \ - sLog.append( " ] call setA( " ); \ - sLog.append( NA ); \ - sLog.append( " )\n" ); \ - WRITE_LOGFILE( LOGFILE, sLog.makeStringAndClear() ) \ + OStringBuffer sLog(256); \ + sLog.append( (sal_Int32)nTimeStamp ); \ + sLog.append( ": Thread[ " ); \ + sLog.append( NID ); \ + sLog.append( " ] call setA( " ); \ + sLog.append( NA ); \ + sLog.append( " )\n" ); \ + WRITE_LOGFILE( LOGFILE, sLog.makeStringAndClear() ) \ } - #define LOG_SETA_END( NA, EREASON, NID ) \ - { \ - sal_uInt32 nTimeStamp = osl_getGlobalTimer(); \ + #define LOG_SETA_END( NA, EREASON, NID ) \ + { \ + sal_uInt32 nTimeStamp = osl_getGlobalTimer(); \ ::osl::MutexGuard aLogGuard( m_aLogMutex ); \ - OStringBuffer sLog(256); \ - sLog.append( (sal_Int32)nTimeStamp ); \ - sLog.append( ": Thread[ " ); \ - sLog.append( NID ); \ - if( EREASON == E_NOREASON ) \ - sLog.append( " ] finish setA( " ); \ - else \ - sLog.append( " ] was refused at setA( "); \ - sLog.append( NA ); \ - sLog.append( " )\n" ); \ - WRITE_LOGFILE( LOGFILE, sLog.makeStringAndClear() ) \ + OStringBuffer sLog(256); \ + sLog.append( (sal_Int32)nTimeStamp ); \ + sLog.append( ": Thread[ " ); \ + sLog.append( NID ); \ + if( EREASON == E_NOREASON ) \ + sLog.append( " ] finish setA( " ); \ + else \ + sLog.append( " ] was refused at setA( "); \ + sLog.append( NA ); \ + sLog.append( " )\n" ); \ + WRITE_LOGFILE( LOGFILE, sLog.makeStringAndClear() ) \ } - #define LOG_GETA_START( NID ) \ - { \ - sal_uInt32 nTimeStamp = osl_getGlobalTimer(); \ + #define LOG_GETA_START( NID ) \ + { \ + sal_uInt32 nTimeStamp = osl_getGlobalTimer(); \ ::osl::MutexGuard aLogGuard( m_aLogMutex ); \ - OStringBuffer sLog(256); \ - sLog.append( (sal_Int32)nTimeStamp ); \ - sLog.append( ": Thread[ " ); \ - sLog.append( NID ); \ - sLog.append( " ] call getA()\n" ); \ - WRITE_LOGFILE( LOGFILE, sLog.makeStringAndClear() ) \ + OStringBuffer sLog(256); \ + sLog.append( (sal_Int32)nTimeStamp ); \ + sLog.append( ": Thread[ " ); \ + sLog.append( NID ); \ + sLog.append( " ] call getA()\n" ); \ + WRITE_LOGFILE( LOGFILE, sLog.makeStringAndClear() ) \ } - #define LOG_GETA_END( NRETURN, EREASON, NID ) \ - { \ - sal_uInt32 nTimeStamp = osl_getGlobalTimer(); \ + #define LOG_GETA_END( NRETURN, EREASON, NID ) \ + { \ + sal_uInt32 nTimeStamp = osl_getGlobalTimer(); \ ::osl::MutexGuard aLogGuard( m_aLogMutex ); \ - OStringBuffer sLog(256); \ - sLog.append( (sal_Int32)nTimeStamp ); \ - sLog.append( ": Thread[ " ); \ - sLog.append( NID ); \ - if( EREASON == E_NOREASON ) \ - sLog.append( " ] finish getA() with " ); \ - else \ - sLog.append( " ] was refused at getA() with " ); \ - sLog.append( NRETURN ); \ - sLog.append( "\n" ); \ - WRITE_LOGFILE( LOGFILE, sLog.makeStringAndClear() ) \ + OStringBuffer sLog(256); \ + sLog.append( (sal_Int32)nTimeStamp ); \ + sLog.append( ": Thread[ " ); \ + sLog.append( NID ); \ + if( EREASON == E_NOREASON ) \ + sLog.append( " ] finish getA() with " ); \ + else \ + sLog.append( " ] was refused at getA() with " ); \ + sLog.append( NRETURN ); \ + sLog.append( "\n" ); \ + WRITE_LOGFILE( LOGFILE, sLog.makeStringAndClear() ) \ } - #define LOG_WORKA_START( NA, NID ) \ - { \ - sal_uInt32 nTimeStamp = osl_getGlobalTimer(); \ + #define LOG_WORKA_START( NA, NID ) \ + { \ + sal_uInt32 nTimeStamp = osl_getGlobalTimer(); \ ::osl::MutexGuard aLogGuard( m_aLogMutex ); \ - OStringBuffer sLog(256); \ - sLog.append( (sal_Int32)nTimeStamp ); \ - sLog.append( ": Thread[ " ); \ - sLog.append( NID ); \ - sLog.append( " ] call workA( " ); \ - sLog.append( NA ); \ - sLog.append( " )\n" ); \ - WRITE_LOGFILE( LOGFILE, sLog.makeStringAndClear() ) \ + OStringBuffer sLog(256); \ + sLog.append( (sal_Int32)nTimeStamp ); \ + sLog.append( ": Thread[ " ); \ + sLog.append( NID ); \ + sLog.append( " ] call workA( " ); \ + sLog.append( NA ); \ + sLog.append( " )\n" ); \ + WRITE_LOGFILE( LOGFILE, sLog.makeStringAndClear() ) \ } - #define LOG_WORKA_END( NRETURN, EREASON, NID ) \ - { \ - sal_uInt32 nTimeStamp = osl_getGlobalTimer(); \ + #define LOG_WORKA_END( NRETURN, EREASON, NID ) \ + { \ + sal_uInt32 nTimeStamp = osl_getGlobalTimer(); \ ::osl::MutexGuard aLogGuard( m_aLogMutex ); \ - OStringBuffer sLog(256); \ - sLog.append( (sal_Int32)nTimeStamp ); \ - sLog.append( ": Thread[ " ); \ - sLog.append( NID ); \ - if( EREASON == E_NOREASON ) \ - sLog.append( " ] finish workA() with " ); \ - else \ - sLog.append( " ] was refused at workA() with " ); \ - sLog.append( NRETURN ); \ - sLog.append( "\n" ); \ - WRITE_LOGFILE( LOGFILE, sLog.makeStringAndClear() ) \ + OStringBuffer sLog(256); \ + sLog.append( (sal_Int32)nTimeStamp ); \ + sLog.append( ": Thread[ " ); \ + sLog.append( NID ); \ + if( EREASON == E_NOREASON ) \ + sLog.append( " ] finish workA() with " ); \ + else \ + sLog.append( " ] was refused at workA() with " ); \ + sLog.append( NRETURN ); \ + sLog.append( "\n" ); \ + WRITE_LOGFILE( LOGFILE, sLog.makeStringAndClear() ) \ } - #define LOG_INITEXCEPTION( SMETHOD, NID ) \ - { \ - sal_uInt32 nTimeStamp = osl_getGlobalTimer(); \ + #define LOG_INITEXCEPTION( SMETHOD, NID ) \ + { \ + sal_uInt32 nTimeStamp = osl_getGlobalTimer(); \ ::osl::MutexGuard aLogGuard( m_aLogMutex ); \ - OStringBuffer sLog(256); \ - sLog.append( (sal_Int32)nTimeStamp ); \ - sLog.append( ": Thread[ " ); \ - sLog.append( NID ); \ - sLog.append( " ] get EInitException from \"" ); \ - sLog.append( SMETHOD ); \ - sLog.append( "\"\n" ); \ - WRITE_LOGFILE( LOGFILE, sLog.makeStringAndClear() ) \ + OStringBuffer sLog(256); \ + sLog.append( (sal_Int32)nTimeStamp ); \ + sLog.append( ": Thread[ " ); \ + sLog.append( NID ); \ + sLog.append( " ] get EInitException from \"" ); \ + sLog.append( SMETHOD ); \ + sLog.append( "\"\n" ); \ + WRITE_LOGFILE( LOGFILE, sLog.makeStringAndClear() ) \ } - #define LOG_CLOSEEXCEPTION( SMETHOD, NID ) \ - { \ - sal_uInt32 nTimeStamp = osl_getGlobalTimer(); \ + #define LOG_CLOSEEXCEPTION( SMETHOD, NID ) \ + { \ + sal_uInt32 nTimeStamp = osl_getGlobalTimer(); \ ::osl::MutexGuard aLogGuard( m_aLogMutex ); \ - OStringBuffer sLog(256); \ - sLog.append( (sal_Int32)nTimeStamp ); \ - sLog.append( ": Thread[ " ); \ - sLog.append( NID ); \ - sLog.append( " ] get ECloseException from \"" ); \ - sLog.append( SMETHOD ); \ - sLog.append( "\"\n" ); \ - WRITE_LOGFILE( LOGFILE, sLog.makeStringAndClear() ) \ + OStringBuffer sLog(256); \ + sLog.append( (sal_Int32)nTimeStamp ); \ + sLog.append( ": Thread[ " ); \ + sLog.append( NID ); \ + sLog.append( " ] get ECloseException from \"" ); \ + sLog.append( SMETHOD ); \ + sLog.append( "\"\n" ); \ + WRITE_LOGFILE( LOGFILE, sLog.makeStringAndClear() ) \ } - #define LOG_INIT( NA, NID ) \ - { \ - sal_uInt32 nTimeStamp = osl_getGlobalTimer(); \ + #define LOG_INIT( NA, NID ) \ + { \ + sal_uInt32 nTimeStamp = osl_getGlobalTimer(); \ ::osl::MutexGuard aLogGuard( m_aLogMutex ); \ - OStringBuffer sLog(256); \ - sLog.append( (sal_Int32)nTimeStamp ); \ - sLog.append( ": Thread[ " ); \ - sLog.append( NID ); \ - sLog.append( " ] initialize me with " ); \ - sLog.append( NA ); \ - sLog.append( "\n" ); \ - WRITE_LOGFILE( LOGFILE, sLog.makeStringAndClear() ) \ + OStringBuffer sLog(256); \ + sLog.append( (sal_Int32)nTimeStamp ); \ + sLog.append( ": Thread[ " ); \ + sLog.append( NID ); \ + sLog.append( " ] initialize me with " ); \ + sLog.append( NA ); \ + sLog.append( "\n" ); \ + WRITE_LOGFILE( LOGFILE, sLog.makeStringAndClear() ) \ } - #define LOG_CLOSE( NID ) \ - { \ - sal_uInt32 nTimeStamp = osl_getGlobalTimer(); \ + #define LOG_CLOSE( NID ) \ + { \ + sal_uInt32 nTimeStamp = osl_getGlobalTimer(); \ ::osl::MutexGuard aLogGuard( m_aLogMutex ); \ - OStringBuffer sLog(256); \ - sLog.append( (sal_Int32)nTimeStamp ); \ - sLog.append( ": Thread[ " ); \ - sLog.append( NID ); \ - sLog.append( " ] close me\n" ); \ - WRITE_LOGFILE( LOGFILE, sLog.makeStringAndClear() ) \ + OStringBuffer sLog(256); \ + sLog.append( (sal_Int32)nTimeStamp ); \ + sLog.append( ": Thread[ " ); \ + sLog.append( NID ); \ + sLog.append( " ] close me\n" ); \ + WRITE_LOGFILE( LOGFILE, sLog.makeStringAndClear() ) \ } #else - #define LOG_SETA_START( NA, NID ) - #define LOG_SETA_END( NA, EREASON, NID ) - #define LOG_GETA_START( NID ) - #define LOG_GETA_END( NRETURN, EREASON, NID ) - #define LOG_WORKA_START( NA, NID ) - #define LOG_WORKA_END( NRETURN, EREASON, NID ) - #define LOG_INITEXCEPTION( SMETHOD, NID ) - #define LOG_CLOSEEXCEPTION( SMETHOD, NID ) - #define LOG_INIT( NA, NID ) - #define LOG_CLOSE( NID ) + #define LOG_SETA_START( NA, NID ) + #define LOG_SETA_END( NA, EREASON, NID ) + #define LOG_GETA_START( NID ) + #define LOG_GETA_END( NRETURN, EREASON, NID ) + #define LOG_WORKA_START( NA, NID ) + #define LOG_WORKA_END( NRETURN, EREASON, NID ) + #define LOG_INITEXCEPTION( SMETHOD, NID ) + #define LOG_CLOSEEXCEPTION( SMETHOD, NID ) + #define LOG_INIT( NA, NID ) + #define LOG_CLOSE( NID ) #endif //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ sal_uInt16 getRandomValue() @@ -262,21 +262,21 @@ sal_uInt16 getRandomValue() // Get new random value for thread-sleep! // See run() for further informations. // Always calculate a new random number. - sal_uInt16 nValue; - rtlRandomPool aPool = rtl_random_createPool(); - rtl_random_getBytes ( aPool, &nValue, 2 ); - rtl_random_destroyPool ( aPool ); + sal_uInt16 nValue; + rtlRandomPool aPool = rtl_random_createPool(); + rtl_random_getBytes ( aPool, &nValue, 2 ); + rtl_random_destroyPool ( aPool ); return nValue; } /*-************************************************************************************************************//** - @descr This class is used from different threads at the same time. + @descr This class is used from different threads at the same time. We start working after calling init() first(!) ... and finish it by calling close(). It exist two methods for reading/writing an internal variable "A". Another function workA() do both things at the same time. All public methods log information in a file if DO_LOG is defined. - @attention Our public base class FaiRWLockBase is a struct with a RWLock as member. + @attention Our public base class FaiRWLockBase is a struct with a RWLock as member. This member can be used by guards to safe access at internal variables in interface methods. Another baseclass is the TransactionBase. They support rejection of wrong calls at wrong time. @@ -289,37 +289,37 @@ class ThreadSafeClass : private ThreadHelpBase { public: - ThreadSafeClass (); + ThreadSafeClass (); ~ThreadSafeClass(); // This methods are used from differnt threads // to test this class. - void init ( sal_Int32 nA , - sal_Int32 nThreadID ); - void close ( sal_Int32 nThreadID ); - void setA ( sal_Int32 nA , - sal_Int32 nThreadID ); - sal_Int32 getA ( sal_Int32 nThreadID ); - sal_Int32 workA ( sal_Int32 nA , - sal_Int32 nThreadID ); + void init ( sal_Int32 nA , + sal_Int32 nThreadID ); + void close ( sal_Int32 nThreadID ); + void setA ( sal_Int32 nA , + sal_Int32 nThreadID ); + sal_Int32 getA ( sal_Int32 nThreadID ); + sal_Int32 workA ( sal_Int32 nA , + sal_Int32 nThreadID ); #ifdef ENABLE_REQUESTCOUNT // This methods are used for statistics only! - sal_Int32 getReadCount () { return m_nReadCount; } - sal_Int32 getWriteCount() { return m_nWriteCount; } + sal_Int32 getReadCount () { return m_nReadCount; } + sal_Int32 getWriteCount() { return m_nWriteCount; } #endif private: - sal_Int32 m_nA ; /// test member fro reading/writing + sal_Int32 m_nA ; /// test member fro reading/writing #ifdef ENABLE_LOG - ::osl::Mutex m_aLogMutex ; /// mutex to serialize writing log file! + ::osl::Mutex m_aLogMutex ; /// mutex to serialize writing log file! #endif #ifdef ENABLE_REQUESTCOUNT - oslInterlockedCount m_nReadCount ; /// statistic variables to count read/write requests - oslInterlockedCount m_nWriteCount ; + oslInterlockedCount m_nReadCount ; /// statistic variables to count read/write requests + oslInterlockedCount m_nWriteCount ; #endif }; @@ -327,10 +327,10 @@ class ThreadSafeClass : private ThreadHelpBase ThreadSafeClass::ThreadSafeClass() : ThreadHelpBase ( ) , TransactionBase ( ) - , m_nA ( 0 ) + , m_nA ( 0 ) #ifdef ENABLE_REQUESTCOUNT - , m_nReadCount ( 0 ) - , m_nWriteCount ( 0 ) + , m_nReadCount ( 0 ) + , m_nWriteCount ( 0 ) #endif { } @@ -397,7 +397,7 @@ void ThreadSafeClass::close( sal_Int32 nThreadID ) } //_________________________________________________________________________________________________________________ -void ThreadSafeClass::setA( sal_Int32 nA, sal_Int32 nThreadID ) +void ThreadSafeClass::setA( sal_Int32 nA, sal_Int32 nThreadID ) { // Register this method as a transaction to prevent code against wrong calls // after close() or before init()! @@ -447,8 +447,8 @@ sal_Int32 ThreadSafeClass::getA( sal_Int32 nThreadID ) } //_________________________________________________________________________________________________________________ -sal_Int32 ThreadSafeClass::workA( sal_Int32 nA , - sal_Int32 nThreadID ) +sal_Int32 ThreadSafeClass::workA( sal_Int32 nA , + sal_Int32 nThreadID ) { // Register this method as a transaction to prevent code against wrong calls // after close() or before init()! @@ -483,7 +483,7 @@ sal_Int32 ThreadSafeClass::workA( sal_Int32 nA , } /*-****************************************************************************************************//** - @descr Every thread instance of these class lopp from 0 up to "nLoops". + @descr Every thread instance of these class lopp from 0 up to "nLoops". He sleep for a random time and work with given test class "pClass" then. We use random values for waiting for better results! Otherwise all threads are sychron after first 2,3...5 calls - I think! @@ -493,34 +493,34 @@ class TestThread : public OThread { public: - TestThread( ThreadSafeClass* pClass , - sal_Int32 nLoops , - Condition* pListener , - sal_Bool bOwner = sal_False ); + TestThread( ThreadSafeClass* pClass , + sal_Int32 nLoops , + Condition* pListener , + sal_Bool bOwner = sal_False ); private: - virtual void SAL_CALL run (); - virtual void SAL_CALL onTerminated (); + virtual void SAL_CALL run (); + virtual void SAL_CALL onTerminated (); private: - ThreadSafeClass* m_pClass ; - sal_Int32 m_nLoops ; - sal_Int32 m_nThreadID ; - Condition* m_pListener ; - sal_Bool m_bOwner ; + ThreadSafeClass* m_pClass ; + sal_Int32 m_nLoops ; + sal_Int32 m_nThreadID ; + Condition* m_pListener ; + sal_Bool m_bOwner ; }; //_________________________________________________________________________________________________________________ -TestThread::TestThread( ThreadSafeClass* pClass , - sal_Int32 nLoops , - Condition* pListener , - sal_Bool bOwner ) - : m_pClass ( pClass ) - , m_nLoops ( nLoops ) - , m_pListener ( pListener ) - , m_bOwner ( bOwner ) +TestThread::TestThread( ThreadSafeClass* pClass , + sal_Int32 nLoops , + Condition* pListener , + sal_Bool bOwner ) + : m_pClass ( pClass ) + , m_nLoops ( nLoops ) + , m_pListener ( pListener ) + , m_bOwner ( bOwner ) { } @@ -540,10 +540,10 @@ void SAL_CALL TestThread::run() } #ifdef ENABLE_THREADDELAY - TimeValue nDelay ; + TimeValue nDelay ; #endif - sal_Int32 nA ; + sal_Int32 nA ; for( sal_Int32 nCount=0; nCount<m_nLoops; ++nCount ) { @@ -585,35 +585,35 @@ void SAL_CALL TestThread::onTerminated() // But don't forget to call listener before. m_pListener->set(); - m_pClass = NULL; - m_pListener = NULL; + m_pClass = NULL; + m_pListener = NULL; delete this; } /*-****************************************************************************************************//** - @descr This is our test application. + @descr This is our test application. We create one ThreadSafeClass object and a lot of threads which use it at different times. *//*-*****************************************************************************************************/ struct ThreadInfo { - Condition* pCondition ; - TestThread* pThread ; + Condition* pCondition ; + TestThread* pThread ; }; class TestApplication : public Application { public: - void Main ( ); - sal_Int32 measureTime ( sal_Int32 nThreadCount , - sal_Int32 nOwner , - sal_Int32 nLoops=0 ); + void Main ( ); + sal_Int32 measureTime ( sal_Int32 nThreadCount , + sal_Int32 nOwner , + sal_Int32 nLoops=0 ); }; //_________________________________________________________________________________________________________________ -// definition +// definition //_________________________________________________________________________________________________________________ TestApplication aApplication; @@ -623,17 +623,17 @@ TestApplication aApplication; // You can specify the owner thread of this test class which start/stop it by using "nOwner". [1..nThreadcount]! // If you specify "nLoops" different from 0 we use it as loop count for every started thread. // Otherwise we work with random values. -sal_Int32 TestApplication::measureTime( sal_Int32 nThreadCount , - sal_Int32 nOwner , - sal_Int32 nLoops ) +sal_Int32 TestApplication::measureTime( sal_Int32 nThreadCount , + sal_Int32 nOwner , + sal_Int32 nLoops ) { // This is the class which should be tested. ThreadSafeClass aClass; // Create list of threads. - ThreadInfo* pThreads = new ThreadInfo[nThreadCount]; - sal_Int32 nLoopCount = nLoops ; - sal_Bool bOwner = sal_False ; + ThreadInfo* pThreads = new ThreadInfo[nThreadCount]; + sal_Int32 nLoopCount = nLoops ; + sal_Bool bOwner = sal_False ; for( sal_Int32 nI=0; nI<nThreadCount; ++nI ) { // If nLoops==0 => we must use random value; otherwise we must use given count ... @@ -654,8 +654,8 @@ sal_Int32 TestApplication::measureTime( sal_Int32 nThreadCount , } // Start clock to get information about used time. - sal_uInt32 nStartTime ; - sal_uInt32 nEndTime ; + sal_uInt32 nStartTime ; + sal_uInt32 nEndTime ; nStartTime = osl_getGlobalTimer(); @@ -686,49 +686,49 @@ sal_Int32 TestApplication::measureTime( sal_Int32 nThreadCount , //_________________________________________________________________________________________________________________ void TestApplication::Main() { - sal_Int32 nTestCount = 0; /// count of calling "measureTime()" - sal_Int32 nThreadCount = 0; /// count of used threads by "measure..." - sal_Int32 nLoops = 0; /// loop count for every thread - sal_Int32 nOwner = 0; /// number of owner thread + sal_Int32 nTestCount = 0; /// count of calling "measureTime()" + sal_Int32 nThreadCount = 0; /// count of used threads by "measure..." + sal_Int32 nLoops = 0; /// loop count for every thread + sal_Int32 nOwner = 0; /// number of owner thread // Parse command line. // Attention: All parameter are required and must exist! // syntax: "threadtest.exe <testcount> <threadcount> <loops> <owner>" - OStartupInfo aInfo ; - OUString sArgument ; - sal_Int32 nArgument ; - sal_Int32 nCount = aInfo.getCommandArgCount(); + OStartupInfo aInfo ; + OUString sArgument ; + sal_Int32 nArgument ; + sal_Int32 nCount = aInfo.getCommandArgCount(); LOG_ASSERT2( nCount!=4 ,"TestApplication::Main()" , "Wrong argument line detected!") for( nArgument=0; nArgument<nCount; ++nArgument ) { aInfo.getCommandArg( nArgument, sArgument ); - if( nArgument== 0 ) nTestCount =sArgument.toInt32(); - if( nArgument== 1 ) nThreadCount=sArgument.toInt32(); - if( nArgument== 2 ) nLoops =sArgument.toInt32(); - if( nArgument== 3 ) nOwner =sArgument.toInt32(); + if( nArgument== 0 ) nTestCount =sArgument.toInt32(); + if( nArgument== 1 ) nThreadCount=sArgument.toInt32(); + if( nArgument== 2 ) nLoops =sArgument.toInt32(); + if( nArgument== 3 ) nOwner =sArgument.toInt32(); } LOG_ASSERT2( nTestCount==0||nThreadCount==0||nLoops==0||nOwner==0,"TestApplication::Main()", "Wrong argument value detected!" ) // Start test. - OStringBuffer sBuf(256); - sal_Int32 nTime=0; + OStringBuffer sBuf(256); + sal_Int32 nTime=0; sBuf.append( "Nr.\tTime\tThreadCount\tLoops\tOwner\n" ); for( sal_Int32 nI=1; nI<=nTestCount; ++nI ) { nTime = measureTime( nThreadCount, nOwner, nLoops ); - sBuf.append( nI ); - sBuf.append( "\t" ); - sBuf.append( nTime ); - sBuf.append( "\t" ); - sBuf.append( nThreadCount ); - sBuf.append( "\t" ); - sBuf.append( nLoops ); - sBuf.append( "\t" ); - sBuf.append( nOwner ); - sBuf.append( "\n" ); + sBuf.append( nI ); + sBuf.append( "\t" ); + sBuf.append( nTime ); + sBuf.append( "\t" ); + sBuf.append( nThreadCount ); + sBuf.append( "\t" ); + sBuf.append( nLoops ); + sBuf.append( "\t" ); + sBuf.append( nOwner ); + sBuf.append( "\n" ); } WRITE_LOGFILE( STATISTICS_FILE, sBuf.makeStringAndClear() ); diff --git a/framework/test/typecfg/cfgview.cxx b/framework/test/typecfg/cfgview.cxx index 8faf4e64e196..e11e33a8f4f4 100644 --- a/framework/test/typecfg/cfgview.cxx +++ b/framework/test/typecfg/cfgview.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <classes/servicemanager.hxx> #include <classes/filtercache.hxx> @@ -40,14 +40,14 @@ #include <queries.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/beans/PropertyValue.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <comphelper/processfactory.hxx> #include <vos/process.hxx> @@ -65,7 +65,7 @@ #include <stdio.h> //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ #define RDBFILE DECLARE_ASCII("typecfg.rdb" ) @@ -112,25 +112,25 @@ #define TARGET_PROPERTIES "properties" //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ -using namespace ::std ; -using namespace ::vos ; -using namespace ::rtl ; -using namespace ::framework ; -using namespace ::comphelper ; -using namespace ::com::sun::star::uno ; -using namespace ::com::sun::star::lang ; -using namespace ::com::sun::star::container ; -using namespace ::com::sun::star::beans ; +using namespace ::std ; +using namespace ::vos ; +using namespace ::rtl ; +using namespace ::framework ; +using namespace ::comphelper ; +using namespace ::com::sun::star::uno ; +using namespace ::com::sun::star::lang ; +using namespace ::com::sun::star::container ; +using namespace ::com::sun::star::beans ; //_________________________________________________________________________________________________________________ -// defines +// defines //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ /*-***************************************************************************************************************/ @@ -178,7 +178,7 @@ class CFGView : public Application }; // class CFGView //_________________________________________________________________________________________________________________ -// global variables +// global variables //_________________________________________________________________________________________________________________ CFGView gApplication; @@ -295,20 +295,20 @@ void CFGView::impl_generateHTMLView() // generate start frameset OUStringBuffer sStartFramesetHTML( 10000 ); - sStartFramesetHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tTypeDetection CFG\n\t\t</title>\n\t</head>\n" ); // open html - sStartFramesetHTML.appendAscii( "\t\t<frameset rows=\"25%,75%\">\n" ); // open frameset - sStartFramesetHTML.appendAscii( "\t\t\t<frame name=\"" ); // generate frame "menu" - sStartFramesetHTML.appendAscii( TARGET_MENU ); - sStartFramesetHTML.appendAscii( "\" src=\"" ); - sStartFramesetHTML.appendAscii( MENU_HTML ); - sStartFramesetHTML.appendAscii( "\" title=\"List\">\n" ); - sStartFramesetHTML.appendAscii( "\t\t\t<frame name=\"" ); // generate frame "view" - sStartFramesetHTML.appendAscii( TARGET_VIEW ); - sStartFramesetHTML.appendAscii( "\" src=\"" ); - sStartFramesetHTML.appendAscii( BLANK_HTML ); - sStartFramesetHTML.appendAscii( "\" title=\"Properties\">\n" ); - sStartFramesetHTML.appendAscii( "\t\t</frameset>\n" ); // close frameset - sStartFramesetHTML.appendAscii( "</html>\n" ); // close html + sStartFramesetHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tTypeDetection CFG\n\t\t</title>\n\t</head>\n" ); // open html + sStartFramesetHTML.appendAscii( "\t\t<frameset rows=\"25%,75%\">\n" ); // open frameset + sStartFramesetHTML.appendAscii( "\t\t\t<frame name=\"" ); // generate frame "menu" + sStartFramesetHTML.appendAscii( TARGET_MENU ); + sStartFramesetHTML.appendAscii( "\" src=\"" ); + sStartFramesetHTML.appendAscii( MENU_HTML ); + sStartFramesetHTML.appendAscii( "\" title=\"List\">\n" ); + sStartFramesetHTML.appendAscii( "\t\t\t<frame name=\"" ); // generate frame "view" + sStartFramesetHTML.appendAscii( TARGET_VIEW ); + sStartFramesetHTML.appendAscii( "\" src=\"" ); + sStartFramesetHTML.appendAscii( BLANK_HTML ); + sStartFramesetHTML.appendAscii( "\" title=\"Properties\">\n" ); + sStartFramesetHTML.appendAscii( "\t\t</frameset>\n" ); // close frameset + sStartFramesetHTML.appendAscii( "</html>\n" ); // close html impl_writeFile( FRAMESET_START_HTML, U2B(sStartFramesetHTML.makeStringAndClear()) ); @@ -316,7 +316,7 @@ void CFGView::impl_generateHTMLView() // generate blank html OUStringBuffer sBlankHTML( 10000 ); - sBlankHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tBlank\n\t\t</title>\n\t</head>\n\t<body>\n\t</body>Please select ...\n</html>\n" ); // open html + sBlankHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tBlank\n\t\t</title>\n\t</head>\n\t<body>\n\t</body>Please select ...\n</html>\n" ); // open html impl_writeFile( BLANK_HTML, U2B(sBlankHTML.makeStringAndClear()) ); @@ -324,77 +324,77 @@ void CFGView::impl_generateHTMLView() // generate menu OUStringBuffer sMenuHTML( 10000 ); - sMenuHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tMenu\n\t\t</title>\n\t</head>\n\t<body>\n" ); // open html - sMenuHTML.appendAscii( "\t\t<ul>\n" ); // open list + sMenuHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tMenu\n\t\t</title>\n\t</head>\n\t<body>\n" ); // open html + sMenuHTML.appendAscii( "\t\t<ul>\n" ); // open list - sMenuHTML.appendAscii( "\t\t<li><a href=\"" ); // list entry for "All Types" - sMenuHTML.appendAscii( FRAMESET_TYPES_HTML ); - sMenuHTML.appendAscii( "\" target=\"" ); - sMenuHTML.appendAscii( TARGET_VIEW ); - sMenuHTML.appendAscii( "\">All Types</a></li>\n" ); + sMenuHTML.appendAscii( "\t\t<li><a href=\"" ); // list entry for "All Types" + sMenuHTML.appendAscii( FRAMESET_TYPES_HTML ); + sMenuHTML.appendAscii( "\" target=\"" ); + sMenuHTML.appendAscii( TARGET_VIEW ); + sMenuHTML.appendAscii( "\">All Types</a></li>\n" ); - sMenuHTML.appendAscii( "\t\t<li><a href=\"" ); // list entry for "All Filters" - sMenuHTML.appendAscii( FRAMESET_FILTERS_HTML ); - sMenuHTML.appendAscii( "\" target=\"" ); - sMenuHTML.appendAscii( TARGET_VIEW ); + sMenuHTML.appendAscii( "\t\t<li><a href=\"" ); // list entry for "All Filters" + sMenuHTML.appendAscii( FRAMESET_FILTERS_HTML ); + sMenuHTML.appendAscii( "\" target=\"" ); + sMenuHTML.appendAscii( TARGET_VIEW ); sMenuHTML.appendAscii( "\">All Filters</a></li>\n" ); sMenuHTML.appendAscii( "\t\t<li><a href=\"" ); // list entry for "All Filters sorted by modules" sMenuHTML.appendAscii( FRAMESET_MODULFILTERS_HTML ); - sMenuHTML.appendAscii( "\" target=\"" ); - sMenuHTML.appendAscii( TARGET_VIEW ); + sMenuHTML.appendAscii( "\" target=\"" ); + sMenuHTML.appendAscii( TARGET_VIEW ); sMenuHTML.appendAscii( "\">Filters by Moduls</a></li>\n" ); - sMenuHTML.appendAscii( "\t\t<li><a href=\"" ); // list entry for "All Detectors" - sMenuHTML.appendAscii( FRAMESET_DETECTORS_HTML ); - sMenuHTML.appendAscii( "\" target=\"" ); - sMenuHTML.appendAscii( TARGET_VIEW ); - sMenuHTML.appendAscii( "\">All Detector Services</a></li>\n" ); - - sMenuHTML.appendAscii( "\t\t<li><a href=\"" ); // list entry for "All Loaders" - sMenuHTML.appendAscii( FRAMESET_LOADERS_HTML ); - sMenuHTML.appendAscii( "\" target=\"" ); - sMenuHTML.appendAscii( TARGET_VIEW ); - sMenuHTML.appendAscii( "\">All Loader Services</a></li>\n" ); - - sMenuHTML.appendAscii( "\t\t<li><a href=\"" ); // list entry for "Invalid Filter" - sMenuHTML.appendAscii( FRAMESET_INVALIDFILTERS_HTML ); - sMenuHTML.appendAscii( "\" target=\"" ); - sMenuHTML.appendAscii( TARGET_VIEW ); - sMenuHTML.appendAscii( "\">Invalid Filter</a></li>\n" ); - - sMenuHTML.appendAscii( "\t\t<li><a href=\"" ); // list entry for "Invalid Detect Services" - sMenuHTML.appendAscii( FRAMESET_INVALIDDETECTORS_HTML ); - sMenuHTML.appendAscii( "\" target=\"" ); - sMenuHTML.appendAscii( TARGET_VIEW ); - sMenuHTML.appendAscii( "\">Invalid Detect Services</a></li>\n" ); + sMenuHTML.appendAscii( "\t\t<li><a href=\"" ); // list entry for "All Detectors" + sMenuHTML.appendAscii( FRAMESET_DETECTORS_HTML ); + sMenuHTML.appendAscii( "\" target=\"" ); + sMenuHTML.appendAscii( TARGET_VIEW ); + sMenuHTML.appendAscii( "\">All Detector Services</a></li>\n" ); + + sMenuHTML.appendAscii( "\t\t<li><a href=\"" ); // list entry for "All Loaders" + sMenuHTML.appendAscii( FRAMESET_LOADERS_HTML ); + sMenuHTML.appendAscii( "\" target=\"" ); + sMenuHTML.appendAscii( TARGET_VIEW ); + sMenuHTML.appendAscii( "\">All Loader Services</a></li>\n" ); + + sMenuHTML.appendAscii( "\t\t<li><a href=\"" ); // list entry for "Invalid Filter" + sMenuHTML.appendAscii( FRAMESET_INVALIDFILTERS_HTML ); + sMenuHTML.appendAscii( "\" target=\"" ); + sMenuHTML.appendAscii( TARGET_VIEW ); + sMenuHTML.appendAscii( "\">Invalid Filter</a></li>\n" ); + + sMenuHTML.appendAscii( "\t\t<li><a href=\"" ); // list entry for "Invalid Detect Services" + sMenuHTML.appendAscii( FRAMESET_INVALIDDETECTORS_HTML ); + sMenuHTML.appendAscii( "\" target=\"" ); + sMenuHTML.appendAscii( TARGET_VIEW ); + sMenuHTML.appendAscii( "\">Invalid Detect Services</a></li>\n" ); sMenuHTML.appendAscii( "\t\t<li><a href=\"" ); // list entry for "Double Filter UINames" sMenuHTML.appendAscii( FRAMESET_DOUBLEFILTERUINAMES_HTML ); - sMenuHTML.appendAscii( "\" target=\"" ); - sMenuHTML.appendAscii( TARGET_VIEW ); + sMenuHTML.appendAscii( "\" target=\"" ); + sMenuHTML.appendAscii( TARGET_VIEW ); sMenuHTML.appendAscii( "\">Double Filter UINames</a></li>\n" ); - sMenuHTML.appendAscii( "\t\t<li><a href=\"" ); // list entry for "Show Filter Flags" - sMenuHTML.appendAscii( FILTERFLAGS_HTML ); - sMenuHTML.appendAscii( "\" target=\"" ); - sMenuHTML.appendAscii( TARGET_VIEW ); - sMenuHTML.appendAscii( "\">Show Filter Flags</a></li>\n" ); + sMenuHTML.appendAscii( "\t\t<li><a href=\"" ); // list entry for "Show Filter Flags" + sMenuHTML.appendAscii( FILTERFLAGS_HTML ); + sMenuHTML.appendAscii( "\" target=\"" ); + sMenuHTML.appendAscii( TARGET_VIEW ); + sMenuHTML.appendAscii( "\">Show Filter Flags</a></li>\n" ); - sMenuHTML.appendAscii( "\t\t</ul>\n" ); // close list - sMenuHTML.appendAscii( "\t</body>\n</html>\n" ); // close html + sMenuHTML.appendAscii( "\t\t</ul>\n" ); // close list + sMenuHTML.appendAscii( "\t</body>\n</html>\n" ); // close html impl_writeFile( MENU_HTML, U2B(sMenuHTML.makeStringAndClear()) ); - impl_generateTypeListHTML (); - impl_generateFilterListHTML (); + impl_generateTypeListHTML (); + impl_generateFilterListHTML (); impl_generateFilterModulListHTML (); - impl_generateDetectorListHTML (); - impl_generateLoaderListHTML (); - impl_generateInvalidFiltersHTML (); - impl_generateInvalidDetectorsHTML (); - impl_generateInvalidLoadersHTML (); - impl_generateFilterFlagsHTML (); + impl_generateDetectorListHTML (); + impl_generateLoaderListHTML (); + impl_generateInvalidFiltersHTML (); + impl_generateInvalidDetectorsHTML (); + impl_generateInvalidLoadersHTML (); + impl_generateFilterFlagsHTML (); impl_generateDoubleFilterUINamesHTML(); } @@ -405,20 +405,20 @@ void CFGView::impl_generateTypeListHTML() // generate frameset for types OUStringBuffer sTypesFramesetHTML( 10000 ); - sTypesFramesetHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tFrameset: Types\n\t\t</title>\n\t</head>\n" ); // open html - sTypesFramesetHTML.appendAscii( "\t\t<frameset cols=\"40%,60%\">\n" ); // open frameset for cols - sTypesFramesetHTML.appendAscii( "\t\t\t<frame name=\"" ); // generate frame "list" - sTypesFramesetHTML.appendAscii( TARGET_LIST ); - sTypesFramesetHTML.appendAscii( "\" src=\"" ); - sTypesFramesetHTML.appendAscii( ALLTYPES_HTML ); - sTypesFramesetHTML.appendAscii( "\" title=\"List\">\n" ); - sTypesFramesetHTML.appendAscii( "\t\t\t<frame name=\"" ); // generate frame "properties" - sTypesFramesetHTML.appendAscii( TARGET_PROPERTIES ); - sTypesFramesetHTML.appendAscii( "\" src=\"" ); - sTypesFramesetHTML.appendAscii( TYPEPROPERTIES_HTML ); - sTypesFramesetHTML.appendAscii( "\" title=\"Properties\">\n" ); - sTypesFramesetHTML.appendAscii( "\t\t</frameset>\n" ); // close frameset cols - sTypesFramesetHTML.appendAscii( "</html>\n" ); // close html + sTypesFramesetHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tFrameset: Types\n\t\t</title>\n\t</head>\n" ); // open html + sTypesFramesetHTML.appendAscii( "\t\t<frameset cols=\"40%,60%\">\n" ); // open frameset for cols + sTypesFramesetHTML.appendAscii( "\t\t\t<frame name=\"" ); // generate frame "list" + sTypesFramesetHTML.appendAscii( TARGET_LIST ); + sTypesFramesetHTML.appendAscii( "\" src=\"" ); + sTypesFramesetHTML.appendAscii( ALLTYPES_HTML ); + sTypesFramesetHTML.appendAscii( "\" title=\"List\">\n" ); + sTypesFramesetHTML.appendAscii( "\t\t\t<frame name=\"" ); // generate frame "properties" + sTypesFramesetHTML.appendAscii( TARGET_PROPERTIES ); + sTypesFramesetHTML.appendAscii( "\" src=\"" ); + sTypesFramesetHTML.appendAscii( TYPEPROPERTIES_HTML ); + sTypesFramesetHTML.appendAscii( "\" title=\"Properties\">\n" ); + sTypesFramesetHTML.appendAscii( "\t\t</frameset>\n" ); // close frameset cols + sTypesFramesetHTML.appendAscii( "</html>\n" ); // close html impl_writeFile( FRAMESET_TYPES_HTML, U2B(sTypesFramesetHTML.makeStringAndClear()) ); @@ -428,10 +428,10 @@ void CFGView::impl_generateTypeListHTML() OUStringBuffer sAllTypesHTML( 10000 ); OUStringBuffer sTypePropHTML( 10000 ); - sAllTypesHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tAll Types\n\t\t</title>\n\t</head>\n\t<body>\n" ); // open html - sAllTypesHTML.appendAscii( "\t\t<table border=0><tr><td bgcolor=#ff8040><strong>Nr.</strong></td><td bgcolor=#ff8040><strong>Type</strong></td></tr>\n" ); // open table + sAllTypesHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tAll Types\n\t\t</title>\n\t</head>\n\t<body>\n" ); // open html + sAllTypesHTML.appendAscii( "\t\t<table border=0><tr><td bgcolor=#ff8040><strong>Nr.</strong></td><td bgcolor=#ff8040><strong>Type</strong></td></tr>\n" ); // open table - sTypePropHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tTypeProperties\n\t\t</title>\n\t</head>\n\t<body>\n" ); // open html + sTypePropHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tTypeProperties\n\t\t</title>\n\t</head>\n\t<body>\n" ); // open html css::uno::Sequence< ::rtl::OUString > lNames = m_aData.pCache->getAllTypeNames(); sal_Int32 nCount = lNames.getLength() ; @@ -441,18 +441,18 @@ void CFGView::impl_generateTypeListHTML() FileType aItem = m_aData.pCache->getType( sName ); // write entry in type list table - sAllTypesHTML.appendAscii ( "\t\t\t<tr>\n" ); // open row - sAllTypesHTML.appendAscii ( "\t\t\t\t<td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">" ); // open column "nr" + sAllTypesHTML.appendAscii ( "\t\t\t<tr>\n" ); // open row + sAllTypesHTML.appendAscii ( "\t\t\t\t<td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">" ); // open column "nr" sAllTypesHTML.append ( OUString::valueOf( nItem ) ); // write nr - sAllTypesHTML.appendAscii ( "</td>\n" ); // close column "nr" - sAllTypesHTML.appendAscii ( "\t\t\t\t<td>" ); // open column "name" - sAllTypesHTML.appendAscii ( "<a href=\"" ); // open href="typeproperties.html#<typename>" - sAllTypesHTML.appendAscii ( TYPEPROPERTIES_HTML ); - sAllTypesHTML.appendAscii ( "#" ); + sAllTypesHTML.appendAscii ( "</td>\n" ); // close column "nr" + sAllTypesHTML.appendAscii ( "\t\t\t\t<td>" ); // open column "name" + sAllTypesHTML.appendAscii ( "<a href=\"" ); // open href="typeproperties.html#<typename>" + sAllTypesHTML.appendAscii ( TYPEPROPERTIES_HTML ); + sAllTypesHTML.appendAscii ( "#" ); sAllTypesHTML.append ( aItem.sName ); - sAllTypesHTML.appendAscii ( "\" target=\"" ); - sAllTypesHTML.appendAscii ( TARGET_PROPERTIES ); - sAllTypesHTML.appendAscii ( "\">" ); + sAllTypesHTML.appendAscii ( "\" target=\"" ); + sAllTypesHTML.appendAscii ( TARGET_PROPERTIES ); + sAllTypesHTML.appendAscii ( "\">" ); sAllTypesHTML.append ( aItem.sName ); // write name sAllTypesHTML.appendAscii ( "</a>" ); // close href sAllTypesHTML.appendAscii ( "</td>\n" ); // close column "name" @@ -481,43 +481,43 @@ void CFGView::impl_generateTypeListHTML() sTypePropHTML.appendAscii ( "\"<br>" ); } sTypePropHTML.appendAscii ( "</td></tr>\n" ); - sTypePropHTML.appendAscii ( "\t\t\t<tr><td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">MediaType</td><td valign=\"top\" align=\"top\"> " ); // generate row "MediaType <value>" + sTypePropHTML.appendAscii ( "\t\t\t<tr><td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">MediaType</td><td valign=\"top\" align=\"top\"> " ); // generate row "MediaType <value>" sTypePropHTML.append ( aItem.sMediaType ); - sTypePropHTML.appendAscii ( "</td></tr>\n" ); - sTypePropHTML.appendAscii ( "\t\t\t<tr><td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">ClipboardFormat</td><td valign=\"top\" align=\"top\"> " ); // generate row "ClipboardFormat <value>" + sTypePropHTML.appendAscii ( "</td></tr>\n" ); + sTypePropHTML.appendAscii ( "\t\t\t<tr><td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">ClipboardFormat</td><td valign=\"top\" align=\"top\"> " ); // generate row "ClipboardFormat <value>" sTypePropHTML.append ( aItem.sClipboardFormat ); - sTypePropHTML.appendAscii ( "</td></tr>\n" ); - sTypePropHTML.appendAscii ( "\t\t\t<tr><td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">URLPattern</td><td valign=\"top\" align=\"top\">" ); // generate row "URLPattern <value>" + sTypePropHTML.appendAscii ( "</td></tr>\n" ); + sTypePropHTML.appendAscii ( "\t\t\t<tr><td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">URLPattern</td><td valign=\"top\" align=\"top\">" ); // generate row "URLPattern <value>" for( ConstStringListIterator pPattern=aItem.lURLPattern.begin() ; pPattern!=aItem.lURLPattern.end() ; ++pPattern ) { - sTypePropHTML.appendAscii ( " \""); - sTypePropHTML.append ( *pPattern ); - sTypePropHTML.appendAscii ( "\"<br>" ); + sTypePropHTML.appendAscii ( " \""); + sTypePropHTML.append ( *pPattern ); + sTypePropHTML.appendAscii ( "\"<br>" ); } - sTypePropHTML.appendAscii ( "</td></tr>\n" ); - sTypePropHTML.appendAscii ( "\t\t\t<tr><td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">Extensions</td><td valign=\"top\" align=\"top\">" ); // generate row "Extensions <value>" + sTypePropHTML.appendAscii ( "</td></tr>\n" ); + sTypePropHTML.appendAscii ( "\t\t\t<tr><td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">Extensions</td><td valign=\"top\" align=\"top\">" ); // generate row "Extensions <value>" for( ConstStringListIterator pExtension=aItem.lExtensions.begin() ; pExtension!=aItem.lExtensions.end() ; ++pExtension ) { - sTypePropHTML.appendAscii ( " \"" ); - sTypePropHTML.append ( *pExtension ); - sTypePropHTML.appendAscii ( "\"<br>" ); + sTypePropHTML.appendAscii ( " \"" ); + sTypePropHTML.append ( *pExtension ); + sTypePropHTML.appendAscii ( "\"<br>" ); } - sTypePropHTML.appendAscii ( "</td></tr>\n" ); - sTypePropHTML.appendAscii ( "\t\t\t<tr><td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">DocumentIconID</td><td valign=\"top\" align=\"top\"> " ); // generate row "DocumentIconID <value>" + sTypePropHTML.appendAscii ( "</td></tr>\n" ); + sTypePropHTML.appendAscii ( "\t\t\t<tr><td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">DocumentIconID</td><td valign=\"top\" align=\"top\"> " ); // generate row "DocumentIconID <value>" sTypePropHTML.append ( OUString::valueOf( aItem.nDocumentIconID ) ); - sTypePropHTML.appendAscii ( "</td></tr>\n" ); - sTypePropHTML.appendAscii ( "\t\t</table>\n" ); // close table - sTypePropHTML.appendAscii ( "\t\t<p>\n" ); // add space between this and following table + sTypePropHTML.appendAscii ( "</td></tr>\n" ); + sTypePropHTML.appendAscii ( "\t\t</table>\n" ); // close table + sTypePropHTML.appendAscii ( "\t\t<p>\n" ); // add space between this and following table } - sAllTypesHTML.appendAscii( "</table>\n" ); // close table - sAllTypesHTML.appendAscii( "</body>\n</html>\n" ); // close html + sAllTypesHTML.appendAscii( "</table>\n" ); // close table + sAllTypesHTML.appendAscii( "</body>\n</html>\n" ); // close html - sTypePropHTML.appendAscii( "</body>\n</html>\n" ); // close html + sTypePropHTML.appendAscii( "</body>\n</html>\n" ); // close html impl_writeFile( ALLTYPES_HTML , U2B(sAllTypesHTML.makeStringAndClear()) ); impl_writeFile( TYPEPROPERTIES_HTML , U2B(sTypePropHTML.makeStringAndClear()) ); @@ -530,20 +530,20 @@ void CFGView::impl_generateFilterListHTML() // generate frameset for types OUStringBuffer sFiltersFramesetHTML( 10000 ); - sFiltersFramesetHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tFrameset: Filters\n\t\t</title>\n\t</head>\n" ); // open html - sFiltersFramesetHTML.appendAscii( "\t\t<frameset cols=\"40%,60%\">\n" ); // open frameset for cols - sFiltersFramesetHTML.appendAscii( "\t\t\t<frame name=\"" ); // generate frame "list" - sFiltersFramesetHTML.appendAscii( TARGET_LIST ); - sFiltersFramesetHTML.appendAscii( "\" src=\"" ); - sFiltersFramesetHTML.appendAscii( ALLFILTERS_HTML ); - sFiltersFramesetHTML.appendAscii( "\" title=\"List\">\n" ); - sFiltersFramesetHTML.appendAscii( "\t\t\t<frame name=\"" ); // generate frame "properties" - sFiltersFramesetHTML.appendAscii( TARGET_PROPERTIES ); - sFiltersFramesetHTML.appendAscii( "\" src=\"" ); - sFiltersFramesetHTML.appendAscii( FILTERPROPERTIES_HTML ); - sFiltersFramesetHTML.appendAscii( "\" title=\"Properties\">\n" ); - sFiltersFramesetHTML.appendAscii( "\t\t</frameset>\n" ); // close frameset cols - sFiltersFramesetHTML.appendAscii( "</html>\n" ); // close html + sFiltersFramesetHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tFrameset: Filters\n\t\t</title>\n\t</head>\n" ); // open html + sFiltersFramesetHTML.appendAscii( "\t\t<frameset cols=\"40%,60%\">\n" ); // open frameset for cols + sFiltersFramesetHTML.appendAscii( "\t\t\t<frame name=\"" ); // generate frame "list" + sFiltersFramesetHTML.appendAscii( TARGET_LIST ); + sFiltersFramesetHTML.appendAscii( "\" src=\"" ); + sFiltersFramesetHTML.appendAscii( ALLFILTERS_HTML ); + sFiltersFramesetHTML.appendAscii( "\" title=\"List\">\n" ); + sFiltersFramesetHTML.appendAscii( "\t\t\t<frame name=\"" ); // generate frame "properties" + sFiltersFramesetHTML.appendAscii( TARGET_PROPERTIES ); + sFiltersFramesetHTML.appendAscii( "\" src=\"" ); + sFiltersFramesetHTML.appendAscii( FILTERPROPERTIES_HTML ); + sFiltersFramesetHTML.appendAscii( "\" title=\"Properties\">\n" ); + sFiltersFramesetHTML.appendAscii( "\t\t</frameset>\n" ); // close frameset cols + sFiltersFramesetHTML.appendAscii( "</html>\n" ); // close html impl_writeFile( FRAMESET_FILTERS_HTML, U2B(sFiltersFramesetHTML.makeStringAndClear()) ); @@ -553,10 +553,10 @@ void CFGView::impl_generateFilterListHTML() OUStringBuffer sAllFiltersHTML( 10000 ); OUStringBuffer sFilterPropHTML( 10000 ); - sAllFiltersHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tAll Filters\n\t\t</title>\n\t</head>\n\t<body>\n" ); // open html - sAllFiltersHTML.appendAscii( "\t\t<table border=0><tr><td bgcolor=#ff8040><strong>Nr.</strong></td><td bgcolor=#ff8040><strong>Filter</strong></td></tr>\n" ); // open table + sAllFiltersHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tAll Filters\n\t\t</title>\n\t</head>\n\t<body>\n" ); // open html + sAllFiltersHTML.appendAscii( "\t\t<table border=0><tr><td bgcolor=#ff8040><strong>Nr.</strong></td><td bgcolor=#ff8040><strong>Filter</strong></td></tr>\n" ); // open table - sFilterPropHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tFilterProperties\n\t\t</title>\n\t</head>\n\t<body>\n" ); // open html + sFilterPropHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tFilterProperties\n\t\t</title>\n\t</head>\n\t<body>\n" ); // open html /* ::framework::StringList lFilterNames; for( ConstFilterIterator pFilter=m_pData->aCFGView.begin(); pFilter!=m_pData->aCFGView.end(); ++pFilter ) @@ -576,40 +576,40 @@ void CFGView::impl_generateFilterListHTML() aFilter = m_aData.pCache->getFilter( lNames[nFilterCounter] ); // write entry in filter list table - sAllFiltersHTML.appendAscii ( "\t\t\t<tr>\n" ); // open row - sAllFiltersHTML.appendAscii ( "\t\t\t\t<td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">" ); // open column "nr" - sAllFiltersHTML.append ( OUString::valueOf( nFilterCounter ) ); // write nr - sAllFiltersHTML.appendAscii ( "</td>\n" ); // close column "nr" - sAllFiltersHTML.appendAscii ( "\t\t\t\t<td>" ); // open column "name" - sAllFiltersHTML.appendAscii ( "<a href=\"" ); // open href="filterproperties.html#<filtername>" - sAllFiltersHTML.appendAscii ( FILTERPROPERTIES_HTML ); - sAllFiltersHTML.appendAscii ( "#" ); + sAllFiltersHTML.appendAscii ( "\t\t\t<tr>\n" ); // open row + sAllFiltersHTML.appendAscii ( "\t\t\t\t<td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">" ); // open column "nr" + sAllFiltersHTML.append ( OUString::valueOf( nFilterCounter ) ); // write nr + sAllFiltersHTML.appendAscii ( "</td>\n" ); // close column "nr" + sAllFiltersHTML.appendAscii ( "\t\t\t\t<td>" ); // open column "name" + sAllFiltersHTML.appendAscii ( "<a href=\"" ); // open href="filterproperties.html#<filtername>" + sAllFiltersHTML.appendAscii ( FILTERPROPERTIES_HTML ); + sAllFiltersHTML.appendAscii ( "#" ); sAllFiltersHTML.append ( aFilter.sName ); - sAllFiltersHTML.appendAscii ( "\" target=\"" ); - sAllFiltersHTML.appendAscii ( TARGET_PROPERTIES ); - sAllFiltersHTML.appendAscii ( "\">" ); + sAllFiltersHTML.appendAscii ( "\" target=\"" ); + sAllFiltersHTML.appendAscii ( TARGET_PROPERTIES ); + sAllFiltersHTML.appendAscii ( "\">" ); sAllFiltersHTML.append ( aFilter.sName ); // write name - sAllFiltersHTML.appendAscii ( "</a>" ); // close href - sAllFiltersHTML.appendAscii ( "</td>\n" ); // close column "name" - sAllFiltersHTML.appendAscii ( "\t\t\t</tr>\n" ); // close row + sAllFiltersHTML.appendAscii ( "</a>" ); // close href + sAllFiltersHTML.appendAscii ( "</td>\n" ); // close column "name" + sAllFiltersHTML.appendAscii ( "\t\t\t</tr>\n" ); // close row // write entry in filter property table - sFilterPropHTML.appendAscii ( "\t\t<a name=\"" ); // set target="#<typename>" to follow table + sFilterPropHTML.appendAscii ( "\t\t<a name=\"" ); // set target="#<typename>" to follow table sFilterPropHTML.append ( aFilter.sName ); - sFilterPropHTML.appendAscii ( "\"></a>" ); - sFilterPropHTML.appendAscii ( "\t\t<table border=0>\n" ); // open table - sFilterPropHTML.appendAscii ( "\t\t\t<tr><td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">Nr.</td><td bgcolor=#f5f9d5 valign=\"top\" align=\"top\"> "); // generate row "Nr <value>" - sFilterPropHTML.append ( OUString::valueOf( nFilterCounter ) ); - sFilterPropHTML.appendAscii ( "</td></tr>\n" ); - sFilterPropHTML.appendAscii ( "\t\t\t<tr><td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">Name</td><td valign=\"top\" align=\"top\"> " ); // generate row "Name <value>" + sFilterPropHTML.appendAscii ( "\"></a>" ); + sFilterPropHTML.appendAscii ( "\t\t<table border=0>\n" ); // open table + sFilterPropHTML.appendAscii ( "\t\t\t<tr><td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">Nr.</td><td bgcolor=#f5f9d5 valign=\"top\" align=\"top\"> "); // generate row "Nr <value>" + sFilterPropHTML.append ( OUString::valueOf( nFilterCounter ) ); + sFilterPropHTML.appendAscii ( "</td></tr>\n" ); + sFilterPropHTML.appendAscii ( "\t\t\t<tr><td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">Name</td><td valign=\"top\" align=\"top\"> " ); // generate row "Name <value>" sFilterPropHTML.append ( aFilter.sName ); - sFilterPropHTML.appendAscii ( "</td></tr>\n" ); + sFilterPropHTML.appendAscii ( "</td></tr>\n" ); sFilterPropHTML.appendAscii ( "\t\t\t<tr><td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">Order</td><td valign=\"top\" align=\"top\"> \"" ); // generate row "Order <value>" sFilterPropHTML.append ( aFilter.nOrder ); - sFilterPropHTML.appendAscii ( "\"</td></tr>\n" ); - sFilterPropHTML.appendAscii ( "\t\t\t<tr><td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">Type</td><td valign=\"top\" align=\"top\"> \"" ); // generate row "Type <value>" + sFilterPropHTML.appendAscii ( "\"</td></tr>\n" ); + sFilterPropHTML.appendAscii ( "\t\t\t<tr><td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">Type</td><td valign=\"top\" align=\"top\"> \"" ); // generate row "Type <value>" sFilterPropHTML.append ( aFilter.sType ); - sFilterPropHTML.appendAscii ( "\"</td></tr>\n" ); + sFilterPropHTML.appendAscii ( "\"</td></tr>\n" ); sFilterPropHTML.appendAscii ( "\t\t\t<tr><td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">UIName</td><td valign=\"top\" align=\"top\">" ); // generate row "UIName <value>" for( ConstStringHashIterator pUIName=aFilter.lUINames.begin() ; pUIName!=aFilter.lUINames.end() ; @@ -622,13 +622,13 @@ void CFGView::impl_generateFilterListHTML() sFilterPropHTML.appendAscii ( "\"<br>" ); } sFilterPropHTML.appendAscii ( "</td></tr>\n" ); - sFilterPropHTML.appendAscii ( "\t\t\t<tr><td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">DocumentService</td><td valign=\"top\" align=\"top\"> " ); // generate row "DocumentService <value>" + sFilterPropHTML.appendAscii ( "\t\t\t<tr><td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">DocumentService</td><td valign=\"top\" align=\"top\"> " ); // generate row "DocumentService <value>" sFilterPropHTML.append ( aFilter.sDocumentService ); - sFilterPropHTML.appendAscii ( "</td></tr>\n" ); - sFilterPropHTML.appendAscii ( "\t\t\t<tr><td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">FilterService</td><td valign=\"top\" align=\"top\"> " ); // generate row "FilterService <value>" + sFilterPropHTML.appendAscii ( "</td></tr>\n" ); + sFilterPropHTML.appendAscii ( "\t\t\t<tr><td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">FilterService</td><td valign=\"top\" align=\"top\"> " ); // generate row "FilterService <value>" sFilterPropHTML.append ( aFilter.sFilterService ); - sFilterPropHTML.appendAscii ( "</td></tr>\n" ); - sFilterPropHTML.appendAscii ( "\t\t\t<tr><td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">Flags</td><td valign=\"top\" align=\"top\"> " ); // generate row "Flags <value>" + sFilterPropHTML.appendAscii ( "</td></tr>\n" ); + sFilterPropHTML.appendAscii ( "\t\t\t<tr><td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">Flags</td><td valign=\"top\" align=\"top\"> " ); // generate row "Flags <value>" if( aFilter.nFlags & FILTERFLAG_IMPORT ) { sFilterPropHTML.append( FILTERFLAGNAME_IMPORT ); sFilterPropHTML.appendAscii( "<br> " ); }; if( aFilter.nFlags & FILTERFLAG_EXPORT ) { sFilterPropHTML.append( FILTERFLAGNAME_EXPORT ); sFilterPropHTML.appendAscii( "<br> " ); }; if( aFilter.nFlags & FILTERFLAG_TEMPLATE ) { sFilterPropHTML.append( FILTERFLAGNAME_TEMPLATE ); sFilterPropHTML.appendAscii( "<br> " ); }; @@ -651,30 +651,30 @@ void CFGView::impl_generateFilterListHTML() if( aFilter.nFlags & FILTERFLAG_PREFERED ) { sFilterPropHTML.append( FILTERFLAGNAME_PREFERED ); sFilterPropHTML.appendAscii( "<br> " ); }; sFilterPropHTML.appendAscii ( "</td></tr>\n" ); - sFilterPropHTML.appendAscii ( "\t\t\t<tr><td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">UserData</td><td valign=\"top\" align=\"top\">" ); // generate row "UserData <value>" + sFilterPropHTML.appendAscii ( "\t\t\t<tr><td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">UserData</td><td valign=\"top\" align=\"top\">" ); // generate row "UserData <value>" for( ConstStringListIterator pUserData=aFilter.lUserData.begin() ; pUserData!=aFilter.lUserData.end() ; ++pUserData ) { - sFilterPropHTML.appendAscii ( " \"" ); - sFilterPropHTML.append ( *pUserData ); - sFilterPropHTML.appendAscii ( "\"<br>" ); + sFilterPropHTML.appendAscii ( " \"" ); + sFilterPropHTML.append ( *pUserData ); + sFilterPropHTML.appendAscii ( "\"<br>" ); } - sFilterPropHTML.appendAscii ( "</td></tr>\n" ); - sFilterPropHTML.appendAscii ( "\t\t\t<tr><td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">FileFormatVersion</td><td valign=\"top\" align=\"top\"> "); // generate row "FileFormatVersion <value>" + sFilterPropHTML.appendAscii ( "</td></tr>\n" ); + sFilterPropHTML.appendAscii ( "\t\t\t<tr><td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">FileFormatVersion</td><td valign=\"top\" align=\"top\"> "); // generate row "FileFormatVersion <value>" sFilterPropHTML.append ( OUString::valueOf( aFilter.nFileFormatVersion ) ); - sFilterPropHTML.appendAscii ( "</td></tr>\n" ); - sFilterPropHTML.appendAscii ( "\t\t\t<tr><td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">TemplateName</td><td valign=\"top\" align=\"top\"> " ); // generate row "TemplateName <value>" + sFilterPropHTML.appendAscii ( "</td></tr>\n" ); + sFilterPropHTML.appendAscii ( "\t\t\t<tr><td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">TemplateName</td><td valign=\"top\" align=\"top\"> " ); // generate row "TemplateName <value>" sFilterPropHTML.append ( aFilter.sTemplateName ); - sFilterPropHTML.appendAscii ( "</td></tr>\n" ); - sFilterPropHTML.appendAscii ( "\t\t</table>\n" ); // close table - sFilterPropHTML.appendAscii ( "\t\t<p>\n" ); // add space between this and following table + sFilterPropHTML.appendAscii ( "</td></tr>\n" ); + sFilterPropHTML.appendAscii ( "\t\t</table>\n" ); // close table + sFilterPropHTML.appendAscii ( "\t\t<p>\n" ); // add space between this and following table } - sAllFiltersHTML.appendAscii( "</table>\n" ); // close table - sAllFiltersHTML.appendAscii( "</body>\n</html>\n" ); // close html + sAllFiltersHTML.appendAscii( "</table>\n" ); // close table + sAllFiltersHTML.appendAscii( "</body>\n</html>\n" ); // close html - sFilterPropHTML.appendAscii( "</body>\n</html>\n" ); // close html + sFilterPropHTML.appendAscii( "</body>\n</html>\n" ); // close html impl_writeFile( ALLFILTERS_HTML , U2B(sAllFiltersHTML.makeStringAndClear()) ); impl_writeFile( FILTERPROPERTIES_HTML, U2B(sFilterPropHTML.makeStringAndClear()) ); @@ -710,10 +710,10 @@ void CFGView::impl_generateFilterModulListHTML() OUStringBuffer sAllFiltersHTML( 10000 ); OUStringBuffer sFilterPropHTML( 10000 ); - sAllFiltersHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tAll Filters\n\t\t</title>\n\t</head>\n\t<body>\n" ); // open html - sAllFiltersHTML.appendAscii( "\t\t<table border=0><tr><td bgcolor=#ff8040><strong>Nr.</strong></td><td bgcolor=#ff8040><strong>Filter</strong></td></tr>\n" ); // open table + sAllFiltersHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tAll Filters\n\t\t</title>\n\t</head>\n\t<body>\n" ); // open html + sAllFiltersHTML.appendAscii( "\t\t<table border=0><tr><td bgcolor=#ff8040><strong>Nr.</strong></td><td bgcolor=#ff8040><strong>Filter</strong></td></tr>\n" ); // open table - sFilterPropHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tFilterProperties\n\t\t</title>\n\t</head>\n\t<body>\n" ); // open html + sFilterPropHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tFilterProperties\n\t\t</title>\n\t</head>\n\t<body>\n" ); // open html css::uno::Sequence< ::rtl::OUString > lWriter ; css::uno::Sequence< ::rtl::OUString > lWeb ; @@ -911,10 +911,10 @@ void CFGView::impl_generateFilterModulListHTML() } } - sAllFiltersHTML.appendAscii( "</table>\n" ); // close table - sAllFiltersHTML.appendAscii( "</body>\n</html>\n" ); // close html + sAllFiltersHTML.appendAscii( "</table>\n" ); // close table + sAllFiltersHTML.appendAscii( "</body>\n</html>\n" ); // close html - sFilterPropHTML.appendAscii( "</body>\n</html>\n" ); // close html + sFilterPropHTML.appendAscii( "</body>\n</html>\n" ); // close html impl_writeFile( ALLFILTERS_HTML , U2B(sAllFiltersHTML.makeStringAndClear()) ); impl_writeFile( FILTERPROPERTIES_HTML, U2B(sFilterPropHTML.makeStringAndClear()) ); @@ -927,20 +927,20 @@ void CFGView::impl_generateDetectorListHTML() // generate frameset for detector services OUStringBuffer sDetectorsFramesetHTML( 10000 ); - sDetectorsFramesetHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tFrameset: Detector Services\n\t\t</title>\n\t</head>\n" ); // open html - sDetectorsFramesetHTML.appendAscii( "\t\t<frameset cols=\"40%,60%\">\n" ); // open frameset for cols - sDetectorsFramesetHTML.appendAscii( "\t\t\t<frame name=\"" ); // generate frame "list" - sDetectorsFramesetHTML.appendAscii( TARGET_LIST ); - sDetectorsFramesetHTML.appendAscii( "\" src=\"" ); - sDetectorsFramesetHTML.appendAscii( ALLDETECTORS_HTML ); - sDetectorsFramesetHTML.appendAscii( "\" title=\"List\">\n" ); - sDetectorsFramesetHTML.appendAscii( "\t\t\t<frame name=\"" ); // generate frame "properties" - sDetectorsFramesetHTML.appendAscii( TARGET_PROPERTIES ); - sDetectorsFramesetHTML.appendAscii( "\" src=\"" ); - sDetectorsFramesetHTML.appendAscii( DETECTORPROPERTIES_HTML ); - sDetectorsFramesetHTML.appendAscii( "\" title=\"Properties\">\n" ); - sDetectorsFramesetHTML.appendAscii( "\t\t</frameset>\n" ); // close frameset cols - sDetectorsFramesetHTML.appendAscii( "</html>\n" ); // close html + sDetectorsFramesetHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tFrameset: Detector Services\n\t\t</title>\n\t</head>\n" ); // open html + sDetectorsFramesetHTML.appendAscii( "\t\t<frameset cols=\"40%,60%\">\n" ); // open frameset for cols + sDetectorsFramesetHTML.appendAscii( "\t\t\t<frame name=\"" ); // generate frame "list" + sDetectorsFramesetHTML.appendAscii( TARGET_LIST ); + sDetectorsFramesetHTML.appendAscii( "\" src=\"" ); + sDetectorsFramesetHTML.appendAscii( ALLDETECTORS_HTML ); + sDetectorsFramesetHTML.appendAscii( "\" title=\"List\">\n" ); + sDetectorsFramesetHTML.appendAscii( "\t\t\t<frame name=\"" ); // generate frame "properties" + sDetectorsFramesetHTML.appendAscii( TARGET_PROPERTIES ); + sDetectorsFramesetHTML.appendAscii( "\" src=\"" ); + sDetectorsFramesetHTML.appendAscii( DETECTORPROPERTIES_HTML ); + sDetectorsFramesetHTML.appendAscii( "\" title=\"Properties\">\n" ); + sDetectorsFramesetHTML.appendAscii( "\t\t</frameset>\n" ); // close frameset cols + sDetectorsFramesetHTML.appendAscii( "</html>\n" ); // close html impl_writeFile( FRAMESET_DETECTORS_HTML, U2B(sDetectorsFramesetHTML.makeStringAndClear()) ); @@ -950,10 +950,10 @@ void CFGView::impl_generateDetectorListHTML() OUStringBuffer sAllDetectorsHTML( 10000 ); OUStringBuffer sDetectorPropHTML( 10000 ); - sAllDetectorsHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tAll Detectors\n\t\t</title>\n\t</head>\n\t<body>\n" ); // open html - sAllDetectorsHTML.appendAscii( "\t\t<table border=0><tr><td bgcolor=#ff8040><strong>Nr.</strong></td><td bgcolor=#ff8040><strong>Detector</strong></td></tr>\n" ); // open table + sAllDetectorsHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tAll Detectors\n\t\t</title>\n\t</head>\n\t<body>\n" ); // open html + sAllDetectorsHTML.appendAscii( "\t\t<table border=0><tr><td bgcolor=#ff8040><strong>Nr.</strong></td><td bgcolor=#ff8040><strong>Detector</strong></td></tr>\n" ); // open table - sDetectorPropHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tDetectorProperties\n\t\t</title>\n\t</head>\n\t<body>\n" ); // open html + sDetectorPropHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tDetectorProperties\n\t\t</title>\n\t</head>\n\t<body>\n" ); // open html css::uno::Sequence< ::rtl::OUString > lNames = m_aData.pCache->getAllDetectorNames(); sal_Int32 nCount = lNames.getLength() ; @@ -962,52 +962,52 @@ void CFGView::impl_generateDetectorListHTML() Detector aDetector = m_aData.pCache->getDetector( lNames[nItem] ); // write entry in detector list table - sAllDetectorsHTML.appendAscii ( "\t\t\t<tr>\n" ); // open row - sAllDetectorsHTML.appendAscii ( "\t\t\t\t<td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">" ); // open column "nr" + sAllDetectorsHTML.appendAscii ( "\t\t\t<tr>\n" ); // open row + sAllDetectorsHTML.appendAscii ( "\t\t\t\t<td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">" ); // open column "nr" sAllDetectorsHTML.append ( OUString::valueOf( nItem ) ); // write nr - sAllDetectorsHTML.appendAscii ( "</td>\n" ); // close column "nr" - sAllDetectorsHTML.appendAscii ( "\t\t\t\t<td>" ); // open column "name" - sAllDetectorsHTML.appendAscii ( "<a href=\"" ); // open href="detectorproperties.html#<detectorname>" - sAllDetectorsHTML.appendAscii ( DETECTORPROPERTIES_HTML ); - sAllDetectorsHTML.appendAscii ( "#" ); + sAllDetectorsHTML.appendAscii ( "</td>\n" ); // close column "nr" + sAllDetectorsHTML.appendAscii ( "\t\t\t\t<td>" ); // open column "name" + sAllDetectorsHTML.appendAscii ( "<a href=\"" ); // open href="detectorproperties.html#<detectorname>" + sAllDetectorsHTML.appendAscii ( DETECTORPROPERTIES_HTML ); + sAllDetectorsHTML.appendAscii ( "#" ); sAllDetectorsHTML.append ( aDetector.sName ); - sAllDetectorsHTML.appendAscii ( "\" target=\"" ); - sAllDetectorsHTML.appendAscii ( TARGET_PROPERTIES ); - sAllDetectorsHTML.appendAscii ( "\">" ); + sAllDetectorsHTML.appendAscii ( "\" target=\"" ); + sAllDetectorsHTML.appendAscii ( TARGET_PROPERTIES ); + sAllDetectorsHTML.appendAscii ( "\">" ); sAllDetectorsHTML.append ( aDetector.sName ); // write name - sAllDetectorsHTML.appendAscii ( "</a>" ); // close href - sAllDetectorsHTML.appendAscii ( "</td>\n" ); // close column "name" - sAllDetectorsHTML.appendAscii ( "\t\t\t</tr>\n" ); // close row + sAllDetectorsHTML.appendAscii ( "</a>" ); // close href + sAllDetectorsHTML.appendAscii ( "</td>\n" ); // close column "name" + sAllDetectorsHTML.appendAscii ( "\t\t\t</tr>\n" ); // close row // write entry in detector property table - sDetectorPropHTML.appendAscii ( "\t\t<a name=\"" ); // set target="#<detectorname>" to follow table + sDetectorPropHTML.appendAscii ( "\t\t<a name=\"" ); // set target="#<detectorname>" to follow table sDetectorPropHTML.append ( aDetector.sName ); - sDetectorPropHTML.appendAscii ( "\"></a>" ); - sDetectorPropHTML.appendAscii ( "\t\t<table border=0>\n" ); // open table - sDetectorPropHTML.appendAscii ( "\t\t\t<tr><td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">Nr.</td><td valign=\"top\" align=\"top\"> " ); // generate row "Nr <value>" + sDetectorPropHTML.appendAscii ( "\"></a>" ); + sDetectorPropHTML.appendAscii ( "\t\t<table border=0>\n" ); // open table + sDetectorPropHTML.appendAscii ( "\t\t\t<tr><td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">Nr.</td><td valign=\"top\" align=\"top\"> " ); // generate row "Nr <value>" sDetectorPropHTML.append ( OUString::valueOf( nItem ) ); - sDetectorPropHTML.appendAscii ( "</td></tr>\n" ); - sDetectorPropHTML.appendAscii ( "\t\t\t<tr><td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">Name</td><td valign=\"top\" align=\"top\"> " ); // generate row "Name <value>" + sDetectorPropHTML.appendAscii ( "</td></tr>\n" ); + sDetectorPropHTML.appendAscii ( "\t\t\t<tr><td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">Name</td><td valign=\"top\" align=\"top\"> " ); // generate row "Name <value>" sDetectorPropHTML.append ( aDetector.sName ); - sDetectorPropHTML.appendAscii ( "</td></tr>\n" ); - sDetectorPropHTML.appendAscii ( "\t\t\t<tr><td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">Types</td><td valign=\"top\" align=\"top\">" ); // generate row "Types <value>" + sDetectorPropHTML.appendAscii ( "</td></tr>\n" ); + sDetectorPropHTML.appendAscii ( "\t\t\t<tr><td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">Types</td><td valign=\"top\" align=\"top\">" ); // generate row "Types <value>" for( ConstStringListIterator pType=aDetector.lTypes.begin() ; pType!=aDetector.lTypes.end() ; ++pType ) { - sDetectorPropHTML.appendAscii ( " \""); - sDetectorPropHTML.append ( *pType ); - sDetectorPropHTML.appendAscii ( "\"<br>" ); + sDetectorPropHTML.appendAscii ( " \""); + sDetectorPropHTML.append ( *pType ); + sDetectorPropHTML.appendAscii ( "\"<br>" ); } - sDetectorPropHTML.appendAscii ( "\t\t</table>\n" ); // close table - sDetectorPropHTML.appendAscii ( "\t\t<p>\n" ); // add space between this and following table + sDetectorPropHTML.appendAscii ( "\t\t</table>\n" ); // close table + sDetectorPropHTML.appendAscii ( "\t\t<p>\n" ); // add space between this and following table } - sAllDetectorsHTML.appendAscii( "</table>\n" ); // close table - sAllDetectorsHTML.appendAscii( "</body>\n</html>\n" ); // close html + sAllDetectorsHTML.appendAscii( "</table>\n" ); // close table + sAllDetectorsHTML.appendAscii( "</body>\n</html>\n" ); // close html - sDetectorPropHTML.appendAscii( "</body>\n</html>\n" ); // close html + sDetectorPropHTML.appendAscii( "</body>\n</html>\n" ); // close html impl_writeFile( ALLDETECTORS_HTML , U2B(sAllDetectorsHTML.makeStringAndClear()) ); impl_writeFile( DETECTORPROPERTIES_HTML , U2B(sDetectorPropHTML.makeStringAndClear()) ); @@ -1020,20 +1020,20 @@ void CFGView::impl_generateLoaderListHTML() // generate frameset for loader services OUStringBuffer sLoadersFramesetHTML( 10000 ); - sLoadersFramesetHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tFrameset: Loader Services\n\t\t</title>\n\t</head>\n" ); // open html - sLoadersFramesetHTML.appendAscii( "\t\t<frameset cols=\"40%,60%\">\n" ); // open frameset for cols - sLoadersFramesetHTML.appendAscii( "\t\t\t<frame name=\"" ); // generate frame "list" - sLoadersFramesetHTML.appendAscii( TARGET_LIST ); - sLoadersFramesetHTML.appendAscii( "\" src=\"" ); - sLoadersFramesetHTML.appendAscii( ALLLOADERS_HTML ); - sLoadersFramesetHTML.appendAscii( "\" title=\"List\">\n" ); - sLoadersFramesetHTML.appendAscii( "\t\t\t<frame name=\"" ); // generate frame "properties" - sLoadersFramesetHTML.appendAscii( TARGET_PROPERTIES ); - sLoadersFramesetHTML.appendAscii( "\" src=\"" ); - sLoadersFramesetHTML.appendAscii( LOADERPROPERTIES_HTML ); - sLoadersFramesetHTML.appendAscii( "\" title=\"Properties\">\n" ); - sLoadersFramesetHTML.appendAscii( "\t\t</frameset>\n" ); // close frameset cols - sLoadersFramesetHTML.appendAscii( "</html>\n" ); // close html + sLoadersFramesetHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tFrameset: Loader Services\n\t\t</title>\n\t</head>\n" ); // open html + sLoadersFramesetHTML.appendAscii( "\t\t<frameset cols=\"40%,60%\">\n" ); // open frameset for cols + sLoadersFramesetHTML.appendAscii( "\t\t\t<frame name=\"" ); // generate frame "list" + sLoadersFramesetHTML.appendAscii( TARGET_LIST ); + sLoadersFramesetHTML.appendAscii( "\" src=\"" ); + sLoadersFramesetHTML.appendAscii( ALLLOADERS_HTML ); + sLoadersFramesetHTML.appendAscii( "\" title=\"List\">\n" ); + sLoadersFramesetHTML.appendAscii( "\t\t\t<frame name=\"" ); // generate frame "properties" + sLoadersFramesetHTML.appendAscii( TARGET_PROPERTIES ); + sLoadersFramesetHTML.appendAscii( "\" src=\"" ); + sLoadersFramesetHTML.appendAscii( LOADERPROPERTIES_HTML ); + sLoadersFramesetHTML.appendAscii( "\" title=\"Properties\">\n" ); + sLoadersFramesetHTML.appendAscii( "\t\t</frameset>\n" ); // close frameset cols + sLoadersFramesetHTML.appendAscii( "</html>\n" ); // close html impl_writeFile( FRAMESET_LOADERS_HTML, U2B(sLoadersFramesetHTML.makeStringAndClear()) ); @@ -1043,10 +1043,10 @@ void CFGView::impl_generateLoaderListHTML() OUStringBuffer sAllLoadersHTML( 10000 ); OUStringBuffer sLoaderPropHTML( 10000 ); - sAllLoadersHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tAll Loaders\n\t\t</title>\n\t</head>\n\t<body>\n" ); // open html - sAllLoadersHTML.appendAscii( "\t\t<table border=0><tr><td bgcolor=#ff8040><strong>Nr.</strong></td><td bgcolor=#ff8040><strong>Loader</strong></td></tr>\n" ); // open table + sAllLoadersHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tAll Loaders\n\t\t</title>\n\t</head>\n\t<body>\n" ); // open html + sAllLoadersHTML.appendAscii( "\t\t<table border=0><tr><td bgcolor=#ff8040><strong>Nr.</strong></td><td bgcolor=#ff8040><strong>Loader</strong></td></tr>\n" ); // open table - sLoaderPropHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tLoaderProperties\n\t\t</title>\n\t</head>\n\t<body>\n" ); // open html + sLoaderPropHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tLoaderProperties\n\t\t</title>\n\t</head>\n\t<body>\n" ); // open html css::uno::Sequence< ::rtl::OUString > lNames = m_aData.pCache->getAllLoaderNames(); sal_Int32 nCount = lNames.getLength() ; @@ -1055,34 +1055,34 @@ void CFGView::impl_generateLoaderListHTML() Loader aLoader = m_aData.pCache->getLoader( lNames[nItem] ); // write entry in loader list table - sAllLoadersHTML.appendAscii ( "\t\t\t<tr>\n" ); // open row - sAllLoadersHTML.appendAscii ( "\t\t\t\t<td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">" ); // open column "nr" + sAllLoadersHTML.appendAscii ( "\t\t\t<tr>\n" ); // open row + sAllLoadersHTML.appendAscii ( "\t\t\t\t<td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">" ); // open column "nr" sAllLoadersHTML.append ( OUString::valueOf( nItem ) ); // write nr - sAllLoadersHTML.appendAscii ( "</td>\n" ); // close column "nr" - sAllLoadersHTML.appendAscii ( "\t\t\t\t<td>" ); // open column "name" - sAllLoadersHTML.appendAscii ( "<a href=\"" ); // open href="loaderproperties.html#<loadername>" - sAllLoadersHTML.appendAscii ( LOADERPROPERTIES_HTML ); - sAllLoadersHTML.appendAscii ( "#" ); + sAllLoadersHTML.appendAscii ( "</td>\n" ); // close column "nr" + sAllLoadersHTML.appendAscii ( "\t\t\t\t<td>" ); // open column "name" + sAllLoadersHTML.appendAscii ( "<a href=\"" ); // open href="loaderproperties.html#<loadername>" + sAllLoadersHTML.appendAscii ( LOADERPROPERTIES_HTML ); + sAllLoadersHTML.appendAscii ( "#" ); sAllLoadersHTML.append ( aLoader.sName ); - sAllLoadersHTML.appendAscii ( "\" target=\"" ); - sAllLoadersHTML.appendAscii ( TARGET_PROPERTIES ); - sAllLoadersHTML.appendAscii ( "\">" ); + sAllLoadersHTML.appendAscii ( "\" target=\"" ); + sAllLoadersHTML.appendAscii ( TARGET_PROPERTIES ); + sAllLoadersHTML.appendAscii ( "\">" ); sAllLoadersHTML.append ( aLoader.sName ); // write name - sAllLoadersHTML.appendAscii ( "</a>" ); // close href - sAllLoadersHTML.appendAscii ( "</td>\n" ); // close column "name" - sAllLoadersHTML.appendAscii ( "\t\t\t</tr>\n" ); // close row + sAllLoadersHTML.appendAscii ( "</a>" ); // close href + sAllLoadersHTML.appendAscii ( "</td>\n" ); // close column "name" + sAllLoadersHTML.appendAscii ( "\t\t\t</tr>\n" ); // close row // write entry in loader property table - sLoaderPropHTML.appendAscii ( "\t\t<a name=\"" ); // set target="#<loadername>" to follow table + sLoaderPropHTML.appendAscii ( "\t\t<a name=\"" ); // set target="#<loadername>" to follow table sLoaderPropHTML.append ( aLoader.sName ); - sLoaderPropHTML.appendAscii ( "\"></a>" ); - sLoaderPropHTML.appendAscii ( "\t\t<table border=0>\n" ); // open table - sLoaderPropHTML.appendAscii ( "\t\t\t<tr><td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">Nr.</td><td valign=\"top\" align=\"top\"> " ); // generate row "Nr <value>" + sLoaderPropHTML.appendAscii ( "\"></a>" ); + sLoaderPropHTML.appendAscii ( "\t\t<table border=0>\n" ); // open table + sLoaderPropHTML.appendAscii ( "\t\t\t<tr><td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">Nr.</td><td valign=\"top\" align=\"top\"> " ); // generate row "Nr <value>" sLoaderPropHTML.append ( OUString::valueOf( nItem ) ); - sLoaderPropHTML.appendAscii ( "</td></tr>\n" ); - sLoaderPropHTML.appendAscii ( "\t\t\t<tr><td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">Name</td><td valign=\"top\" align=\"top\"> " ); // generate row "Name <value>" + sLoaderPropHTML.appendAscii ( "</td></tr>\n" ); + sLoaderPropHTML.appendAscii ( "\t\t\t<tr><td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">Name</td><td valign=\"top\" align=\"top\"> " ); // generate row "Name <value>" sLoaderPropHTML.append ( aLoader.sName ); - sLoaderPropHTML.appendAscii ( "</td></tr>\n" ); + sLoaderPropHTML.appendAscii ( "</td></tr>\n" ); sLoaderPropHTML.appendAscii ( "\t\t\t<tr><td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">UIName</td><td valign=\"top\" align=\"top\">" ); // generate row "UIName <value>" for( ConstStringHashIterator pUIName=aLoader.lUINames.begin() ; pUIName!=aLoader.lUINames.end() ; @@ -1094,25 +1094,25 @@ void CFGView::impl_generateLoaderListHTML() sLoaderPropHTML.append ( pUIName->second ); sLoaderPropHTML.appendAscii ( "\"<br>" ); } - sLoaderPropHTML.appendAscii ( "</td></tr>\n" ); - sLoaderPropHTML.appendAscii ( "\t\t\t<tr><td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">Types</td><td valign=\"top\" align=\"top\">" ); // generate row "Types <value>" + sLoaderPropHTML.appendAscii ( "</td></tr>\n" ); + sLoaderPropHTML.appendAscii ( "\t\t\t<tr><td bgcolor=#f5f9d5 valign=\"top\" align=\"top\">Types</td><td valign=\"top\" align=\"top\">" ); // generate row "Types <value>" for( ConstStringListIterator pType=aLoader.lTypes.begin() ; pType!=aLoader.lTypes.end() ; ++pType ) { - sLoaderPropHTML.appendAscii ( " \""); - sLoaderPropHTML.append ( *pType ); - sLoaderPropHTML.appendAscii ( "\"<br>" ); + sLoaderPropHTML.appendAscii ( " \""); + sLoaderPropHTML.append ( *pType ); + sLoaderPropHTML.appendAscii ( "\"<br>" ); } - sLoaderPropHTML.appendAscii ( "\t\t</table>\n" ); // close table - sLoaderPropHTML.appendAscii ( "\t\t<p>\n" ); // add space between this and following table + sLoaderPropHTML.appendAscii ( "\t\t</table>\n" ); // close table + sLoaderPropHTML.appendAscii ( "\t\t<p>\n" ); // add space between this and following table } - sAllLoadersHTML.appendAscii( "</table>\n" ); // close table - sAllLoadersHTML.appendAscii( "</body>\n</html>\n" ); // close html + sAllLoadersHTML.appendAscii( "</table>\n" ); // close table + sAllLoadersHTML.appendAscii( "</body>\n</html>\n" ); // close html - sLoaderPropHTML.appendAscii( "</body>\n</html>\n" ); // close html + sLoaderPropHTML.appendAscii( "</body>\n</html>\n" ); // close html impl_writeFile( ALLLOADERS_HTML , U2B(sAllLoadersHTML.makeStringAndClear()) ); impl_writeFile( LOADERPROPERTIES_HTML, U2B(sLoaderPropHTML.makeStringAndClear()) ); @@ -1125,20 +1125,20 @@ void CFGView::impl_generateInvalidFiltersHTML() // generate frameset for invalid filters OUStringBuffer sInvalidFiltersFramesetHTML( 10000 ); - sInvalidFiltersFramesetHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tFrameset: Invalid Filters\n\t\t</title>\n\t</head>\n" ); // open html - sInvalidFiltersFramesetHTML.appendAscii( "\t\t<frameset cols=\"40%,60%\">\n" ); // open frameset for cols - sInvalidFiltersFramesetHTML.appendAscii( "\t\t\t<frame name=\"" ); // generate frame "list" - sInvalidFiltersFramesetHTML.appendAscii( TARGET_LIST ); - sInvalidFiltersFramesetHTML.appendAscii( "\" src=\"" ); - sInvalidFiltersFramesetHTML.appendAscii( INVALIDFILTERS_HTML ); - sInvalidFiltersFramesetHTML.appendAscii( "\" title=\"List\">\n" ); - sInvalidFiltersFramesetHTML.appendAscii( "\t\t\t<frame name=\"" ); // generate frame "properties" - sInvalidFiltersFramesetHTML.appendAscii( TARGET_PROPERTIES ); - sInvalidFiltersFramesetHTML.appendAscii( "\" src=\"" ); - sInvalidFiltersFramesetHTML.appendAscii( FILTERPROPERTIES_HTML ); - sInvalidFiltersFramesetHTML.appendAscii( "\" title=\"Properties\">\n" ); - sInvalidFiltersFramesetHTML.appendAscii( "\t\t</frameset>\n" ); // close frameset cols - sInvalidFiltersFramesetHTML.appendAscii( "</html>\n" ); // close html + sInvalidFiltersFramesetHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tFrameset: Invalid Filters\n\t\t</title>\n\t</head>\n" ); // open html + sInvalidFiltersFramesetHTML.appendAscii( "\t\t<frameset cols=\"40%,60%\">\n" ); // open frameset for cols + sInvalidFiltersFramesetHTML.appendAscii( "\t\t\t<frame name=\"" ); // generate frame "list" + sInvalidFiltersFramesetHTML.appendAscii( TARGET_LIST ); + sInvalidFiltersFramesetHTML.appendAscii( "\" src=\"" ); + sInvalidFiltersFramesetHTML.appendAscii( INVALIDFILTERS_HTML ); + sInvalidFiltersFramesetHTML.appendAscii( "\" title=\"List\">\n" ); + sInvalidFiltersFramesetHTML.appendAscii( "\t\t\t<frame name=\"" ); // generate frame "properties" + sInvalidFiltersFramesetHTML.appendAscii( TARGET_PROPERTIES ); + sInvalidFiltersFramesetHTML.appendAscii( "\" src=\"" ); + sInvalidFiltersFramesetHTML.appendAscii( FILTERPROPERTIES_HTML ); + sInvalidFiltersFramesetHTML.appendAscii( "\" title=\"Properties\">\n" ); + sInvalidFiltersFramesetHTML.appendAscii( "\t\t</frameset>\n" ); // close frameset cols + sInvalidFiltersFramesetHTML.appendAscii( "</html>\n" ); // close html impl_writeFile( FRAMESET_INVALIDFILTERS_HTML, U2B(sInvalidFiltersFramesetHTML.makeStringAndClear()) ); @@ -1146,10 +1146,10 @@ void CFGView::impl_generateInvalidFiltersHTML() // Search invalid registered filters! OUStringBuffer sInvalidFilterHTML( 10000 ); - sInvalidFilterHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tInvalid Filter\n\t\t</title>\n\t</head>\n\t<body>\n" ); // open html - sInvalidFilterHTML.appendAscii( "\t\tPlease check follow filter entries in configuration. They are registered for invalid types!<p>\n" ); // write "Note" - sInvalidFilterHTML.appendAscii( "\t\t<table border=0>\n" ); // open table - sInvalidFilterHTML.appendAscii( "\t<tr><td bgcolor=#ff8040><strong>Nr.</strong></td><td bgcolor=#ff8040><strong>Filter</strong></td><td bgcolor=#ff8040><strong>Wrong Type</strong></td></tr>\n" ); // generate table header + sInvalidFilterHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tInvalid Filter\n\t\t</title>\n\t</head>\n\t<body>\n" ); // open html + sInvalidFilterHTML.appendAscii( "\t\tPlease check follow filter entries in configuration. They are registered for invalid types!<p>\n" ); // write "Note" + sInvalidFilterHTML.appendAscii( "\t\t<table border=0>\n" ); // open table + sInvalidFilterHTML.appendAscii( "\t<tr><td bgcolor=#ff8040><strong>Nr.</strong></td><td bgcolor=#ff8040><strong>Filter</strong></td><td bgcolor=#ff8040><strong>Wrong Type</strong></td></tr>\n" ); // generate table header css::uno::Sequence< ::rtl::OUString > lFilters = m_aData.pCache->getAllFilterNames(); sal_Int32 nFilterCount = lFilters.getLength() ; @@ -1172,23 +1172,23 @@ void CFGView::impl_generateInvalidFiltersHTML() } if( bFound == sal_False ) { - sInvalidFilterHTML.appendAscii ( "\t<tr><td bgcolor=#ff0000 color=#00ffff>" ); // generate row for invalid filter entry + sInvalidFilterHTML.appendAscii ( "\t<tr><td bgcolor=#ff0000 color=#00ffff>" ); // generate row for invalid filter entry sInvalidFilterHTML.append ( OUString::valueOf( nFilter ) ); - sInvalidFilterHTML.appendAscii ( "</td><td><a href=\"" ); - sInvalidFilterHTML.appendAscii ( FILTERPROPERTIES_HTML ); - sInvalidFilterHTML.appendAscii ( "#" ); + sInvalidFilterHTML.appendAscii ( "</td><td><a href=\"" ); + sInvalidFilterHTML.appendAscii ( FILTERPROPERTIES_HTML ); + sInvalidFilterHTML.appendAscii ( "#" ); sInvalidFilterHTML.append ( aFilter.sName ); - sInvalidFilterHTML.appendAscii ( "\" target=\"" ); - sInvalidFilterHTML.appendAscii ( TARGET_PROPERTIES ); - sInvalidFilterHTML.appendAscii ( "\">" ); + sInvalidFilterHTML.appendAscii ( "\" target=\"" ); + sInvalidFilterHTML.appendAscii ( TARGET_PROPERTIES ); + sInvalidFilterHTML.appendAscii ( "\">" ); sInvalidFilterHTML.append ( aFilter.sName ); - sInvalidFilterHTML.appendAscii ( "\"</a></td><td>\"" ); + sInvalidFilterHTML.appendAscii ( "\"</a></td><td>\"" ); sInvalidFilterHTML.append ( aFilter.sType ); - sInvalidFilterHTML.appendAscii ( "\"</td></tr>\n" ); + sInvalidFilterHTML.appendAscii ( "\"</td></tr>\n" ); } } - sInvalidFilterHTML.appendAscii( "</table>\n" ); // close table - sInvalidFilterHTML.appendAscii( "</body>\n</html>\n" ); // close html + sInvalidFilterHTML.appendAscii( "</table>\n" ); // close table + sInvalidFilterHTML.appendAscii( "</body>\n</html>\n" ); // close html impl_writeFile( INVALIDFILTERS_HTML, U2B(sInvalidFilterHTML.makeStringAndClear()) ); } @@ -1199,20 +1199,20 @@ void CFGView::impl_generateInvalidDetectorsHTML() // generate frameset for invalid detectors OUStringBuffer sInvalidDetectorsFramesetHTML( 10000 ); - sInvalidDetectorsFramesetHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tFrameset: Invalid Detectors\n\t\t</title>\n\t</head>\n" ); // open html - sInvalidDetectorsFramesetHTML.appendAscii( "\t\t<frameset cols=\"40%,60%\">\n" ); // open frameset for cols - sInvalidDetectorsFramesetHTML.appendAscii( "\t\t\t<frame name=\"" ); // generate frame "list" - sInvalidDetectorsFramesetHTML.appendAscii( TARGET_LIST ); - sInvalidDetectorsFramesetHTML.appendAscii( "\" src=\"" ); - sInvalidDetectorsFramesetHTML.appendAscii( INVALIDDETECTORS_HTML ); - sInvalidDetectorsFramesetHTML.appendAscii( "\" title=\"List\">\n" ); - sInvalidDetectorsFramesetHTML.appendAscii( "\t\t\t<frame name=\"" ); // generate frame "properties" - sInvalidDetectorsFramesetHTML.appendAscii( TARGET_PROPERTIES ); - sInvalidDetectorsFramesetHTML.appendAscii( "\" src=\"" ); - sInvalidDetectorsFramesetHTML.appendAscii( DETECTORPROPERTIES_HTML ); - sInvalidDetectorsFramesetHTML.appendAscii( "\" title=\"Properties\">\n" ); - sInvalidDetectorsFramesetHTML.appendAscii( "\t\t</frameset>\n" ); // close frameset cols - sInvalidDetectorsFramesetHTML.appendAscii( "</html>\n" ); // close html + sInvalidDetectorsFramesetHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tFrameset: Invalid Detectors\n\t\t</title>\n\t</head>\n" ); // open html + sInvalidDetectorsFramesetHTML.appendAscii( "\t\t<frameset cols=\"40%,60%\">\n" ); // open frameset for cols + sInvalidDetectorsFramesetHTML.appendAscii( "\t\t\t<frame name=\"" ); // generate frame "list" + sInvalidDetectorsFramesetHTML.appendAscii( TARGET_LIST ); + sInvalidDetectorsFramesetHTML.appendAscii( "\" src=\"" ); + sInvalidDetectorsFramesetHTML.appendAscii( INVALIDDETECTORS_HTML ); + sInvalidDetectorsFramesetHTML.appendAscii( "\" title=\"List\">\n" ); + sInvalidDetectorsFramesetHTML.appendAscii( "\t\t\t<frame name=\"" ); // generate frame "properties" + sInvalidDetectorsFramesetHTML.appendAscii( TARGET_PROPERTIES ); + sInvalidDetectorsFramesetHTML.appendAscii( "\" src=\"" ); + sInvalidDetectorsFramesetHTML.appendAscii( DETECTORPROPERTIES_HTML ); + sInvalidDetectorsFramesetHTML.appendAscii( "\" title=\"Properties\">\n" ); + sInvalidDetectorsFramesetHTML.appendAscii( "\t\t</frameset>\n" ); // close frameset cols + sInvalidDetectorsFramesetHTML.appendAscii( "</html>\n" ); // close html impl_writeFile( FRAMESET_INVALIDDETECTORS_HTML, U2B(sInvalidDetectorsFramesetHTML.makeStringAndClear()) ); @@ -1220,10 +1220,10 @@ void CFGView::impl_generateInvalidDetectorsHTML() // Search invalid registered detect services! OUStringBuffer sInvalidDetectorsHTML( 10000 ); - sInvalidDetectorsHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tInvalid Detector Services\n\t\t</title>\n\t</head>\n\t<body>\n" ); // open html - sInvalidDetectorsHTML.appendAscii( "\t\tPlease check follow detect service entries in configuration. They are registered for invalid types!<p>\n" ); // write "Note" - sInvalidDetectorsHTML.appendAscii( "\t\t<table border=0>\n" ); // open table - sInvalidDetectorsHTML.appendAscii( "\t<tr><td bgcolor=#ff8040><strong>Nr.</strong></td><td bgcolor=#ff8040><strong>Detector</strong></td></tr>\n" ); // generate table header + sInvalidDetectorsHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tInvalid Detector Services\n\t\t</title>\n\t</head>\n\t<body>\n" ); // open html + sInvalidDetectorsHTML.appendAscii( "\t\tPlease check follow detect service entries in configuration. They are registered for invalid types!<p>\n" ); // write "Note" + sInvalidDetectorsHTML.appendAscii( "\t\t<table border=0>\n" ); // open table + sInvalidDetectorsHTML.appendAscii( "\t<tr><td bgcolor=#ff8040><strong>Nr.</strong></td><td bgcolor=#ff8040><strong>Detector</strong></td></tr>\n" ); // generate table header css::uno::Sequence< ::rtl::OUString > lDetectors = m_aData.pCache->getAllDetectorNames(); sal_Int32 nDetectorCount = lDetectors.getLength() ; @@ -1249,21 +1249,21 @@ void CFGView::impl_generateInvalidDetectorsHTML() } if( bFound == sal_False ) { - sInvalidDetectorsHTML.appendAscii ( "\t<tr><td bgcolor=#ff0000 color=#00ffff>" ); // generate row for invalid detector entry + sInvalidDetectorsHTML.appendAscii ( "\t<tr><td bgcolor=#ff0000 color=#00ffff>" ); // generate row for invalid detector entry sInvalidDetectorsHTML.append ( OUString::valueOf( nDetector ) ); - sInvalidDetectorsHTML.appendAscii ( "</td><td><a href=\"" ); - sInvalidDetectorsHTML.appendAscii ( DETECTORPROPERTIES_HTML ); - sInvalidDetectorsHTML.appendAscii ( "#" ); + sInvalidDetectorsHTML.appendAscii ( "</td><td><a href=\"" ); + sInvalidDetectorsHTML.appendAscii ( DETECTORPROPERTIES_HTML ); + sInvalidDetectorsHTML.appendAscii ( "#" ); sInvalidDetectorsHTML.append ( aDetector.sName ); - sInvalidDetectorsHTML.appendAscii ( "\" target=\"" ); - sInvalidDetectorsHTML.appendAscii ( TARGET_PROPERTIES ); - sInvalidDetectorsHTML.appendAscii ( "\">" ); + sInvalidDetectorsHTML.appendAscii ( "\" target=\"" ); + sInvalidDetectorsHTML.appendAscii ( TARGET_PROPERTIES ); + sInvalidDetectorsHTML.appendAscii ( "\">" ); sInvalidDetectorsHTML.append ( aDetector.sName ); - sInvalidDetectorsHTML.appendAscii ( "\"</a></td></tr>\n" ); + sInvalidDetectorsHTML.appendAscii ( "\"</a></td></tr>\n" ); } } - sInvalidDetectorsHTML.appendAscii( "</table>\n" ); // close table - sInvalidDetectorsHTML.appendAscii( "</body>\n</html>\n" ); // close html + sInvalidDetectorsHTML.appendAscii( "</table>\n" ); // close table + sInvalidDetectorsHTML.appendAscii( "</body>\n</html>\n" ); // close html impl_writeFile( INVALIDDETECTORS_HTML, U2B(sInvalidDetectorsHTML.makeStringAndClear()) ); } @@ -1274,20 +1274,20 @@ void CFGView::impl_generateInvalidLoadersHTML() // generate frameset for invalid loaders OUStringBuffer sInvalidLoadersFramesetHTML( 10000 ); - sInvalidLoadersFramesetHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tFrameset: Invalid Loaders\n\t\t</title>\n\t</head>\n" ); // open html - sInvalidLoadersFramesetHTML.appendAscii( "\t\t<frameset cols=\"40%,60%\">\n" ); // open frameset for cols - sInvalidLoadersFramesetHTML.appendAscii( "\t\t\t<frame name=\"" ); // generate frame "list" - sInvalidLoadersFramesetHTML.appendAscii( TARGET_LIST ); - sInvalidLoadersFramesetHTML.appendAscii( "\" src=\"" ); - sInvalidLoadersFramesetHTML.appendAscii( INVALIDLOADERS_HTML ); - sInvalidLoadersFramesetHTML.appendAscii( "\" title=\"List\">\n" ); - sInvalidLoadersFramesetHTML.appendAscii( "\t\t\t<frame name=\"" ); // generate frame "properties" - sInvalidLoadersFramesetHTML.appendAscii( TARGET_PROPERTIES ); - sInvalidLoadersFramesetHTML.appendAscii( "\" src=\"" ); - sInvalidLoadersFramesetHTML.appendAscii( LOADERPROPERTIES_HTML ); - sInvalidLoadersFramesetHTML.appendAscii( "\" title=\"Properties\">\n" ); - sInvalidLoadersFramesetHTML.appendAscii( "\t\t</frameset>\n" ); // close frameset cols - sInvalidLoadersFramesetHTML.appendAscii( "</html>\n" ); // close html + sInvalidLoadersFramesetHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tFrameset: Invalid Loaders\n\t\t</title>\n\t</head>\n" ); // open html + sInvalidLoadersFramesetHTML.appendAscii( "\t\t<frameset cols=\"40%,60%\">\n" ); // open frameset for cols + sInvalidLoadersFramesetHTML.appendAscii( "\t\t\t<frame name=\"" ); // generate frame "list" + sInvalidLoadersFramesetHTML.appendAscii( TARGET_LIST ); + sInvalidLoadersFramesetHTML.appendAscii( "\" src=\"" ); + sInvalidLoadersFramesetHTML.appendAscii( INVALIDLOADERS_HTML ); + sInvalidLoadersFramesetHTML.appendAscii( "\" title=\"List\">\n" ); + sInvalidLoadersFramesetHTML.appendAscii( "\t\t\t<frame name=\"" ); // generate frame "properties" + sInvalidLoadersFramesetHTML.appendAscii( TARGET_PROPERTIES ); + sInvalidLoadersFramesetHTML.appendAscii( "\" src=\"" ); + sInvalidLoadersFramesetHTML.appendAscii( LOADERPROPERTIES_HTML ); + sInvalidLoadersFramesetHTML.appendAscii( "\" title=\"Properties\">\n" ); + sInvalidLoadersFramesetHTML.appendAscii( "\t\t</frameset>\n" ); // close frameset cols + sInvalidLoadersFramesetHTML.appendAscii( "</html>\n" ); // close html impl_writeFile( FRAMESET_INVALIDLOADERS_HTML, U2B(sInvalidLoadersFramesetHTML.makeStringAndClear()) ); @@ -1295,10 +1295,10 @@ void CFGView::impl_generateInvalidLoadersHTML() // Search invalid registered detect services! OUStringBuffer sInvalidLoadersHTML( 10000 ); - sInvalidLoadersHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tInvalid Loader Services\n\t\t</title>\n\t</head>\n\t<body>\n" ); // open html - sInvalidLoadersHTML.appendAscii( "\t\tPlease check follow loader service entries in configuration. They are registered for invalid types!<p>\n" ); // write "Note" - sInvalidLoadersHTML.appendAscii( "\t\t<table border=0>\n" ); // open table - sInvalidLoadersHTML.appendAscii( "\t<tr><td bgcolor=#ff8040><strong>Nr.</strong></td><td bgcolor=#ff8040><strong>Loader</strong></td></tr>\n" ); // generate table header + sInvalidLoadersHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tInvalid Loader Services\n\t\t</title>\n\t</head>\n\t<body>\n" ); // open html + sInvalidLoadersHTML.appendAscii( "\t\tPlease check follow loader service entries in configuration. They are registered for invalid types!<p>\n" ); // write "Note" + sInvalidLoadersHTML.appendAscii( "\t\t<table border=0>\n" ); // open table + sInvalidLoadersHTML.appendAscii( "\t<tr><td bgcolor=#ff8040><strong>Nr.</strong></td><td bgcolor=#ff8040><strong>Loader</strong></td></tr>\n" ); // generate table header css::uno::Sequence< ::rtl::OUString > lLoaders = m_aData.pCache->getAllLoaderNames(); sal_Int32 nLoaderCount = lLoaders.getLength() ; @@ -1324,21 +1324,21 @@ void CFGView::impl_generateInvalidLoadersHTML() } if( bFound == sal_False ) { - sInvalidLoadersHTML.appendAscii ( "\t<tr><td bgcolor=#ff0000 color=#00ffff>" ); // generate row for invalid loader entry + sInvalidLoadersHTML.appendAscii ( "\t<tr><td bgcolor=#ff0000 color=#00ffff>" ); // generate row for invalid loader entry sInvalidLoadersHTML.append ( OUString::valueOf( nLoader ) ); - sInvalidLoadersHTML.appendAscii ( "</td><td><a href=\"" ); - sInvalidLoadersHTML.appendAscii ( LOADERPROPERTIES_HTML ); - sInvalidLoadersHTML.appendAscii ( "#" ); + sInvalidLoadersHTML.appendAscii ( "</td><td><a href=\"" ); + sInvalidLoadersHTML.appendAscii ( LOADERPROPERTIES_HTML ); + sInvalidLoadersHTML.appendAscii ( "#" ); sInvalidLoadersHTML.append ( aLoader.sName ); - sInvalidLoadersHTML.appendAscii ( "\" target=\"" ); - sInvalidLoadersHTML.appendAscii ( TARGET_PROPERTIES ); - sInvalidLoadersHTML.appendAscii ( "\">" ); + sInvalidLoadersHTML.appendAscii ( "\" target=\"" ); + sInvalidLoadersHTML.appendAscii ( TARGET_PROPERTIES ); + sInvalidLoadersHTML.appendAscii ( "\">" ); sInvalidLoadersHTML.append ( aLoader.sName ); - sInvalidLoadersHTML.appendAscii ( "\"</a></td></tr>\n" ); + sInvalidLoadersHTML.appendAscii ( "\"</a></td></tr>\n" ); } } - sInvalidLoadersHTML.appendAscii( "</table>\n" ); // close table - sInvalidLoadersHTML.appendAscii( "</body>\n</html>\n" ); // close html + sInvalidLoadersHTML.appendAscii( "</table>\n" ); // close table + sInvalidLoadersHTML.appendAscii( "</body>\n</html>\n" ); // close html impl_writeFile( INVALIDLOADERS_HTML, U2B(sInvalidLoadersHTML.makeStringAndClear()) ); } @@ -1349,10 +1349,10 @@ void CFGView::impl_generateFilterFlagsHTML() // Create view of all filters and his flags. OUStringBuffer sFilterFlagsHTML( 10000 ); - sFilterFlagsHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tFilter and Flags\n\t\t</title>\n\t</head>\n\t<body>\n" ); // open html - sFilterFlagsHTML.appendAscii( "\t\tThis is a list of all filters and his supported flags!<p>\n" ); // write "Note" - sFilterFlagsHTML.appendAscii( "\t\t<table border=0>\n" ); // open table - sFilterFlagsHTML.appendAscii( "\t<tr><td bgcolor=#ff8040><strong>Nr.</strong></td><td bgcolor=#ff8040><strong>Loader</strong></td></tr>\n" ); // generate table header + sFilterFlagsHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tFilter and Flags\n\t\t</title>\n\t</head>\n\t<body>\n" ); // open html + sFilterFlagsHTML.appendAscii( "\t\tThis is a list of all filters and his supported flags!<p>\n" ); // write "Note" + sFilterFlagsHTML.appendAscii( "\t\t<table border=0>\n" ); // open table + sFilterFlagsHTML.appendAscii( "\t<tr><td bgcolor=#ff8040><strong>Nr.</strong></td><td bgcolor=#ff8040><strong>Loader</strong></td></tr>\n" ); // generate table header css::uno::Sequence< ::rtl::OUString > lNames = m_aData.pCache->getAllFilterNames(); sal_Int32 nCount = lNames.getLength(); @@ -1360,17 +1360,17 @@ void CFGView::impl_generateFilterFlagsHTML() { Filter aFilter = m_aData.pCache->getFilter( lNames[nItem] ); - sFilterFlagsHTML.appendAscii( "\t<tr><td bgcolor=#ff0000 color=#00ffff>" ); + sFilterFlagsHTML.appendAscii( "\t<tr><td bgcolor=#ff0000 color=#00ffff>" ); sFilterFlagsHTML.append ( OUString::valueOf( nItem ) ); - sFilterFlagsHTML.appendAscii( "</td><td><a href=\"" ); - sFilterFlagsHTML.appendAscii( LOADERPROPERTIES_HTML ); - sFilterFlagsHTML.appendAscii( "#" ); + sFilterFlagsHTML.appendAscii( "</td><td><a href=\"" ); + sFilterFlagsHTML.appendAscii( LOADERPROPERTIES_HTML ); + sFilterFlagsHTML.appendAscii( "#" ); sFilterFlagsHTML.append ( aFilter.sName ); - sFilterFlagsHTML.appendAscii( "\" target=\"" ); - sFilterFlagsHTML.appendAscii( TARGET_PROPERTIES ); - sFilterFlagsHTML.appendAscii( "\">" ); + sFilterFlagsHTML.appendAscii( "\" target=\"" ); + sFilterFlagsHTML.appendAscii( TARGET_PROPERTIES ); + sFilterFlagsHTML.appendAscii( "\">" ); sFilterFlagsHTML.append ( aFilter.sName ); - sFilterFlagsHTML.appendAscii( "\"</a></td><td>" ); + sFilterFlagsHTML.appendAscii( "\"</a></td><td>" ); if( aFilter.nFlags & FILTERFLAG_IMPORT ) { sFilterFlagsHTML.append( FILTERFLAGNAME_IMPORT ); sFilterFlagsHTML.appendAscii( " | " ); } if( aFilter.nFlags & FILTERFLAG_EXPORT ) { sFilterFlagsHTML.append( FILTERFLAGNAME_EXPORT ); sFilterFlagsHTML.appendAscii( " | " ); } @@ -1393,10 +1393,10 @@ void CFGView::impl_generateFilterFlagsHTML() if( aFilter.nFlags & FILTERFLAG_BROWSERPREFERED ) { sFilterFlagsHTML.append( FILTERFLAGNAME_BROWSERPREFERED ); sFilterFlagsHTML.appendAscii( " | " ); } if( aFilter.nFlags & FILTERFLAG_PREFERED ) { sFilterFlagsHTML.append( FILTERFLAGNAME_PREFERED ); } - sFilterFlagsHTML.appendAscii( "</td></tr>\n" ); + sFilterFlagsHTML.appendAscii( "</td></tr>\n" ); } - sFilterFlagsHTML.appendAscii( "</table>\n" ); // close table - sFilterFlagsHTML.appendAscii( "</body>\n</html>\n" ); // close html + sFilterFlagsHTML.appendAscii( "</table>\n" ); // close table + sFilterFlagsHTML.appendAscii( "</body>\n</html>\n" ); // close html impl_writeFile( FILTERFLAGS_HTML, U2B(sFilterFlagsHTML.makeStringAndClear()) ); } diff --git a/framework/test/typecfg/typecfg.cxx b/framework/test/typecfg/typecfg.cxx index 64b32eb8b816..e7fb7a23bab1 100644 --- a/framework/test/typecfg/typecfg.cxx +++ b/framework/test/typecfg/typecfg.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <classes/servicemanager.hxx> #include <classes/filtercache.hxx> @@ -38,14 +38,14 @@ #include <services.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/beans/PropertyValue.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <comphelper/processfactory.hxx> #include <vos/process.hxx> @@ -59,40 +59,40 @@ #include <stdio.h> //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ -#define RDBFILE DECLARE_ASCII("typecfg.rdb" ) -#define ARGUMENT_GENERATE_CFGVIEW DECLARE_ASCII("-cfgview" ) -#define ARGUMENT_CHECK_FILTERREGISTRATION DECLARE_ASCII("-registerfilter" ) -#define ARGUMENT_GENERATE_TYPEDETECTION_XCD DECLARE_ASCII("-generatexcd" ) +#define RDBFILE DECLARE_ASCII("typecfg.rdb" ) +#define ARGUMENT_GENERATE_CFGVIEW DECLARE_ASCII("-cfgview" ) +#define ARGUMENT_CHECK_FILTERREGISTRATION DECLARE_ASCII("-registerfilter" ) +#define ARGUMENT_GENERATE_TYPEDETECTION_XCD DECLARE_ASCII("-generatexcd" ) //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ -using namespace ::std ; -using namespace ::vos ; -using namespace ::rtl ; -using namespace ::framework ; -using namespace ::comphelper ; -using namespace ::com::sun::star::uno ; -using namespace ::com::sun::star::lang ; -using namespace ::com::sun::star::container ; -using namespace ::com::sun::star::beans ; +using namespace ::std ; +using namespace ::vos ; +using namespace ::rtl ; +using namespace ::framework ; +using namespace ::comphelper ; +using namespace ::com::sun::star::uno ; +using namespace ::com::sun::star::lang ; +using namespace ::com::sun::star::container ; +using namespace ::com::sun::star::beans ; //_________________________________________________________________________________________________________________ -// defines +// defines //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ enum EMode { - E_GENERATE_CFGVIEW , - E_CHECK_FILTERREGISTRATION , + E_GENERATE_CFGVIEW , + E_CHECK_FILTERREGISTRATION , E_GENERATE_TYPEDETECTION_XCD }; @@ -107,23 +107,23 @@ class TypeApplication : public Application //************************************************************************************************************* private: - void impl_parseCommandLine (); - void impl_generateCFGView (); - void impl_checkFilterRegistration (); - void impl_generateTypeDetectionXCD (); + void impl_parseCommandLine (); + void impl_generateCFGView (); + void impl_checkFilterRegistration (); + void impl_generateTypeDetectionXCD (); //************************************************************************************************************* private: - EMode m_eMode ; - Reference< XMultiServiceFactory > m_xServiceManager ; + EMode m_eMode ; + Reference< XMultiServiceFactory > m_xServiceManager ; - FilterCache* m_pCache ; + FilterCache* m_pCache ; -}; // class FilterApplication +}; // class FilterApplication //_________________________________________________________________________________________________________________ -// global variables +// global variables //_________________________________________________________________________________________________________________ TypeApplication gApplication; @@ -142,11 +142,11 @@ void TypeApplication::Main() switch( m_eMode ) { - case E_GENERATE_CFGVIEW : impl_generateCFGView(); + case E_GENERATE_CFGVIEW : impl_generateCFGView(); break; - case E_CHECK_FILTERREGISTRATION : impl_checkFilterRegistration(); + case E_CHECK_FILTERREGISTRATION : impl_checkFilterRegistration(); break; - case E_GENERATE_TYPEDETECTION_XCD : impl_generateTypeDetectionXCD(); + case E_GENERATE_TYPEDETECTION_XCD : impl_generateTypeDetectionXCD(); break; } @@ -157,10 +157,10 @@ void TypeApplication::Main() //***************************************************************************************************************** void TypeApplication::impl_parseCommandLine() { - OStartupInfo aInfo ; - OUString sArgument ; - sal_Int32 nArgument = 0 ; - sal_Int32 nCount = aInfo.getCommandArgCount(); + OStartupInfo aInfo ; + OUString sArgument ; + sal_Int32 nArgument = 0 ; + sal_Int32 nCount = aInfo.getCommandArgCount(); while( nArgument<nCount ) { @@ -195,7 +195,7 @@ void TypeApplication::impl_generateCFGView() // Cache use ref count! FilterCache aCache; aCache.impldbg_generateHTMLView(); - #endif //ENABLE_FILTERCACHEDEBUG + #endif //ENABLE_FILTERCACHEDEBUG } //***************************************************************************************************************** @@ -207,32 +207,32 @@ void TypeApplication::impl_checkFilterRegistration() { Sequence< PropertyValue > lProperties( 8 ); - lProperties[0].Name = DECLARE_ASCII("Type") ; - lProperties[0].Value <<= DECLARE_ASCII("MeinType") ; + lProperties[0].Name = DECLARE_ASCII("Type") ; + lProperties[0].Value <<= DECLARE_ASCII("MeinType") ; - lProperties[1].Name = DECLARE_ASCII("UIName") ; - lProperties[1].Value <<= DECLARE_ASCII("MeinUIName") ; + lProperties[1].Name = DECLARE_ASCII("UIName") ; + lProperties[1].Value <<= DECLARE_ASCII("MeinUIName") ; - lProperties[2].Name = DECLARE_ASCII("UINames") ; - lProperties[2].Value <<= Sequence< PropertyValue >() ; + lProperties[2].Name = DECLARE_ASCII("UINames") ; + lProperties[2].Value <<= Sequence< PropertyValue >() ; - lProperties[3].Name = DECLARE_ASCII("DocumentService") ; - lProperties[3].Value <<= DECLARE_ASCII("MeinDocService") ; + lProperties[3].Name = DECLARE_ASCII("DocumentService") ; + lProperties[3].Value <<= DECLARE_ASCII("MeinDocService") ; - lProperties[4].Name = DECLARE_ASCII("FilterService") ; - lProperties[4].Value <<= DECLARE_ASCII("MeinFilterService") ; + lProperties[4].Name = DECLARE_ASCII("FilterService") ; + lProperties[4].Value <<= DECLARE_ASCII("MeinFilterService") ; - lProperties[5].Name = DECLARE_ASCII("Flags") ; - lProperties[5].Value <<= (sal_Int32)256 ; + lProperties[5].Name = DECLARE_ASCII("Flags") ; + lProperties[5].Value <<= (sal_Int32)256 ; - lProperties[6].Name = DECLARE_ASCII("UserData") ; - lProperties[6].Value <<= Sequence< OUString >() ; + lProperties[6].Name = DECLARE_ASCII("UserData") ; + lProperties[6].Value <<= Sequence< OUString >() ; - lProperties[7].Name = DECLARE_ASCII("FileFormatVersion") ; - lProperties[7].Value <<= (sal_Int32)0 ; + lProperties[7].Name = DECLARE_ASCII("FileFormatVersion") ; + lProperties[7].Value <<= (sal_Int32)0 ; - lProperties[8].Name = DECLARE_ASCII("TemplateName") ; - lProperties[8].Value <<= DECLARE_ASCII("MeinTemplate") ; + lProperties[8].Name = DECLARE_ASCII("TemplateName") ; + lProperties[8].Value <<= DECLARE_ASCII("MeinTemplate") ; } } @@ -241,9 +241,9 @@ void TypeApplication::impl_generateTypeDetectionXCD() { #ifdef ENABLE_GENERATEFILTERCACHE // Cache use ref count! - FilterCache aCache ; - sal_Bool bWriteable = sal_True; - sal_Unicode cSeparator = ',' ; - aCache.impldbg_generateXCD( "org.openoffice.Office.TypeDetection.xcd", bWriteable, cSeparator ); - #endif //ENABLE_GENERATEFILTERCACHE + FilterCache aCache ; + sal_Bool bWriteable = sal_True; + sal_Unicode cSeparator = ',' ; + aCache.impldbg_generateXCD( "org.openoffice.Office.TypeDetection.xcd", bWriteable, cSeparator ); + #endif //ENABLE_GENERATEFILTERCACHE } diff --git a/framework/test/typecfg/xml2xcd.cxx b/framework/test/typecfg/xml2xcd.cxx index 3f86cd04ba07..9bdb35f4fec0 100644 --- a/framework/test/typecfg/xml2xcd.cxx +++ b/framework/test/typecfg/xml2xcd.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #define VCL_NEED_BASETSD @@ -44,12 +44,12 @@ #include <filterflags.h> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/lang/XMultiServiceFactory.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <comphelper/processfactory.hxx> #include <unotools/processfactory.hxx> @@ -63,17 +63,17 @@ #include <vcl/msgbox.hxx> //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ using namespace ::framework ; //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// defines +// defines //_________________________________________________________________________________________________________________ /* @@ -115,7 +115,7 @@ using namespace ::framework ; #define SCPFILE_ADDITIONAL "scp_additional.txt" //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ /*-***************************************************************************************************************/ @@ -221,7 +221,7 @@ class XCDGenerator : public Application }; // class XCDGenerator //_________________________________________________________________________________________________________________ -// global variables +// global variables //_________________________________________________________________________________________________________________ XCDGenerator gGenerator; @@ -1422,13 +1422,13 @@ void XCDGenerator::impl_generateIntProperty( ::rtl::OUStringBuffer& sXCD const ::rtl::OUString& sName , sal_Int32 nValue ) { - sXCD.appendAscii( "\t\t\t<default:value cfg:name=\"" ); - sXCD.append ( sName ); - sXCD.appendAscii( "\" cfg:type=\"int\" cfg:writable=\"" ); + sXCD.appendAscii( "\t\t\t<default:value cfg:name=\"" ); + sXCD.append ( sName ); + sXCD.appendAscii( "\" cfg:type=\"int\" cfg:writable=\"" ); sXCD.appendAscii( m_aData.bWriteable==sal_True ? "true\">\n" : "false\">\n" ); - sXCD.appendAscii( "\t\t\t\t<default:data>" ); - sXCD.append ( (sal_Int32)(nValue) ); - sXCD.appendAscii( "</default:data>\n\t\t\t</default:value>\n" ); + sXCD.appendAscii( "\t\t\t\t<default:data>" ); + sXCD.append ( (sal_Int32)(nValue) ); + sXCD.appendAscii( "</default:data>\n\t\t\t</default:value>\n" ); } //***************************************************************************************************************** @@ -1436,13 +1436,13 @@ void XCDGenerator::impl_generateBoolProperty( ::rtl::OUStringBuffer& s const ::rtl::OUString& sName , sal_Bool bValue ) { - sXCD.appendAscii( "\t\t\t<default:value cfg:name=\"" ); - sXCD.append ( sName ); + sXCD.appendAscii( "\t\t\t<default:value cfg:name=\"" ); + sXCD.append ( sName ); sXCD.appendAscii( "\" cfg:type=\"boolean\" cfg:writable=\"" ); sXCD.appendAscii( m_aData.bWriteable==sal_True ? "true\">\n" : "false\">\n" ); - sXCD.appendAscii( "\t\t\t\t<default:data>" ); - sXCD.appendAscii( bValue==sal_True ? "true" : "false" ); - sXCD.appendAscii( "</default:data>\n\t\t\t</default:value>\n" ); + sXCD.appendAscii( "\t\t\t\t<default:data>" ); + sXCD.appendAscii( bValue==sal_True ? "true" : "false" ); + sXCD.appendAscii( "</default:data>\n\t\t\t</default:value>\n" ); } //***************************************************************************************************************** @@ -1450,9 +1450,9 @@ void XCDGenerator::impl_generateStringProperty( ::rtl::OUStringBuffer& s const ::rtl::OUString& sName , const ::rtl::OUString& sValue ) { - sXCD.appendAscii( "\t\t\t<default:value cfg:name=\"" ); - sXCD.append ( sName ); - sXCD.appendAscii( "\" cfg:type=\"string\" cfg:writable=\"" ); + sXCD.appendAscii( "\t\t\t<default:value cfg:name=\"" ); + sXCD.append ( sName ); + sXCD.appendAscii( "\" cfg:type=\"string\" cfg:writable=\"" ); sXCD.appendAscii( m_aData.bWriteable==sal_True ? "true\"" : "false\"" ); if( sValue.getLength() > 0 ) { @@ -1491,7 +1491,7 @@ void XCDGenerator::impl_generateStringListProperty( ::rtl::OUStringBuffe if( nCount > 0 ) { - sXCD.appendAscii( ">\n\t\t\t\t<default:data>" ); + sXCD.appendAscii( ">\n\t\t\t\t<default:data>" ); for( ConstStringListIterator pEntry=lValue.begin(); pEntry!=lValue.end(); ++pEntry ) { sXCD.append( *pEntry ); @@ -1516,9 +1516,9 @@ void XCDGenerator::impl_generateUINamesProperty( ::rtl::OUStringBuffer& const ::rtl::OUString& sName , const StringHash& lUINames ) { - sXCD.appendAscii( "\t\t\t<default:value cfg:name=\"" ); - sXCD.append ( sName ); - sXCD.appendAscii( "\" cfg:type=\"string\" cfg:localized=\"true\" cfg:writable=\"" ); + sXCD.appendAscii( "\t\t\t<default:value cfg:name=\"" ); + sXCD.append ( sName ); + sXCD.appendAscii( "\" cfg:type=\"string\" cfg:localized=\"true\" cfg:writable=\"" ); sXCD.appendAscii( m_aData.bWriteable==sal_True ? "true\"" : "false\"" ); if( lUINames.size() > 0 ) @@ -1574,8 +1574,8 @@ void XCDGenerator::impl_generateUINamesProperty( ::rtl::OUStringBuffer& { ::rtl::OUStringBuffer sSource ( sValue ); ::rtl::OUStringBuffer sDestination( 10000 ); - sal_Int32 nCount = sValue.getLength(); - sal_Int32 i = 0; + sal_Int32 nCount = sValue.getLength(); + sal_Int32 i = 0; for( i=0; i<nCount; ++i ) { diff --git a/framework/uiconfig/startmodule/menubar/menubar.xml b/framework/uiconfig/startmodule/menubar/menubar.xml index b5e52e7afac2..e9a0f333f4ce 100644 --- a/framework/uiconfig/startmodule/menubar/menubar.xml +++ b/framework/uiconfig/startmodule/menubar/menubar.xml @@ -75,7 +75,6 @@ <menu:menuitem menu:id=".uno:ExtendedHelp"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:HelpSupport"/> - <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:About"/> </menu:menupopup> diff --git a/framework/util/hidother.src b/framework/util/hidother.src index f12337cfe72c..f4c2b493c865 100644 --- a/framework/util/hidother.src +++ b/framework/util/hidother.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,6 +27,6 @@ #include "../inc/helpid.hrc" // HID_XXX -hidspecial HID_BACKINGWINDOW { HelpID = HID_BACKINGWINDOW; }; +hidspecial HID_BACKINGWINDOW { HelpID = HID_BACKINGWINDOW; }; hidspecial HID_LICENSEDIALOG { HelpID = HID_LICENSEDIALOG; }; hidspecial HID_STATUSBAR { HelpID = HID_STATUSBAR; }; diff --git a/framework/util/lgd.xml b/framework/util/lgd.xml index d62a77c6c09e..278d8f97b3bc 100644 --- a/framework/util/lgd.xml +++ b/framework/util/lgd.xml @@ -17,18 +17,18 @@ <supported-service> com.sun.star.comp.framework.LoginDialog </supported-service> </component-description> - <project-build-dependency> cppu </project-build-dependency> - <project-build-dependency> cppuhelper </project-build-dependency> - <project-build-dependency> vos </project-build-dependency> - <project-build-dependency> sal </project-build-dependency> - <project-build-dependency> sv </project-build-dependency> - <project-build-dependency> tools </project-build-dependency> + <project-build-dependency> cppu </project-build-dependency> + <project-build-dependency> cppuhelper </project-build-dependency> + <project-build-dependency> vos </project-build-dependency> + <project-build-dependency> sal </project-build-dependency> + <project-build-dependency> sv </project-build-dependency> + <project-build-dependency> tools </project-build-dependency> - <runtime-module-dependency> cppu2 </runtime-module-dependency> - <runtime-module-dependency> cppuhelper </runtime-module-dependency> - <runtime-module-dependency> vos2$(COM) </runtime-module-dependency> - <runtime-module-dependency> sal2 </runtime-module-dependency> - <runtime-module-dependency> tl </runtime-module-dependency> - <runtime-module-dependency> sv </runtime-module-dependency> + <runtime-module-dependency> cppu2 </runtime-module-dependency> + <runtime-module-dependency> cppuhelper </runtime-module-dependency> + <runtime-module-dependency> vos2$(COM) </runtime-module-dependency> + <runtime-module-dependency> sal2 </runtime-module-dependency> + <runtime-module-dependency> tl </runtime-module-dependency> + <runtime-module-dependency> sv </runtime-module-dependency> </module-description> |