diff options
Diffstat (limited to 'unotools')
174 files changed, 4020 insertions, 3920 deletions
diff --git a/unotools/inc/pch/precompiled_unotools.cxx b/unotools/inc/pch/precompiled_unotools.cxx index 56609a47e969..d3121e5d7654 100644 --- a/unotools/inc/pch/precompiled_unotools.cxx +++ b/unotools/inc/pch/precompiled_unotools.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/unotools/inc/pch/precompiled_unotools.hxx b/unotools/inc/pch/precompiled_unotools.hxx index dec72c148da6..cd6956c38af4 100644 --- a/unotools/inc/pch/precompiled_unotools.hxx +++ b/unotools/inc/pch/precompiled_unotools.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/unotools/inc/unotools/accelcfg.hxx b/unotools/inc/unotools/accelcfg.hxx index a1884d34fbc3..30a5fec00a5c 100644 --- a/unotools/inc/unotools/accelcfg.hxx +++ b/unotools/inc/unotools/accelcfg.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 @@ -60,7 +60,7 @@ public: // get special accelerators static SvtAcceleratorConfiguration* CreateFromStream( SvStream& rStream ); - static String GetStreamName(); + static String GetStreamName(); static SvStream* GetDefaultStream( StreamMode ); virtual ~SvtAcceleratorConfiguration(); diff --git a/unotools/inc/unotools/accessiblerelationsethelper.hxx b/unotools/inc/unotools/accessiblerelationsethelper.hxx index ba853381329f..1726b16eb2a6 100644 --- a/unotools/inc/unotools/accessiblerelationsethelper.hxx +++ b/unotools/inc/unotools/accessiblerelationsethelper.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,12 +53,12 @@ namespace utl { //......................................................................... -/** @descr +/** @descr This base class provides an implementation of the <code>AccessibleRelationSet</code> service. */ class UNOTOOLS_DLLPUBLIC AccessibleRelationSetHelper - : public cppu::WeakImplHelper1< + : public cppu::WeakImplHelper1< ::com::sun::star::accessibility::XAccessibleRelationSet > { @@ -67,7 +67,7 @@ public: AccessibleRelationSetHelper (); AccessibleRelationSetHelper (const AccessibleRelationSetHelper& rHelper); protected: - virtual ~AccessibleRelationSetHelper (void); + virtual ~AccessibleRelationSetHelper (void); public: //===== XAccessibleRelationSet ========================================== @@ -134,25 +134,25 @@ public: //===== XTypeProvider =================================================== - /** Returns a sequence of all supported interfaces. + /** Returns a sequence of all supported interfaces. */ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL getTypes (void) throw (::com::sun::star::uno::RuntimeException); - /** Returns a implementation id. + /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId (void) throw (::com::sun::star::uno::RuntimeException); protected: - /// Mutex guarding this object. + /// Mutex guarding this object. ::vos::OMutex maMutex; private: - /// The implementation of this helper interface. - AccessibleRelationSetHelperImpl* mpHelperImpl; + /// The implementation of this helper interface. + AccessibleRelationSetHelperImpl* mpHelperImpl; }; //......................................................................... diff --git a/unotools/inc/unotools/accessiblestatesethelper.hxx b/unotools/inc/unotools/accessiblestatesethelper.hxx index 3847beeee146..40e4b4a2dda3 100644 --- a/unotools/inc/unotools/accessiblestatesethelper.hxx +++ b/unotools/inc/unotools/accessiblestatesethelper.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 @@ namespace utl { //......................................................................... -/** @descr +/** @descr This base class provides an implementation of the <code>AccessibleStateSet</code> service. */ class UNOTOOLS_DLLPUBLIC AccessibleStateSetHelper - : public cppu::WeakImplHelper1< + : public cppu::WeakImplHelper1< ::com::sun::star::accessibility::XAccessibleStateSet > { @@ -78,7 +78,7 @@ public: AccessibleStateSetHelper ( const AccessibleStateSetHelper& rHelper ); protected: - virtual ~AccessibleStateSetHelper (void); + virtual ~AccessibleStateSetHelper (void); public: //===== XAccessibleStateSet ============================================== @@ -132,12 +132,12 @@ public: /** Adds a state to the set. */ - void AddState(sal_Int16 aState) + void AddState(sal_Int16 aState) throw (::com::sun::star::uno::RuntimeException); /** Removes a state from the set if the set contains the state, otherwise nothing is done. */ - void RemoveState(sal_Int16 aState) + void RemoveState(sal_Int16 aState) throw (::com::sun::star::uno::RuntimeException); /** Compares the set with the set given by rComparativeValue and puts the results @@ -156,25 +156,25 @@ public: //===== XTypeProvider =================================================== - /** Returns a sequence of all supported interfaces. + /** Returns a sequence of all supported interfaces. */ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL getTypes (void) throw (::com::sun::star::uno::RuntimeException); - /** Returns a implementation id. + /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId (void) throw (::com::sun::star::uno::RuntimeException); protected: - /// Mutex guarding this object. + /// Mutex guarding this object. ::vos::OMutex maMutex; private: - /// The implementation of this helper interface. - AccessibleStateSetHelperImpl* mpHelperImpl; + /// The implementation of this helper interface. + AccessibleStateSetHelperImpl* mpHelperImpl; }; //......................................................................... diff --git a/unotools/inc/unotools/atom.hxx b/unotools/inc/unotools/atom.hxx index 8576b31f6970..0671931f9128 100644 --- a/unotools/inc/unotools/atom.hxx +++ b/unotools/inc/unotools/atom.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/unotools/inc/unotools/bootstrap.hxx b/unotools/inc/unotools/bootstrap.hxx index bbb476fdaf9e..8ff10e6bcc22 100644 --- a/unotools/inc/unotools/bootstrap.hxx +++ b/unotools/inc/unotools/bootstrap.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/unotools/inc/unotools/cacheoptions.hxx b/unotools/inc/unotools/cacheoptions.hxx index 432a91e67070..46aceacfa771 100644 --- a/unotools/inc/unotools/cacheoptions.hxx +++ b/unotools/inc/unotools/cacheoptions.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 INCLUDED_unotools_CACHEOPTIONS_HXX //_________________________________________________________________________________________________________________ -// includes +// includes //_________________________________________________________________________________________________________________ #include "unotools/unotoolsdllapi.h" @@ -38,12 +38,12 @@ #include <rtl/ustring.hxx> //_________________________________________________________________________________________________________________ -// 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! *//*-*************************************************************************************************************/ @@ -51,108 +51,108 @@ class SvtCacheOptions_Impl; //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** - @short collect informations about startup features + @short collect informations about startup features @descr - - @implements - - @base - + @implements - + @base - - @devstatus ready to use + @devstatus ready to use *//*-*************************************************************************************************************/ class UNOTOOLS_DLLPUBLIC SvtCacheOptions { //------------------------------------------------------------------------------------------------------------- - // 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 - *//*-*****************************************************************************************************/ SvtCacheOptions(); ~SvtCacheOptions(); //--------------------------------------------------------------------------------------------------------- - // interface + // interface //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short interface methods to get and set value of config key "org.openoffice.Office.Common/_3D-Engine/..." + @short interface methods to get and set value of config key "org.openoffice.Office.Common/_3D-Engine/..." @descr These options describe internal states to enable/disable features of installed office. GetWriterOLE_Objects() - SetWriterOLE_Objects() => set the number of Writer OLE objects to be cached + SetWriterOLE_Objects() => set the number of Writer OLE objects to be cached GetDrawingEngineOLE_Objects() - SetDrawingEngineOLE_Objects() => set the number of DrawingEngine OLE objects to be cached + SetDrawingEngineOLE_Objects() => set the number of DrawingEngine OLE objects to be cached GetGraphicManagerTotalCacheSize() - SetGraphicManagerTotalCacheSize() => set the maximum cache size used by GraphicManager to cache graphic objects + SetGraphicManagerTotalCacheSize() => set the maximum cache size used by GraphicManager to cache graphic objects GetGraphicManagerObjectCacheSize() - SetGraphicManagerObjectCacheSize() => set the maximum cache size for one GraphicObject to be cached by GraphicManager + SetGraphicManagerObjectCacheSize() => set the maximum cache size for one GraphicObject to be cached by GraphicManager - @seealso configuration package "org.openoffice.Office.Common/_3D-Engine" + @seealso configuration package "org.openoffice.Office.Common/_3D-Engine" *//*-*****************************************************************************************************/ - sal_Int32 GetWriterOLE_Objects() const; - sal_Int32 GetDrawingEngineOLE_Objects() const; - sal_Int32 GetGraphicManagerTotalCacheSize() const; - sal_Int32 GetGraphicManagerObjectCacheSize() const; - sal_Int32 GetGraphicManagerObjectReleaseTime() const; + sal_Int32 GetWriterOLE_Objects() const; + sal_Int32 GetDrawingEngineOLE_Objects() const; + sal_Int32 GetGraphicManagerTotalCacheSize() const; + sal_Int32 GetGraphicManagerObjectCacheSize() const; + sal_Int32 GetGraphicManagerObjectReleaseTime() const; - void SetWriterOLE_Objects( sal_Int32 nObjects ); - void SetDrawingEngineOLE_Objects( sal_Int32 nObjects ); - void SetGraphicManagerTotalCacheSize( sal_Int32 nTotalCacheSize ); - void SetGraphicManagerObjectCacheSize( sal_Int32 nObjectCacheSize ); + void SetWriterOLE_Objects( sal_Int32 nObjects ); + void SetDrawingEngineOLE_Objects( sal_Int32 nObjects ); + void SetGraphicManagerTotalCacheSize( sal_Int32 nTotalCacheSize ); + void SetGraphicManagerObjectCacheSize( sal_Int32 nObjectCacheSize ); void SetGraphicManagerObjectReleaseTime( sal_Int32 nReleaseTimeSeconds ); //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: /*-****************************************************************************************************//** - @short return a reference to a static mutex - @descr These class use his own static mutex to be threadsafe. + @short return a reference to a static mutex + @descr These class use his own static mutex to be threadsafe. 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 - *//*-*****************************************************************************************************/ UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex(); //------------------------------------------------------------------------------------------------------------- - // private member + // private member //------------------------------------------------------------------------------------------------------------- private: @@ -165,8 +165,8 @@ class UNOTOOLS_DLLPUBLIC SvtCacheOptions Do it in your source only. */ - static SvtCacheOptions_Impl* m_pDataContainer ; /// impl. data container as dynamic pointer for smaller memory requirements! - static sal_Int32 m_nRefCount ; /// internal ref count mechanism + static SvtCacheOptions_Impl* m_pDataContainer ; /// impl. data container as dynamic pointer for smaller memory requirements! + static sal_Int32 m_nRefCount ; /// internal ref count mechanism }; diff --git a/unotools/inc/unotools/calendarwrapper.hxx b/unotools/inc/unotools/calendarwrapper.hxx index f5a8a06b1f6c..8ac8a240b667 100644 --- a/unotools/inc/unotools/calendarwrapper.hxx +++ b/unotools/inc/unotools/calendarwrapper.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,9 +52,9 @@ namespace com { namespace sun { namespace star { class UNOTOOLS_DLLPUBLIC CalendarWrapper { ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xSMgr; - ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XExtendedCalendar > xC; + ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XExtendedCalendar > xC; - DateTime aEpochStart; // 1Jan1970 + DateTime aEpochStart; // 1Jan1970 public: CalendarWrapper( @@ -114,11 +114,11 @@ public: { return aEpochStart; } /// set a local (!) Gregorian DateTime - inline void setGregorianDateTime( const DateTime& rDateTime ) + inline void setGregorianDateTime( const DateTime& rDateTime ) { setLocalDateTime( rDateTime - aEpochStart ); } /// get the DateTime as a local (!) Gregorian DateTime - inline DateTime getGregorianDateTime() const + inline DateTime getGregorianDateTime() const { return aEpochStart + getLocalDateTime(); } private: diff --git a/unotools/inc/unotools/charclass.hxx b/unotools/inc/unotools/charclass.hxx index 4469ed8ffc3d..8d6f7f211d2d 100644 --- a/unotools/inc/unotools/charclass.hxx +++ b/unotools/inc/unotools/charclass.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 @@ #ifndef _UNOTOOLS_CHARCLASS_HXX #define _UNOTOOLS_CHARCLASS_HXX -#include <ctype.h> // isdigit(), isalpha() +#include <ctype.h> // isdigit(), isalpha() #include <tools/string.hxx> #include <tools/solar.h> #include <com/sun/star/i18n/KCharacterType.hpp> @@ -75,17 +75,17 @@ const sal_Int32 nCharClassNumericTypeMask = class UNOTOOLS_DLLPUBLIC CharClass { - ::com::sun::star::lang::Locale aLocale; - ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCharacterClassification > xCC; + ::com::sun::star::lang::Locale aLocale; + ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCharacterClassification > xCC; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xSMgr; mutable ::osl::Mutex aMutex; // not implemented, prevent usage CharClass( const CharClass& ); - CharClass& operator=( const CharClass& ); + CharClass& operator=( const CharClass& ); // instantiate component somehow - void getComponentInstance(); + void getComponentInstance(); public: /// Preferred ctor with service manager specified @@ -103,49 +103,49 @@ public: ~CharClass(); /// set a new Locale - void setLocale( const ::com::sun::star::lang::Locale& rLocale ); + void setLocale( const ::com::sun::star::lang::Locale& rLocale ); /// get current Locale const ::com::sun::star::lang::Locale& getLocale() const; /// isdigit() on ascii values - static inline sal_Bool isAsciiDigit( sal_Unicode c ) + static inline sal_Bool isAsciiDigit( sal_Unicode c ) { return c < 128 ? sal_Bool(isdigit( (unsigned char) c ) != 0) : sal_False; } /// isalpha() on ascii values - static inline sal_Bool isAsciiAlpha( sal_Unicode c ) + static inline sal_Bool isAsciiAlpha( sal_Unicode c ) { return c < 128 ? sal_Bool(isalpha( (unsigned char) c ) != 0) : sal_False; } /// isalnum() on ascii values - static inline sal_Bool isAsciiAlphaNumeric( sal_Unicode c ) + static inline sal_Bool isAsciiAlphaNumeric( sal_Unicode c ) { return c < 128 ? sal_Bool(isalnum( (unsigned char) c ) != 0) : sal_False; } /// isdigit() on ascii values of entire string - static sal_Bool isAsciiNumeric( const String& rStr ); + static sal_Bool isAsciiNumeric( const String& rStr ); /// isalpha() on ascii values of entire string - static sal_Bool isAsciiAlpha( const String& rStr ); + static sal_Bool isAsciiAlpha( const String& rStr ); /// isalnum() on ascii values of entire string - static sal_Bool isAsciiAlphaNumeric( const String& rStr ); + static sal_Bool isAsciiAlphaNumeric( const String& rStr ); /// whether type is pure alpha or not, e.g. return of getStringType - static inline sal_Bool isAlphaType( sal_Int32 nType ) + static inline sal_Bool isAlphaType( sal_Int32 nType ) { return ((nType & nCharClassAlphaType) != 0) && ((nType & ~(nCharClassAlphaTypeMask)) == 0); } /// whether type is pure numeric or not, e.g. return of getStringType - static inline sal_Bool isNumericType( sal_Int32 nType ) + static inline sal_Bool isNumericType( sal_Int32 nType ) { return ((nType & nCharClassNumericType) != 0) && ((nType & ~(nCharClassNumericTypeMask)) == 0); } /// whether type is pure alphanumeric or not, e.g. return of getStringType - static inline sal_Bool isAlphaNumericType( sal_Int32 nType ) + static inline sal_Bool isAlphaNumericType( sal_Int32 nType ) { return ((nType & (nCharClassAlphaType | nCharClassNumericType)) != 0) && @@ -154,14 +154,14 @@ public: } /// whether type is pure letter or not, e.g. return of getStringType - static inline sal_Bool isLetterType( sal_Int32 nType ) + static inline sal_Bool isLetterType( sal_Int32 nType ) { return ((nType & nCharClassLetterType) != 0) && ((nType & ~(nCharClassLetterTypeMask)) == 0); } /// whether type is pure letternumeric or not, e.g. return of getStringType - static inline sal_Bool isLetterNumericType( sal_Int32 nType ) + static inline sal_Bool isLetterNumericType( sal_Int32 nType ) { return ((nType & (nCharClassLetterType | nCharClassNumericType)) != 0) && @@ -172,20 +172,20 @@ public: // Wrapper implementations of class CharacterClassification - String toUpper( const String& rStr, xub_StrLen nPos, xub_StrLen nCount ) const; - String toLower( const String& rStr, xub_StrLen nPos, xub_StrLen nCount ) const; - String toTitle( const String& rStr, xub_StrLen nPos, xub_StrLen nCount ) const; + String toUpper( const String& rStr, xub_StrLen nPos, xub_StrLen nCount ) const; + String toLower( const String& rStr, xub_StrLen nPos, xub_StrLen nCount ) const; + String toTitle( const String& rStr, xub_StrLen nPos, xub_StrLen nCount ) const; - ::rtl::OUString toUpper_rtl( const ::rtl::OUString& rStr, sal_Int32 nPos, sal_Int32 nCount ) const; - ::rtl::OUString toLower_rtl( const ::rtl::OUString& rStr, sal_Int32 nPos, sal_Int32 nCount ) const; + ::rtl::OUString toUpper_rtl( const ::rtl::OUString& rStr, sal_Int32 nPos, sal_Int32 nCount ) const; + ::rtl::OUString toLower_rtl( const ::rtl::OUString& rStr, sal_Int32 nPos, sal_Int32 nCount ) const; // use the postfix because compilers could get confused by the both similar versions // (me thinks they shouldn't, but in fact MSCV 6 does) - sal_Int16 getType( const String& rStr, xub_StrLen nPos ) const; - sal_Int16 getCharacterDirection( const String& rStr, xub_StrLen nPos ) const; - sal_Int16 getScript( const String& rStr, xub_StrLen nPos ) const; - sal_Int32 getCharacterType( const String& rStr, xub_StrLen nPos ) const; - sal_Int32 getStringType( const String& rStr, xub_StrLen nPos, xub_StrLen nCount ) const; + sal_Int16 getType( const String& rStr, xub_StrLen nPos ) const; + sal_Int16 getCharacterDirection( const String& rStr, xub_StrLen nPos ) const; + sal_Int16 getScript( const String& rStr, xub_StrLen nPos ) const; + sal_Int32 getCharacterType( const String& rStr, xub_StrLen nPos ) const; + sal_Int32 getStringType( const String& rStr, xub_StrLen nPos, xub_StrLen nCount ) const; ::com::sun::star::i18n::ParseResult parseAnyToken( const String& rStr, @@ -207,28 +207,28 @@ public: // Functionality of class International methods - sal_Bool isAlpha( const String& rStr, xub_StrLen nPos ) const; - sal_Bool isLetter( const String& rStr, xub_StrLen nPos ) const; - sal_Bool isDigit( const String& rStr, xub_StrLen nPos ) const; - sal_Bool isAlphaNumeric( const String& rStr, xub_StrLen nPos ) const; - sal_Bool isLetterNumeric( const String& rStr, xub_StrLen nPos ) const; - sal_Bool isAlpha( const String& rStr ) const; - sal_Bool isLetter( const String& rStr ) const; - sal_Bool isNumeric( const String& rStr ) const; - sal_Bool isAlphaNumeric( const String& rStr ) const; - sal_Bool isLetterNumeric( const String& rStr ) const; - - void toUpper( String& rStr ) const + sal_Bool isAlpha( const String& rStr, xub_StrLen nPos ) const; + sal_Bool isLetter( const String& rStr, xub_StrLen nPos ) const; + sal_Bool isDigit( const String& rStr, xub_StrLen nPos ) const; + sal_Bool isAlphaNumeric( const String& rStr, xub_StrLen nPos ) const; + sal_Bool isLetterNumeric( const String& rStr, xub_StrLen nPos ) const; + sal_Bool isAlpha( const String& rStr ) const; + sal_Bool isLetter( const String& rStr ) const; + sal_Bool isNumeric( const String& rStr ) const; + sal_Bool isAlphaNumeric( const String& rStr ) const; + sal_Bool isLetterNumeric( const String& rStr ) const; + + void toUpper( String& rStr ) const { rStr = toUpper( rStr, 0, rStr.Len() ); } - void toLower( String& rStr ) const + void toLower( String& rStr ) const { rStr = toLower( rStr, 0, rStr.Len() ); } - inline String upper( const String& rStr ) const + inline String upper( const String& rStr ) const { return toUpper( rStr, 0, rStr.Len() ); } - inline String lower( const String& rStr ) const + inline String lower( const String& rStr ) const { return toLower( rStr, 0, rStr.Len() ); } - const ::rtl::OUString& toUpper_rtl( ::rtl::OUString& _rStr ) const { return _rStr = toUpper_rtl( _rStr, 0, _rStr.getLength() ); } - const ::rtl::OUString& toLower_rtl( ::rtl::OUString& _rStr ) const { return _rStr = toLower_rtl( _rStr, 0, _rStr.getLength() ); } + const ::rtl::OUString& toUpper_rtl( ::rtl::OUString& _rStr ) const { return _rStr = toUpper_rtl( _rStr, 0, _rStr.getLength() ); } + const ::rtl::OUString& toLower_rtl( ::rtl::OUString& _rStr ) const { return _rStr = toLower_rtl( _rStr, 0, _rStr.getLength() ); } }; diff --git a/unotools/inc/unotools/cmdoptions.hxx b/unotools/inc/unotools/cmdoptions.hxx index c2454d9582ee..160646067953 100644 --- a/unotools/inc/unotools/cmdoptions.hxx +++ b/unotools/inc/unotools/cmdoptions.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 INCLUDED_unotools_CMDOPTIONS_HXX //_________________________________________________________________________________________________________________ -// includes +// includes //_________________________________________________________________________________________________________________ #include "unotools/unotoolsdllapi.h" @@ -40,22 +40,22 @@ #include <unotools/options.hxx> //_________________________________________________________________________________________________________________ -// types, enums, ... +// types, enums, ... //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** - @descr The method GetList() returns a list of property values. + @descr The method GetList() returns a list of property values. Use follow defines to seperate values by names. *//*-*************************************************************************************************************/ #define CMDOPTIONS_PROPERTYNAME_URL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CommandURL" )) //_________________________________________________________________________________________________________________ -// 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! *//*-*************************************************************************************************************/ @@ -63,17 +63,17 @@ class SvtCommandOptions_Impl; //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** @short collect informations about dynamic menus @descr Make it possible to configure dynamic menu structures of menus like "new" or "wizard". - @implements - - @base - + @implements - + @base - - @devstatus ready to use + @devstatus ready to use *//*-*************************************************************************************************************/ class UNOTOOLS_DLLPUBLIC SvtCommandOptions: public utl::detail::Options @@ -81,7 +81,7 @@ class UNOTOOLS_DLLPUBLIC SvtCommandOptions: public utl::detail::Options friend class SvtCommandOptions_Impl; //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: @@ -93,43 +93,43 @@ class UNOTOOLS_DLLPUBLIC SvtCommandOptions: public utl::detail::Options }; //--------------------------------------------------------------------------------------------------------- - // 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 - *//*-*****************************************************************************************************/ SvtCommandOptions(); virtual ~SvtCommandOptions(); //--------------------------------------------------------------------------------------------------------- - // interface + // interface //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short clear complete sepcified list + @short clear complete sepcified list @descr Call this methods to clear the whole list. To fill it again use AppendItem(). - @seealso - + @seealso - @param "eMenu" select right menu to clear. - @return - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ void Clear( CmdOption eOption ); @@ -139,7 +139,7 @@ class UNOTOOLS_DLLPUBLIC SvtCommandOptions: public utl::detail::Options @descr Call it to get all entries of an dynamic menu. We return a list of all nodes with his names and properties. - @seealso - + @seealso - @param "eOption" select the list to retrieve. @return A list of command strings is returned. @@ -150,16 +150,16 @@ class UNOTOOLS_DLLPUBLIC SvtCommandOptions: public utl::detail::Options sal_Bool HasEntries( CmdOption eOption ) const; /*-****************************************************************************************************//** - @short Lookup if a command URL is inside a given list + @short Lookup if a command URL is inside a given list @descr Lookup if a command URL is inside a given lst - @seealso - + @seealso - @param "eOption" select right command list - @param "aCommandURL" a command URL that is used for the look up - @return "sal_True" if the command is inside the list otherwise "sal_False" + @param "aCommandURL" a command URL that is used for the look up + @return "sal_True" if the command is inside the list otherwise "sal_False" - @onerror - + @onerror - *//*-*****************************************************************************************************/ sal_Bool Lookup( CmdOption eOption, const ::rtl::OUString& aCommandURL ) const; @@ -169,7 +169,7 @@ class UNOTOOLS_DLLPUBLIC SvtCommandOptions: public utl::detail::Options @descr Call it to get all entries of an dynamic menu. We return a list of all nodes with his names and properties. - @seealso - + @seealso - @param "eOption" select the list to retrieve. @return A list of command strings is returned. @@ -183,13 +183,13 @@ class UNOTOOLS_DLLPUBLIC SvtCommandOptions: public utl::detail::Options @short adds a new command to specified options list @descr You can add a command to specified options list! - @seealso method Clear() + @seealso method Clear() - @param "eOption" specifies the command list + @param "eOption" specifies the command list @param "sURL" URL for dispatch - @return - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ void AddCommand( CmdOption eOption, const ::rtl::OUString& sURL ); @@ -212,29 +212,29 @@ class UNOTOOLS_DLLPUBLIC SvtCommandOptions: public utl::detail::Options void EstablisFrameCallback(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame); //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: /*-****************************************************************************************************//** - @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 - *//*-*****************************************************************************************************/ UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex(); //------------------------------------------------------------------------------------------------------------- - // private member + // private member //------------------------------------------------------------------------------------------------------------- private: @@ -247,8 +247,8 @@ class UNOTOOLS_DLLPUBLIC SvtCommandOptions: public utl::detail::Options Do it in your source only. */ - static SvtCommandOptions_Impl* m_pDataContainer ; /// impl. data container as dynamic pointer for smaller memory requirements! - static sal_Int32 m_nRefCount ; /// internal ref count mechanism + static SvtCommandOptions_Impl* m_pDataContainer ; /// impl. data container as dynamic pointer for smaller memory requirements! + static sal_Int32 m_nRefCount ; /// internal ref count mechanism }; // class SvtCmdOptions diff --git a/unotools/inc/unotools/collatorwrapper.hxx b/unotools/inc/unotools/collatorwrapper.hxx index e4f2a3443f1d..edcdec5da9ff 100644 --- a/unotools/inc/unotools/collatorwrapper.hxx +++ b/unotools/inc/unotools/collatorwrapper.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/unotools/inc/unotools/compatibility.hxx b/unotools/inc/unotools/compatibility.hxx index eb01e43f3ba0..65e92fa050e7 100644 --- a/unotools/inc/unotools/compatibility.hxx +++ b/unotools/inc/unotools/compatibility.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 INCLUDED_unotools_COMPATIBILITY_HXX //_________________________________________________________________________________________________________________ -// includes +// includes //_________________________________________________________________________________________________________________ #include "unotools/unotoolsdllapi.h" @@ -39,7 +39,7 @@ #include <unotools/options.hxx> //_________________________________________________________________________________________________________________ -// types, enums, ... +// types, enums, ... //_________________________________________________________________________________________________________________ enum CompatibilityOptions @@ -58,7 +58,7 @@ enum CompatibilityOptions }; /*-************************************************************************************************************//** - @descr The method GetList() returns a list of property values. + @descr The method GetList() returns a list of property values. Use follow defines to seperate values by names. *//*-*************************************************************************************************************/ #define COMPATIBILITY_PROPERTYNAME_NAME OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ) @@ -78,12 +78,12 @@ enum CompatibilityOptions #define COMPATIBILITY_DEFAULT_NAME OUString( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ) //_________________________________________________________________________________________________________________ -// 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! *//*-*************************************************************************************************************/ @@ -91,74 +91,76 @@ enum CompatibilityOptions class SvtCompatibilityOptions_Impl; //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** @short collect informations about dynamic menus @descr Make it possible to configure dynamic menu structures of menus like "new" or "wizard". - @implements - - @base - + @implements - + @base - - @devstatus ready to use + @devstatus ready to use *//*-*************************************************************************************************************/ class UNOTOOLS_DLLPUBLIC SvtCompatibilityOptions: public utl::detail::Options { //------------------------------------------------------------------------------------------------------------- - // 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 - *//*-*****************************************************************************************************/ SvtCompatibilityOptions(); virtual ~SvtCompatibilityOptions(); //--------------------------------------------------------------------------------------------------------- - // interface + // interface //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short clear complete specified list + @short clear complete specified list @descr Call this methods to clear the whole list. - @seealso - + @seealso - @param - - @return - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ void Clear(); + void SetDefault( ::rtl::OUString sName, bool bValue ); + /*-****************************************************************************************************//** @short return complete specified list @descr Call it to get all entries of compatibility options. We return a list of all nodes with its names and properties. - @seealso - + @seealso - @param - @return A list of compatibility options is returned. @@ -172,14 +174,14 @@ class UNOTOOLS_DLLPUBLIC SvtCompatibilityOptions: public utl::detail::Options @short append a new item @descr - @seealso method Clear() + @seealso method Clear() @param "sName" Name @param "sModule" Module - @return - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ void AppendItem( const ::rtl::OUString& sName, @@ -196,42 +198,42 @@ class UNOTOOLS_DLLPUBLIC SvtCompatibilityOptions: public utl::detail::Options bool bConsiderWrappingStyle, bool bExpandWordSpace ); - bool IsUsePrtDevice() const; - bool IsAddSpacing() const; - bool IsAddSpacingAtPages() const; - bool IsUseOurTabStops() const; - bool IsNoExtLeading() const; - bool IsUseLineSpacing() const; - bool IsAddTableSpacing() const; - bool IsUseObjectPositioning() const; - bool IsUseOurTextWrapping() const; + bool IsUsePrtDevice() const; + bool IsAddSpacing() const; + bool IsAddSpacingAtPages() const; + bool IsUseOurTabStops() const; + bool IsNoExtLeading() const; + bool IsUseLineSpacing() const; + bool IsAddTableSpacing() const; + bool IsUseObjectPositioning() const; + bool IsUseOurTextWrapping() const; bool IsConsiderWrappingStyle() const; bool IsExpandWordSpace() const; //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: /*-****************************************************************************************************//** - @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 - *//*-*****************************************************************************************************/ UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex(); //------------------------------------------------------------------------------------------------------------- - // private member + // private member //------------------------------------------------------------------------------------------------------------- private: @@ -244,8 +246,8 @@ class UNOTOOLS_DLLPUBLIC SvtCompatibilityOptions: public utl::detail::Options Do it in your source only. */ - static SvtCompatibilityOptions_Impl* m_pDataContainer; /// impl. data container as dynamic pointer for smaller memory requirements! - static sal_Int32 m_nRefCount ; /// internal ref count mechanism + static SvtCompatibilityOptions_Impl* m_pDataContainer; /// impl. data container as dynamic pointer for smaller memory requirements! + static sal_Int32 m_nRefCount ; /// internal ref count mechanism }; // class SvtCompatibilityOptions diff --git a/unotools/inc/unotools/componentresmodule.hxx b/unotools/inc/unotools/componentresmodule.hxx index 0fe4e126ea74..f3b3bf5a5a02 100644 --- a/unotools/inc/unotools/componentresmodule.hxx +++ b/unotools/inc/unotools/componentresmodule.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/unotools/inc/unotools/configitem.hxx b/unotools/inc/unotools/configitem.hxx index d1477cba1b74..b50a34c58457 100644 --- a/unotools/inc/unotools/configitem.hxx +++ b/unotools/inc/unotools/configitem.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 @@ -198,7 +198,7 @@ namespace utl sal_Bool IsModified() const; /** writes the changed values into the sub tree. Always called in the Dtor of the derived class. */ - virtual void Commit()=0; + virtual void Commit()=0; sal_Bool IsInValueChange() const; @@ -206,7 +206,7 @@ namespace utl /** checks if the configuration manager used by this item is valid. */ - sal_Bool IsValidConfigMgr() const; + sal_Bool IsValidConfigMgr() const; }; }//namespace utl #endif //_UTL_CONFIGITEM_HXX_ diff --git a/unotools/inc/unotools/configmgr.hxx b/unotools/inc/unotools/configmgr.hxx index c26ff5245739..b1a349b1ee74 100644 --- a/unotools/inc/unotools/configmgr.hxx +++ b/unotools/inc/unotools/configmgr.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/unotools/inc/unotools/confignode.hxx b/unotools/inc/unotools/confignode.hxx index 57b5f5bd2afb..77300edfec3f 100644 --- a/unotools/inc/unotools/confignode.hxx +++ b/unotools/inc/unotools/confignode.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 @@ -57,16 +57,16 @@ namespace utl { private: ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess > - m_xHierarchyAccess; /// accessing children grandchildren (mandatory interface of our UNO object) + m_xHierarchyAccess; /// accessing children grandchildren (mandatory interface of our UNO object) ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > - m_xDirectAccess; /// accessing children (mandatory interface of our UNO object) + m_xDirectAccess; /// accessing children (mandatory interface of our UNO object) ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > - m_xReplaceAccess; /// replacing child values + m_xReplaceAccess; /// replacing child values ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > - m_xContainerAccess; /// modifying set nodes (optional interface of our UNO object) + m_xContainerAccess; /// modifying set nodes (optional interface of our UNO object) ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xDummy; - sal_Bool m_bEscapeNames; /// escape names before accessing children ? + sal_Bool m_bEscapeNames; /// escape names before accessing children ? ::rtl::OUString m_sCompletePath; @@ -101,11 +101,11 @@ namespace utl ::rtl::OUString getNodePath() const; /** open a sub node - @param _rPath access path of the to-be-opened sub node. May be a hierarchical path. + @param _rPath access path of the to-be-opened sub node. May be a hierarchical path. */ - OConfigurationNode openNode(const ::rtl::OUString& _rPath) const throw(); + OConfigurationNode openNode(const ::rtl::OUString& _rPath) const throw(); - OConfigurationNode openNode( const sal_Char* _pAsciiPath ) const + OConfigurationNode openNode( const sal_Char* _pAsciiPath ) const { return openNode( ::rtl::OUString::createFromAscii( _pAsciiPath ) ); } @@ -116,11 +116,11 @@ namespace utl method will fail.<br/> Unless the respective operations on the pure configuration API, the to-be-created node immediately becomes a part of it's hierarchy, no explicit insertion is necessary. - @param _rName name for the new child. Must be level-1-depth. + @param _rName name for the new child. Must be level-1-depth. */ - OConfigurationNode createNode(const ::rtl::OUString& _rName) const throw(); + OConfigurationNode createNode(const ::rtl::OUString& _rName) const throw(); - OConfigurationNode createNode( const sal_Char* _pAsciiName ) const + OConfigurationNode createNode( const sal_Char* _pAsciiName ) const { return createNode( ::rtl::OUString::createFromAscii( _pAsciiName ) ); } @@ -131,8 +131,8 @@ namespace utl method will fail.<br/> Unless the respective operations on the pure configuration API, the to-be-created node immediately becomes a part of it's hierarchy, no explicit insertion is necessary. - @param _rName name for the new child. Must be level-1-depth. - @param _aNewNode the node which should be appended + @param _rName name for the new child. Must be level-1-depth. + @param _aNewNode the node which should be appended */ OConfigurationNode appendNode(const ::rtl::OUString& _rName,const OConfigurationNode& _aNewNode) const throw(); @@ -146,9 +146,9 @@ namespace utl If the object represents a set node, this method may be used to delete an existent child. For non-set-nodes, the method will fail. */ - sal_Bool removeNode(const ::rtl::OUString& _rName) const throw(); + sal_Bool removeNode(const ::rtl::OUString& _rName) const throw(); - sal_Bool removeNode( const sal_Char* _pAsciiName ) const + sal_Bool removeNode( const sal_Char* _pAsciiName ) const { return removeNode( ::rtl::OUString::createFromAscii( _pAsciiName ) ); } @@ -173,11 +173,11 @@ namespace utl The value given is written into the node specified by the given relative path.<br/> In opposite to <method>getNodeValue</method>, _rName must refer to a leaf in the configuration tree, not an inner node. - @return sal_True if and only if the write was successfull. + @return sal_True if and only if the write was successfull. */ - sal_Bool setNodeValue(const ::rtl::OUString& _rPath, const ::com::sun::star::uno::Any& _rValue) const throw(); + sal_Bool setNodeValue(const ::rtl::OUString& _rPath, const ::com::sun::star::uno::Any& _rValue) const throw(); - sal_Bool setNodeValue( const sal_Char* _pAsciiPath, const ::com::sun::star::uno::Any& _rValue ) const + sal_Bool setNodeValue( const sal_Char* _pAsciiPath, const ::com::sun::star::uno::Any& _rValue ) const { return setNodeValue( ::rtl::OUString::createFromAscii( _pAsciiPath ), _rValue ); } @@ -192,11 +192,11 @@ namespace utl escaping for such names may not be supported by the underlying API objects. @see getEscape */ - void setEscape(sal_Bool _bEnable = sal_True); + void setEscape(sal_Bool _bEnable = sal_True); /** get the flag specifying the current escape behaviour @see setEscape */ - sal_Bool getEscape() const { return m_bEscapeNames; } + sal_Bool getEscape() const { return m_bEscapeNames; } /// invalidate the object virtual void clear() throw(); @@ -228,8 +228,8 @@ namespace utl protected: enum NAMEORIGIN { - NO_CONFIGURATION, /// the name came from a configuration node - NO_CALLER /// the name came from a client of this class + NO_CONFIGURATION, /// the name came from a configuration node + NO_CALLER /// the name came from a client of this class }; ::rtl::OUString normalizeName(const ::rtl::OUString& _rName, NAMEORIGIN _eOrigin) const; }; @@ -303,12 +303,12 @@ namespace utl In opposite to <method>createWithServiceFactory</method>, createWithProvider expects a configuration provider to work with. - @param _rxConfProvider configuration provider to use when retrieving the node. - @param _rPath path to the node the object should represent - @param _nDepth depth for node retrieval - @param _eMode specifies which privileges should be applied when retrieving the node + @param _rxConfProvider configuration provider to use when retrieving the node. + @param _rPath path to the node the object should represent + @param _nDepth depth for node retrieval + @param _eMode specifies which privileges should be applied when retrieving the node - @see createWithServiceFactory + @see createWithServiceFactory */ static OConfigurationTreeRoot createWithProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxConfProvider, @@ -324,11 +324,11 @@ namespace utl or such).<br/> In opposite to <method>createWithProvider</method>, createWithProvider expects a service factory. This factory is used to create a configuration provider, and this provider is used to retrieve the node - @see createWithProvider - @param _rxORB service factory to use to create the configuration provider. - @param _rPath path to the node the object should represent - @param _nDepth depth for node retrieval - @param _eMode specifies which privileges should be applied when retrieving the node + @see createWithProvider + @param _rxORB service factory to use to create the configuration provider. + @param _rPath path to the node the object should represent + @param _nDepth depth for node retrieval + @param _eMode specifies which privileges should be applied when retrieving the node */ static OConfigurationTreeRoot createWithServiceFactory(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB, const ::rtl::OUString& _rPath, sal_Int32 _nDepth = -1, CREATION_MODE _eMode = CM_UPDATABLE, sal_Bool _bLazyWrite = sal_True); @@ -345,7 +345,7 @@ namespace utl /** commit all changes made on the subtree the object is the root for<p/> All changes made on any <type>OConfigurationNode</type> object retrieved (maybe indirect) from this root object are committed when calling this method. - @return sal_True if and only if the commit was successfull + @return sal_True if and only if the commit was successfull */ sal_Bool commit() const throw(); @@ -354,7 +354,7 @@ namespace utl }; //........................................................................ -} // namespace utl +} // namespace utl //........................................................................ #endif // _UNOTOOLS_CONFIGNODE_HXX_ diff --git a/unotools/inc/unotools/configpathes.hxx b/unotools/inc/unotools/configpathes.hxx index 2a1e76abf1fc..d58049f01525 100644 --- a/unotools/inc/unotools/configpathes.hxx +++ b/unotools/inc/unotools/configpathes.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,24 +39,24 @@ namespace rtl namespace utl { //---------------------------------------------------------------------------- - /** extract the local nodename and the parent nodepath + /** extract the local nodename and the parent nodepath from a configuration path. @param _sInPath A configuration path that is not an empty or root path.<BR/> - If this is not a valid configuration path, it is interpreted as + If this is not a valid configuration path, it is interpreted as local name of a node. @param _rsOutPath - On exit: The configuration path obtained by dropping + On exit: The configuration path obtained by dropping the last level off <var>_sInPath</var>.<BR/> - If <var>_sInPath</var> could not be parsed as a valid + If <var>_sInPath</var> could not be parsed as a valid configuration path, this is set to an empty string. @param _rsLocalName On exit: The plain (non-escaped) name of the node identified by <var>_sInPath</var>. <BR/> - If <var>_sInPath</var> could not be parsed as a valid + If <var>_sInPath</var> could not be parsed as a valid configuration path, this is set to <var>_sInPath</var>. @returns @@ -64,7 +64,7 @@ namespace utl <FALSE/>, if the path was a one-level path or an invalid path */ - UNOTOOLS_DLLPUBLIC sal_Bool splitLastFromConfigurationPath(::rtl::OUString const& _sInPath, + UNOTOOLS_DLLPUBLIC sal_Bool splitLastFromConfigurationPath(::rtl::OUString const& _sInPath, ::rtl::OUString& _rsOutPath, ::rtl::OUString& _rsLocalName); @@ -73,9 +73,12 @@ namespace utl @param _sInPath A relative configuration path that is not empty.<BR/> - If this is not a valid configuration path, it is interpreted as + If this is not a valid configuration path, it is interpreted as a single name of a node. + @param _sOutPath + If non-null, contains the remainder of the path upon return. + @returns The plain (non-escaped) name of the node that is the first step when traversing <var>_sInPath</var>.<BR/> @@ -83,7 +86,8 @@ namespace utl configuration path, it is returned unaltered. */ - UNOTOOLS_DLLPUBLIC ::rtl::OUString extractFirstFromConfigurationPath(::rtl::OUString const& _sInPath); + UNOTOOLS_DLLPUBLIC ::rtl::OUString extractFirstFromConfigurationPath( + ::rtl::OUString const& _sInPath, ::rtl::OUString* _sOutPath = 0); //---------------------------------------------------------------------------- /** check whether a path is to a nested node with respect to a parent path. @@ -106,7 +110,7 @@ namespace utl If both pathes are equal <TRUE/> is returned. */ - sal_Bool isPrefixOfConfigurationPath(::rtl::OUString const& _sNestedPath, + sal_Bool isPrefixOfConfigurationPath(::rtl::OUString const& _sNestedPath, ::rtl::OUString const& _sPrefixPath); //---------------------------------------------------------------------------- @@ -131,38 +135,38 @@ namespace utl <var>_sNestedPath</var> is returned unaltered. */ - UNOTOOLS_DLLPUBLIC ::rtl::OUString dropPrefixFromConfigurationPath(::rtl::OUString const& _sNestedPath, + UNOTOOLS_DLLPUBLIC ::rtl::OUString dropPrefixFromConfigurationPath(::rtl::OUString const& _sNestedPath, ::rtl::OUString const& _sPrefixPath); //---------------------------------------------------------------------------- - /** Create a one-level relative configuration path from a set element name + /** Create a one-level relative configuration path from a set element name without a known set element type. @param _sElementName - An arbitrary string that is to be interpreted as + An arbitrary string that is to be interpreted as name of a configuration set element. @returns - A one-level relative path to the element, of the form + A one-level relative path to the element, of the form "*['<Name>']", where <Name> is properly escaped. */ UNOTOOLS_DLLPUBLIC ::rtl::OUString wrapConfigurationElementName(::rtl::OUString const& _sElementName); //---------------------------------------------------------------------------- - /** Create a one-level relative configuration path from a set element name + /** Create a one-level relative configuration path from a set element name and a known set element type. @param _sElementName - An arbitrary string that is to be interpreted as + An arbitrary string that is to be interpreted as name of a configuration set element. @param _sTypeName - An string identifying the type of the element. Usually this is be + An string identifying the type of the element. Usually this is be the name of the element-template of the set.<BR/> @returns - A one-level relative path to the element, of the form + A one-level relative path to the element, of the form "<Type>['<Name>']", where <Name> is properly escaped. */ @@ -170,7 +174,7 @@ namespace utl ::rtl::OUString const& _sTypeName); //---------------------------------------------------------------------------- -} // namespace utl +} // namespace utl //---------------------------------------------------------------------------- #endif // UNOTOOLS_CONFIGPATHES_HXX_INCLUDED diff --git a/unotools/inc/unotools/configvaluecontainer.hxx b/unotools/inc/unotools/configvaluecontainer.hxx index a66ca4cb753a..e4e9216d5bc0 100644 --- a/unotools/inc/unotools/configvaluecontainer.hxx +++ b/unotools/inc/unotools/configvaluecontainer.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,11 +36,11 @@ namespace utl { //......................................................................... -#define CVC_READONLY_ACCESS 0x0000 -#define CVC_UPDATE_ACCESS 0x0001 +#define CVC_READONLY_ACCESS 0x0000 +#define CVC_UPDATE_ACCESS 0x0001 -#define CVC_LAZY_UPDATE 0x0000 -#define CVC_IMMEDIATE_UPDATE 0x0002 +#define CVC_LAZY_UPDATE 0x0000 +#define CVC_IMMEDIATE_UPDATE 0x0002 struct OConfigurationValueContainerImpl; struct NodeValueAccessor; @@ -148,7 +148,7 @@ namespace utl @param _rValueType is the type of your accessort. This type must be supported by the configuration. */ - void registerExchangeLocation( + void registerExchangeLocation( const sal_Char* _pRelativePathAscii, void* _pContainer, const ::com::sun::star::uno::Type& _rValueType @@ -164,7 +164,7 @@ namespace utl @param _pContainer points to the Any you want to hold the value */ - void registerNullValueExchangeLocation( + void registerNullValueExchangeLocation( const sal_Char* _pRelativePathAscii, ::com::sun::star::uno::Any* _pContainer ); @@ -180,7 +180,7 @@ namespace utl @see write */ - void read( ); + void read( ); /** updates the configuration data @@ -199,7 +199,7 @@ namespace utl @see read @see commit */ - void write( sal_Bool _bCommit = sal_True ); + void write( sal_Bool _bCommit = sal_True ); /** commits any changes done @@ -214,7 +214,7 @@ namespace utl If <FALSE/>, only the current values in the config nodes (as present since the last call to <method>write</method>) are committed. */ - void commit( sal_Bool _bWrite = sal_True ); + void commit( sal_Bool _bWrite = sal_True ); private: /// implements the ctors @@ -225,11 +225,11 @@ namespace utl ); /// registers a value container - void implRegisterExchangeLocation( const NodeValueAccessor& _rAccessor ); + void implRegisterExchangeLocation( const NodeValueAccessor& _rAccessor ); }; //......................................................................... -} // namespace utl +} // namespace utl //......................................................................... #endif // UNOTOOLS_CONFIGVALUECONTAINER_HXX diff --git a/unotools/inc/unotools/datetime.hxx b/unotools/inc/unotools/datetime.hxx index ef02822f1dc5..f33bf394e609 100644 --- a/unotools/inc/unotools/datetime.hxx +++ b/unotools/inc/unotools/datetime.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 @@ -56,7 +56,7 @@ namespace utl UNOTOOLS_DLLPUBLIC void typeConvert(const starutil::DateTime& _rDateTime, DateTime& _rOut); //......................................................................... -} // namespace utl +} // namespace utl //......................................................................... #endif // _UNOTOOLS_DATETIME_HXX_ diff --git a/unotools/inc/unotools/defaultoptions.hxx b/unotools/inc/unotools/defaultoptions.hxx index ecd6b7928629..3457b7881a85 100644 --- a/unotools/inc/unotools/defaultoptions.hxx +++ b/unotools/inc/unotools/defaultoptions.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,14 +40,14 @@ class SvtDefaultOptions_Impl; class UNOTOOLS_DLLPUBLIC SvtDefaultOptions: public utl::detail::Options { private: - SvtDefaultOptions_Impl* pImp; + SvtDefaultOptions_Impl* pImp; public: SvtDefaultOptions(); virtual ~SvtDefaultOptions(); - String GetDefaultPath( USHORT nId ) const; + String GetDefaultPath( USHORT nId ) const; }; #endif // #ifndef INCLUDED_unotools_DEFAULTOPTIONS_HXX diff --git a/unotools/inc/unotools/desktopterminationobserver.hxx b/unotools/inc/unotools/desktopterminationobserver.hxx index 6b1f0d3e52f6..95c41ac8b7b0 100644 --- a/unotools/inc/unotools/desktopterminationobserver.hxx +++ b/unotools/inc/unotools/desktopterminationobserver.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/unotools/inc/unotools/digitgroupingiterator.hxx b/unotools/inc/unotools/digitgroupingiterator.hxx index 19f3ebf37abb..048417d80d4a 100644 --- a/unotools/inc/unotools/digitgroupingiterator.hxx +++ b/unotools/inc/unotools/digitgroupingiterator.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 utl { The iterator advances over the digit groupings, returning the number of digits per group. If the last group was encountered the iterator will always return the last grouping. - + Grouping values are sanitized to be 0 <= value <= SAL_MAX_UINT16, even if originally Int32, to be able to easily cast it down to String's xub_StrLen. This shouldn't make any difference in practice. diff --git a/unotools/inc/unotools/docinfohelper.hxx b/unotools/inc/unotools/docinfohelper.hxx index 9ce9d346af20..58a43484c1b2 100644 --- a/unotools/inc/unotools/docinfohelper.hxx +++ b/unotools/inc/unotools/docinfohelper.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 @@ public: }; -} // namespace utl +} // namespace utl #endif // _UNOTOOLS_DOCINFOHELPER_HXX_ diff --git a/unotools/inc/unotools/dynamicmenuoptions.hxx b/unotools/inc/unotools/dynamicmenuoptions.hxx index 9d695e166471..5fba07c217b1 100644 --- a/unotools/inc/unotools/dynamicmenuoptions.hxx +++ b/unotools/inc/unotools/dynamicmenuoptions.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 INCLUDED_unotools_DYNAMICMENUOPTIONS_HXX //_________________________________________________________________________________________________________________ -// includes +// includes //_________________________________________________________________________________________________________________ #include "unotools/unotoolsdllapi.h" @@ -39,11 +39,11 @@ #include <unotools/options.hxx> //_________________________________________________________________________________________________________________ -// types, enums, ... +// types, enums, ... //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** - @descr The method GetList() returns a list of property values. + @descr The method GetList() returns a list of property values. Use follow defines to seperate values by names. *//*-*************************************************************************************************************/ #define DYNAMICMENU_PROPERTYNAME_URL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL" )) @@ -61,12 +61,12 @@ enum EDynamicMenuType E_HELPBOOKMARKS = 2 }; //_________________________________________________________________________________________________________________ -// 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! *//*-*************************************************************************************************************/ @@ -74,65 +74,65 @@ enum EDynamicMenuType class SvtDynamicMenuOptions_Impl; //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** @short collect informations about dynamic menus @descr Make it possible to configure dynamic menu structures of menus like "new" or "wizard". - @implements - - @base - + @implements - + @base - - @devstatus ready to use + @devstatus ready to use *//*-*************************************************************************************************************/ class UNOTOOLS_DLLPUBLIC SvtDynamicMenuOptions: public utl::detail::Options { //------------------------------------------------------------------------------------------------------------- - // 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 - *//*-*****************************************************************************************************/ SvtDynamicMenuOptions(); virtual ~SvtDynamicMenuOptions(); //--------------------------------------------------------------------------------------------------------- - // interface + // interface //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short clear complete sepcified list + @short clear complete sepcified list @descr Call this methods to clear the whole list. To fill it again use AppendItem(). - @seealso - + @seealso - @param "eMenu" select right menu to clear. - @return - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ void Clear( EDynamicMenuType eMenu ); @@ -142,7 +142,7 @@ class UNOTOOLS_DLLPUBLIC SvtDynamicMenuOptions: public utl::detail::Options @descr Call it to get all entries of an dynamic menu. We return a list of all nodes with his names and properties. - @seealso - + @seealso - @param "eMenu" select right menu. @return A list of menu items is returned. @@ -157,16 +157,16 @@ class UNOTOOLS_DLLPUBLIC SvtDynamicMenuOptions: public utl::detail::Options @descr You can append items to a menu only - removing isn't allowed for a special item! We support a nothing or all mechanism only! Clear all or append something ... - @seealso method Clear() + @seealso method Clear() @param "eMenu" select right menu. @param "sURL" URL for dispatch @param "sTitle" label of menu entry @param "sImageIdentifier" icon identifier @param "sTargetName" target for dispatch - @return - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ void AppendItem( EDynamicMenuType eMenu , @@ -176,29 +176,29 @@ class UNOTOOLS_DLLPUBLIC SvtDynamicMenuOptions: public utl::detail::Options const ::rtl::OUString& sTargetName ); //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: /*-****************************************************************************************************//** - @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 - *//*-*****************************************************************************************************/ UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex(); //------------------------------------------------------------------------------------------------------------- - // private member + // private member //------------------------------------------------------------------------------------------------------------- private: diff --git a/unotools/inc/unotools/eventcfg.hxx b/unotools/inc/unotools/eventcfg.hxx index 839811f9dd80..34b547fda898 100644 --- a/unotools/inc/unotools/eventcfg.hxx +++ b/unotools/inc/unotools/eventcfg.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,30 +37,30 @@ #include <hash_map> #include <vector> -#define STR_EVENT_STARTAPP 0 -#define STR_EVENT_CLOSEAPP 1 -#define STR_EVENT_DOCCREATED 2 -#define STR_EVENT_CREATEDOC 3 +#define STR_EVENT_STARTAPP 0 +#define STR_EVENT_CLOSEAPP 1 +#define STR_EVENT_DOCCREATED 2 +#define STR_EVENT_CREATEDOC 3 #define STR_EVENT_LOADFINISHED 4 -#define STR_EVENT_OPENDOC 5 -#define STR_EVENT_PREPARECLOSEDOC 6 -#define STR_EVENT_CLOSEDOC 7 -#define STR_EVENT_SAVEDOC 8 -#define STR_EVENT_SAVEDOCDONE 9 +#define STR_EVENT_OPENDOC 5 +#define STR_EVENT_PREPARECLOSEDOC 6 +#define STR_EVENT_CLOSEDOC 7 +#define STR_EVENT_SAVEDOC 8 +#define STR_EVENT_SAVEDOCDONE 9 #define STR_EVENT_SAVEDOCFAILED 10 -#define STR_EVENT_SAVEASDOC 11 -#define STR_EVENT_SAVEASDOCDONE 12 +#define STR_EVENT_SAVEASDOC 11 +#define STR_EVENT_SAVEASDOCDONE 12 #define STR_EVENT_SAVEASDOCFAILED 13 #define STR_EVENT_SAVETODOC 14 #define STR_EVENT_SAVETODOCDONE 15 #define STR_EVENT_SAVETODOCFAILED 16 -#define STR_EVENT_ACTIVATEDOC 17 -#define STR_EVENT_DEACTIVATEDOC 18 -#define STR_EVENT_PRINTDOC 19 +#define STR_EVENT_ACTIVATEDOC 17 +#define STR_EVENT_DEACTIVATEDOC 18 +#define STR_EVENT_PRINTDOC 19 #define STR_EVENT_VIEWCREATED 20 #define STR_EVENT_PREPARECLOSEVIEW 21 #define STR_EVENT_CLOSEVIEW 22 -#define STR_EVENT_MODIFYCHANGED 23 +#define STR_EVENT_MODIFYCHANGED 23 #define STR_EVENT_TITLECHANGED 24 #define STR_EVENT_VISAREACHANGED 25 #define STR_EVENT_MODECHANGED 26 @@ -83,8 +83,8 @@ public: ~GlobalEventConfig_Impl( ); void EstablishFrameCallback(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame); - void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames); - void Commit(); + void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames); + void Commit(); ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw (::com::sun::star::uno::RuntimeException); void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); diff --git a/unotools/inc/unotools/eventlisteneradapter.hxx b/unotools/inc/unotools/eventlisteneradapter.hxx index c46cabc4dffb..02d151a5c471 100644 --- a/unotools/inc/unotools/eventlisteneradapter.hxx +++ b/unotools/inc/unotools/eventlisteneradapter.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 @@ -46,11 +46,11 @@ namespace utl friend class OEventListenerImpl; private: - UNOTOOLS_DLLPRIVATE OEventListenerAdapter( const OEventListenerAdapter& _rSource ); // never implemented - UNOTOOLS_DLLPRIVATE const OEventListenerAdapter& operator=( const OEventListenerAdapter& _rSource ); // never implemented + UNOTOOLS_DLLPRIVATE OEventListenerAdapter( const OEventListenerAdapter& _rSource ); // never implemented + UNOTOOLS_DLLPRIVATE const OEventListenerAdapter& operator=( const OEventListenerAdapter& _rSource ); // never implemented protected: - OEventListenerAdapterImpl* m_pImpl; + OEventListenerAdapterImpl* m_pImpl; protected: OEventListenerAdapter(); @@ -64,7 +64,7 @@ namespace utl }; //......................................................................... -} // namespace utl +} // namespace utl //......................................................................... #endif // _UNOTOOLS_EVENTLISTENERADAPTER_HXX_ diff --git a/unotools/inc/unotools/extendedsecurityoptions.hxx b/unotools/inc/unotools/extendedsecurityoptions.hxx index 6e6b04472d31..fa15ab1a7c0d 100644 --- a/unotools/inc/unotools/extendedsecurityoptions.hxx +++ b/unotools/inc/unotools/extendedsecurityoptions.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 INCLUDED_unotools_EXTENDEDSECURITYOPTIONS_HXX //_________________________________________________________________________________________________________________ -// includes +// includes //_________________________________________________________________________________________________________________ #include "unotools/unotoolsdllapi.h" @@ -39,12 +39,12 @@ #include <unotools/options.hxx> //_________________________________________________________________________________________________________________ -// 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! *//*-*************************************************************************************************************/ @@ -52,94 +52,94 @@ class SvtExtendedSecurityOptions_Impl; //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** - @short collect informations about security features + @short collect informations about security features @descr - - @implements - - @base - + @implements - + @base - - @ATTENTION This class is partially threadsafe. + @ATTENTION This class is partially threadsafe. - @devstatus ready to use + @devstatus ready to use *//*-*************************************************************************************************************/ class UNOTOOLS_DLLPUBLIC SvtExtendedSecurityOptions: public utl::detail::Options { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: // Must be zero based! enum OpenHyperlinkMode { - OPEN_NEVER = 0, + OPEN_NEVER = 0, OPEN_WITHSECURITYCHECK, OPEN_ALWAYS }; //--------------------------------------------------------------------------------------------------------- - // 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 - *//*-*****************************************************************************************************/ SvtExtendedSecurityOptions(); virtual ~SvtExtendedSecurityOptions(); //--------------------------------------------------------------------------------------------------------- - // interface + // interface //--------------------------------------------------------------------------------------------------------- - sal_Bool IsSecureHyperlink( const rtl::OUString& aURL ) const; - com::sun::star::uno::Sequence< rtl::OUString > GetSecureExtensionList() const; + sal_Bool IsSecureHyperlink( const rtl::OUString& aURL ) const; + com::sun::star::uno::Sequence< rtl::OUString > GetSecureExtensionList() const; - OpenHyperlinkMode GetOpenHyperlinkMode(); - void SetOpenHyperlinkMode( OpenHyperlinkMode aMode ); + OpenHyperlinkMode GetOpenHyperlinkMode(); + void SetOpenHyperlinkMode( OpenHyperlinkMode aMode ); sal_Bool IsOpenHyperlinkModeReadOnly() const; //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: /*-****************************************************************************************************//** - @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 - *//*-*****************************************************************************************************/ UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetInitMutex(); //------------------------------------------------------------------------------------------------------------- - // private member + // private member //------------------------------------------------------------------------------------------------------------- private: @@ -152,9 +152,9 @@ class UNOTOOLS_DLLPUBLIC SvtExtendedSecurityOptions: public utl::detail::Options Do it in your source only. */ - static SvtExtendedSecurityOptions_Impl* m_pDataContainer ; /// impl. data container as dynamic pointer for smaller memory requirements! - static sal_Int32 m_nRefCount ; /// internal ref count mechanism + static SvtExtendedSecurityOptions_Impl* m_pDataContainer ; /// impl. data container as dynamic pointer for smaller memory requirements! + static sal_Int32 m_nRefCount ; /// internal ref count mechanism -}; // class SvtExtendedSecurityOptions +}; // class SvtExtendedSecurityOptions #endif // #ifndef INCLUDED_unotools_EXTENDEDSECURITYOPTIONS_HXX diff --git a/unotools/inc/unotools/fltrcfg.hxx b/unotools/inc/unotools/fltrcfg.hxx index 890efebde071..26a1b2205932 100644 --- a/unotools/inc/unotools/fltrcfg.hxx +++ b/unotools/inc/unotools/fltrcfg.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,11 +40,11 @@ class UNOTOOLS_DLLPUBLIC SvtFilterOptions : public utl::ConfigItem const com::sun::star::uno::Sequence<rtl::OUString>& GetPropertyNames(); public: SvtFilterOptions(); - virtual ~SvtFilterOptions(); + virtual ~SvtFilterOptions(); - virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames); - virtual void Commit(); - void Load(); + virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames); + virtual void Commit(); + void Load(); void SetLoadWordBasicCode( sal_Bool bFlag ); sal_Bool IsLoadWordBasicCode() const; diff --git a/unotools/inc/unotools/fontcfg.hxx b/unotools/inc/unotools/fontcfg.hxx index 633c12c4c99c..4f71c740a549 100644 --- a/unotools/inc/unotools/fontcfg.hxx +++ b/unotools/inc/unotools/fontcfg.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,7 +75,7 @@ class UNOTOOLS_DLLPUBLIC DefaultFontConfiguration m_xConfigProvider; com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > m_xConfigAccess; - + struct LocaleAccess { // the real string used in the configuration @@ -84,22 +84,22 @@ class UNOTOOLS_DLLPUBLIC DefaultFontConfiguration // xAccess is mutable to be able to be filled on demand mutable com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > xAccess; }; - + std::hash_map< com::sun::star::lang::Locale, LocaleAccess, utl::LocaleHash > m_aConfig; - + rtl::OUString tryLocale( const com::sun::star::lang::Locale& rLocale, const rtl::OUString& rType ) const; - + DefaultFontConfiguration(); public: ~DefaultFontConfiguration(); - + static DefaultFontConfiguration* get(); - + rtl::OUString getDefaultFont( const com::sun::star::lang::Locale& rLocale, int nType ) const; - rtl::OUString getUserInterfaceFont( const com::sun::star::lang::Locale& rLocale ) const; + rtl::OUString getUserInterfaceFont( const com::sun::star::lang::Locale& rLocale ) const; }; // IMPL_FONT_ATTR_DEFAULT - Default-Font like Andale Sans UI, Palace Script, Albany, Thorndale, Cumberland, ... @@ -162,14 +162,14 @@ class UNOTOOLS_DLLPUBLIC DefaultFontConfiguration struct UNOTOOLS_DLLPUBLIC FontNameAttr { - String Name; - ::std::vector< String > Substitutions; - ::std::vector< String > MSSubstitutions; - ::std::vector< String > PSSubstitutions; - ::std::vector< String > HTMLSubstitutions; - FontWeight Weight; - FontWidth Width; - unsigned long Type; // bitfield of IMPL_FONT_ATTR_* + String Name; + ::std::vector< String > Substitutions; + ::std::vector< String > MSSubstitutions; + ::std::vector< String > PSSubstitutions; + ::std::vector< String > HTMLSubstitutions; + FontWeight Weight; + FontWidth Width; + unsigned long Type; // bitfield of IMPL_FONT_ATTR_* }; class UNOTOOLS_DLLPUBLIC FontSubstConfiguration @@ -188,14 +188,14 @@ private: // a minimal match is sufficient (that is e.g. "Thorndale" will match // "Thorndale BlaBlub"). Also names must be lower case. mutable std::vector< FontNameAttr > aSubstAttributes; - + LocaleSubst() : bConfigRead( false ) {} }; std::hash_map< com::sun::star::lang::Locale, LocaleSubst, utl::LocaleHash > m_aSubst; typedef std::hash_set< rtl::OUString, rtl::OUStringHash > UniqueSubstHash; mutable UniqueSubstHash maSubstHash; - + void fillSubstVector( const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > xFont, const rtl::OUString& rType, std::vector< String >& rSubstVector ) const; diff --git a/unotools/inc/unotools/fontcvt.hxx b/unotools/inc/unotools/fontcvt.hxx index 333ee36e706d..ab8c4aafd61e 100644 --- a/unotools/inc/unotools/fontcvt.hxx +++ b/unotools/inc/unotools/fontcvt.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,6 +74,6 @@ public: //allow somewhat more dubious transformations that are nevertheless //recognizably similiar. Even in this mode there will be characters that fail. //The users of this might want to make a distinction between failed characters -//which were inside and those outside the unicode private area. +//which were inside and those outside the unicode private area. UNOTOOLS_DLLPUBLIC StarSymbolToMSMultiFont *CreateStarSymbolToMSMultiFont(bool bPerfectOnly=false); #endif // _UNOTOOLS_FONTCVT_HXX diff --git a/unotools/inc/unotools/fontdefs.hxx b/unotools/inc/unotools/fontdefs.hxx index 12868aabe525..9cd2915570c9 100644 --- a/unotools/inc/unotools/fontdefs.hxx +++ b/unotools/inc/unotools/fontdefs.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 @@ -72,8 +72,8 @@ public: const sal_Unicode* mpCvtTab; const char* mpSubsFontName; sal_Unicode (*mpCvtFunc)( sal_Unicode ); - sal_Unicode RecodeChar( sal_Unicode c ) const; - void RecodeString( String& rStra, xub_StrLen nIndex, xub_StrLen nLen ) const; + sal_Unicode RecodeChar( sal_Unicode c ) const; + void RecodeString( String& rStra, xub_StrLen nIndex, xub_StrLen nLen ) const; static const ConvertChar* GetRecodeData( const String& rOrgFontName, const String& rMapFontName ); }; diff --git a/unotools/inc/unotools/fontoptions.hxx b/unotools/inc/unotools/fontoptions.hxx index 7809fb4380cf..6d728a94de18 100644 --- a/unotools/inc/unotools/fontoptions.hxx +++ b/unotools/inc/unotools/fontoptions.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 INCLUDED_unotools_FONTOPTIONS_HXX //_________________________________________________________________________________________________________________ -// includes +// includes //_________________________________________________________________________________________________________________ #include "unotools/unotoolsdllapi.h" @@ -38,12 +38,12 @@ #include <unotools/options.hxx> //_________________________________________________________________________________________________________________ -// 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! *//*-*************************************************************************************************************/ @@ -51,108 +51,108 @@ class SvtFontOptions_Impl; //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** - @short collect informations about font features + @short collect informations about font features @descr - - @implements - - @base - + @implements - + @base - - @devstatus ready to use + @devstatus ready to use *//*-*************************************************************************************************************/ class UNOTOOLS_DLLPUBLIC SvtFontOptions: public utl::detail::Options { //------------------------------------------------------------------------------------------------------------- - // 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 - *//*-*****************************************************************************************************/ SvtFontOptions(); virtual ~SvtFontOptions(); //--------------------------------------------------------------------------------------------------------- - // interface + // interface //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short interface methods to get and set value of config key "org.openoffice.Office.Common/Font" - @descr These values defines different states of font handling. + @short interface methods to get and set value of config key "org.openoffice.Office.Common/Font" + @descr These values defines different states of font handling. - ..ReplacementTable..() => Determines if the list of font replacements is applied or not. + ..ReplacementTable..() => Determines if the list of font replacements is applied or not. - ..FontHistory..() => The last 5 fonts will be shown and the last one will be the + ..FontHistory..() => The last 5 fonts will be shown and the last one will be the first name on the list. These will be displayed in the Font name combo box on the Object bar. - ..FontWYSIWYG..() => With this option the names of the selectable fonts + ..FontWYSIWYG..() => With this option the names of the selectable fonts (for example, the fonts in the Font field in the object bar) will be formatted as the current font. - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror No error should occurre! + @onerror No error should occurre! *//*-*****************************************************************************************************/ - sal_Bool IsReplacementTableEnabled ( ) const ; - void EnableReplacementTable ( sal_Bool bState ) ; + sal_Bool IsReplacementTableEnabled ( ) const ; + void EnableReplacementTable ( sal_Bool bState ) ; - sal_Bool IsFontHistoryEnabled ( ) const ; - void EnableFontHistory ( sal_Bool bState ) ; + sal_Bool IsFontHistoryEnabled ( ) const ; + void EnableFontHistory ( sal_Bool bState ) ; - sal_Bool IsFontWYSIWYGEnabled ( ) const ; - void EnableFontWYSIWYG ( sal_Bool bState ) ; + sal_Bool IsFontWYSIWYGEnabled ( ) const ; + void EnableFontWYSIWYG ( sal_Bool bState ) ; //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: /*-****************************************************************************************************//** - @short return a reference to a static mutex - @descr These class use his own static mutex to be threadsafe. + @short return a reference to a static mutex + @descr These class use his own static mutex to be threadsafe. 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 - *//*-*****************************************************************************************************/ UNOTOOLS_DLLPRIVATE static ::osl::Mutex& impl_GetOwnStaticMutex(); //------------------------------------------------------------------------------------------------------------- - // private member + // private member //------------------------------------------------------------------------------------------------------------- private: @@ -165,9 +165,9 @@ class UNOTOOLS_DLLPUBLIC SvtFontOptions: public utl::detail::Options Do it in your source only. */ - static SvtFontOptions_Impl* m_pDataContainer ; /// impl. data container as dynamic pointer for smaller memory requirements! - static sal_Int32 m_nRefCount ; /// internal ref count mechanism + static SvtFontOptions_Impl* m_pDataContainer ; /// impl. data container as dynamic pointer for smaller memory requirements! + static sal_Int32 m_nRefCount ; /// internal ref count mechanism -}; // class SvtFontOptions +}; // class SvtFontOptions #endif // #ifndef INCLUDED_unotools_FONTOPTIONS_HXX diff --git a/unotools/inc/unotools/historyoptions.hxx b/unotools/inc/unotools/historyoptions.hxx index 50b411e5d17e..6d86505eb61c 100644 --- a/unotools/inc/unotools/historyoptions.hxx +++ b/unotools/inc/unotools/historyoptions.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 INCLUDED_SVTOOLS_HISTORYOPTIONS_HXX //_________________________________________________________________________________________________________________ -// includes +// includes //_________________________________________________________________________________________________________________ #include "unotools/unotoolsdllapi.h" @@ -40,21 +40,21 @@ #include <unotools/options.hxx> //_________________________________________________________________________________________________________________ -// types, enums, ... +// types, enums, ... //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** - @descr The method GetList() returns a list of property values. + @descr The method GetList() returns a list of property values. Use follow defines to seperate values by names. *//*-*************************************************************************************************************/ -#define HISTORY_PROPERTYNAME_URL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL" )) -#define HISTORY_PROPERTYNAME_FILTER ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Filter" )) -#define HISTORY_PROPERTYNAME_TITLE ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title" )) -#define HISTORY_PROPERTYNAME_PASSWORD ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Password" )) +#define HISTORY_PROPERTYNAME_URL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL" )) +#define HISTORY_PROPERTYNAME_FILTER ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Filter" )) +#define HISTORY_PROPERTYNAME_TITLE ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title" )) +#define HISTORY_PROPERTYNAME_PASSWORD ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Password" )) /*-************************************************************************************************************//** - @descr You can use these enum values to specify right history if you call ouer interface methods. + @descr You can use these enum values to specify right history if you call ouer interface methods. *//*-*************************************************************************************************************/ enum EHistoryType @@ -65,12 +65,12 @@ enum EHistoryType }; //_________________________________________________________________________________________________________________ -// 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! *//*-*************************************************************************************************************/ @@ -78,156 +78,156 @@ enum EHistoryType class SvtHistoryOptions_Impl; //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** - @short collect informations about history features + @short collect informations about history features @descr - - @implements - - @base - + @implements - + @base - - @devstatus ready to use + @devstatus ready to use *//*-*************************************************************************************************************/ class UNOTOOLS_DLLPUBLIC SvtHistoryOptions: public utl::detail::Options { //------------------------------------------------------------------------------------------------------------- - // 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 - *//*-*****************************************************************************************************/ SvtHistoryOptions(); virtual ~SvtHistoryOptions(); //--------------------------------------------------------------------------------------------------------- - // interface + // interface //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short interface methods to get and set value of config key "org.openoffice.Office.Common/History/..." - @descr key "PickList" : The last used documents displayed in the file menu. - key "History" : The last opened documents general. + @short interface methods to get and set value of config key "org.openoffice.Office.Common/History/..." + @descr key "PickList" : The last used documents displayed in the file menu. + key "History" : The last opened documents general. *//*-*****************************************************************************************************/ /*-****************************************************************************************************//** - @short set/get max size of specified history - @descr Call this methods to get information about max. size of specified list. + @short set/get max size of specified history + @descr Call this methods to get information about max. size of specified list. These value lay down the max count of items in these history. If a new one is add to it the oldest one is deleted automaticly! - @seealso - + @seealso - - @param "eHistory" select right history. - @param "nSize" is the new max size of specified list. If new size smaller then the old one + @param "eHistory" select right history. + @param "nSize" is the new max size of specified list. If new size smaller then the old one some oldest entries will be destroyed automaticly! - @return Current max size of specified list. + @return Current max size of specified list. - @onerror - + @onerror - *//*-*****************************************************************************************************/ - sal_uInt32 GetSize( EHistoryType eHistory ) const ; - void SetSize( EHistoryType eHistory, sal_uInt32 nSize ) ; + sal_uInt32 GetSize( EHistoryType eHistory ) const ; + void SetSize( EHistoryType eHistory, sal_uInt32 nSize ) ; /*-****************************************************************************************************//** - @short clear complete sepcified list - @descr Call this methods to clear the whole list. After that GetItemCount() will return 0 ... + @short clear complete sepcified list + @descr Call this methods to clear the whole list. After that GetItemCount() will return 0 ... but GetSize() will return the old value! - @seealso - + @seealso - - @param "eHistory" select right history. - @return - + @param "eHistory" select right history. + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ void Clear( EHistoryType eHistory ); /*-****************************************************************************************************//** - @short return complete sepcified list - @descr If you will show the whole list call this method to get it completly. + @short return complete sepcified list + @descr If you will show the whole list call this method to get it completly. - @seealso - + @seealso - - @param "eHistory" select right history. - @return A list of history items is returned. + @param "eHistory" select right history. + @return A list of history items is returned. - @onerror - + @onerror - *//*-*****************************************************************************************************/ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > GetList( EHistoryType eHistory ) const ; /*-****************************************************************************************************//** - @short append a new item to specified list - @descr You can append items to a list only - removing isn't allowed for a special item! + @short append a new item to specified list + @descr You can append items to a list only - removing isn't allowed for a special item! The oldest entry is deleted automaticly if max size arrived or you can call Clear() ... It exist two different overload methods to do this. One for user which have an complete history item and another one for uncompletly data sets! - @seealso method SetSize() - @seealso method Clear() + @seealso method SetSize() + @seealso method Clear() - @param "eHistory" select right history. - @param "sURL" URL to save in history - @param "sFilter" filter name to save in history - @param "sTitle" document title to save in history - @param "sPassword" password to save in history - @return - + @param "eHistory" select right history. + @param "sURL" URL to save in history + @param "sFilter" filter name to save in history + @param "sTitle" document title to save in history + @param "sPassword" password to save in history + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ - void AppendItem( EHistoryType eHistory , - const ::rtl::OUString& sURL , - const ::rtl::OUString& sFilter , - const ::rtl::OUString& sTitle , - const ::rtl::OUString& sPassword ); + void AppendItem( EHistoryType eHistory , + const ::rtl::OUString& sURL , + const ::rtl::OUString& sFilter , + const ::rtl::OUString& sTitle , + const ::rtl::OUString& sPassword ); //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: /*-****************************************************************************************************//** - @short return a reference to a static mutex - @descr Make these class threadsafe. + @short return a reference to a static mutex + @descr Make these class threadsafe. - @seealso - + @seealso - - @param - - @return A reference to a static mutex member. + @param - + @return A reference to a static mutex member. - @onerror - + @onerror - *//*-*****************************************************************************************************/ UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex(); //------------------------------------------------------------------------------------------------------------- - // private member + // private member //------------------------------------------------------------------------------------------------------------- private: @@ -240,9 +240,9 @@ class UNOTOOLS_DLLPUBLIC SvtHistoryOptions: public utl::detail::Options Do it in your source only. */ - static SvtHistoryOptions_Impl* m_pDataContainer ; /// impl. data container as dynamic pointer for smaller memory requirements! - static sal_Int32 m_nRefCount ; /// internal ref count mechanism + static SvtHistoryOptions_Impl* m_pDataContainer ; /// impl. data container as dynamic pointer for smaller memory requirements! + static sal_Int32 m_nRefCount ; /// internal ref count mechanism -}; // class SvtHistoryOptions +}; // class SvtHistoryOptions -#endif // #ifndef INCLUDED_SVTOOLS_HISTORYOPTIONS_HXX +#endif // #ifndef INCLUDED_SVTOOLS_HISTORYOPTIONS_HXX diff --git a/unotools/inc/unotools/historyoptions_const.hxx b/unotools/inc/unotools/historyoptions_const.hxx index 1d57d5146666..e3acd20b5d60 100644 --- a/unotools/inc/unotools/historyoptions_const.hxx +++ b/unotools/inc/unotools/historyoptions_const.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/unotools/inc/unotools/idhelper.hxx b/unotools/inc/unotools/idhelper.hxx index d8c734025b12..57a2aa5a9d92 100644 --- a/unotools/inc/unotools/idhelper.hxx +++ b/unotools/inc/unotools/idhelper.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 @@ namespace utl //========================================================================= // to shorten some lines ... -typedef ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > TypeSequence; +typedef ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > TypeSequence; // compare to Sequences of Types struct TypeSequenceLess : public ::std::binary_function<TypeSequence, TypeSequence, bool> @@ -77,14 +77,14 @@ public: }; // declare the map -DECLARE_STL_MAP ( TypeSequence, +DECLARE_STL_MAP ( TypeSequence, ::cppu::OImplementationId, TypeSequenceLess, MapType2Id ); //......................................................................... -} // namespace utl +} // namespace utl //......................................................................... //========================================================================= @@ -106,39 +106,39 @@ DECLARE_STL_MAP ( TypeSequence, cleared. The less classes use it, the earlier map entries which may have been reused will be cleared. */ -#define DECLARE_IMPLEMENTATIONID_HELPER(_namespace, classname) \ -namespace _namespace { \ -class classname \ -{ \ - friend class classname##Ref; \ +#define DECLARE_IMPLEMENTATIONID_HELPER(_namespace, classname) \ +namespace _namespace { \ +class classname \ +{ \ + friend class classname##Ref; \ \ - static sal_Int32 s_nReferenced; \ - static void* s_pMap; \ + static sal_Int32 s_nReferenced; \ + static void* s_pMap; \ \ - static ::osl::Mutex s_aMutex; \ + static ::osl::Mutex s_aMutex; \ \ -public: \ - static void acquire(); \ - static void release(); \ +public: \ + static void acquire(); \ + static void release(); \ \ - static ::com::sun::star::uno::Sequence< sal_Int8 > getImplementationId( \ - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >& _rTypes); \ + static ::com::sun::star::uno::Sequence< sal_Int8 > getImplementationId( \ + const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >& _rTypes); \ \ -private: \ - static void implCreateMap(); \ +private: \ + static void implCreateMap(); \ \ - classname() { } \ -}; \ + classname() { } \ +}; \ \ -/*=======================================================================*/ \ -class classname##Ref \ -{ \ -public: \ - classname##Ref() { classname::acquire(); } \ - ~classname##Ref() { classname::release(); } \ -}; \ +/*=======================================================================*/ \ +class classname##Ref \ +{ \ +public: \ + classname##Ref() { classname::acquire(); } \ + ~classname##Ref() { classname::release(); } \ +}; \ \ -} /* _namespace */ \ +} /* _namespace */ \ \ /************************************************************************* @@ -147,62 +147,62 @@ public: \ /** implement an id helper */ -#define IMPLEMENT_IMPLEMENTATIONID_HELPER(_namespace, classname) \ -namespace _namespace { \ +#define IMPLEMENT_IMPLEMENTATIONID_HELPER(_namespace, classname) \ +namespace _namespace { \ \ -/*=======================================================================*/ \ +/*=======================================================================*/ \ \ -sal_Int32 classname::s_nReferenced(0); \ -void* classname::s_pMap = NULL; \ -::osl::Mutex classname::s_aMutex; \ +sal_Int32 classname::s_nReferenced(0); \ +void* classname::s_pMap = NULL; \ +::osl::Mutex classname::s_aMutex; \ \ -/*-----------------------------------------------------------------------*/ \ -void classname::acquire() \ -{ \ - ::osl::MutexGuard aGuard(s_aMutex); \ - ++s_nReferenced; \ -} \ +/*-----------------------------------------------------------------------*/ \ +void classname::acquire() \ +{ \ + ::osl::MutexGuard aGuard(s_aMutex); \ + ++s_nReferenced; \ +} \ \ -/*-----------------------------------------------------------------------*/ \ -void classname::release() \ -{ \ - ::osl::MutexGuard aGuard(s_aMutex); \ - if (!--s_nReferenced) \ - { \ - delete static_cast< ::utl::MapType2Id *>( s_pMap ); \ - s_pMap = NULL; \ - } \ -} \ +/*-----------------------------------------------------------------------*/ \ +void classname::release() \ +{ \ + ::osl::MutexGuard aGuard(s_aMutex); \ + if (!--s_nReferenced) \ + { \ + delete static_cast< ::utl::MapType2Id *>( s_pMap ); \ + s_pMap = NULL; \ + } \ +} \ \ -/*-----------------------------------------------------------------------*/ \ -::com::sun::star::uno::Sequence< sal_Int8 > classname::getImplementationId( \ - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >& _rTypes) \ -{ \ - ::osl::MutexGuard aGuard(s_aMutex); \ - DBG_ASSERT(s_nReferenced, \ - "classname::getImplementationId : you need to hold a reference to this class in order to use it !"); \ - /* give the calling class a member of type classname##Ref and all is fine .... */ \ +/*-----------------------------------------------------------------------*/ \ +::com::sun::star::uno::Sequence< sal_Int8 > classname::getImplementationId( \ + const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >& _rTypes) \ +{ \ + ::osl::MutexGuard aGuard(s_aMutex); \ + DBG_ASSERT(s_nReferenced, \ + "classname::getImplementationId : you need to hold a reference to this class in order to use it !"); \ + /* give the calling class a member of type classname##Ref and all is fine .... */ \ \ - implCreateMap(); \ + implCreateMap(); \ \ - ::utl::MapType2Id* pMap = static_cast< ::utl::MapType2Id *>(s_pMap); \ + ::utl::MapType2Id* pMap = static_cast< ::utl::MapType2Id *>(s_pMap); \ \ - ::cppu::OImplementationId& rId = (*pMap)[_rTypes]; \ - /* this will create an entry for the given type sequence, if neccessary */ \ + ::cppu::OImplementationId& rId = (*pMap)[_rTypes]; \ + /* this will create an entry for the given type sequence, if neccessary */ \ \ - return rId.getImplementationId(); \ -} \ + return rId.getImplementationId(); \ +} \ \ -/*-----------------------------------------------------------------------*/ \ -void classname::implCreateMap() \ -{ \ - if (s_pMap) \ - return; \ - s_pMap = new ::utl::MapType2Id(); \ -} \ +/*-----------------------------------------------------------------------*/ \ +void classname::implCreateMap() \ +{ \ + if (s_pMap) \ + return; \ + s_pMap = new ::utl::MapType2Id(); \ +} \ \ \ -} /* _namespace */ \ +} /* _namespace */ \ \ diff --git a/unotools/inc/unotools/inetoptions.hxx b/unotools/inc/unotools/inetoptions.hxx index f69d3d211c9c..1a6d1b8fcc7c 100644 --- a/unotools/inc/unotools/inetoptions.hxx +++ b/unotools/inc/unotools/inetoptions.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/unotools/inc/unotools/internaloptions.hxx b/unotools/inc/unotools/internaloptions.hxx index 7e2be078811d..0c8ad67f61bf 100644 --- a/unotools/inc/unotools/internaloptions.hxx +++ b/unotools/inc/unotools/internaloptions.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 INCLUDED_unotools_INTERNALOPTIONS_HXX //_________________________________________________________________________________________________________________ -// includes +// includes //_________________________________________________________________________________________________________________ #include "unotools/unotoolsdllapi.h" @@ -38,19 +38,19 @@ #include <unotools/options.hxx> //_________________________________________________________________________________________________________________ -// namespaces! +// namespaces! //_________________________________________________________________________________________________________________ -#define MUTEX ::osl::Mutex -#define OUSTRING ::rtl::OUString +#define MUTEX ::osl::Mutex +#define OUSTRING ::rtl::OUString //_________________________________________________________________________________________________________________ -// 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! *//*-*************************************************************************************************************/ @@ -58,108 +58,108 @@ class SvtInternalOptions_Impl; //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** - @short collect informations about internal features + @short collect informations about internal features @descr - - @implements - - @base - + @implements - + @base - - @ATTENTION This class is partially threadsafe. + @ATTENTION This class is partially threadsafe. - @devstatus ready to use + @devstatus ready to use *//*-*************************************************************************************************************/ class UNOTOOLS_DLLPUBLIC SvtInternalOptions: public utl::detail::Options { //------------------------------------------------------------------------------------------------------------- - // 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 - *//*-*****************************************************************************************************/ SvtInternalOptions(); virtual ~SvtInternalOptions(); //--------------------------------------------------------------------------------------------------------- - // interface + // interface //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short interface methods to get and set value of config key "org.openoffice.Office.Common/Internal/..." + @short interface methods to get and set value of config key "org.openoffice.Office.Common/Internal/..." @descr These options describe internal states to enable/disable features of installed office. The values are fixed at runtime - and implemented as readonly! - SlotCFGEnabled() => If this option is set (true), StarOffice is searching for the slot.cfg. + SlotCFGEnabled() => If this option is set (true), StarOffice is searching for the slot.cfg. If the slot.cfg cannot be found, the start is aborted. If this option is not set (false), the slot.cfg must not be available, otherwise the start is also aborted. - CrashMailEnabled() => Crash-Mail-Feature to document program crashes. After a crash, + CrashMailEnabled() => Crash-Mail-Feature to document program crashes. After a crash, an e-mail with information about the system used is generated automatically when starting StarOffice. - @seealso configuration package "org.openoffice.Office.Common/Internal" + @seealso configuration package "org.openoffice.Office.Common/Internal" *//*-*****************************************************************************************************/ - sal_Bool SlotCFGEnabled () const; - sal_Bool CrashMailEnabled () const; - sal_Bool MailUIEnabled () const; - sal_Bool IsRemoveMenuEntryClose() const; - sal_Bool IsRemoveMenuEntryBackToWebtop() const; - sal_Bool IsRemoveMenuEntryNewWebtop() const; - sal_Bool IsRemoveMenuEntryLogout() const; + sal_Bool SlotCFGEnabled () const; + sal_Bool CrashMailEnabled () const; + sal_Bool MailUIEnabled () const; + sal_Bool IsRemoveMenuEntryClose() const; + sal_Bool IsRemoveMenuEntryBackToWebtop() const; + sal_Bool IsRemoveMenuEntryNewWebtop() const; + sal_Bool IsRemoveMenuEntryLogout() const; - OUSTRING GetCurrentTempURL() const; - void SetCurrentTempURL( const OUSTRING& aNewCurrentTempURL ); + OUSTRING GetCurrentTempURL() const; + void SetCurrentTempURL( const OUSTRING& aNewCurrentTempURL ); //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: /*-****************************************************************************************************//** - @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 - *//*-*****************************************************************************************************/ UNOTOOLS_DLLPRIVATE static MUTEX& GetOwnStaticMutex(); //------------------------------------------------------------------------------------------------------------- - // private member + // private member //------------------------------------------------------------------------------------------------------------- private: @@ -172,9 +172,9 @@ class UNOTOOLS_DLLPUBLIC SvtInternalOptions: public utl::detail::Options Do it in your source only. */ - static SvtInternalOptions_Impl* m_pDataContainer ; /// impl. data container as dynamic pointer for smaller memory requirements! - static sal_Int32 m_nRefCount ; /// internal ref count mechanism + static SvtInternalOptions_Impl* m_pDataContainer ; /// impl. data container as dynamic pointer for smaller memory requirements! + static sal_Int32 m_nRefCount ; /// internal ref count mechanism -}; // class SvtInternalOptions +}; // class SvtInternalOptions #endif // #ifndef INCLUDED_unotools_INTERNALOPTIONS_HXX diff --git a/unotools/inc/unotools/intlwrapper.hxx b/unotools/inc/unotools/intlwrapper.hxx index e35f4cc9268f..49754e473e73 100644 --- a/unotools/inc/unotools/intlwrapper.hxx +++ b/unotools/inc/unotools/intlwrapper.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,7 +55,7 @@ class UNOTOOLS_DLLPUBLIC IntlWrapper { private: - ::com::sun::star::lang::Locale aLocale; + ::com::sun::star::lang::Locale aLocale; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xSMgr; CharClass* pCharClass; diff --git a/unotools/inc/unotools/itemholderbase.hxx b/unotools/inc/unotools/itemholderbase.hxx index df1892d41a12..060357c6fb77 100644 --- a/unotools/inc/unotools/itemholderbase.hxx +++ b/unotools/inc/unotools/itemholderbase.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/unotools/inc/unotools/javaoptions.hxx b/unotools/inc/unotools/javaoptions.hxx index 38e023556716..b01836063f47 100644 --- a/unotools/inc/unotools/javaoptions.hxx +++ b/unotools/inc/unotools/javaoptions.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/unotools/inc/unotools/lingucfg.hxx b/unotools/inc/unotools/lingucfg.hxx index 9a26bdd73021..9b785a2e6f64 100755 --- a/unotools/inc/unotools/lingucfg.hxx +++ b/unotools/inc/unotools/lingucfg.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,14 +49,14 @@ class SvtLinguConfigItem; struct UNOTOOLS_DLLPUBLIC SvtLinguOptions { - ::com::sun::star::uno::Sequence< rtl::OUString > aActiveDics; + ::com::sun::star::uno::Sequence< rtl::OUString > aActiveDics; ::com::sun::star::uno::Sequence< rtl::OUString > aActiveConvDics; BOOL bROActiveDics; BOOL bROActiveConvDics; // Hyphenator service specific options - INT16 nHyphMinLeading, + INT16 nHyphMinLeading, nHyphMinTrailing, nHyphMinWordLength; @@ -65,39 +65,39 @@ struct UNOTOOLS_DLLPUBLIC SvtLinguOptions bROHyphMinWordLength; // misc options (non-service specific) - INT16 nDefaultLanguage; - INT16 nDefaultLanguage_CJK; - INT16 nDefaultLanguage_CTL; + INT16 nDefaultLanguage; + INT16 nDefaultLanguage_CJK; + INT16 nDefaultLanguage_CTL; BOOL bRODefaultLanguage; BOOL bRODefaultLanguage_CJK; BOOL bRODefaultLanguage_CTL; // spelling options (non-service specific) - BOOL bIsSpellSpecial; - BOOL bIsSpellAuto; - BOOL bIsSpellReverse; + BOOL bIsSpellSpecial; + BOOL bIsSpellAuto; + BOOL bIsSpellReverse; BOOL bROIsSpellSpecial; BOOL bROIsSpellAuto; BOOL bROIsSpellReverse; // hyphenation options (non-service specific) - BOOL bIsHyphSpecial; - BOOL bIsHyphAuto; + BOOL bIsHyphSpecial; + BOOL bIsHyphAuto; BOOL bROIsHyphSpecial; BOOL bROIsHyphAuto; // common to SpellChecker, Hyphenator and Thesaurus service - BOOL bIsUseDictionaryList; - BOOL bIsIgnoreControlCharacters; + BOOL bIsUseDictionaryList; + BOOL bIsIgnoreControlCharacters; BOOL bROIsUseDictionaryList; BOOL bROIsIgnoreControlCharacters; // SpellChecker service specific options - BOOL bIsSpellWithDigits, + BOOL bIsSpellWithDigits, bIsSpellUpperCase, bIsSpellCapitalization; @@ -144,11 +144,11 @@ struct UNOTOOLS_DLLPUBLIC SvtLinguOptions struct UNOTOOLS_DLLPUBLIC SvtLinguConfigDictionaryEntry { // the URL's pointing to the location of the files the dictionary consists of - com::sun::star::uno::Sequence< rtl::OUString > aLocations; + com::sun::star::uno::Sequence< rtl::OUString > aLocations; // the name of the dictionary format implement - rtl::OUString aFormatName; + rtl::OUString aFormatName; // the list of languages (ISO names) the dictionary can be used for - com::sun::star::uno::Sequence< rtl::OUString > aLocaleNames; + com::sun::star::uno::Sequence< rtl::OUString > aLocaleNames; }; ////////////////////////////////////////////////////////////////////// diff --git a/unotools/inc/unotools/linguprops.hxx b/unotools/inc/unotools/linguprops.hxx index 4f2640116454..add07cd6e3d9 100644 --- a/unotools/inc/unotools/linguprops.hxx +++ b/unotools/inc/unotools/linguprops.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 @@ -30,35 +30,35 @@ // UNO property names for general options -#define UPN_IS_GERMAN_PRE_REFORM "IsGermanPreReform" /*! deprecated #i91949 !*/ -#define UPN_IS_USE_DICTIONARY_LIST "IsUseDictionaryList" -#define UPN_IS_IGNORE_CONTROL_CHARACTERS "IsIgnoreControlCharacters" -#define UPN_ACTIVE_DICTIONARIES "ActiveDictionaries" +#define UPN_IS_GERMAN_PRE_REFORM "IsGermanPreReform" /*! deprecated #i91949 !*/ +#define UPN_IS_USE_DICTIONARY_LIST "IsUseDictionaryList" +#define UPN_IS_IGNORE_CONTROL_CHARACTERS "IsIgnoreControlCharacters" +#define UPN_ACTIVE_DICTIONARIES "ActiveDictionaries" // UNO property names for SpellChecker -#define UPN_IS_SPELL_UPPER_CASE "IsSpellUpperCase" -#define UPN_IS_SPELL_WITH_DIGITS "IsSpellWithDigits" -#define UPN_IS_SPELL_CAPITALIZATION "IsSpellCapitalization" +#define UPN_IS_SPELL_UPPER_CASE "IsSpellUpperCase" +#define UPN_IS_SPELL_WITH_DIGITS "IsSpellWithDigits" +#define UPN_IS_SPELL_CAPITALIZATION "IsSpellCapitalization" // UNO property names for Hyphenator -#define UPN_HYPH_MIN_LEADING "HyphMinLeading" -#define UPN_HYPH_MIN_TRAILING "HyphMinTrailing" -#define UPN_HYPH_MIN_WORD_LENGTH "HyphMinWordLength" +#define UPN_HYPH_MIN_LEADING "HyphMinLeading" +#define UPN_HYPH_MIN_TRAILING "HyphMinTrailing" +#define UPN_HYPH_MIN_WORD_LENGTH "HyphMinWordLength" // UNO property names for Lingu // (those not covered by the SpellChecker and Hyphenator // properties and more likely to be used in other modules only) -#define UPN_DEFAULT_LANGUAGE "DefaultLanguage" -#define UPN_DEFAULT_LOCALE "DefaultLocale" -#define UPN_DEFAULT_LOCALE_CJK "DefaultLocale_CJK" -#define UPN_DEFAULT_LOCALE_CTL "DefaultLocale_CTL" -#define UPN_IS_HYPH_AUTO "IsHyphAuto" -#define UPN_IS_HYPH_SPECIAL "IsHyphSpecial" -#define UPN_IS_SPELL_AUTO "IsSpellAuto" -#define UPN_IS_SPELL_HIDE "IsSpellHide" /*! deprecated #i91949 !*/ -#define UPN_IS_SPELL_IN_ALL_LANGUAGES "IsSpellInAllLanguages" /*! deprecated #i91949 !*/ -#define UPN_IS_SPELL_SPECIAL "IsSpellSpecial" -#define UPN_IS_WRAP_REVERSE "IsWrapReverse" +#define UPN_DEFAULT_LANGUAGE "DefaultLanguage" +#define UPN_DEFAULT_LOCALE "DefaultLocale" +#define UPN_DEFAULT_LOCALE_CJK "DefaultLocale_CJK" +#define UPN_DEFAULT_LOCALE_CTL "DefaultLocale_CTL" +#define UPN_IS_HYPH_AUTO "IsHyphAuto" +#define UPN_IS_HYPH_SPECIAL "IsHyphSpecial" +#define UPN_IS_SPELL_AUTO "IsSpellAuto" +#define UPN_IS_SPELL_HIDE "IsSpellHide" /*! deprecated #i91949 !*/ +#define UPN_IS_SPELL_IN_ALL_LANGUAGES "IsSpellInAllLanguages" /*! deprecated #i91949 !*/ +#define UPN_IS_SPELL_SPECIAL "IsSpellSpecial" +#define UPN_IS_WRAP_REVERSE "IsWrapReverse" #define UPN_DATA_FILES_CHANGED_CHECK_VALUE "DataFilesChangedCheckValue" // UNO property names for text conversion options @@ -84,28 +84,28 @@ #define UPN_IS_GRAMMAR_INTERACTIVE "IsInteractiveGrammarCheck" // uno property handles -#define UPH_IS_GERMAN_PRE_REFORM 0 -#define UPH_IS_USE_DICTIONARY_LIST 1 -#define UPH_IS_IGNORE_CONTROL_CHARACTERS 2 -#define UPH_IS_SPELL_UPPER_CASE 3 -#define UPH_IS_SPELL_WITH_DIGITS 4 -#define UPH_IS_SPELL_CAPITALIZATION 5 -#define UPH_HYPH_MIN_LEADING 6 -#define UPH_HYPH_MIN_TRAILING 7 -#define UPH_HYPH_MIN_WORD_LENGTH 8 -#define UPH_DEFAULT_LOCALE 9 -#define UPH_IS_SPELL_AUTO 10 -#define UPH_IS_SPELL_HIDE 11 -#define UPH_IS_SPELL_IN_ALL_LANGUAGES 12 -#define UPH_IS_SPELL_SPECIAL 13 -#define UPH_IS_HYPH_AUTO 14 -#define UPH_IS_HYPH_SPECIAL 15 -#define UPH_IS_WRAP_REVERSE 16 +#define UPH_IS_GERMAN_PRE_REFORM 0 +#define UPH_IS_USE_DICTIONARY_LIST 1 +#define UPH_IS_IGNORE_CONTROL_CHARACTERS 2 +#define UPH_IS_SPELL_UPPER_CASE 3 +#define UPH_IS_SPELL_WITH_DIGITS 4 +#define UPH_IS_SPELL_CAPITALIZATION 5 +#define UPH_HYPH_MIN_LEADING 6 +#define UPH_HYPH_MIN_TRAILING 7 +#define UPH_HYPH_MIN_WORD_LENGTH 8 +#define UPH_DEFAULT_LOCALE 9 +#define UPH_IS_SPELL_AUTO 10 +#define UPH_IS_SPELL_HIDE 11 +#define UPH_IS_SPELL_IN_ALL_LANGUAGES 12 +#define UPH_IS_SPELL_SPECIAL 13 +#define UPH_IS_HYPH_AUTO 14 +#define UPH_IS_HYPH_SPECIAL 15 +#define UPH_IS_WRAP_REVERSE 16 #define UPH_DATA_FILES_CHANGED_CHECK_VALUE 17 -#define UPH_DEFAULT_LANGUAGE 21 -#define UPH_DEFAULT_LOCALE_CJK 22 -#define UPH_DEFAULT_LOCALE_CTL 23 -#define UPH_ACTIVE_DICTIONARIES 24 +#define UPH_DEFAULT_LANGUAGE 21 +#define UPH_DEFAULT_LOCALE_CJK 22 +#define UPH_DEFAULT_LOCALE_CTL 23 +#define UPH_ACTIVE_DICTIONARIES 24 #define UPH_ACTIVE_CONVERSION_DICTIONARIES 25 #define UPH_IS_IGNORE_POST_POSITIONAL_WORD 26 #define UPH_IS_AUTO_CLOSE_DIALOG 27 diff --git a/unotools/inc/unotools/localedatawrapper.hxx b/unotools/inc/unotools/localedatawrapper.hxx index fd09b07e58cb..a72fb91fc182 100644 --- a/unotools/inc/unotools/localedatawrapper.hxx +++ b/unotools/inc/unotools/localedatawrapper.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,50 +75,50 @@ class UNOTOOLS_DLLPUBLIC LocaleDataWrapper ::com::sun::star::uno::Sequence< ::rtl::OUString > aReservedWordSeq; ::com::sun::star::uno::Sequence< sal_Int32 > aGrouping; // cached items - String aLocaleItem[::com::sun::star::i18n::LocaleItem::COUNT]; - String aReservedWord[::com::sun::star::i18n::reservedWords::COUNT]; - String aCurrSymbol; - String aCurrBankSymbol; - int nDateFormat; - int nLongDateFormat; - USHORT nCurrPositiveFormat; - USHORT nCurrNegativeFormat; - USHORT nCurrDigits; - BOOL bLocaleDataItemValid; - BOOL bReservedWordValid; + String aLocaleItem[::com::sun::star::i18n::LocaleItem::COUNT]; + String aReservedWord[::com::sun::star::i18n::reservedWords::COUNT]; + String aCurrSymbol; + String aCurrBankSymbol; + int nDateFormat; + int nLongDateFormat; + USHORT nCurrPositiveFormat; + USHORT nCurrNegativeFormat; + USHORT nCurrDigits; + BOOL bLocaleDataItemValid; + BOOL bReservedWordValid; mutable ::utl::ReadWriteMutex aMutex; // dummies, to be implemented or provided by XML locale data - sal_Unicode cCurrZeroChar; + sal_Unicode cCurrZeroChar; // not implemented, prevent usage LocaleDataWrapper( const LocaleDataWrapper& ); - LocaleDataWrapper& operator=( const LocaleDataWrapper& ); + LocaleDataWrapper& operator=( const LocaleDataWrapper& ); // whenever Locale changes - void invalidateData(); + void invalidateData(); - void getOneLocaleItemImpl( sal_Int16 nItem ); - const String& getOneLocaleItem( sal_Int16 nItem ) const; + void getOneLocaleItemImpl( sal_Int16 nItem ); + const String& getOneLocaleItem( sal_Int16 nItem ) const; - void getOneReservedWordImpl( sal_Int16 nWord ); - const String& getOneReservedWord( sal_Int16 nWord ) const; + void getOneReservedWordImpl( sal_Int16 nWord ); + const String& getOneReservedWord( sal_Int16 nWord ) const; - void getCurrSymbolsImpl(); - void getCurrFormatsImpl(); + void getCurrSymbolsImpl(); + void getCurrFormatsImpl(); void scanCurrFormatImpl( const String& rCode, xub_StrLen nStart, xub_StrLen& nSign, xub_StrLen& nPar, xub_StrLen& nNum, xub_StrLen& nBlank, xub_StrLen& nSym ); - void getDateFormatsImpl(); + void getDateFormatsImpl(); DateFormat scanDateFormatImpl( const String& rCode ); void getDefaultCalendarImpl(); - sal_Unicode* ImplAddFormatNum( sal_Unicode* pBuf, + sal_Unicode* ImplAddFormatNum( sal_Unicode* pBuf, sal_Int64 nNumber, USHORT nDecimals, BOOL bUseThousandSep, BOOL bTrailingZeros ) const; @@ -141,7 +141,7 @@ public: const { return xSMgr; } /// set a new Locale to request - void setLocale( const ::com::sun::star::lang::Locale& rLocale ); + void setLocale( const ::com::sun::star::lang::Locale& rLocale ); /// get current requested Locale const ::com::sun::star::lang::Locale& getLocale() const; @@ -177,7 +177,7 @@ public: static ::com::sun::star::uno::Sequence< sal_uInt16 > getInstalledLanguageTypes(); /// maps the LocaleData string to the International enum - MeasurementSystem mapMeasurementStringToEnum( const String& rMS ) const; + MeasurementSystem mapMeasurementStringToEnum( const String& rMS ) const; /// Convenience method to obtain the default calendar. const ::boost::shared_ptr< ::com::sun::star::i18n::Calendar > getDefaultCalendar() const; @@ -202,56 +202,56 @@ public: // Functionality of class International methods, LocaleItem - inline const String& getDateSep() const + inline const String& getDateSep() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::DATE_SEPARATOR ); } - inline const String& getNumThousandSep() const + inline const String& getNumThousandSep() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::THOUSAND_SEPARATOR ); } - inline const String& getNumDecimalSep() const + inline const String& getNumDecimalSep() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::DECIMAL_SEPARATOR ); } - inline const String& getTimeSep() const + inline const String& getTimeSep() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::TIME_SEPARATOR ); } - inline const String& getTime100SecSep() const + inline const String& getTime100SecSep() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::TIME_100SEC_SEPARATOR ); } - inline const String& getListSep() const + inline const String& getListSep() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::LIST_SEPARATOR ); } - inline const String& getQuotationMarkStart() const + inline const String& getQuotationMarkStart() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::SINGLE_QUOTATION_START ); } - inline const String& getQuotationMarkEnd() const + inline const String& getQuotationMarkEnd() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::SINGLE_QUOTATION_END ); } - inline const String& getDoubleQuotationMarkStart() const + inline const String& getDoubleQuotationMarkStart() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::DOUBLE_QUOTATION_START ); } - inline const String& getDoubleQuotationMarkEnd() const + inline const String& getDoubleQuotationMarkEnd() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::DOUBLE_QUOTATION_END ); } - inline const String& getMeasurementSystem() const + inline const String& getMeasurementSystem() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::MEASUREMENT_SYSTEM ); } - inline MeasurementSystem getMeasurementSystemEnum() const + inline MeasurementSystem getMeasurementSystemEnum() const { return mapMeasurementStringToEnum( getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::MEASUREMENT_SYSTEM ) ); } - inline const String& getTimeAM() const + inline const String& getTimeAM() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::TIME_AM ); } - inline const String& getTimePM() const + inline const String& getTimePM() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::TIME_PM ); } - inline const String& getLongDateDayOfWeekSep() const + inline const String& getLongDateDayOfWeekSep() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::LONG_DATE_DAY_OF_WEEK_SEPARATOR ); } - inline const String& getLongDateDaySep() const + inline const String& getLongDateDaySep() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::LONG_DATE_DAY_SEPARATOR ); } - inline const String& getLongDateMonthSep() const + inline const String& getLongDateMonthSep() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::LONG_DATE_MONTH_SEPARATOR ); } - inline const String& getLongDateYearSep() const + inline const String& getLongDateYearSep() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::LONG_DATE_YEAR_SEPARATOR ); } // currency - const String& getCurrSymbol() const; - const String& getCurrBankSymbol() const; - USHORT getCurrPositiveFormat() const; - USHORT getCurrNegativeFormat() const; - USHORT getCurrDigits() const; + const String& getCurrSymbol() const; + const String& getCurrBankSymbol() const; + USHORT getCurrPositiveFormat() const; + USHORT getCurrNegativeFormat() const; + USHORT getCurrDigits() const; // simple date and time formatting - DateFormat getDateFormat() const; - DateFormat getLongDateFormat() const; + DateFormat getDateFormat() const; + DateFormat getLongDateFormat() const; /// only numerical values of Gregorian calendar - String getDate( const Date& rDate ) const; - String getTime( const Time& rTime, BOOL bSec = TRUE, + String getDate( const Date& rDate ) const; + String getTime( const Time& rTime, BOOL bSec = TRUE, BOOL b100Sec = FALSE ) const; String getDuration( const Time& rTime, BOOL bSec = TRUE, BOOL b100Sec = FALSE ) const; @@ -305,7 +305,7 @@ public: getCurrSymbol(), bUseThousandSep ); } // dummy returns, to be implemented - inline sal_Unicode getCurrZeroChar() const + inline sal_Unicode getCurrZeroChar() const { return cCurrZeroChar; } inline BOOL isNumLeadingZero() const { return TRUE; } @@ -318,16 +318,16 @@ public: // reserved words - inline const String& getTrueWord() const + inline const String& getTrueWord() const { return getOneReservedWord( ::com::sun::star::i18n::reservedWords::TRUE_WORD ); } - inline const String& getFalseWord() const + inline const String& getFalseWord() const { return getOneReservedWord( ::com::sun::star::i18n::reservedWords::FALSE_WORD ); } /// return a quarter string matching nQuarter (0..3) => "1st quarter" .. "4th quarter" inline const String& getQuarterWord( sal_Int16 nQuarter ) const { return getOneReservedWord( ::com::sun::star::i18n::reservedWords::QUARTER1_WORD + nQuarter ); } - inline const String& getAboveWord() const + inline const String& getAboveWord() const { return getOneReservedWord( ::com::sun::star::i18n::reservedWords::ABOVE_WORD ); } - inline const String& getBelowWord() const + inline const String& getBelowWord() const { return getOneReservedWord( ::com::sun::star::i18n::reservedWords::BELOW_WORD ); } /// return a quarter abbreviation string matching nQuarter (0..3) => "Q1" .. "Q2" inline const String& getQuarterAbbreviation( sal_Int16 nQuarter ) const @@ -347,7 +347,7 @@ public: /** Append locale info to string, used with locale data checking. A string similar to "de_DE requested\n en_US loaded" is appended. */ - String& appendLocaleInfo( String& rDebugMsg ) const; + String& appendLocaleInfo( String& rDebugMsg ) const; /** Ouput a message during locale data checking. The (UTF-8) string is written to stderr and in a non-product build or if DBG_UTIL is enabled diff --git a/unotools/inc/unotools/localfilehelper.hxx b/unotools/inc/unotools/localfilehelper.hxx index 11e0851c3298..6409d8331aad 100644 --- a/unotools/inc/unotools/localfilehelper.hxx +++ b/unotools/inc/unotools/localfilehelper.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/unotools/inc/unotools/localisationoptions.hxx b/unotools/inc/unotools/localisationoptions.hxx index acce942f6a42..56110659e8c1 100644 --- a/unotools/inc/unotools/localisationoptions.hxx +++ b/unotools/inc/unotools/localisationoptions.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 INCLUDED_unotools_LOCALISATIONOPTIONS_HXX //_________________________________________________________________________________________________________________ -// includes +// includes //_________________________________________________________________________________________________________________ #include <sal/types.h> @@ -37,12 +37,12 @@ #include <unotools/options.hxx> //_________________________________________________________________________________________________________________ -// 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! *//*-*************************************************************************************************************/ @@ -50,114 +50,114 @@ class SvtLocalisationOptions_Impl; //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** - @short collect informations about localisation features + @short collect informations about localisation features @descr - - @implements - - @base - + @implements - + @base - - @devstatus ready to use + @devstatus ready to use *//*-*************************************************************************************************************/ class UNOTOOLS_DLLPUBLIC SvtLocalisationOptions: public utl::detail::Options { //------------------------------------------------------------------------------------------------------------- - // 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 - *//*-*****************************************************************************************************/ SvtLocalisationOptions(); virtual ~SvtLocalisationOptions(); //--------------------------------------------------------------------------------------------------------- - // interface + // interface //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short interface methods to get and set value of config key "org.openoffice.Office.Common/View/Localisation/AutoMnemonic" - @descr These value specifies if shortcuts should be assigned automatically. + @short interface methods to get and set value of config key "org.openoffice.Office.Common/View/Localisation/AutoMnemonic" + @descr These value specifies if shortcuts should be assigned automatically. - @seealso - + @seealso - - @param "bState", new value to set it in configuration. - @return The value which represent current state of internal variable. + @param "bState", new value to set it in configuration. + @return The value which represent current state of internal variable. - @onerror No error should occurre! + @onerror No error should occurre! *//*-*****************************************************************************************************/ - sal_Bool IsAutoMnemonic ( ) const ; - void SetAutoMnemonic ( sal_Bool bState ) ; + sal_Bool IsAutoMnemonic ( ) const ; + void SetAutoMnemonic ( sal_Bool bState ) ; /*-****************************************************************************************************//** - @short interface methods to get and set value of config key "org.openoffice.Office.Common/View/Localisation/DialogScale" - @descr These value specifies the factor for increasing controls. + @short interface methods to get and set value of config key "org.openoffice.Office.Common/View/Localisation/DialogScale" + @descr These value specifies the factor for increasing controls. Value from [0..100] are allowed. - @ATTENTION These methods don't check for valid or invalid values! + @ATTENTION These methods don't check for valid or invalid values! Our configuration server can do it ... but these implementation don't get any notifications about wrong commits ...! => If you set an invalid value - nothing will be changed. The information will lost. - @seealso baseclass ConfigItem + @seealso baseclass ConfigItem - @param "nScale" new value to set it in configuration. - @return The value which represent current state of internal variable. + @param "nScale" new value to set it in configuration. + @return The value which represent current state of internal variable. - @onerror No error should occurre! + @onerror No error should occurre! *//*-*****************************************************************************************************/ - sal_Int32 GetDialogScale( ) const ; - void SetDialogScale( sal_Int32 nScale ) ; + sal_Int32 GetDialogScale( ) const ; + void SetDialogScale( sal_Int32 nScale ) ; //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: /*-****************************************************************************************************//** - @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 - *//*-*****************************************************************************************************/ UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex(); //------------------------------------------------------------------------------------------------------------- - // private member + // private member //------------------------------------------------------------------------------------------------------------- private: @@ -170,9 +170,9 @@ class UNOTOOLS_DLLPUBLIC SvtLocalisationOptions: public utl::detail::Options Do it in your source only. */ - static SvtLocalisationOptions_Impl* m_pDataContainer ; /// impl. data container as dynamic pointer for smaller memory requirements! - static sal_Int32 m_nRefCount ; /// internal ref count mechanism + static SvtLocalisationOptions_Impl* m_pDataContainer ; /// impl. data container as dynamic pointer for smaller memory requirements! + static sal_Int32 m_nRefCount ; /// internal ref count mechanism -}; // class SvtLocalisationOptions +}; // class SvtLocalisationOptions #endif // #ifndef INCLUDED_unotools_LOCALISATIONOPTIONS_HXX diff --git a/unotools/inc/unotools/loghelper.hxx b/unotools/inc/unotools/loghelper.hxx index d5421089dff4..1b106ba74b50 100644 --- a/unotools/inc/unotools/loghelper.hxx +++ b/unotools/inc/unotools/loghelper.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/unotools/inc/unotools/misccfg.hxx b/unotools/inc/unotools/misccfg.hxx index 01b8db21138f..b9af389c2175 100644 --- a/unotools/inc/unotools/misccfg.hxx +++ b/unotools/inc/unotools/misccfg.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,23 +40,23 @@ namespace utl class UNOTOOLS_DLLPUBLIC MiscCfg : public detail::Options { - SfxMiscCfg* pImpl; + SfxMiscCfg* pImpl; public: MiscCfg( ); virtual ~MiscCfg( ); - BOOL IsNotFoundWarning() const; - void SetNotFoundWarning( BOOL bSet); + BOOL IsNotFoundWarning() const; + void SetNotFoundWarning( BOOL bSet); - BOOL IsPaperSizeWarning() const; - void SetPaperSizeWarning(BOOL bSet); + BOOL IsPaperSizeWarning() const; + void SetPaperSizeWarning(BOOL bSet); - BOOL IsPaperOrientationWarning() const; - void SetPaperOrientationWarning( BOOL bSet); + BOOL IsPaperOrientationWarning() const; + void SetPaperOrientationWarning( BOOL bSet); // 0 ... 99 - sal_Int32 GetYear2000() const; + sal_Int32 GetYear2000() const; void SetYear2000( sal_Int32 nSet ); }; diff --git a/unotools/inc/unotools/moduleoptions.hxx b/unotools/inc/unotools/moduleoptions.hxx index d48a390a30bc..5d53c81142fd 100644 --- a/unotools/inc/unotools/moduleoptions.hxx +++ b/unotools/inc/unotools/moduleoptions.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 INCLUDED_SVTOOLS_MODULEOPTIONS_HXX //_________________________________________________________________________________________________________________ -// includes +// includes //_________________________________________________________________________________________________________________ #include "unotools/unotoolsdllapi.h" @@ -42,44 +42,44 @@ #include <unotools/options.hxx> //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ #define FEATUREFLAG_BASICIDE 0x00000020 -#define FEATUREFLAG_MATH 0x00000100 -#define FEATUREFLAG_CHART 0x00000200 -#define FEATUREFLAG_CALC 0x00000800 -#define FEATUREFLAG_DRAW 0x00001000 -#define FEATUREFLAG_WRITER 0x00002000 -#define FEATUREFLAG_IMPRESS 0x00008000 -#define FEATUREFLAG_INSIGHT 0x00010000 +#define FEATUREFLAG_MATH 0x00000100 +#define FEATUREFLAG_CHART 0x00000200 +#define FEATUREFLAG_CALC 0x00000800 +#define FEATUREFLAG_DRAW 0x00001000 +#define FEATUREFLAG_WRITER 0x00002000 +#define FEATUREFLAG_IMPRESS 0x00008000 +#define FEATUREFLAG_INSIGHT 0x00010000 //_________________________________________________________________________________________________________________ -// 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! *//*-*************************************************************************************************************/ class SvtModuleOptions_Impl; //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** - @short collect informations about installation state of modules + @short collect informations about installation state of modules @descr Use these class to get installation state of different office modules like writer, calc etc Further you can ask for additional informations; e.g. name of standard template file, which should be used by corresponding module; or short/long name of these module factory. - @implements - - @base - + @implements - + @base - - @devstatus ready to use + @devstatus ready to use @threadsafe yes *//*-*************************************************************************************************************/ class UNOTOOLS_DLLPUBLIC SvtModuleOptions: public utl::detail::Options @@ -120,24 +120,24 @@ class UNOTOOLS_DLLPUBLIC SvtModuleOptions: public utl::detail::Options E_MATH = 6, E_CHART = 7, E_STARTMODULE = 8, - E_DATABASE = 9, + E_DATABASE = 9, E_BASIC = 10 }; //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: //--------------------------------------------------------------------------------------------------------- - // constructor / destructor + // constructor / destructor //--------------------------------------------------------------------------------------------------------- SvtModuleOptions(); virtual ~SvtModuleOptions(); //--------------------------------------------------------------------------------------------------------- - // interface + // interface //--------------------------------------------------------------------------------------------------------- sal_Bool IsModuleInstalled ( EModule eModule ) const; ::rtl::OUString GetModuleName ( EModule eModule ) const; @@ -231,13 +231,13 @@ class UNOTOOLS_DLLPUBLIC SvtModuleOptions: public utl::detail::Options ::com::sun::star::uno::Sequence < ::rtl::OUString > GetAllServiceNames(); //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: UNOTOOLS_DLLPRIVATE static ::osl::Mutex& impl_GetOwnStaticMutex(); //------------------------------------------------------------------------------------------------------------- - // private member + // private member //------------------------------------------------------------------------------------------------------------- private: @@ -249,9 +249,9 @@ class UNOTOOLS_DLLPUBLIC SvtModuleOptions: public utl::detail::Options Do it in your source only. */ - static SvtModuleOptions_Impl* m_pDataContainer ; /// impl. data container as dynamic pointer for smaller memory requirements! - static sal_Int32 m_nRefCount ; /// internal ref count mechanism + static SvtModuleOptions_Impl* m_pDataContainer ; /// impl. data container as dynamic pointer for smaller memory requirements! + static sal_Int32 m_nRefCount ; /// internal ref count mechanism -}; // class SvtModuleOptions +}; // class SvtModuleOptions -#endif // #ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX +#endif // #ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX diff --git a/unotools/inc/unotools/nativenumberwrapper.hxx b/unotools/inc/unotools/nativenumberwrapper.hxx index 9b7d5c130a51..95690cc91f7b 100644 --- a/unotools/inc/unotools/nativenumberwrapper.hxx +++ b/unotools/inc/unotools/nativenumberwrapper.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 @@ -60,14 +60,14 @@ public: sal_Int16 nNativeNumberMode ) const; sal_Bool isValidNatNum( - const ::com::sun::star::lang::Locale& rLocale, + const ::com::sun::star::lang::Locale& rLocale, sal_Int16 nNativeNumberMode ) const; ::com::sun::star::i18n::NativeNumberXmlAttributes convertToXmlAttributes( const ::com::sun::star::lang::Locale& rLocale, sal_Int16 nNativeNumberMode ) const; - sal_Int16 convertFromXmlAttributes( + sal_Int16 convertFromXmlAttributes( const ::com::sun::star::i18n::NativeNumberXmlAttributes& rAttr ) const; }; diff --git a/unotools/inc/unotools/numberformatcodewrapper.hxx b/unotools/inc/unotools/numberformatcodewrapper.hxx index 394346275b14..8fc436ded794 100644 --- a/unotools/inc/unotools/numberformatcodewrapper.hxx +++ b/unotools/inc/unotools/numberformatcodewrapper.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,12 +41,12 @@ namespace com { namespace sun { namespace star { class UNOTOOLS_DLLPUBLIC NumberFormatCodeWrapper { ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xSMgr; - ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XNumberFormatCode > xNFC; - ::com::sun::star::lang::Locale aLocale; + ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XNumberFormatCode > xNFC; + ::com::sun::star::lang::Locale aLocale; // not implemented, prevent usage NumberFormatCodeWrapper( const NumberFormatCodeWrapper& ); - NumberFormatCodeWrapper& operator=( const NumberFormatCodeWrapper& ); + NumberFormatCodeWrapper& operator=( const NumberFormatCodeWrapper& ); public: NumberFormatCodeWrapper( @@ -58,10 +58,10 @@ public: /// set a new Locale - void setLocale( const ::com::sun::star::lang::Locale& rLocale ); + void setLocale( const ::com::sun::star::lang::Locale& rLocale ); /// get current Locale - const ::com::sun::star::lang::Locale& getLocale() const { return aLocale; } + const ::com::sun::star::lang::Locale& getLocale() const { return aLocale; } // Wrapper implementations of class NumberFormatCodeMapper diff --git a/unotools/inc/unotools/options.hxx b/unotools/inc/unotools/options.hxx index 0279e16df1d9..4bfc33024394 100644 --- a/unotools/inc/unotools/options.hxx +++ b/unotools/inc/unotools/options.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 @@ -57,7 +57,7 @@ namespace utl { { IMPL_ConfigurationListenerList* mpList; sal_Int32 m_nBroadcastBlocked; // broadcast only if this is 0 - sal_uInt32 m_nBlockedHint; + sal_uInt32 m_nBlockedHint; public: void AddListener( utl::ConfigurationListener* pListener ); diff --git a/unotools/inc/unotools/optionsdlg.hxx b/unotools/inc/unotools/optionsdlg.hxx index 833e8d5700c3..293040a82909 100644 --- a/unotools/inc/unotools/optionsdlg.hxx +++ b/unotools/inc/unotools/optionsdlg.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/unotools/inc/unotools/pathoptions.hxx b/unotools/inc/unotools/pathoptions.hxx index 4d94c93cca4a..d36fe0e31478 100644 --- a/unotools/inc/unotools/pathoptions.hxx +++ b/unotools/inc/unotools/pathoptions.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 @@ class SvtPathOptions_Impl; class UNOTOOLS_DLLPUBLIC SvtPathOptions: public utl::detail::Options { private: - SvtPathOptions_Impl* pImp; + SvtPathOptions_Impl* pImp; public: enum Pathes @@ -76,28 +76,28 @@ public: virtual ~SvtPathOptions(); // get the pathes, not const because of using a mutex - const String& GetAddinPath() const; - const String& GetAutoCorrectPath() const; - const String& GetAutoTextPath() const; - const String& GetBackupPath() const; - const String& GetBasicPath() const; - const String& GetBitmapPath() const; - const String& GetConfigPath() const; - const String& GetDictionaryPath() const; - const String& GetFavoritesPath() const; - const String& GetFilterPath() const; - const String& GetGalleryPath() const; - const String& GetGraphicPath() const; - const String& GetHelpPath() const; - const String& GetLinguisticPath() const; - const String& GetModulePath() const; - const String& GetPalettePath() const; - const String& GetPluginPath() const; - const String& GetStoragePath() const; - const String& GetTempPath() const; - const String& GetTemplatePath() const; - const String& GetUserConfigPath() const; - const String& GetWorkPath() const; + const String& GetAddinPath() const; + const String& GetAutoCorrectPath() const; + const String& GetAutoTextPath() const; + const String& GetBackupPath() const; + const String& GetBasicPath() const; + const String& GetBitmapPath() const; + const String& GetConfigPath() const; + const String& GetDictionaryPath() const; + const String& GetFavoritesPath() const; + const String& GetFilterPath() const; + const String& GetGalleryPath() const; + const String& GetGraphicPath() const; + const String& GetHelpPath() const; + const String& GetLinguisticPath() const; + const String& GetModulePath() const; + const String& GetPalettePath() const; + const String& GetPluginPath() const; + const String& GetStoragePath() const; + const String& GetTempPath() const; + const String& GetTemplatePath() const; + const String& GetUserConfigPath() const; + const String& GetWorkPath() const; const String& GetUIConfigPath() const; const String& GetFingerprintPath() const; @@ -105,33 +105,33 @@ public: const String& GetPath(Pathes ePath) const; // set the pathes - void SetAddinPath( const String& rPath ); - void SetAutoCorrectPath( const String& rPath ); - void SetAutoTextPath( const String& rPath ); - void SetBackupPath( const String& rPath ); - void SetBasicPath( const String& rPath ); - void SetBitmapPath( const String& rPath ); - void SetConfigPath( const String& rPath ); - void SetDictionaryPath( const String& rPath ); - void SetFavoritesPath( const String& rPath ); - void SetFilterPath( const String& rPath ); - void SetGalleryPath( const String& rPath ); - void SetGraphicPath( const String& rPath ); - void SetHelpPath( const String& rPath ); - void SetLinguisticPath( const String& rPath ); - void SetModulePath( const String& rPath ); - void SetPalettePath( const String& rPath ); - void SetPluginPath( const String& rPath ); - void SetStoragePath( const String& rPath ); - void SetTempPath( const String& rPath ); - void SetTemplatePath( const String& rPath ); - void SetUserConfigPath( const String& rPath ); - void SetWorkPath( const String& rPath ); + void SetAddinPath( const String& rPath ); + void SetAutoCorrectPath( const String& rPath ); + void SetAutoTextPath( const String& rPath ); + void SetBackupPath( const String& rPath ); + void SetBasicPath( const String& rPath ); + void SetBitmapPath( const String& rPath ); + void SetConfigPath( const String& rPath ); + void SetDictionaryPath( const String& rPath ); + void SetFavoritesPath( const String& rPath ); + void SetFilterPath( const String& rPath ); + void SetGalleryPath( const String& rPath ); + void SetGraphicPath( const String& rPath ); + void SetHelpPath( const String& rPath ); + void SetLinguisticPath( const String& rPath ); + void SetModulePath( const String& rPath ); + void SetPalettePath( const String& rPath ); + void SetPluginPath( const String& rPath ); + void SetStoragePath( const String& rPath ); + void SetTempPath( const String& rPath ); + void SetTemplatePath( const String& rPath ); + void SetUserConfigPath( const String& rPath ); + void SetWorkPath( const String& rPath ); void SetPath( SvtPathOptions::Pathes ePath, const String& rNewPath ); - String SubstituteVariable( const String& rVar ); - String UseVariable( const String& rVar ); - sal_Bool SearchFile( String& rIniFile, Pathes ePath = PATH_USERCONFIG ); + String SubstituteVariable( const String& rVar ); + String UseVariable( const String& rVar ); + sal_Bool SearchFile( String& rIniFile, Pathes ePath = PATH_USERCONFIG ); ::com::sun::star::lang::Locale GetLocale() const; sal_Bool IsReadonly() const; }; diff --git a/unotools/inc/unotools/printwarningoptions.hxx b/unotools/inc/unotools/printwarningoptions.hxx index 94f3bc6a3ddb..709e22691cef 100644 --- a/unotools/inc/unotools/printwarningoptions.hxx +++ b/unotools/inc/unotools/printwarningoptions.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/unotools/inc/unotools/processfactory.hxx b/unotools/inc/unotools/processfactory.hxx index fd852f2c46fa..b43dc2f0a335 100644 --- a/unotools/inc/unotools/processfactory.hxx +++ b/unotools/inc/unotools/processfactory.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 @@ -32,12 +32,12 @@ #include <com/sun/star/uno/Reference.hxx> namespace com { namespace sun { namespace star { namespace lang { - class XMultiServiceFactory; + class XMultiServiceFactory; } } } } namespace utl { - + /** * This function set the process service factory. * diff --git a/unotools/inc/unotools/progresshandlerwrap.hxx b/unotools/inc/unotools/progresshandlerwrap.hxx index 4326da0a331f..900ab9dc0083 100644 --- a/unotools/inc/unotools/progresshandlerwrap.hxx +++ b/unotools/inc/unotools/progresshandlerwrap.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,15 +43,15 @@ public: ProgressHandlerWrap( ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > xSI ); // XProgressHandler - virtual void SAL_CALL push( const ::com::sun::star::uno::Any& Status ) + virtual void SAL_CALL push( const ::com::sun::star::uno::Any& Status ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL update( const ::com::sun::star::uno::Any& Status ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL pop() + virtual void SAL_CALL pop() throw (::com::sun::star::uno::RuntimeException); }; -} // namespace utl +} // namespace utl #endif // _UTL_PROGRESSHANDLERWRAP_HXX_ diff --git a/unotools/inc/unotools/propertysethelper.hxx b/unotools/inc/unotools/propertysethelper.hxx index ad6508e76df3..2943a0d2eb5c 100644 --- a/unotools/inc/unotools/propertysethelper.hxx +++ b/unotools/inc/unotools/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 diff --git a/unotools/inc/unotools/propertysetinfo.hxx b/unotools/inc/unotools/propertysetinfo.hxx index 7e3f26dfc73b..0ccc76f8ba76 100644 --- a/unotools/inc/unotools/propertysetinfo.hxx +++ b/unotools/inc/unotools/propertysetinfo.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/unotools/inc/unotools/querydeep.hxx b/unotools/inc/unotools/querydeep.hxx index fd57f38147d0..5b09650216db 100644 --- a/unotools/inc/unotools/querydeep.hxx +++ b/unotools/inc/unotools/querydeep.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,48 +34,48 @@ /** */ //for docpp namespace utl -{ +{ //-------------------------------------------------------------------------------------------------------- /** * Inspect interfaces types whether they are related by inheritance. *<BR> - * @return true if rType is derived from rBaseType - * @param rBaseType a <type>Type</type> of an interface. - * @param rType a <type>Type</type> of an interface. + * @return true if rType is derived from rBaseType + * @param rBaseType a <type>Type</type> of an interface. + * @param rType a <type>Type</type> of an interface. */ sal_Bool isDerivedFrom( - const ::com::sun::star::uno::Type & rBaseType, + const ::com::sun::star::uno::Type & rBaseType, const ::com::sun::star::uno::Type & rType ); //-------------------------------------------------------------------------------------------------------- /** * Inspect interface types whether they are related by inheritance. *<BR> - * @return true if p is of a type derived from rBaseType - * @param rBaseType a <type>Type</type> of an interface. - * @param p a pointer to an interface. + * @return true if p is of a type derived from rBaseType + * @param rBaseType a <type>Type</type> of an interface. + * @param p a pointer to an interface. */ template <class Interface> inline sal_Bool isDerivedFrom( - const ::com::sun::star::uno::Type& rBaseType, + const ::com::sun::star::uno::Type& rBaseType, Interface* /*p*/) { - return isDerivedFrom( - rBaseType, + return isDerivedFrom( + rBaseType, ::getCppuType(static_cast<const ::com::sun::star::uno::Reference<Interface> *>(0))); } //-------------------------------------------------------------------------------------------------------- // possible optimization ? -// Any aRet(::cppu::queryInterface(rType, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12)); -// if (aRet.hasValue()) -// return aRet; +// Any aRet(::cppu::queryInterface(rType, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12)); +// if (aRet.hasValue()) +// return aRet; /** * Inspect types and choose return proper interface. *<BR> - * @param p1 a pointer to an interface. + * @param p1 a pointer to an interface. */ template< class Interface1 > inline ::com::sun::star::uno::Any queryDeepInterface( @@ -91,8 +91,8 @@ inline ::com::sun::star::uno::Any queryDeepInterface( /** * Inspect types and choose return proper interface. *<BR> - * @param p1 a pointer to an interface. - * @param p2 a pointer to an interface. + * @param p1 a pointer to an interface. + * @param p2 a pointer to an interface. */ template< class Interface1, class Interface2 > inline ::com::sun::star::uno::Any queryDeepInterface( @@ -110,9 +110,9 @@ inline ::com::sun::star::uno::Any queryDeepInterface( /** * Inspect types and choose return proper interface. *<BR> - * @param p1 a pointer to an interface. - * @param p2 a pointer to an interface. - * @param p3 a pointer to an interface. + * @param p1 a pointer to an interface. + * @param p2 a pointer to an interface. + * @param p3 a pointer to an interface. */ template< class Interface1, class Interface2, class Interface3 > inline ::com::sun::star::uno::Any queryDeepInterface( @@ -132,10 +132,10 @@ inline ::com::sun::star::uno::Any queryDeepInterface( /** * Inspect types and choose return proper interface. *<BR> - * @param p1 a pointer to an interface. - * @param p2 a pointer to an interface. - * @param p3 a pointer to an interface. - * @param p4 a pointer to an interface. + * @param p1 a pointer to an interface. + * @param p2 a pointer to an interface. + * @param p3 a pointer to an interface. + * @param p4 a pointer to an interface. */ template< class Interface1, class Interface2, class Interface3, class Interface4 > inline ::com::sun::star::uno::Any queryDeepInterface( @@ -157,11 +157,11 @@ inline ::com::sun::star::uno::Any queryDeepInterface( /** * Inspect types and choose return proper interface. *<BR> - * @param p1 a pointer to an interface. - * @param p2 a pointer to an interface. - * @param p3 a pointer to an interface. - * @param p4 a pointer to an interface. - * @param p5 a pointer to an interface. + * @param p1 a pointer to an interface. + * @param p2 a pointer to an interface. + * @param p3 a pointer to an interface. + * @param p4 a pointer to an interface. + * @param p5 a pointer to an interface. */ template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5 > inline ::com::sun::star::uno::Any queryDeepInterface( @@ -185,12 +185,12 @@ inline ::com::sun::star::uno::Any queryDeepInterface( /** * Inspect types and choose return proper interface. *<BR> - * @param p1 a pointer to an interface. - * @param p2 a pointer to an interface. - * @param p3 a pointer to an interface. - * @param p4 a pointer to an interface. - * @param p5 a pointer to an interface. - * @param p6 a pointer to an interface. + * @param p1 a pointer to an interface. + * @param p2 a pointer to an interface. + * @param p3 a pointer to an interface. + * @param p4 a pointer to an interface. + * @param p5 a pointer to an interface. + * @param p6 a pointer to an interface. */ template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5, class Interface6 > @@ -218,13 +218,13 @@ inline ::com::sun::star::uno::Any queryDeepInterface( /** * Inspect types and choose return proper interface. *<BR> - * @param p1 a pointer to an interface. - * @param p2 a pointer to an interface. - * @param p3 a pointer to an interface. - * @param p4 a pointer to an interface. - * @param p5 a pointer to an interface. - * @param p6 a pointer to an interface. - * @param p7 a pointer to an interface. + * @param p1 a pointer to an interface. + * @param p2 a pointer to an interface. + * @param p3 a pointer to an interface. + * @param p4 a pointer to an interface. + * @param p5 a pointer to an interface. + * @param p6 a pointer to an interface. + * @param p7 a pointer to an interface. */ template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5, class Interface6, class Interface7 > @@ -254,14 +254,14 @@ inline ::com::sun::star::uno::Any queryDeepInterface( /** * Inspect types and choose return proper interface. *<BR> - * @param p1 a pointer to an interface. - * @param p2 a pointer to an interface. - * @param p3 a pointer to an interface. - * @param p4 a pointer to an interface. - * @param p5 a pointer to an interface. - * @param p6 a pointer to an interface. - * @param p7 a pointer to an interface. - * @param p8 a pointer to an interface. + * @param p1 a pointer to an interface. + * @param p2 a pointer to an interface. + * @param p3 a pointer to an interface. + * @param p4 a pointer to an interface. + * @param p5 a pointer to an interface. + * @param p6 a pointer to an interface. + * @param p7 a pointer to an interface. + * @param p8 a pointer to an interface. */ template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5, class Interface6, class Interface7, class Interface8 > @@ -293,15 +293,15 @@ inline ::com::sun::star::uno::Any queryDeepInterface( /** * Inspect types and choose return proper interface. *<BR> - * @param p1 a pointer to an interface. - * @param p2 a pointer to an interface. - * @param p3 a pointer to an interface. - * @param p4 a pointer to an interface. - * @param p5 a pointer to an interface. - * @param p6 a pointer to an interface. - * @param p7 a pointer to an interface. - * @param p8 a pointer to an interface. - * @param p9 a pointer to an interface. + * @param p1 a pointer to an interface. + * @param p2 a pointer to an interface. + * @param p3 a pointer to an interface. + * @param p4 a pointer to an interface. + * @param p5 a pointer to an interface. + * @param p6 a pointer to an interface. + * @param p7 a pointer to an interface. + * @param p8 a pointer to an interface. + * @param p9 a pointer to an interface. */ template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5, class Interface6, class Interface7, class Interface8, class Interface9 > @@ -335,16 +335,16 @@ inline ::com::sun::star::uno::Any queryDeepInterface( /** * Inspect types and choose return proper interface. *<BR> - * @param p1 a pointer to an interface. - * @param p2 a pointer to an interface. - * @param p3 a pointer to an interface. - * @param p4 a pointer to an interface. - * @param p5 a pointer to an interface. - * @param p6 a pointer to an interface. - * @param p7 a pointer to an interface. - * @param p8 a pointer to an interface. - * @param p9 a pointer to an interface. - * @param p10 a pointer to an interface. + * @param p1 a pointer to an interface. + * @param p2 a pointer to an interface. + * @param p3 a pointer to an interface. + * @param p4 a pointer to an interface. + * @param p5 a pointer to an interface. + * @param p6 a pointer to an interface. + * @param p7 a pointer to an interface. + * @param p8 a pointer to an interface. + * @param p9 a pointer to an interface. + * @param p10 a pointer to an interface. */ template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5, class Interface6, class Interface7, class Interface8, class Interface9, class Interface10 > @@ -380,17 +380,17 @@ inline ::com::sun::star::uno::Any queryDeepInterface( /** * Inspect types and choose return proper interface. *<BR> - * @param p1 a pointer to an interface. - * @param p2 a pointer to an interface. - * @param p3 a pointer to an interface. - * @param p4 a pointer to an interface. - * @param p5 a pointer to an interface. - * @param p6 a pointer to an interface. - * @param p7 a pointer to an interface. - * @param p8 a pointer to an interface. - * @param p9 a pointer to an interface. - * @param p10 a pointer to an interface. - * @param p11 a pointer to an interface. + * @param p1 a pointer to an interface. + * @param p2 a pointer to an interface. + * @param p3 a pointer to an interface. + * @param p4 a pointer to an interface. + * @param p5 a pointer to an interface. + * @param p6 a pointer to an interface. + * @param p7 a pointer to an interface. + * @param p8 a pointer to an interface. + * @param p9 a pointer to an interface. + * @param p10 a pointer to an interface. + * @param p11 a pointer to an interface. */ template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5, class Interface6, class Interface7, class Interface8, class Interface9, class Interface10, @@ -430,18 +430,18 @@ inline ::com::sun::star::uno::Any queryDeepInterface( /** * Inspect types and choose return proper interface. *<BR> - * @param p1 a pointer to an interface. - * @param p2 a pointer to an interface. - * @param p3 a pointer to an interface. - * @param p4 a pointer to an interface. - * @param p5 a pointer to an interface. - * @param p6 a pointer to an interface. - * @param p7 a pointer to an interface. - * @param p8 a pointer to an interface. - * @param p9 a pointer to an interface. - * @param p10 a pointer to an interface. - * @param p11 a pointer to an interface. - * @param p12 a pointer to an interface. + * @param p1 a pointer to an interface. + * @param p2 a pointer to an interface. + * @param p3 a pointer to an interface. + * @param p4 a pointer to an interface. + * @param p5 a pointer to an interface. + * @param p6 a pointer to an interface. + * @param p7 a pointer to an interface. + * @param p8 a pointer to an interface. + * @param p9 a pointer to an interface. + * @param p10 a pointer to an interface. + * @param p11 a pointer to an interface. + * @param p12 a pointer to an interface. */ template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5, class Interface6, class Interface7, class Interface8, class Interface9, class Interface10, diff --git a/unotools/inc/unotools/readwritemutexguard.hxx b/unotools/inc/unotools/readwritemutexguard.hxx index 3035d5bda878..d19cace57a06 100644 --- a/unotools/inc/unotools/readwritemutexguard.hxx +++ b/unotools/inc/unotools/readwritemutexguard.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/unotools/inc/unotools/regoptions.hxx b/unotools/inc/unotools/regoptions.hxx index 1cca531886ca..2bb10a561a0f 100644 --- a/unotools/inc/unotools/regoptions.hxx +++ b/unotools/inc/unotools/regoptions.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 @@ namespace utl class UNOTOOLS_DLLPUBLIC RegOptions { private: - RegOptionsImpl* m_pImpl; + RegOptionsImpl* m_pImpl; // the impl class is constructed upon need only (as this is expensive) UNOTOOLS_DLLPRIVATE void ensureImpl( ); @@ -55,24 +55,24 @@ namespace utl ~RegOptions( ); // retrieves the URL which should be used for online registration - String getRegistrationURL( ) const; + String getRegistrationURL( ) const; // checks if the menu item which can be used to trigger the online registration should be available - sal_Bool allowMenu( ) const; + sal_Bool allowMenu( ) const; enum DialogPermission - { // the registration dialog shall be executed .... - dpDisabled, // ... never - it has been disabled - dpNotThisSession, // ... later - no statement when, but _not now_ - dpRemindLater, // ... later at a reminder date - dpThisSession // ... during this session + { // the registration dialog shall be executed .... + dpDisabled, // ... never - it has been disabled + dpNotThisSession, // ... later - no statement when, but _not now_ + dpRemindLater, // ... later at a reminder date + dpThisSession // ... during this session }; /** checks if the registration dialog is allowed <p>A return value of <TRUE/> does not mean that during this session, the dialog is allowed to be executed. It simply means executing it is allowed <em>in general</em></p> */ - DialogPermission getDialogPermission( ) const; + DialogPermission getDialogPermission( ) const; /** claims that the current session is done with respect to the registration dialog. @@ -87,7 +87,7 @@ namespace utl <method>getDialogPermission</method> <em>may</em> return dpThisSession</li> </ul></p> */ - void markSessionDone( ); + void markSessionDone( ); /** activates the reminder diff --git a/unotools/inc/unotools/regpathhelper.hxx b/unotools/inc/unotools/regpathhelper.hxx index 1f48dda63fc8..331195a8b9d9 100644 --- a/unotools/inc/unotools/regpathhelper.hxx +++ b/unotools/inc/unotools/regpathhelper.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 @@ namespace utl * Search for the user registry using the following rules: * <dl> * <dt> 1. (for further use) search in sversion.ini (.sversionrc) for an entry - * REGISTRY_VERSION_STRING (example: UserRegistry 5.0/505=test.rdb) in the section - * [Registry]. If found, then take this value instead of the name "user.rdb". - * <dt> 2. Search in the config directory of the user for a file "user.rdb". If - * found return the full path and name of the file. If not found, retry this - * step with a dot before ".user.rdb". - * <dt> 3. If not found a new user registry with name "user.rdb" will be created in the user - * config directory. + * REGISTRY_VERSION_STRING (example: UserRegistry 5.0/505=test.rdb) in the section + * [Registry]. If found, then take this value instead of the name "user.rdb". + * <dt> 2. Search in the config directory of the user for a file "user.rdb". If + * found return the full path and name of the file. If not found, retry this + * step with a dot before ".user.rdb". + * <dt> 3. If not found a new user registry with name "user.rdb" will be created in the user + * config directory. * </dl> *<BR> * @author Juergen Schmidt @@ -54,7 +54,7 @@ namespace utl /** * This function returns a path to the system registry file. * The system registry will always be searched in the same directory of the - * executable. The name of the system registry is "applicat.rdb". If the system + * executable. The name of the system registry is "applicat.rdb". If the system * registry was not found, then the environment variable STAR_REGISTRY will be checked. * If this variable was set, it must contain a full path to a valid system registry. * Search for the user registry using the following rules: diff --git a/unotools/inc/unotools/saveopt.hxx b/unotools/inc/unotools/saveopt.hxx index 22cf75c5be3d..c1a5510d268d 100644 --- a/unotools/inc/unotools/saveopt.hxx +++ b/unotools/inc/unotools/saveopt.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 @@ -101,14 +101,14 @@ public: void SetSaveRelFSys( sal_Bool b ); sal_Bool IsSaveRelFSys() const; - void SetSaveUnpacked( sal_Bool b ); - sal_Bool IsSaveUnpacked() const; + void SetSaveUnpacked( sal_Bool b ); + sal_Bool IsSaveUnpacked() const; void SetLoadUserSettings(sal_Bool b); sal_Bool IsLoadUserSettings() const; - void SetPrettyPrinting( sal_Bool _bEnable ); - sal_Bool IsPrettyPrinting( ) const; + void SetPrettyPrinting( sal_Bool _bEnable ); + sal_Bool IsPrettyPrinting( ) const; void SetWarnAlienFormat( sal_Bool _bEnable ); sal_Bool IsWarnAlienFormat( ) const; diff --git a/unotools/inc/unotools/searchopt.hxx b/unotools/inc/unotools/searchopt.hxx index ed4110011df7..6aeee1280ca4 100644 --- a/unotools/inc/unotools/searchopt.hxx +++ b/unotools/inc/unotools/searchopt.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 @@ class SvtSearchOptions_Impl; class UNOTOOLS_DLLPUBLIC SvtSearchOptions { - SvtSearchOptions_Impl *pImpl; + SvtSearchOptions_Impl *pImpl; // disallow copy-constructor and assignment-operator for now SvtSearchOptions( const SvtSearchOptions & ); @@ -47,71 +47,71 @@ public: SvtSearchOptions(); ~SvtSearchOptions(); - INT32 GetTransliterationFlags() const; + INT32 GetTransliterationFlags() const; // // General Options // - BOOL IsWholeWordsOnly() const; - BOOL IsBackwards() const; - BOOL IsUseRegularExpression() const; - BOOL IsSearchForStyles() const; - BOOL IsSimilaritySearch() const; - BOOL IsUseAsianOptions() const; - BOOL IsMatchCase() const; // also Japanese search option - BOOL IsNotes() const; - - void SetWholeWordsOnly( BOOL bVal ); - void SetBackwards( BOOL bVal ); - void SetUseRegularExpression( BOOL bVal ); - void SetSearchForStyles( BOOL bVal ); - void SetSimilaritySearch( BOOL bVal ); - void SetUseAsianOptions( BOOL bVal ); - void SetMatchCase( BOOL bVal ); // also Japanese search option - void SetNotes( BOOL bVal); + BOOL IsWholeWordsOnly() const; + BOOL IsBackwards() const; + BOOL IsUseRegularExpression() const; + BOOL IsSearchForStyles() const; + BOOL IsSimilaritySearch() const; + BOOL IsUseAsianOptions() const; + BOOL IsMatchCase() const; // also Japanese search option + BOOL IsNotes() const; + + void SetWholeWordsOnly( BOOL bVal ); + void SetBackwards( BOOL bVal ); + void SetUseRegularExpression( BOOL bVal ); + void SetSearchForStyles( BOOL bVal ); + void SetSimilaritySearch( BOOL bVal ); + void SetUseAsianOptions( BOOL bVal ); + void SetMatchCase( BOOL bVal ); // also Japanese search option + void SetNotes( BOOL bVal); // // Japanese search options // - BOOL IsMatchFullHalfWidthForms() const; - BOOL IsMatchHiraganaKatakana() const; - BOOL IsMatchContractions() const; - BOOL IsMatchMinusDashChoon() const; - BOOL IsMatchRepeatCharMarks() const; - BOOL IsMatchVariantFormKanji() const; - BOOL IsMatchOldKanaForms() const; - BOOL IsMatchDiziDuzu() const; - BOOL IsMatchBavaHafa() const; - BOOL IsMatchTsithichiDhizi() const; - BOOL IsMatchHyuiyuByuvyu() const; - BOOL IsMatchSesheZeje() const; - BOOL IsMatchIaiya() const; - BOOL IsMatchKiku() const; - BOOL IsIgnorePunctuation() const; - BOOL IsIgnoreWhitespace() const; - BOOL IsIgnoreProlongedSoundMark() const; - BOOL IsIgnoreMiddleDot() const; - - void SetMatchFullHalfWidthForms( BOOL bVal ); - void SetMatchHiraganaKatakana( BOOL bVal ); - void SetMatchContractions( BOOL bVal ); - void SetMatchMinusDashChoon( BOOL bVal ); - void SetMatchRepeatCharMarks( BOOL bVal ); - void SetMatchVariantFormKanji( BOOL bVal ); - void SetMatchOldKanaForms( BOOL bVal ); - void SetMatchDiziDuzu( BOOL bVal ); - void SetMatchBavaHafa( BOOL bVal ); - void SetMatchTsithichiDhizi( BOOL bVal ); - void SetMatchHyuiyuByuvyu( BOOL bVal ); - void SetMatchSesheZeje( BOOL bVal ); - void SetMatchIaiya( BOOL bVal ); - void SetMatchKiku( BOOL bVal ); - void SetIgnorePunctuation( BOOL bVal ); - void SetIgnoreWhitespace( BOOL bVal ); - void SetIgnoreProlongedSoundMark( BOOL bVal ); - void SetIgnoreMiddleDot( BOOL bVal ); + BOOL IsMatchFullHalfWidthForms() const; + BOOL IsMatchHiraganaKatakana() const; + BOOL IsMatchContractions() const; + BOOL IsMatchMinusDashChoon() const; + BOOL IsMatchRepeatCharMarks() const; + BOOL IsMatchVariantFormKanji() const; + BOOL IsMatchOldKanaForms() const; + BOOL IsMatchDiziDuzu() const; + BOOL IsMatchBavaHafa() const; + BOOL IsMatchTsithichiDhizi() const; + BOOL IsMatchHyuiyuByuvyu() const; + BOOL IsMatchSesheZeje() const; + BOOL IsMatchIaiya() const; + BOOL IsMatchKiku() const; + BOOL IsIgnorePunctuation() const; + BOOL IsIgnoreWhitespace() const; + BOOL IsIgnoreProlongedSoundMark() const; + BOOL IsIgnoreMiddleDot() const; + + void SetMatchFullHalfWidthForms( BOOL bVal ); + void SetMatchHiraganaKatakana( BOOL bVal ); + void SetMatchContractions( BOOL bVal ); + void SetMatchMinusDashChoon( BOOL bVal ); + void SetMatchRepeatCharMarks( BOOL bVal ); + void SetMatchVariantFormKanji( BOOL bVal ); + void SetMatchOldKanaForms( BOOL bVal ); + void SetMatchDiziDuzu( BOOL bVal ); + void SetMatchBavaHafa( BOOL bVal ); + void SetMatchTsithichiDhizi( BOOL bVal ); + void SetMatchHyuiyuByuvyu( BOOL bVal ); + void SetMatchSesheZeje( BOOL bVal ); + void SetMatchIaiya( BOOL bVal ); + void SetMatchKiku( BOOL bVal ); + void SetIgnorePunctuation( BOOL bVal ); + void SetIgnoreWhitespace( BOOL bVal ); + void SetIgnoreProlongedSoundMark( BOOL bVal ); + void SetIgnoreMiddleDot( BOOL bVal ); }; diff --git a/unotools/inc/unotools/securityoptions.hxx b/unotools/inc/unotools/securityoptions.hxx index ddeed4b94520..838a98dc682f 100644 --- a/unotools/inc/unotools/securityoptions.hxx +++ b/unotools/inc/unotools/securityoptions.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 INCLUDED_unotools_SECURITYOPTIONS_HXX //_________________________________________________________________________________________________________________ -// includes +// includes //_________________________________________________________________________________________________________________ #include "unotools/unotoolsdllapi.h" @@ -39,12 +39,12 @@ #include <unotools/options.hxx> //_________________________________________________________________________________________________________________ -// 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! *//*-*************************************************************************************************************/ @@ -52,7 +52,7 @@ class SvtSecurityOptions_Impl; //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** @@ -62,21 +62,21 @@ class SvtSecurityOptions_Impl; enum EBasicSecurityMode { - eNEVER_EXECUTE = 0, - eFROM_LIST = 1, + eNEVER_EXECUTE = 0, + eFROM_LIST = 1, eALWAYS_EXECUTE = 2 }; /*-************************************************************************************************************//** - @short collect informations about security features + @short collect informations about security features @descr - - @implements - - @base - + @implements - + @base - - @ATTENTION This class is partially threadsafe. + @ATTENTION This class is partially threadsafe. - @devstatus ready to use + @devstatus ready to use *//*-*************************************************************************************************************/ class UNOTOOLS_DLLPUBLIC SvtSecurityOptions: public utl::detail::Options @@ -89,10 +89,10 @@ class UNOTOOLS_DLLPUBLIC SvtSecurityOptions: public utl::detail::Options enum EOption { E_SECUREURLS, - E_BASICMODE, // xmlsec05 depricated - E_EXECUTEPLUGINS, // xmlsec05 depricated - E_WARNING, // xmlsec05 depricated - E_CONFIRMATION, // xmlsec05 depricated + E_BASICMODE, // xmlsec05 depricated + E_EXECUTEPLUGINS, // xmlsec05 depricated + E_WARNING, // xmlsec05 depricated + E_CONFIRMATION, // xmlsec05 depricated E_DOCWARN_SAVEORSEND, E_DOCWARN_SIGNING, E_DOCWARN_PRINT, @@ -125,36 +125,36 @@ class UNOTOOLS_DLLPUBLIC SvtSecurityOptions: public utl::detail::Options */ //------------------------------------------------------------------------------------------------------------- - // 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 - *//*-*****************************************************************************************************/ SvtSecurityOptions(); virtual ~SvtSecurityOptions(); //--------------------------------------------------------------------------------------------------------- - // interface + // interface //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** @@ -171,111 +171,111 @@ class UNOTOOLS_DLLPUBLIC SvtSecurityOptions: public utl::detail::Options sal_Bool IsReadOnly( EOption eOption ) const ; /*-****************************************************************************************************//** - @short interface methods to get and set value of config key "org.openoffice.Office.Common/Security/Scripting/SecureURL" - @descr These value displays the list of all trustworthy URLs. - zB.: file:/ => All scripts from the local file system including a LAN; - private:explorer => Scripts from the Explorer; - private:help => Scripts in the help system; - private:newmenu => Scripts that are executed by the commands File-New and AutoPilot; - private:schedule => Scripts of the scheduler; - private:searchfolder => Scripts of the searchfolder; - private:user => Scripts that are entered in the URL field. - @seealso - - - @param "seqURLList", new values to set it in configuration. - @return The values which represent current state of internal variable. - - @onerror No error should occurre! + @short interface methods to get and set value of config key "org.openoffice.Office.Common/Security/Scripting/SecureURL" + @descr These value displays the list of all trustworthy URLs. + zB.: file:/ => All scripts from the local file system including a LAN; + private:explorer => Scripts from the Explorer; + private:help => Scripts in the help system; + private:newmenu => Scripts that are executed by the commands File-New and AutoPilot; + private:schedule => Scripts of the scheduler; + private:searchfolder => Scripts of the searchfolder; + private:user => Scripts that are entered in the URL field. + @seealso - + + @param "seqURLList", new values to set it in configuration. + @return The values which represent current state of internal variable. + + @onerror No error should occurre! *//*-*****************************************************************************************************/ - ::com::sun::star::uno::Sequence< ::rtl::OUString > GetSecureURLs( ) const ; - void SetSecureURLs( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& seqURLList ) ; + ::com::sun::star::uno::Sequence< ::rtl::OUString > GetSecureURLs( ) const ; + void SetSecureURLs( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& seqURLList ) ; /*-****************************************************************************************************//** - @short interface methods to get and set value of config key "org.openoffice.Office.Common/Security/Scripting/StarOfficeBasic" - @descr These value determines how StarOffice Basic scripts should be handled. + @short interface methods to get and set value of config key "org.openoffice.Office.Common/Security/Scripting/StarOfficeBasic" + @descr These value determines how StarOffice Basic scripts should be handled. It exist 3 different modes: 0 = never execute 1 = from list 2 = always execute - @ATTENTION These methods don't check for valid or invalid values! + @ATTENTION These methods don't check for valid or invalid values! Our configuration server can do it ... but these implementation don't get any notifications about wrong commits ...! => If you set an invalid value - nothing will be changed. The information will lost. - @seealso enum EBasicSecurityMode + @seealso enum EBasicSecurityMode - @param "eMode" to set new mode ... Value must defined as an enum of type EBasicSecurityMode! - @return An enum value, which present current mode. + @param "eMode" to set new mode ... Value must defined as an enum of type EBasicSecurityMode! + @return An enum value, which present current mode. - @onerror No error should occurre! + @onerror No error should occurre! *//*-*****************************************************************************************************/ - sal_Int32 GetMacroSecurityLevel ( ) const ; - void SetMacroSecurityLevel ( sal_Int32 _nLevel ) ; + sal_Int32 GetMacroSecurityLevel ( ) const ; + void SetMacroSecurityLevel ( sal_Int32 _nLevel ) ; - sal_Bool IsMacroDisabled ( ) const ; + sal_Bool IsMacroDisabled ( ) const ; /*-****************************************************************************************************//** - @short special method to check an URL and his referer corresponding to ouer internal security cessation - @descr Give us an URL and his referer and we will say you if these url can be scripted or not! + @short special method to check an URL and his referer corresponding to ouer internal security cessation + @descr Give us an URL and his referer and we will say you if these url can be scripted or not! - @seealso - + @seealso - - @param "sURL" reference to URL for checking - @param "sReferer" reference to referer which whish to run script by given URL - @return sal_True if URL is secure or security is obsolete(!) or sal_False otherwise. + @param "sURL" reference to URL for checking + @param "sReferer" reference to referer which whish to run script by given URL + @return sal_True if URL is secure or security is obsolete(!) or sal_False otherwise. - @onerror No error should occurre! + @onerror No error should occurre! *//*-*****************************************************************************************************/ - sal_Bool IsSecureURL( const ::rtl::OUString& sURL , - const ::rtl::OUString& sReferer ) const ; + sal_Bool IsSecureURL( const ::rtl::OUString& sURL , + const ::rtl::OUString& sReferer ) const ; - ::com::sun::star::uno::Sequence< Certificate > GetTrustedAuthors ( ) const ; - void SetTrustedAuthors ( const ::com::sun::star::uno::Sequence< Certificate >& rAuthors ) ; - sal_Bool IsTrustedAuthorsEnabled ( ) ; + ::com::sun::star::uno::Sequence< Certificate > GetTrustedAuthors ( ) const ; + void SetTrustedAuthors ( const ::com::sun::star::uno::Sequence< Certificate >& rAuthors ) ; + sal_Bool IsTrustedAuthorsEnabled ( ) ; // for bool options only! - bool IsOptionSet ( EOption eOption ) const ; - bool SetOption ( EOption eOption, bool bValue ) ; - bool IsOptionEnabled ( EOption eOption ) const ; + bool IsOptionSet ( EOption eOption ) const ; + bool SetOption ( EOption eOption, bool bValue ) ; + bool IsOptionEnabled ( EOption eOption ) const ; // xmlsec05 depricated methods sal_Bool IsExecutePlugins() const; void SetExecutePlugins( sal_Bool bSet ); - EBasicSecurityMode GetBasicMode( ) const ; - void SetBasicMode( EBasicSecurityMode eMode ) ; + EBasicSecurityMode GetBasicMode( ) const ; + void SetBasicMode( EBasicSecurityMode eMode ) ; sal_Bool IsWarningEnabled() const; void SetWarningEnabled( sal_Bool bSet ); sal_Bool IsConfirmationEnabled() const; void SetConfirmationEnabled( sal_Bool bSet ); //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: /*-****************************************************************************************************//** - @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 - *//*-*****************************************************************************************************/ UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetInitMutex(); //------------------------------------------------------------------------------------------------------------- - // private member + // private member //------------------------------------------------------------------------------------------------------------- private: @@ -288,9 +288,9 @@ class UNOTOOLS_DLLPUBLIC SvtSecurityOptions: public utl::detail::Options Do it in your source only. */ - static SvtSecurityOptions_Impl* m_pDataContainer ; /// impl. data container as dynamic pointer for smaller memory requirements! - static sal_Int32 m_nRefCount ; /// internal ref count mechanism + static SvtSecurityOptions_Impl* m_pDataContainer ; /// impl. data container as dynamic pointer for smaller memory requirements! + static sal_Int32 m_nRefCount ; /// internal ref count mechanism -}; // class SvtSecurityOptions +}; // class SvtSecurityOptions #endif // #ifndef INCLUDED_unotools_SECURITYOPTIONS_HXX diff --git a/unotools/inc/unotools/sharedunocomponent.hxx b/unotools/inc/unotools/sharedunocomponent.hxx index 70c01b0cc0af..0883370201c6 100644 --- a/unotools/inc/unotools/sharedunocomponent.hxx +++ b/unotools/inc/unotools/sharedunocomponent.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/unotools/inc/unotools/sourceviewconfig.hxx b/unotools/inc/unotools/sourceviewconfig.hxx index 5f66d6d05c76..90c4f9cfbe60 100644 --- a/unotools/inc/unotools/sourceviewconfig.hxx +++ b/unotools/inc/unotools/sourceviewconfig.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/unotools/inc/unotools/startoptions.hxx b/unotools/inc/unotools/startoptions.hxx index 4fbb2c091864..d7717e68ae12 100644 --- a/unotools/inc/unotools/startoptions.hxx +++ b/unotools/inc/unotools/startoptions.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/unotools/inc/unotools/streamhelper.hxx b/unotools/inc/unotools/streamhelper.hxx index d6250e7b0306..0aee7552f221 100644 --- a/unotools/inc/unotools/streamhelper.hxx +++ b/unotools/inc/unotools/streamhelper.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,23 +38,23 @@ namespace utl { - namespace stario = ::com::sun::star::io; - namespace staruno = ::com::sun::star::uno; + namespace stario = ::com::sun::star::io; + namespace staruno = ::com::sun::star::uno; /** * The helper implementation for a using input streams based on SvLockBytes. * - * @author Dirk Grobler - * @since 00/28/03 + * @author Dirk Grobler + * @since 00/28/03 */ typedef ::cppu::WeakImplHelper2<stario::XInputStream, stario::XSeekable> InputStreamHelper_Base; // needed for some compilers class UNOTOOLS_DLLPUBLIC OInputStreamHelper : public InputStreamHelper_Base { - ::osl::Mutex m_aMutex; - SvLockBytesRef m_xLockBytes; - sal_uInt32 m_nActPos; - sal_Int32 m_nAvailable; // this is typically the chunk(buffer) size + ::osl::Mutex m_aMutex; + SvLockBytesRef m_xLockBytes; + sal_uInt32 m_nActPos; + sal_Int32 m_nAvailable; // this is typically the chunk(buffer) size public: OInputStreamHelper(const SvLockBytesRef& _xLockBytes, @@ -83,16 +83,16 @@ public: /** * The helper implementation for a using output streams based on SvLockBytes. * - * @author Dirk Grobler - * @since 00/28/03 + * @author Dirk Grobler + * @since 00/28/03 */ typedef ::cppu::WeakImplHelper1<stario::XOutputStream> OutputStreamHelper_Base; // needed for some compilers class UNOTOOLS_DLLPUBLIC OOutputStreamHelper : public OutputStreamHelper_Base { - ::osl::Mutex m_aMutex; - SvLockBytesRef m_xLockBytes; - sal_uInt32 m_nActPos; + ::osl::Mutex m_aMutex; + SvLockBytesRef m_xLockBytes; + sal_uInt32 m_nActPos; public: OOutputStreamHelper(const SvLockBytesRef& _xLockBytes, sal_uInt32 _nPos = 0) @@ -109,7 +109,7 @@ public: virtual void SAL_CALL closeOutput( ) throw(stario::NotConnectedException, stario::BufferSizeExceededException, stario::IOException, staruno::RuntimeException); }; -} // namespace utl +} // namespace utl #endif // _UNOTOOLS_STREAM_WRAPPER_HXX_ diff --git a/unotools/inc/unotools/streamsection.hxx b/unotools/inc/unotools/streamsection.hxx index 4c51ed648eb1..0765138bd237 100644 --- a/unotools/inc/unotools/streamsection.hxx +++ b/unotools/inc/unotools/streamsection.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,37 +35,37 @@ namespace utl { - namespace stario = ::com::sun::star::io; - namespace staruno = ::com::sun::star::uno; + namespace stario = ::com::sun::star::io; + namespace staruno = ::com::sun::star::uno; /** implements handling for compatibly reading/writing data from/into an input/output stream. data written in a block secured by this class should be readable by older versions which use the same mechanism. - @author Frank Schoenheit - @since 00/26/05 + @author Frank Schoenheit + @since 00/26/05 */ class OStreamSection { - staruno::Reference< stario::XMarkableStream > m_xMarkStream; - staruno::Reference< stario::XDataInputStream > m_xInStream; - staruno::Reference< stario::XDataOutputStream > m_xOutStream; + staruno::Reference< stario::XMarkableStream > m_xMarkStream; + staruno::Reference< stario::XDataInputStream > m_xInStream; + staruno::Reference< stario::XDataOutputStream > m_xOutStream; - sal_Int32 m_nBlockStart; - sal_Int32 m_nBlockLen; + sal_Int32 m_nBlockStart; + sal_Int32 m_nBlockLen; public: - /** starts reading of a "skippable" section of data within the given input stream<BR> - @param _rxInput the stream to read from. Must support the + /** starts reading of a "skippable" section of data within the given input stream<BR> + @param _rxInput the stream to read from. Must support the <type scope="com::sun::star::io">XMarkableStream</type> interface */ OStreamSection(const staruno::Reference< stario::XDataInputStream >& _rxInput); - /** starts writing of a "skippable" section of data into the given output stream - @param _rxOutput the stream the stream to write to. Must support the + /** starts writing of a "skippable" section of data into the given output stream + @param _rxOutput the stream the stream to write to. Must support the <type scope="com::sun::star::io">XMarkableStream</type> interface - @param _nPresumedLength estimation for the length of the upcoming section. If greater 0, this + @param _nPresumedLength estimation for the length of the upcoming section. If greater 0, this value will be written as section length and corrected (in the dtor) only if needed. If you know how much bytes you are about to write, you may want to use this param, saving some stream operations this way. @@ -78,7 +78,7 @@ public: ~OStreamSection(); }; -} // namespace utl +} // namespace utl #endif // _UNOTOOLS_STREAMSECTION_HXX_ diff --git a/unotools/inc/unotools/streamwrap.hxx b/unotools/inc/unotools/streamwrap.hxx index d8544cc25f3e..a74f5d93ba20 100644 --- a/unotools/inc/unotools/streamwrap.hxx +++ b/unotools/inc/unotools/streamwrap.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,22 +42,22 @@ class SvStream; namespace utl { - namespace stario = ::com::sun::star::io; - namespace staruno = ::com::sun::star::uno; + namespace stario = ::com::sun::star::io; + namespace staruno = ::com::sun::star::uno; //================================================================== //= OInputStreamWrapper //================================================================== -typedef ::cppu::WeakImplHelper1 < stario::XInputStream +typedef ::cppu::WeakImplHelper1 < stario::XInputStream > InputStreamWrapper_Base; // needed for some compilers /// helper class for wrapping an SvStream into an <type scope="com.sun.star.io">XInputStream</type> class UNOTOOLS_DLLPUBLIC OInputStreamWrapper : public InputStreamWrapper_Base { protected: - ::osl::Mutex m_aMutex; - SvStream* m_pSvStream; - sal_Bool m_bSvStreamOwner : 1; + ::osl::Mutex m_aMutex; + SvStream* m_pSvStream; + sal_Bool m_bSvStreamOwner : 1; OInputStreamWrapper() { m_pSvStream = 0; m_bSvStreamOwner = sal_False; } void SetStream(SvStream* _pStream, sal_Bool bOwner ) @@ -72,11 +72,11 @@ public: DECLARE_UNO3_AGG_DEFAULTS(OInputStreamWrapper, InputStreamWrapper_Base); // stario::XInputStream - virtual sal_Int32 SAL_CALL readBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException); - virtual sal_Int32 SAL_CALL readSomeBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException); - virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException); - virtual sal_Int32 SAL_CALL available() throw(stario::NotConnectedException, staruno::RuntimeException); - virtual void SAL_CALL closeInput() throw(stario::NotConnectedException, staruno::RuntimeException); + virtual sal_Int32 SAL_CALL readBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException); + virtual sal_Int32 SAL_CALL readSomeBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException); + virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException); + virtual sal_Int32 SAL_CALL available() throw(stario::NotConnectedException, staruno::RuntimeException); + virtual void SAL_CALL closeInput() throw(stario::NotConnectedException, staruno::RuntimeException); protected: /// throws a NotConnectedException if the object is not connected anymore @@ -88,8 +88,8 @@ protected: //================================================================== //= OSeekableInputStreamWrapper //================================================================== -typedef ::cppu::ImplHelper1 < ::com::sun::star::io::XSeekable - > OSeekableInputStreamWrapper_Base; +typedef ::cppu::ImplHelper1 < ::com::sun::star::io::XSeekable + > OSeekableInputStreamWrapper_Base; /** helper class for wrapping an SvStream into an <type scope="com.sun.star.io">XInputStream</type> which is seekable (i.e. supports the <type scope="com.sun.star.io">XSeekable</type> interface). */ @@ -116,7 +116,7 @@ class UNOTOOLS_DLLPUBLIC OOutputStreamWrapper : public OutputStreamWrapper_Base { protected: // TODO: thread safety! - SvStream& rStream; + SvStream& rStream; public: OOutputStreamWrapper(SvStream& _rStream) :rStream(_rStream) { } @@ -137,8 +137,8 @@ protected: //================================================================== //= OSeekableOutputStreamWrapper //================================================================== -typedef ::cppu::ImplHelper1 < ::com::sun::star::io::XSeekable - > OSeekableOutputStreamWrapper_Base; +typedef ::cppu::ImplHelper1 < ::com::sun::star::io::XSeekable + > OSeekableOutputStreamWrapper_Base; /** helper class for wrapping an SvStream into an <type scope="com.sun.star.io">XOutputStream</type> which is seekable (i.e. supports the <type scope="com.sun.star.io">XSeekable</type> interface). */ diff --git a/unotools/inc/unotools/syslocale.hxx b/unotools/inc/unotools/syslocale.hxx index 5d653297fde1..d37d8b75d5bb 100644 --- a/unotools/inc/unotools/syslocale.hxx +++ b/unotools/inc/unotools/syslocale.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 @@ -72,11 +72,11 @@ public: */ const LocaleDataWrapper* GetLocaleDataPtr() const; const CharClass* GetCharClassPtr() const; - SvtSysLocaleOptions& GetOptions() const; + SvtSysLocaleOptions& GetOptions() const; com::sun::star::lang::Locale GetLocale() const; - LanguageType GetLanguage() const; + LanguageType GetLanguage() const; com::sun::star::lang::Locale GetUILocale() const; - LanguageType GetUILanguage() const; + LanguageType GetUILanguage() const; /** Get the best MIME encoding matching the system locale, or if that isn't determinable one that matches the UI locale, or UTF8 if everything else diff --git a/unotools/inc/unotools/syslocaleoptions.hxx b/unotools/inc/unotools/syslocaleoptions.hxx index 63e271f1c435..7a3dbef82c2a 100644 --- a/unotools/inc/unotools/syslocaleoptions.hxx +++ b/unotools/inc/unotools/syslocaleoptions.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 @@ -105,14 +105,14 @@ public: void SetLocaleConfigString( const ::rtl::OUString& rStr ); com::sun::star::lang::Locale GetLocale() const; com::sun::star::lang::Locale GetRealLocale() const; - LanguageType GetRealLanguage() const; + LanguageType GetRealLanguage() const; /// The config string may be empty to denote the SYSTEM locale const ::rtl::OUString& GetUILocaleConfigString() const; void SetUILocaleConfigString( const ::rtl::OUString& rStr ); com::sun::star::lang::Locale GetUILocale() const; com::sun::star::lang::Locale GetRealUILocale() const; - LanguageType GetRealUILanguage() const; + LanguageType GetRealUILanguage() const; /// The config string may be empty to denote the default currency of the locale const ::rtl::OUString& GetCurrencyConfigString() const; diff --git a/unotools/inc/unotools/tempfile.hxx b/unotools/inc/unotools/tempfile.hxx index 29ca06a23c71..65ac64eb3034 100644 --- a/unotools/inc/unotools/tempfile.hxx +++ b/unotools/inc/unotools/tempfile.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/unotools/inc/unotools/textsearch.hxx b/unotools/inc/unotools/textsearch.hxx index e4cd095fcc14..56706bfd7d16 100644 --- a/unotools/inc/unotools/textsearch.hxx +++ b/unotools/inc/unotools/textsearch.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,12 +61,12 @@ public: private: String sSrchStr; // the search string - String sReplaceStr; // the replace string + String sReplaceStr; // the replace string SearchType eSrchType; // search normal/regular/LevDist - int bWordOnly : 1; // used by normal search - int bSrchInSel : 1; // search only in the selection + int bWordOnly : 1; // used by normal search + int bSrchInSel : 1; // search only in the selection int bCaseSense : 1; // // values for the "weight Levenshtein-Distance" @@ -86,44 +86,44 @@ public: BOOL bSrchInSel = FALSE ); SearchParam( const SearchParam& ); - const String& GetSrchStr() const { return sSrchStr; } - const String& GetReplaceStr() const { return sReplaceStr; } + const String& GetSrchStr() const { return sSrchStr; } + const String& GetReplaceStr() const { return sReplaceStr; } SearchType GetSrchType() const { return eSrchType; } int IsCaseSensitive() const { return bCaseSense; } - int IsSrchInSelection() const { return bSrchInSel; } - int IsSrchWordOnly() const { return bWordOnly; } + int IsSrchInSelection() const { return bSrchInSel; } + int IsSrchWordOnly() const { return bWordOnly; } - void SetSrchStr( const String& rStr ) { sSrchStr = rStr; } - void SetReplaceStr( const String& rStr ) { sReplaceStr = rStr; } + void SetSrchStr( const String& rStr ) { sSrchStr = rStr; } + void SetReplaceStr( const String& rStr ) { sReplaceStr = rStr; } void SetSrchType( SearchType eType ) { eSrchType = eType; } void SetCaseSensitive( int bFlag ) { bCaseSense = bFlag; } void SetSrchInSelection( int bFlag ) { bSrchInSel = bFlag; } void SetSrchWordOnly( int bFlag ) { bWordOnly = bFlag; } - int IsSrchRelaxed() const { return bLEV_Relaxed; } - int GetLEVOther() const { return nLEV_OtherX; } - int GetLEVShorter() const { return nLEV_ShorterY; } - int GetLEVLonger() const { return nLEV_LongerZ; } + int IsSrchRelaxed() const { return bLEV_Relaxed; } + int GetLEVOther() const { return nLEV_OtherX; } + int GetLEVShorter() const { return nLEV_ShorterY; } + int GetLEVLonger() const { return nLEV_LongerZ; } void SetSrchRelaxed( int bFlag ) { bLEV_Relaxed = bFlag; } - void SetLEVOther( int nValue ) { nLEV_OtherX = nValue; } - void SetLEVShorter( int nValue ) { nLEV_ShorterY = nValue; } - void SetLEVLonger( int nValue ) { nLEV_LongerZ = nValue; } + void SetLEVOther( int nValue ) { nLEV_OtherX = nValue; } + void SetLEVShorter( int nValue ) { nLEV_ShorterY = nValue; } + void SetLEVLonger( int nValue ) { nLEV_LongerZ = nValue; } - long GetTransliterationFlags() const { return nTransliterationFlags; } - void SetTransliterationFlags( long nValue ) { nTransliterationFlags = nValue; } + long GetTransliterationFlags() const { return nTransliterationFlags; } + void SetTransliterationFlags( long nValue ) { nTransliterationFlags = nValue; } }; -// Klasse zum Suchen eines Strings in einem String. -// Unterstuetzt werden folgende Verfahren: -// - normalen Text (Bayer/Moore) -// - regulaere Ausdruecke -// - gewichtete Levenshtein Distanz +// Klasse zum Suchen eines Strings in einem String. +// Unterstuetzt werden folgende Verfahren: +// - normalen Text (Bayer/Moore) +// - regulaere Ausdruecke +// - gewichtete Levenshtein Distanz // -// Es kann Vorwaerts und Rueckwaerts gesucht werden! +// Es kann Vorwaerts und Rueckwaerts gesucht werden! class UNOTOOLS_DLLPUBLIC TextSearch { @@ -156,7 +156,7 @@ public: /* search in the (selected) text the search string: rScrTxt - the text, in in which we search - pStart - start position for the search + pStart - start position for the search pEnde - end position for the search RETURN values == TRUE: something is found @@ -189,7 +189,7 @@ public: }; // ............................................................................ -} // namespace utl +} // namespace utl // ............................................................................ #endif diff --git a/unotools/inc/unotools/transliterationwrapper.hxx b/unotools/inc/unotools/transliterationwrapper.hxx index acd3bbf5dcf4..4b1b96ebc778 100644 --- a/unotools/inc/unotools/transliterationwrapper.hxx +++ b/unotools/inc/unotools/transliterationwrapper.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,7 +54,7 @@ class UNOTOOLS_DLLPUBLIC TransliterationWrapper // not implemented, prevent usage TransliterationWrapper( const TransliterationWrapper& ); - TransliterationWrapper& operator=( const TransliterationWrapper& ); + TransliterationWrapper& operator=( const TransliterationWrapper& ); void loadModuleImpl() const; void setLanguageLocaleImpl( sal_uInt16 nLang ); @@ -67,7 +67,7 @@ public: ~TransliterationWrapper(); // get current Locale / Language - const ::com::sun::star::lang::Locale& getLocale() const { return aLocale;} + const ::com::sun::star::lang::Locale& getLocale() const { return aLocale;} sal_uInt16 getLanguage() const { return nLanguage; } sal_uInt32 getType() const { return nType; } diff --git a/unotools/inc/unotools/ucbhelper.hxx b/unotools/inc/unotools/ucbhelper.hxx index 687868adbdb4..686e954c46ef 100644 --- a/unotools/inc/unotools/ucbhelper.hxx +++ b/unotools/inc/unotools/ucbhelper.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,9 +67,9 @@ namespace utl static sal_Bool CanMakeFolder( const String& rFolder ); static sal_Bool MakeFolder( const String& rFolder, sal_Bool bNewOnly = sal_False ); - static sal_Bool MakeFolder( ::ucbhelper::Content& rParent, - const String& rTitle, - ::ucbhelper::Content& rNewFolder, + static sal_Bool MakeFolder( ::ucbhelper::Content& rParent, + const String& rTitle, + ::ucbhelper::Content& rNewFolder, sal_Bool bNewOnly = sal_False ); static sal_Bool HasParentFolder( const String& rFolder ); @@ -79,7 +79,8 @@ namespace utl static sal_Bool Exists( const String& rContent ); static sal_Bool FindInPath( const String& rPath, const String& rName, String& rFile, char cDelim = ';', BOOL bAllowWildCards = TRUE ); static sal_Bool Find( const String& rFolder, const String& rName, String& rFile, BOOL bAllowWildCards = FALSE ); - static sal_Bool IsSubPath( const ::rtl::OUString& rPath, const ::rtl::OUString& rChildCandidate, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentProvider >& xContentProvider = ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentProvider >() ); + static sal_Bool IsSubPath( const ::rtl::OUString& rPath, const ::rtl::OUString& rChildCandidate, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentProvider >& xContentProvider = ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentProvider >() ); + static sal_Bool EqualURLs( const ::rtl::OUString& aFirstURL, const ::rtl::OUString& aSecondURL ); }; } diff --git a/unotools/inc/unotools/ucblockbytes.hxx b/unotools/inc/unotools/ucblockbytes.hxx index 2ba0a683745a..3295e607a59a 100644 --- a/unotools/inc/unotools/ucblockbytes.hxx +++ b/unotools/inc/unotools/ucblockbytes.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 @@ -104,9 +104,9 @@ SV_DECL_IMPL_REF( UcbLockBytesHandler ) class UNOTOOLS_DLLPUBLIC UcbLockBytes : public virtual SvLockBytes { - vos::OCondition m_aInitialized; - vos::OCondition m_aTerminated; - vos::OMutex m_aMutex; + vos::OCondition m_aInitialized; + vos::OCondition m_aTerminated; + vos::OMutex m_aMutex; String m_aContentType; String m_aRealURL; @@ -115,7 +115,7 @@ class UNOTOOLS_DLLPUBLIC UcbLockBytes : public virtual SvLockBytes NS_UNO::Reference < NS_IO::XInputStream > m_xInputStream; NS_UNO::Reference < NS_IO::XOutputStream > m_xOutputStream; NS_UNO::Reference < NS_IO::XSeekable > m_xSeekable; - void* m_pCommandThread; // is alive only for compatibility reasons + void* m_pCommandThread; // is alive only for compatibility reasons UcbLockBytesHandlerRef m_xHandler; sal_uInt32 m_nRead; @@ -126,7 +126,7 @@ class UNOTOOLS_DLLPUBLIC UcbLockBytes : public virtual SvLockBytes sal_Bool m_bDontClose : 1; sal_Bool m_bStreamValid : 1; - DECL_LINK( DataAvailHdl, void * ); + DECL_LINK( DataAvailHdl, void * ); UcbLockBytes( UcbLockBytesHandler* pHandler=NULL ); protected: diff --git a/unotools/inc/unotools/ucbstreamhelper.hxx b/unotools/inc/unotools/ucbstreamhelper.hxx index 2c06d925ddb2..a6a1b9be04fb 100644 --- a/unotools/inc/unotools/ucbstreamhelper.hxx +++ b/unotools/inc/unotools/ucbstreamhelper.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/unotools/inc/unotools/undoopt.hxx b/unotools/inc/unotools/undoopt.hxx index 319f5f4edf32..6504f2a31deb 100644 --- a/unotools/inc/unotools/undoopt.hxx +++ b/unotools/inc/unotools/undoopt.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/unotools/inc/unotools/unotoolsdllapi.h b/unotools/inc/unotools/unotoolsdllapi.h index 521c9c3af3f6..43bd5df8027f 100644 --- a/unotools/inc/unotools/unotoolsdllapi.h +++ b/unotools/inc/unotools/unotoolsdllapi.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 @@ -27,15 +27,15 @@ #ifndef INCLUDED_UNOTOOLSDLLAPI_H #define INCLUDED_UNOTOOLSDLLAPI_H - + #include "sal/types.h" - + #if defined(UNOTOOLS_DLLIMPLEMENTATION) #define UNOTOOLS_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else #define UNOTOOLS_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif #define UNOTOOLS_DLLPRIVATE SAL_DLLPRIVATE - + #endif /* INCLUDED_UNOTOOLSDLLAPI_H */ diff --git a/unotools/inc/unotools/unotunnelhelper.hxx b/unotools/inc/unotools/unotunnelhelper.hxx index ec4f1243f4d9..862b6df18c74 100644 --- a/unotools/inc/unotools/unotunnelhelper.hxx +++ b/unotools/inc/unotools/unotunnelhelper.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 @@ -114,7 +114,7 @@ public: sal_Bool equalTo(staruno::Sequence<sal_Int8> const& rIdentifier) throw() { - return rIdentifier.getLength() == sizeof(tunnelId) && + return rIdentifier.getLength() == sizeof(tunnelId) && rtl_compareMemory(tunnelId, rIdentifier.getConstArray(), sizeof(tunnelId)) == 0; } diff --git a/unotools/inc/unotools/useroptions.hxx b/unotools/inc/unotools/useroptions.hxx index 020ddd657eaf..b89d3482a899 100644 --- a/unotools/inc/unotools/useroptions.hxx +++ b/unotools/inc/unotools/useroptions.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,21 +35,21 @@ // define ---------------------------------------------------------------- -#define USER_OPT_CITY ((USHORT)0) -#define USER_OPT_COMPANY ((USHORT)1) -#define USER_OPT_COUNTRY ((USHORT)2) -#define USER_OPT_EMAIL ((USHORT)3) -#define USER_OPT_FAX ((USHORT)4) -#define USER_OPT_FIRSTNAME ((USHORT)5) -#define USER_OPT_LASTNAME ((USHORT)6) -#define USER_OPT_POSITION ((USHORT)7) -#define USER_OPT_STATE ((USHORT)8) -#define USER_OPT_STREET ((USHORT)9) -#define USER_OPT_TELEPHONEHOME ((USHORT)10) -#define USER_OPT_TELEPHONEWORK ((USHORT)11) -#define USER_OPT_TITLE ((USHORT)12) -#define USER_OPT_ID ((USHORT)13) -#define USER_OPT_ZIP ((USHORT)14) +#define USER_OPT_CITY ((USHORT)0) +#define USER_OPT_COMPANY ((USHORT)1) +#define USER_OPT_COUNTRY ((USHORT)2) +#define USER_OPT_EMAIL ((USHORT)3) +#define USER_OPT_FAX ((USHORT)4) +#define USER_OPT_FIRSTNAME ((USHORT)5) +#define USER_OPT_LASTNAME ((USHORT)6) +#define USER_OPT_POSITION ((USHORT)7) +#define USER_OPT_STATE ((USHORT)8) +#define USER_OPT_STREET ((USHORT)9) +#define USER_OPT_TELEPHONEHOME ((USHORT)10) +#define USER_OPT_TELEPHONEWORK ((USHORT)11) +#define USER_OPT_TITLE ((USHORT)12) +#define USER_OPT_ID ((USHORT)13) +#define USER_OPT_ZIP ((USHORT)14) #define USER_OPT_FATHERSNAME ((USHORT)15) #define USER_OPT_APARTMENT ((USHORT)16) @@ -60,58 +60,58 @@ class SvtUserOptions_Impl; class UNOTOOLS_DLLPUBLIC SvtUserOptions: public utl::detail::Options { private: - SvtUserOptions_Impl* pImp; + SvtUserOptions_Impl* pImp; public: SvtUserOptions(); virtual ~SvtUserOptions(); - static ::osl::Mutex& GetInitMutex(); + static ::osl::Mutex& GetInitMutex(); // get the address token - ::rtl::OUString GetCompany() const; - ::rtl::OUString GetFirstName() const; - ::rtl::OUString GetLastName() const; - ::rtl::OUString GetID() const; - ::rtl::OUString GetStreet() const; - ::rtl::OUString GetCity() const; - ::rtl::OUString GetState() const; - ::rtl::OUString GetZip() const; - ::rtl::OUString GetCountry() const; - ::rtl::OUString GetPosition() const; - ::rtl::OUString GetTitle() const; - ::rtl::OUString GetTelephoneHome() const; - ::rtl::OUString GetTelephoneWork() const; - ::rtl::OUString GetFax() const; - ::rtl::OUString GetEmail() const; - ::rtl::OUString GetCustomerNumber() const; + ::rtl::OUString GetCompany() const; + ::rtl::OUString GetFirstName() const; + ::rtl::OUString GetLastName() const; + ::rtl::OUString GetID() const; + ::rtl::OUString GetStreet() const; + ::rtl::OUString GetCity() const; + ::rtl::OUString GetState() const; + ::rtl::OUString GetZip() const; + ::rtl::OUString GetCountry() const; + ::rtl::OUString GetPosition() const; + ::rtl::OUString GetTitle() const; + ::rtl::OUString GetTelephoneHome() const; + ::rtl::OUString GetTelephoneWork() const; + ::rtl::OUString GetFax() const; + ::rtl::OUString GetEmail() const; + ::rtl::OUString GetCustomerNumber() const; ::rtl::OUString GetFathersName() const; ::rtl::OUString GetApartment() const; - ::rtl::OUString GetFullName() const; - ::rtl::OUString GetLocale() const; + ::rtl::OUString GetFullName() const; + ::rtl::OUString GetLocale() const; // set the address token - void SetCompany( const ::rtl::OUString& rNewToken ); - void SetFirstName( const ::rtl::OUString& rNewToken ); - void SetLastName( const ::rtl::OUString& rNewToken ); - void SetID( const ::rtl::OUString& rNewToken ); - void SetStreet( const ::rtl::OUString& rNewToken ); - void SetCity( const ::rtl::OUString& rNewToken ); - void SetState( const ::rtl::OUString& rNewToken ); - void SetZip( const ::rtl::OUString& rNewToken ); - void SetCountry( const ::rtl::OUString& rNewToken ); - void SetPosition( const ::rtl::OUString& rNewToken ); - void SetTitle( const ::rtl::OUString& rNewToken ); - void SetTelephoneHome( const ::rtl::OUString& rNewToken ); - void SetTelephoneWork( const ::rtl::OUString& rNewToken ); - void SetFax( const ::rtl::OUString& rNewToken ); - void SetEmail( const ::rtl::OUString& rNewToken ); - void SetCustomerNumber( const ::rtl::OUString& rNewToken ); + void SetCompany( const ::rtl::OUString& rNewToken ); + void SetFirstName( const ::rtl::OUString& rNewToken ); + void SetLastName( const ::rtl::OUString& rNewToken ); + void SetID( const ::rtl::OUString& rNewToken ); + void SetStreet( const ::rtl::OUString& rNewToken ); + void SetCity( const ::rtl::OUString& rNewToken ); + void SetState( const ::rtl::OUString& rNewToken ); + void SetZip( const ::rtl::OUString& rNewToken ); + void SetCountry( const ::rtl::OUString& rNewToken ); + void SetPosition( const ::rtl::OUString& rNewToken ); + void SetTitle( const ::rtl::OUString& rNewToken ); + void SetTelephoneHome( const ::rtl::OUString& rNewToken ); + void SetTelephoneWork( const ::rtl::OUString& rNewToken ); + void SetFax( const ::rtl::OUString& rNewToken ); + void SetEmail( const ::rtl::OUString& rNewToken ); + void SetCustomerNumber( const ::rtl::OUString& rNewToken ); void SetFathersName( const ::rtl::OUString& rNewToken ); void SetApartment( const ::rtl::OUString& rNewToken ); - sal_Bool IsTokenReadonly( USHORT nToken ) const; + sal_Bool IsTokenReadonly( USHORT nToken ) const; ::rtl::OUString GetToken(USHORT nToken) const; }; diff --git a/unotools/inc/unotools/useroptions_const.hxx b/unotools/inc/unotools/useroptions_const.hxx index 34a12f6519bf..44e2a9bb2962 100644 --- a/unotools/inc/unotools/useroptions_const.hxx +++ b/unotools/inc/unotools/useroptions_const.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 @@ -32,7 +32,7 @@ namespace { - static const ::rtl::OUString s_sData = ::rtl::OUString::createFromAscii("org.openoffice.UserProfile/Data"); + static const ::rtl::OUString s_sData = ::rtl::OUString::createFromAscii("org.openoffice.UserProfile/Data"); static const ::rtl::OUString s_so = ::rtl::OUString::createFromAscii("o"); // USER_OPT_COMPANY static const ::rtl::OUString s_sgivenname = ::rtl::OUString::createFromAscii("givenname"); // USER_OPT_FIRSTNAME static const ::rtl::OUString s_ssn = ::rtl::OUString::createFromAscii("sn"); // USER_OPT_LASTNAME diff --git a/unotools/inc/unotools/viewoptions.hxx b/unotools/inc/unotools/viewoptions.hxx index 6fa60ea3fb05..5058e2ec6324 100644 --- a/unotools/inc/unotools/viewoptions.hxx +++ b/unotools/inc/unotools/viewoptions.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 INCLUDED_unotools_VIEWOPTIONS_HXX //_________________________________________________________________________________________________________________ -// includes +// includes //_________________________________________________________________________________________________________________ #include "unotools/unotoolsdllapi.h" @@ -42,29 +42,29 @@ #include <unotools/options.hxx> //_________________________________________________________________________________________________________________ -// forward declarations +// forward declarations //_________________________________________________________________________________________________________________ class SvtViewOptionsBase_Impl; //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** - @descr Use these enum values to specify right list in configuration in which your view data are saved. + @descr Use these enum values to specify right list in configuration in which your view data are saved. *//*-*************************************************************************************************************/ enum EViewType { - E_DIALOG = 0, - E_TABDIALOG = 1, - E_TABPAGE = 2, - E_WINDOW = 3 + E_DIALOG = 0, + E_TABDIALOG = 1, + E_TABPAGE = 2, + E_WINDOW = 3 }; /*-************************************************************************************************************//** - @short collect informations about view features + @short collect informations about view features @descr We support different basetypes of views like dialogs, tab-dialogs, tab-pages and normal windows. You must specify your basetype by using right enum value and must give us a valid name for your subkey in registry! We support some fix features for some bastypes and user data as string for all! @@ -88,35 +88,35 @@ enum EViewType structure of configuration: - org.openoffice.Office.Views [package] - /Dialogs [set] - /Dialog_FileOpen [DialogType] - /Dialog_ImportGraphics [DialogType] + org.openoffice.Office.Views [package] + /Dialogs [set] + /Dialog_FileOpen [DialogType] + /Dialog_ImportGraphics [DialogType] ... - /Dialog_<YourName> [DialogType] + /Dialog_<YourName> [DialogType] - /TabDialogs [set] - /TabDialog_001 [TabDialogType] - /TabDialog_Blubber [TabDialogType] + /TabDialogs [set] + /TabDialog_001 [TabDialogType] + /TabDialog_Blubber [TabDialogType] ... - /TabDialog_<YourName> [TabDialogType] + /TabDialog_<YourName> [TabDialogType] - /TabPages [set] - /TabPage_XXX [TabPageType] - /TabPage_Date [TabPageType] + /TabPages [set] + /TabPage_XXX [TabPageType] + /TabPage_Date [TabPageType] ... - /TabPage_<YourName> [TabPageType] + /TabPage_<YourName> [TabPageType] - /Windows [set] - /Window_User [WindowType] - /Window_Options [WindowType] + /Windows [set] + /Window_User [WindowType] + /Window_Options [WindowType] ... - /Window_<YourName> [WindowType] + /Window_<YourName> [WindowType] - @implements - - @base - + @implements - + @base - - @devstatus ready to use + @devstatus ready to use *//*-*************************************************************************************************************/ class UNOTOOLS_DLLPUBLIC SvtViewOptions: public utl::detail::Options @@ -144,28 +144,28 @@ class UNOTOOLS_DLLPUBLIC SvtViewOptions: public utl::detail::Options */ //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: //--------------------------------------------------------------------------------------------------------- - // constructor / destructor + // constructor / destructor //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short standard constructor and destructor - @descr This will de-/initialize an instance with default values. + @short standard constructor and destructor + @descr This will de-/initialize an instance with default values. You must give us the basic type of your view and a name which specify right entry in dynamical configuration list. If entry not exist, we create a new one! - @seealso enum EViewType + @seealso enum EViewType - @param "eType" specify type of your view and is used to use right data container! - @param "sViewName" specify the name of your view and is the key name in data list too. - @return - + @param "eType" specify type of your view and is used to use right data container! + @param "sViewName" specify the name of your view and is the key name in data list too. + @return - - @onerror An assertion is thrown in debug version. Otherwise we do nothing! + @onerror An assertion is thrown in debug version. Otherwise we do nothing! *//*-*****************************************************************************************************/ SvtViewOptions( EViewType eType , @@ -179,7 +179,7 @@ class UNOTOOLS_DLLPUBLIC SvtViewOptions: public utl::detail::Options @seealso - @param - - @return - + @return - @onerror - *//*-*****************************************************************************************************/ @@ -188,35 +188,35 @@ class UNOTOOLS_DLLPUBLIC SvtViewOptions: public utl::detail::Options static void ReleaseOptions(); //--------------------------------------------------------------------------------------------------------- - // interface + // interface //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short use it to get information about existing entries in configuration - @descr The methods to set/get the position or size will create a new entry automaticly if + @short use it to get information about existing entries in configuration + @descr The methods to set/get the position or size will create a new entry automaticly if it not already exist and work with default values! If this a problem for you - you MUST call these method before and you must make up your own mind about that. @seealso - - @onerror No error should occure. + @onerror No error should occure. *//*-*****************************************************************************************************/ sal_Bool Exists() const; /*-****************************************************************************************************//** - @short use it to delete an entry of dynamic view set - @descr You can use this method to delete anexisting node in configuration. + @short use it to delete an entry of dynamic view set + @descr You can use this method to delete anexisting node in configuration. But if you call a Set- or Get- method again on this instance the item is created again! If you do nothing after this call your view will die relay in configuration ... - @seealso method Exist() + @seealso method Exist() - @return True if delete OK, False otherwise. + @return True if delete OK, False otherwise. - @onerror We return sal_False. + @onerror We return sal_False. *//*-*****************************************************************************************************/ sal_Bool Delete(); @@ -236,41 +236,41 @@ class UNOTOOLS_DLLPUBLIC SvtViewOptions: public utl::detail::Options void SetWindowState( const ::rtl::OUString& sState ); /*-****************************************************************************************************//** - @short use it to set/get the page number which was the last active one - @descr It's only supported for: - tab-dialogs + @short use it to set/get the page number which was the last active one + @descr It's only supported for: - tab-dialogs If you call it for other ones you will get an assertion in debug version. In a product version we do nothing! - @seealso - + @seealso - - @onerror An assertion is thrown in debug version. Otherwise we do nothing! + @onerror An assertion is thrown in debug version. Otherwise we do nothing! *//*-*****************************************************************************************************/ sal_Int32 GetPageID( ) const; void SetPageID( sal_Int32 nID ); /*-****************************************************************************************************//** - @short use it to set/get the visual state of a window - @descr It's only supported for: - windows + @short use it to set/get the visual state of a window + @descr It's only supported for: - windows If you call it for other ones you will get an assertion in debug version. In a product version we do nothing! - @seealso - + @seealso - - @onerror An assertion is thrown in debug version. Otherwise we do nothing! + @onerror An assertion is thrown in debug version. Otherwise we do nothing! *//*-*****************************************************************************************************/ sal_Bool IsVisible ( ) const; void SetVisible( sal_Bool bState ); /*-****************************************************************************************************//** - @short use it to set/get the extended user data (consisting of a set of named scalar values) - @descr It's supported for ALL types! + @short use it to set/get the extended user data (consisting of a set of named scalar values) + @descr It's supported for ALL types! Every view can handle its own user defined data set. @seealso - - @onerror In the non-product version, an assertion is made. In a product version, errors are silently ignored. + @onerror In the non-product version, an assertion is made. In a product version, errors are silently ignored. *//*-*****************************************************************************************************/ /* #ifdef TF_OLDVIEW @@ -288,7 +288,7 @@ class UNOTOOLS_DLLPUBLIC SvtViewOptions: public utl::detail::Options @seealso - - @onerror In the non-product version, an assertion is made. In a product version, errors are silently ignored. + @onerror In the non-product version, an assertion is made. In a product version, errors are silently ignored. *//*-*****************************************************************************************************/ ::com::sun::star::uno::Any GetUserItem( const ::rtl::OUString& sName ) const; @@ -296,37 +296,37 @@ class UNOTOOLS_DLLPUBLIC SvtViewOptions: public utl::detail::Options const ::com::sun::star::uno::Any& aValue ); //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: /*-****************************************************************************************************//** - @short return a reference to a static mutex - @descr These class is threadsafe. + @short return a reference to a static mutex + @descr These class is threadsafe. We create a static mutex only for one time and use it to protect our refcount and container member! - @seealso - + @seealso - - @param - - @return A reference to a static mutex member. + @param - + @return A reference to a static mutex member. - @onerror - + @onerror - *//*-*****************************************************************************************************/ UNOTOOLS_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex(); //------------------------------------------------------------------------------------------------------------- - // private member + // private member //------------------------------------------------------------------------------------------------------------- private: /// specify which list of views in configuration is used! This can't be a static value!!! /// ... because we need this value to work with right static data container. - EViewType m_eViewType ; - ::rtl::OUString m_sViewName ; + EViewType m_eViewType ; + ::rtl::OUString m_sViewName ; /// - impl. data container as dynamic pointer for smaller memory requirements! /// - internal ref count mechanism @@ -348,6 +348,6 @@ class UNOTOOLS_DLLPUBLIC SvtViewOptions: public utl::detail::Options static SvtViewOptionsBase_Impl* m_pDataContainer_Windows ; /// hold data for all windows static sal_Int32 m_nRefCount_Windows ; -}; // class SvtViewOptions +}; // class SvtViewOptions #endif // #ifndef INCLUDED_unotools_VIEWOPTIONS_HXX diff --git a/unotools/inc/unotools/workingsetoptions.hxx b/unotools/inc/unotools/workingsetoptions.hxx index 04a4a0bea6cb..2072adc6e1cd 100644 --- a/unotools/inc/unotools/workingsetoptions.hxx +++ b/unotools/inc/unotools/workingsetoptions.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 INCLUDED_unotools_WORKINGSETOPTIONS_HXX //_________________________________________________________________________________________________________________ -// includes +// includes //_________________________________________________________________________________________________________________ #include <sal/types.h> @@ -38,12 +38,12 @@ #include <unotools/options.hxx> //_________________________________________________________________________________________________________________ -// 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! *//*-*************************************************************************************************************/ @@ -51,91 +51,91 @@ class SvtWorkingSetOptions_Impl; //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** - @short collect informations about security features + @short collect informations about security features @descr - - @implements - - @base - + @implements - + @base - - @devstatus ready to use + @devstatus ready to use *//*-*************************************************************************************************************/ class SvtWorkingSetOptions: public utl::detail::Options { //------------------------------------------------------------------------------------------------------------- - // 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 - *//*-*****************************************************************************************************/ SvtWorkingSetOptions(); virtual ~SvtWorkingSetOptions(); //--------------------------------------------------------------------------------------------------------- - // interface + // interface //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short interface methods to get and set value of config key "org.openoffice.Office.Common/Security/Scripting/SecureURL" - @descr These value defines the editing view for documents and windows, which have to be restored + @short interface methods to get and set value of config key "org.openoffice.Office.Common/Security/Scripting/SecureURL" + @descr These value defines the editing view for documents and windows, which have to be restored when restarting StarOffice. The list gets filled, if Save/WorkingSet = true. - @seealso - + @seealso - - @param "seqWindowList", new values to set it in configuration. - @return The values which represent current state of internal variable. + @param "seqWindowList", new values to set it in configuration. + @return The values which represent current state of internal variable. - @onerror No error should occurre! + @onerror No error should occurre! *//*-*****************************************************************************************************/ - ::com::sun::star::uno::Sequence< ::rtl::OUString > GetWindowList( ) const ; - void SetWindowList( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& seqWindowList ) ; + ::com::sun::star::uno::Sequence< ::rtl::OUString > GetWindowList( ) const ; + void SetWindowList( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& seqWindowList ) ; //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short return a reference to a static mutex - @descr These class use his own static mutex to be threadsafe. + @short return a reference to a static mutex + @descr These class use his own static mutex to be threadsafe. 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(); //------------------------------------------------------------------------------------------------------------- - // private member + // private member //------------------------------------------------------------------------------------------------------------- private: @@ -148,9 +148,9 @@ class SvtWorkingSetOptions: public utl::detail::Options Do it in your source only. */ - static SvtWorkingSetOptions_Impl* m_pDataContainer ; /// impl. data container as dynamic pointer for smaller memory requirements! - static sal_Int32 m_nRefCount ; /// internal ref count mechanism + static SvtWorkingSetOptions_Impl* m_pDataContainer ; /// impl. data container as dynamic pointer for smaller memory requirements! + static sal_Int32 m_nRefCount ; /// internal ref count mechanism -}; // class SvtWorkingSetOptions +}; // class SvtWorkingSetOptions #endif // #ifndef INCLUDED_unotools_WORKINGSETOPTIONS_HXX diff --git a/unotools/inc/unotools/xmlaccelcfg.hxx b/unotools/inc/unotools/xmlaccelcfg.hxx index db561660d3c2..66c4e3738066 100644 --- a/unotools/inc/unotools/xmlaccelcfg.hxx +++ b/unotools/inc/unotools/xmlaccelcfg.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 @@ -79,10 +79,10 @@ class OReadAccelatorDocumentHandler : public ::com::sun::star::xml::sax::XDocume private: ::rtl::OUString getErrorLineString(); - int m_nElementDepth; - sal_Bool m_bAcceleratorMode; - sal_Bool m_bItemCloseExpected; - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > m_xLocator; + int m_nElementDepth; + sal_Bool m_bAcceleratorMode; + sal_Bool m_bItemCloseExpected; + ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > m_xLocator; SvtAcceleratorItemList& m_aReadAcceleratorList; }; @@ -102,8 +102,8 @@ class OWriteAccelatorDocumentHandler ::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_aAttributeType; - const SvtAcceleratorItemList& m_aWriteAcceleratorList; + ::rtl::OUString m_aAttributeType; + const SvtAcceleratorItemList& m_aWriteAcceleratorList; }; #endif // INCLUDED_unotools_XMLACCELCFG_HXX diff --git a/unotools/qa/complex/tempfile/TempFileTest.java b/unotools/qa/complex/tempfile/TempFileTest.java index fa50bdeee043..581d7ae97b15 100644 --- a/unotools/qa/complex/tempfile/TempFileTest.java +++ b/unotools/qa/complex/tempfile/TempFileTest.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/unotools/qa/complex/tempfile/TempFileUnitTest.java b/unotools/qa/complex/tempfile/TempFileUnitTest.java index 5cd0b7292105..bdecf39c0602 100644 --- a/unotools/qa/complex/tempfile/TempFileUnitTest.java +++ b/unotools/qa/complex/tempfile/TempFileUnitTest.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 @@ -37,17 +37,17 @@ import com.sun.star.uno.UnoRuntime; public class TempFileUnitTest extends ComplexTestCase { private XMultiServiceFactory m_xMSF = null; private XSimpleFileAccess m_xSFA = null; - + public String[] getTestMethodNames() { return new String[] { "ExecuteTest01", "ExecuteTest02"}; } - + public String getTestObjectName() { return "TempFileUnitTest"; } - + public void before() { m_xMSF = (XMultiServiceFactory)param.getMSF(); if ( m_xMSF == null ) { @@ -67,17 +67,17 @@ public class TempFileUnitTest extends ComplexTestCase { failed ( "Cannot get simple file access!" ); } } - + public void after() { m_xMSF = null; m_xSFA = null; } - + public void ExecuteTest01() { TempFileTest aTest = new Test01( m_xMSF, m_xSFA, log ); assure( "Test01 failed!", aTest.test() ); } - + public void ExecuteTest02() { TempFileTest aTest = new Test02( m_xMSF, m_xSFA, log ); assure( "Test02 failed!", aTest.test() ); diff --git a/unotools/qa/complex/tempfile/Test01.java b/unotools/qa/complex/tempfile/Test01.java index dbf3d6c15de2..ba8da9d0d189 100644 --- a/unotools/qa/complex/tempfile/Test01.java +++ b/unotools/qa/complex/tempfile/Test01.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 @@ -41,13 +41,13 @@ public class Test01 implements TempFileTest { XMultiServiceFactory m_xMSF = null; XSimpleFileAccess m_xSFA = null; TestHelper m_aTestHelper = null; - + public Test01(XMultiServiceFactory xMSF, XSimpleFileAccess xSFA, LogWriter aLogWriter) { m_xMSF = xMSF; m_xSFA = xSFA; m_aTestHelper = new TestHelper(aLogWriter, "Test01: "); } - + public boolean test() { XTempFile xTempFile = null; XTruncate xTruncate = null; @@ -65,19 +65,19 @@ public class Test01 implements TempFileTest { m_aTestHelper.Error( "Cannot create TempFile. exception: " + e ); return false; } - + //retrieve the tempfile URL if ( xTempFile == null ) { m_aTestHelper.Error( "Cannot get XTempFile interface." ); return false; } - + try { //compare the file name with the name in the URL. sFileURL = m_aTestHelper.GetTempFileURL( xTempFile ); sFileName = m_aTestHelper.GetTempFileName( xTempFile ); m_aTestHelper.CompareFileNameAndURL( sFileName, sFileURL ); - + //write to the stream using the service. byte pBytesIn[] = new byte[9]; byte pBytesOut1[][] = new byte [1][9]; @@ -85,7 +85,7 @@ public class Test01 implements TempFileTest { Random oRandom = new Random(); oRandom.nextBytes( pBytesIn ); m_aTestHelper.WriteBytesWithStream( pBytesIn, xTempFile ); - + //check the result by reading from the service. xTempFile.seek(0); m_aTestHelper.ReadBytesWithStream( pBytesOut1, pBytesIn.length + 1, xTempFile ); @@ -94,7 +94,7 @@ public class Test01 implements TempFileTest { m_aTestHelper.Error( "Tempfile outputs false data!" ); } } - + //check the result by reading from the file directly. m_aTestHelper.ReadDirectlyFromTempFile( pBytesOut2, pBytesIn.length + 1, m_xSFA, sFileURL ); for ( int i = 0; i < pBytesIn.length; i++ ) { @@ -102,7 +102,7 @@ public class Test01 implements TempFileTest { m_aTestHelper.Error( "Tempfile contains false data!" ); } } - + //close the object(by closing input and output), check that the file was removed. xTempFile.setRemoveFile( false ); m_aTestHelper.CloseTempFile( xTempFile ); diff --git a/unotools/qa/complex/tempfile/Test02.java b/unotools/qa/complex/tempfile/Test02.java index 18ca4de2e04b..b30231ad2fdb 100644 --- a/unotools/qa/complex/tempfile/Test02.java +++ b/unotools/qa/complex/tempfile/Test02.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 @@ -37,17 +37,17 @@ import java.util.Random; import share.LogWriter; public class Test02 implements TempFileTest { - + XMultiServiceFactory m_xMSF; XSimpleFileAccess m_xSFA; TestHelper m_aTestHelper; - + public Test02(XMultiServiceFactory xMSF, XSimpleFileAccess xSFA, LogWriter aLogWriter) { m_xMSF = xMSF; m_xSFA = xSFA; m_aTestHelper = new TestHelper(aLogWriter, "Test02: "); } - + public boolean test() { Object oTempFile = null; XTempFile xTempFile = null; @@ -73,16 +73,16 @@ public class Test02 implements TempFileTest { Random oRandom = new Random(); oRandom.nextBytes( pBytesIn ); m_aTestHelper.WriteBytesWithStream( pBytesIn, xTempFile ); - + //get the URL. sFileURL = m_aTestHelper.GetTempFileURL( xTempFile ); - + //let the service not to remove the URL. m_aTestHelper.SetTempFileRemove( xTempFile, false ); - + //close the tempfile by closing input and output. m_aTestHelper.CloseTempFile( xTempFile ); - + //check that the file is still available. //xTempFile.seek(0); m_aTestHelper.ReadDirectlyFromTempFile( pBytesOut, pBytesIn.length + 1, m_xSFA, sFileURL ); diff --git a/unotools/qa/complex/tempfile/TestHelper.java b/unotools/qa/complex/tempfile/TestHelper.java index 6edc2c362fa8..09d524b51005 100644 --- a/unotools/qa/complex/tempfile/TestHelper.java +++ b/unotools/qa/complex/tempfile/TestHelper.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 @@ -39,7 +39,7 @@ import share.LogWriter; public class TestHelper { LogWriter m_aLogWriter; String m_sTestPrefix; - + public TestHelper( LogWriter aLogWriter, String sTestPrefix ) { m_aLogWriter = aLogWriter; m_sTestPrefix = sTestPrefix; @@ -51,7 +51,7 @@ public class TestHelper { Error( "Cannot set TempFileRemove. exception: " + e ); } } - + public boolean GetTempFileRemove ( XTempFile xTempFile ) { boolean b = false; try { @@ -61,7 +61,7 @@ public class TestHelper { } return b; } - + public String GetTempFileURL ( XTempFile xTempFile ) { String sTempFileURL = null; try { @@ -74,7 +74,7 @@ public class TestHelper { } return sTempFileURL; } - + public String GetTempFileName( XTempFile xTempFile ) { String sTempFileName = null; try { @@ -87,7 +87,7 @@ public class TestHelper { } return sTempFileName; } - + public boolean CompareFileNameAndURL ( String sTempFileName, String sTempFileURL ) { boolean bRet = false; try { @@ -100,7 +100,7 @@ public class TestHelper { } return bRet; } - + public void WriteBytesWithStream( byte [] pBytes, XTempFile xTempFile ) { try { XOutputStream xOutTemp = xTempFile.getOutputStream(); @@ -114,7 +114,7 @@ public class TestHelper { Error( "Cannot write to stream. exception: " + e ); } } - + public void ReadBytesWithStream( byte [][] pBytes, int nBytes, XTempFile xTempFile ) { try { XInputStream xInTemp = xTempFile.getInputStream(); @@ -150,7 +150,7 @@ public class TestHelper { "ReadDirectlyFromTempFile(). exception: " + e ); } } - + public void CloseTempFile( XTempFile xTempFile ) { XOutputStream xOutTemp = null; XInputStream xInTemp = null; @@ -182,7 +182,7 @@ public class TestHelper { Error( "Cannot close input stream. exception:" + e ); } } - + public void KillTempFile ( String sTempFileURL, XSimpleFileAccess xSFA ) { try { if ( sTempFileURL != null ) { @@ -197,7 +197,7 @@ public class TestHelper { "KillTempFile(): " + e); } } - + public boolean IfTempFileExists( XSimpleFileAccess xSFA, String sTempFileURL ) { boolean bRet = false; try { @@ -206,7 +206,7 @@ public class TestHelper { bRet = xSFA.exists( sTempFileURL ); Message ( "Tempfile " + ( bRet ? "still " : "no longer " ) + "exists." ); } - } + } } catch( Exception e ) { Error( "Exception caught in TestHelper." + @@ -214,11 +214,11 @@ public class TestHelper { } return bRet; } - + public void Error( String sError ) { m_aLogWriter.println( m_sTestPrefix + "Error: " + sError ); } - + public void Message( String sMessage ) { m_aLogWriter.println( m_sTestPrefix + sMessage ); } diff --git a/unotools/source/accessibility/accessiblerelationsethelper.cxx b/unotools/source/accessibility/accessiblerelationsethelper.cxx index 60e807ee9320..dc05cadba1fb 100644 --- a/unotools/source/accessibility/accessiblerelationsethelper.cxx +++ b/unotools/source/accessibility/accessiblerelationsethelper.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,10 +34,10 @@ #include <vector> #include <comphelper/sequence.hxx> -using namespace ::utl; -using namespace ::rtl; -using namespace ::com::sun::star; -using namespace ::com::sun::star::accessibility; +using namespace ::utl; +using namespace ::rtl; +using namespace ::com::sun::star; +using namespace ::com::sun::star::accessibility; class AccessibleRelationSetHelperImpl { diff --git a/unotools/source/accessibility/accessiblestatesethelper.cxx b/unotools/source/accessibility/accessiblestatesethelper.cxx index be7bf3fbeb28..b54c5166cf06 100644 --- a/unotools/source/accessibility/accessiblestatesethelper.cxx +++ b/unotools/source/accessibility/accessiblestatesethelper.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,10 +41,10 @@ // it has the size of 64 because I use a uInt64 #define BITFIELDSIZE 64 -using namespace ::utl; -using namespace ::rtl; -using namespace ::com::sun::star; -using namespace ::com::sun::star::accessibility; +using namespace ::utl; +using namespace ::rtl; +using namespace ::com::sun::star; +using namespace ::com::sun::star::accessibility; class AccessibleStateSetHelperImpl { @@ -68,7 +68,7 @@ public: AccessibleStateSetHelperImpl* pNewStates) throw (uno::RuntimeException); - inline void AddStates( const sal_Int64 _nStates ) SAL_THROW( ( ) ); + inline void AddStates( const sal_Int64 _nStates ) SAL_THROW( ( ) ); private: #if 0 diff --git a/unotools/source/config/accelcfg.cxx b/unotools/source/config/accelcfg.cxx index fc0e6108138b..9e2602bd88cd 100644 --- a/unotools/source/config/accelcfg.cxx +++ b/unotools/source/config/accelcfg.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 @@ -68,14 +68,14 @@ class SvtAcceleratorConfig_Impl public: SvtAcceleratorItemList aList; - bool bModified; + bool bModified; SvtAcceleratorConfig_Impl() : bModified( FALSE ) {} SvtAcceleratorConfig_Impl( Reference< XInputStream >& xInputStream ); - bool Commit( Reference< XOutputStream >& xOutputStream ); + bool Commit( Reference< XOutputStream >& xOutputStream ); }; // ----------------------------------------------------------------------- diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx index b2e1bf1739f8..cb5a49e7d5c1 100644 --- a/unotools/source/config/bootstrap.cxx +++ b/unotools/source/config/bootstrap.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,26 +50,26 @@ // --------------------------------------------------------------------------------------- #define BOOTSTRAP_DATA_NAME SAL_CONFIGFILE("bootstrap") -#define BOOTSTRAP_ITEM_PRODUCT_KEY "ProductKey" +#define BOOTSTRAP_ITEM_PRODUCT_KEY "ProductKey" #define BOOTSTRAP_ITEM_PRODUCT_SOURCE "ProductSource" -#define BOOTSTRAP_ITEM_VERSIONFILE "Location" -#define BOOTSTRAP_ITEM_BUILDID "buildid" +#define BOOTSTRAP_ITEM_VERSIONFILE "Location" +#define BOOTSTRAP_ITEM_BUILDID "buildid" -#define BOOTSTRAP_ITEM_BASEINSTALLATION "BaseInstallation" -#define BOOTSTRAP_ITEM_USERINSTALLATION "UserInstallation" +#define BOOTSTRAP_ITEM_BASEINSTALLATION "BaseInstallation" +#define BOOTSTRAP_ITEM_USERINSTALLATION "UserInstallation" -#define BOOTSTRAP_ITEM_SHAREDIR "SharedDataDir" -#define BOOTSTRAP_ITEM_USERDIR "UserDataDir" +#define BOOTSTRAP_ITEM_SHAREDIR "SharedDataDir" +#define BOOTSTRAP_ITEM_USERDIR "UserDataDir" -#define BOOTSTRAP_DEFAULT_BASEINSTALL "$SYSBINDIR/.." +#define BOOTSTRAP_DEFAULT_BASEINSTALL "$SYSBINDIR/.." -#define BOOTSTRAP_DIRNAME_SHAREDIR "share" -#define BOOTSTRAP_DIRNAME_USERDIR "user" +#define BOOTSTRAP_DIRNAME_SHAREDIR "share" +#define BOOTSTRAP_DIRNAME_USERDIR "user" -#define VERSIONFILE_SECTION "Versions" +#define VERSIONFILE_SECTION "Versions" -#define SETUP_DATA_NAME SAL_CONFIGFILE("setup") -#define SETUP_ITEM_ALLUSERS "ALLUSERS" +#define SETUP_DATA_NAME SAL_CONFIGFILE("setup") +#define SETUP_ITEM_ALLUSERS "ALLUSERS" // --------------------------------------------------------------------------------------- typedef char const * AsciiString; // --------------------------------------------------------------------------------------- @@ -195,23 +195,23 @@ PathStatus implCheckStatusOfURL(OUString const& _sURL, osl::DirectoryItem& aDirI { switch( DirectoryItem::get(_sURL, aDirItem) ) { - case DirectoryItem::E_None: // Success + case DirectoryItem::E_None: // Success eStatus = Bootstrap::PATH_EXISTS; break; - case DirectoryItem::E_NOENT: // No such file or directory<br> + case DirectoryItem::E_NOENT: // No such file or directory<br> eStatus = Bootstrap::PATH_VALID; break; - case DirectoryItem::E_INVAL: // the format of the parameters was not valid<br> - case DirectoryItem::E_NAMETOOLONG: // File name too long<br> - case DirectoryItem::E_NOTDIR: // A component of the path prefix of path is not a directory<p> + case DirectoryItem::E_INVAL: // the format of the parameters was not valid<br> + case DirectoryItem::E_NAMETOOLONG: // File name too long<br> + case DirectoryItem::E_NOTDIR: // A component of the path prefix of path is not a directory<p> eStatus = Bootstrap::DATA_INVALID; break; // how to handle these ? - case DirectoryItem::E_LOOP: // Too many symbolic links encountered<br> - case DirectoryItem::E_ACCES: // permission denied<br> + case DirectoryItem::E_LOOP: // Too many symbolic links encountered<br> + case DirectoryItem::E_ACCES: // permission denied<br> // any other error - what to do ? default: eStatus = Bootstrap::DATA_UNKNOWN; diff --git a/unotools/source/config/cacheoptions.cxx b/unotools/source/config/cacheoptions.cxx index 2b2b612274ac..af2565f9b6ab 100644 --- a/unotools/source/config/cacheoptions.cxx +++ b/unotools/source/config/cacheoptions.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 @@ #endif //_________________________________________________________________________________________________________________ -// includes +// includes //_________________________________________________________________________________________________________________ #include <unotools/cacheoptions.hxx> @@ -42,7 +42,7 @@ #include <com/sun/star/uno/Sequence.hxx> //_________________________________________________________________________________________________________________ -// namespaces +// namespaces //_________________________________________________________________________________________________________________ using namespace ::utl; @@ -51,66 +51,66 @@ using namespace ::osl; using namespace ::com::sun::star::uno; //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ -#define ROOTNODE_START OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Cache" )) -#define DEFAULT_WRITEROLE 20 -#define DEFAULT_DRAWINGOLE 20 -#define DEFAULT_GRFMGR_TOTALSIZE 10000000 -#define DEFAULT_GRFMGR_OBJECTSIZE 2400000 -#define DEFAULT_GRFMGR_OBJECTRELEASE 600 - -#define PROPERTYNAME_WRITEROLE OUString(RTL_CONSTASCII_USTRINGPARAM("Writer/OLE_Objects")) -#define PROPERTYNAME_DRAWINGOLE OUString(RTL_CONSTASCII_USTRINGPARAM("DrawingEngine/OLE_Objects")) -#define PROPERTYNAME_GRFMGR_TOTALSIZE OUString(RTL_CONSTASCII_USTRINGPARAM("GraphicManager/TotalCacheSize")) -#define PROPERTYNAME_GRFMGR_OBJECTSIZE OUString(RTL_CONSTASCII_USTRINGPARAM("GraphicManager/ObjectCacheSize")) +#define ROOTNODE_START OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Cache" )) +#define DEFAULT_WRITEROLE 20 +#define DEFAULT_DRAWINGOLE 20 +#define DEFAULT_GRFMGR_TOTALSIZE 10000000 +#define DEFAULT_GRFMGR_OBJECTSIZE 2400000 +#define DEFAULT_GRFMGR_OBJECTRELEASE 600 + +#define PROPERTYNAME_WRITEROLE OUString(RTL_CONSTASCII_USTRINGPARAM("Writer/OLE_Objects")) +#define PROPERTYNAME_DRAWINGOLE OUString(RTL_CONSTASCII_USTRINGPARAM("DrawingEngine/OLE_Objects")) +#define PROPERTYNAME_GRFMGR_TOTALSIZE OUString(RTL_CONSTASCII_USTRINGPARAM("GraphicManager/TotalCacheSize")) +#define PROPERTYNAME_GRFMGR_OBJECTSIZE OUString(RTL_CONSTASCII_USTRINGPARAM("GraphicManager/ObjectCacheSize")) #define PROPERTYNAME_GRFMGR_OBJECTRELEASE OUString(RTL_CONSTASCII_USTRINGPARAM("GraphicManager/ObjectReleaseTime")) -#define PROPERTYHANDLE_WRITEROLE 0 -#define PROPERTYHANDLE_DRAWINGOLE 1 -#define PROPERTYHANDLE_GRFMGR_TOTALSIZE 2 -#define PROPERTYHANDLE_GRFMGR_OBJECTSIZE 3 +#define PROPERTYHANDLE_WRITEROLE 0 +#define PROPERTYHANDLE_DRAWINGOLE 1 +#define PROPERTYHANDLE_GRFMGR_TOTALSIZE 2 +#define PROPERTYHANDLE_GRFMGR_OBJECTSIZE 3 #define PROPERTYHANDLE_GRFMGR_OBJECTRELEASE 4 -#define PROPERTYCOUNT 5 +#define PROPERTYCOUNT 5 class SvtCacheOptions_Impl : public ConfigItem { public: //--------------------------------------------------------------------------------------------------------- -// constructor / destructor +// constructor / destructor //--------------------------------------------------------------------------------------------------------- SvtCacheOptions_Impl(); ~SvtCacheOptions_Impl(); //--------------------------------------------------------------------------------------------------------- -// overloaded methods of baseclass +// overloaded methods of baseclass //--------------------------------------------------------------------------------------------------------- - virtual void Commit(); + virtual void Commit(); virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); //--------------------------------------------------------------------------------------------------------- -// public interface +// public interface //--------------------------------------------------------------------------------------------------------- - sal_Int32 GetWriterOLE_Objects() const; - sal_Int32 GetDrawingEngineOLE_Objects() const; - sal_Int32 GetGraphicManagerTotalCacheSize() const; - sal_Int32 GetGraphicManagerObjectCacheSize() const; - sal_Int32 GetGraphicManagerObjectReleaseTime() const; + sal_Int32 GetWriterOLE_Objects() const; + sal_Int32 GetDrawingEngineOLE_Objects() const; + sal_Int32 GetGraphicManagerTotalCacheSize() const; + sal_Int32 GetGraphicManagerObjectCacheSize() const; + sal_Int32 GetGraphicManagerObjectReleaseTime() const; - void SetWriterOLE_Objects( sal_Int32 nObjects ); - void SetDrawingEngineOLE_Objects( sal_Int32 nObjects ); - void SetGraphicManagerTotalCacheSize( sal_Int32 nTotalCacheSize ); - void SetGraphicManagerObjectCacheSize( sal_Int32 nObjectCacheSize ); + void SetWriterOLE_Objects( sal_Int32 nObjects ); + void SetDrawingEngineOLE_Objects( sal_Int32 nObjects ); + void SetGraphicManagerTotalCacheSize( sal_Int32 nTotalCacheSize ); + void SetGraphicManagerObjectCacheSize( sal_Int32 nObjectCacheSize ); void SetGraphicManagerObjectReleaseTime( sal_Int32 nReleaseTimeSeconds ); //------------------------------------------------------------------------------------------------------------- -// private methods +// private methods //------------------------------------------------------------------------------------------------------------- private: @@ -118,41 +118,41 @@ private: static Sequence< OUString > impl_GetPropertyNames(); //------------------------------------------------------------------------------------------------------------- -// private member +// private member //------------------------------------------------------------------------------------------------------------- private: - sal_Int32 mnWriterOLE; - sal_Int32 mnDrawingOLE; - sal_Int32 mnGrfMgrTotalSize; - sal_Int32 mnGrfMgrObjectSize; + sal_Int32 mnWriterOLE; + sal_Int32 mnDrawingOLE; + sal_Int32 mnGrfMgrTotalSize; + sal_Int32 mnGrfMgrObjectSize; sal_Int32 mnGrfMgrObjectRelease; }; //_________________________________________________________________________________________________________________ -// definitions +// definitions //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** SvtCacheOptions_Impl::SvtCacheOptions_Impl() : - ConfigItem( ROOTNODE_START ), + ConfigItem( ROOTNODE_START ), mnWriterOLE( DEFAULT_WRITEROLE ), mnDrawingOLE( DEFAULT_DRAWINGOLE ), mnGrfMgrTotalSize( DEFAULT_GRFMGR_TOTALSIZE ), mnGrfMgrObjectSize( DEFAULT_GRFMGR_OBJECTSIZE ), mnGrfMgrObjectRelease( DEFAULT_GRFMGR_OBJECTRELEASE ) { - Sequence< OUString > seqNames( impl_GetPropertyNames() ); - Sequence< Any > seqValues = GetProperties( seqNames ) ; + Sequence< OUString > seqNames( impl_GetPropertyNames() ); + Sequence< Any > seqValues = GetProperties( seqNames ) ; DBG_ASSERT( !(seqNames.getLength()!=seqValues.getLength()), "SvtCacheOptions_Impl::SvtCacheOptions_Impl()\nI miss some values of configuration keys!\n" ); // Copy values from list in right order to ouer internal member. sal_Int32 nPropertyCount = seqValues.getLength(); - sal_Int32 nProperty = 0; + sal_Int32 nProperty = 0; for( nProperty=0; nProperty<nPropertyCount; ++nProperty ) { @@ -200,7 +200,7 @@ SvtCacheOptions_Impl::SvtCacheOptions_Impl() : } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** SvtCacheOptions_Impl::~SvtCacheOptions_Impl() { @@ -209,12 +209,12 @@ SvtCacheOptions_Impl::~SvtCacheOptions_Impl() } //***************************************************************************************************************** -// Commit +// Commit //***************************************************************************************************************** void SvtCacheOptions_Impl::Commit() { - Sequence< OUString > aSeqNames( impl_GetPropertyNames() ); - Sequence< Any > aSeqValues( aSeqNames.getLength() ); + Sequence< OUString > aSeqNames( impl_GetPropertyNames() ); + Sequence< Any > aSeqValues( aSeqNames.getLength() ); for( sal_Int32 nProperty = 0, nCount = aSeqNames.getLength(); nProperty < nCount; ++nProperty ) { @@ -250,7 +250,7 @@ void SvtCacheOptions_Impl::Notify( const Sequence< rtl::OUString >& ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Int32 SvtCacheOptions_Impl::GetWriterOLE_Objects() const { @@ -258,7 +258,7 @@ sal_Int32 SvtCacheOptions_Impl::GetWriterOLE_Objects() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Int32 SvtCacheOptions_Impl::GetDrawingEngineOLE_Objects() const { @@ -266,7 +266,7 @@ sal_Int32 SvtCacheOptions_Impl::GetDrawingEngineOLE_Objects() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Int32 SvtCacheOptions_Impl::GetGraphicManagerTotalCacheSize() const { @@ -274,7 +274,7 @@ sal_Int32 SvtCacheOptions_Impl::GetGraphicManagerTotalCacheSize() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Int32 SvtCacheOptions_Impl::GetGraphicManagerObjectCacheSize() const { @@ -282,7 +282,7 @@ sal_Int32 SvtCacheOptions_Impl::GetGraphicManagerObjectCacheSize() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Int32 SvtCacheOptions_Impl::GetGraphicManagerObjectReleaseTime() const { @@ -290,7 +290,7 @@ sal_Int32 SvtCacheOptions_Impl::GetGraphicManagerObjectReleaseTime() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtCacheOptions_Impl::SetWriterOLE_Objects( sal_Int32 nWriterOLE ) { @@ -299,7 +299,7 @@ void SvtCacheOptions_Impl::SetWriterOLE_Objects( sal_Int32 nWriterOLE ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtCacheOptions_Impl::SetDrawingEngineOLE_Objects( sal_Int32 nDrawingOLE ) { @@ -308,7 +308,7 @@ void SvtCacheOptions_Impl::SetDrawingEngineOLE_Objects( sal_Int32 nDrawingOLE ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtCacheOptions_Impl::SetGraphicManagerTotalCacheSize( sal_Int32 nGrfMgrTotalSize ) { @@ -317,7 +317,7 @@ void SvtCacheOptions_Impl::SetGraphicManagerTotalCacheSize( sal_Int32 nGrfMgrTot } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtCacheOptions_Impl::SetGraphicManagerObjectCacheSize( sal_Int32 nGrfMgrObjectSize ) { @@ -326,7 +326,7 @@ void SvtCacheOptions_Impl::SetGraphicManagerObjectCacheSize( sal_Int32 nGrfMgrOb } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtCacheOptions_Impl::SetGraphicManagerObjectReleaseTime( sal_Int32 nGrfMgrObjectReleaseTime ) { @@ -335,7 +335,7 @@ void SvtCacheOptions_Impl::SetGraphicManagerObjectReleaseTime( sal_Int32 nGrfMgr } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** Sequence< OUString > SvtCacheOptions_Impl::impl_GetPropertyNames() { @@ -355,15 +355,15 @@ Sequence< OUString > SvtCacheOptions_Impl::impl_GetPropertyNames() } //***************************************************************************************************************** -// 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 //***************************************************************************************************************** -SvtCacheOptions_Impl* SvtCacheOptions::m_pDataContainer = NULL; -sal_Int32 SvtCacheOptions::m_nRefCount = 0; +SvtCacheOptions_Impl* SvtCacheOptions::m_pDataContainer = NULL; +sal_Int32 SvtCacheOptions::m_nRefCount = 0; //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** SvtCacheOptions::SvtCacheOptions() { @@ -379,7 +379,7 @@ SvtCacheOptions::SvtCacheOptions() } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** SvtCacheOptions::~SvtCacheOptions() { @@ -397,7 +397,7 @@ SvtCacheOptions::~SvtCacheOptions() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Int32 SvtCacheOptions::GetWriterOLE_Objects() const { @@ -406,7 +406,7 @@ sal_Int32 SvtCacheOptions::GetWriterOLE_Objects() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Int32 SvtCacheOptions::GetDrawingEngineOLE_Objects() const { @@ -415,7 +415,7 @@ sal_Int32 SvtCacheOptions::GetDrawingEngineOLE_Objects() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Int32 SvtCacheOptions::GetGraphicManagerTotalCacheSize() const { @@ -424,7 +424,7 @@ sal_Int32 SvtCacheOptions::GetGraphicManagerTotalCacheSize() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Int32 SvtCacheOptions::GetGraphicManagerObjectCacheSize() const { @@ -433,7 +433,7 @@ sal_Int32 SvtCacheOptions::GetGraphicManagerObjectCacheSize() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Int32 SvtCacheOptions::GetGraphicManagerObjectReleaseTime() const { @@ -442,7 +442,7 @@ sal_Int32 SvtCacheOptions::GetGraphicManagerObjectReleaseTime() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtCacheOptions::SetWriterOLE_Objects( sal_Int32 nWriterOLE ) { @@ -451,7 +451,7 @@ void SvtCacheOptions::SetWriterOLE_Objects( sal_Int32 nWriterOLE ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtCacheOptions::SetDrawingEngineOLE_Objects( sal_Int32 nDrawingOLE ) { @@ -460,7 +460,7 @@ void SvtCacheOptions::SetDrawingEngineOLE_Objects( sal_Int32 nDrawingOLE ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtCacheOptions::SetGraphicManagerTotalCacheSize( sal_Int32 nGrfMgrTotalSize ) { @@ -469,7 +469,7 @@ void SvtCacheOptions::SetGraphicManagerTotalCacheSize( sal_Int32 nGrfMgrTotalSiz } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtCacheOptions::SetGraphicManagerObjectCacheSize( sal_Int32 nGrfMgrObjectSize ) { @@ -478,7 +478,7 @@ void SvtCacheOptions::SetGraphicManagerObjectCacheSize( sal_Int32 nGrfMgrObjectS } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtCacheOptions::SetGraphicManagerObjectReleaseTime( sal_Int32 nGrfMgrObjectReleaseTime ) { @@ -487,7 +487,7 @@ void SvtCacheOptions::SetGraphicManagerObjectReleaseTime( sal_Int32 nGrfMgrObjec } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** Mutex& SvtCacheOptions::GetOwnStaticMutex() { diff --git a/unotools/source/config/cmdoptions.cxx b/unotools/source/config/cmdoptions.cxx index fd4fb07e7918..724ea8658997 100644 --- a/unotools/source/config/cmdoptions.cxx +++ b/unotools/source/config/cmdoptions.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_unotools.hxx" //_________________________________________________________________________________________________________________ -// includes +// includes //_________________________________________________________________________________________________________________ #include <unotools/cmdoptions.hxx> @@ -48,33 +48,33 @@ #include <hash_map> //_________________________________________________________________________________________________________________ -// namespaces +// namespaces //_________________________________________________________________________________________________________________ -using namespace ::std ; -using namespace ::utl ; -using namespace ::rtl ; -using namespace ::osl ; -using namespace ::com::sun::star::uno ; -using namespace ::com::sun::star::beans ; +using namespace ::std ; +using namespace ::utl ; +using namespace ::rtl ; +using namespace ::osl ; +using namespace ::com::sun::star::uno ; +using namespace ::com::sun::star::beans ; //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ -#define ROOTNODE_CMDOPTIONS OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Commands/Execute" )) -#define PATHDELIMITER OUString(RTL_CONSTASCII_USTRINGPARAM("/" )) +#define ROOTNODE_CMDOPTIONS OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Commands/Execute" )) +#define PATHDELIMITER OUString(RTL_CONSTASCII_USTRINGPARAM("/" )) -#define SETNODE_DISABLED OUString(RTL_CONSTASCII_USTRINGPARAM("Disabled" )) +#define SETNODE_DISABLED OUString(RTL_CONSTASCII_USTRINGPARAM("Disabled" )) -#define PROPERTYNAME_CMD OUString(RTL_CONSTASCII_USTRINGPARAM("Command" )) +#define PROPERTYNAME_CMD OUString(RTL_CONSTASCII_USTRINGPARAM("Command" )) #define PROPERTYCOUNT 1 #define OFFSET_CMD 0 //_________________________________________________________________________________________________________________ -// private declarations! +// private declarations! //_________________________________________________________________________________________________________________ // Method to retrieve a hash code from a string. May be we have to change it to decrease collisions in the hash map @@ -130,9 +130,9 @@ class SvtCmdOptions // special strings "sEmpty" and "sSeperator" to perform too ... Sequence< OUString > GetList() const { - sal_Int32 nCount = (sal_Int32)m_aCommandHashMap.size(); - sal_Int32 nIndex = 0; - Sequence< OUString > aList( nCount ); + sal_Int32 nCount = (sal_Int32)m_aCommandHashMap.size(); + sal_Int32 nIndex = 0; + Sequence< OUString > aList( nCount ); CommandHashMap::const_iterator pEntry = m_aCommandHashMap.begin(); while ( pEntry != m_aCommandHashMap.end() ) @@ -142,10 +142,10 @@ class SvtCmdOptions } private: - class CommandHashMap : public ::std::hash_map< ::rtl::OUString , - sal_Int32 , - OUStringHashCode , - ::std::equal_to< ::rtl::OUString > > + class CommandHashMap : public ::std::hash_map< ::rtl::OUString , + sal_Int32 , + OUStringHashCode , + ::std::equal_to< ::rtl::OUString > > { public: inline void free() @@ -162,55 +162,55 @@ typedef ::std::vector< ::com::sun::star::uno::WeakReference< ::com::sun::star::f class SvtCommandOptions_Impl : public ConfigItem { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: //--------------------------------------------------------------------------------------------------------- - // constructor / destructor + // constructor / destructor //--------------------------------------------------------------------------------------------------------- SvtCommandOptions_Impl(); ~SvtCommandOptions_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< 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 //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** @@ -218,45 +218,45 @@ class SvtCommandOptions_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 - *//*-*****************************************************************************************************/ - void Clear ( SvtCommandOptions::CmdOption eCmdOption ); + void Clear ( SvtCommandOptions::CmdOption eCmdOption ); sal_Bool HasEntries ( SvtCommandOptions::CmdOption eOption ) const; - sal_Bool Lookup ( SvtCommandOptions::CmdOption eCmdOption, const OUString& ) const; - Sequence< OUString > GetList ( SvtCommandOptions::CmdOption eCmdOption ) const ; - void AddCommand ( SvtCommandOptions::CmdOption eCmdOption, - const OUString& sURL ); + sal_Bool Lookup ( SvtCommandOptions::CmdOption eCmdOption, const OUString& ) const; + Sequence< OUString > GetList ( SvtCommandOptions::CmdOption eCmdOption ) const ; + void AddCommand ( SvtCommandOptions::CmdOption eCmdOption, + const OUString& sURL ); void EstablisFrameCallback(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame); //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: /*-****************************************************************************************************//** @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 and support dynamical menu item lists! - @seealso - + @seealso - - @param "nDisabledCount" , returns count of menu entries for "new" - @return A list of configuration key names is returned. + @param "nDisabledCount" , returns count of menu entries for "new" + @return A list of configuration key names is returned. - @onerror - + @onerror - *//*-*****************************************************************************************************/ Sequence< OUString > impl_GetPropertyNames(); //------------------------------------------------------------------------------------------------------------- - // private member + // private member //------------------------------------------------------------------------------------------------------------- private: @@ -265,11 +265,11 @@ class SvtCommandOptions_Impl : public ConfigItem }; //_________________________________________________________________________________________________________________ -// definitions +// definitions //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** SvtCommandOptions_Impl::SvtCommandOptions_Impl() // Init baseclasses first @@ -288,8 +288,8 @@ SvtCommandOptions_Impl::SvtCommandOptions_Impl() // Copy values from list in right order to ouer internal member. // Attention: List for names and values have an internal construction pattern! - sal_Int32 nItem = 0 ; - OUString sCmd ; + sal_Int32 nItem = 0 ; + OUString sCmd ; // Set size of hash_map reach a used size of approx. 60% m_aDisabledCommands.SetContainerSize( lNames.getLength() * 10 / 6 ); @@ -311,7 +311,7 @@ SvtCommandOptions_Impl::SvtCommandOptions_Impl() } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** SvtCommandOptions_Impl::~SvtCommandOptions_Impl() { @@ -323,7 +323,7 @@ SvtCommandOptions_Impl::~SvtCommandOptions_Impl() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtCommandOptions_Impl::Notify( const Sequence< OUString >& ) { @@ -339,8 +339,8 @@ void SvtCommandOptions_Impl::Notify( const Sequence< OUString >& ) // Copy values from list in right order to ouer internal member. // Attention: List for names and values have an internal construction pattern! - sal_Int32 nItem = 0 ; - OUString sCmd ; + sal_Int32 nItem = 0 ; + OUString sCmd ; // Set size of hash_map reach a used size of approx. 60% m_aDisabledCommands.Clear(); @@ -367,7 +367,7 @@ void SvtCommandOptions_Impl::Notify( const Sequence< OUString >& ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtCommandOptions_Impl::Commit() { @@ -375,7 +375,7 @@ void SvtCommandOptions_Impl::Commit() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtCommandOptions_Impl::Clear( SvtCommandOptions::CmdOption eCmdOption ) { @@ -394,7 +394,7 @@ void SvtCommandOptions_Impl::Clear( SvtCommandOptions::CmdOption eCmdOption ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Bool SvtCommandOptions_Impl::HasEntries( SvtCommandOptions::CmdOption eOption ) const { @@ -405,7 +405,7 @@ sal_Bool SvtCommandOptions_Impl::HasEntries( SvtCommandOptions::CmdOption eOptio } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** Sequence< OUString > SvtCommandOptions_Impl::GetList( SvtCommandOptions::CmdOption eCmdOption ) const { @@ -427,7 +427,7 @@ Sequence< OUString > SvtCommandOptions_Impl::GetList( SvtCommandOptions::CmdOpti } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Bool SvtCommandOptions_Impl::Lookup( SvtCommandOptions::CmdOption eCmdOption, const OUString& aCommand ) const { @@ -445,7 +445,7 @@ sal_Bool SvtCommandOptions_Impl::Lookup( SvtCommandOptions::CmdOption eCmdOption } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtCommandOptions_Impl::AddCommand( SvtCommandOptions::CmdOption eCmdOption, const OUString& sCmd ) { @@ -478,7 +478,7 @@ void SvtCommandOptions_Impl::EstablisFrameCallback(const ::com::sun::star::uno:: } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** Sequence< OUString > SvtCommandOptions_Impl::impl_GetPropertyNames() { @@ -506,15 +506,15 @@ Sequence< OUString > SvtCommandOptions_Impl::impl_GetPropertyNames() } //***************************************************************************************************************** -// 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 //***************************************************************************************************************** SvtCommandOptions_Impl* SvtCommandOptions::m_pDataContainer = NULL ; sal_Int32 SvtCommandOptions::m_nRefCount = 0 ; //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** SvtCommandOptions::SvtCommandOptions() { @@ -531,7 +531,7 @@ SvtCommandOptions::SvtCommandOptions() } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** SvtCommandOptions::~SvtCommandOptions() { @@ -549,7 +549,7 @@ SvtCommandOptions::~SvtCommandOptions() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtCommandOptions::Clear( CmdOption eCmdOption ) { @@ -558,7 +558,7 @@ void SvtCommandOptions::Clear( CmdOption eCmdOption ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Bool SvtCommandOptions::HasEntries( CmdOption eOption ) const { @@ -567,7 +567,7 @@ sal_Bool SvtCommandOptions::HasEntries( CmdOption eOption ) const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Bool SvtCommandOptions::Lookup( CmdOption eCmdOption, const OUString& aCommandURL ) const { @@ -576,7 +576,7 @@ sal_Bool SvtCommandOptions::Lookup( CmdOption eCmdOption, const OUString& aComma } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** Sequence< OUString > SvtCommandOptions::GetList( CmdOption eCmdOption ) const { @@ -585,7 +585,7 @@ Sequence< OUString > SvtCommandOptions::GetList( CmdOption eCmdOption ) const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtCommandOptions::AddCommand( CmdOption eCmdOption, const OUString& sURL ) { @@ -603,7 +603,7 @@ void SvtCommandOptions::EstablisFrameCallback(const ::com::sun::star::uno::Refer } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** Mutex& SvtCommandOptions::GetOwnStaticMutex() { diff --git a/unotools/source/config/compatibility.cxx b/unotools/source/config/compatibility.cxx index 61ebe0211817..4640cf9bb662 100644 --- a/unotools/source/config/compatibility.cxx +++ b/unotools/source/config/compatibility.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,12 +29,13 @@ #include "precompiled_unotools.hxx" //_________________________________________________________________________________________________________________ -// includes +// includes //_________________________________________________________________________________________________________________ #include <unotools/compatibility.hxx> #include <unotools/configmgr.hxx> #include <unotools/configitem.hxx> +#include <unotools/syslocale.hxx> #include <tools/debug.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> @@ -48,7 +49,7 @@ #include <algorithm> //_________________________________________________________________________________________________________________ -// namespaces +// namespaces //_________________________________________________________________________________________________________________ using namespace ::std; @@ -59,12 +60,12 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ -#define ROOTNODE_OPTIONS OUString( RTL_CONSTASCII_USTRINGPARAM( "Office.Compatibility/" ) ) -#define PATHDELIMITER OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ) -#define SETNODE_ALLFILEFORMATS OUString( RTL_CONSTASCII_USTRINGPARAM( "AllFileFormats" ) ) +#define ROOTNODE_OPTIONS OUString( RTL_CONSTASCII_USTRINGPARAM( "Office.Compatibility/" ) ) +#define PATHDELIMITER OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ) +#define SETNODE_ALLFILEFORMATS OUString( RTL_CONSTASCII_USTRINGPARAM( "AllFileFormats" ) ) #define PROPERTYNAME_NAME COMPATIBILITY_PROPERTYNAME_NAME #define PROPERTYNAME_MODULE COMPATIBILITY_PROPERTYNAME_MODULE @@ -97,7 +98,7 @@ using namespace ::com::sun::star::beans; #define OFFSET_EXPANDWORDSPACE 12 //_________________________________________________________________________________________________________________ -// private declarations! +// private declarations! //_________________________________________________________________________________________________________________ /*-**************************************************************************************************************** @@ -123,30 +124,30 @@ struct SvtCompatibilityEntry bUseOurTextWrapping( false ), bConsiderWrappingStyle( false ), bExpandWordSpace( true ) {} - inline void SetUsePrtMetrics( bool _bSet ) { bUsePrtMetrics = _bSet; } - inline void SetAddSpacing( bool _bSet ) { bAddSpacing = _bSet; } - inline void SetAddSpacingAtPages( bool _bSet ) { bAddSpacingAtPages = _bSet; } - inline void SetUseOurTabStops( bool _bSet ) { bUseOurTabStops = _bSet; } - inline void SetNoExtLeading( bool _bSet ) { bNoExtLeading = _bSet; } - inline void SetUseLineSpacing( bool _bSet ) { bUseLineSpacing = _bSet; } - inline void SetAddTableSpacing( bool _bSet ) { bAddTableSpacing = _bSet; } - inline void SetUseObjPos( bool _bSet ) { bUseObjPos = _bSet; } - inline void SetUseOurTextWrapping( bool _bSet ) { bUseOurTextWrapping = _bSet; } + inline void SetUsePrtMetrics( bool _bSet ) { bUsePrtMetrics = _bSet; } + inline void SetAddSpacing( bool _bSet ) { bAddSpacing = _bSet; } + inline void SetAddSpacingAtPages( bool _bSet ) { bAddSpacingAtPages = _bSet; } + inline void SetUseOurTabStops( bool _bSet ) { bUseOurTabStops = _bSet; } + inline void SetNoExtLeading( bool _bSet ) { bNoExtLeading = _bSet; } + inline void SetUseLineSpacing( bool _bSet ) { bUseLineSpacing = _bSet; } + inline void SetAddTableSpacing( bool _bSet ) { bAddTableSpacing = _bSet; } + inline void SetUseObjPos( bool _bSet ) { bUseObjPos = _bSet; } + inline void SetUseOurTextWrapping( bool _bSet ) { bUseOurTextWrapping = _bSet; } inline void SetConsiderWrappingStyle( bool _bSet ) { bConsiderWrappingStyle = _bSet; } inline void SetExpandWordSpace( bool _bSet ) { bExpandWordSpace = _bSet; } public: OUString sName; OUString sModule; - bool bUsePrtMetrics; - bool bAddSpacing; - bool bAddSpacingAtPages; - bool bUseOurTabStops; - bool bNoExtLeading; - bool bUseLineSpacing; - bool bAddTableSpacing; - bool bUseObjPos; - bool bUseOurTextWrapping; + bool bUsePrtMetrics; + bool bAddSpacing; + bool bAddSpacingAtPages; + bool bUseOurTabStops; + bool bNoExtLeading; + bool bUseLineSpacing; + bool bAddTableSpacing; + bool bUseObjPos; + bool bUseOurTextWrapping; bool bConsiderWrappingStyle; bool bExpandWordSpace; }; @@ -181,7 +182,7 @@ class SvtCompatibility Sequence< Sequence< PropertyValue > > lResult( nCount ); const vector< SvtCompatibilityEntry >* pList = &lEntries; - lProperties[ OFFSET_NAME ].Name = PROPERTYNAME_NAME; + lProperties[ OFFSET_NAME ].Name = PROPERTYNAME_NAME; lProperties[ OFFSET_MODULE ].Name = PROPERTYNAME_MODULE; lProperties[ OFFSET_USEPRTMETRICS ].Name = PROPERTYNAME_USEPRTMETRICS; lProperties[ OFFSET_ADDSPACING ].Name = PROPERTYNAME_ADDSPACING; @@ -218,7 +219,7 @@ class SvtCompatibility return lResult; } - int size() const + int size() const { return lEntries.size(); } @@ -235,55 +236,57 @@ class SvtCompatibility class SvtCompatibilityOptions_Impl : public ConfigItem { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: //--------------------------------------------------------------------------------------------------------- - // constructor / destructor + // constructor / destructor //--------------------------------------------------------------------------------------------------------- SvtCompatibilityOptions_Impl(); ~SvtCompatibilityOptions_Impl(); + void SetDefault( OUString sName, bool bValue ); + //--------------------------------------------------------------------------------------------------------- - // 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< 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 //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** @@ -291,17 +294,17 @@ class SvtCompatibilityOptions_Impl : public ConfigItem @descr These class is used as static member of "SvtCompatibilityOptions" ... => The code exist only for one time and isn't duplicated for every instance! - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ void Clear(); Sequence< Sequence< PropertyValue > > GetList() const; - void AppendItem( const ::rtl::OUString& _sName, + void AppendItem( const ::rtl::OUString& _sName, const ::rtl::OUString& _sModule, bool _bUsePrtMetrics, bool _bAddSpacing, @@ -328,22 +331,22 @@ class SvtCompatibilityOptions_Impl : public ConfigItem inline bool IsExpandWordSpace() const { return m_aDefOptions.bExpandWordSpace; } //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: /*-****************************************************************************************************//** @short return list of key names of our configuration management which represent one 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 and support dynamical menu item lists! - @seealso - + @seealso - @param - - @return A list of configuration key names is returned. + @return A list of configuration key names is returned. - @onerror - + @onerror - *//*-*****************************************************************************************************/ Sequence< OUString > impl_GetPropertyNames( Sequence< OUString >& rItems ); @@ -357,30 +360,30 @@ class SvtCompatibilityOptions_Impl : public ConfigItem @param "lSource" , original list @param "lDestination" , destination of operation - @return A list of configuration key names is returned. + @return A list of configuration key names is returned. - @onerror - + @onerror - *//*-*****************************************************************************************************/ void impl_ExpandPropertyNames( const Sequence< OUString >& lSource, Sequence< OUString >& lDestination ); //------------------------------------------------------------------------------------------------------------- - // private member + // private member //------------------------------------------------------------------------------------------------------------- private: - SvtCompatibility m_aOptions; - SvtCompatibilityEntry m_aDefOptions; + SvtCompatibility m_aOptions; + SvtCompatibilityEntry m_aDefOptions; }; //_________________________________________________________________________________________________________________ -// definitions +// definitions //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** SvtCompatibilityOptions_Impl::SvtCompatibilityOptions_Impl() // Init baseclasses first @@ -425,6 +428,12 @@ SvtCompatibilityOptions_Impl::SvtCompatibilityOptions_Impl() if ( !bDefaultFound && aItem.sName.equals( COMPATIBILITY_DEFAULT_NAME ) != sal_False ) { + SvtSysLocale aSysLocale; + com::sun::star::lang::Locale aLocale = aSysLocale.GetLocale(); + if ( aLocale.Language.equalsAscii( "zh" ) || aLocale.Language.equalsAscii( "ja" ) || + aLocale.Language.equalsAscii( "ko" ) ) + aItem.bExpandWordSpace = false; + m_aDefOptions = aItem; bDefaultFound = true; } @@ -432,7 +441,7 @@ SvtCompatibilityOptions_Impl::SvtCompatibilityOptions_Impl() } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** SvtCompatibilityOptions_Impl::~SvtCompatibilityOptions_Impl() { @@ -443,8 +452,34 @@ SvtCompatibilityOptions_Impl::~SvtCompatibilityOptions_Impl() } } +void SvtCompatibilityOptions_Impl::SetDefault( OUString sName, bool bValue ) +{ + if ( COMPATIBILITY_PROPERTYNAME_USEPRTMETRICS.equals( sName ) ) + m_aDefOptions.SetUsePrtMetrics( bValue ); + else if ( COMPATIBILITY_PROPERTYNAME_ADDSPACING.equals( sName ) ) + m_aDefOptions.SetAddSpacing( bValue ); + else if ( COMPATIBILITY_PROPERTYNAME_ADDSPACINGATPAGES.equals( sName ) ) + m_aDefOptions.SetAddSpacingAtPages( bValue ); + else if ( COMPATIBILITY_PROPERTYNAME_USEOURTABSTOPS.equals( sName ) ) + m_aDefOptions.SetUseOurTabStops( bValue ); + else if ( COMPATIBILITY_PROPERTYNAME_NOEXTLEADING.equals( sName ) ) + m_aDefOptions.SetNoExtLeading( bValue ); + else if ( COMPATIBILITY_PROPERTYNAME_USELINESPACING.equals( sName ) ) + m_aDefOptions.SetUseLineSpacing( bValue ); + else if ( COMPATIBILITY_PROPERTYNAME_ADDTABLESPACING.equals( sName ) ) + m_aDefOptions.SetAddTableSpacing( bValue ); + else if ( COMPATIBILITY_PROPERTYNAME_USEOBJECTPOSITIONING.equals( sName ) ) + m_aDefOptions.SetUseObjPos( bValue ); + else if ( COMPATIBILITY_PROPERTYNAME_USEOURTEXTWRAPPING.equals( sName ) ) + m_aDefOptions.SetUseOurTextWrapping( bValue ); + else if ( COMPATIBILITY_PROPERTYNAME_CONSIDERWRAPPINGSTYLE.equals( sName ) ) + m_aDefOptions.SetConsiderWrappingStyle( bValue ); + else if ( COMPATIBILITY_PROPERTYNAME_EXPANDWORDSPACE.equals( sName ) ) + m_aDefOptions.SetExpandWordSpace( bValue ); +} + //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtCompatibilityOptions_Impl::Notify( const Sequence< OUString >& ) { @@ -452,7 +487,7 @@ void SvtCompatibilityOptions_Impl::Notify( const Sequence< OUString >& ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtCompatibilityOptions_Impl::Commit() { @@ -470,29 +505,29 @@ void SvtCompatibilityOptions_Impl::Commit() aItem = m_aOptions[ nItem ]; sNode = SETNODE_ALLFILEFORMATS + PATHDELIMITER + aItem.sName + PATHDELIMITER; - lPropertyValues[ OFFSET_MODULE - 1 ].Name = sNode + PROPERTYNAME_MODULE; - lPropertyValues[ OFFSET_USEPRTMETRICS - 1 ].Name = sNode + PROPERTYNAME_USEPRTMETRICS; - lPropertyValues[ OFFSET_ADDSPACING - 1 ].Name = sNode + PROPERTYNAME_ADDSPACING; - lPropertyValues[ OFFSET_ADDSPACINGATPAGES - 1 ].Name = sNode + PROPERTYNAME_ADDSPACINGATPAGES; - lPropertyValues[ OFFSET_USEOURTABSTOPS - 1 ].Name = sNode + PROPERTYNAME_USEOURTABSTOPS; - lPropertyValues[ OFFSET_NOEXTLEADING - 1 ].Name = sNode + PROPERTYNAME_NOEXTLEADING; - lPropertyValues[ OFFSET_USELINESPACING - 1 ].Name = sNode + PROPERTYNAME_USELINESPACING; - lPropertyValues[ OFFSET_ADDTABLESPACING - 1 ].Name = sNode + PROPERTYNAME_ADDTABLESPACING; - lPropertyValues[ OFFSET_USEOBJPOS - 1 ].Name = sNode + PROPERTYNAME_USEOBJPOS; - lPropertyValues[ OFFSET_USEOURTEXTWRAPPING - 1 ].Name = sNode + PROPERTYNAME_USEOURTEXTWRAP; + lPropertyValues[ OFFSET_MODULE - 1 ].Name = sNode + PROPERTYNAME_MODULE; + lPropertyValues[ OFFSET_USEPRTMETRICS - 1 ].Name = sNode + PROPERTYNAME_USEPRTMETRICS; + lPropertyValues[ OFFSET_ADDSPACING - 1 ].Name = sNode + PROPERTYNAME_ADDSPACING; + lPropertyValues[ OFFSET_ADDSPACINGATPAGES - 1 ].Name = sNode + PROPERTYNAME_ADDSPACINGATPAGES; + lPropertyValues[ OFFSET_USEOURTABSTOPS - 1 ].Name = sNode + PROPERTYNAME_USEOURTABSTOPS; + lPropertyValues[ OFFSET_NOEXTLEADING - 1 ].Name = sNode + PROPERTYNAME_NOEXTLEADING; + lPropertyValues[ OFFSET_USELINESPACING - 1 ].Name = sNode + PROPERTYNAME_USELINESPACING; + lPropertyValues[ OFFSET_ADDTABLESPACING - 1 ].Name = sNode + PROPERTYNAME_ADDTABLESPACING; + lPropertyValues[ OFFSET_USEOBJPOS - 1 ].Name = sNode + PROPERTYNAME_USEOBJPOS; + lPropertyValues[ OFFSET_USEOURTEXTWRAPPING - 1 ].Name = sNode + PROPERTYNAME_USEOURTEXTWRAP; lPropertyValues[ OFFSET_CONSIDERWRAPPINGSTYLE - 1 ].Name = sNode + PROPERTYNAME_CONSIDERWRAPSTYLE; lPropertyValues[ OFFSET_EXPANDWORDSPACE - 1 ].Name = sNode + PROPERTYNAME_EXPANDWORDSPACE; - lPropertyValues[ OFFSET_MODULE - 1 ].Value <<= aItem.sModule; - lPropertyValues[ OFFSET_USEPRTMETRICS - 1 ].Value <<= aItem.bUsePrtMetrics; - lPropertyValues[ OFFSET_ADDSPACING - 1 ].Value <<= aItem.bAddSpacing; - lPropertyValues[ OFFSET_ADDSPACINGATPAGES - 1 ].Value <<= aItem.bAddSpacingAtPages; - lPropertyValues[ OFFSET_USEOURTABSTOPS - 1 ].Value <<= aItem.bUseOurTabStops; - lPropertyValues[ OFFSET_NOEXTLEADING - 1 ].Value <<= aItem.bNoExtLeading; - lPropertyValues[ OFFSET_USELINESPACING - 1 ].Value <<= aItem.bUseLineSpacing; - lPropertyValues[ OFFSET_ADDTABLESPACING - 1 ].Value <<= aItem.bAddTableSpacing; - lPropertyValues[ OFFSET_USEOBJPOS - 1 ].Value <<= aItem.bUseObjPos; - lPropertyValues[ OFFSET_USEOURTEXTWRAPPING - 1 ].Value <<= aItem.bUseOurTextWrapping; + lPropertyValues[ OFFSET_MODULE - 1 ].Value <<= aItem.sModule; + lPropertyValues[ OFFSET_USEPRTMETRICS - 1 ].Value <<= aItem.bUsePrtMetrics; + lPropertyValues[ OFFSET_ADDSPACING - 1 ].Value <<= aItem.bAddSpacing; + lPropertyValues[ OFFSET_ADDSPACINGATPAGES - 1 ].Value <<= aItem.bAddSpacingAtPages; + lPropertyValues[ OFFSET_USEOURTABSTOPS - 1 ].Value <<= aItem.bUseOurTabStops; + lPropertyValues[ OFFSET_NOEXTLEADING - 1 ].Value <<= aItem.bNoExtLeading; + lPropertyValues[ OFFSET_USELINESPACING - 1 ].Value <<= aItem.bUseLineSpacing; + lPropertyValues[ OFFSET_ADDTABLESPACING - 1 ].Value <<= aItem.bAddTableSpacing; + lPropertyValues[ OFFSET_USEOBJPOS - 1 ].Value <<= aItem.bUseObjPos; + lPropertyValues[ OFFSET_USEOURTEXTWRAPPING - 1 ].Value <<= aItem.bUseOurTextWrapping; lPropertyValues[ OFFSET_CONSIDERWRAPPINGSTYLE - 1 ].Value <<= aItem.bConsiderWrappingStyle; lPropertyValues[ OFFSET_EXPANDWORDSPACE - 1 ].Value <<= aItem.bExpandWordSpace; @@ -501,7 +536,7 @@ void SvtCompatibilityOptions_Impl::Commit() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtCompatibilityOptions_Impl::Clear() { @@ -510,7 +545,7 @@ void SvtCompatibilityOptions_Impl::Clear() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** Sequence< Sequence< PropertyValue > > SvtCompatibilityOptions_Impl::GetList() const { @@ -520,10 +555,10 @@ Sequence< Sequence< PropertyValue > > SvtCompatibilityOptions_Impl::GetList() co } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** -void SvtCompatibilityOptions_Impl::AppendItem( const ::rtl::OUString& _sName, +void SvtCompatibilityOptions_Impl::AppendItem( const ::rtl::OUString& _sName, const ::rtl::OUString& _sModule, bool _bUsePrtMetrics, bool _bAddSpacing, @@ -559,7 +594,7 @@ void SvtCompatibilityOptions_Impl::AppendItem( const ::rtl::OUString& _sName, } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** Sequence< OUString > SvtCompatibilityOptions_Impl::impl_GetPropertyNames( Sequence< OUString >& rItems ) { @@ -573,7 +608,7 @@ Sequence< OUString > SvtCompatibilityOptions_Impl::impl_GetPropertyNames( Sequen } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** void SvtCompatibilityOptions_Impl::impl_ExpandPropertyNames( const Sequence< OUString >& lSource, Sequence< OUString >& lDestination ) @@ -629,15 +664,15 @@ void SvtCompatibilityOptions_Impl::impl_ExpandPropertyNames( } //***************************************************************************************************************** -// 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 //***************************************************************************************************************** -SvtCompatibilityOptions_Impl* SvtCompatibilityOptions::m_pDataContainer = NULL; -sal_Int32 SvtCompatibilityOptions::m_nRefCount = 0; +SvtCompatibilityOptions_Impl* SvtCompatibilityOptions::m_pDataContainer = NULL; +sal_Int32 SvtCompatibilityOptions::m_nRefCount = 0; //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** SvtCompatibilityOptions::SvtCompatibilityOptions() { @@ -654,7 +689,7 @@ SvtCompatibilityOptions::SvtCompatibilityOptions() } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** SvtCompatibilityOptions::~SvtCompatibilityOptions() { @@ -672,7 +707,7 @@ SvtCompatibilityOptions::~SvtCompatibilityOptions() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtCompatibilityOptions::Clear() { @@ -680,8 +715,13 @@ void SvtCompatibilityOptions::Clear() m_pDataContainer->Clear(); } +void SvtCompatibilityOptions::SetDefault( ::rtl::OUString sName, bool bValue ) +{ + m_pDataContainer->SetDefault( sName, bValue ); +} + //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtCompatibilityOptions::AppendItem( const ::rtl::OUString& sName, const ::rtl::OUString& sModule, @@ -778,7 +818,7 @@ Sequence< Sequence< PropertyValue > > SvtCompatibilityOptions::GetList() const } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** Mutex& SvtCompatibilityOptions::GetOwnStaticMutex() { diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx index e191f471057a..a3268cffc38f 100644 --- a/unotools/source/config/configitem.cxx +++ b/unotools/source/config/configitem.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 @@ -94,8 +94,8 @@ namespace utl{ > { public: - ConfigItem* pParent; - const Sequence< OUString > aPropertyNames; + ConfigItem* pParent; + const Sequence< OUString > aPropertyNames; ConfigChangeListener_Impl(ConfigItem& rItem, const Sequence< OUString >& rNames); ~ConfigChangeListener_Impl(); @@ -110,12 +110,12 @@ namespace utl{ ---------------------------------------------------------------------------*/ struct ConfigItem_Impl { - utl::ConfigManager* pManager; - sal_Int16 nMode; - sal_Bool bIsModified; + utl::ConfigManager* pManager; + sal_Int16 nMode; + sal_Bool bIsModified; sal_Bool bEnableInternalNotification; - sal_Int16 nInValueChange; + sal_Int16 nInValueChange; ConfigItem_Impl() : pManager(0), nMode(0), @@ -200,7 +200,7 @@ void ConfigChangeListener_Impl::changesOccurred( const ChangesEvent& rEvent ) th { const ElementChange* pElementChanges = rEvent.Changes.getConstArray(); - Sequence<OUString> aChangedNames(rEvent.Changes.getLength()); + Sequence<OUString> aChangedNames(rEvent.Changes.getLength()); OUString* pNames = aChangedNames.getArray(); const OUString* pCheckPropertyNames = aPropertyNames.getConstArray(); @@ -254,7 +254,7 @@ ConfigItem::ConfigItem(const OUString rSubTree, sal_Int16 nSetMode ) : /* -----------------------------17.11.00 13:53-------------------------------- ---------------------------------------------------------------------------*/ -ConfigItem::ConfigItem(utl::ConfigManager& rManager, const rtl::OUString rSubTree) : +ConfigItem::ConfigItem(utl::ConfigManager& rManager, const rtl::OUString rSubTree) : sSubTree(rSubTree), pImpl(new ConfigItem_Impl) { @@ -284,7 +284,7 @@ ConfigItem::~ConfigItem() /* -----------------------------29.08.00 12:52-------------------------------- ---------------------------------------------------------------------------*/ -void ConfigItem::ReleaseConfigMgr() +void ConfigItem::ReleaseConfigMgr() { Reference<XHierarchicalNameAccess> xHierarchyAccess = GetTree(); if(xHierarchyAccess.is()) @@ -340,30 +340,30 @@ sal_Bool lcl_IsLocalProperty(const OUString& rSubTree, const OUString& rProperty /* -----------------------------10.04.01 15:00-------------------------------- ---------------------------------------------------------------------------*/ -void ConfigItem::impl_packLocalizedProperties( const Sequence< OUString >& lInNames , - const Sequence< Any >& lInValues , - Sequence< Any >& lOutValues ) +void ConfigItem::impl_packLocalizedProperties( const Sequence< OUString >& lInNames , + const Sequence< Any >& lInValues , + Sequence< Any >& lOutValues ) { // Safe impossible cases. // This method should be called for special ConfigItem-mode only! OSL_ENSURE( ((pImpl->nMode & CONFIG_MODE_ALL_LOCALES ) == CONFIG_MODE_ALL_LOCALES), "ConfigItem::impl_packLocalizedProperties()\nWrong call of this method detected!\n" ); - sal_Int32 nSourceCounter ; // used to step during input lists - sal_Int32 nSourceSize ; // marks end of loop over input lists - sal_Int32 nDestinationCounter ; // actual position in output lists - sal_Int32 nPropertyCounter ; // counter of inner loop for Sequence< PropertyValue > - sal_Int32 nPropertiesSize ; // marks end of inner loop - Sequence< OUString > lPropertyNames ; // list of all locales for localized entry - Sequence< PropertyValue > lProperties ; // localized values of an configuration entry packed for return - Reference< XInterface > xLocalizedNode ; // if cfg entry is localized ... lInValues contains an XInterface! + sal_Int32 nSourceCounter ; // used to step during input lists + sal_Int32 nSourceSize ; // marks end of loop over input lists + sal_Int32 nDestinationCounter ; // actual position in output lists + sal_Int32 nPropertyCounter ; // counter of inner loop for Sequence< PropertyValue > + sal_Int32 nPropertiesSize ; // marks end of inner loop + Sequence< OUString > lPropertyNames ; // list of all locales for localized entry + Sequence< PropertyValue > lProperties ; // localized values of an configuration entry packed for return + Reference< XInterface > xLocalizedNode ; // if cfg entry is localized ... lInValues contains an XInterface! // Optimise follow algorithm ... A LITTLE BIT :-) // There exist two different possibilities: - // i ) There exist no localized entries ... => size of lOutValues will be the same like lInNames/lInValues! - // ii) There exist some (mostly one or two) localized entries ... => size of lOutValues will be the same like lInNames/lInValues! - // ... Why? If a localized value exist - the any is filled with an XInterface object (is a SetNode-service). - // We read all his child nodes and pack it into Sequence< PropertyValue >. - // The result list we pack into the return any. We never change size of lists! + // i ) There exist no localized entries ... => size of lOutValues will be the same like lInNames/lInValues! + // ii) There exist some (mostly one or two) localized entries ... => size of lOutValues will be the same like lInNames/lInValues! + // ... Why? If a localized value exist - the any is filled with an XInterface object (is a SetNode-service). + // We read all his child nodes and pack it into Sequence< PropertyValue >. + // The result list we pack into the return any. We never change size of lists! nSourceSize = lInNames.getLength(); lOutValues.realloc( nSourceSize ); @@ -383,9 +383,9 @@ void ConfigItem::impl_packLocalizedProperties( const Sequence< OUString >& Reference< XNameContainer > xSetAccess( xLocalizedNode, UNO_QUERY ); if( xSetAccess.is() == sal_True ) { - lPropertyNames = xSetAccess->getElementNames() ; - nPropertiesSize = lPropertyNames.getLength() ; - lProperties.realloc( nPropertiesSize ) ; + lPropertyNames = xSetAccess->getElementNames() ; + nPropertiesSize = lPropertyNames.getLength() ; + lProperties.realloc( nPropertiesSize ) ; for( nPropertyCounter=0; nPropertyCounter<nPropertiesSize; ++nPropertyCounter ) { @@ -394,10 +394,10 @@ void ConfigItem::impl_packLocalizedProperties( const Sequence< OUString >& OUString sPropName = lInNames[nSourceCounter]; OUString sLocaleName = lPropertyNames[nPropertyCounter]; #endif - lProperties[nPropertyCounter].Name = lPropertyNames[nPropertyCounter] ; + lProperties[nPropertyCounter].Name = lPropertyNames[nPropertyCounter] ; OUString sLocaleValue; - xSetAccess->getByName( lPropertyNames[nPropertyCounter] ) >>= sLocaleValue ; - lProperties[nPropertyCounter].Value <<= sLocaleValue; + xSetAccess->getByName( lPropertyNames[nPropertyCounter] ) >>= sLocaleValue ; + lProperties[nPropertyCounter].Value <<= sLocaleValue; } lOutValues[nDestinationCounter] <<= lProperties; @@ -414,35 +414,35 @@ void ConfigItem::impl_packLocalizedProperties( const Sequence< OUString >& /* -----------------------------10.04.01 15:00-------------------------------- ---------------------------------------------------------------------------*/ -void ConfigItem::impl_unpackLocalizedProperties( const Sequence< OUString >& lInNames , - const Sequence< Any >& lInValues , - Sequence< OUString >& lOutNames , - Sequence< Any >& lOutValues ) +void ConfigItem::impl_unpackLocalizedProperties( const Sequence< OUString >& lInNames , + const Sequence< Any >& lInValues , + Sequence< OUString >& lOutNames , + Sequence< Any >& lOutValues ) { // Safe impossible cases. // This method should be called for special ConfigItem-mode only! OSL_ENSURE( ((pImpl->nMode & CONFIG_MODE_ALL_LOCALES ) == CONFIG_MODE_ALL_LOCALES), "ConfigItem::impl_unpackLocalizedProperties()\nWrong call of this method detected!\n" ); - sal_Int32 nSourceCounter ; // used to step during input lists - sal_Int32 nSourceSize ; // marks end of loop over input lists - sal_Int32 nDestinationCounter ; // actual position in output lists - sal_Int32 nPropertyCounter ; // counter of inner loop for Sequence< PropertyValue > - sal_Int32 nPropertiesSize ; // marks end of inner loop - OUString sNodeName ; // base name of node ( e.g. "UIName/" ) ... expand to locale ( e.g. "UIName/de" ) - Sequence< PropertyValue > lProperties ; // localized values of an configuration entry getted from lInValues-Any + sal_Int32 nSourceCounter ; // used to step during input lists + sal_Int32 nSourceSize ; // marks end of loop over input lists + sal_Int32 nDestinationCounter ; // actual position in output lists + sal_Int32 nPropertyCounter ; // counter of inner loop for Sequence< PropertyValue > + sal_Int32 nPropertiesSize ; // marks end of inner loop + OUString sNodeName ; // base name of node ( e.g. "UIName/" ) ... expand to locale ( e.g. "UIName/de" ) + Sequence< PropertyValue > lProperties ; // localized values of an configuration entry getted from lInValues-Any // Optimise follow algorithm ... A LITTLE BIT :-) // There exist two different possibilities: - // i ) There exist no localized entries ... => size of lOutNames/lOutValues will be the same like lInNames/lInValues! - // ii) There exist some (mostly one or two) localized entries ... => size of lOutNames/lOutValues will be some bytes greater then lInNames/lInValues. - // => I think we should make it fast for i). ii) is a special case and mustn't be SOOOO... fast. - // We should reserve same space for output list like input ones first. - // Follow algorithm looks for these borders and change it for ii) only! - // It will be faster then a "realloc()" call in every loop ... + // i ) There exist no localized entries ... => size of lOutNames/lOutValues will be the same like lInNames/lInValues! + // ii) There exist some (mostly one or two) localized entries ... => size of lOutNames/lOutValues will be some bytes greater then lInNames/lInValues. + // => I think we should make it fast for i). ii) is a special case and mustn't be SOOOO... fast. + // We should reserve same space for output list like input ones first. + // Follow algorithm looks for these borders and change it for ii) only! + // It will be faster then a "realloc()" call in every loop ... nSourceSize = lInNames.getLength(); - lOutNames.realloc ( nSourceSize ); - lOutValues.realloc ( nSourceSize ); + lOutNames.realloc ( nSourceSize ); + lOutValues.realloc ( nSourceSize ); // Algorithm: // Copy all names and values from const to return lists. @@ -455,21 +455,21 @@ void ConfigItem::impl_unpackLocalizedProperties( const Sequence< OUString > // If item a special localized one ... split it and insert his parts to output lists ... if( lInValues[nSourceCounter].getValueType() == ::getCppuType( (const Sequence< PropertyValue >*)NULL ) ) { - lInValues[nSourceCounter] >>= lProperties ; - sNodeName = lInNames[nSourceCounter] ; - sNodeName += C2U("/") ; - nPropertiesSize = lProperties.getLength() ; + lInValues[nSourceCounter] >>= lProperties ; + sNodeName = lInNames[nSourceCounter] ; + sNodeName += C2U("/") ; + nPropertiesSize = lProperties.getLength() ; if( (nDestinationCounter+nPropertiesSize) > lOutNames.getLength() ) { - lOutNames.realloc ( nDestinationCounter+nPropertiesSize ); - lOutValues.realloc ( nDestinationCounter+nPropertiesSize ); + lOutNames.realloc ( nDestinationCounter+nPropertiesSize ); + lOutValues.realloc ( nDestinationCounter+nPropertiesSize ); } for( nPropertyCounter=0; nPropertyCounter<nPropertiesSize; ++nPropertyCounter ) { - lOutNames [nDestinationCounter] = sNodeName + lProperties[nPropertyCounter].Name ; - lOutValues[nDestinationCounter] = lProperties[nPropertyCounter].Value ; + lOutNames [nDestinationCounter] = sNodeName + lProperties[nPropertyCounter].Name ; + lOutValues[nDestinationCounter] = lProperties[nPropertyCounter].Value ; ++nDestinationCounter; } } @@ -478,8 +478,8 @@ void ConfigItem::impl_unpackLocalizedProperties( const Sequence< OUString > { if( (nDestinationCounter+1) > lOutNames.getLength() ) { - lOutNames.realloc ( nDestinationCounter+1 ); - lOutValues.realloc ( nDestinationCounter+1 ); + lOutNames.realloc ( nDestinationCounter+1 ); + lOutValues.realloc ( nDestinationCounter+1 ); } lOutNames [nDestinationCounter] = lInNames [nSourceCounter]; @@ -647,11 +647,11 @@ sal_Bool ConfigItem::PutProperties( const Sequence< OUString >& rNames, sal_Bool bRet = xHierarchyAccess.is() && xTopNodeReplace.is(); if(bRet) { - Sequence< OUString > lNames ; - Sequence< Any > lValues ; - const OUString* pNames = NULL ; - const Any* pValues = NULL ; - sal_Int32 nNameCount ; + Sequence< OUString > lNames ; + Sequence< Any > lValues ; + const OUString* pNames = NULL ; + const Any* pValues = NULL ; + sal_Int32 nNameCount ; if(( pImpl->nMode & CONFIG_MODE_ALL_LOCALES ) == CONFIG_MODE_ALL_LOCALES ) { // If ConfigItem works in "ALL_LOCALES"-mode ... we must support a Sequence< PropertyValue > @@ -659,17 +659,17 @@ sal_Bool ConfigItem::PutProperties( const Sequence< OUString >& rNames, // How we can do that? // We must split all PropertyValues to "Sequence< OUString >" AND "Sequence< Any >"! impl_unpackLocalizedProperties( rNames, rValues, lNames, lValues ); - pNames = lNames.getConstArray (); - pValues = lValues.getConstArray (); - nNameCount = lNames.getLength (); + pNames = lNames.getConstArray (); + pValues = lValues.getConstArray (); + nNameCount = lNames.getLength (); } else { // This is the normal mode ... // Use given input lists directly. - pNames = rNames.getConstArray (); - pValues = rValues.getConstArray (); - nNameCount = rNames.getLength (); + pNames = rNames.getConstArray (); + pValues = rValues.getConstArray (); + nNameCount = rNames.getLength (); } for(int i = 0; i < nNameCount; i++) { @@ -1194,7 +1194,7 @@ sal_Bool ConfigItem::ReplaceSetProperties( xCont->insertByName(pSubNodeNames[j], aVal); } } - try { xBatch->commitChanges(); } + try { xBatch->commitChanges(); } CATCH_INFO("Exception from commitChanges(): ") const PropertyValue* pProperties = rValues.getConstArray(); @@ -1356,14 +1356,14 @@ sal_Bool ConfigItem::AddNode(const rtl::OUString& rNode, const rtl::OUString& rN /* -----------------------------12.02.01 11:38-------------------------------- ---------------------------------------------------------------------------*/ -sal_Int16 ConfigItem::GetMode() const +sal_Int16 ConfigItem::GetMode() const { return pImpl->nMode; } /* -----------------------------12.02.01 13:31-------------------------------- ---------------------------------------------------------------------------*/ -void ConfigItem::SetModified() +void ConfigItem::SetModified() { pImpl->bIsModified = sal_True; } diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx index 0df6d49afe59..9f8b9045c3e0 100644 --- a/unotools/source/config/configmgr.cxx +++ b/unotools/source/config/configmgr.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 @@ -90,15 +90,15 @@ namespace //----------------------------------------------------------------------------- struct ConfigItemListEntry_Impl { - ConfigItem* pConfigItem; + ConfigItem* pConfigItem; - ConfigItemListEntry_Impl(ConfigItem* pItem ) : + ConfigItemListEntry_Impl(ConfigItem* pItem ) : pConfigItem(pItem){} }; typedef std::list<ConfigItemListEntry_Impl> ConfigItemList; struct utl::ConfigMgr_Impl { - ConfigItemList aItemList; + ConfigItemList aItemList; }; /* -----------------------------28.08.00 15:35-------------------------------- @@ -352,11 +352,11 @@ void ConfigManager::StoreConfigItems() } } } -ConfigManager* ConfigManager::pConfigManager = 0; +ConfigManager* ConfigManager::pConfigManager = 0; /* -----------------------------07.09.00 11:06-------------------------------- ---------------------------------------------------------------------------*/ -ConfigManager* ConfigManager::GetConfigManager() +ConfigManager* ConfigManager::GetConfigManager() { if(!pConfigManager) { @@ -367,7 +367,7 @@ ConfigManager* ConfigManager::GetConfigManager() /* -----------------------------07.09.00 11:06-------------------------------- ---------------------------------------------------------------------------*/ -void ConfigManager::RemoveConfigManager() +void ConfigManager::RemoveConfigManager() { if(pConfigManager) { @@ -495,7 +495,7 @@ Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp) OUString sPath = C2U(cConfigBaseURL); switch(eProp) { - case LOCALE: sPath += C2U("Setup/L10N"); break; + case LOCALE: sPath += C2U("Setup/L10N"); break; case PRODUCTNAME: case PRODUCTVERSION: @@ -506,7 +506,7 @@ Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp) case OOOVENDOR: case ABOUTBOXPRODUCTVERSION: sPath += C2U("Setup/Product"); break; - case DEFAULTCURRENCY: sPath += C2U("Setup/L10N"); break; + case DEFAULTCURRENCY: sPath += C2U("Setup/L10N"); break; case WRITERCOMPATIBILITYVERSIONOOO11: sPath += C2U("Office.Compatibility/WriterCompatibilityVersion"); break; @@ -533,17 +533,17 @@ Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp) OUString sProperty; switch(eProp) { - case LOCALE: sProperty = C2U("ooLocale"); break; - case PRODUCTNAME: sProperty = C2U("ooName"); break; - case PRODUCTVERSION: sProperty = C2U("ooSetupVersion"); break; - case ABOUTBOXPRODUCTVERSION: sProperty = C2U("ooSetupVersionAboutBox"); break; + case LOCALE: sProperty = C2U("ooLocale"); break; + case PRODUCTNAME: sProperty = C2U("ooName"); break; + case PRODUCTVERSION: sProperty = C2U("ooSetupVersion"); break; + case ABOUTBOXPRODUCTVERSION: sProperty = C2U("ooSetupVersionAboutBox"); break; case OOOVENDOR: sProperty = C2U("ooVendor"); break; - case PRODUCTEXTENSION: sProperty = C2U("ooSetupExtension"); break; + case PRODUCTEXTENSION: sProperty = C2U("ooSetupExtension"); break; case PRODUCTXMLFILEFORMATNAME: sProperty = C2U("ooXMLFileFormatName"); break; case PRODUCTXMLFILEFORMATVERSION: sProperty = C2U("ooXMLFileFormatVersion"); break; case OPENSOURCECONTEXT: sProperty = C2U("ooOpenSourceContext"); break; case DEFAULTCURRENCY: sProperty = C2U("ooSetupCurrency"); break; - case WRITERCOMPATIBILITYVERSIONOOO11: sProperty = C2U("OOo11"); break; + case WRITERCOMPATIBILITYVERSIONOOO11: sProperty = C2U("OOo11"); break; default: break; } @@ -740,7 +740,7 @@ void ConfigManager::PutLocalProperty(const OUString& rProperty, const Any& rValu /* -----------------------------13.12.00 08:47-------------------------------- ---------------------------------------------------------------------------*/ -sal_Bool ConfigManager::IsLocalConfigProvider() +sal_Bool ConfigManager::IsLocalConfigProvider() { return false; } diff --git a/unotools/source/config/confignode.cxx b/unotools/source/config/confignode.cxx index 181c7ca46c8f..9426e4b5b863 100644 --- a/unotools/source/config/confignode.cxx +++ b/unotools/source/config/confignode.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 @@ -280,7 +280,7 @@ namespace utl Reference< XSingleServiceFactory > xChildFactory(m_xContainerAccess, UNO_QUERY); OSL_ENSURE(xChildFactory.is(), "OConfigurationNode::createNode: object is invalid or read-only!"); - if (xChildFactory.is()) // implies m_xContainerAccess.is() + if (xChildFactory.is()) // implies m_xContainerAccess.is() { Reference< XInterface > xNewChild; try @@ -660,6 +660,6 @@ namespace utl } //........................................................................ -} // namespace utl +} // namespace utl //........................................................................ diff --git a/unotools/source/config/configpathes.cxx b/unotools/source/config/configpathes.cxx index dc66854a8d43..538b0a7aead6 100644 --- a/unotools/source/config/configpathes.cxx +++ b/unotools/source/config/configpathes.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 @@ -68,7 +68,7 @@ void lcl_resolveCharEntities(OUString & aLocalString) if (ch) { aResult.append(aLocalString.copy(nStart,nEscapePos-nStart)).append(ch); - + sal_Int32 nEscapeEnd=aLocalString.indexOf(';',nEscapePos); nStart = nEscapeEnd+1; nEscapePos=aLocalString.indexOf('&',nStart); @@ -81,12 +81,12 @@ void lcl_resolveCharEntities(OUString & aLocalString) while ( nEscapePos > 0); aResult.append(aLocalString.copy(nStart)); - + aLocalString = aResult.makeStringAndClear(); } //---------------------------------------------------------------------------- -sal_Bool splitLastFromConfigurationPath(OUString const& _sInPath, +sal_Bool splitLastFromConfigurationPath(OUString const& _sInPath, OUString& _rsOutPath, OUString& _rsLocalName) { @@ -138,8 +138,8 @@ sal_Bool splitLastFromConfigurationPath(OUString const& _sInPath, nPos = _sInPath.lastIndexOf('/',nEnd); nStart = nPos + 1; } - OSL_ASSERT( -1 <= nPos && - nPos < nStart && + OSL_ASSERT( -1 <= nPos && + nPos < nStart && nStart < nEnd && nEnd <= _sInPath.getLength() ); @@ -154,7 +154,7 @@ sal_Bool splitLastFromConfigurationPath(OUString const& _sInPath, } //---------------------------------------------------------------------------- -OUString extractFirstFromConfigurationPath(OUString const& _sInPath) +OUString extractFirstFromConfigurationPath(OUString const& _sInPath, OUString* _sOutPath) { sal_Int32 nSep = _sInPath.indexOf('/'); sal_Int32 nBracket = _sInPath.indexOf('['); @@ -179,8 +179,7 @@ OUString extractFirstFromConfigurationPath(OUString const& _sInPath) nBracket = nEnd; } OSL_ENSURE(nEnd > nStart && _sInPath[nBracket] == ']', "Invalid config path: improper mismatch of quote or bracket"); - OSL_DEBUG_ONLY(nSep = nBracket+1); - OSL_ENSURE(nSep == _sInPath.getLength() || _sInPath[nSep] == '/', "Invalid config path: brackets not followed by slash"); + OSL_ENSURE((nBracket+1 == _sInPath.getLength() && nSep == -1) || (_sInPath[nBracket+1] == '/' && nSep == nBracket+1), "Invalid config path: brackets not followed by slash"); } else // ... but our initial element name is in simple form nStart = 0; @@ -188,6 +187,12 @@ OUString extractFirstFromConfigurationPath(OUString const& _sInPath) OUString sResult = (nEnd >= 0) ? _sInPath.copy(nStart, nEnd-nStart) : _sInPath; lcl_resolveCharEntities(sResult); + + if (_sOutPath != 0) + { + *_sOutPath = (nSep >= 0) ? _sInPath.copy(nSep + 1) : OUString(); + } + return sResult; } @@ -202,7 +207,7 @@ sal_Int32 lcl_findPrefixEnd(OUString const& _sNestedPath, OUString const& _sPref OSL_ENSURE(nPrefixLength == 0 || _sPrefixPath[nPrefixLength-1] != '/', "Cannot handle slash-terminated prefix pathes"); - + sal_Bool bIsPrefix; if (_sNestedPath.getLength() > nPrefixLength) { @@ -218,19 +223,19 @@ sal_Int32 lcl_findPrefixEnd(OUString const& _sNestedPath, OUString const& _sPref { bIsPrefix = false; } - + return bIsPrefix ? nPrefixLength : 0; } //---------------------------------------------------------------------------- -sal_Bool isPrefixOfConfigurationPath(OUString const& _sNestedPath, +sal_Bool isPrefixOfConfigurationPath(OUString const& _sNestedPath, OUString const& _sPrefixPath) { return _sPrefixPath.getLength() == 0 || lcl_findPrefixEnd(_sNestedPath,_sPrefixPath) != 0; } //---------------------------------------------------------------------------- -OUString dropPrefixFromConfigurationPath(OUString const& _sNestedPath, +OUString dropPrefixFromConfigurationPath(OUString const& _sNestedPath, OUString const& _sPrefixPath) { if ( sal_Int32 nPrefixEnd = lcl_findPrefixEnd(_sNestedPath,_sPrefixPath) ) @@ -274,7 +279,7 @@ OUString lcl_wrapName(const OUString& _sContent, const OUString& _sType) case sal_Unicode('\"'): aNormalized.appendAscii( RTL_CONSTASCII_STRINGPARAM(""") ); break; default: aNormalized.append( *pCur ); - } + } } // suffix: closing quote and bracket diff --git a/unotools/source/config/configvaluecontainer.cxx b/unotools/source/config/configvaluecontainer.cxx index 653305f92f74..47ee26d4ae6a 100644 --- a/unotools/source/config/configvaluecontainer.cxx +++ b/unotools/source/config/configvaluecontainer.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,10 +60,10 @@ namespace utl struct NodeValueAccessor { private: - ::rtl::OUString sRelativePath; // the relative path of the node - LocationType eLocationType; // the type of location where the value is stored - void* pLocation; // the pointer to the location - Type aDataType; // the type object pointed to by pLocation + ::rtl::OUString sRelativePath; // the relative path of the node + LocationType eLocationType; // the type of location where the value is stored + void* pLocation; // the pointer to the location + Type aDataType; // the type object pointed to by pLocation public: NodeValueAccessor( const ::rtl::OUString& _rNodePath ); @@ -71,11 +71,11 @@ namespace utl void bind( void* _pLocation, const Type& _rType ); void bind( Any* _pLocation ); - bool isBound( ) const { return ( ltUnbound != eLocationType ) && ( NULL != pLocation ); } - const ::rtl::OUString& getPath( ) const { return sRelativePath; } - LocationType getLocType( ) const { return eLocationType; } - void* getLocation( ) const { return pLocation; } - const Type& getDataType( ) const { return aDataType; } + bool isBound( ) const { return ( ltUnbound != eLocationType ) && ( NULL != pLocation ); } + const ::rtl::OUString& getPath( ) const { return sRelativePath; } + LocationType getLocType( ) const { return eLocationType; } + void* getLocation( ) const { return pLocation; } + const Type& getDataType( ) const { return aDataType; } bool operator == ( const NodeValueAccessor& rhs ) const; bool operator != ( const NodeValueAccessor& rhs ) const { return !operator == ( rhs ); } @@ -96,9 +96,9 @@ namespace utl bool NodeValueAccessor::operator == ( const NodeValueAccessor& rhs ) const { - return ( sRelativePath == rhs.sRelativePath ) - && ( eLocationType == rhs.eLocationType ) - && ( pLocation == rhs.pLocation ); + return ( sRelativePath == rhs.sRelativePath ) + && ( eLocationType == rhs.eLocationType ) + && ( pLocation == rhs.pLocation ); } //--------------------------------------------------------------------- @@ -156,7 +156,7 @@ namespace utl aBuf.append("::utl::lcl_copyData( Accessor, Any ): could not assign the data (node path: "); aBuf.append( rtl::OUStringToOString( _rAccessor.getPath(), RTL_TEXTENCODING_ASCII_US ) ); aBuf.append( " !" ); - DBG_ASSERT( bSuccess, aBuf.getStr() ); + DBG_ASSERT( bSuccess, aBuf.getStr() ); #endif } else { @@ -211,8 +211,8 @@ namespace utl struct SubNodeAccess : public ::std::unary_function< NodeValueAccessor, void > { protected: - const OConfigurationNode& m_rRootNode; - ::osl::Mutex& m_rMutex; + const OConfigurationNode& m_rRootNode; + ::osl::Mutex& m_rMutex; public: SubNodeAccess( const OConfigurationNode& _rRootNode, ::osl::Mutex& _rMutex ) @@ -262,11 +262,11 @@ namespace utl //===================================================================== struct OConfigurationValueContainerImpl { - Reference< XMultiServiceFactory > xORB; // the service factory - ::osl::Mutex& rMutex; // the mutex for accessing the data containers - OConfigurationTreeRoot aConfigRoot; // the configuration node we're accessing + Reference< XMultiServiceFactory > xORB; // the service factory + ::osl::Mutex& rMutex; // the mutex for accessing the data containers + OConfigurationTreeRoot aConfigRoot; // the configuration node we're accessing - NodeValueAccessors aAccessors; // the accessors to the node values + NodeValueAccessors aAccessors; // the accessors to the node values OConfigurationValueContainerImpl( const Reference< XMultiServiceFactory >& _rxORB, ::osl::Mutex& _rMutex ) :xORB( _rxORB ) @@ -351,14 +351,14 @@ namespace utl { // checks .... DBG_ASSERT( _pContainer, "OConfigurationValueContainer::registerExchangeLocation: invalid container location!" ); - DBG_ASSERT( ( TypeClass_CHAR == _rValueType.getTypeClass( ) ) - || ( TypeClass_BOOLEAN == _rValueType.getTypeClass( ) ) - || ( TypeClass_BYTE == _rValueType.getTypeClass( ) ) - || ( TypeClass_SHORT == _rValueType.getTypeClass( ) ) - || ( TypeClass_LONG == _rValueType.getTypeClass( ) ) - || ( TypeClass_DOUBLE == _rValueType.getTypeClass( ) ) - || ( TypeClass_STRING == _rValueType.getTypeClass( ) ) - || ( TypeClass_SEQUENCE == _rValueType.getTypeClass( ) ), + DBG_ASSERT( ( TypeClass_CHAR == _rValueType.getTypeClass( ) ) + || ( TypeClass_BOOLEAN == _rValueType.getTypeClass( ) ) + || ( TypeClass_BYTE == _rValueType.getTypeClass( ) ) + || ( TypeClass_SHORT == _rValueType.getTypeClass( ) ) + || ( TypeClass_LONG == _rValueType.getTypeClass( ) ) + || ( TypeClass_DOUBLE == _rValueType.getTypeClass( ) ) + || ( TypeClass_STRING == _rValueType.getTypeClass( ) ) + || ( TypeClass_SEQUENCE == _rValueType.getTypeClass( ) ), "OConfigurationValueContainer::registerExchangeLocation: invalid type!" ); // build an accessor for this container @@ -451,6 +451,6 @@ namespace utl } //......................................................................... -} // namespace utl +} // namespace utl //......................................................................... diff --git a/unotools/source/config/defaultoptions.cxx b/unotools/source/config/defaultoptions.cxx index 1567bd1b841d..1d6913e1b66d 100644 --- a/unotools/source/config/defaultoptions.cxx +++ b/unotools/source/config/defaultoptions.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 @@ -52,28 +52,28 @@ using namespace com::sun::star::uno; // define ---------------------------------------------------------------- -#define ASCII_STR(s) OUString( RTL_CONSTASCII_USTRINGPARAM(s) ) - -#define DEFAULTPATH__ADDIN 0 -#define DEFAULTPATH__AUTOCORRECT 1 -#define DEFAULTPATH__AUTOTEXT 2 -#define DEFAULTPATH__BACKUP 3 -#define DEFAULTPATH__BASIC 4 -#define DEFAULTPATH__BITMAP 5 -#define DEFAULTPATH__CONFIG 6 -#define DEFAULTPATH__DICTIONARY 7 -#define DEFAULTPATH__FAVORITES 8 -#define DEFAULTPATH__FILTER 9 -#define DEFAULTPATH__GALLERY 10 -#define DEFAULTPATH__GRAPHIC 11 -#define DEFAULTPATH__HELP 12 -#define DEFAULTPATH__LINGUISTIC 13 -#define DEFAULTPATH__MODULE 14 -#define DEFAULTPATH__PALETTE 15 -#define DEFAULTPATH__PLUGIN 16 -#define DEFAULTPATH__TEMP 17 -#define DEFAULTPATH__TEMPLATE 18 -#define DEFAULTPATH__USERCONFIG 19 +#define ASCII_STR(s) OUString( RTL_CONSTASCII_USTRINGPARAM(s) ) + +#define DEFAULTPATH__ADDIN 0 +#define DEFAULTPATH__AUTOCORRECT 1 +#define DEFAULTPATH__AUTOTEXT 2 +#define DEFAULTPATH__BACKUP 3 +#define DEFAULTPATH__BASIC 4 +#define DEFAULTPATH__BITMAP 5 +#define DEFAULTPATH__CONFIG 6 +#define DEFAULTPATH__DICTIONARY 7 +#define DEFAULTPATH__FAVORITES 8 +#define DEFAULTPATH__FILTER 9 +#define DEFAULTPATH__GALLERY 10 +#define DEFAULTPATH__GRAPHIC 11 +#define DEFAULTPATH__HELP 12 +#define DEFAULTPATH__LINGUISTIC 13 +#define DEFAULTPATH__MODULE 14 +#define DEFAULTPATH__PALETTE 15 +#define DEFAULTPATH__PLUGIN 16 +#define DEFAULTPATH__TEMP 17 +#define DEFAULTPATH__TEMPLATE 18 +#define DEFAULTPATH__USERCONFIG 19 #define DEFAULTPATH__WORK 20 #define DEFAULTPATH__USERDICTIONARY 21 @@ -82,47 +82,47 @@ using namespace com::sun::star::uno; class SvtDefaultOptions_Impl : public utl::ConfigItem { public: - String m_aAddinPath; - String m_aAutoCorrectPath; - String m_aAutoTextPath; - String m_aBackupPath; - String m_aBasicPath; - String m_aBitmapPath; - String m_aConfigPath; - String m_aDictionaryPath; - String m_aFavoritesPath; - String m_aFilterPath; - String m_aGalleryPath; - String m_aGraphicPath; - String m_aHelpPath; - String m_aLinguisticPath; - String m_aModulePath; - String m_aPalettePath; - String m_aPluginPath; - String m_aTempPath; - String m_aTemplatePath; - String m_aUserConfigPath; - String m_aWorkPath; + String m_aAddinPath; + String m_aAutoCorrectPath; + String m_aAutoTextPath; + String m_aBackupPath; + String m_aBasicPath; + String m_aBitmapPath; + String m_aConfigPath; + String m_aDictionaryPath; + String m_aFavoritesPath; + String m_aFilterPath; + String m_aGalleryPath; + String m_aGraphicPath; + String m_aHelpPath; + String m_aLinguisticPath; + String m_aModulePath; + String m_aPalettePath; + String m_aPluginPath; + String m_aTempPath; + String m_aTemplatePath; + String m_aUserConfigPath; + String m_aWorkPath; String m_aUserDictionaryPath; SvtDefaultOptions_Impl(); - String GetDefaultPath( USHORT nId ) const; + String GetDefaultPath( USHORT nId ) const; virtual void Commit(); virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames); }; // global ---------------------------------------------------------------- -static SvtDefaultOptions_Impl* pOptions = NULL; -static sal_Int32 nRefCount = 0; +static SvtDefaultOptions_Impl* pOptions = NULL; +static sal_Int32 nRefCount = 0; typedef String SvtDefaultOptions_Impl:: *PathStrPtr; struct PathToDefaultMapping_Impl { - SvtPathOptions::Pathes _ePath; - PathStrPtr _pDefaultPath; + SvtPathOptions::Pathes _ePath; + PathStrPtr _pDefaultPath; }; static PathToDefaultMapping_Impl __READONLY_DATA PathMap_Impl[] = @@ -156,27 +156,27 @@ Sequence< OUString > GetDefaultPropertyNames() { static const char* aPropNames[] = { - "Addin", // PATH_ADDIN - "AutoCorrect", // PATH_AUTOCORRECT - "AutoText", // PATH_AUTOTEXT - "Backup", // PATH_BACKUP - "Basic", // PATH_BASIC - "Bitmap", // PATH_BITMAP - "Config", // PATH_CONFIG - "Dictionary", // PATH_DICTIONARY - "Favorite", // PATH_FAVORITES - "Filter", // PATH_FILTER - "Gallery", // PATH_GALLERY - "Graphic", // PATH_GRAPHIC - "Help", // PATH_HELP - "Linguistic", // PATH_LINGUISTIC - "Module", // PATH_MODULE - "Palette", // PATH_PALETTE - "Plugin", // PATH_PLUGIN - "Temp", // PATH_TEMP - "Template", // PATH_TEMPLATE - "UserConfig", // PATH_USERCONFIG - "Work" // PATH_WORK + "Addin", // PATH_ADDIN + "AutoCorrect", // PATH_AUTOCORRECT + "AutoText", // PATH_AUTOTEXT + "Backup", // PATH_BACKUP + "Basic", // PATH_BASIC + "Bitmap", // PATH_BITMAP + "Config", // PATH_CONFIG + "Dictionary", // PATH_DICTIONARY + "Favorite", // PATH_FAVORITES + "Filter", // PATH_FILTER + "Gallery", // PATH_GALLERY + "Graphic", // PATH_GRAPHIC + "Help", // PATH_HELP + "Linguistic", // PATH_LINGUISTIC + "Module", // PATH_MODULE + "Palette", // PATH_PALETTE + "Plugin", // PATH_PLUGIN + "Temp", // PATH_TEMP + "Template", // PATH_TEMPLATE + "UserConfig", // PATH_USERCONFIG + "Work" // PATH_WORK }; const int nCount = sizeof( aPropNames ) / sizeof( const char* ); @@ -293,27 +293,27 @@ SvtDefaultOptions_Impl::SvtDefaultOptions_Impl() : ConfigItem( ASCII_STR("Office switch ( nProp ) { - case DEFAULTPATH__ADDIN: m_aAddinPath = String( aFullPath ); break; - case DEFAULTPATH__AUTOCORRECT: m_aAutoCorrectPath = String( aFullPath ); break; - case DEFAULTPATH__AUTOTEXT: m_aAutoTextPath = String( aFullPath ); break; - case DEFAULTPATH__BACKUP: m_aBackupPath = String( aFullPath ); break; - case DEFAULTPATH__BASIC: m_aBasicPath = String( aFullPath ); break; - case DEFAULTPATH__BITMAP: m_aBitmapPath = String( aFullPath ); break; - case DEFAULTPATH__CONFIG: m_aConfigPath = String( aFullPath ); break; - case DEFAULTPATH__DICTIONARY: m_aDictionaryPath = String( aFullPath ); break; - case DEFAULTPATH__FAVORITES: m_aFavoritesPath = String( aFullPath ); break; - case DEFAULTPATH__FILTER: m_aFilterPath = String( aFullPath ); break; - case DEFAULTPATH__GALLERY: m_aGalleryPath = String( aFullPath ); break; - case DEFAULTPATH__GRAPHIC: m_aGraphicPath = String( aFullPath ); break; - case DEFAULTPATH__HELP: m_aHelpPath = String( aFullPath ); break; - case DEFAULTPATH__LINGUISTIC: m_aLinguisticPath = String( aFullPath ); break; - case DEFAULTPATH__MODULE: m_aModulePath = String( aFullPath ); break; - case DEFAULTPATH__PALETTE: m_aPalettePath = String( aFullPath ); break; - case DEFAULTPATH__PLUGIN: m_aPluginPath = String( aFullPath ); break; - case DEFAULTPATH__TEMP: m_aTempPath = String( aFullPath ); break; - case DEFAULTPATH__TEMPLATE: m_aTemplatePath = String( aFullPath ); break; - case DEFAULTPATH__USERCONFIG: m_aUserConfigPath = String( aFullPath ); break; - case DEFAULTPATH__WORK: m_aWorkPath = String( aFullPath ); break; + case DEFAULTPATH__ADDIN: m_aAddinPath = String( aFullPath ); break; + case DEFAULTPATH__AUTOCORRECT: m_aAutoCorrectPath = String( aFullPath ); break; + case DEFAULTPATH__AUTOTEXT: m_aAutoTextPath = String( aFullPath ); break; + case DEFAULTPATH__BACKUP: m_aBackupPath = String( aFullPath ); break; + case DEFAULTPATH__BASIC: m_aBasicPath = String( aFullPath ); break; + case DEFAULTPATH__BITMAP: m_aBitmapPath = String( aFullPath ); break; + case DEFAULTPATH__CONFIG: m_aConfigPath = String( aFullPath ); break; + case DEFAULTPATH__DICTIONARY: m_aDictionaryPath = String( aFullPath ); break; + case DEFAULTPATH__FAVORITES: m_aFavoritesPath = String( aFullPath ); break; + case DEFAULTPATH__FILTER: m_aFilterPath = String( aFullPath ); break; + case DEFAULTPATH__GALLERY: m_aGalleryPath = String( aFullPath ); break; + case DEFAULTPATH__GRAPHIC: m_aGraphicPath = String( aFullPath ); break; + case DEFAULTPATH__HELP: m_aHelpPath = String( aFullPath ); break; + case DEFAULTPATH__LINGUISTIC: m_aLinguisticPath = String( aFullPath ); break; + case DEFAULTPATH__MODULE: m_aModulePath = String( aFullPath ); break; + case DEFAULTPATH__PALETTE: m_aPalettePath = String( aFullPath ); break; + case DEFAULTPATH__PLUGIN: m_aPluginPath = String( aFullPath ); break; + case DEFAULTPATH__TEMP: m_aTempPath = String( aFullPath ); break; + case DEFAULTPATH__TEMPLATE: m_aTemplatePath = String( aFullPath ); break; + case DEFAULTPATH__USERCONFIG: m_aUserConfigPath = String( aFullPath ); break; + case DEFAULTPATH__WORK: m_aWorkPath = String( aFullPath ); break; case DEFAULTPATH__USERDICTIONARY: m_aUserDictionaryPath = String( aFullPath );break; default: diff --git a/unotools/source/config/docinfohelper.cxx b/unotools/source/config/docinfohelper.cxx index 677432e1f7d3..f75d0c00909b 100644 --- a/unotools/source/config/docinfohelper.cxx +++ b/unotools/source/config/docinfohelper.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/unotools/source/config/dynamicmenuoptions.cxx b/unotools/source/config/dynamicmenuoptions.cxx index 6ef88002a442..44a4d05d59da 100644 --- a/unotools/source/config/dynamicmenuoptions.cxx +++ b/unotools/source/config/dynamicmenuoptions.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 @@ #endif //_________________________________________________________________________________________________________________ -// includes +// includes //_________________________________________________________________________________________________________________ #include <unotools/dynamicmenuoptions.hxx> @@ -51,18 +51,18 @@ #include <algorithm> //_________________________________________________________________________________________________________________ -// namespaces +// namespaces //_________________________________________________________________________________________________________________ -using namespace ::std ; -using namespace ::utl ; -using namespace ::rtl ; -using namespace ::osl ; -using namespace ::com::sun::star::uno ; -using namespace ::com::sun::star::beans ; +using namespace ::std ; +using namespace ::utl ; +using namespace ::rtl ; +using namespace ::osl ; +using namespace ::com::sun::star::uno ; +using namespace ::com::sun::star::beans ; //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ #define ROOTNODE_MENUS OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Menus/" )) @@ -88,7 +88,7 @@ using namespace ::com::sun::star::beans ; #define PATHPREFIX_USER OUString(RTL_CONSTASCII_USTRINGPARAM("u" )) //_________________________________________________________________________________________________________________ -// private declarations! +// private declarations! //_________________________________________________________________________________________________________________ /*-**************************************************************************************************************** @@ -254,55 +254,55 @@ class SvtDynMenu class SvtDynamicMenuOptions_Impl : public ConfigItem { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: //--------------------------------------------------------------------------------------------------------- - // constructor / destructor + // constructor / destructor //--------------------------------------------------------------------------------------------------------- SvtDynamicMenuOptions_Impl(); ~SvtDynamicMenuOptions_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< 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 //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** @@ -310,12 +310,12 @@ class SvtDynamicMenuOptions_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 - *//*-*****************************************************************************************************/ void Clear ( EDynamicMenuType eMenu ); @@ -327,23 +327,23 @@ class SvtDynamicMenuOptions_Impl : public ConfigItem const OUString& sTargetName ); //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: /*-****************************************************************************************************//** @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 and support dynamical menu item lists! - @seealso - + @seealso - @param "nNewCount" , returns count of menu entries for "new" @param "nWizardCount" , returns count of menu entries for "wizard" - @return A list of configuration key names is returned. + @return A list of configuration key names is returned. - @onerror - + @onerror - *//*-*****************************************************************************************************/ Sequence< OUString > impl_GetPropertyNames( sal_uInt32& nNewCount, sal_uInt32& nWizardCount, sal_uInt32& nHelpBookmarksCount ); @@ -382,9 +382,9 @@ class SvtDynamicMenuOptions_Impl : public ConfigItem @param "lSource" , original list (e.g. [m1-m2-m3-m6-m0] ) @param "lDestination" , destination of operation @param "sSetNode" , name of configuration set to build complete path - @return A list of configuration key names is returned. + @return A list of configuration key names is returned. - @onerror - + @onerror - *//*-*****************************************************************************************************/ void impl_SortAndExpandPropertyNames( const Sequence< OUString >& lSource , @@ -392,7 +392,7 @@ class SvtDynamicMenuOptions_Impl : public ConfigItem const OUString& sSetNode ); //------------------------------------------------------------------------------------------------------------- - // private member + // private member //------------------------------------------------------------------------------------------------------------- private: @@ -403,11 +403,11 @@ class SvtDynamicMenuOptions_Impl : public ConfigItem }; //_________________________________________________________________________________________________________________ -// definitions +// definitions //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** SvtDynamicMenuOptions_Impl::SvtDynamicMenuOptions_Impl() // Init baseclasses first @@ -522,7 +522,7 @@ SvtDynamicMenuOptions_Impl::SvtDynamicMenuOptions_Impl() } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** SvtDynamicMenuOptions_Impl::~SvtDynamicMenuOptions_Impl() { @@ -534,7 +534,7 @@ SvtDynamicMenuOptions_Impl::~SvtDynamicMenuOptions_Impl() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtDynamicMenuOptions_Impl::Notify( const Sequence< OUString >& ) { @@ -542,7 +542,7 @@ void SvtDynamicMenuOptions_Impl::Notify( const Sequence< OUString >& ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtDynamicMenuOptions_Impl::Commit() { @@ -631,7 +631,7 @@ void SvtDynamicMenuOptions_Impl::Commit() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtDynamicMenuOptions_Impl::Clear( EDynamicMenuType eMenu ) { @@ -658,7 +658,7 @@ void SvtDynamicMenuOptions_Impl::Clear( EDynamicMenuType eMenu ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** Sequence< Sequence< PropertyValue > > SvtDynamicMenuOptions_Impl::GetMenu( EDynamicMenuType eMenu ) const { @@ -684,7 +684,7 @@ Sequence< Sequence< PropertyValue > > SvtDynamicMenuOptions_Impl::GetMenu( EDyna } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtDynamicMenuOptions_Impl::AppendItem( EDynamicMenuType eMenu , const OUString& sURL , @@ -717,7 +717,7 @@ void SvtDynamicMenuOptions_Impl::AppendItem( EDynamicMenuType eMen } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** Sequence< OUString > SvtDynamicMenuOptions_Impl::impl_GetPropertyNames( sal_uInt32& nNewCount, sal_uInt32& nWizardCount, sal_uInt32& nHelpBookmarksCount ) { @@ -772,7 +772,7 @@ class SelectByPrefix }; //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** void SvtDynamicMenuOptions_Impl::impl_SortAndExpandPropertyNames( const Sequence< OUString >& lSource , Sequence< OUString >& lDestination , @@ -821,15 +821,15 @@ void SvtDynamicMenuOptions_Impl::impl_SortAndExpandPropertyNames( const Sequence } //***************************************************************************************************************** -// 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 //***************************************************************************************************************** SvtDynamicMenuOptions_Impl* SvtDynamicMenuOptions::m_pDataContainer = NULL ; sal_Int32 SvtDynamicMenuOptions::m_nRefCount = 0 ; //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** SvtDynamicMenuOptions::SvtDynamicMenuOptions() { @@ -846,7 +846,7 @@ SvtDynamicMenuOptions::SvtDynamicMenuOptions() } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** SvtDynamicMenuOptions::~SvtDynamicMenuOptions() { @@ -864,7 +864,7 @@ SvtDynamicMenuOptions::~SvtDynamicMenuOptions() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtDynamicMenuOptions::Clear( EDynamicMenuType eMenu ) { @@ -873,7 +873,7 @@ void SvtDynamicMenuOptions::Clear( EDynamicMenuType eMenu ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** Sequence< Sequence< PropertyValue > > SvtDynamicMenuOptions::GetMenu( EDynamicMenuType eMenu ) const { @@ -882,7 +882,7 @@ Sequence< Sequence< PropertyValue > > SvtDynamicMenuOptions::GetMenu( EDynamicMe } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtDynamicMenuOptions::AppendItem( EDynamicMenuType eMenu , const OUString& sURL , @@ -895,7 +895,7 @@ void SvtDynamicMenuOptions::AppendItem( EDynamicMenuType eMenu } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** Mutex& SvtDynamicMenuOptions::GetOwnStaticMutex() { diff --git a/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx index a07c99b70381..2c35715b375e 100644 --- a/unotools/source/config/eventcfg.cxx +++ b/unotools/source/config/eventcfg.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 @@ -47,11 +47,11 @@ #include <algorithm> -using namespace ::std ; -using namespace ::utl ; -using namespace ::rtl ; -using namespace ::osl ; -using namespace ::com::sun::star::uno ; +using namespace ::std ; +using namespace ::utl ; +using namespace ::rtl ; +using namespace ::osl ; +using namespace ::com::sun::star::uno ; using namespace ::com::sun::star; #define ROOTNODE_EVENTS OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Events/ApplicationEvents" )) @@ -135,7 +135,7 @@ GlobalEventConfig_Impl::GlobalEventConfig_Impl() } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** GlobalEventConfig_Impl::~GlobalEventConfig_Impl() { @@ -155,7 +155,7 @@ GlobalEventConfig_Impl::~GlobalEventConfig_Impl() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void GlobalEventConfig_Impl::Notify( const Sequence< OUString >& ) { @@ -176,7 +176,7 @@ void GlobalEventConfig_Impl::Notify( const Sequence< OUString >& ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void GlobalEventConfig_Impl::Commit() { @@ -220,7 +220,7 @@ void GlobalEventConfig_Impl::EstablishFrameCallback(const ::com::sun::star::uno: } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** void GlobalEventConfig_Impl::initBindingInfo() { diff --git a/unotools/source/config/extendedsecurityoptions.cxx b/unotools/source/config/extendedsecurityoptions.cxx index 716733e2d090..1e29a1339b73 100644 --- a/unotools/source/config/extendedsecurityoptions.cxx +++ b/unotools/source/config/extendedsecurityoptions.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_unotools.hxx" //_________________________________________________________________________________________________________________ -// includes +// includes //_________________________________________________________________________________________________________________ #include <unotools/extendedsecurityoptions.hxx> @@ -50,31 +50,31 @@ #include "itemholder1.hxx" //_________________________________________________________________________________________________________________ -// namespaces +// namespaces //_________________________________________________________________________________________________________________ -using namespace ::utl ; -using namespace ::rtl ; -using namespace ::osl ; -using namespace ::com::sun::star::uno ; +using namespace ::utl ; +using namespace ::rtl ; +using namespace ::osl ; +using namespace ::com::sun::star::uno ; //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ -#define ROOTNODE_SECURITY OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Security")) +#define ROOTNODE_SECURITY OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Security")) -#define SECURE_EXTENSIONS_SET OUString(RTL_CONSTASCII_USTRINGPARAM("SecureExtensions")) -#define EXTENSION_PROPNAME OUString(RTL_CONSTASCII_USTRINGPARAM("/Extension")) +#define SECURE_EXTENSIONS_SET OUString(RTL_CONSTASCII_USTRINGPARAM("SecureExtensions")) +#define EXTENSION_PROPNAME OUString(RTL_CONSTASCII_USTRINGPARAM("/Extension")) -#define PROPERTYNAME_HYPERLINKS_OPEN OUString(RTL_CONSTASCII_USTRINGPARAM("Hyperlinks/Open")) +#define PROPERTYNAME_HYPERLINKS_OPEN OUString(RTL_CONSTASCII_USTRINGPARAM("Hyperlinks/Open")) -#define PROPERTYHANDLE_HYPERLINKS_OPEN 0 +#define PROPERTYHANDLE_HYPERLINKS_OPEN 0 #define PROPERTYCOUNT 1 //_________________________________________________________________________________________________________________ -// private declarations! +// private declarations! //_________________________________________________________________________________________________________________ struct OUStringHashCode @@ -100,134 +100,134 @@ class ExtensionHashMap : public ::std::hash_map< ::rtl::OUString, class SvtExtendedSecurityOptions_Impl : public ConfigItem { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: //--------------------------------------------------------------------------------------------------------- - // constructor / destructor + // constructor / destructor //--------------------------------------------------------------------------------------------------------- SvtExtendedSecurityOptions_Impl(); ~SvtExtendedSecurityOptions_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 "seqPropertyNames" is the list of properties which should be updated. - @return - + @param "seqPropertyNames" is the list of properties which should be updated. + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual void Notify( const Sequence< OUString >& seqPropertyNames ); /*-****************************************************************************************************//** - @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 //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short Access method to check for security problems - @descr Different methods to check for security related problems. + @short Access method to check for security problems + @descr Different methods to check for security related problems. - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ - sal_Bool IsSecureHyperlink( const rtl::OUString& aURL ) const; - Sequence< rtl::OUString > GetSecureExtensionList() const; + sal_Bool IsSecureHyperlink( const rtl::OUString& aURL ) const; + Sequence< rtl::OUString > GetSecureExtensionList() const; - SvtExtendedSecurityOptions::OpenHyperlinkMode GetOpenHyperlinkMode(); - void SetOpenHyperlinkMode( SvtExtendedSecurityOptions::OpenHyperlinkMode aMode ); + SvtExtendedSecurityOptions::OpenHyperlinkMode GetOpenHyperlinkMode(); + void SetOpenHyperlinkMode( SvtExtendedSecurityOptions::OpenHyperlinkMode aMode ); sal_Bool IsOpenHyperlinkModeReadOnly() const; //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: /*-****************************************************************************************************//** - @short return list of key names of ouer configuration management which represent oue module tree - @descr These methods return a static const list of key names. We need it to get needed values from our + @short return list of key names of ouer configuration management which represent oue module tree + @descr These methods return a static const list of key names. We need it to get needed values from our configuration management. - @seealso - + @seealso - - @param - - @return A list of needed configuration keys is returned. + @param - + @return A list of needed configuration keys is returned. - @onerror - + @onerror - *//*-*****************************************************************************************************/ static Sequence< OUString > GetPropertyNames(); /*-****************************************************************************************************//** - @short Fills the hash map with all extensions known to be secure - @descr These methods fills the given hash map object with all extensions known to be secure. + @short Fills the hash map with all extensions known to be secure + @descr These methods fills the given hash map object with all extensions known to be secure. - @seealso - + @seealso - - @param aHashMap + @param aHashMap A hash map to be filled with secure extension strings. - @return - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ void FillExtensionHashMap( ExtensionHashMap& aHashMap ); //------------------------------------------------------------------------------------------------------------- - // private member + // private member //------------------------------------------------------------------------------------------------------------- private: - OUString m_aSecureExtensionsSetName; - OUString m_aExtensionPropName; + OUString m_aSecureExtensionsSetName; + OUString m_aExtensionPropName; - SvtExtendedSecurityOptions::OpenHyperlinkMode m_eOpenHyperlinkMode; + SvtExtendedSecurityOptions::OpenHyperlinkMode m_eOpenHyperlinkMode; sal_Bool m_bROOpenHyperlinkMode; - ExtensionHashMap m_aExtensionHashMap; + ExtensionHashMap m_aExtensionHashMap; }; //_________________________________________________________________________________________________________________ -// definitions +// definitions //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** SvtExtendedSecurityOptions_Impl::SvtExtendedSecurityOptions_Impl() // Init baseclasses first - : ConfigItem ( ROOTNODE_SECURITY ), + : ConfigItem ( ROOTNODE_SECURITY ), m_aSecureExtensionsSetName( SECURE_EXTENSIONS_SET ), m_aExtensionPropName( EXTENSION_PROPNAME ), m_bROOpenHyperlinkMode(sal_False) @@ -236,8 +236,8 @@ SvtExtendedSecurityOptions_Impl::SvtExtendedSecurityOptions_Impl() // Fill the extension hash map with all secure extension strings FillExtensionHashMap( m_aExtensionHashMap ); - Sequence< OUString > seqNames = GetPropertyNames(); - Sequence< Any > seqValues = GetProperties( seqNames ); + Sequence< OUString > seqNames = GetPropertyNames(); + Sequence< Any > seqValues = GetProperties( seqNames ); Sequence< sal_Bool > seqRO = GetReadOnlyStates ( seqNames ); sal_Int32 nPropertyCount = seqValues.getLength(); @@ -272,7 +272,7 @@ SvtExtendedSecurityOptions_Impl::SvtExtendedSecurityOptions_Impl() } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** SvtExtendedSecurityOptions_Impl::~SvtExtendedSecurityOptions_Impl() { @@ -284,7 +284,7 @@ SvtExtendedSecurityOptions_Impl::~SvtExtendedSecurityOptions_Impl() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtExtendedSecurityOptions_Impl::Notify( const Sequence< OUString >& ) { @@ -292,19 +292,19 @@ void SvtExtendedSecurityOptions_Impl::Notify( const Sequence< OUString >& ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtExtendedSecurityOptions_Impl::Commit() { // Get names of supported properties, create a list for values and copy current values to it. - Sequence< OUString > seqNames = GetPropertyNames (); - sal_Int32 nCount = seqNames.getLength(); - Sequence< Any > seqValues ( nCount ); + Sequence< OUString > seqNames = GetPropertyNames (); + sal_Int32 nCount = seqNames.getLength(); + Sequence< Any > seqValues ( nCount ); for( sal_Int32 nProperty=0; nProperty<nCount; ++nProperty ) { switch( nProperty ) { - case PROPERTYHANDLE_HYPERLINKS_OPEN: { + case PROPERTYHANDLE_HYPERLINKS_OPEN: { seqValues[nProperty] <<= (sal_Int32)m_eOpenHyperlinkMode; } break; @@ -316,7 +316,7 @@ void SvtExtendedSecurityOptions_Impl::Commit() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Bool SvtExtendedSecurityOptions_Impl::IsSecureHyperlink( const OUString& aURL ) const { @@ -333,7 +333,7 @@ sal_Bool SvtExtendedSecurityOptions_Impl::IsSecureHyperlink( const OUString& aUR } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** Sequence< OUString > SvtExtendedSecurityOptions_Impl::GetSecureExtensionList() const { @@ -350,7 +350,7 @@ Sequence< OUString > SvtExtendedSecurityOptions_Impl::GetSecureExtensionList() c } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** SvtExtendedSecurityOptions::OpenHyperlinkMode SvtExtendedSecurityOptions_Impl::GetOpenHyperlinkMode() { @@ -365,7 +365,7 @@ sal_Bool SvtExtendedSecurityOptions_Impl::IsOpenHyperlinkModeReadOnly() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtExtendedSecurityOptions_Impl::SetOpenHyperlinkMode( SvtExtendedSecurityOptions::OpenHyperlinkMode eNewMode ) { @@ -374,16 +374,16 @@ void SvtExtendedSecurityOptions_Impl::SetOpenHyperlinkMode( SvtExtendedSecurityO } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** void SvtExtendedSecurityOptions_Impl::FillExtensionHashMap( ExtensionHashMap& aHashMap ) { // Get sequence with secure extensions from configuration - Sequence< OUString > seqNodes = GetNodeNames( m_aSecureExtensionsSetName ); + Sequence< OUString > seqNodes = GetNodeNames( m_aSecureExtensionsSetName ); - OUString aValue; - Sequence< Any > aValues; - Sequence< OUString > aPropSeq( 1 ); + OUString aValue; + Sequence< Any > aValues; + Sequence< OUString > aPropSeq( 1 ); for ( int i = 0; i < seqNodes.getLength(); i++ ) { // Create access name for property @@ -409,7 +409,7 @@ void SvtExtendedSecurityOptions_Impl::FillExtensionHashMap( ExtensionHashMap& aH } //***************************************************************************************************************** -// private method (currently not used) +// private method (currently not used) //***************************************************************************************************************** Sequence< OUString > SvtExtendedSecurityOptions_Impl::GetPropertyNames() { @@ -425,15 +425,15 @@ Sequence< OUString > SvtExtendedSecurityOptions_Impl::GetPropertyNames() } //***************************************************************************************************************** -// 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 //***************************************************************************************************************** -SvtExtendedSecurityOptions_Impl* SvtExtendedSecurityOptions::m_pDataContainer = NULL ; -sal_Int32 SvtExtendedSecurityOptions::m_nRefCount = 0 ; +SvtExtendedSecurityOptions_Impl* SvtExtendedSecurityOptions::m_pDataContainer = NULL ; +sal_Int32 SvtExtendedSecurityOptions::m_nRefCount = 0 ; //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** SvtExtendedSecurityOptions::SvtExtendedSecurityOptions() { @@ -452,7 +452,7 @@ SvtExtendedSecurityOptions::SvtExtendedSecurityOptions() } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** SvtExtendedSecurityOptions::~SvtExtendedSecurityOptions() { @@ -470,7 +470,7 @@ SvtExtendedSecurityOptions::~SvtExtendedSecurityOptions() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Bool SvtExtendedSecurityOptions::IsSecureHyperlink( const rtl::OUString& aURL ) const { @@ -479,7 +479,7 @@ sal_Bool SvtExtendedSecurityOptions::IsSecureHyperlink( const rtl::OUString& aUR } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** Sequence< rtl::OUString > SvtExtendedSecurityOptions::GetSecureExtensionList() const { @@ -488,7 +488,7 @@ Sequence< rtl::OUString > SvtExtendedSecurityOptions::GetSecureExtensionList() c } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** SvtExtendedSecurityOptions::OpenHyperlinkMode SvtExtendedSecurityOptions::GetOpenHyperlinkMode() { @@ -504,7 +504,7 @@ sal_Bool SvtExtendedSecurityOptions::IsOpenHyperlinkModeReadOnly() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtExtendedSecurityOptions::SetOpenHyperlinkMode( SvtExtendedSecurityOptions::OpenHyperlinkMode eMode ) { @@ -513,7 +513,7 @@ void SvtExtendedSecurityOptions::SetOpenHyperlinkMode( SvtExtendedSecurityOption } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** Mutex& SvtExtendedSecurityOptions::GetInitMutex() { diff --git a/unotools/source/config/fltrcfg.cxx b/unotools/source/config/fltrcfg.cxx index 94f7ff07d7d7..35f13c0aba59 100644 --- a/unotools/source/config/fltrcfg.cxx +++ b/unotools/source/config/fltrcfg.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,25 +42,25 @@ using namespace com::sun::star::uno; #define C2U(cChar) OUString::createFromAscii(cChar) // ----------------------------------------------------------------------- -#define FILTERCFG_WORD_CODE 0x0001 -#define FILTERCFG_WORD_STORAGE 0x0002 -#define FILTERCFG_EXCEL_CODE 0x0004 -#define FILTERCFG_EXCEL_STORAGE 0x0008 -#define FILTERCFG_PPOINT_CODE 0x0010 -#define FILTERCFG_PPOINT_STORAGE 0x0020 -#define FILTERCFG_MATH_LOAD 0x0100 -#define FILTERCFG_MATH_SAVE 0x0200 -#define FILTERCFG_WRITER_LOAD 0x0400 -#define FILTERCFG_WRITER_SAVE 0x0800 -#define FILTERCFG_CALC_LOAD 0x1000 -#define FILTERCFG_CALC_SAVE 0x2000 -#define FILTERCFG_IMPRESS_LOAD 0x4000 -#define FILTERCFG_IMPRESS_SAVE 0x8000 -#define FILTERCFG_EXCEL_EXECTBL 0x10000 +#define FILTERCFG_WORD_CODE 0x0001 +#define FILTERCFG_WORD_STORAGE 0x0002 +#define FILTERCFG_EXCEL_CODE 0x0004 +#define FILTERCFG_EXCEL_STORAGE 0x0008 +#define FILTERCFG_PPOINT_CODE 0x0010 +#define FILTERCFG_PPOINT_STORAGE 0x0020 +#define FILTERCFG_MATH_LOAD 0x0100 +#define FILTERCFG_MATH_SAVE 0x0200 +#define FILTERCFG_WRITER_LOAD 0x0400 +#define FILTERCFG_WRITER_SAVE 0x0800 +#define FILTERCFG_CALC_LOAD 0x1000 +#define FILTERCFG_CALC_SAVE 0x2000 +#define FILTERCFG_IMPRESS_LOAD 0x4000 +#define FILTERCFG_IMPRESS_SAVE 0x8000 +#define FILTERCFG_EXCEL_EXECTBL 0x10000 #define FILTERCFG_ENABLE_PPT_PREVIEW 0x20000 #define FILTERCFG_ENABLE_EXCEL_PREVIEW 0x40000 #define FILTERCFG_ENABLE_WORD_PREVIEW 0x80000 -#define FILTERCFG_USE_ENHANCED_FIELDS 0x100000 +#define FILTERCFG_USE_ENHANCED_FIELDS 0x100000 static SvtFilterOptions* pOptions=0; @@ -69,27 +69,27 @@ static SvtFilterOptions* pOptions=0; ---------------------------------------------------------------------------*/ class SvtAppFilterOptions_Impl : public utl::ConfigItem { - sal_Bool bLoadVBA; - sal_Bool bSaveVBA; + sal_Bool bLoadVBA; + sal_Bool bSaveVBA; public: SvtAppFilterOptions_Impl(const OUString& rRoot) : utl::ConfigItem(rRoot), bLoadVBA(sal_False), - bSaveVBA(sal_False) {} + bSaveVBA(sal_False) {} ~SvtAppFilterOptions_Impl(); - virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames); - void Load(); + virtual void Commit(); + virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames); + void Load(); - sal_Bool IsLoad() const {return bLoadVBA;} - void SetLoad(sal_Bool bSet) + sal_Bool IsLoad() const {return bLoadVBA;} + void SetLoad(sal_Bool bSet) { if(bSet != bLoadVBA) SetModified(); bLoadVBA = bSet; } - sal_Bool IsSave() const {return bSaveVBA;} - void SetSave(sal_Bool bSet) + sal_Bool IsSave() const {return bSaveVBA;} + void SetSave(sal_Bool bSet) { if(bSet != bSaveVBA) SetModified(); @@ -108,7 +108,7 @@ SvtAppFilterOptions_Impl::~SvtAppFilterOptions_Impl() /* -----------------------------22.01.01 10:38-------------------------------- ---------------------------------------------------------------------------*/ -void SvtAppFilterOptions_Impl::Commit() +void SvtAppFilterOptions_Impl::Commit() { Sequence<OUString> aNames(2); OUString* pNames = aNames.getArray(); @@ -133,7 +133,7 @@ void SvtAppFilterOptions_Impl::Notify( const Sequence< rtl::OUString >& ) /* -----------------------------22.01.01 10:38-------------------------------- ---------------------------------------------------------------------------*/ -void SvtAppFilterOptions_Impl::Load() +void SvtAppFilterOptions_Impl::Load() { Sequence<OUString> aNames(2); OUString* pNames = aNames.getArray(); @@ -152,17 +152,17 @@ void SvtAppFilterOptions_Impl::Load() // ----------------------------------------------------------------------- class SvtCalcFilterOptions_Impl : public SvtAppFilterOptions_Impl { - sal_Bool bLoadExecutable; + sal_Bool bLoadExecutable; public: SvtCalcFilterOptions_Impl(const OUString& rRoot) : SvtAppFilterOptions_Impl(rRoot), bLoadExecutable(sal_False) {} - virtual void Commit(); - void Load(); + virtual void Commit(); + void Load(); - sal_Bool IsLoadExecutable() const {return bLoadExecutable;} - void SetLoadExecutable(sal_Bool bSet) + sal_Bool IsLoadExecutable() const {return bLoadExecutable;} + void SetLoadExecutable(sal_Bool bSet) { if(bSet != bLoadExecutable) SetModified(); @@ -244,13 +244,13 @@ void SvtFilterOptions_Impl::SetFlag( ULONG nFlag, BOOL bSet ) { switch(nFlag) { - case FILTERCFG_WORD_CODE: aWriterCfg.SetLoad(bSet);break; - case FILTERCFG_WORD_STORAGE: aWriterCfg.SetSave(bSet);break; - case FILTERCFG_EXCEL_CODE: aCalcCfg.SetLoad(bSet);break; - case FILTERCFG_EXCEL_STORAGE: aCalcCfg.SetSave(bSet);break; - case FILTERCFG_EXCEL_EXECTBL: aCalcCfg.SetLoadExecutable(bSet);break; - case FILTERCFG_PPOINT_CODE: aImpressCfg.SetLoad(bSet);break; - case FILTERCFG_PPOINT_STORAGE: aImpressCfg.SetSave(bSet);break; + case FILTERCFG_WORD_CODE: aWriterCfg.SetLoad(bSet);break; + case FILTERCFG_WORD_STORAGE: aWriterCfg.SetSave(bSet);break; + case FILTERCFG_EXCEL_CODE: aCalcCfg.SetLoad(bSet);break; + case FILTERCFG_EXCEL_STORAGE: aCalcCfg.SetSave(bSet);break; + case FILTERCFG_EXCEL_EXECTBL: aCalcCfg.SetLoadExecutable(bSet);break; + case FILTERCFG_PPOINT_CODE: aImpressCfg.SetLoad(bSet);break; + case FILTERCFG_PPOINT_STORAGE: aImpressCfg.SetSave(bSet);break; default: if( bSet ) nFlags |= nFlag; @@ -266,13 +266,13 @@ BOOL SvtFilterOptions_Impl::IsFlag( ULONG nFlag ) const BOOL bRet; switch(nFlag) { - case FILTERCFG_WORD_CODE : bRet = aWriterCfg.IsLoad();break; - case FILTERCFG_WORD_STORAGE : bRet = aWriterCfg.IsSave();break; - case FILTERCFG_EXCEL_CODE : bRet = aCalcCfg.IsLoad();break; + case FILTERCFG_WORD_CODE : bRet = aWriterCfg.IsLoad();break; + case FILTERCFG_WORD_STORAGE : bRet = aWriterCfg.IsSave();break; + case FILTERCFG_EXCEL_CODE : bRet = aCalcCfg.IsLoad();break; case FILTERCFG_EXCEL_STORAGE : bRet = aCalcCfg.IsSave();break; - case FILTERCFG_EXCEL_EXECTBL : bRet = aCalcCfg.IsLoadExecutable();break; - case FILTERCFG_PPOINT_CODE : bRet = aImpressCfg.IsLoad();break; - case FILTERCFG_PPOINT_STORAGE : bRet = aImpressCfg.IsSave();break; + case FILTERCFG_EXCEL_EXECTBL : bRet = aCalcCfg.IsLoadExecutable();break; + case FILTERCFG_PPOINT_CODE : bRet = aImpressCfg.IsLoad();break; + case FILTERCFG_PPOINT_STORAGE : bRet = aImpressCfg.IsSave();break; default: bRet = 0 != (nFlags & nFlag ); } @@ -306,17 +306,17 @@ const Sequence<OUString>& SvtFilterOptions::GetPropertyNames() aNames.realloc(nCount); static const char* aPropNames[] = { - "Import/MathTypeToMath", // 0 - "Import/WinWordToWriter", // 1 - "Import/PowerPointToImpress", // 2 - "Import/ExcelToCalc", // 3 + "Import/MathTypeToMath", // 0 + "Import/WinWordToWriter", // 1 + "Import/PowerPointToImpress", // 2 + "Import/ExcelToCalc", // 3 "Export/MathToMathType", // 4 "Export/WriterToWinWord", // 5 "Export/ImpressToPowerPoint", // 6 - "Export/CalcToExcel", // 7 - "Export/EnablePowerPointPreview", // 8 - "Export/EnableExcelPreview", // 9 - "Export/EnableWordPreview", // 10 + "Export/CalcToExcel", // 7 + "Export/EnablePowerPointPreview", // 8 + "Export/EnableExcelPreview", // 9 + "Export/EnableWordPreview", // 10 "Import/ImportWWFieldsAsEnhancedFields" // 11 }; OUString* pNames = aNames.getArray(); @@ -530,8 +530,7 @@ void SvtFilterOptions::SetWriter2WinWord( BOOL bFlag ) BOOL SvtFilterOptions::IsUseEnhancedFields() const { - return false; // disable for now; -// return pImp->IsFlag( FILTERCFG_USE_ENHANCED_FIELDS ); + return pImp->IsFlag( FILTERCFG_USE_ENHANCED_FIELDS ); } void SvtFilterOptions::SetUseEnhancedFields( BOOL bFlag ) diff --git a/unotools/source/config/fontcfg.cxx b/unotools/source/config/fontcfg.cxx index e8ae78d0aed2..6713679f4600 100644 --- a/unotools/source/config/fontcfg.cxx +++ b/unotools/source/config/fontcfg.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 @@ -232,7 +232,7 @@ OUString DefaultFontConfiguration::tryLocale( const Locale& rLocale, const OUStr } } } - + return aRet; } @@ -242,7 +242,7 @@ OUString DefaultFontConfiguration::getDefaultFont( const Locale& rLocale, int nT aLocale.Language = rLocale.Language.toAsciiLowerCase(); aLocale.Country = rLocale.Country.toAsciiUpperCase(); aLocale.Variant = rLocale.Variant.toAsciiUpperCase(); - + OUString aType = OUString::createFromAscii( getKeyType( nType ) ); OUString aRet = tryLocale( aLocale, aType ); if( ! aRet.getLength() && aLocale.Variant.getLength() ) @@ -569,7 +569,7 @@ struct ImplFontAttrWeightSearchData static ImplFontAttrWeightSearchData const aImplWeightAttrSearchList[] = { // the attribute names are ordered by "first match wins" -// e.g. "semilight" should wins over "semi" +// e.g. "semilight" should wins over "semi" { "extrablack", WEIGHT_BLACK }, { "ultrablack", WEIGHT_BLACK }, { "ultrabold", WEIGHT_ULTRABOLD }, @@ -1085,7 +1085,7 @@ unsigned long FontSubstConfiguration::getSubstType( const com::sun::star::uno::R catch( WrappedTargetException ) { } - + return type; } @@ -1117,7 +1117,7 @@ void FontSubstConfiguration::readLocaleSubst( const com::sun::star::lang::Locale const OUString* pFontNames = aFonts.getConstArray(); // improve performance, heap fragmentation it->second.aSubstAttributes.reserve( nFonts ); - + // strings for subst retrieval, construct only once OUString aSubstFontsStr ( RTL_CONSTASCII_USTRINGPARAM( "SubstFonts" ) ); OUString aSubstFontsMSStr ( RTL_CONSTASCII_USTRINGPARAM( "SubstFontsMS" ) ); @@ -1159,7 +1159,7 @@ void FontSubstConfiguration::readLocaleSubst( const com::sun::star::lang::Locale aAttr.Weight = getSubstWeight( xFont, aSubstWeightStr ); aAttr.Width = getSubstWidth( xFont, aSubstWidthStr ); aAttr.Type = getSubstType( xFont, aSubstTypeStr ); - + // finally insert this entry it->second.aSubstAttributes.push_back( aAttr ); } diff --git a/unotools/source/config/fontoptions.cxx b/unotools/source/config/fontoptions.cxx index 5853dd36af98..151c57a6eaf7 100644 --- a/unotools/source/config/fontoptions.cxx +++ b/unotools/source/config/fontoptions.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 @@ #endif //_________________________________________________________________________________________________________________ -// includes +// includes //_________________________________________________________________________________________________________________ #include <unotools/fontoptions.hxx> @@ -45,160 +45,160 @@ #include "itemholder1.hxx" //_________________________________________________________________________________________________________________ -// namespaces +// namespaces //_________________________________________________________________________________________________________________ -using namespace ::utl ; -using namespace ::rtl ; -using namespace ::osl ; -using namespace ::com::sun::star::uno ; +using namespace ::utl ; +using namespace ::rtl ; +using namespace ::osl ; +using namespace ::com::sun::star::uno ; //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ -#define ROOTNODE_FONT OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Font" )) +#define ROOTNODE_FONT OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Font" )) -#define PROPERTYNAME_REPLACEMENTTABLE OUString(RTL_CONSTASCII_USTRINGPARAM("Substitution/Replacement" )) -#define PROPERTYNAME_FONTHISTORY OUString(RTL_CONSTASCII_USTRINGPARAM("View/History" )) -#define PROPERTYNAME_FONTWYSIWYG OUString(RTL_CONSTASCII_USTRINGPARAM("View/ShowFontBoxWYSIWYG" )) +#define PROPERTYNAME_REPLACEMENTTABLE OUString(RTL_CONSTASCII_USTRINGPARAM("Substitution/Replacement" )) +#define PROPERTYNAME_FONTHISTORY OUString(RTL_CONSTASCII_USTRINGPARAM("View/History" )) +#define PROPERTYNAME_FONTWYSIWYG OUString(RTL_CONSTASCII_USTRINGPARAM("View/ShowFontBoxWYSIWYG" )) -#define PROPERTYHANDLE_REPLACEMENTTABLE 0 -#define PROPERTYHANDLE_FONTHISTORY 1 -#define PROPERTYHANDLE_FONTWYSIWYG 2 +#define PROPERTYHANDLE_REPLACEMENTTABLE 0 +#define PROPERTYHANDLE_FONTHISTORY 1 +#define PROPERTYHANDLE_FONTWYSIWYG 2 -#define PROPERTYCOUNT 3 +#define PROPERTYCOUNT 3 //_________________________________________________________________________________________________________________ -// private declarations! +// private declarations! //_________________________________________________________________________________________________________________ class SvtFontOptions_Impl : public ConfigItem { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: //--------------------------------------------------------------------------------------------------------- - // constructor / destructor + // constructor / destructor //--------------------------------------------------------------------------------------------------------- SvtFontOptions_Impl(); ~SvtFontOptions_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 "seqPropertyNames" is the list of properties which should be updated. - @return - + @param "seqPropertyNames" is the list of properties which should be updated. + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual void Notify( const Sequence< OUString >& seqPropertyNames ); /*-****************************************************************************************************//** - @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 //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short access method to get internal values - @descr These method give us a chance to regulate acces to ouer internal values. + @short access method to get internal values + @descr These method give us a chance to regulate acces to ouer internal values. It's not used in the moment - but it's possible for the feature! - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ - sal_Bool IsReplacementTableEnabled ( ) const ; - void EnableReplacementTable ( sal_Bool bState ) ; + sal_Bool IsReplacementTableEnabled ( ) const ; + void EnableReplacementTable ( sal_Bool bState ) ; - sal_Bool IsFontHistoryEnabled ( ) const ; - void EnableFontHistory ( sal_Bool bState ) ; + sal_Bool IsFontHistoryEnabled ( ) const ; + void EnableFontHistory ( sal_Bool bState ) ; - sal_Bool IsFontWYSIWYGEnabled ( ) const ; - void EnableFontWYSIWYG ( sal_Bool bState ) ; + sal_Bool IsFontWYSIWYGEnabled ( ) const ; + void EnableFontWYSIWYG ( sal_Bool bState ) ; //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: /*-****************************************************************************************************//** - @short return list of key names of ouer configuration management which represent oue module tree - @descr These methods return a static const list of key names. We need it to get needed values from our + @short return list of key names of ouer configuration management which represent oue module tree + @descr These methods return a static const list of key names. We need it to get needed values from our configuration management. - @seealso - + @seealso - - @param - - @return A list of needed configuration keys is returned. + @param - + @return A list of needed configuration keys is returned. - @onerror - + @onerror - *//*-*****************************************************************************************************/ static Sequence< OUString > impl_GetPropertyNames(); //------------------------------------------------------------------------------------------------------------- - // private member + // private member //------------------------------------------------------------------------------------------------------------- private: - sal_Bool m_bReplacementTable ; - sal_Bool m_bFontHistory ; - sal_Bool m_bFontWYSIWYG ; + sal_Bool m_bReplacementTable ; + sal_Bool m_bFontHistory ; + sal_Bool m_bFontWYSIWYG ; }; //_________________________________________________________________________________________________________________ -// definitions +// definitions //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** SvtFontOptions_Impl::SvtFontOptions_Impl() // Init baseclasses first - : ConfigItem ( ROOTNODE_FONT ) + : ConfigItem ( ROOTNODE_FONT ) // Init member then. - , m_bReplacementTable ( sal_False ) - , m_bFontHistory ( sal_False ) - , m_bFontWYSIWYG ( sal_False ) + , m_bReplacementTable ( sal_False ) + , m_bFontHistory ( sal_False ) + , m_bFontWYSIWYG ( sal_False ) { // Use our static list of configuration keys to get his values. - Sequence< OUString > seqNames = impl_GetPropertyNames ( ); - Sequence< Any > seqValues = GetProperties ( seqNames ); + Sequence< OUString > seqNames = impl_GetPropertyNames ( ); + Sequence< Any > seqValues = GetProperties ( seqNames ); // Safe impossible cases. // We need values from ALL configuration keys. @@ -214,17 +214,17 @@ SvtFontOptions_Impl::SvtFontOptions_Impl() DBG_ASSERT( !(seqValues[nProperty].hasValue()==sal_False), "SvtFontOptions_Impl::SvtFontOptions_Impl()\nInvalid property value detected!\n" ); switch( nProperty ) { - case PROPERTYHANDLE_REPLACEMENTTABLE : { + case PROPERTYHANDLE_REPLACEMENTTABLE : { DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtFontOptions_Impl::SvtFontOptions_Impl()\nWho has changed the value type of \"Office.Common\\Font\\Substitution\\Replacement\"?" ); seqValues[nProperty] >>= m_bReplacementTable; } break; - case PROPERTYHANDLE_FONTHISTORY : { + case PROPERTYHANDLE_FONTHISTORY : { DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtFontOptions_Impl::SvtFontOptions_Impl()\nWho has changed the value type of \"Office.Common\\Font\\View\\History\"?" ); seqValues[nProperty] >>= m_bFontHistory; } break; - case PROPERTYHANDLE_FONTWYSIWYG : { + case PROPERTYHANDLE_FONTWYSIWYG : { DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtFontOptions_Impl::SvtFontOptions_Impl()\nWho has changed the value type of \"Office.Common\\Font\\View\\ShowFontBoxWYSIWYG\"?" ); seqValues[nProperty] >>= m_bFontWYSIWYG; } @@ -238,7 +238,7 @@ SvtFontOptions_Impl::SvtFontOptions_Impl() } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** SvtFontOptions_Impl::~SvtFontOptions_Impl() { @@ -250,7 +250,7 @@ SvtFontOptions_Impl::~SvtFontOptions_Impl() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtFontOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames ) { @@ -287,27 +287,27 @@ void SvtFontOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtFontOptions_Impl::Commit() { // Get names of supported properties, create a list for values and copy current values to it. - Sequence< OUString > seqNames = impl_GetPropertyNames(); - sal_Int32 nCount = seqNames.getLength(); - Sequence< Any > seqValues ( nCount ); + Sequence< OUString > seqNames = impl_GetPropertyNames(); + sal_Int32 nCount = seqNames.getLength(); + Sequence< Any > seqValues ( nCount ); for( sal_Int32 nProperty=0; nProperty<nCount; ++nProperty ) { switch( nProperty ) { - case PROPERTYHANDLE_REPLACEMENTTABLE : { + case PROPERTYHANDLE_REPLACEMENTTABLE : { seqValues[nProperty] <<= m_bReplacementTable; } break; - case PROPERTYHANDLE_FONTHISTORY : { + case PROPERTYHANDLE_FONTHISTORY : { seqValues[nProperty] <<= m_bFontHistory; } break; - case PROPERTYHANDLE_FONTWYSIWYG : { + case PROPERTYHANDLE_FONTWYSIWYG : { seqValues[nProperty] <<= m_bFontWYSIWYG; } break; @@ -318,7 +318,7 @@ void SvtFontOptions_Impl::Commit() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Bool SvtFontOptions_Impl::IsReplacementTableEnabled() const { @@ -326,7 +326,7 @@ sal_Bool SvtFontOptions_Impl::IsReplacementTableEnabled() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtFontOptions_Impl::EnableReplacementTable( sal_Bool bState ) { @@ -335,7 +335,7 @@ void SvtFontOptions_Impl::EnableReplacementTable( sal_Bool bState ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Bool SvtFontOptions_Impl::IsFontHistoryEnabled() const { @@ -343,7 +343,7 @@ sal_Bool SvtFontOptions_Impl::IsFontHistoryEnabled() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtFontOptions_Impl::EnableFontHistory( sal_Bool bState ) { @@ -352,7 +352,7 @@ void SvtFontOptions_Impl::EnableFontHistory( sal_Bool bState ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Bool SvtFontOptions_Impl::IsFontWYSIWYGEnabled() const { @@ -360,7 +360,7 @@ sal_Bool SvtFontOptions_Impl::IsFontWYSIWYGEnabled() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtFontOptions_Impl::EnableFontWYSIWYG( sal_Bool bState ) { @@ -369,16 +369,16 @@ void SvtFontOptions_Impl::EnableFontWYSIWYG( sal_Bool bState ) } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** Sequence< OUString > SvtFontOptions_Impl::impl_GetPropertyNames() { // Build static list of configuration key names. static const OUString pProperties[] = { - PROPERTYNAME_REPLACEMENTTABLE , - PROPERTYNAME_FONTHISTORY , - PROPERTYNAME_FONTWYSIWYG , + PROPERTYNAME_REPLACEMENTTABLE , + PROPERTYNAME_FONTHISTORY , + PROPERTYNAME_FONTWYSIWYG , }; // Initialize return sequence with these list ... static const Sequence< OUString > seqPropertyNames( pProperties, PROPERTYCOUNT ); @@ -387,15 +387,15 @@ Sequence< OUString > SvtFontOptions_Impl::impl_GetPropertyNames() } //***************************************************************************************************************** -// 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 //***************************************************************************************************************** -SvtFontOptions_Impl* SvtFontOptions::m_pDataContainer = NULL ; -sal_Int32 SvtFontOptions::m_nRefCount = 0 ; +SvtFontOptions_Impl* SvtFontOptions::m_pDataContainer = NULL ; +sal_Int32 SvtFontOptions::m_nRefCount = 0 ; //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** SvtFontOptions::SvtFontOptions() { @@ -414,7 +414,7 @@ SvtFontOptions::SvtFontOptions() } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** SvtFontOptions::~SvtFontOptions() { @@ -432,7 +432,7 @@ SvtFontOptions::~SvtFontOptions() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Bool SvtFontOptions::IsReplacementTableEnabled() const { @@ -441,7 +441,7 @@ sal_Bool SvtFontOptions::IsReplacementTableEnabled() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtFontOptions::EnableReplacementTable( sal_Bool bState ) { @@ -450,7 +450,7 @@ void SvtFontOptions::EnableReplacementTable( sal_Bool bState ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Bool SvtFontOptions::IsFontHistoryEnabled() const { @@ -459,7 +459,7 @@ sal_Bool SvtFontOptions::IsFontHistoryEnabled() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtFontOptions::EnableFontHistory( sal_Bool bState ) { @@ -468,7 +468,7 @@ void SvtFontOptions::EnableFontHistory( sal_Bool bState ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Bool SvtFontOptions::IsFontWYSIWYGEnabled() const { @@ -477,7 +477,7 @@ sal_Bool SvtFontOptions::IsFontWYSIWYGEnabled() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtFontOptions::EnableFontWYSIWYG( sal_Bool bState ) { @@ -486,7 +486,7 @@ void SvtFontOptions::EnableFontWYSIWYG( sal_Bool bState ) } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** Mutex& SvtFontOptions::impl_GetOwnStaticMutex() { diff --git a/unotools/source/config/historyoptions.cxx b/unotools/source/config/historyoptions.cxx index 5cb74f9bbf35..653e4104da04 100644 --- a/unotools/source/config/historyoptions.cxx +++ b/unotools/source/config/historyoptions.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/unotools/source/config/inetoptions.cxx b/unotools/source/config/inetoptions.cxx index 15bf425af744..5686ea822b1b 100644 --- a/unotools/source/config/inetoptions.cxx +++ b/unotools/source/config/inetoptions.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/unotools/source/config/internaloptions.cxx b/unotools/source/config/internaloptions.cxx index 310b52f8c98f..281a8eaa3046 100644 --- a/unotools/source/config/internaloptions.cxx +++ b/unotools/source/config/internaloptions.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 @@ #endif //_________________________________________________________________________________________________________________ -// includes +// includes //_________________________________________________________________________________________________________________ #include <deque> @@ -48,39 +48,39 @@ #include "itemholder1.hxx" //_________________________________________________________________________________________________________________ -// namespaces +// namespaces //_________________________________________________________________________________________________________________ -using namespace ::utl ; -using namespace ::rtl ; -using namespace ::osl ; -using namespace ::std ; -using namespace ::com::sun::star::uno ; -using namespace ::com::sun::star::beans ; +using namespace ::utl ; +using namespace ::rtl ; +using namespace ::osl ; +using namespace ::std ; +using namespace ::com::sun::star::uno ; +using namespace ::com::sun::star::beans ; //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ -#define ROOTNODE_INTERNAL OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Internal" )) -#define DEFAULT_SLOTCFG sal_False -#define DEFAULT_SENDCRASHMAIL sal_False +#define ROOTNODE_INTERNAL OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Internal" )) +#define DEFAULT_SLOTCFG sal_False +#define DEFAULT_SENDCRASHMAIL sal_False #define DEFAULT_USEMAILUI sal_True -#define DEFAULT_CURRENTTEMPURL OUString(RTL_CONSTASCII_USTRINGPARAM("")) +#define DEFAULT_CURRENTTEMPURL OUString(RTL_CONSTASCII_USTRINGPARAM("")) -#define FIXPROPERTYNAME_SLOTCFG OUString(RTL_CONSTASCII_USTRINGPARAM("Slot" )) -#define FIXPROPERTYNAME_SENDCRASHMAIL OUString(RTL_CONSTASCII_USTRINGPARAM("SendCrashMail" )) +#define FIXPROPERTYNAME_SLOTCFG OUString(RTL_CONSTASCII_USTRINGPARAM("Slot" )) +#define FIXPROPERTYNAME_SENDCRASHMAIL OUString(RTL_CONSTASCII_USTRINGPARAM("SendCrashMail" )) #define FIXPROPERTYNAME_USEMAILUI OUString(RTL_CONSTASCII_USTRINGPARAM("UseMailUI" )) -#define FIXPROPERTYNAME_CURRENTTEMPURL OUString(RTL_CONSTASCII_USTRINGPARAM("CurrentTempURL" )) +#define FIXPROPERTYNAME_CURRENTTEMPURL OUString(RTL_CONSTASCII_USTRINGPARAM("CurrentTempURL" )) //#define FIXPROPERTYNAME_REMOVEMENUENTRYCLOSE OUString(RTL_CONSTASCII_USTRINGPARAM("RemoveMenuEntryClose")) //#define FIXPROPERTYNAME_REMOVEMENUENTRYBACKTOWEBTOP OUString(RTL_CONSTASCII_USTRINGPARAM("RemoveMenuEntryBackToWebtop")) //#define FIXPROPERTYNAME_REMOVEMENUENTRYNEWWEBTOP OUString(RTL_CONSTASCII_USTRINGPARAM("RemoveMenuEntryNewWebtop")) //#define FIXPROPERTYNAME_REMOVEMENUENTRYLOGOUT OUString(RTL_CONSTASCII_USTRINGPARAM("RemoveMenuEntryLogout")) -#define FIXPROPERTYHANDLE_SLOTCFG 0 -#define FIXPROPERTYHANDLE_SENDCRASHMAIL 1 +#define FIXPROPERTYHANDLE_SLOTCFG 0 +#define FIXPROPERTYHANDLE_SENDCRASHMAIL 1 #define FIXPROPERTYHANDLE_USEMAILUI 2 -#define FIXPROPERTYHANDLE_CURRENTTEMPURL 3 +#define FIXPROPERTYHANDLE_CURRENTTEMPURL 3 //#define FIXPROPERTYHANDLE_REMOVEMENUENTRYCLOSE 3 //#define FIXPROPERTYHANDLE_REMOVEMENUENTRYBACKTOWEBTOP 4 //#define FIXPROPERTYHANDLE_REMOVEMENUENTRYNEWWEBTOP 5 @@ -88,42 +88,42 @@ using namespace ::com::sun::star::beans ; #define FIXPROPERTYCOUNT 4 /* -#define PROPERTYNAME_RECOVERYLIST OUString(RTL_CONSTASCII_USTRINGPARAM("RecoveryList" )) -#define PROPERTYNAME_URL OUString(RTL_CONSTASCII_USTRINGPARAM("OrgURL" )) -#define PROPERTYNAME_FILTER OUString(RTL_CONSTASCII_USTRINGPARAM("FilterName" )) -#define PROPERTYNAME_TEMPNAME OUString(RTL_CONSTASCII_USTRINGPARAM("TempURL" )) - -#define OFFSET_URL 0 -#define OFFSET_FILTER 1 -#define OFFSET_TEMPNAME 2 +#define PROPERTYNAME_RECOVERYLIST OUString(RTL_CONSTASCII_USTRINGPARAM("RecoveryList" )) +#define PROPERTYNAME_URL OUString(RTL_CONSTASCII_USTRINGPARAM("OrgURL" )) +#define PROPERTYNAME_FILTER OUString(RTL_CONSTASCII_USTRINGPARAM("FilterName" )) +#define PROPERTYNAME_TEMPNAME OUString(RTL_CONSTASCII_USTRINGPARAM("TempURL" )) + +#define OFFSET_URL 0 +#define OFFSET_FILTER 1 +#define OFFSET_TEMPNAME 2 */ -#define PATHDELIMITER OUString(RTL_CONSTASCII_USTRINGPARAM("/" )) -#define FIXR OUString(RTL_CONSTASCII_USTRINGPARAM("r" )) +#define PATHDELIMITER OUString(RTL_CONSTASCII_USTRINGPARAM("/" )) +#define FIXR OUString(RTL_CONSTASCII_USTRINGPARAM("r" )) //_________________________________________________________________________________________________________________ -// private declarations! +// private declarations! //_________________________________________________________________________________________________________________ /* struct tIMPL_RecoveryEntry { - OUString sURL ; - OUString sFilter ; - OUString sTempName ; + OUString sURL ; + OUString sFilter ; + OUString sTempName ; tIMPL_RecoveryEntry() { - sURL = OUString(); - sFilter = OUString(); - sTempName = OUString(); + sURL = OUString(); + sFilter = OUString(); + sTempName = OUString(); } - tIMPL_RecoveryEntry( const OUString& sNewURL , - const OUString& sNewFilter , - const OUString& sNewTempName ) + tIMPL_RecoveryEntry( const OUString& sNewURL , + const OUString& sNewFilter , + const OUString& sNewTempName ) { - sURL = sNewURL ; - sFilter = sNewFilter ; - sTempName = sNewTempName ; + sURL = sNewURL ; + sFilter = sNewFilter ; + sTempName = sNewTempName ; } }; @@ -132,7 +132,7 @@ typedef deque< tIMPL_RecoveryEntry > tIMPL_RecoveryStack; class SvtInternalOptions_Impl : public ConfigItem { //------------------------------------------------------------------------------------------------------------- - // private member + // private member //------------------------------------------------------------------------------------------------------------- private: @@ -142,39 +142,39 @@ class SvtInternalOptions_Impl : public ConfigItem sal_Bool m_bRemoveMenuEntryNewWebtop; sal_Bool m_bRemoveMenuEntryLogout; sal_Bool m_bSlotCFG ; /// cache "Slot" of Internal section - sal_Bool m_bSendCrashMail ; /// cache "SendCrashMail" of Internal section + sal_Bool m_bSendCrashMail ; /// cache "SendCrashMail" of Internal section sal_Bool m_bUseMailUI; - OUString m_aCurrentTempURL ; - // tIMPL_RecoveryStack m_aRecoveryList ; /// cache "RecoveryList" of Internal section + OUString m_aCurrentTempURL ; + // tIMPL_RecoveryStack m_aRecoveryList ; /// cache "RecoveryList" of Internal section //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: //--------------------------------------------------------------------------------------------------------- - // constructor / destructor + // constructor / destructor //--------------------------------------------------------------------------------------------------------- SvtInternalOptions_Impl(); ~SvtInternalOptions_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 "seqPropertyNames" is the list of properties which should be updated. - @return - + @param "seqPropertyNames" is the list of properties which should be updated. + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual void Notify( const Sequence< OUString >& ) @@ -183,35 +183,35 @@ class SvtInternalOptions_Impl : public ConfigItem } /*-****************************************************************************************************//** - @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 //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short access method to get internal values - @descr These method give us a chance to regulate acces to ouer internal values. + @short access method to get internal values + @descr These method give us a chance to regulate acces to ouer internal values. It's not used in the moment - but it's possible for the feature! - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ sal_Bool IsRemoveMenuEntryClose() const { return m_bRemoveMenuEntryClose; } @@ -222,46 +222,46 @@ class SvtInternalOptions_Impl : public ConfigItem sal_Bool CrashMailEnabled () const { return m_bSendCrashMail; } sal_Bool MailUIEnabled () const { return m_bUseMailUI; } - OUString GetCurrentTempURL() const { return m_aCurrentTempURL; } - void SetCurrentTempURL( const OUString& aNewCurrentTempURL ); + OUString GetCurrentTempURL() const { return m_aCurrentTempURL; } + void SetCurrentTempURL( const OUString& aNewCurrentTempURL ); /* - void PushRecoveryItem ( const OUString& sURL , - const OUString& sFilter , - const OUString& sTempName ); - void PopRecoveryItem ( OUString& sURL , - OUString& sFilter , - OUString& sTempName ); - sal_Bool IsRecoveryListEmpty ( ) const; + void PushRecoveryItem ( const OUString& sURL , + const OUString& sFilter , + const OUString& sTempName ); + void PopRecoveryItem ( OUString& sURL , + OUString& sFilter , + OUString& sTempName ); + sal_Bool IsRecoveryListEmpty ( ) const; */ //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: /*-****************************************************************************************************//** - @short return list of fix key names of ouer configuration management which represent oue module tree - @descr These methods return a static const list of key names. We need it to get needed values from our + @short return list of fix key names of ouer configuration management which represent oue module tree + @descr These methods return a static const list of key names. We need it to get needed values from our configuration management. We return well known key names only - because the "UserData" node is handled in a special way! - @seealso - + @seealso - - @param - - @return A list of needed configuration keys is returned. + @param - + @return A list of needed configuration keys is returned. - @onerror - + @onerror - *//*-*****************************************************************************************************/ Sequence< OUString > impl_GetPropertyNames(); }; //_________________________________________________________________________________________________________________ -// definitions +// definitions //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** SvtInternalOptions_Impl::SvtInternalOptions_Impl() // Init baseclasses first @@ -271,24 +271,24 @@ SvtInternalOptions_Impl::SvtInternalOptions_Impl() , m_bRemoveMenuEntryBackToWebtop ( sal_False ) , m_bRemoveMenuEntryNewWebtop ( sal_False ) , m_bRemoveMenuEntryLogout ( sal_False ) - , m_bSlotCFG ( DEFAULT_SLOTCFG ) - , m_bSendCrashMail ( DEFAULT_SENDCRASHMAIL ) - , m_bUseMailUI ( DEFAULT_USEMAILUI ) - , m_aCurrentTempURL ( DEFAULT_CURRENTTEMPURL ) + , m_bSlotCFG ( DEFAULT_SLOTCFG ) + , m_bSendCrashMail ( DEFAULT_SENDCRASHMAIL ) + , m_bUseMailUI ( DEFAULT_USEMAILUI ) + , m_aCurrentTempURL ( DEFAULT_CURRENTTEMPURL ) { // Use our list of configuration keys to get his values. // structure of internal section: (first 2 entries are fixed - all other are member of a set!) - // "Slot" - // "SendCrashMail" - // "RecoveryList/r1/URL" - // "RecoveryList/r1/Filter" - // "RecoveryList/r1/TempName" - // "RecoveryList/r2/URL" - // "RecoveryList/r2/Filter" - // "RecoveryList/r2/TempName" - // "RecoveryList/.." - Sequence< OUString > seqNames = impl_GetPropertyNames() ; - Sequence< Any > seqValues = GetProperties( seqNames ) ; + // "Slot" + // "SendCrashMail" + // "RecoveryList/r1/URL" + // "RecoveryList/r1/Filter" + // "RecoveryList/r1/TempName" + // "RecoveryList/r2/URL" + // "RecoveryList/r2/Filter" + // "RecoveryList/r2/TempName" + // "RecoveryList/.." + Sequence< OUString > seqNames = impl_GetPropertyNames() ; + Sequence< Any > seqValues = GetProperties( seqNames ) ; // Safe impossible cases. // We need values from ALL configuration keys. @@ -296,12 +296,12 @@ SvtInternalOptions_Impl::SvtInternalOptions_Impl() DBG_ASSERT( !(seqNames.getLength()!=seqValues.getLength()), "SvtInternalOptions_Impl::SvtInternalOptions_Impl()\nI miss some values of configuration keys!\n" ); // Read fixed values first! - DBG_ASSERT(!(seqValues[FIXPROPERTYHANDLE_SLOTCFG].getValueTypeClass()!=TypeClass_BOOLEAN) , "SvtInternalOptions_Impl::SvtInternalOptions_Impl()\nWho has changed the value type of \"Office.Common\\Internal\\Slot\"?" ); - DBG_ASSERT(!(seqValues[FIXPROPERTYHANDLE_SENDCRASHMAIL].getValueTypeClass()!=TypeClass_BOOLEAN) , "SvtInternalOptions_Impl::SvtInternalOptions_Impl()\nWho has changed the value type of \"Office.Common\\Internal\\SendCrashMail\"?" ); - seqValues[FIXPROPERTYHANDLE_SLOTCFG ] >>= m_bSlotCFG ; - seqValues[FIXPROPERTYHANDLE_SENDCRASHMAIL ] >>= m_bSendCrashMail ; + DBG_ASSERT(!(seqValues[FIXPROPERTYHANDLE_SLOTCFG].getValueTypeClass()!=TypeClass_BOOLEAN) , "SvtInternalOptions_Impl::SvtInternalOptions_Impl()\nWho has changed the value type of \"Office.Common\\Internal\\Slot\"?" ); + DBG_ASSERT(!(seqValues[FIXPROPERTYHANDLE_SENDCRASHMAIL].getValueTypeClass()!=TypeClass_BOOLEAN) , "SvtInternalOptions_Impl::SvtInternalOptions_Impl()\nWho has changed the value type of \"Office.Common\\Internal\\SendCrashMail\"?" ); + seqValues[FIXPROPERTYHANDLE_SLOTCFG ] >>= m_bSlotCFG ; + seqValues[FIXPROPERTYHANDLE_SENDCRASHMAIL ] >>= m_bSendCrashMail ; seqValues[FIXPROPERTYHANDLE_USEMAILUI ] >>= m_bUseMailUI ; - seqValues[FIXPROPERTYHANDLE_CURRENTTEMPURL ] >>= m_aCurrentTempURL ; + seqValues[FIXPROPERTYHANDLE_CURRENTTEMPURL ] >>= m_aCurrentTempURL ; // seqValues[FIXPROPERTYHANDLE_REMOVEMENUENTRYCLOSE ] >>= m_bRemoveMenuEntryClose ; // seqValues[FIXPROPERTYHANDLE_REMOVEMENUENTRYBACKTOWEBTOP ] >>= m_bRemoveMenuEntryBackToWebtop ; // seqValues[FIXPROPERTYHANDLE_REMOVEMENUENTRYNEWWEBTOP ] >>= m_bRemoveMenuEntryNewWebtop ; @@ -311,16 +311,16 @@ SvtInternalOptions_Impl::SvtInternalOptions_Impl() // 3 subkeys for every item! // Attention: Start at next element after last fixed entry! We must ignore "Slot" and "SendCrashMail" ... tIMPL_RecoveryEntry aEntry; - sal_uInt32 nCount = seqValues.getLength() ; - sal_uInt32 nPosition = FIXPROPERTYCOUNT ; + sal_uInt32 nCount = seqValues.getLength() ; + sal_uInt32 nPosition = FIXPROPERTYCOUNT ; while( nPosition<nCount ) { - seqValues[nPosition] >>= aEntry.sURL ; + seqValues[nPosition] >>= aEntry.sURL ; ++nPosition; - seqValues[nPosition] >>= aEntry.sFilter ; + seqValues[nPosition] >>= aEntry.sFilter ; ++nPosition; - seqValues[nPosition] >>= aEntry.sTempName ; + seqValues[nPosition] >>= aEntry.sTempName ; ++nPosition; m_aRecoveryList.push_front( aEntry ); } @@ -331,7 +331,7 @@ SvtInternalOptions_Impl::SvtInternalOptions_Impl() } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** SvtInternalOptions_Impl::~SvtInternalOptions_Impl() { @@ -342,7 +342,7 @@ SvtInternalOptions_Impl::~SvtInternalOptions_Impl() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtInternalOptions_Impl::Commit() { @@ -361,9 +361,9 @@ void SvtInternalOptions_Impl::Commit() // Write set of dynamic properties then. ClearNodeSet( PROPERTYNAME_RECOVERYLIST ); - tIMPL_RecoveryEntry aItem ; - OUString sNode ; - Sequence< PropertyValue > seqPropertyValues( 3 ) ; // Every node in set has 3 sub-nodes!( url, filter, tempname ) + tIMPL_RecoveryEntry aItem ; + OUString sNode ; + Sequence< PropertyValue > seqPropertyValues( 3 ) ; // Every node in set has 3 sub-nodes!( url, filter, tempname ) // Copy list entries to save-list and write it to configuration. @@ -373,12 +373,12 @@ void SvtInternalOptions_Impl::Commit() aItem = m_aRecoveryList.top(); m_aRecoveryList.pop(); sNode = PROPERTYNAME_RECOVERYLIST + PATHDELIMITER + FIXR + OUString::valueOf( (sal_Int32)nItem ) + PATHDELIMITER; - seqPropertyValues[OFFSET_URL ].Name = sNode + PROPERTYNAME_URL ; - seqPropertyValues[OFFSET_FILTER ].Name = sNode + PROPERTYNAME_FILTER ; - seqPropertyValues[OFFSET_TEMPNAME ].Name = sNode + PROPERTYNAME_TEMPNAME ; - seqPropertyValues[OFFSET_URL ].Value <<= aItem.sURL ; - seqPropertyValues[OFFSET_FILTER ].Value <<= aItem.sFilter ; - seqPropertyValues[OFFSET_TEMPNAME ].Value <<= aItem.sTempName ; + seqPropertyValues[OFFSET_URL ].Name = sNode + PROPERTYNAME_URL ; + seqPropertyValues[OFFSET_FILTER ].Name = sNode + PROPERTYNAME_FILTER ; + seqPropertyValues[OFFSET_TEMPNAME ].Name = sNode + PROPERTYNAME_TEMPNAME ; + seqPropertyValues[OFFSET_URL ].Value <<= aItem.sURL ; + seqPropertyValues[OFFSET_FILTER ].Value <<= aItem.sFilter ; + seqPropertyValues[OFFSET_TEMPNAME ].Value <<= aItem.sTempName ; SetSetProperties( PROPERTYNAME_RECOVERYLIST, seqPropertyValues ); } @@ -389,12 +389,12 @@ void SvtInternalOptions_Impl::Commit() aItem = *iRecovery; sNode = PROPERTYNAME_RECOVERYLIST + PATHDELIMITER + FIXR + OUString::valueOf( (sal_Int32)nItem ) + PATHDELIMITER; - seqPropertyValues[OFFSET_URL ].Name = sNode + PROPERTYNAME_URL ; - seqPropertyValues[OFFSET_FILTER ].Name = sNode + PROPERTYNAME_FILTER ; - seqPropertyValues[OFFSET_TEMPNAME ].Name = sNode + PROPERTYNAME_TEMPNAME ; - seqPropertyValues[OFFSET_URL ].Value <<= iRecovery->sURL ; - seqPropertyValues[OFFSET_FILTER ].Value <<= iRecovery->sFilter ; - seqPropertyValues[OFFSET_TEMPNAME ].Value <<= iRecovery->sTempName ; + seqPropertyValues[OFFSET_URL ].Name = sNode + PROPERTYNAME_URL ; + seqPropertyValues[OFFSET_FILTER ].Name = sNode + PROPERTYNAME_FILTER ; + seqPropertyValues[OFFSET_TEMPNAME ].Name = sNode + PROPERTYNAME_TEMPNAME ; + seqPropertyValues[OFFSET_URL ].Value <<= iRecovery->sURL ; + seqPropertyValues[OFFSET_FILTER ].Value <<= iRecovery->sFilter ; + seqPropertyValues[OFFSET_TEMPNAME ].Value <<= iRecovery->sTempName ; SetSetProperties( PROPERTYNAME_RECOVERYLIST, seqPropertyValues ); } @@ -402,7 +402,7 @@ void SvtInternalOptions_Impl::Commit() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtInternalOptions_Impl::SetCurrentTempURL( const OUString& aNewCurrentTempURL ) { @@ -413,11 +413,11 @@ void SvtInternalOptions_Impl::SetCurrentTempURL( const OUString& aNewCurrentTemp #if 0 //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** -void SvtInternalOptions_Impl::PushRecoveryItem( const OUString& sURL , - const OUString& sFilter , - const OUString& sTempName ) +void SvtInternalOptions_Impl::PushRecoveryItem( const OUString& sURL , + const OUString& sFilter , + const OUString& sTempName ) { tIMPL_RecoveryEntry aEntry( sURL, sFilter, sTempName ); m_aRecoveryList.push_front( aEntry ); @@ -425,22 +425,22 @@ void SvtInternalOptions_Impl::PushRecoveryItem( const OUString& sURL } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** -void SvtInternalOptions_Impl::PopRecoveryItem( OUString& sURL , - OUString& sFilter , - OUString& sTempName ) +void SvtInternalOptions_Impl::PopRecoveryItem( OUString& sURL , + OUString& sFilter , + OUString& sTempName ) { tIMPL_RecoveryEntry aEntry = m_aRecoveryList.front(); m_aRecoveryList.pop_front(); - SetModified(); // Don't forget it - we delete an entry here! - sURL = aEntry.sURL ; - sFilter = aEntry.sFilter ; - sTempName = aEntry.sTempName ; + SetModified(); // Don't forget it - we delete an entry here! + sURL = aEntry.sURL ; + sFilter = aEntry.sFilter ; + sTempName = aEntry.sTempName ; } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Bool SvtInternalOptions_Impl::IsRecoveryListEmpty() const { @@ -449,7 +449,7 @@ sal_Bool SvtInternalOptions_Impl::IsRecoveryListEmpty() const #endif //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** Sequence< OUString > SvtInternalOptions_Impl::impl_GetPropertyNames() { @@ -465,9 +465,9 @@ Sequence< OUString > SvtInternalOptions_Impl::impl_GetPropertyNames() // Add names of fix properties to list. seqProperties[FIXPROPERTYHANDLE_SLOTCFG ] = FIXPROPERTYNAME_SLOTCFG ; - seqProperties[FIXPROPERTYHANDLE_SENDCRASHMAIL ] = FIXPROPERTYNAME_SENDCRASHMAIL ; + seqProperties[FIXPROPERTYHANDLE_SENDCRASHMAIL ] = FIXPROPERTYNAME_SENDCRASHMAIL ; seqProperties[FIXPROPERTYHANDLE_USEMAILUI ] = FIXPROPERTYNAME_USEMAILUI ; - seqProperties[FIXPROPERTYHANDLE_CURRENTTEMPURL ] = FIXPROPERTYNAME_CURRENTTEMPURL ; + seqProperties[FIXPROPERTYHANDLE_CURRENTTEMPURL ] = FIXPROPERTYNAME_CURRENTTEMPURL ; // seqProperties[FIXPROPERTYHANDLE_REMOVEMENUENTRYCLOSE ] = FIXPROPERTYNAME_REMOVEMENUENTRYCLOSE; // seqProperties[FIXPROPERTYHANDLE_REMOVEMENUENTRYBACKTOWEBTOP ] = FIXPROPERTYNAME_REMOVEMENUENTRYBACKTOWEBTOP; // seqProperties[FIXPROPERTYHANDLE_REMOVEMENUENTRYNEWWEBTOP ] = FIXPROPERTYNAME_REMOVEMENUENTRYNEWWEBTOP; @@ -479,11 +479,11 @@ Sequence< OUString > SvtInternalOptions_Impl::impl_GetPropertyNames() // nPosition is the start point of an list item, nItem an index into right list of node names! for( sal_Int32 nItem=0; nItem<nRecoveryCount; ++nItem ) { - seqProperties[nPosition] = PROPERTYNAME_RECOVERYLIST + PATHDELIMITER + seqRecoveryItems[nItem] + PATHDELIMITER + PROPERTYNAME_URL ; + seqProperties[nPosition] = PROPERTYNAME_RECOVERYLIST + PATHDELIMITER + seqRecoveryItems[nItem] + PATHDELIMITER + PROPERTYNAME_URL ; ++nPosition; - seqProperties[nPosition] = PROPERTYNAME_RECOVERYLIST + PATHDELIMITER + seqRecoveryItems[nItem] + PATHDELIMITER + PROPERTYNAME_FILTER ; + seqProperties[nPosition] = PROPERTYNAME_RECOVERYLIST + PATHDELIMITER + seqRecoveryItems[nItem] + PATHDELIMITER + PROPERTYNAME_FILTER ; ++nPosition; - seqProperties[nPosition] = PROPERTYNAME_RECOVERYLIST + PATHDELIMITER + seqRecoveryItems[nItem] + PATHDELIMITER + PROPERTYNAME_TEMPNAME ; + seqProperties[nPosition] = PROPERTYNAME_RECOVERYLIST + PATHDELIMITER + seqRecoveryItems[nItem] + PATHDELIMITER + PROPERTYNAME_TEMPNAME ; ++nPosition; } */ @@ -492,15 +492,15 @@ Sequence< OUString > SvtInternalOptions_Impl::impl_GetPropertyNames() } //***************************************************************************************************************** -// 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 //***************************************************************************************************************** -SvtInternalOptions_Impl* SvtInternalOptions::m_pDataContainer = NULL ; -sal_Int32 SvtInternalOptions::m_nRefCount = 0 ; +SvtInternalOptions_Impl* SvtInternalOptions::m_pDataContainer = NULL ; +sal_Int32 SvtInternalOptions::m_nRefCount = 0 ; //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** SvtInternalOptions::SvtInternalOptions() { @@ -519,7 +519,7 @@ SvtInternalOptions::SvtInternalOptions() } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** SvtInternalOptions::~SvtInternalOptions() { @@ -537,7 +537,7 @@ SvtInternalOptions::~SvtInternalOptions() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Bool SvtInternalOptions::SlotCFGEnabled() const { @@ -546,7 +546,7 @@ sal_Bool SvtInternalOptions::SlotCFGEnabled() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Bool SvtInternalOptions::CrashMailEnabled() const { @@ -555,7 +555,7 @@ sal_Bool SvtInternalOptions::CrashMailEnabled() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Bool SvtInternalOptions::MailUIEnabled() const { @@ -603,7 +603,7 @@ void SvtInternalOptions::SetCurrentTempURL( const OUString& aNewCurrentTempURL ) } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** Mutex& SvtInternalOptions::GetOwnStaticMutex() { diff --git a/unotools/source/config/itemholder1.cxx b/unotools/source/config/itemholder1.cxx index 48b1decc4983..241c9fd7a75d 100644 --- a/unotools/source/config/itemholder1.cxx +++ b/unotools/source/config/itemholder1.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/unotools/source/config/itemholder1.hxx b/unotools/source/config/itemholder1.hxx index 8e7fd285cc0a..ba35ae1d6f4b 100644 --- a/unotools/source/config/itemholder1.hxx +++ b/unotools/source/config/itemholder1.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/unotools/source/config/javaoptions.cxx b/unotools/source/config/javaoptions.cxx index 8c41aac2d3de..eef64a0f21dd 100644 --- a/unotools/source/config/javaoptions.cxx +++ b/unotools/source/config/javaoptions.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/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx index 39233f022534..da10593f2f05 100755 --- a/unotools/source/config/lingucfg.cxx +++ b/unotools/source/config/lingucfg.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 @@ -74,7 +74,7 @@ static BOOL lcl_SetLocale( INT16 &rLanguage, const uno::Any &rVal ) BOOL bSucc = FALSE; lang::Locale aNew; - if (rVal >>= aNew) // conversion successful? + if (rVal >>= aNew) // conversion successful? { INT16 nNew = MsLangId::convertLocaleToLanguage( aNew ); if (nNew != rLanguage) @@ -113,16 +113,16 @@ SvtLinguOptions::SvtLinguOptions() nDefaultLanguage_CTL = LANGUAGE_NONE; // general options - bIsUseDictionaryList = - bIsIgnoreControlCharacters = TRUE; + bIsUseDictionaryList = + bIsIgnoreControlCharacters = TRUE; // spelling options - bIsSpellCapitalization = - bIsSpellSpecial = TRUE; - bIsSpellAuto = - bIsSpellReverse = - bIsSpellWithDigits = - bIsSpellUpperCase = FALSE; + bIsSpellCapitalization = + bIsSpellSpecial = TRUE; + bIsSpellAuto = + bIsSpellReverse = + bIsSpellWithDigits = + bIsSpellUpperCase = FALSE; // text conversion options bIsIgnorePostPositionalWord = TRUE; @@ -140,11 +140,11 @@ SvtLinguOptions::SvtLinguOptions() bROIsReverseMapping = FALSE; // hyphenation options - bIsHyphSpecial = TRUE; - bIsHyphAuto = FALSE; - nHyphMinLeading = - nHyphMinTrailing = 2; - nHyphMinWordLength = 0; + bIsHyphSpecial = TRUE; + bIsHyphAuto = FALSE; + nHyphMinLeading = + nHyphMinTrailing = 2; + nHyphMinWordLength = 0; nDataFilesChangedCheckValue = 0; @@ -279,7 +279,7 @@ static struct NamesToHdl {/* 31 */ "GrammarChecking/IsInteractiveCheck", UPN_IS_GRAMMAR_INTERACTIVE, UPH_IS_GRAMMAR_INTERACTIVE}, /* similar to entry 0 (thus no own configuration entry) but with different property name and type */ -{ NULL, UPN_DEFAULT_LANGUAGE, UPH_DEFAULT_LANGUAGE}, +{ NULL, UPN_DEFAULT_LANGUAGE, UPH_DEFAULT_LANGUAGE}, { NULL, NULL, -1} }; @@ -1128,8 +1128,8 @@ BOOL SvtLinguConfig::GetDictionaryEntry( xNA.set( xNA->getByName( rNodeName ), uno::UNO_QUERY_THROW ); // read group data... - uno::Sequence< rtl::OUString > aLocations; - rtl::OUString aFormatName; + uno::Sequence< rtl::OUString > aLocations; + rtl::OUString aFormatName; uno::Sequence< rtl::OUString > aLocaleNames; bSuccess = (xNA->getByName( aG_Locations ) >>= aLocations) && (xNA->getByName( aG_Format ) >>= aFormatName) && @@ -1406,8 +1406,8 @@ rtl::OUString SvtLinguConfig::GetSpellAndGrammarContextDictionaryImage( } -::rtl::OUString SvtLinguConfig::GetThesaurusDialogImage( - const ::rtl::OUString &rServiceImplName, +::rtl::OUString SvtLinguConfig::GetThesaurusDialogImage( + const ::rtl::OUString &rServiceImplName, bool bHighContrast ) const { rtl::OUString aRes; @@ -1420,9 +1420,9 @@ rtl::OUString SvtLinguConfig::GetSpellAndGrammarContextDictionaryImage( return aRes; } - -::rtl::OUString SvtLinguConfig::GetSynonymsContextImage( - const ::rtl::OUString &rServiceImplName, + +::rtl::OUString SvtLinguConfig::GetSynonymsContextImage( + const ::rtl::OUString &rServiceImplName, bool bHighContrast ) const { rtl::OUString aRes; @@ -1434,7 +1434,7 @@ rtl::OUString SvtLinguConfig::GetSpellAndGrammarContextDictionaryImage( } return aRes; } - + bool SvtLinguConfig::HasVendorImages( const char *pImageName ) const { @@ -1464,9 +1464,9 @@ bool SvtLinguConfig::HasVendorImages( const char *pImageName ) const { bRes = true; break; - } - } - } + } + } + } } catch (uno::Exception &) { @@ -1475,7 +1475,7 @@ bool SvtLinguConfig::HasVendorImages( const char *pImageName ) const } return bRes; } - + bool SvtLinguConfig::HasGrammarChecker() const { diff --git a/unotools/source/config/localisationoptions.cxx b/unotools/source/config/localisationoptions.cxx index f4b8bbd087ef..523c8b936a3a 100644 --- a/unotools/source/config/localisationoptions.cxx +++ b/unotools/source/config/localisationoptions.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 @@ #endif //_________________________________________________________________________________________________________________ -// includes +// includes //_________________________________________________________________________________________________________________ #include <unotools/localisationoptions.hxx> @@ -45,154 +45,154 @@ #include "itemholder1.hxx" //_________________________________________________________________________________________________________________ -// namespaces +// namespaces //_________________________________________________________________________________________________________________ -using namespace ::utl ; -using namespace ::rtl ; -using namespace ::osl ; -using namespace ::com::sun::star::uno ; +using namespace ::utl ; +using namespace ::rtl ; +using namespace ::osl ; +using namespace ::com::sun::star::uno ; //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ -#define ROOTNODE_LOCALISATION OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/View/Localisation")) -#define DEFAULT_AUTOMNEMONIC sal_False -#define DEFAULT_DIALOGSCALE 0 +#define ROOTNODE_LOCALISATION OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/View/Localisation")) +#define DEFAULT_AUTOMNEMONIC sal_False +#define DEFAULT_DIALOGSCALE 0 -#define PROPERTYNAME_AUTOMNEMONIC OUString(RTL_CONSTASCII_USTRINGPARAM("AutoMnemonic" )) -#define PROPERTYNAME_DIALOGSCALE OUString(RTL_CONSTASCII_USTRINGPARAM("DialogScale" )) +#define PROPERTYNAME_AUTOMNEMONIC OUString(RTL_CONSTASCII_USTRINGPARAM("AutoMnemonic" )) +#define PROPERTYNAME_DIALOGSCALE OUString(RTL_CONSTASCII_USTRINGPARAM("DialogScale" )) -#define PROPERTYHANDLE_AUTOMNEMONIC 0 -#define PROPERTYHANDLE_DIALOGSCALE 1 +#define PROPERTYHANDLE_AUTOMNEMONIC 0 +#define PROPERTYHANDLE_DIALOGSCALE 1 -#define PROPERTYCOUNT 2 +#define PROPERTYCOUNT 2 //_________________________________________________________________________________________________________________ -// private declarations! +// private declarations! //_________________________________________________________________________________________________________________ class SvtLocalisationOptions_Impl : public ConfigItem { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: //--------------------------------------------------------------------------------------------------------- - // constructor / destructor + // constructor / destructor //--------------------------------------------------------------------------------------------------------- SvtLocalisationOptions_Impl(); ~SvtLocalisationOptions_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 "seqPropertyNames" is the list of properties which should be updated. - @return - + @param "seqPropertyNames" is the list of properties which should be updated. + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual void Notify( const Sequence< OUString >& seqPropertyNames ); /*-****************************************************************************************************//** - @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 //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short access method to get internal values - @descr These method give us a chance to regulate acces to ouer internal values. + @short access method to get internal values + @descr These method give us a chance to regulate acces to ouer internal values. It's not used in the moment - but it's possible for the feature! - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ - sal_Bool IsAutoMnemonic ( ) const ; - void SetAutoMnemonic ( sal_Bool bState ) ; - sal_Int32 GetDialogScale ( ) const ; - void SetDialogScale ( sal_Int32 nScale ) ; + sal_Bool IsAutoMnemonic ( ) const ; + void SetAutoMnemonic ( sal_Bool bState ) ; + sal_Int32 GetDialogScale ( ) const ; + void SetDialogScale ( sal_Int32 nScale ) ; //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: /*-****************************************************************************************************//** - @short return list of key names of ouer configuration management which represent oue module tree - @descr These methods return a static const list of key names. We need it to get needed values from our + @short return list of key names of ouer configuration management which represent oue module tree + @descr These methods return a static const list of key names. We need it to get needed values from our configuration management. - @seealso - + @seealso - - @param - - @return A list of needed configuration keys is returned. + @param - + @return A list of needed configuration keys is returned. - @onerror - + @onerror - *//*-*****************************************************************************************************/ static Sequence< OUString > GetPropertyNames(); //------------------------------------------------------------------------------------------------------------- - // private member + // private member //------------------------------------------------------------------------------------------------------------- private: - sal_Bool m_bAutoMnemonic ; - sal_Int32 m_nDialogScale ; + sal_Bool m_bAutoMnemonic ; + sal_Int32 m_nDialogScale ; }; //_________________________________________________________________________________________________________________ -// definitions +// definitions //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** SvtLocalisationOptions_Impl::SvtLocalisationOptions_Impl() // Init baseclasses first - : ConfigItem ( ROOTNODE_LOCALISATION ) + : ConfigItem ( ROOTNODE_LOCALISATION ) // Init member then. - , m_bAutoMnemonic ( DEFAULT_AUTOMNEMONIC ) - , m_nDialogScale ( DEFAULT_DIALOGSCALE ) + , m_bAutoMnemonic ( DEFAULT_AUTOMNEMONIC ) + , m_nDialogScale ( DEFAULT_DIALOGSCALE ) { // Use our static list of configuration keys to get his values. - Sequence< OUString > seqNames = GetPropertyNames ( ); - Sequence< Any > seqValues = GetProperties ( seqNames ); + Sequence< OUString > seqNames = GetPropertyNames ( ); + Sequence< Any > seqValues = GetProperties ( seqNames ); // Safe impossible cases. // We need values from ALL configuration keys. @@ -208,13 +208,13 @@ SvtLocalisationOptions_Impl::SvtLocalisationOptions_Impl() DBG_ASSERT( !(seqValues[nProperty].hasValue()==sal_False), "SvtLocalisationOptions_Impl::SvtLocalisationOptions_Impl()\nInvalid property value detected!\n" ); switch( nProperty ) { - case PROPERTYHANDLE_AUTOMNEMONIC : { + case PROPERTYHANDLE_AUTOMNEMONIC : { DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtLocalisationOptions_Impl::SvtLocalisationOptions_Impl()\nWho has changed the value type of \"Office.Common\\View\\Localisation\\AutoMnemonic\"?" ); seqValues[nProperty] >>= m_bAutoMnemonic; } break; - case PROPERTYHANDLE_DIALOGSCALE : { + case PROPERTYHANDLE_DIALOGSCALE : { DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_LONG), "SvtLocalisationOptions_Impl::SvtLocalisationOptions_Impl()\nWho has changed the value type of \"Office.Common\\View\\Localisation\\DialogScale\"?" ); seqValues[nProperty] >>= m_nDialogScale; } @@ -228,7 +228,7 @@ SvtLocalisationOptions_Impl::SvtLocalisationOptions_Impl() } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** SvtLocalisationOptions_Impl::~SvtLocalisationOptions_Impl() { @@ -240,7 +240,7 @@ SvtLocalisationOptions_Impl::~SvtLocalisationOptions_Impl() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtLocalisationOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames ) { @@ -273,24 +273,24 @@ void SvtLocalisationOptions_Impl::Notify( const Sequence< OUString >& seqPropert } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtLocalisationOptions_Impl::Commit() { // Get names of supported properties, create a list for values and copy current values to it. - Sequence< OUString > seqNames = GetPropertyNames (); - sal_Int32 nCount = seqNames.getLength(); - Sequence< Any > seqValues ( nCount ); + Sequence< OUString > seqNames = GetPropertyNames (); + sal_Int32 nCount = seqNames.getLength(); + Sequence< Any > seqValues ( nCount ); for( sal_Int32 nProperty=0; nProperty<nCount; ++nProperty ) { switch( nProperty ) { - case PROPERTYHANDLE_AUTOMNEMONIC : { + case PROPERTYHANDLE_AUTOMNEMONIC : { seqValues[nProperty] <<= m_bAutoMnemonic; } break; - case PROPERTYHANDLE_DIALOGSCALE : { + case PROPERTYHANDLE_DIALOGSCALE : { seqValues[nProperty] <<= m_nDialogScale; } break; @@ -301,7 +301,7 @@ void SvtLocalisationOptions_Impl::Commit() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Bool SvtLocalisationOptions_Impl::IsAutoMnemonic() const { @@ -309,7 +309,7 @@ sal_Bool SvtLocalisationOptions_Impl::IsAutoMnemonic() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtLocalisationOptions_Impl::SetAutoMnemonic( sal_Bool bState ) { @@ -318,7 +318,7 @@ void SvtLocalisationOptions_Impl::SetAutoMnemonic( sal_Bool bState ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Int32 SvtLocalisationOptions_Impl::GetDialogScale() const { @@ -326,7 +326,7 @@ sal_Int32 SvtLocalisationOptions_Impl::GetDialogScale() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtLocalisationOptions_Impl::SetDialogScale( sal_Int32 nScale ) { @@ -335,15 +335,15 @@ void SvtLocalisationOptions_Impl::SetDialogScale( sal_Int32 nScale ) } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** Sequence< OUString > SvtLocalisationOptions_Impl::GetPropertyNames() { // Build static list of configuration key names. static const OUString pProperties[] = { - PROPERTYNAME_AUTOMNEMONIC , - PROPERTYNAME_DIALOGSCALE , + PROPERTYNAME_AUTOMNEMONIC , + PROPERTYNAME_DIALOGSCALE , }; // Initialize return sequence with these list ... static const Sequence< OUString > seqPropertyNames( pProperties, PROPERTYCOUNT ); @@ -352,15 +352,15 @@ Sequence< OUString > SvtLocalisationOptions_Impl::GetPropertyNames() } //***************************************************************************************************************** -// 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 //***************************************************************************************************************** -SvtLocalisationOptions_Impl* SvtLocalisationOptions::m_pDataContainer = NULL ; -sal_Int32 SvtLocalisationOptions::m_nRefCount = 0 ; +SvtLocalisationOptions_Impl* SvtLocalisationOptions::m_pDataContainer = NULL ; +sal_Int32 SvtLocalisationOptions::m_nRefCount = 0 ; //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** SvtLocalisationOptions::SvtLocalisationOptions() { @@ -379,7 +379,7 @@ SvtLocalisationOptions::SvtLocalisationOptions() } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** SvtLocalisationOptions::~SvtLocalisationOptions() { @@ -397,7 +397,7 @@ SvtLocalisationOptions::~SvtLocalisationOptions() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Bool SvtLocalisationOptions::IsAutoMnemonic() const { @@ -406,7 +406,7 @@ sal_Bool SvtLocalisationOptions::IsAutoMnemonic() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtLocalisationOptions::SetAutoMnemonic( sal_Bool bState ) { @@ -415,7 +415,7 @@ void SvtLocalisationOptions::SetAutoMnemonic( sal_Bool bState ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Int32 SvtLocalisationOptions::GetDialogScale() const { @@ -424,7 +424,7 @@ sal_Int32 SvtLocalisationOptions::GetDialogScale() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtLocalisationOptions::SetDialogScale( sal_Int32 nScale ) { @@ -433,7 +433,7 @@ void SvtLocalisationOptions::SetDialogScale( sal_Int32 nScale ) } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** Mutex& SvtLocalisationOptions::GetOwnStaticMutex() { diff --git a/unotools/source/config/menuoptions.cxx b/unotools/source/config/menuoptions.cxx index 2c5756c2140c..080c511345dd 100644 --- a/unotools/source/config/menuoptions.cxx +++ b/unotools/source/config/menuoptions.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 @@ #endif //_________________________________________________________________________________________________________________ -// includes +// includes //_________________________________________________________________________________________________________________ #include <unotools/menuoptions.hxx> @@ -46,30 +46,30 @@ #include "itemholder1.hxx" //_________________________________________________________________________________________________________________ -// namespaces +// namespaces //_________________________________________________________________________________________________________________ -using namespace ::utl ; -using namespace ::rtl ; -using namespace ::osl ; -using namespace ::com::sun::star::uno ; +using namespace ::utl ; +using namespace ::rtl ; +using namespace ::osl ; +using namespace ::com::sun::star::uno ; //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ -#define ROOTNODE_MENU OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/View/Menu" )) -#define DEFAULT_DONTHIDEDISABLEDENTRIES sal_False -#define DEFAULT_FOLLOWMOUSE sal_True -#define DEFAULT_MENUICONS 2 +#define ROOTNODE_MENU OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/View/Menu" )) +#define DEFAULT_DONTHIDEDISABLEDENTRIES sal_False +#define DEFAULT_FOLLOWMOUSE sal_True +#define DEFAULT_MENUICONS 2 -#define PROPERTYNAME_DONTHIDEDISABLEDENTRIES OUString(RTL_CONSTASCII_USTRINGPARAM("DontHideDisabledEntry" )) -#define PROPERTYNAME_FOLLOWMOUSE OUString(RTL_CONSTASCII_USTRINGPARAM("FollowMouse" )) +#define PROPERTYNAME_DONTHIDEDISABLEDENTRIES OUString(RTL_CONSTASCII_USTRINGPARAM("DontHideDisabledEntry" )) +#define PROPERTYNAME_FOLLOWMOUSE OUString(RTL_CONSTASCII_USTRINGPARAM("FollowMouse" )) #define PROPERTYNAME_SHOWICONSINMENUES OUString(RTL_CONSTASCII_USTRINGPARAM("ShowIconsInMenues" )) #define PROPERTYNAME_SYSTEMICONSINMENUES OUString(RTL_CONSTASCII_USTRINGPARAM("IsSystemIconsInMenus" )) -#define PROPERTYHANDLE_DONTHIDEDISABLEDENTRIES 0 -#define PROPERTYHANDLE_FOLLOWMOUSE 1 +#define PROPERTYHANDLE_DONTHIDEDISABLEDENTRIES 0 +#define PROPERTYHANDLE_FOLLOWMOUSE 1 #define PROPERTYHANDLE_SHOWICONSINMENUES 2 #define PROPERTYHANDLE_SYSTEMICONSINMENUES 3 @@ -80,29 +80,29 @@ using namespace ::com::sun::star::uno ; DECLARE_LIST( LinkList, Link * ) //_________________________________________________________________________________________________________________ -// private declarations! +// private declarations! //_________________________________________________________________________________________________________________ class SvtMenuOptions_Impl : public ConfigItem { //------------------------------------------------------------------------------------------------------------- - // private member + // private member //------------------------------------------------------------------------------------------------------------- private: LinkList aList; - sal_Bool m_bDontHideDisabledEntries ; /// cache "DontHideDisabledEntries" of Menu section - sal_Bool m_bFollowMouse ; /// cache "FollowMouse" of Menu section - sal_Int16 m_nMenuIcons ; /// cache "MenuIcons" of Menu section + sal_Bool m_bDontHideDisabledEntries ; /// cache "DontHideDisabledEntries" of Menu section + sal_Bool m_bFollowMouse ; /// cache "FollowMouse" of Menu section + sal_Int16 m_nMenuIcons ; /// cache "MenuIcons" of Menu section //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: //--------------------------------------------------------------------------------------------------------- - // constructor / destructor + // constructor / destructor //--------------------------------------------------------------------------------------------------------- SvtMenuOptions_Impl(); @@ -112,67 +112,67 @@ class SvtMenuOptions_Impl : public ConfigItem void RemoveListener( const Link& rLink ); //--------------------------------------------------------------------------------------------------------- - // 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 "seqPropertyNames" is the list of properties which should be updated. - @return - + @param "seqPropertyNames" is the list of properties which should be updated. + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual void Notify( const Sequence< OUString >& seqPropertyNames ); /*-****************************************************************************************************//** - @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 //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short access method to get internal values - @descr These method give us a chance to regulate acces to ouer internal values. + @short access method to get internal values + @descr These method give us a chance to regulate acces to ouer internal values. It's not used in the moment - but it's possible for the feature! - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ - sal_Bool IsEntryHidingEnabled() const + sal_Bool IsEntryHidingEnabled() const { return m_bDontHideDisabledEntries; } - sal_Bool IsFollowMouseEnabled() const + sal_Bool IsFollowMouseEnabled() const { return m_bFollowMouse; } - sal_Int16 GetMenuIconsState() const + sal_Int16 GetMenuIconsState() const { return m_nMenuIcons; } - void SetEntryHidingState ( sal_Bool bState ) + void SetEntryHidingState ( sal_Bool bState ) { m_bDontHideDisabledEntries = bState; SetModified(); @@ -181,7 +181,7 @@ class SvtMenuOptions_Impl : public ConfigItem Commit(); } - void SetFollowMouseState ( sal_Bool bState ) + void SetFollowMouseState ( sal_Bool bState ) { m_bFollowMouse = bState; SetModified(); @@ -190,7 +190,7 @@ class SvtMenuOptions_Impl : public ConfigItem Commit(); } - void SetMenuIconsState ( sal_Int16 bState ) + void SetMenuIconsState ( sal_Int16 bState ) { m_nMenuIcons = bState; SetModified(); @@ -200,45 +200,45 @@ class SvtMenuOptions_Impl : public ConfigItem } //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: /*-****************************************************************************************************//** - @short return list of fix key names of ouer configuration management which represent oue module tree - @descr These methods return a static const list of key names. We need it to get needed values from our + @short return list of fix key names of ouer configuration management which represent oue module tree + @descr These methods return a static const list of key names. We need it to get needed values from our configuration management. - @seealso - + @seealso - - @param - - @return A list of needed configuration keys is returned. + @param - + @return A list of needed configuration keys is returned. - @onerror - + @onerror - *//*-*****************************************************************************************************/ static Sequence< OUString > impl_GetPropertyNames(); }; //_________________________________________________________________________________________________________________ -// definitions +// definitions //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** SvtMenuOptions_Impl::SvtMenuOptions_Impl() // Init baseclasses first - : ConfigItem ( ROOTNODE_MENU ) + : ConfigItem ( ROOTNODE_MENU ) // Init member then. - , m_bDontHideDisabledEntries ( DEFAULT_DONTHIDEDISABLEDENTRIES ) - , m_bFollowMouse ( DEFAULT_FOLLOWMOUSE ) - , m_nMenuIcons ( DEFAULT_MENUICONS ) + , m_bDontHideDisabledEntries ( DEFAULT_DONTHIDEDISABLEDENTRIES ) + , m_bFollowMouse ( DEFAULT_FOLLOWMOUSE ) + , m_nMenuIcons ( DEFAULT_MENUICONS ) { // Use our static list of configuration keys to get his values. - Sequence< OUString > seqNames = impl_GetPropertyNames(); - Sequence< Any > seqValues = GetProperties( seqNames ) ; + Sequence< OUString > seqNames = impl_GetPropertyNames(); + Sequence< Any > seqValues = GetProperties( seqNames ) ; // Safe impossible cases. // We need values from ALL configuration keys. @@ -249,8 +249,8 @@ SvtMenuOptions_Impl::SvtMenuOptions_Impl() sal_Bool bSystemMenuIcons = true; // Copy values from list in right order to ouer internal member. - sal_Int32 nPropertyCount = seqValues.getLength() ; - sal_Int32 nProperty = 0 ; + sal_Int32 nPropertyCount = seqValues.getLength() ; + sal_Int32 nProperty = 0 ; for( nProperty=0; nProperty<nPropertyCount; ++nProperty ) { // Safe impossible cases. @@ -258,13 +258,13 @@ SvtMenuOptions_Impl::SvtMenuOptions_Impl() DBG_ASSERT( !(seqValues[nProperty].hasValue()==sal_False), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nInvalid property value for property detected!\n" ); switch( nProperty ) { - case PROPERTYHANDLE_DONTHIDEDISABLEDENTRIES : { + case PROPERTYHANDLE_DONTHIDEDISABLEDENTRIES : { DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nWho has changed the value type of \"Office.Common\\View\\Menu\\DontHideDisabledEntry\"?" ); seqValues[nProperty] >>= m_bDontHideDisabledEntries; } break; - case PROPERTYHANDLE_FOLLOWMOUSE : { + case PROPERTYHANDLE_FOLLOWMOUSE : { DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nWho has changed the value type of \"Office.Common\\View\\Menu\\FollowMouse\"?" ); seqValues[nProperty] >>= m_bFollowMouse; } @@ -274,7 +274,7 @@ SvtMenuOptions_Impl::SvtMenuOptions_Impl() seqValues[nProperty] >>= bMenuIcons; } break; - case PROPERTYHANDLE_SYSTEMICONSINMENUES : { + case PROPERTYHANDLE_SYSTEMICONSINMENUES : { DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nWho has changed the value type of \"Office.Common\\View\\Menu\\IsSystemIconsInMenus\"?" ); seqValues[nProperty] >>= bSystemMenuIcons; } @@ -288,7 +288,7 @@ SvtMenuOptions_Impl::SvtMenuOptions_Impl() } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** SvtMenuOptions_Impl::~SvtMenuOptions_Impl() { @@ -304,7 +304,7 @@ SvtMenuOptions_Impl::~SvtMenuOptions_Impl() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtMenuOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames ) { @@ -354,24 +354,24 @@ void SvtMenuOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtMenuOptions_Impl::Commit() { // Get names of supported properties, create a list for values and copy current values to it. - Sequence< OUString > seqNames = impl_GetPropertyNames(); - sal_Int32 nCount = seqNames.getLength(); - Sequence< Any > seqValues ( nCount ); + Sequence< OUString > seqNames = impl_GetPropertyNames(); + sal_Int32 nCount = seqNames.getLength(); + Sequence< Any > seqValues ( nCount ); for( sal_Int32 nProperty=0; nProperty<nCount; ++nProperty ) { switch( nProperty ) { - case PROPERTYHANDLE_DONTHIDEDISABLEDENTRIES : { + case PROPERTYHANDLE_DONTHIDEDISABLEDENTRIES : { seqValues[nProperty] <<= m_bDontHideDisabledEntries; } break; - case PROPERTYHANDLE_FOLLOWMOUSE : { + case PROPERTYHANDLE_FOLLOWMOUSE : { seqValues[nProperty] <<= m_bFollowMouse; } break; @@ -380,7 +380,7 @@ void SvtMenuOptions_Impl::Commit() seqValues[nProperty] <<=(sal_Bool)(Application::GetSettings().GetStyleSettings().GetUseImagesInMenus()); } break; - case PROPERTYHANDLE_SYSTEMICONSINMENUES : { + case PROPERTYHANDLE_SYSTEMICONSINMENUES : { seqValues[nProperty] <<= (m_nMenuIcons == 2 ? sal_True : sal_False) ; } break; @@ -391,16 +391,16 @@ void SvtMenuOptions_Impl::Commit() } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** Sequence< OUString > SvtMenuOptions_Impl::impl_GetPropertyNames() { // Build static list of configuration key names. static const OUString pProperties[] = { - PROPERTYNAME_DONTHIDEDISABLEDENTRIES , - PROPERTYNAME_FOLLOWMOUSE , - PROPERTYNAME_SHOWICONSINMENUES , + PROPERTYNAME_DONTHIDEDISABLEDENTRIES , + PROPERTYNAME_FOLLOWMOUSE , + PROPERTYNAME_SHOWICONSINMENUES , PROPERTYNAME_SYSTEMICONSINMENUES }; // Initialize return sequence with these list ... @@ -427,15 +427,15 @@ void SvtMenuOptions_Impl::RemoveListener( const Link& rLink ) } //***************************************************************************************************************** -// 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 //***************************************************************************************************************** -SvtMenuOptions_Impl* SvtMenuOptions::m_pDataContainer = NULL ; -sal_Int32 SvtMenuOptions::m_nRefCount = 0 ; +SvtMenuOptions_Impl* SvtMenuOptions::m_pDataContainer = NULL ; +sal_Int32 SvtMenuOptions::m_nRefCount = 0 ; //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** SvtMenuOptions::SvtMenuOptions() { @@ -454,7 +454,7 @@ SvtMenuOptions::SvtMenuOptions() } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** SvtMenuOptions::~SvtMenuOptions() { @@ -472,7 +472,7 @@ SvtMenuOptions::~SvtMenuOptions() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Bool SvtMenuOptions::IsEntryHidingEnabled() const { @@ -481,7 +481,7 @@ sal_Bool SvtMenuOptions::IsEntryHidingEnabled() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Bool SvtMenuOptions::IsFollowMouseEnabled() const { @@ -490,7 +490,7 @@ sal_Bool SvtMenuOptions::IsFollowMouseEnabled() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtMenuOptions::SetEntryHidingState( sal_Bool bState ) { @@ -499,7 +499,7 @@ void SvtMenuOptions::SetEntryHidingState( sal_Bool bState ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtMenuOptions::SetFollowMouseState( sal_Bool bState ) { @@ -508,7 +508,7 @@ void SvtMenuOptions::SetFollowMouseState( sal_Bool bState ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Int16 SvtMenuOptions::GetMenuIconsState() const { @@ -517,7 +517,7 @@ sal_Int16 SvtMenuOptions::GetMenuIconsState() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtMenuOptions::SetMenuIconsState( sal_Int16 bState ) { @@ -526,7 +526,7 @@ void SvtMenuOptions::SetMenuIconsState( sal_Int16 bState ) } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** Mutex& SvtMenuOptions::GetOwnStaticMutex() { diff --git a/unotools/source/config/misccfg.cxx b/unotools/source/config/misccfg.cxx index e2cc8686d444..9a8b01c45908 100644 --- a/unotools/source/config/misccfg.cxx +++ b/unotools/source/config/misccfg.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,8 +42,8 @@ #define DEFAULT_TAB 2000 -#define DEF_INCH 2540L -#define DEF_RELTWIP 1440L +#define DEF_INCH 2540L +#define DEF_RELTWIP 1440L using namespace rtl; using namespace com::sun::star::uno; @@ -58,32 +58,32 @@ static sal_Int32 nRefCount = 0; class SfxMiscCfg : public utl::ConfigItem { - BOOL bPaperSize; // printer warnings - BOOL bPaperOrientation; - BOOL bNotFound; - sal_Int32 nYear2000; // two digit year representation + BOOL bPaperSize; // printer warnings + BOOL bPaperOrientation; + BOOL bNotFound; + sal_Int32 nYear2000; // two digit year representation const com::sun::star::uno::Sequence<rtl::OUString>& GetPropertyNames(); - void Load(); + void Load(); public: SfxMiscCfg( ); ~SfxMiscCfg( ); - 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(); - BOOL IsNotFoundWarning() const {return bNotFound;} - void SetNotFoundWarning( BOOL bSet); + BOOL IsNotFoundWarning() const {return bNotFound;} + void SetNotFoundWarning( BOOL bSet); - BOOL IsPaperSizeWarning() const {return bPaperSize;} - void SetPaperSizeWarning(BOOL bSet); + BOOL IsPaperSizeWarning() const {return bPaperSize;} + void SetPaperSizeWarning(BOOL bSet); - BOOL IsPaperOrientationWarning() const {return bPaperOrientation;} - void SetPaperOrientationWarning( BOOL bSet); + BOOL IsPaperOrientationWarning() const {return bPaperOrientation;} + void SetPaperOrientationWarning( BOOL bSet); // 0 ... 99 - sal_Int32 GetYear2000() const { return nYear2000; } + sal_Int32 GetYear2000() const { return nYear2000; } void SetYear2000( sal_Int32 nSet ); }; @@ -99,7 +99,7 @@ SfxMiscCfg::SfxMiscCfg() : nYear2000( 1930 ) { RTL_LOGFILE_CONTEXT(aLog, "svl SfxMiscCfg::SfxMiscCfg()"); - + Load(); } /* -----------------------------02.03.01 15:31-------------------------------- @@ -159,10 +159,10 @@ const Sequence<OUString>& SfxMiscCfg::GetPropertyNames() { static const char* aPropNames[] = { - "Print/Warning/PaperSize", // 0 - "Print/Warning/PaperOrientation", // 1 - "Print/Warning/NotFound", // 2 - "DateFormat/TwoDigitYear", // 3 + "Print/Warning/PaperSize", // 0 + "Print/Warning/PaperOrientation", // 1 + "Print/Warning/NotFound", // 2 + "DateFormat/TwoDigitYear", // 3 }; const int nCount = 4; aNames.realloc(nCount); @@ -190,7 +190,7 @@ void SfxMiscCfg::Load() { switch(nProp) { - case 0: bPaperSize = *(sal_Bool*)pValues[nProp].getValue(); break; //"Print/Warning/PaperSize", + case 0: bPaperSize = *(sal_Bool*)pValues[nProp].getValue(); break; //"Print/Warning/PaperSize", case 1: bPaperOrientation = *(sal_Bool*)pValues[nProp].getValue(); break; //"Print/Warning/PaperOrientation", case 2: bNotFound = *(sal_Bool*)pValues[nProp].getValue() ; break; //"Print/Warning/NotFound", case 3: pValues[nProp] >>= nYear2000;break; //"DateFormat/TwoDigitYear", @@ -220,7 +220,7 @@ void SfxMiscCfg::Commit() { switch(nProp) { - case 0: pValues[nProp].setValue(&bPaperSize, rType);break; //"Print/Warning/PaperSize", + case 0: pValues[nProp].setValue(&bPaperSize, rType);break; //"Print/Warning/PaperSize", case 1: pValues[nProp].setValue(&bPaperOrientation, rType);break; //"Print/Warning/PaperOrientation", case 2: pValues[nProp].setValue(&bNotFound, rType);break; //"Print/Warning/NotFound", case 3: pValues[nProp] <<= nYear2000;break; //"DateFormat/TwoDigitYear", @@ -266,17 +266,17 @@ MiscCfg::~MiscCfg( ) } } -BOOL MiscCfg::IsNotFoundWarning() const +BOOL MiscCfg::IsNotFoundWarning() const { return pImpl->IsNotFoundWarning(); } -void MiscCfg::SetNotFoundWarning( BOOL bSet) +void MiscCfg::SetNotFoundWarning( BOOL bSet) { pImpl->SetNotFoundWarning( bSet ); } -BOOL MiscCfg::IsPaperSizeWarning() const +BOOL MiscCfg::IsPaperSizeWarning() const { return pImpl->IsPaperSizeWarning(); } @@ -286,12 +286,12 @@ void MiscCfg::SetPaperSizeWarning(BOOL bSet) pImpl->SetPaperSizeWarning( bSet ); } -BOOL MiscCfg::IsPaperOrientationWarning() const +BOOL MiscCfg::IsPaperOrientationWarning() const { return pImpl->IsPaperOrientationWarning(); } -void MiscCfg::SetPaperOrientationWarning( BOOL bSet) +void MiscCfg::SetPaperOrientationWarning( BOOL bSet) { pImpl->SetPaperOrientationWarning( bSet ); } diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx index afce713ccc49..7414a8342d39 100644 --- a/unotools/source/config/moduleoptions.cxx +++ b/unotools/source/config/moduleoptions.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 @@ #endif //_________________________________________________________________________________________________________________ -// includes +// includes //_________________________________________________________________________________________________________________ #include <unotools/moduleoptions.hxx> @@ -55,7 +55,7 @@ #include "itemholder1.hxx" //_________________________________________________________________________________________________________________ -// namespaces +// namespaces //_________________________________________________________________________________________________________________ #ifndef css @@ -63,7 +63,7 @@ namespace css = ::com::sun::star; #endif //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** @@ -373,32 +373,32 @@ typedef FactoryInfo FactoryInfoList[FACTORYCOUNT]; a refcount and make it threadsafe by using an osl mutex. So we don't must do anything for that. We can implement pure functionality to read/write configuration data only. - @implements - + @implements - @base ConfigItem - @devstatus ready to use + @devstatus ready to use @threadsafe no *//*-*************************************************************************************************************/ class SvtModuleOptions_Impl : public ::utl::ConfigItem { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: //--------------------------------------------------------------------------------------------------------- - // constructor / destructor + // constructor / destructor //--------------------------------------------------------------------------------------------------------- SvtModuleOptions_Impl(SvtModuleOptions* pOutsideClass); ~SvtModuleOptions_Impl(); //--------------------------------------------------------------------------------------------------------- - // overloaded methods of baseclass + // overloaded methods of baseclass //--------------------------------------------------------------------------------------------------------- virtual void Notify( const css::uno::Sequence< ::rtl::OUString >& lPropertyNames ); virtual void Commit( ); //--------------------------------------------------------------------------------------------------------- - // public interface + // public interface //--------------------------------------------------------------------------------------------------------- sal_Bool IsModuleInstalled ( SvtModuleOptions::EModule eModule ) const; ::com::sun::star::uno::Sequence < ::rtl::OUString > GetAllServiceNames(); @@ -421,7 +421,7 @@ class SvtModuleOptions_Impl : public ::utl::ConfigItem void MakeReadonlyStatesAvailable(); //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: static css::uno::Sequence< ::rtl::OUString > impl_ExpandSetNames ( const css::uno::Sequence< ::rtl::OUString >& lSetNames ); @@ -433,7 +433,7 @@ class SvtModuleOptions_Impl : public ::utl::ConfigItem private: //------------------------------------------------------------------------------------------------------------- - // private member + // private member //------------------------------------------------------------------------------------------------------------- private: FactoryInfoList m_lFactories; @@ -442,7 +442,7 @@ class SvtModuleOptions_Impl : public ::utl::ConfigItem }; //_________________________________________________________________________________________________________________ -// definitions +// definitions //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** @@ -560,8 +560,8 @@ void SvtModuleOptions_Impl::Commit() sBasePath = PATHSEPERATOR + pInfo->getFactory() + PATHSEPERATOR; const css::uno::Sequence< css::beans::PropertyValue > lChangedProperties = pInfo->getChangedProperties ( sBasePath ); - const css::beans::PropertyValue* pChangedProperties = lChangedProperties.getConstArray(); - sal_Int32 nPropertyCount = lChangedProperties.getLength(); + const css::beans::PropertyValue* pChangedProperties = lChangedProperties.getConstArray(); + sal_Int32 nPropertyCount = lChangedProperties.getLength(); for( sal_Int32 nProperty=0; nProperty<nPropertyCount; ++nProperty ) { lCommitProperties[nRealCount] = pChangedProperties[nProperty]; @@ -881,7 +881,7 @@ css::uno::Sequence< ::rtl::OUString > SvtModuleOptions_Impl::impl_ExpandSetNames { sal_Int32 nCount = lSetNames.getLength() ; css::uno::Sequence< ::rtl::OUString > lPropNames ( nCount*PROPERTYCOUNT ); - ::rtl::OUString* pPropNames = lPropNames.getArray() ; + ::rtl::OUString* pPropNames = lPropNames.getArray() ; sal_Int32 nPropStart = 0 ; for( sal_Int32 nName=0; nName<nCount; ++nName ) @@ -1091,9 +1091,9 @@ void SvtModuleOptions_Impl::MakeReadonlyStatesAvailable() } //***************************************************************************************************************** -// 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 //***************************************************************************************************************** SvtModuleOptions_Impl* SvtModuleOptions::m_pDataContainer = NULL ; sal_Int32 SvtModuleOptions::m_nRefCount = 0 ; @@ -1393,7 +1393,7 @@ sal_uInt32 SvtModuleOptions::GetFeatures() const case SvtModuleOptions::E_MATH : { return ::rtl::OUString::createFromAscii("Math"); } case SvtModuleOptions::E_CHART : { return ::rtl::OUString::createFromAscii("Chart"); } case SvtModuleOptions::E_BASIC : { return ::rtl::OUString::createFromAscii("Basic"); } - case SvtModuleOptions::E_DATABASE : { return ::rtl::OUString::createFromAscii("Database"); } + case SvtModuleOptions::E_DATABASE : { return ::rtl::OUString::createFromAscii("Database"); } default: OSL_ASSERT( "unknown factory" ); break; diff --git a/unotools/source/config/options.cxx b/unotools/source/config/options.cxx index c65fd09efd0c..4adbe616df84 100644 --- a/unotools/source/config/options.cxx +++ b/unotools/source/config/options.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/unotools/source/config/optionsdlg.cxx b/unotools/source/config/optionsdlg.cxx index cb98e8514358..ae2b625ea640 100644 --- a/unotools/source/config/optionsdlg.cxx +++ b/unotools/source/config/optionsdlg.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/unotools/source/config/optionsdrawinglayer.cxx b/unotools/source/config/optionsdrawinglayer.cxx index c15f5a97e435..71e21355d9a3 100644 --- a/unotools/source/config/optionsdrawinglayer.cxx +++ b/unotools/source/config/optionsdrawinglayer.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 @@ #endif //_________________________________________________________________________________________________________________ -// includes +// includes //_________________________________________________________________________________________________________________ #include <unotools/optionsdrawinglayer.hxx> @@ -42,188 +42,188 @@ #include <vcl/outdev.hxx> //_________________________________________________________________________________________________________________ -// namespaces +// namespaces //_________________________________________________________________________________________________________________ -using namespace ::utl ; -using namespace ::rtl ; -using namespace ::osl ; -using namespace ::com::sun::star::uno ; +using namespace ::utl ; +using namespace ::rtl ; +using namespace ::osl ; +using namespace ::com::sun::star::uno ; //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ -#define ROOTNODE_START OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Drawinglayer" )) -#define DEFAULT_OVERLAYBUFFER sal_True -#define DEFAULT_PAINTBUFFER sal_True -#define DEFAULT_STRIPE_COLOR_A 0 -#define DEFAULT_STRIPE_COLOR_B 16581375 -#define DEFAULT_STRIPE_LENGTH 4 +#define ROOTNODE_START OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Drawinglayer" )) +#define DEFAULT_OVERLAYBUFFER sal_True +#define DEFAULT_PAINTBUFFER sal_True +#define DEFAULT_STRIPE_COLOR_A 0 +#define DEFAULT_STRIPE_COLOR_B 16581375 +#define DEFAULT_STRIPE_LENGTH 4 // #i73602# // #i74769#, #i75172# : Change default for Calc and Writer to True -#define DEFAULT_OVERLAYBUFFER_CALC sal_True -#define DEFAULT_OVERLAYBUFFER_WRITER sal_True -#define DEFAULT_OVERLAYBUFFER_DRAWIMPRESS sal_True +#define DEFAULT_OVERLAYBUFFER_CALC sal_True +#define DEFAULT_OVERLAYBUFFER_WRITER sal_True +#define DEFAULT_OVERLAYBUFFER_DRAWIMPRESS sal_True // #i74769#, #i75172# -#define DEFAULT_PAINTBUFFER_CALC sal_True -#define DEFAULT_PAINTBUFFER_WRITER sal_True -#define DEFAULT_PAINTBUFFER_DRAWIMPRESS sal_True +#define DEFAULT_PAINTBUFFER_CALC sal_True +#define DEFAULT_PAINTBUFFER_WRITER sal_True +#define DEFAULT_PAINTBUFFER_DRAWIMPRESS sal_True // #i4219# -#define DEFAULT_MAXIMUMPAPERWIDTH 300 -#define DEFAULT_MAXIMUMPAPERHEIGHT 300 -#define DEFAULT_MAXIMUMPAPERLEFTMARGIN 9999 -#define DEFAULT_MAXIMUMPAPERRIGHTMARGIN 9999 -#define DEFAULT_MAXIMUMPAPERTOPMARGIN 9999 -#define DEFAULT_MAXIMUMPAPERBOTTOMMARGIN 9999 +#define DEFAULT_MAXIMUMPAPERWIDTH 300 +#define DEFAULT_MAXIMUMPAPERHEIGHT 300 +#define DEFAULT_MAXIMUMPAPERLEFTMARGIN 9999 +#define DEFAULT_MAXIMUMPAPERRIGHTMARGIN 9999 +#define DEFAULT_MAXIMUMPAPERTOPMARGIN 9999 +#define DEFAULT_MAXIMUMPAPERBOTTOMMARGIN 9999 // primitives -#define DEFAULT_ANTIALIASING sal_True -#define DEFAULT_SNAPHORVERLINESTODISCRETE sal_True -#define DEFAULT_SOLIDDRAGCREATE sal_True -#define DEFAULT_RENDERDECORATEDTEXTDIRECT sal_True -#define DEFAULT_RENDERSIMPLETEXTDIRECT sal_True -#define DEFAULT_QUADRATIC3DRENDERLIMIT 1000000 -#define DEFAULT_QUADRATICFORMCONTROLRENDERLIMIT 45000 +#define DEFAULT_ANTIALIASING sal_True +#define DEFAULT_SNAPHORVERLINESTODISCRETE sal_True +#define DEFAULT_SOLIDDRAGCREATE sal_True +#define DEFAULT_RENDERDECORATEDTEXTDIRECT sal_True +#define DEFAULT_RENDERSIMPLETEXTDIRECT sal_True +#define DEFAULT_QUADRATIC3DRENDERLIMIT 1000000 +#define DEFAULT_QUADRATICFORMCONTROLRENDERLIMIT 45000 // #i97672# selection settings -#define DEFAULT_TRANSPARENTSELECTION sal_True -#define DEFAULT_TRANSPARENTSELECTIONPERCENT 75 +#define DEFAULT_TRANSPARENTSELECTION sal_True +#define DEFAULT_TRANSPARENTSELECTIONPERCENT 75 #define DEFAULT_SELECTIONMAXIMUMLUMINANCEPERCENT 70 -#define PROPERTYNAME_OVERLAYBUFFER OUString(RTL_CONSTASCII_USTRINGPARAM("OverlayBuffer" )) -#define PROPERTYNAME_PAINTBUFFER OUString(RTL_CONSTASCII_USTRINGPARAM("PaintBuffer" )) -#define PROPERTYNAME_STRIPE_COLOR_A OUString(RTL_CONSTASCII_USTRINGPARAM("StripeColorA" )) -#define PROPERTYNAME_STRIPE_COLOR_B OUString(RTL_CONSTASCII_USTRINGPARAM("StripeColorB" )) -#define PROPERTYNAME_STRIPE_LENGTH OUString(RTL_CONSTASCII_USTRINGPARAM("StripeLength" )) +#define PROPERTYNAME_OVERLAYBUFFER OUString(RTL_CONSTASCII_USTRINGPARAM("OverlayBuffer" )) +#define PROPERTYNAME_PAINTBUFFER OUString(RTL_CONSTASCII_USTRINGPARAM("PaintBuffer" )) +#define PROPERTYNAME_STRIPE_COLOR_A OUString(RTL_CONSTASCII_USTRINGPARAM("StripeColorA" )) +#define PROPERTYNAME_STRIPE_COLOR_B OUString(RTL_CONSTASCII_USTRINGPARAM("StripeColorB" )) +#define PROPERTYNAME_STRIPE_LENGTH OUString(RTL_CONSTASCII_USTRINGPARAM("StripeLength" )) // #i73602# -#define PROPERTYNAME_OVERLAYBUFFER_CALC OUString(RTL_CONSTASCII_USTRINGPARAM("OverlayBuffer_Calc")) -#define PROPERTYNAME_OVERLAYBUFFER_WRITER OUString(RTL_CONSTASCII_USTRINGPARAM("OverlayBuffer_Writer")) -#define PROPERTYNAME_OVERLAYBUFFER_DRAWIMPRESS OUString(RTL_CONSTASCII_USTRINGPARAM("OverlayBuffer_DrawImpress")) +#define PROPERTYNAME_OVERLAYBUFFER_CALC OUString(RTL_CONSTASCII_USTRINGPARAM("OverlayBuffer_Calc")) +#define PROPERTYNAME_OVERLAYBUFFER_WRITER OUString(RTL_CONSTASCII_USTRINGPARAM("OverlayBuffer_Writer")) +#define PROPERTYNAME_OVERLAYBUFFER_DRAWIMPRESS OUString(RTL_CONSTASCII_USTRINGPARAM("OverlayBuffer_DrawImpress")) // #i74769#, #i75172# -#define PROPERTYNAME_PAINTBUFFER_CALC OUString(RTL_CONSTASCII_USTRINGPARAM("PaintBuffer_Calc")) -#define PROPERTYNAME_PAINTBUFFER_WRITER OUString(RTL_CONSTASCII_USTRINGPARAM("PaintBuffer_Writer")) -#define PROPERTYNAME_PAINTBUFFER_DRAWIMPRESS OUString(RTL_CONSTASCII_USTRINGPARAM("PaintBuffer_DrawImpress")) +#define PROPERTYNAME_PAINTBUFFER_CALC OUString(RTL_CONSTASCII_USTRINGPARAM("PaintBuffer_Calc")) +#define PROPERTYNAME_PAINTBUFFER_WRITER OUString(RTL_CONSTASCII_USTRINGPARAM("PaintBuffer_Writer")) +#define PROPERTYNAME_PAINTBUFFER_DRAWIMPRESS OUString(RTL_CONSTASCII_USTRINGPARAM("PaintBuffer_DrawImpress")) // #i4219# -#define PROPERTYNAME_MAXIMUMPAPERWIDTH OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperWidth")) -#define PROPERTYNAME_MAXIMUMPAPERHEIGHT OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperHeight")) -#define PROPERTYNAME_MAXIMUMPAPERLEFTMARGIN OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperLeftMargin")) -#define PROPERTYNAME_MAXIMUMPAPERRIGHTMARGIN OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperRightMargin")) -#define PROPERTYNAME_MAXIMUMPAPERTOPMARGIN OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperTopMargin")) -#define PROPERTYNAME_MAXIMUMPAPERBOTTOMMARGIN OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperBottomMargin")) +#define PROPERTYNAME_MAXIMUMPAPERWIDTH OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperWidth")) +#define PROPERTYNAME_MAXIMUMPAPERHEIGHT OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperHeight")) +#define PROPERTYNAME_MAXIMUMPAPERLEFTMARGIN OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperLeftMargin")) +#define PROPERTYNAME_MAXIMUMPAPERRIGHTMARGIN OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperRightMargin")) +#define PROPERTYNAME_MAXIMUMPAPERTOPMARGIN OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperTopMargin")) +#define PROPERTYNAME_MAXIMUMPAPERBOTTOMMARGIN OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperBottomMargin")) // primitives -#define PROPERTYNAME_ANTIALIASING OUString(RTL_CONSTASCII_USTRINGPARAM("AntiAliasing")) -#define PROPERTYNAME_SNAPHORVERLINESTODISCRETE OUString(RTL_CONSTASCII_USTRINGPARAM("SnapHorVerLinesToDiscrete")) -#define PROPERTYNAME_SOLIDDRAGCREATE OUString(RTL_CONSTASCII_USTRINGPARAM("SolidDragCreate")) -#define PROPERTYNAME_RENDERDECORATEDTEXTDIRECT OUString(RTL_CONSTASCII_USTRINGPARAM("RenderDecoratedTextDirect")) -#define PROPERTYNAME_RENDERSIMPLETEXTDIRECT OUString(RTL_CONSTASCII_USTRINGPARAM("RenderSimpleTextDirect")) -#define PROPERTYNAME_QUADRATIC3DRENDERLIMIT OUString(RTL_CONSTASCII_USTRINGPARAM("Quadratic3DRenderLimit")) -#define PROPERTYNAME_QUADRATICFORMCONTROLRENDERLIMIT OUString(RTL_CONSTASCII_USTRINGPARAM("QuadraticFormControlRenderLimit")) +#define PROPERTYNAME_ANTIALIASING OUString(RTL_CONSTASCII_USTRINGPARAM("AntiAliasing")) +#define PROPERTYNAME_SNAPHORVERLINESTODISCRETE OUString(RTL_CONSTASCII_USTRINGPARAM("SnapHorVerLinesToDiscrete")) +#define PROPERTYNAME_SOLIDDRAGCREATE OUString(RTL_CONSTASCII_USTRINGPARAM("SolidDragCreate")) +#define PROPERTYNAME_RENDERDECORATEDTEXTDIRECT OUString(RTL_CONSTASCII_USTRINGPARAM("RenderDecoratedTextDirect")) +#define PROPERTYNAME_RENDERSIMPLETEXTDIRECT OUString(RTL_CONSTASCII_USTRINGPARAM("RenderSimpleTextDirect")) +#define PROPERTYNAME_QUADRATIC3DRENDERLIMIT OUString(RTL_CONSTASCII_USTRINGPARAM("Quadratic3DRenderLimit")) +#define PROPERTYNAME_QUADRATICFORMCONTROLRENDERLIMIT OUString(RTL_CONSTASCII_USTRINGPARAM("QuadraticFormControlRenderLimit")) // #i97672# selection settings -#define PROPERTYNAME_TRANSPARENTSELECTION OUString(RTL_CONSTASCII_USTRINGPARAM("TransparentSelection")) -#define PROPERTYNAME_TRANSPARENTSELECTIONPERCENT OUString(RTL_CONSTASCII_USTRINGPARAM("TransparentSelectionPercent")) -#define PROPERTYNAME_SELECTIONMAXIMUMLUMINANCEPERCENT OUString(RTL_CONSTASCII_USTRINGPARAM("SelectionMaximumLuminancePercent")) +#define PROPERTYNAME_TRANSPARENTSELECTION OUString(RTL_CONSTASCII_USTRINGPARAM("TransparentSelection")) +#define PROPERTYNAME_TRANSPARENTSELECTIONPERCENT OUString(RTL_CONSTASCII_USTRINGPARAM("TransparentSelectionPercent")) +#define PROPERTYNAME_SELECTIONMAXIMUMLUMINANCEPERCENT OUString(RTL_CONSTASCII_USTRINGPARAM("SelectionMaximumLuminancePercent")) -#define PROPERTYHANDLE_OVERLAYBUFFER 0 -#define PROPERTYHANDLE_PAINTBUFFER 1 -#define PROPERTYHANDLE_STRIPE_COLOR_A 2 -#define PROPERTYHANDLE_STRIPE_COLOR_B 3 -#define PROPERTYHANDLE_STRIPE_LENGTH 4 +#define PROPERTYHANDLE_OVERLAYBUFFER 0 +#define PROPERTYHANDLE_PAINTBUFFER 1 +#define PROPERTYHANDLE_STRIPE_COLOR_A 2 +#define PROPERTYHANDLE_STRIPE_COLOR_B 3 +#define PROPERTYHANDLE_STRIPE_LENGTH 4 // #i73602# -#define PROPERTYHANDLE_OVERLAYBUFFER_CALC 5 -#define PROPERTYHANDLE_OVERLAYBUFFER_WRITER 6 -#define PROPERTYHANDLE_OVERLAYBUFFER_DRAWIMPRESS 7 +#define PROPERTYHANDLE_OVERLAYBUFFER_CALC 5 +#define PROPERTYHANDLE_OVERLAYBUFFER_WRITER 6 +#define PROPERTYHANDLE_OVERLAYBUFFER_DRAWIMPRESS 7 // #i74769#, #i75172# -#define PROPERTYHANDLE_PAINTBUFFER_CALC 8 -#define PROPERTYHANDLE_PAINTBUFFER_WRITER 9 -#define PROPERTYHANDLE_PAINTBUFFER_DRAWIMPRESS 10 +#define PROPERTYHANDLE_PAINTBUFFER_CALC 8 +#define PROPERTYHANDLE_PAINTBUFFER_WRITER 9 +#define PROPERTYHANDLE_PAINTBUFFER_DRAWIMPRESS 10 // #i4219# -#define PROPERTYHANDLE_MAXIMUMPAPERWIDTH 11 -#define PROPERTYHANDLE_MAXIMUMPAPERHEIGHT 12 -#define PROPERTYHANDLE_MAXIMUMPAPERLEFTMARGIN 13 -#define PROPERTYHANDLE_MAXIMUMPAPERRIGHTMARGIN 14 -#define PROPERTYHANDLE_MAXIMUMPAPERTOPMARGIN 15 -#define PROPERTYHANDLE_MAXIMUMPAPERBOTTOMMARGIN 16 +#define PROPERTYHANDLE_MAXIMUMPAPERWIDTH 11 +#define PROPERTYHANDLE_MAXIMUMPAPERHEIGHT 12 +#define PROPERTYHANDLE_MAXIMUMPAPERLEFTMARGIN 13 +#define PROPERTYHANDLE_MAXIMUMPAPERRIGHTMARGIN 14 +#define PROPERTYHANDLE_MAXIMUMPAPERTOPMARGIN 15 +#define PROPERTYHANDLE_MAXIMUMPAPERBOTTOMMARGIN 16 // primitives -#define PROPERTYHANDLE_ANTIALIASING 17 -#define PROPERTYHANDLE_SNAPHORVERLINESTODISCRETE 18 -#define PROPERTYHANDLE_SOLIDDRAGCREATE 19 -#define PROPERTYHANDLE_RENDERDECORATEDTEXTDIRECT 20 -#define PROPERTYHANDLE_RENDERSIMPLETEXTDIRECT 21 -#define PROPERTYHANDLE_QUADRATIC3DRENDERLIMIT 22 -#define PROPERTYHANDLE_QUADRATICFORMCONTROLRENDERLIMIT 23 +#define PROPERTYHANDLE_ANTIALIASING 17 +#define PROPERTYHANDLE_SNAPHORVERLINESTODISCRETE 18 +#define PROPERTYHANDLE_SOLIDDRAGCREATE 19 +#define PROPERTYHANDLE_RENDERDECORATEDTEXTDIRECT 20 +#define PROPERTYHANDLE_RENDERSIMPLETEXTDIRECT 21 +#define PROPERTYHANDLE_QUADRATIC3DRENDERLIMIT 22 +#define PROPERTYHANDLE_QUADRATICFORMCONTROLRENDERLIMIT 23 // #i97672# selection settings -#define PROPERTYHANDLE_TRANSPARENTSELECTION 24 -#define PROPERTYHANDLE_TRANSPARENTSELECTIONPERCENT 25 -#define PROPERTYHANDLE_SELECTIONMAXIMUMLUMINANCEPERCENT 26 +#define PROPERTYHANDLE_TRANSPARENTSELECTION 24 +#define PROPERTYHANDLE_TRANSPARENTSELECTIONPERCENT 25 +#define PROPERTYHANDLE_SELECTIONMAXIMUMLUMINANCEPERCENT 26 -#define PROPERTYCOUNT 27 +#define PROPERTYCOUNT 27 class SvtOptionsDrawinglayer_Impl : public ConfigItem { public: //--------------------------------------------------------------------------------------------------------- -// constructor / destructor +// constructor / destructor //--------------------------------------------------------------------------------------------------------- SvtOptionsDrawinglayer_Impl(); ~SvtOptionsDrawinglayer_Impl(); //--------------------------------------------------------------------------------------------------------- -// overloaded methods of baseclass +// overloaded methods of baseclass //--------------------------------------------------------------------------------------------------------- virtual void Commit(); //--------------------------------------------------------------------------------------------------------- -// public interface +// public interface //--------------------------------------------------------------------------------------------------------- - sal_Bool IsOverlayBuffer() const; - sal_Bool IsPaintBuffer() const; - Color GetStripeColorA() const; - Color GetStripeColorB() const; - sal_uInt16 GetStripeLength() const; + sal_Bool IsOverlayBuffer() const; + sal_Bool IsPaintBuffer() const; + Color GetStripeColorA() const; + Color GetStripeColorB() const; + sal_uInt16 GetStripeLength() const; // #i73602# - sal_Bool IsOverlayBuffer_Calc() const; - sal_Bool IsOverlayBuffer_Writer() const; - sal_Bool IsOverlayBuffer_DrawImpress() const; + sal_Bool IsOverlayBuffer_Calc() const; + sal_Bool IsOverlayBuffer_Writer() const; + sal_Bool IsOverlayBuffer_DrawImpress() const; // #i74769#, #i75172# - sal_Bool IsPaintBuffer_Calc() const; - sal_Bool IsPaintBuffer_Writer() const; - sal_Bool IsPaintBuffer_DrawImpress() const; + sal_Bool IsPaintBuffer_Calc() const; + sal_Bool IsPaintBuffer_Writer() const; + sal_Bool IsPaintBuffer_DrawImpress() const; - void SetOverlayBuffer( sal_Bool bState ); - void SetPaintBuffer( sal_Bool bState ); - void SetStripeColorA( Color aColor ); - void SetStripeColorB( Color aColor ); - void SetStripeLength( sal_uInt16 nLength ); + void SetOverlayBuffer( sal_Bool bState ); + void SetPaintBuffer( sal_Bool bState ); + void SetStripeColorA( Color aColor ); + void SetStripeColorB( Color aColor ); + void SetStripeLength( sal_uInt16 nLength ); // #i73602# - void SetOverlayBuffer_Calc( sal_Bool bState ); - void SetOverlayBuffer_Writer( sal_Bool bState ); - void SetOverlayBuffer_DrawImpress( sal_Bool bState ); + void SetOverlayBuffer_Calc( sal_Bool bState ); + void SetOverlayBuffer_Writer( sal_Bool bState ); + void SetOverlayBuffer_DrawImpress( sal_Bool bState ); // #i74769#, #i75172# - void SetPaintBuffer_Calc( sal_Bool bState ); - void SetPaintBuffer_Writer( sal_Bool bState ); - void SetPaintBuffer_DrawImpress( sal_Bool bState ); + void SetPaintBuffer_Calc( sal_Bool bState ); + void SetPaintBuffer_Writer( sal_Bool bState ); + void SetPaintBuffer_DrawImpress( sal_Bool bState ); // #i4219# sal_uInt32 GetMaximumPaperWidth() const; @@ -244,33 +244,33 @@ public: sal_Bool IsAAPossibleOnThisSystem() const; // primitives - sal_Bool IsAntiAliasing() const; - sal_Bool IsSnapHorVerLinesToDiscrete() const; - sal_Bool IsSolidDragCreate() const; - sal_Bool IsRenderDecoratedTextDirect() const; - sal_Bool IsRenderSimpleTextDirect() const; + sal_Bool IsAntiAliasing() const; + sal_Bool IsSnapHorVerLinesToDiscrete() const; + sal_Bool IsSolidDragCreate() const; + sal_Bool IsRenderDecoratedTextDirect() const; + sal_Bool IsRenderSimpleTextDirect() const; sal_uInt32 GetQuadratic3DRenderLimit() const; sal_uInt32 GetQuadraticFormControlRenderLimit() const; - void SetAntiAliasing( sal_Bool bState ); - void SetSnapHorVerLinesToDiscrete( sal_Bool bState ); - void SetSolidDragCreate( sal_Bool bState ); - void SetRenderDecoratedTextDirect( sal_Bool bState ); - void SetRenderSimpleTextDirect( sal_Bool bState ); + void SetAntiAliasing( sal_Bool bState ); + void SetSnapHorVerLinesToDiscrete( sal_Bool bState ); + void SetSolidDragCreate( sal_Bool bState ); + void SetRenderDecoratedTextDirect( sal_Bool bState ); + void SetRenderSimpleTextDirect( sal_Bool bState ); void SetQuadratic3DRenderLimit(sal_uInt32 nNew); void SetQuadraticFormControlRenderLimit(sal_uInt32 nNew); // #i97672# selection settings - sal_Bool IsTransparentSelection() const; - sal_uInt16 GetTransparentSelectionPercent() const; - sal_uInt16 GetSelectionMaximumLuminancePercent() const; + sal_Bool IsTransparentSelection() const; + sal_uInt16 GetTransparentSelectionPercent() const; + sal_uInt16 GetSelectionMaximumLuminancePercent() const; - void SetTransparentSelection( sal_Bool bState ); - void SetTransparentSelectionPercent( sal_uInt16 nPercent ); - void SetSelectionMaximumLuminancePercent( sal_uInt16 nPercent ); + void SetTransparentSelection( sal_Bool bState ); + void SetTransparentSelectionPercent( sal_uInt16 nPercent ); + void SetSelectionMaximumLuminancePercent( sal_uInt16 nPercent ); //------------------------------------------------------------------------------------------------------------- -// private methods +// private methods //------------------------------------------------------------------------------------------------------------- private: @@ -278,48 +278,48 @@ private: static Sequence< OUString > impl_GetPropertyNames(); //------------------------------------------------------------------------------------------------------------- -// private member +// private member //------------------------------------------------------------------------------------------------------------- private: - sal_Bool m_bOverlayBuffer; - sal_Bool m_bPaintBuffer; - Color m_bStripeColorA; - Color m_bStripeColorB; - sal_uInt16 m_nStripeLength; + sal_Bool m_bOverlayBuffer; + sal_Bool m_bPaintBuffer; + Color m_bStripeColorA; + Color m_bStripeColorB; + sal_uInt16 m_nStripeLength; // #i73602# - sal_Bool m_bOverlayBuffer_Calc; - sal_Bool m_bOverlayBuffer_Writer; - sal_Bool m_bOverlayBuffer_DrawImpress; + sal_Bool m_bOverlayBuffer_Calc; + sal_Bool m_bOverlayBuffer_Writer; + sal_Bool m_bOverlayBuffer_DrawImpress; // #i74769#, #i75172# - sal_Bool m_bPaintBuffer_Calc; - sal_Bool m_bPaintBuffer_Writer; - sal_Bool m_bPaintBuffer_DrawImpress; + sal_Bool m_bPaintBuffer_Calc; + sal_Bool m_bPaintBuffer_Writer; + sal_Bool m_bPaintBuffer_DrawImpress; // #i4219# - sal_uInt32 m_nMaximumPaperWidth; - sal_uInt32 m_nMaximumPaperHeight; - sal_uInt32 m_nMaximumPaperLeftMargin; - sal_uInt32 m_nMaximumPaperRightMargin; - sal_uInt32 m_nMaximumPaperTopMargin; - sal_uInt32 m_nMaximumPaperBottomMargin; + sal_uInt32 m_nMaximumPaperWidth; + sal_uInt32 m_nMaximumPaperHeight; + sal_uInt32 m_nMaximumPaperLeftMargin; + sal_uInt32 m_nMaximumPaperRightMargin; + sal_uInt32 m_nMaximumPaperTopMargin; + sal_uInt32 m_nMaximumPaperBottomMargin; // primitives - sal_Bool m_bAntiAliasing; - sal_Bool m_bSnapHorVerLinesToDiscrete; - sal_Bool m_bSolidDragCreate; - sal_Bool m_bRenderDecoratedTextDirect; - sal_Bool m_bRenderSimpleTextDirect; - sal_uInt32 m_nQuadratic3DRenderLimit; - sal_uInt32 m_nQuadraticFormControlRenderLimit; + sal_Bool m_bAntiAliasing; + sal_Bool m_bSnapHorVerLinesToDiscrete; + sal_Bool m_bSolidDragCreate; + sal_Bool m_bRenderDecoratedTextDirect; + sal_Bool m_bRenderSimpleTextDirect; + sal_uInt32 m_nQuadratic3DRenderLimit; + sal_uInt32 m_nQuadraticFormControlRenderLimit; // #i97672# selection settings - sal_uInt16 m_nTransparentSelectionPercent; - sal_uInt16 m_nSelectionMaximumLuminancePercent; - sal_Bool m_bTransparentSelection; + sal_uInt16 m_nTransparentSelectionPercent; + sal_uInt16 m_nSelectionMaximumLuminancePercent; + sal_Bool m_bTransparentSelection; // local values bool m_bAllowAA : 1; @@ -327,14 +327,14 @@ private: }; //_________________________________________________________________________________________________________________ -// definitions +// definitions //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl() : - ConfigItem( ROOTNODE_START ), + ConfigItem( ROOTNODE_START ), m_bOverlayBuffer( DEFAULT_OVERLAYBUFFER ), m_bPaintBuffer( DEFAULT_PAINTBUFFER ), m_bStripeColorA(Color(DEFAULT_STRIPE_COLOR_A)), @@ -377,14 +377,14 @@ SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl() : m_bAllowAA(true), m_bAllowAAChecked(false) { - Sequence< OUString > seqNames( impl_GetPropertyNames() ); - Sequence< Any > seqValues = GetProperties( seqNames ) ; + Sequence< OUString > seqNames( impl_GetPropertyNames() ); + Sequence< Any > seqValues = GetProperties( seqNames ) ; DBG_ASSERT( !(seqNames.getLength()!=seqValues.getLength()), "SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl()\nI miss some values of configuration keys!\n" ); // Copy values from list in right order to ouer internal member. sal_Int32 nPropertyCount = seqValues.getLength(); - sal_Int32 nProperty = 0; + sal_Int32 nProperty = 0; for( nProperty=0; nProperty<nPropertyCount; ++nProperty ) { @@ -594,7 +594,7 @@ SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl() : } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** SvtOptionsDrawinglayer_Impl::~SvtOptionsDrawinglayer_Impl() { @@ -603,12 +603,12 @@ SvtOptionsDrawinglayer_Impl::~SvtOptionsDrawinglayer_Impl() } //***************************************************************************************************************** -// Commit +// Commit //***************************************************************************************************************** void SvtOptionsDrawinglayer_Impl::Commit() { - Sequence< OUString > aSeqNames( impl_GetPropertyNames() ); - Sequence< Any > aSeqValues( aSeqNames.getLength() ); + Sequence< OUString > aSeqNames( impl_GetPropertyNames() ); + Sequence< Any > aSeqValues( aSeqNames.getLength() ); for( sal_Int32 nProperty = 0, nCount = aSeqNames.getLength(); nProperty < nCount; ++nProperty ) { @@ -733,7 +733,7 @@ void SvtOptionsDrawinglayer_Impl::Commit() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Bool SvtOptionsDrawinglayer_Impl::IsOverlayBuffer() const { @@ -741,7 +741,7 @@ sal_Bool SvtOptionsDrawinglayer_Impl::IsOverlayBuffer() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Bool SvtOptionsDrawinglayer_Impl::IsPaintBuffer() const { @@ -749,7 +749,7 @@ sal_Bool SvtOptionsDrawinglayer_Impl::IsPaintBuffer() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** Color SvtOptionsDrawinglayer_Impl::GetStripeColorA() const { @@ -757,7 +757,7 @@ Color SvtOptionsDrawinglayer_Impl::GetStripeColorA() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** Color SvtOptionsDrawinglayer_Impl::GetStripeColorB() const { @@ -765,7 +765,7 @@ Color SvtOptionsDrawinglayer_Impl::GetStripeColorB() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_uInt16 SvtOptionsDrawinglayer_Impl::GetStripeLength() const { @@ -836,7 +836,7 @@ sal_uInt32 SvtOptionsDrawinglayer_Impl::GetMaximumPaperBottomMargin() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtOptionsDrawinglayer_Impl::SetOverlayBuffer( sal_Bool bState ) { @@ -848,7 +848,7 @@ void SvtOptionsDrawinglayer_Impl::SetOverlayBuffer( sal_Bool bState ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtOptionsDrawinglayer_Impl::SetPaintBuffer( sal_Bool bState ) { @@ -860,7 +860,7 @@ void SvtOptionsDrawinglayer_Impl::SetPaintBuffer( sal_Bool bState ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtOptionsDrawinglayer_Impl::SetStripeColorA( Color aColor ) { @@ -872,7 +872,7 @@ void SvtOptionsDrawinglayer_Impl::SetStripeColorA( Color aColor ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtOptionsDrawinglayer_Impl::SetStripeColorB( Color aColor ) { @@ -884,7 +884,7 @@ void SvtOptionsDrawinglayer_Impl::SetStripeColorB( Color aColor ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtOptionsDrawinglayer_Impl::SetStripeLength( sal_uInt16 nLength ) { @@ -1174,18 +1174,18 @@ sal_uInt16 SvtOptionsDrawinglayer_Impl::GetSelectionMaximumLuminancePercent() co } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** Sequence< OUString > SvtOptionsDrawinglayer_Impl::impl_GetPropertyNames() { // Build static list of configuration key names. static const OUString pProperties[] = { - PROPERTYNAME_OVERLAYBUFFER , - PROPERTYNAME_PAINTBUFFER , - PROPERTYNAME_STRIPE_COLOR_A , - PROPERTYNAME_STRIPE_COLOR_B , - PROPERTYNAME_STRIPE_LENGTH , + PROPERTYNAME_OVERLAYBUFFER , + PROPERTYNAME_PAINTBUFFER , + PROPERTYNAME_STRIPE_COLOR_A , + PROPERTYNAME_STRIPE_COLOR_B , + PROPERTYNAME_STRIPE_LENGTH , // #i73602# PROPERTYNAME_OVERLAYBUFFER_CALC, @@ -1227,15 +1227,15 @@ Sequence< OUString > SvtOptionsDrawinglayer_Impl::impl_GetPropertyNames() } //***************************************************************************************************************** -// 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 //***************************************************************************************************************** SvtOptionsDrawinglayer_Impl* SvtOptionsDrawinglayer::m_pDataContainer = NULL; sal_Int32 SvtOptionsDrawinglayer::m_nRefCount = 0; //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** SvtOptionsDrawinglayer::SvtOptionsDrawinglayer() { @@ -1251,7 +1251,7 @@ SvtOptionsDrawinglayer::SvtOptionsDrawinglayer() } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** SvtOptionsDrawinglayer::~SvtOptionsDrawinglayer() { @@ -1269,7 +1269,7 @@ SvtOptionsDrawinglayer::~SvtOptionsDrawinglayer() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Bool SvtOptionsDrawinglayer::IsOverlayBuffer() const { @@ -1278,7 +1278,7 @@ sal_Bool SvtOptionsDrawinglayer::IsOverlayBuffer() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Bool SvtOptionsDrawinglayer::IsPaintBuffer() const { @@ -1287,7 +1287,7 @@ sal_Bool SvtOptionsDrawinglayer::IsPaintBuffer() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** Color SvtOptionsDrawinglayer::GetStripeColorA() const { @@ -1296,7 +1296,7 @@ Color SvtOptionsDrawinglayer::GetStripeColorA() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** Color SvtOptionsDrawinglayer::GetStripeColorB() const { @@ -1305,7 +1305,7 @@ Color SvtOptionsDrawinglayer::GetStripeColorB() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_uInt16 SvtOptionsDrawinglayer::GetStripeLength() const { @@ -1389,7 +1389,7 @@ sal_uInt32 SvtOptionsDrawinglayer::GetMaximumPaperBottomMargin() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtOptionsDrawinglayer::SetOverlayBuffer( sal_Bool bState ) { @@ -1398,7 +1398,7 @@ void SvtOptionsDrawinglayer::SetOverlayBuffer( sal_Bool bState ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtOptionsDrawinglayer::SetPaintBuffer( sal_Bool bState ) { @@ -1407,7 +1407,7 @@ void SvtOptionsDrawinglayer::SetPaintBuffer( sal_Bool bState ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtOptionsDrawinglayer::SetStripeColorA( Color aColor ) { @@ -1416,7 +1416,7 @@ void SvtOptionsDrawinglayer::SetStripeColorA( Color aColor ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtOptionsDrawinglayer::SetStripeColorB( Color aColor ) { @@ -1425,7 +1425,7 @@ void SvtOptionsDrawinglayer::SetStripeColorB( Color aColor ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtOptionsDrawinglayer::SetStripeLength( sal_uInt16 nLength ) { @@ -1677,7 +1677,7 @@ void SvtOptionsDrawinglayer::SetSelectionMaximumLuminancePercent( sal_uInt16 nPe } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** Mutex& SvtOptionsDrawinglayer::GetOwnStaticMutex() { diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx index 2ae6f0c97f0c..b02f912a9cf9 100644 --- a/unotools/source/config/pathoptions.cxx +++ b/unotools/source/config/pathoptions.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 @@ -69,30 +69,30 @@ using namespace com::sun::star::lang; // define ---------------------------------------------------------------- -#define SEARCHPATH_DELIMITER ';' +#define SEARCHPATH_DELIMITER ';' -#define ASCII_STR(s) OUString( RTL_CONSTASCII_USTRINGPARAM(s) ) +#define ASCII_STR(s) OUString( RTL_CONSTASCII_USTRINGPARAM(s) ) -#define SIGN_STARTVARIABLE ASCII_STR("$(") -#define SIGN_ENDVARIABLE ASCII_STR(")") +#define SIGN_STARTVARIABLE ASCII_STR("$(") +#define SIGN_ENDVARIABLE ASCII_STR(")") // Supported variables by the old SvtPathOptions implementation -#define SUBSTITUTE_INST "$(inst)" -#define SUBSTITUTE_PROG "$(prog)" -#define SUBSTITUTE_USER "$(user)" +#define SUBSTITUTE_INST "$(inst)" +#define SUBSTITUTE_PROG "$(prog)" +#define SUBSTITUTE_USER "$(user)" #define SUBSTITUTE_INSTPATH "$(instpath)" #define SUBSTITUTE_PROGPATH "$(progpath)" #define SUBSTITUTE_USERPATH "$(userpath)" -#define SUBSTITUTE_INSTURL "$(insturl)" -#define SUBSTITUTE_PROGURL "$(progurl)" -#define SUBSTITUTE_USERURL "$(userurl)" -#define SUBSTITUTE_PATH "$(path)" -//#define SUBSTITUTE_LANG "$(lang)" -#define SUBSTITUTE_LANGID "$(langid)" -#define SUBSTITUTE_VLANG "$(vlang)" -#define SUBSTITUTE_WORKDIRURL "$(workdirurl)" +#define SUBSTITUTE_INSTURL "$(insturl)" +#define SUBSTITUTE_PROGURL "$(progurl)" +#define SUBSTITUTE_USERURL "$(userurl)" +#define SUBSTITUTE_PATH "$(path)" +//#define SUBSTITUTE_LANG "$(lang)" +#define SUBSTITUTE_LANGID "$(langid)" +#define SUBSTITUTE_VLANG "$(vlang)" +#define SUBSTITUTE_WORKDIRURL "$(workdirurl)" -#define STRPOS_NOTFOUND -1 +#define STRPOS_NOTFOUND -1 struct OUStringHashCode { @@ -108,7 +108,7 @@ enum VarNameProperty VAR_NEEDS_FILEURL }; -class NameToHandleMap : public ::std::hash_map< ::rtl::OUString, sal_Int32, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > +class NameToHandleMap : public ::std::hash_map< ::rtl::OUString, sal_Int32, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > { public: inline void free() { NameToHandleMap().swap( *this ); } @@ -132,14 +132,14 @@ class SvtPathOptions_Impl { private: // Local variables to return const references - std::vector< String > m_aPathArray; - Reference< XFastPropertySet > m_xPathSettings; - Reference< XStringSubstitution > m_xSubstVariables; + std::vector< String > m_aPathArray; + Reference< XFastPropertySet > m_xPathSettings; + Reference< XStringSubstitution > m_xSubstVariables; mutable EnumToHandleMap m_aMapEnumToPropHandle; - VarNameToEnumMap m_aMapVarNamesToEnum; + VarNameToEnumMap m_aMapVarNamesToEnum; - ::com::sun::star::lang::Locale m_aLocale; - String m_aEmptyString; + ::com::sun::star::lang::Locale m_aLocale; + String m_aEmptyString; mutable ::osl::Mutex m_aMutex; public: @@ -148,60 +148,60 @@ class SvtPathOptions_Impl // get the pathes, not const because of using a mutex const String& GetPath( SvtPathOptions::Pathes ); const String& GetAddinPath() { return GetPath( SvtPathOptions::PATH_ADDIN ); } - const String& GetAutoCorrectPath() { return GetPath( SvtPathOptions::PATH_AUTOCORRECT ); } - const String& GetAutoTextPath() { return GetPath( SvtPathOptions::PATH_AUTOTEXT ); } - const String& GetBackupPath() { return GetPath( SvtPathOptions::PATH_BACKUP ); } - const String& GetBasicPath() { return GetPath( SvtPathOptions::PATH_BASIC ); } - const String& GetBitmapPath() { return GetPath( SvtPathOptions::PATH_BITMAP ); } - const String& GetConfigPath() { return GetPath( SvtPathOptions::PATH_CONFIG ); } - const String& GetDictionaryPath() { return GetPath( SvtPathOptions::PATH_DICTIONARY ); } - const String& GetFavoritesPath() { return GetPath( SvtPathOptions::PATH_FAVORITES ); } - const String& GetFilterPath() { return GetPath( SvtPathOptions::PATH_FILTER ); } - const String& GetGalleryPath() { return GetPath( SvtPathOptions::PATH_GALLERY ); } - const String& GetGraphicPath() { return GetPath( SvtPathOptions::PATH_GRAPHIC ); } - const String& GetHelpPath() { return GetPath( SvtPathOptions::PATH_HELP ); } - const String& GetLinguisticPath() { return GetPath( SvtPathOptions::PATH_LINGUISTIC ); } - const String& GetModulePath() { return GetPath( SvtPathOptions::PATH_MODULE ); } - const String& GetPalettePath() { return GetPath( SvtPathOptions::PATH_PALETTE ); } - const String& GetPluginPath() { return GetPath( SvtPathOptions::PATH_PLUGIN ); } - const String& GetStoragePath() { return GetPath( SvtPathOptions::PATH_STORAGE ); } - const String& GetTempPath() { return GetPath( SvtPathOptions::PATH_TEMP ); } - const String& GetTemplatePath() { return GetPath( SvtPathOptions::PATH_TEMPLATE ); } - const String& GetUserConfigPath() { return GetPath( SvtPathOptions::PATH_USERCONFIG ); } - const String& GetWorkPath() { return GetPath( SvtPathOptions::PATH_WORK ); } + const String& GetAutoCorrectPath() { return GetPath( SvtPathOptions::PATH_AUTOCORRECT ); } + const String& GetAutoTextPath() { return GetPath( SvtPathOptions::PATH_AUTOTEXT ); } + const String& GetBackupPath() { return GetPath( SvtPathOptions::PATH_BACKUP ); } + const String& GetBasicPath() { return GetPath( SvtPathOptions::PATH_BASIC ); } + const String& GetBitmapPath() { return GetPath( SvtPathOptions::PATH_BITMAP ); } + const String& GetConfigPath() { return GetPath( SvtPathOptions::PATH_CONFIG ); } + const String& GetDictionaryPath() { return GetPath( SvtPathOptions::PATH_DICTIONARY ); } + const String& GetFavoritesPath() { return GetPath( SvtPathOptions::PATH_FAVORITES ); } + const String& GetFilterPath() { return GetPath( SvtPathOptions::PATH_FILTER ); } + const String& GetGalleryPath() { return GetPath( SvtPathOptions::PATH_GALLERY ); } + const String& GetGraphicPath() { return GetPath( SvtPathOptions::PATH_GRAPHIC ); } + const String& GetHelpPath() { return GetPath( SvtPathOptions::PATH_HELP ); } + const String& GetLinguisticPath() { return GetPath( SvtPathOptions::PATH_LINGUISTIC ); } + const String& GetModulePath() { return GetPath( SvtPathOptions::PATH_MODULE ); } + const String& GetPalettePath() { return GetPath( SvtPathOptions::PATH_PALETTE ); } + const String& GetPluginPath() { return GetPath( SvtPathOptions::PATH_PLUGIN ); } + const String& GetStoragePath() { return GetPath( SvtPathOptions::PATH_STORAGE ); } + const String& GetTempPath() { return GetPath( SvtPathOptions::PATH_TEMP ); } + const String& GetTemplatePath() { return GetPath( SvtPathOptions::PATH_TEMPLATE ); } + const String& GetUserConfigPath() { return GetPath( SvtPathOptions::PATH_USERCONFIG ); } + const String& GetWorkPath() { return GetPath( SvtPathOptions::PATH_WORK ); } const String& GetUIConfigPath() { return GetPath( SvtPathOptions::PATH_UICONFIG ); } const String& GetFingerprintPath() { return GetPath( SvtPathOptions::PATH_FINGERPRINT ); } // set the pathes void SetPath( SvtPathOptions::Pathes, const String& rNewPath ); void SetAddinPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_ADDIN, rPath ); } - void SetAutoCorrectPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_AUTOCORRECT, rPath ); } - void SetAutoTextPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_AUTOTEXT, rPath ); } - void SetBackupPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_BACKUP, rPath ); } - void SetBasicPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_BASIC, rPath ); } - void SetBitmapPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_BITMAP, rPath ); } - void SetConfigPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_CONFIG, rPath ); } - void SetDictionaryPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_DICTIONARY, rPath ); } - void SetFavoritesPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_FAVORITES, rPath ); } - void SetFilterPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_FILTER, rPath ); } - void SetGalleryPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_GALLERY, rPath ); } - void SetGraphicPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_GRAPHIC, rPath ); } - void SetHelpPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_HELP, rPath ); } - void SetLinguisticPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_LINGUISTIC, rPath ); } - void SetModulePath( const String& rPath ) { SetPath( SvtPathOptions::PATH_MODULE, rPath ); } - void SetPalettePath( const String& rPath ) { SetPath( SvtPathOptions::PATH_PALETTE, rPath ); } - void SetPluginPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_PLUGIN, rPath ); } - void SetStoragePath( const String& rPath ) { SetPath( SvtPathOptions::PATH_STORAGE, rPath ); } - void SetTempPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_TEMP, rPath ); } - void SetTemplatePath( const String& rPath ) { SetPath( SvtPathOptions::PATH_TEMPLATE, rPath ); } - void SetUserConfigPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_USERCONFIG, rPath ); } - void SetWorkPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_WORK, rPath ); } - - rtl::OUString SubstVar( const rtl::OUString& rVar ); - rtl::OUString SubstituteAndConvert( const rtl::OUString& rPath ); - rtl::OUString UsePathVariables( const rtl::OUString& rPath ); - - ::com::sun::star::lang::Locale GetLocale() const { return m_aLocale; } + void SetAutoCorrectPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_AUTOCORRECT, rPath ); } + void SetAutoTextPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_AUTOTEXT, rPath ); } + void SetBackupPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_BACKUP, rPath ); } + void SetBasicPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_BASIC, rPath ); } + void SetBitmapPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_BITMAP, rPath ); } + void SetConfigPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_CONFIG, rPath ); } + void SetDictionaryPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_DICTIONARY, rPath ); } + void SetFavoritesPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_FAVORITES, rPath ); } + void SetFilterPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_FILTER, rPath ); } + void SetGalleryPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_GALLERY, rPath ); } + void SetGraphicPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_GRAPHIC, rPath ); } + void SetHelpPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_HELP, rPath ); } + void SetLinguisticPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_LINGUISTIC, rPath ); } + void SetModulePath( const String& rPath ) { SetPath( SvtPathOptions::PATH_MODULE, rPath ); } + void SetPalettePath( const String& rPath ) { SetPath( SvtPathOptions::PATH_PALETTE, rPath ); } + void SetPluginPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_PLUGIN, rPath ); } + void SetStoragePath( const String& rPath ) { SetPath( SvtPathOptions::PATH_STORAGE, rPath ); } + void SetTempPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_TEMP, rPath ); } + void SetTemplatePath( const String& rPath ) { SetPath( SvtPathOptions::PATH_TEMPLATE, rPath ); } + void SetUserConfigPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_USERCONFIG, rPath ); } + void SetWorkPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_WORK, rPath ); } + + rtl::OUString SubstVar( const rtl::OUString& rVar ); + rtl::OUString SubstituteAndConvert( const rtl::OUString& rPath ); + rtl::OUString UsePathVariables( const rtl::OUString& rPath ); + + ::com::sun::star::lang::Locale GetLocale() const { return m_aLocale; } BOOL IsPathReadonly(SvtPathOptions::Pathes ePath)const; }; @@ -214,50 +214,50 @@ static sal_Int32 nRefCount = 0; // functions ------------------------------------------------------------- struct PropertyStruct { - const char* pPropName; // The ascii name of the Office path - SvtPathOptions::Pathes ePath; // The enum value used by SvtPathOptions + const char* pPropName; // The ascii name of the Office path + SvtPathOptions::Pathes ePath; // The enum value used by SvtPathOptions }; struct VarNameAttribute { - const char* pVarName; // The name of the path variable - VarNameProperty eVarProperty; // Which return value is needed by this path variable + const char* pVarName; // The name of the path variable + VarNameProperty eVarProperty; // Which return value is needed by this path variable }; static PropertyStruct aPropNames[] = { - { "Addin", SvtPathOptions::PATH_ADDIN }, - { "AutoCorrect", SvtPathOptions::PATH_AUTOCORRECT }, - { "AutoText", SvtPathOptions::PATH_AUTOTEXT }, - { "Backup", SvtPathOptions::PATH_BACKUP }, - { "Basic", SvtPathOptions::PATH_BASIC }, - { "Bitmap", SvtPathOptions::PATH_BITMAP }, - { "Config", SvtPathOptions::PATH_CONFIG }, - { "Dictionary", SvtPathOptions::PATH_DICTIONARY }, - { "Favorite", SvtPathOptions::PATH_FAVORITES }, - { "Filter", SvtPathOptions::PATH_FILTER }, - { "Gallery", SvtPathOptions::PATH_GALLERY }, - { "Graphic", SvtPathOptions::PATH_GRAPHIC }, - { "Help", SvtPathOptions::PATH_HELP }, - { "Linguistic", SvtPathOptions::PATH_LINGUISTIC }, - { "Module", SvtPathOptions::PATH_MODULE }, - { "Palette", SvtPathOptions::PATH_PALETTE }, - { "Plugin", SvtPathOptions::PATH_PLUGIN }, - { "Storage", SvtPathOptions::PATH_STORAGE }, - { "Temp", SvtPathOptions::PATH_TEMP }, - { "Template", SvtPathOptions::PATH_TEMPLATE }, - { "UserConfig", SvtPathOptions::PATH_USERCONFIG }, - { "Work", SvtPathOptions::PATH_WORK }, - { "UIConfig", SvtPathOptions::PATH_UICONFIG }, - { "Fingerprint", SvtPathOptions::PATH_FINGERPRINT } + { "Addin", SvtPathOptions::PATH_ADDIN }, + { "AutoCorrect", SvtPathOptions::PATH_AUTOCORRECT }, + { "AutoText", SvtPathOptions::PATH_AUTOTEXT }, + { "Backup", SvtPathOptions::PATH_BACKUP }, + { "Basic", SvtPathOptions::PATH_BASIC }, + { "Bitmap", SvtPathOptions::PATH_BITMAP }, + { "Config", SvtPathOptions::PATH_CONFIG }, + { "Dictionary", SvtPathOptions::PATH_DICTIONARY }, + { "Favorite", SvtPathOptions::PATH_FAVORITES }, + { "Filter", SvtPathOptions::PATH_FILTER }, + { "Gallery", SvtPathOptions::PATH_GALLERY }, + { "Graphic", SvtPathOptions::PATH_GRAPHIC }, + { "Help", SvtPathOptions::PATH_HELP }, + { "Linguistic", SvtPathOptions::PATH_LINGUISTIC }, + { "Module", SvtPathOptions::PATH_MODULE }, + { "Palette", SvtPathOptions::PATH_PALETTE }, + { "Plugin", SvtPathOptions::PATH_PLUGIN }, + { "Storage", SvtPathOptions::PATH_STORAGE }, + { "Temp", SvtPathOptions::PATH_TEMP }, + { "Template", SvtPathOptions::PATH_TEMPLATE }, + { "UserConfig", SvtPathOptions::PATH_USERCONFIG }, + { "Work", SvtPathOptions::PATH_WORK }, + { "UIConfig", SvtPathOptions::PATH_UICONFIG }, + { "Fingerprint", SvtPathOptions::PATH_FINGERPRINT } }; static VarNameAttribute aVarNameAttribute[] = { - { SUBSTITUTE_INSTPATH, VAR_NEEDS_SYSTEM_PATH }, // $(instpath) - { SUBSTITUTE_PROGPATH, VAR_NEEDS_SYSTEM_PATH }, // $(progpath) - { SUBSTITUTE_USERPATH, VAR_NEEDS_SYSTEM_PATH }, // $(userpath) - { SUBSTITUTE_PATH, VAR_NEEDS_SYSTEM_PATH }, // $(path) + { SUBSTITUTE_INSTPATH, VAR_NEEDS_SYSTEM_PATH }, // $(instpath) + { SUBSTITUTE_PROGPATH, VAR_NEEDS_SYSTEM_PATH }, // $(progpath) + { SUBSTITUTE_USERPATH, VAR_NEEDS_SYSTEM_PATH }, // $(userpath) + { SUBSTITUTE_PATH, VAR_NEEDS_SYSTEM_PATH }, // $(path) }; #if 0 @@ -282,12 +282,12 @@ const String& SvtPathOptions_Impl::GetPath( SvtPathOptions::Pathes ePath ) if ( ePath < SvtPathOptions::PATH_COUNT ) { - OUString aPathValue; - String aResult; - sal_Int32 nHandle = m_aMapEnumToPropHandle[ (sal_Int32)ePath ]; + OUString aPathValue; + String aResult; + sal_Int32 nHandle = m_aMapEnumToPropHandle[ (sal_Int32)ePath ]; // Substitution is done by the service itself using the substition service - Any a = m_xPathSettings->getFastPropertyValue( nHandle ); + Any a = m_xPathSettings->getFastPropertyValue( nHandle ); a >>= aPathValue; if( ePath == SvtPathOptions::PATH_ADDIN || ePath == SvtPathOptions::PATH_FILTER || @@ -335,9 +335,9 @@ void SvtPathOptions_Impl::SetPath( SvtPathOptions::Pathes ePath, const String& r if ( ePath < SvtPathOptions::PATH_COUNT ) { - String aResult; - OUString aNewValue; - Any a; + String aResult; + OUString aNewValue; + Any a; switch ( ePath ) { @@ -395,8 +395,8 @@ OUString SvtPathOptions_Impl::SubstVar( const OUString& rVar ) BOOL bConvertLocal = FALSE; // Search for first occure of "$(...". - sal_Int32 nPosition = aWorkText.indexOf( SIGN_STARTVARIABLE ); // = first position of "$(" in string - sal_Int32 nLength = 0; // = count of letters from "$(" to ")" in string + sal_Int32 nPosition = aWorkText.indexOf( SIGN_STARTVARIABLE ); // = first position of "$(" in string + sal_Int32 nLength = 0; // = count of letters from "$(" to ")" in string // Have we found any variable like "$(...)"? if ( nPosition != STRPOS_NOTFOUND ) @@ -439,7 +439,7 @@ OUString SvtPathOptions_Impl::SubstVar( const OUString& rVar ) 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( SIGN_ENDVARIABLE, nPosition ); if ( nEndPosition != STRPOS_NOTFOUND ) nLength = nEndPosition - nPosition + 1; @@ -516,8 +516,8 @@ SvtPathOptions_Impl::SvtPathOptions_Impl() : if ( pIter != aTempHashMap.end() ) { - sal_Int32 nHandle = pIter->second; - sal_Int32 nEnum = aPropNames[i].ePath; + sal_Int32 nHandle = pIter->second; + sal_Int32 nEnum = aPropNames[i].ePath; m_aMapEnumToPropHandle.insert( EnumToHandleMap::value_type( nEnum, nHandle )); } } @@ -958,30 +958,30 @@ sal_Bool SvtPathOptions::SearchFile( String& rIniFile, Pathes ePath ) String aPath; switch ( ePath ) { - case PATH_ADDIN: aPath = GetAddinPath(); break; - case PATH_AUTOCORRECT: aPath = GetAutoCorrectPath(); break; - case PATH_AUTOTEXT: aPath = GetAutoTextPath(); break; - case PATH_BACKUP: aPath = GetBackupPath(); break; - case PATH_BASIC: aPath = GetBasicPath(); break; - case PATH_BITMAP: aPath = GetBitmapPath(); break; - case PATH_CONFIG: aPath = GetConfigPath(); break; - case PATH_DICTIONARY: aPath = GetDictionaryPath(); break; - case PATH_FAVORITES: aPath = GetFavoritesPath(); break; - case PATH_FILTER: aPath = GetFilterPath(); break; - case PATH_GALLERY: aPath = GetGalleryPath(); break; - case PATH_GRAPHIC: aPath = GetGraphicPath(); break; - case PATH_HELP: aPath = GetHelpPath(); break; - case PATH_LINGUISTIC: aPath = GetLinguisticPath(); break; - case PATH_MODULE: aPath = GetModulePath(); break; - case PATH_PALETTE: aPath = GetPalettePath(); break; - case PATH_PLUGIN: aPath = GetPluginPath(); break; - case PATH_STORAGE: aPath = GetStoragePath(); break; - case PATH_TEMP: aPath = GetTempPath(); break; - case PATH_TEMPLATE: aPath = GetTemplatePath(); break; - case PATH_WORK: aPath = GetWorkPath(); break; + case PATH_ADDIN: aPath = GetAddinPath(); break; + case PATH_AUTOCORRECT: aPath = GetAutoCorrectPath(); break; + case PATH_AUTOTEXT: aPath = GetAutoTextPath(); break; + case PATH_BACKUP: aPath = GetBackupPath(); break; + case PATH_BASIC: aPath = GetBasicPath(); break; + case PATH_BITMAP: aPath = GetBitmapPath(); break; + case PATH_CONFIG: aPath = GetConfigPath(); break; + case PATH_DICTIONARY: aPath = GetDictionaryPath(); break; + case PATH_FAVORITES: aPath = GetFavoritesPath(); break; + case PATH_FILTER: aPath = GetFilterPath(); break; + case PATH_GALLERY: aPath = GetGalleryPath(); break; + case PATH_GRAPHIC: aPath = GetGraphicPath(); break; + case PATH_HELP: aPath = GetHelpPath(); break; + case PATH_LINGUISTIC: aPath = GetLinguisticPath(); break; + case PATH_MODULE: aPath = GetModulePath(); break; + case PATH_PALETTE: aPath = GetPalettePath(); break; + case PATH_PLUGIN: aPath = GetPluginPath(); break; + case PATH_STORAGE: aPath = GetStoragePath(); break; + case PATH_TEMP: aPath = GetTempPath(); break; + case PATH_TEMPLATE: aPath = GetTemplatePath(); break; + case PATH_WORK: aPath = GetWorkPath(); break; case PATH_UICONFIG: aPath = GetUIConfigPath(); break; case PATH_FINGERPRINT: aPath = GetFingerprintPath(); break; - case PATH_USERCONFIG:/*-Wall???*/ break; + case PATH_USERCONFIG:/*-Wall???*/ break; case PATH_COUNT: /*-Wall???*/ break; } @@ -1049,14 +1049,14 @@ void SvtPathOptions::SetPath( SvtPathOptions::Pathes ePath, const String& rNewPa class PathService : public ::cppu::WeakImplHelper2< ::com::sun::star::frame::XConfigManager, ::com::sun::star::lang::XServiceInfo > { - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL substituteVariables( const ::rtl::OUString& sText ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& sKeyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& sKeyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL flush( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::rtl::OUString SAL_CALL substituteVariables( const ::rtl::OUString& sText ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& sKeyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& sKeyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL flush( ) throw(::com::sun::star::uno::RuntimeException); }; // class PathService ----------------------------------------------------- diff --git a/unotools/source/config/printwarningoptions.cxx b/unotools/source/config/printwarningoptions.cxx index d723b3c068d4..482b267970cb 100644 --- a/unotools/source/config/printwarningoptions.cxx +++ b/unotools/source/config/printwarningoptions.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 @@ #endif //_________________________________________________________________________________________________________________ -// includes +// includes //_________________________________________________________________________________________________________________ #include <unotools/printwarningoptions.hxx> @@ -44,16 +44,16 @@ #include <itemholder1.hxx> //_________________________________________________________________________________________________________________ -// namespaces +// namespaces //_________________________________________________________________________________________________________________ -using namespace ::utl ; -using namespace ::rtl ; -using namespace ::osl ; -using namespace ::com::sun::star::uno ; +using namespace ::utl ; +using namespace ::rtl ; +using namespace ::osl ; +using namespace ::com::sun::star::uno ; //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ #define ROOTNODE_START OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Print")) @@ -64,10 +64,10 @@ using namespace ::com::sun::star::uno ; #define PROPERTYNAME_TRANSPARENCY OUString(RTL_CONSTASCII_USTRINGPARAM("Warning/Transparency")) #define PROPERTYNAME_PRINTINGMODIFIESDOCUMENT OUString(RTL_CONSTASCII_USTRINGPARAM("PrintingModifiesDocument")) -#define PROPERTYHANDLE_PAPERSIZE 0 -#define PROPERTYHANDLE_PAPERORIENTATION 1 -#define PROPERTYHANDLE_NOTFOUND 2 -#define PROPERTYHANDLE_TRANSPARENCY 3 +#define PROPERTYHANDLE_PAPERSIZE 0 +#define PROPERTYHANDLE_PAPERORIENTATION 1 +#define PROPERTYHANDLE_NOTFOUND 2 +#define PROPERTYHANDLE_TRANSPARENCY 3 #define PROPERTYHDL_PRINTINGMODIFIESDOCUMENT 4 #define PROPERTYCOUNT 5 @@ -77,37 +77,37 @@ class SvtPrintWarningOptions_Impl : public ConfigItem public: //--------------------------------------------------------------------------------------------------------- -// constructor / destructor +// constructor / destructor //--------------------------------------------------------------------------------------------------------- SvtPrintWarningOptions_Impl(); ~SvtPrintWarningOptions_Impl(); //--------------------------------------------------------------------------------------------------------- -// overloaded methods of baseclass +// overloaded methods of baseclass //--------------------------------------------------------------------------------------------------------- virtual void Commit(); virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); //--------------------------------------------------------------------------------------------------------- -// public interface +// public interface //--------------------------------------------------------------------------------------------------------- - sal_Bool IsPaperSize() const { return m_bPaperSize; } - sal_Bool IsPaperOrientation() const { return m_bPaperOrientation; } - sal_Bool IsNotFound() const { return m_bNotFound; } - sal_Bool IsTransparency() const { return m_bTransparency; } + sal_Bool IsPaperSize() const { return m_bPaperSize; } + sal_Bool IsPaperOrientation() const { return m_bPaperOrientation; } + sal_Bool IsNotFound() const { return m_bNotFound; } + sal_Bool IsTransparency() const { return m_bTransparency; } sal_Bool IsModifyDocumentOnPrintingAllowed() const { return m_bModifyDocumentOnPrintingAllowed; } - void SetPaperSize( sal_Bool bState ) { m_bPaperSize = bState; SetModified(); } - void SetPaperOrientation( sal_Bool bState ) { m_bPaperOrientation = bState; SetModified(); } - void SetNotFound( sal_Bool bState ) { m_bNotFound = bState; SetModified(); } - void SetTransparency( sal_Bool bState ) { m_bTransparency = bState; SetModified(); } + void SetPaperSize( sal_Bool bState ) { m_bPaperSize = bState; SetModified(); } + void SetPaperOrientation( sal_Bool bState ) { m_bPaperOrientation = bState; SetModified(); } + void SetNotFound( sal_Bool bState ) { m_bNotFound = bState; SetModified(); } + void SetTransparency( sal_Bool bState ) { m_bTransparency = bState; SetModified(); } void SetModifyDocumentOnPrintingAllowed( sal_Bool bState ) { m_bModifyDocumentOnPrintingAllowed = bState; SetModified(); } //------------------------------------------------------------------------------------------------------------- -// private methods +// private methods //------------------------------------------------------------------------------------------------------------- private: @@ -115,41 +115,41 @@ private: static Sequence< OUString > impl_GetPropertyNames(); //------------------------------------------------------------------------------------------------------------- -// private member +// private member //------------------------------------------------------------------------------------------------------------- private: - sal_Bool m_bPaperSize; - sal_Bool m_bPaperOrientation; - sal_Bool m_bNotFound; - sal_Bool m_bTransparency; + sal_Bool m_bPaperSize; + sal_Bool m_bPaperOrientation; + sal_Bool m_bNotFound; + sal_Bool m_bTransparency; sal_Bool m_bModifyDocumentOnPrintingAllowed; }; //_________________________________________________________________________________________________________________ -// definitions +// definitions //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** SvtPrintWarningOptions_Impl::SvtPrintWarningOptions_Impl() : - ConfigItem( ROOTNODE_START ), + ConfigItem( ROOTNODE_START ), m_bPaperSize( sal_False ), m_bPaperOrientation( sal_False ), m_bNotFound( sal_False ), m_bTransparency( sal_True ), m_bModifyDocumentOnPrintingAllowed( sal_True ) { - Sequence< OUString > seqNames( impl_GetPropertyNames() ); - Sequence< Any > seqValues( GetProperties( seqNames ) ); + Sequence< OUString > seqNames( impl_GetPropertyNames() ); + Sequence< Any > seqValues( GetProperties( seqNames ) ); DBG_ASSERT( !(seqNames.getLength()!=seqValues.getLength()), "SvtPrintWarningOptions_Impl::SvtPrintWarningOptions_Impl()\nI miss some values of configuration keys!\n" ); // Copy values from list in right order to our internal member. sal_Int32 nPropertyCount = seqValues.getLength(); - sal_Int32 nProperty = 0; + sal_Int32 nProperty = 0; for( nProperty=0; nProperty<nPropertyCount; ++nProperty ) { @@ -196,7 +196,7 @@ SvtPrintWarningOptions_Impl::SvtPrintWarningOptions_Impl() : } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** SvtPrintWarningOptions_Impl::~SvtPrintWarningOptions_Impl() { @@ -205,12 +205,12 @@ SvtPrintWarningOptions_Impl::~SvtPrintWarningOptions_Impl() } //***************************************************************************************************************** -// Commit +// Commit //***************************************************************************************************************** void SvtPrintWarningOptions_Impl::Commit() { - Sequence< OUString > aSeqNames( impl_GetPropertyNames() ); - Sequence< Any > aSeqValues( aSeqNames.getLength() ); + Sequence< OUString > aSeqNames( impl_GetPropertyNames() ); + Sequence< Any > aSeqValues( aSeqNames.getLength() ); for( sal_Int32 nProperty = 0, nCount = aSeqNames.getLength(); nProperty < nCount; ++nProperty ) { @@ -245,7 +245,7 @@ void SvtPrintWarningOptions_Impl::Notify( const Sequence< rtl::OUString >& ) } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** Sequence< OUString > SvtPrintWarningOptions_Impl::impl_GetPropertyNames() { @@ -266,15 +266,15 @@ Sequence< OUString > SvtPrintWarningOptions_Impl::impl_GetPropertyNames() } //***************************************************************************************************************** -// 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 //***************************************************************************************************************** SvtPrintWarningOptions_Impl* SvtPrintWarningOptions::m_pDataContainer = NULL; -sal_Int32 SvtPrintWarningOptions::m_nRefCount = 0; +sal_Int32 SvtPrintWarningOptions::m_nRefCount = 0; //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** SvtPrintWarningOptions::SvtPrintWarningOptions() { @@ -291,7 +291,7 @@ SvtPrintWarningOptions::SvtPrintWarningOptions() } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** SvtPrintWarningOptions::~SvtPrintWarningOptions() { @@ -309,7 +309,7 @@ SvtPrintWarningOptions::~SvtPrintWarningOptions() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Bool SvtPrintWarningOptions::IsPaperSize() const { @@ -318,7 +318,7 @@ sal_Bool SvtPrintWarningOptions::IsPaperSize() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Bool SvtPrintWarningOptions::IsPaperOrientation() const { @@ -327,7 +327,7 @@ sal_Bool SvtPrintWarningOptions::IsPaperOrientation() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Bool SvtPrintWarningOptions::IsNotFound() const { @@ -336,7 +336,7 @@ sal_Bool SvtPrintWarningOptions::IsNotFound() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Bool SvtPrintWarningOptions::IsTransparency() const { @@ -345,7 +345,7 @@ sal_Bool SvtPrintWarningOptions::IsTransparency() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtPrintWarningOptions::SetPaperSize( sal_Bool bState ) { @@ -354,7 +354,7 @@ void SvtPrintWarningOptions::SetPaperSize( sal_Bool bState ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtPrintWarningOptions::SetPaperOrientation( sal_Bool bState ) { @@ -363,7 +363,7 @@ void SvtPrintWarningOptions::SetPaperOrientation( sal_Bool bState ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtPrintWarningOptions::SetNotFound( sal_Bool bState ) { @@ -372,7 +372,7 @@ void SvtPrintWarningOptions::SetNotFound( sal_Bool bState ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtPrintWarningOptions::SetTransparency( sal_Bool bState ) { @@ -396,7 +396,7 @@ void SvtPrintWarningOptions::SetModifyDocumentOnPrintingAllowed( sal_Bool bState } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** Mutex& SvtPrintWarningOptions::GetOwnStaticMutex() { diff --git a/unotools/source/config/regoptions.cxx b/unotools/source/config/regoptions.cxx index 81f089919dfd..1aa06418b75d 100644 --- a/unotools/source/config/regoptions.cxx +++ b/unotools/source/config/regoptions.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,20 +56,20 @@ namespace utl static sal_Int32 lcl_convertString2Date( const ::rtl::OUString& _rStringRep ) { sal_Int32 nDateIntRep = 0; - if ( _rStringRep.getLength() == 2 + 1 + 2 + 1 + 4 ) // DD.MM.YYYY + if ( _rStringRep.getLength() == 2 + 1 + 2 + 1 + 4 ) // DD.MM.YYYY { // validate the string sal_Bool bValid = sal_True; const sal_Unicode* pStringRep = _rStringRep.getStr(); sal_Int32 nLen = _rStringRep.getLength(); - for ( sal_Int32 nPos = 0; + for ( sal_Int32 nPos = 0; bValid && ( nPos < nLen ); ++nPos, ++pStringRep ) { if ( ( 2 == nPos ) || ( 5 == nPos ) ) - bValid = '.' == *pStringRep; // the number separators + bValid = '.' == *pStringRep; // the number separators else bValid = ( *pStringRep >= '0' ) && ( *pStringRep <= '9' ); } @@ -78,9 +78,9 @@ namespace utl if ( bValid ) { Date aDate; - aDate.SetDay ( (USHORT)_rStringRep.copy( 0, 2 ).toInt32( ) ); - aDate.SetMonth ( (USHORT)_rStringRep.copy( 3, 2 ).toInt32( ) ); - aDate.SetYear ( (USHORT)_rStringRep.copy( 6, 4 ).toInt32( ) ); + aDate.SetDay ( (USHORT)_rStringRep.copy( 0, 2 ).toInt32( ) ); + aDate.SetMonth ( (USHORT)_rStringRep.copy( 3, 2 ).toInt32( ) ); + aDate.SetYear ( (USHORT)_rStringRep.copy( 6, 4 ).toInt32( ) ); nDateIntRep = aDate.GetDate(); } } @@ -95,7 +95,7 @@ namespace utl ::rtl::OUString sLeanToken = ::rtl::OUString::valueOf( _nToken ); // check length if ( sLeanToken.getLength() < _nDigits ) - { // fill + { // fill OSL_ENSURE( _nDigits <= 4, "lcl_fillToken: invalid digit number!" ); _rToken = ::rtl::OUString( "0000", _nDigits - sLeanToken.getLength(), RTL_TEXTENCODING_ASCII_US ); _rToken += sLeanToken; @@ -135,11 +135,11 @@ namespace utl } //-------------------------------------------------------------------- - #define DECLARE_STATIC_LAZY_USTRING( name ) \ - static const ::rtl::OUString& lcl_get##name##Name() \ - { \ - static const ::rtl::OUString sName = ::rtl::OUString::createFromAscii( #name ); \ - return sName; \ + #define DECLARE_STATIC_LAZY_USTRING( name ) \ + static const ::rtl::OUString& lcl_get##name##Name() \ + { \ + static const ::rtl::OUString sName = ::rtl::OUString::createFromAscii( #name ); \ + return sName; \ } DECLARE_STATIC_LAZY_USTRING( ReminderDate ); @@ -153,47 +153,47 @@ namespace utl class RegOptionsImpl { private: - OConfigurationTreeRoot m_aRegistrationNode; // the configuration node we need to access our persistent data + OConfigurationTreeRoot m_aRegistrationNode; // the configuration node we need to access our persistent data - String m_sRegistrationURL; // the URL to use when doing an online registration - Date m_aReminderDate; // the reminder date as found in the configuration - sal_Int32 m_nDialogCounter; // the dialog counter - see getDialogPermission - sal_Bool m_bShowMenuItem; // the flag indicating if the registration menu item is allowed + String m_sRegistrationURL; // the URL to use when doing an online registration + Date m_aReminderDate; // the reminder date as found in the configuration + sal_Int32 m_nDialogCounter; // the dialog counter - see getDialogPermission + sal_Bool m_bShowMenuItem; // the flag indicating if the registration menu item is allowed - static RegOptionsImpl* s_pSingleInstance; // the one and only instance of this class - static sal_Int32 s_nInstanceCount; // reference counter for the instances - static sal_Bool s_bThisSessionDone; // the flag indicating if for this session, everything beeing relevant has already been done + static RegOptionsImpl* s_pSingleInstance; // the one and only instance of this class + static sal_Int32 s_nInstanceCount; // reference counter for the instances + static sal_Bool s_bThisSessionDone; // the flag indicating if for this session, everything beeing relevant has already been done private: RegOptionsImpl( ); - static ::osl::Mutex& getStaticMutex(); // get the mutex used to protect the static members of this class + static ::osl::Mutex& getStaticMutex(); // get the mutex used to protect the static members of this class - void commit( ); + void commit( ); sal_Int32 getBuildId() const; private: - RegOptions::DialogPermission implGetDialogPermission( ) const; + RegOptions::DialogPermission implGetDialogPermission( ) const; public: - static RegOptionsImpl* registerClient( ); - static void revokeClient( ); + static RegOptionsImpl* registerClient( ); + static void revokeClient( ); - inline sal_Bool hasURL( ) const { return ( 0 != m_sRegistrationURL.Len() ); } - inline sal_Bool allowMenu( ) const { return hasURL() && m_bShowMenuItem; } - inline String getRegistrationURL( ) const { return m_sRegistrationURL; } + inline sal_Bool hasURL( ) const { return ( 0 != m_sRegistrationURL.Len() ); } + inline sal_Bool allowMenu( ) const { return hasURL() && m_bShowMenuItem; } + inline String getRegistrationURL( ) const { return m_sRegistrationURL; } - RegOptions::DialogPermission getDialogPermission( ) const; - void markSessionDone( ); + RegOptions::DialogPermission getDialogPermission( ) const; + void markSessionDone( ); void activateReminder( sal_Int32 _nDaysFromNow ); void removeReminder(); bool hasReminderDateCome() const; }; //-------------------------------------------------------------------- - RegOptionsImpl* RegOptionsImpl::s_pSingleInstance = NULL; - sal_Bool RegOptionsImpl::s_bThisSessionDone = sal_False; - sal_Int32 RegOptionsImpl::s_nInstanceCount = 0; + RegOptionsImpl* RegOptionsImpl::s_pSingleInstance = NULL; + sal_Bool RegOptionsImpl::s_bThisSessionDone = sal_False; + sal_Int32 RegOptionsImpl::s_nInstanceCount = 0; //-------------------------------------------------------------------- ::osl::Mutex& RegOptionsImpl::getStaticMutex() @@ -252,8 +252,8 @@ namespace utl //-------------------------------------------------------------------- RegOptionsImpl::RegOptionsImpl( ) - :m_nDialogCounter ( 0 ) - ,m_bShowMenuItem ( sal_False ) + :m_nDialogCounter ( 0 ) + ,m_bShowMenuItem ( sal_False ) { // create the config node for all our registration information m_aRegistrationNode = OConfigurationTreeRoot::createWithServiceFactory( @@ -297,7 +297,7 @@ namespace utl if ( 1 == m_nDialogCounter ) { if ( m_aReminderDate.IsValid( ) ) - { // valid reminder date + { // valid reminder date // assume remind later eResult = RegOptions::dpRemindLater; // and check if we reached the reminder date @@ -305,16 +305,16 @@ namespace utl eResult = RegOptions::dpThisSession; } else - eResult = RegOptions::dpThisSession; // execute in this session + eResult = RegOptions::dpThisSession; // execute in this session } else - eResult = RegOptions::dpNotThisSession; // first trigger session not reached + eResult = RegOptions::dpNotThisSession; // first trigger session not reached // a last check .... - if ( ( s_bThisSessionDone ) // this session is already marked as "done" - && ( RegOptions::dpThisSession == eResult )// but without this, the state would be "now" + if ( ( s_bThisSessionDone ) // this session is already marked as "done" + && ( RegOptions::dpThisSession == eResult )// but without this, the state would be "now" ) - eResult = RegOptions::dpDisabled; // -> change state to "disabled" + eResult = RegOptions::dpDisabled; // -> change state to "disabled" } return eResult; @@ -337,7 +337,7 @@ namespace utl OSL_ENSURE( _nDaysFromNow > 0, "RegOptionsImpl::activateReminder: invalid argument!" ); // calc the reminder - m_aReminderDate = Date() + _nDaysFromNow; // today (default ctor) + days + m_aReminderDate = Date() + _nDaysFromNow; // today (default ctor) + days // remember the date m_aRegistrationNode.setNodeValue( @@ -439,7 +439,7 @@ namespace utl s_bThisSessionDone = sal_True; if ( RegOptions::dpRemindLater == eOldPermission ) - { // no action required. If we shall remind later, the counter is already at 1, we should not change this, + { // no action required. If we shall remind later, the counter is already at 1, we should not change this, // as the next smaller number (which is 0 :) means that the dialog would be disabled OSL_ENSURE( 1 == m_nDialogCounter, "RegOptionsImpl::markSessionDone: invalid session counter (1)!" ); } @@ -519,7 +519,7 @@ namespace utl { /// we cache this setting, 'cause it is needed very often static sal_Bool bKnowMenuPermission = sal_False; - static sal_Bool bAllowMenu = sal_False; + static sal_Bool bAllowMenu = sal_False; if ( !bKnowMenuPermission ) { diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx index cbb7e763b38a..6f9aefe0b189 100644 --- a/unotools/source/config/saveopt.cxx +++ b/unotools/source/config/saveopt.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/unotools/source/config/searchopt.cxx b/unotools/source/config/searchopt.cxx index f9318f150589..13ade93a93df 100644 --- a/unotools/source/config/searchopt.cxx +++ b/unotools/source/config/searchopt.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 @@ -43,39 +43,39 @@ using namespace utl; using namespace com::sun::star::uno; using namespace com::sun::star::i18n; -#define MAX_FLAGS_OFFSET 25 +#define MAX_FLAGS_OFFSET 25 ////////////////////////////////////////////////////////////////////// class SvtSearchOptions_Impl : public ConfigItem { - INT32 nFlags; - BOOL bModified; + INT32 nFlags; + BOOL bModified; // disallow copy-constructor and assignment-operator for now SvtSearchOptions_Impl( const SvtSearchOptions_Impl & ); SvtSearchOptions_Impl & operator = ( const SvtSearchOptions_Impl & ); protected: - BOOL IsModified() const { return bModified; } + BOOL IsModified() const { return bModified; } using ConfigItem::SetModified; - void SetModified( BOOL bVal ); - BOOL Load(); - BOOL Save(); + void SetModified( BOOL bVal ); + BOOL Load(); + BOOL Save(); - Sequence< OUString > GetPropertyNames() const; + Sequence< OUString > GetPropertyNames() const; public: SvtSearchOptions_Impl(); virtual ~SvtSearchOptions_Impl(); // ConfigItem - virtual void Commit(); + virtual void Commit(); virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); - BOOL GetFlag( USHORT nOffset ) const; - void SetFlag( USHORT nOffset, BOOL bVal ); + BOOL GetFlag( USHORT nOffset ) const; + void SetFlag( USHORT nOffset, BOOL bVal ); }; @@ -84,7 +84,7 @@ SvtSearchOptions_Impl::SvtSearchOptions_Impl() : ConfigItem( OUString::createFromAscii( "Office.Common/SearchOptions" ) ) { RTL_LOGFILE_CONTEXT(aLog, "unotools SvtSearchOptions_Impl::SvtSearchOptions_Impl()"); - nFlags = 0x0003FFFF; // set all options values to 'true' + nFlags = 0x0003FFFF; // set all options values to 'true' Load(); SetModified( FALSE ); } @@ -142,33 +142,33 @@ Sequence< OUString > SvtSearchOptions_Impl::GetPropertyNames() const { static const char* aPropNames[ MAX_FLAGS_OFFSET + 1 ] = { - "IsWholeWordsOnly", // 0 - "IsBackwards", // 1 - "IsUseRegularExpression", // 2 - //"IsCurrentSelectionOnly", // interactively set or not... - "IsSearchForStyles", // 3 - "IsSimilaritySearch", // 4 - "IsUseAsianOptions", // 5 - "IsMatchCase", // 6 - "Japanese/IsMatchFullHalfWidthForms", // 7 - "Japanese/IsMatchHiraganaKatakana", // 8 - "Japanese/IsMatchContractions", // 9 - "Japanese/IsMatchMinusDashCho-on", // 10 - "Japanese/IsMatchRepeatCharMarks", // 11 - "Japanese/IsMatchVariantFormKanji", // 12 - "Japanese/IsMatchOldKanaForms", // 13 - "Japanese/IsMatch_DiZi_DuZu", // 14 - "Japanese/IsMatch_BaVa_HaFa", // 15 - "Japanese/IsMatch_TsiThiChi_DhiZi", // 16 - "Japanese/IsMatch_HyuIyu_ByuVyu", // 17 - "Japanese/IsMatch_SeShe_ZeJe", // 18 - "Japanese/IsMatch_IaIya", // 19 - "Japanese/IsMatch_KiKu", // 20 - "Japanese/IsIgnorePunctuation", // 21 - "Japanese/IsIgnoreWhitespace", // 22 - "Japanese/IsIgnoreProlongedSoundMark", // 23 - "Japanese/IsIgnoreMiddleDot", // 24 - "IsNotes" // 25 + "IsWholeWordsOnly", // 0 + "IsBackwards", // 1 + "IsUseRegularExpression", // 2 + //"IsCurrentSelectionOnly", // interactively set or not... + "IsSearchForStyles", // 3 + "IsSimilaritySearch", // 4 + "IsUseAsianOptions", // 5 + "IsMatchCase", // 6 + "Japanese/IsMatchFullHalfWidthForms", // 7 + "Japanese/IsMatchHiraganaKatakana", // 8 + "Japanese/IsMatchContractions", // 9 + "Japanese/IsMatchMinusDashCho-on", // 10 + "Japanese/IsMatchRepeatCharMarks", // 11 + "Japanese/IsMatchVariantFormKanji", // 12 + "Japanese/IsMatchOldKanaForms", // 13 + "Japanese/IsMatch_DiZi_DuZu", // 14 + "Japanese/IsMatch_BaVa_HaFa", // 15 + "Japanese/IsMatch_TsiThiChi_DhiZi", // 16 + "Japanese/IsMatch_HyuIyu_ByuVyu", // 17 + "Japanese/IsMatch_SeShe_ZeJe", // 18 + "Japanese/IsMatch_IaIya", // 19 + "Japanese/IsMatch_KiKu", // 20 + "Japanese/IsIgnorePunctuation", // 21 + "Japanese/IsIgnoreWhitespace", // 22 + "Japanese/IsIgnoreProlongedSoundMark", // 23 + "Japanese/IsIgnoreMiddleDot", // 24 + "IsNotes" // 25 }; const int nCount = sizeof( aPropNames ) / sizeof( aPropNames[0] ); diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx index 526e33d1917c..b8b6bb63efa1 100644 --- a/unotools/source/config/securityoptions.cxx +++ b/unotools/source/config/securityoptions.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 @@ #endif //_________________________________________________________________________________________________________________ -// includes +// includes //_________________________________________________________________________________________________________________ #include <unotools/securityoptions.hxx> @@ -51,78 +51,78 @@ #include "itemholder1.hxx" //_________________________________________________________________________________________________________________ -// namespaces +// namespaces //_________________________________________________________________________________________________________________ -using namespace ::utl ; -using namespace ::rtl ; -using namespace ::osl ; -using namespace ::com::sun::star::uno ; +using namespace ::utl ; +using namespace ::rtl ; +using namespace ::osl ; +using namespace ::com::sun::star::uno ; //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ -#define ROOTNODE_SECURITY OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Security/Scripting")) -#define DEFAULT_SECUREURL Sequence< OUString >() -#define DEFAULT_SECLEVEL 3 -#define DEFAULT_TRUSTEDAUTHORS Sequence< SvtSecurityOptions::Certificate >() +#define ROOTNODE_SECURITY OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Security/Scripting")) +#define DEFAULT_SECUREURL Sequence< OUString >() +#define DEFAULT_SECLEVEL 3 +#define DEFAULT_TRUSTEDAUTHORS Sequence< SvtSecurityOptions::Certificate >() // xmlsec05 depricated -#define DEFAULT_STAROFFICEBASIC eALWAYS_EXECUTE - -#define CSTR_SECUREURL "SecureURL" -#define CSTR_DOCWARN_SAVEORSEND "WarnSaveOrSendDoc" -#define CSTR_DOCWARN_SIGNING "WarnSignDoc" -#define CSTR_DOCWARN_PRINT "WarnPrintDoc" -#define CSTR_DOCWARN_CREATEPDF "WarnCreatePDF" -#define CSTR_DOCWARN_REMOVEPERSONALINFO "RemovePersonalInfoOnSaving" -#define CSTR_DOCWARN_RECOMMENDPASSWORD "RecommendPasswordProtection" +#define DEFAULT_STAROFFICEBASIC eALWAYS_EXECUTE + +#define CSTR_SECUREURL "SecureURL" +#define CSTR_DOCWARN_SAVEORSEND "WarnSaveOrSendDoc" +#define CSTR_DOCWARN_SIGNING "WarnSignDoc" +#define CSTR_DOCWARN_PRINT "WarnPrintDoc" +#define CSTR_DOCWARN_CREATEPDF "WarnCreatePDF" +#define CSTR_DOCWARN_REMOVEPERSONALINFO "RemovePersonalInfoOnSaving" +#define CSTR_DOCWARN_RECOMMENDPASSWORD "RecommendPasswordProtection" #define CSTR_CTRLCLICK_HYPERLINK "HyperlinksWithCtrlClick" -#define CSTR_MACRO_SECLEVEL "MacroSecurityLevel" -#define CSTR_MACRO_TRUSTEDAUTHORS "TrustedAuthors" -#define CSTR_MACRO_DISABLE "DisableMacrosExecution" -#define CSTR_TRUSTEDAUTHOR_SUBJECTNAME "SubjectName" -#define CSTR_TRUSTEDAUTHOR_SERIALNUMBER "SerialNumber" -#define CSTR_TRUSTEDAUTHOR_RAWDATA "RawData" - -#define PROPERTYNAME_SECUREURL OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_SECUREURL )) -#define PROPERTYNAME_DOCWARN_SAVEORSEND OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_DOCWARN_SAVEORSEND )) -#define PROPERTYNAME_DOCWARN_SIGNING OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_DOCWARN_SIGNING )) -#define PROPERTYNAME_DOCWARN_PRINT OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_DOCWARN_PRINT )) -#define PROPERTYNAME_DOCWARN_CREATEPDF OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_DOCWARN_CREATEPDF )) -#define PROPERTYNAME_DOCWARN_REMOVEPERSONALINFO OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_DOCWARN_REMOVEPERSONALINFO )) +#define CSTR_MACRO_SECLEVEL "MacroSecurityLevel" +#define CSTR_MACRO_TRUSTEDAUTHORS "TrustedAuthors" +#define CSTR_MACRO_DISABLE "DisableMacrosExecution" +#define CSTR_TRUSTEDAUTHOR_SUBJECTNAME "SubjectName" +#define CSTR_TRUSTEDAUTHOR_SERIALNUMBER "SerialNumber" +#define CSTR_TRUSTEDAUTHOR_RAWDATA "RawData" + +#define PROPERTYNAME_SECUREURL OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_SECUREURL )) +#define PROPERTYNAME_DOCWARN_SAVEORSEND OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_DOCWARN_SAVEORSEND )) +#define PROPERTYNAME_DOCWARN_SIGNING OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_DOCWARN_SIGNING )) +#define PROPERTYNAME_DOCWARN_PRINT OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_DOCWARN_PRINT )) +#define PROPERTYNAME_DOCWARN_CREATEPDF OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_DOCWARN_CREATEPDF )) +#define PROPERTYNAME_DOCWARN_REMOVEPERSONALINFO OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_DOCWARN_REMOVEPERSONALINFO )) #define PROPERTYNAME_DOCWARN_RECOMMENDPASSWORD OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_DOCWARN_RECOMMENDPASSWORD )) #define PROPERTYNAME_CTRLCLICK_HYPERLINK OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_CTRLCLICK_HYPERLINK )) -#define PROPERTYNAME_MACRO_SECLEVEL OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_MACRO_SECLEVEL )) -#define PROPERTYNAME_MACRO_TRUSTEDAUTHORS OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_MACRO_TRUSTEDAUTHORS )) -#define PROPERTYNAME_MACRO_DISABLE OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_MACRO_DISABLE )) -#define PROPERTYNAME_TRUSTEDAUTHOR_SUBJECTNAME OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_TRUSTEDAUTHOR_SUBJECTNAME)) -#define PROPERTYNAME_TRUSTEDAUTHOR_SERIALNUMBER OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_TRUSTEDAUTHOR_SERIALNUMBER)) -#define PROPERTYNAME_TRUSTEDAUTHOR_RAWDATA OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_TRUSTEDAUTHOR_RAWDATA)) +#define PROPERTYNAME_MACRO_SECLEVEL OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_MACRO_SECLEVEL )) +#define PROPERTYNAME_MACRO_TRUSTEDAUTHORS OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_MACRO_TRUSTEDAUTHORS )) +#define PROPERTYNAME_MACRO_DISABLE OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_MACRO_DISABLE )) +#define PROPERTYNAME_TRUSTEDAUTHOR_SUBJECTNAME OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_TRUSTEDAUTHOR_SUBJECTNAME)) +#define PROPERTYNAME_TRUSTEDAUTHOR_SERIALNUMBER OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_TRUSTEDAUTHOR_SERIALNUMBER)) +#define PROPERTYNAME_TRUSTEDAUTHOR_RAWDATA OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_TRUSTEDAUTHOR_RAWDATA)) // xmlsec05 depricated -#define PROPERTYNAME_STAROFFICEBASIC OUString(RTL_CONSTASCII_USTRINGPARAM("OfficeBasic" )) +#define PROPERTYNAME_STAROFFICEBASIC OUString(RTL_CONSTASCII_USTRINGPARAM("OfficeBasic" )) #define PROPERTYNAME_EXECUTEPLUGINS OUString(RTL_CONSTASCII_USTRINGPARAM("ExecutePlugins" )) #define PROPERTYNAME_WARNINGENABLED OUString(RTL_CONSTASCII_USTRINGPARAM("Warning" )) #define PROPERTYNAME_CONFIRMATIONENABLED OUString(RTL_CONSTASCII_USTRINGPARAM("Confirmation" )) // xmlsec05 depricated -#define PROPERTYHANDLE_SECUREURL 0 +#define PROPERTYHANDLE_SECUREURL 0 // xmlsec05 depricated -#define PROPERTYHANDLE_STAROFFICEBASIC 1 +#define PROPERTYHANDLE_STAROFFICEBASIC 1 #define PROPERTYHANDLE_EXECUTEPLUGINS 2 #define PROPERTYHANDLE_WARNINGENABLED 3 #define PROPERTYHANDLE_CONFIRMATIONENABLED 4 // xmlsec05 depricated -#define PROPERTYHANDLE_DOCWARN_SAVEORSEND 5 -#define PROPERTYHANDLE_DOCWARN_SIGNING 6 -#define PROPERTYHANDLE_DOCWARN_PRINT 7 -#define PROPERTYHANDLE_DOCWARN_CREATEPDF 8 -#define PROPERTYHANDLE_DOCWARN_REMOVEPERSONALINFO 9 +#define PROPERTYHANDLE_DOCWARN_SAVEORSEND 5 +#define PROPERTYHANDLE_DOCWARN_SIGNING 6 +#define PROPERTYHANDLE_DOCWARN_PRINT 7 +#define PROPERTYHANDLE_DOCWARN_CREATEPDF 8 +#define PROPERTYHANDLE_DOCWARN_REMOVEPERSONALINFO 9 #define PROPERTYHANDLE_DOCWARN_RECOMMENDPASSWORD 10 #define PROPERTYHANDLE_CTRLCLICK_HYPERLINK 11 #define PROPERTYHANDLE_MACRO_SECLEVEL 12 @@ -130,131 +130,131 @@ using namespace ::com::sun::star::uno ; #define PROPERTYHANDLE_MACRO_DISABLE 14 #define PROPERTYCOUNT 15 -#define PROPERTYHANDLE_INVALID -1 +#define PROPERTYHANDLE_INVALID -1 -#define CFG_READONLY_DEFAULT sal_False +#define CFG_READONLY_DEFAULT sal_False //_________________________________________________________________________________________________________________ -// private declarations! +// private declarations! //_________________________________________________________________________________________________________________ class SvtSecurityOptions_Impl : public ConfigItem { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: //--------------------------------------------------------------------------------------------------------- - // constructor / destructor + // constructor / destructor //--------------------------------------------------------------------------------------------------------- SvtSecurityOptions_Impl(); ~SvtSecurityOptions_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 "seqPropertyNames" is the list of properties which should be updated. - @return - + @param "seqPropertyNames" is the list of properties which should be updated. + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual void Notify( const Sequence< OUString >& seqPropertyNames ); /*-****************************************************************************************************//** - @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 //--------------------------------------------------------------------------------------------------------- - sal_Bool IsReadOnly ( SvtSecurityOptions::EOption eOption ) const ; + sal_Bool IsReadOnly ( SvtSecurityOptions::EOption eOption ) const ; - Sequence< OUString > GetSecureURLs ( ) const ; - void SetSecureURLs ( const Sequence< OUString >& seqURLList ) ; - sal_Bool IsSecureURL ( const OUString& sURL, - const OUString& sReferer ) const ; - inline sal_Int32 GetMacroSecurityLevel ( ) const ; - void SetMacroSecurityLevel ( sal_Int32 _nLevel ) ; + Sequence< OUString > GetSecureURLs ( ) const ; + void SetSecureURLs ( const Sequence< OUString >& seqURLList ) ; + sal_Bool IsSecureURL ( const OUString& sURL, + const OUString& sReferer ) const ; + inline sal_Int32 GetMacroSecurityLevel ( ) const ; + void SetMacroSecurityLevel ( sal_Int32 _nLevel ) ; - inline sal_Bool IsMacroDisabled ( ) const ; + inline sal_Bool IsMacroDisabled ( ) const ; - Sequence< SvtSecurityOptions::Certificate > GetTrustedAuthors ( ) const ; - void SetTrustedAuthors ( const Sequence< SvtSecurityOptions::Certificate >& rAuthors ) ; - sal_Bool IsTrustedAuthorsEnabled ( ) ; + Sequence< SvtSecurityOptions::Certificate > GetTrustedAuthors ( ) const ; + void SetTrustedAuthors ( const Sequence< SvtSecurityOptions::Certificate >& rAuthors ) ; + sal_Bool IsTrustedAuthorsEnabled ( ) ; - sal_Bool IsOptionSet ( SvtSecurityOptions::EOption eOption ) const ; - sal_Bool SetOption ( SvtSecurityOptions::EOption eOption, sal_Bool bValue ) ; - sal_Bool IsOptionEnabled ( SvtSecurityOptions::EOption eOption ) const ; + sal_Bool IsOptionSet ( SvtSecurityOptions::EOption eOption ) const ; + sal_Bool SetOption ( SvtSecurityOptions::EOption eOption, sal_Bool bValue ) ; + sal_Bool IsOptionEnabled ( SvtSecurityOptions::EOption eOption ) const ; private: /*-****************************************************************************************************//** - @short return list of key names of ouer configuration management which represent our module tree - @descr These methods return a static const list of key names. We need it to get needed values from our + @short return list of key names of ouer configuration management which represent our module tree + @descr These methods return a static const list of key names. We need it to get needed values from our configuration management. - @seealso - + @seealso - - @param - - @return A list of needed configuration keys is returned. + @param - + @return A list of needed configuration keys is returned. - @onerror - + @onerror - *//*-*****************************************************************************************************/ - void SetProperty( sal_Int32 nHandle, const Any& rValue, sal_Bool bReadOnly ); - void LoadAuthors( void ); - static sal_Int32 GetHandle( const OUString& rPropertyName ); - bool GetOption( SvtSecurityOptions::EOption eOption, sal_Bool*& rpValue, sal_Bool*& rpRO ); + void SetProperty( sal_Int32 nHandle, const Any& rValue, sal_Bool bReadOnly ); + void LoadAuthors( void ); + static sal_Int32 GetHandle( const OUString& rPropertyName ); + bool GetOption( SvtSecurityOptions::EOption eOption, sal_Bool*& rpValue, sal_Bool*& rpRO ); static Sequence< OUString > GetPropertyNames(); - Sequence< OUString > m_seqSecureURLs; - sal_Bool m_bSaveOrSend; - sal_Bool m_bSigning; - sal_Bool m_bPrint; - sal_Bool m_bCreatePDF; - sal_Bool m_bRemoveInfo; + Sequence< OUString > m_seqSecureURLs; + sal_Bool m_bSaveOrSend; + sal_Bool m_bSigning; + sal_Bool m_bPrint; + sal_Bool m_bCreatePDF; + sal_Bool m_bRemoveInfo; sal_Bool m_bRecommendPwd; sal_Bool m_bCtrlClickHyperlink; - sal_Int32 m_nSecLevel; - Sequence< SvtSecurityOptions::Certificate > m_seqTrustedAuthors; - sal_Bool m_bDisableMacros; - - sal_Bool m_bROSecureURLs; - sal_Bool m_bROSaveOrSend; - sal_Bool m_bROSigning; - sal_Bool m_bROPrint; - sal_Bool m_bROCreatePDF; - sal_Bool m_bRORemoveInfo; + sal_Int32 m_nSecLevel; + Sequence< SvtSecurityOptions::Certificate > m_seqTrustedAuthors; + sal_Bool m_bDisableMacros; + + sal_Bool m_bROSecureURLs; + sal_Bool m_bROSaveOrSend; + sal_Bool m_bROSigning; + sal_Bool m_bROPrint; + sal_Bool m_bROCreatePDF; + sal_Bool m_bRORemoveInfo; sal_Bool m_bRORecommendPwd; sal_Bool m_bROCtrlClickHyperlink; - sal_Bool m_bROSecLevel; - sal_Bool m_bROTrustedAuthors; - sal_Bool m_bRODisableMacros; + sal_Bool m_bROSecLevel; + sal_Bool m_bROTrustedAuthors; + sal_Bool m_bRODisableMacros; // xmlsec05 depricated @@ -274,37 +274,37 @@ private: void SetConfirmationEnabled( sal_Bool bSet ); sal_Bool IsExecutePlugins() const; void SetExecutePlugins( sal_Bool bSet ); - EBasicSecurityMode GetBasicMode ( ) const ; - void SetBasicMode ( EBasicSecurityMode eMode ) ; + EBasicSecurityMode GetBasicMode ( ) const ; + void SetBasicMode ( EBasicSecurityMode eMode ) ; }; //_________________________________________________________________________________________________________________ -// definitions +// definitions //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** SvtSecurityOptions_Impl::SvtSecurityOptions_Impl() - :ConfigItem ( ROOTNODE_SECURITY ) - ,m_seqSecureURLs ( DEFAULT_SECUREURL ) - ,m_bSaveOrSend ( sal_True ) - ,m_bSigning ( sal_True ) - ,m_bPrint ( sal_True ) - ,m_bCreatePDF ( sal_True ) - ,m_bRemoveInfo ( sal_True ) - ,m_nSecLevel ( sal_True ) - ,m_seqTrustedAuthors ( DEFAULT_TRUSTEDAUTHORS ) - ,m_bDisableMacros ( sal_False ) - ,m_bROSecureURLs ( CFG_READONLY_DEFAULT ) - ,m_bROSaveOrSend ( CFG_READONLY_DEFAULT ) - ,m_bROSigning ( CFG_READONLY_DEFAULT ) - ,m_bROPrint ( CFG_READONLY_DEFAULT ) - ,m_bROCreatePDF ( CFG_READONLY_DEFAULT ) - ,m_bRORemoveInfo ( CFG_READONLY_DEFAULT ) - ,m_bROSecLevel ( CFG_READONLY_DEFAULT ) - ,m_bROTrustedAuthors ( CFG_READONLY_DEFAULT ) - ,m_bRODisableMacros ( sal_True ) // currently is not intended to be changed + :ConfigItem ( ROOTNODE_SECURITY ) + ,m_seqSecureURLs ( DEFAULT_SECUREURL ) + ,m_bSaveOrSend ( sal_True ) + ,m_bSigning ( sal_True ) + ,m_bPrint ( sal_True ) + ,m_bCreatePDF ( sal_True ) + ,m_bRemoveInfo ( sal_True ) + ,m_nSecLevel ( sal_True ) + ,m_seqTrustedAuthors ( DEFAULT_TRUSTEDAUTHORS ) + ,m_bDisableMacros ( sal_False ) + ,m_bROSecureURLs ( CFG_READONLY_DEFAULT ) + ,m_bROSaveOrSend ( CFG_READONLY_DEFAULT ) + ,m_bROSigning ( CFG_READONLY_DEFAULT ) + ,m_bROPrint ( CFG_READONLY_DEFAULT ) + ,m_bROCreatePDF ( CFG_READONLY_DEFAULT ) + ,m_bRORemoveInfo ( CFG_READONLY_DEFAULT ) + ,m_bROSecLevel ( CFG_READONLY_DEFAULT ) + ,m_bROTrustedAuthors ( CFG_READONLY_DEFAULT ) + ,m_bRODisableMacros ( sal_True ) // currently is not intended to be changed // xmlsec05 depricated , m_eBasicMode ( DEFAULT_STAROFFICEBASIC ) @@ -318,9 +318,9 @@ SvtSecurityOptions_Impl::SvtSecurityOptions_Impl() // xmlsec05 depricated { - Sequence< OUString > seqNames = GetPropertyNames ( ); - Sequence< Any > seqValues = GetProperties ( seqNames ); - Sequence< sal_Bool > seqRO = GetReadOnlyStates ( seqNames ); + Sequence< OUString > seqNames = GetPropertyNames ( ); + Sequence< Any > seqValues = GetProperties ( seqNames ); + Sequence< sal_Bool > seqRO = GetReadOnlyStates ( seqNames ); // Safe impossible cases. // We need values from ALL configuration keys. @@ -328,7 +328,7 @@ SvtSecurityOptions_Impl::SvtSecurityOptions_Impl() DBG_ASSERT( !(seqNames.getLength()!=seqValues.getLength()), "SvtSecurityOptions_Impl::SvtSecurityOptions_Impl()\nI miss some values of configuration keys!\n" ); // Copy values from list in right order to our internal member. - sal_Int32 nPropertyCount = seqValues.getLength(); + sal_Int32 nPropertyCount = seqValues.getLength(); for( sal_Int32 nProperty = 0 ; nProperty < nPropertyCount ; ++nProperty ) SetProperty( nProperty, seqValues[ nProperty ], seqRO[ nProperty ] ); @@ -341,7 +341,7 @@ SvtSecurityOptions_Impl::SvtSecurityOptions_Impl() } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** SvtSecurityOptions_Impl::~SvtSecurityOptions_Impl() { @@ -357,8 +357,8 @@ void SvtSecurityOptions_Impl::SetProperty( sal_Int32 nProperty, const Any& rValu { m_seqSecureURLs.realloc( 0 ); rValue >>= m_seqSecureURLs; - SvtPathOptions aOpt; - sal_uInt32 nCount = m_seqSecureURLs.getLength(); + SvtPathOptions aOpt; + sal_uInt32 nCount = m_seqSecureURLs.getLength(); for( sal_uInt32 nItem = 0 ; nItem < nCount ; ++nItem ) m_seqSecureURLs[ nItem ] = aOpt.SubstituteVariable( m_seqSecureURLs[ nItem ] ); m_bROSecureURLs = bRO; @@ -475,17 +475,17 @@ void SvtSecurityOptions_Impl::SetProperty( sal_Int32 nProperty, const Any& rValu void SvtSecurityOptions_Impl::LoadAuthors( void ) { - m_seqTrustedAuthors.realloc( 0 ); // first clear - Sequence< OUString > lAuthors = GetNodeNames( PROPERTYNAME_MACRO_TRUSTEDAUTHORS ); - sal_Int32 c1 = lAuthors.getLength(); + m_seqTrustedAuthors.realloc( 0 ); // first clear + Sequence< OUString > lAuthors = GetNodeNames( PROPERTYNAME_MACRO_TRUSTEDAUTHORS ); + sal_Int32 c1 = lAuthors.getLength(); if( c1 ) { - sal_Int32 c2 = c1 * 3; // 3 Properties inside Struct TrustedAuthor - Sequence< OUString > lAllAuthors( c2 ); + sal_Int32 c2 = c1 * 3; // 3 Properties inside Struct TrustedAuthor + Sequence< OUString > lAllAuthors( c2 ); - sal_Int32 i1; - sal_Int32 i2; - OUString aSep( RTL_CONSTASCII_USTRINGPARAM( "/" ) ); + sal_Int32 i1; + sal_Int32 i2; + OUString aSep( RTL_CONSTASCII_USTRINGPARAM( "/" ) ); for( i1 = 0, i2 = 0 ; i1 < c1 ; ++i1 ) { lAllAuthors[ i2 ] = PROPERTYNAME_MACRO_TRUSTEDAUTHORS + aSep + lAuthors[ i1 ] + aSep + PROPERTYNAME_TRUSTEDAUTHOR_SUBJECTNAME; @@ -496,7 +496,7 @@ void SvtSecurityOptions_Impl::LoadAuthors( void ) ++i2; } - Sequence< Any > lValues = GetProperties( lAllAuthors ); + Sequence< Any > lValues = GetProperties( lAllAuthors ); if( lValues.getLength() == c2 ) { m_seqTrustedAuthors.realloc( c1 ); @@ -517,7 +517,7 @@ void SvtSecurityOptions_Impl::LoadAuthors( void ) sal_Int32 SvtSecurityOptions_Impl::GetHandle( const OUString& rName ) { - sal_Int32 nHandle; + sal_Int32 nHandle; if( rName.compareToAscii( CSTR_SECUREURL ) == 0 ) nHandle = PROPERTYHANDLE_SECUREURL; @@ -603,13 +603,13 @@ bool SvtSecurityOptions_Impl::GetOption( SvtSecurityOptions::EOption eOption, sa void SvtSecurityOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames ) { // Use given list of updated properties to get his values from configuration directly! - Sequence< Any > seqValues = GetProperties( seqPropertyNames ); - Sequence< sal_Bool > seqRO = GetReadOnlyStates( seqPropertyNames ); + Sequence< Any > seqValues = GetProperties( seqPropertyNames ); + Sequence< sal_Bool > seqRO = GetReadOnlyStates( seqPropertyNames ); // Safe impossible cases. // We need values from ALL notified configuration keys. DBG_ASSERT( !(seqPropertyNames.getLength()!=seqValues.getLength()), "SvtSecurityOptions_Impl::Notify()\nI miss some values of configuration keys!\n" ); // Step over list of property names and get right value from coreesponding value list to set it on internal members! - sal_Int32 nCount = seqPropertyNames.getLength(); + sal_Int32 nCount = seqPropertyNames.getLength(); for( sal_Int32 nProperty = 0 ; nProperty < nCount ; ++nProperty ) SetProperty( GetHandle( seqPropertyNames[ nProperty ] ), seqValues[ nProperty ], seqRO[ nProperty ] ); @@ -626,7 +626,7 @@ void SvtSecurityOptions_Impl::Commit() Sequence< OUString > lNames(nOrgCount); Sequence< Any > lValues(nOrgCount); sal_Int32 nRealCount = 0; - bool bDone; + bool bDone; ClearNodeSet( PROPERTYNAME_MACRO_TRUSTEDAUTHORS ); @@ -639,9 +639,9 @@ void SvtSecurityOptions_Impl::Commit() bDone = !m_bROSecureURLs; if( bDone ) { - Sequence< OUString > lURLs( m_seqSecureURLs ); - SvtPathOptions aOpt; - sal_Int32 nURLsCnt = lURLs.getLength(); + Sequence< OUString > lURLs( m_seqSecureURLs ); + SvtPathOptions aOpt; + sal_Int32 nURLsCnt = lURLs.getLength(); for( sal_Int32 nItem = 0 ; nItem < nURLsCnt ; ++nItem ) lURLs[ nItem ] = aOpt.UseVariable( lURLs[ nItem ] ); lValues[ nRealCount ] <<= lURLs; @@ -718,20 +718,20 @@ void SvtSecurityOptions_Impl::Commit() bDone = !m_bROTrustedAuthors; if( bDone ) { - sal_Int32 nCnt = m_seqTrustedAuthors.getLength(); + sal_Int32 nCnt = m_seqTrustedAuthors.getLength(); if( nCnt ) { - String s; + String s; s.AppendAscii( CSTR_MACRO_TRUSTEDAUTHORS ); s.AppendAscii( "/a" ); Sequence< Sequence< com::sun::star::beans::PropertyValue > > lPropertyValuesSeq( nCnt ); for( sal_Int32 i = 0 ; i < nCnt ; ++i ) { - String aPrefix( s ); + String aPrefix( s ); aPrefix += String::CreateFromInt32( i ); aPrefix.AppendAscii( "/" ); - Sequence< com::sun::star::beans::PropertyValue > lPropertyValues( 3 ); + Sequence< com::sun::star::beans::PropertyValue > lPropertyValues( 3 ); lPropertyValues[ 0 ].Name = aPrefix + PROPERTYNAME_TRUSTEDAUTHOR_SUBJECTNAME; lPropertyValues[ 0 ].Value <<= m_seqTrustedAuthors[ i ][0]; lPropertyValues[ 1 ].Name = aPrefix + PROPERTYNAME_TRUSTEDAUTHOR_SERIALNUMBER; @@ -743,7 +743,7 @@ void SvtSecurityOptions_Impl::Commit() SetSetProperties( PROPERTYNAME_MACRO_TRUSTEDAUTHORS, lPropertyValues ); } - bDone = false; // because we save in loop above! + bDone = false; // because we save in loop above! } else bDone = false; @@ -810,7 +810,7 @@ void SvtSecurityOptions_Impl::Commit() sal_Bool SvtSecurityOptions_Impl::IsReadOnly( SvtSecurityOptions::EOption eOption ) const { - sal_Bool bReadonly; + sal_Bool bReadonly; switch(eOption) { case SvtSecurityOptions::E_SECUREURLS : @@ -886,8 +886,8 @@ void SvtSecurityOptions_Impl::SetSecureURLs( const Sequence< OUString >& seqURLL } } -sal_Bool SvtSecurityOptions_Impl::IsSecureURL( const OUString& sURL , - const OUString& sReferer) const +sal_Bool SvtSecurityOptions_Impl::IsSecureURL( const OUString& sURL , + const OUString& sReferer) const { sal_Bool bState = sal_False; @@ -982,9 +982,9 @@ sal_Bool SvtSecurityOptions_Impl::IsTrustedAuthorsEnabled() sal_Bool SvtSecurityOptions_Impl::IsOptionSet( SvtSecurityOptions::EOption eOption ) const { - sal_Bool* pValue; - sal_Bool* pRO; - sal_Bool bRet = sal_False; + sal_Bool* pValue; + sal_Bool* pRO; + sal_Bool bRet = sal_False; if( ( const_cast< SvtSecurityOptions_Impl* >( this ) )->GetOption( eOption, pValue, pRO ) ) bRet = *pValue; @@ -994,9 +994,9 @@ sal_Bool SvtSecurityOptions_Impl::IsOptionSet( SvtSecurityOptions::EOption eOpti sal_Bool SvtSecurityOptions_Impl::SetOption( SvtSecurityOptions::EOption eOption, sal_Bool bValue ) { - sal_Bool* pValue; - sal_Bool* pRO; - sal_Bool bRet = sal_False; + sal_Bool* pValue; + sal_Bool* pRO; + sal_Bool bRet = sal_False; if( GetOption( eOption, pValue, pRO ) ) { @@ -1016,9 +1016,9 @@ sal_Bool SvtSecurityOptions_Impl::SetOption( SvtSecurityOptions::EOption eOption sal_Bool SvtSecurityOptions_Impl::IsOptionEnabled( SvtSecurityOptions::EOption eOption ) const { - sal_Bool* pValue; - sal_Bool* pRO; - sal_Bool bRet = sal_False; + sal_Bool* pValue; + sal_Bool* pRO; + sal_Bool bRet = sal_False; if( ( const_cast< SvtSecurityOptions_Impl* >( this ) )->GetOption( eOption, pValue, pRO ) ) bRet = !*pRO; @@ -1054,12 +1054,12 @@ Sequence< OUString > SvtSecurityOptions_Impl::GetPropertyNames() } //***************************************************************************************************************** -// 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 //***************************************************************************************************************** -SvtSecurityOptions_Impl* SvtSecurityOptions::m_pDataContainer = NULL ; -sal_Int32 SvtSecurityOptions::m_nRefCount = 0 ; +SvtSecurityOptions_Impl* SvtSecurityOptions::m_pDataContainer = NULL ; +sal_Int32 SvtSecurityOptions::m_nRefCount = 0 ; SvtSecurityOptions::SvtSecurityOptions() { @@ -1110,8 +1110,8 @@ void SvtSecurityOptions::SetSecureURLs( const Sequence< OUString >& seqURLList ) m_pDataContainer->SetSecureURLs( seqURLList ); } -sal_Bool SvtSecurityOptions::IsSecureURL( const OUString& sURL , - const OUString& sReferer ) const +sal_Bool SvtSecurityOptions::IsSecureURL( const OUString& sURL , + const OUString& sReferer ) const { MutexGuard aGuard( GetInitMutex() ); return m_pDataContainer->IsSecureURL( sURL, sReferer ); @@ -1141,7 +1141,7 @@ Sequence< SvtSecurityOptions::Certificate > SvtSecurityOptions::GetTrustedAuthor return m_pDataContainer->GetTrustedAuthors(); } -void SvtSecurityOptions::SetTrustedAuthors( const Sequence< Certificate >& rAuthors ) +void SvtSecurityOptions::SetTrustedAuthors( const Sequence< Certificate >& rAuthors ) { MutexGuard aGuard( GetInitMutex() ); m_pDataContainer->SetTrustedAuthors( rAuthors ); diff --git a/unotools/source/config/sourceviewconfig.cxx b/unotools/source/config/sourceviewconfig.cxx index cb37db74138d..0c85132478c9 100644 --- a/unotools/source/config/sourceviewconfig.cxx +++ b/unotools/source/config/sourceviewconfig.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 @@ public: ~SourceViewConfig_Impl(); virtual void Notify( const Sequence< rtl::OUString >& aPropertyNames ); - virtual void Commit(); + virtual void Commit(); const rtl::OUString& GetFontName() const {return m_sFontName;} diff --git a/unotools/source/config/startoptions.cxx b/unotools/source/config/startoptions.cxx index d6012c0ad84f..a4a0572f2eda 100644 --- a/unotools/source/config/startoptions.cxx +++ b/unotools/source/config/startoptions.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 @@ #endif //_________________________________________________________________________________________________________________ -// includes +// includes //_________________________________________________________________________________________________________________ #include <unotools/startoptions.hxx> @@ -44,158 +44,158 @@ #include <rtl/logfile.hxx> #include "itemholder1.hxx" //_________________________________________________________________________________________________________________ -// namespaces +// namespaces //_________________________________________________________________________________________________________________ -using namespace ::utl ; -using namespace ::rtl ; -using namespace ::osl ; -using namespace ::com::sun::star::uno ; +using namespace ::utl ; +using namespace ::rtl ; +using namespace ::osl ; +using namespace ::com::sun::star::uno ; //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ -#define DEFAULT_SHOWINTRO sal_True -#define DEFAULT_CONNECTIONURL OUString() +#define DEFAULT_SHOWINTRO sal_True +#define DEFAULT_CONNECTIONURL OUString() -#define ROOTNODE_START OUString(RTL_CONSTASCII_USTRINGPARAM("Setup/Office" )) -#define PROPERTYNAME_SHOWINTRO OUString(RTL_CONSTASCII_USTRINGPARAM("ooSetupShowIntro" )) -#define PROPERTYNAME_CONNECTIONURL OUString(RTL_CONSTASCII_USTRINGPARAM("ooSetupConnectionURL" )) +#define ROOTNODE_START OUString(RTL_CONSTASCII_USTRINGPARAM("Setup/Office" )) +#define PROPERTYNAME_SHOWINTRO OUString(RTL_CONSTASCII_USTRINGPARAM("ooSetupShowIntro" )) +#define PROPERTYNAME_CONNECTIONURL OUString(RTL_CONSTASCII_USTRINGPARAM("ooSetupConnectionURL" )) -#define PROPERTYHANDLE_SHOWINTRO 0 -#define PROPERTYHANDLE_CONNECTIONURL 1 +#define PROPERTYHANDLE_SHOWINTRO 0 +#define PROPERTYHANDLE_CONNECTIONURL 1 -#define PROPERTYCOUNT 2 +#define PROPERTYCOUNT 2 //_________________________________________________________________________________________________________________ -// private declarations! +// private declarations! //_________________________________________________________________________________________________________________ class SvtStartOptions_Impl : public ConfigItem { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: //--------------------------------------------------------------------------------------------------------- - // constructor / destructor + // constructor / destructor //--------------------------------------------------------------------------------------------------------- SvtStartOptions_Impl(); ~SvtStartOptions_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. - @ATTENTION We don't implement these method - because we support readonly values at runtime only! + @ATTENTION We don't implement these method - because we support readonly values at runtime only! - @seealso baseclass ConfigItem + @seealso baseclass ConfigItem - @param "seqPropertyNames" is the list of properties which should be updated. - @return - + @param "seqPropertyNames" is the list of properties which should be updated. + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual void Notify( const Sequence< OUString >& seqPropertyNames ); /*-****************************************************************************************************//** - @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. - @ATTENTION We don't implement these method - because we support readonly values at runtime only! + @ATTENTION We don't implement these method - because we support readonly values at runtime only! - @seealso baseclass ConfigItem + @seealso baseclass ConfigItem - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual void Commit(); //--------------------------------------------------------------------------------------------------------- - // public interface + // public interface //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short access method to get internal values - @descr These method give us a chance to regulate acces to ouer internal values. + @short access method to get internal values + @descr These method give us a chance to regulate acces to ouer internal values. It's not used in the moment - but it's possible for the feature! - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ - sal_Bool IsIntroEnabled ( ) const ; - void EnableIntro ( sal_Bool bState ) ; - OUString GetConnectionURL( ) const ; - void SetConnectionURL( const OUString& sURL ) ; + sal_Bool IsIntroEnabled ( ) const ; + void EnableIntro ( sal_Bool bState ) ; + OUString GetConnectionURL( ) const ; + void SetConnectionURL( const OUString& sURL ) ; //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: /*-****************************************************************************************************//** - @short return list of fix key names of ouer configuration management which represent oue module tree - @descr These methods return a static const list of key names. We need it to get needed values from our + @short return list of fix key names of ouer configuration management which represent oue module tree + @descr These methods return a static const list of key names. We need it to get needed values from our configuration management. We return well known key names only - because the "UserData" node is handled in a special way! - @seealso - + @seealso - - @param - - @return A list of needed configuration keys is returned. + @param - + @return A list of needed configuration keys is returned. - @onerror - + @onerror - *//*-*****************************************************************************************************/ static Sequence< OUString > impl_GetPropertyNames(); //------------------------------------------------------------------------------------------------------------- - // private member + // private member //------------------------------------------------------------------------------------------------------------- private: - sal_Bool m_bShowIntro ; /// cache "ShowIntro" of Start section - OUString m_sConnectionURL ; /// cache "Connection" of Start section + sal_Bool m_bShowIntro ; /// cache "ShowIntro" of Start section + OUString m_sConnectionURL ; /// cache "Connection" of Start section }; //_________________________________________________________________________________________________________________ -// definitions +// definitions //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** SvtStartOptions_Impl::SvtStartOptions_Impl() // Init baseclasses first - : ConfigItem ( ROOTNODE_START ) + : ConfigItem ( ROOTNODE_START ) // Init member then. - , m_bShowIntro ( DEFAULT_SHOWINTRO ) + , m_bShowIntro ( DEFAULT_SHOWINTRO ) { // Use our static list of configuration keys to get his values. - Sequence< OUString > seqNames = impl_GetPropertyNames(); - Sequence< Any > seqValues = GetProperties( seqNames ) ; + Sequence< OUString > seqNames = impl_GetPropertyNames(); + Sequence< Any > seqValues = GetProperties( seqNames ) ; // Safe impossible cases. // We need values from ALL configuration keys. @@ -203,8 +203,8 @@ SvtStartOptions_Impl::SvtStartOptions_Impl() DBG_ASSERT( !(seqNames.getLength()!=seqValues.getLength()), "SvtStartOptions_Impl::SvtStartOptions_Impl()\nI miss some values of configuration keys!\n" ); // Copy values from list in right order to ouer internal member. - sal_Int32 nPropertyCount = seqValues.getLength() ; - sal_Int32 nProperty = 0 ; + sal_Int32 nPropertyCount = seqValues.getLength() ; + sal_Int32 nProperty = 0 ; for( nProperty=0; nProperty<nPropertyCount; ++nProperty ) { // Safe impossible cases. @@ -212,13 +212,13 @@ SvtStartOptions_Impl::SvtStartOptions_Impl() DBG_ASSERT( !(seqValues[nProperty].hasValue()==sal_False), "SvtStartOptions_Impl::SvtStartOptions_Impl()\nInvalid property value for property detected!\n" ); switch( nProperty ) { - case PROPERTYHANDLE_SHOWINTRO : { + case PROPERTYHANDLE_SHOWINTRO : { DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtStartOptions_Impl::SvtStartOptions_Impl()\nWho has changed the value type of \"Office.Common\\Start\\ShowIntro\"?" ); seqValues[nProperty] >>= m_bShowIntro; } break; - case PROPERTYHANDLE_CONNECTIONURL : { + case PROPERTYHANDLE_CONNECTIONURL : { DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_STRING), "SvtStartOptions_Impl::SvtStartOptions_Impl()\nWho has changed the value type of \"Office.Common\\Start\\Connection\"?" ); seqValues[nProperty] >>= m_sConnectionURL; } @@ -231,7 +231,7 @@ SvtStartOptions_Impl::SvtStartOptions_Impl() } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** SvtStartOptions_Impl::~SvtStartOptions_Impl() { @@ -243,7 +243,7 @@ SvtStartOptions_Impl::~SvtStartOptions_Impl() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtStartOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames ) { @@ -274,23 +274,23 @@ void SvtStartOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtStartOptions_Impl::Commit() { // Get names of supported properties, create a list for values and copy current values to it. - Sequence< OUString > seqNames = impl_GetPropertyNames(); - sal_Int32 nCount = seqNames.getLength(); - Sequence< Any > seqValues ( nCount ); + Sequence< OUString > seqNames = impl_GetPropertyNames(); + sal_Int32 nCount = seqNames.getLength(); + Sequence< Any > seqValues ( nCount ); for( sal_Int32 nProperty=0; nProperty<nCount; ++nProperty ) { switch( nProperty ) { - case PROPERTYHANDLE_SHOWINTRO : { + case PROPERTYHANDLE_SHOWINTRO : { seqValues[nProperty] <<= m_bShowIntro; } break; - case PROPERTYHANDLE_CONNECTIONURL : { + case PROPERTYHANDLE_CONNECTIONURL : { seqValues[nProperty] <<= m_sConnectionURL; } break; @@ -301,7 +301,7 @@ void SvtStartOptions_Impl::Commit() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Bool SvtStartOptions_Impl::IsIntroEnabled() const { @@ -309,7 +309,7 @@ sal_Bool SvtStartOptions_Impl::IsIntroEnabled() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtStartOptions_Impl::EnableIntro( sal_Bool bState ) { @@ -318,7 +318,7 @@ void SvtStartOptions_Impl::EnableIntro( sal_Bool bState ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** OUString SvtStartOptions_Impl::GetConnectionURL() const { @@ -326,7 +326,7 @@ OUString SvtStartOptions_Impl::GetConnectionURL() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtStartOptions_Impl::SetConnectionURL( const OUString& sURL ) { @@ -335,15 +335,15 @@ void SvtStartOptions_Impl::SetConnectionURL( const OUString& sURL ) } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** Sequence< OUString > SvtStartOptions_Impl::impl_GetPropertyNames() { // Build static list of configuration key names. static const OUString pProperties[] = { - PROPERTYNAME_SHOWINTRO , - PROPERTYNAME_CONNECTIONURL , + PROPERTYNAME_SHOWINTRO , + PROPERTYNAME_CONNECTIONURL , }; // Initialize return sequence with these list ... static const Sequence< OUString > seqPropertyNames( pProperties, PROPERTYCOUNT ); @@ -352,15 +352,15 @@ Sequence< OUString > SvtStartOptions_Impl::impl_GetPropertyNames() } //***************************************************************************************************************** -// 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 //***************************************************************************************************************** -SvtStartOptions_Impl* SvtStartOptions::m_pDataContainer = NULL ; -sal_Int32 SvtStartOptions::m_nRefCount = 0 ; +SvtStartOptions_Impl* SvtStartOptions::m_pDataContainer = NULL ; +sal_Int32 SvtStartOptions::m_nRefCount = 0 ; //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** SvtStartOptions::SvtStartOptions() { @@ -379,7 +379,7 @@ SvtStartOptions::SvtStartOptions() } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** SvtStartOptions::~SvtStartOptions() { @@ -397,7 +397,7 @@ SvtStartOptions::~SvtStartOptions() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Bool SvtStartOptions::IsIntroEnabled() const { @@ -406,7 +406,7 @@ sal_Bool SvtStartOptions::IsIntroEnabled() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtStartOptions::EnableIntro( sal_Bool bState ) { @@ -415,7 +415,7 @@ void SvtStartOptions::EnableIntro( sal_Bool bState ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** OUString SvtStartOptions::GetConnectionURL() const { @@ -424,7 +424,7 @@ OUString SvtStartOptions::GetConnectionURL() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtStartOptions::SetConnectionURL( const OUString& sURL ) { @@ -433,7 +433,7 @@ void SvtStartOptions::SetConnectionURL( const OUString& sURL ) } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** Mutex& SvtStartOptions::GetOwnStaticMutex() { diff --git a/unotools/source/config/syslocaleoptions.cxx b/unotools/source/config/syslocaleoptions.cxx index 35333b0db6a8..67c435c8c12c 100644 --- a/unotools/source/config/syslocaleoptions.cxx +++ b/unotools/source/config/syslocaleoptions.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 @@ -81,10 +81,10 @@ com::sun::star::lang::Locale lcl_str_to_locale( const ::rtl::OUString rStr ) class SvtSysLocaleOptions_Impl : public utl::ConfigItem { - Locale m_aRealLocale; - Locale m_aRealUILocale; - LanguageType m_eRealLanguage; - LanguageType m_eRealUILanguage; + Locale m_aRealLocale; + Locale m_aRealUILocale; + LanguageType m_eRealLanguage; + LanguageType m_eRealUILanguage; OUString m_aLocaleString; // en-US or de-DE or empty for SYSTEM OUString m_aUILocaleString; // en-US or de-DE or empty for SYSTEM OUString m_aCurrencyString; // USD-en-US or EUR-de-DE @@ -97,8 +97,8 @@ class SvtSysLocaleOptions_Impl : public utl::ConfigItem sal_Bool m_bRODecimalSeparator; static const Sequence< /* const */ OUString > GetPropertyNames(); - void MakeRealLocale(); - void MakeRealUILocale(); + void MakeRealLocale(); + void MakeRealUILocale(); public: SvtSysLocaleOptions_Impl(); @@ -123,26 +123,26 @@ public: void SetDecimalSeparatorAsLocale( sal_Bool bSet); sal_Bool IsReadOnly( SvtSysLocaleOptions::EOption eOption ) const; - const Locale& GetRealLocale() { return m_aRealLocale; } - const Locale& GetRealUILocale() { return m_aRealUILocale; } - LanguageType GetRealLanguage() { return m_eRealLanguage; } - LanguageType GetRealUILanguage() { return m_eRealUILanguage; } + const Locale& GetRealLocale() { return m_aRealLocale; } + const Locale& GetRealUILocale() { return m_aRealUILocale; } + LanguageType GetRealLanguage() { return m_eRealLanguage; } + LanguageType GetRealUILanguage() { return m_eRealUILanguage; } }; -#define ROOTNODE_SYSLOCALE OUString(RTL_CONSTASCII_USTRINGPARAM("Setup/L10N")) +#define ROOTNODE_SYSLOCALE OUString(RTL_CONSTASCII_USTRINGPARAM("Setup/L10N")) -#define PROPERTYNAME_LOCALE OUString(RTL_CONSTASCII_USTRINGPARAM("ooSetupSystemLocale")) -#define PROPERTYNAME_UILOCALE OUString(RTL_CONSTASCII_USTRINGPARAM("ooLocale")) -#define PROPERTYNAME_CURRENCY OUString(RTL_CONSTASCII_USTRINGPARAM("ooSetupCurrency")) -#define PROPERTYNAME_DECIMALSEPARATOR OUString(RTL_CONSTASCII_USTRINGPARAM("DecimalSeparatorAsLocale")) +#define PROPERTYNAME_LOCALE OUString(RTL_CONSTASCII_USTRINGPARAM("ooSetupSystemLocale")) +#define PROPERTYNAME_UILOCALE OUString(RTL_CONSTASCII_USTRINGPARAM("ooLocale")) +#define PROPERTYNAME_CURRENCY OUString(RTL_CONSTASCII_USTRINGPARAM("ooSetupCurrency")) +#define PROPERTYNAME_DECIMALSEPARATOR OUString(RTL_CONSTASCII_USTRINGPARAM("DecimalSeparatorAsLocale")) -#define PROPERTYHANDLE_LOCALE 0 -#define PROPERTYHANDLE_UILOCALE 1 -#define PROPERTYHANDLE_CURRENCY 2 +#define PROPERTYHANDLE_LOCALE 0 +#define PROPERTYHANDLE_UILOCALE 1 +#define PROPERTYHANDLE_CURRENCY 2 #define PROPERTYHANDLE_DECIMALSEPARATOR 3 -#define PROPERTYCOUNT 4 +#define PROPERTYCOUNT 4 const Sequence< OUString > SvtSysLocaleOptions_Impl::GetPropertyNames() { diff --git a/unotools/source/config/undoopt.cxx b/unotools/source/config/undoopt.cxx index 25cb7837008f..db229baf4f5c 100644 --- a/unotools/source/config/undoopt.cxx +++ b/unotools/source/config/undoopt.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/unotools/source/config/useroptions.cxx b/unotools/source/config/useroptions.cxx index 6c63bbfee34b..e8292ae7031b 100644 --- a/unotools/source/config/useroptions.cxx +++ b/unotools/source/config/useroptions.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 @@ -108,26 +108,26 @@ public: ::rtl::OUString GetLocale() const { return m_aLocale; } // set the address token - void SetCompany( const ::rtl::OUString& rNewToken ); - void SetFirstName( const ::rtl::OUString& rNewToken ); - void SetLastName( const ::rtl::OUString& rNewToken ); - void SetID( const ::rtl::OUString& rNewToken ); - void SetStreet( const ::rtl::OUString& rNewToken ); - void SetCity( const ::rtl::OUString& rNewToken ); - void SetState( const ::rtl::OUString& rNewToken ); - void SetZip( const ::rtl::OUString& rNewToken ); - void SetCountry( const ::rtl::OUString& rNewToken ); - void SetPosition( const ::rtl::OUString& rNewToken ); - void SetTitle( const ::rtl::OUString& rNewToken ); - void SetTelephoneHome( const ::rtl::OUString& rNewToken ); - void SetTelephoneWork( const ::rtl::OUString& rNewToken ); - void SetFax( const ::rtl::OUString& rNewToken ); - void SetEmail( const ::rtl::OUString& rNewToken ); - void SetCustomerNumber( const ::rtl::OUString& rNewToken ); + void SetCompany( const ::rtl::OUString& rNewToken ); + void SetFirstName( const ::rtl::OUString& rNewToken ); + void SetLastName( const ::rtl::OUString& rNewToken ); + void SetID( const ::rtl::OUString& rNewToken ); + void SetStreet( const ::rtl::OUString& rNewToken ); + void SetCity( const ::rtl::OUString& rNewToken ); + void SetState( const ::rtl::OUString& rNewToken ); + void SetZip( const ::rtl::OUString& rNewToken ); + void SetCountry( const ::rtl::OUString& rNewToken ); + void SetPosition( const ::rtl::OUString& rNewToken ); + void SetTitle( const ::rtl::OUString& rNewToken ); + void SetTelephoneHome( const ::rtl::OUString& rNewToken ); + void SetTelephoneWork( const ::rtl::OUString& rNewToken ); + void SetFax( const ::rtl::OUString& rNewToken ); + void SetEmail( const ::rtl::OUString& rNewToken ); + void SetCustomerNumber( const ::rtl::OUString& rNewToken ); void SetFathersName( const ::rtl::OUString& rNewToken ); void SetApartment( const ::rtl::OUString& rNewToken ); - sal_Bool IsTokenReadonly( USHORT nToken ) const; + sal_Bool IsTokenReadonly( USHORT nToken ) const; ::rtl::OUString GetToken(USHORT nToken) const; void Notify(); @@ -140,10 +140,10 @@ private: // global ---------------------------------------------------------------- -static SvtUserOptions_Impl* pOptions = NULL; -static sal_Int32 nRefCount = 0; +static SvtUserOptions_Impl* pOptions = NULL; +static sal_Int32 nRefCount = 0; -#define READONLY_DEFAULT sal_False +#define READONLY_DEFAULT sal_False /*-- 16.06.2009 14:22:56--------------------------------------------------- @@ -950,7 +950,7 @@ SvtUserOptions::~SvtUserOptions() if ( !--nRefCount ) { //if ( pOptions->IsModified() ) - // pOptions->Commit(); + // pOptions->Commit(); DELETEZ( pOptions ); } } diff --git a/unotools/source/config/viewoptions.cxx b/unotools/source/config/viewoptions.cxx index 7f2250c611fc..a13641504430 100644 --- a/unotools/source/config/viewoptions.cxx +++ b/unotools/source/config/viewoptions.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_unotools.hxx" //_________________________________________________________________________________________________________________ -// includes +// includes //_________________________________________________________________________________________________________________ #include <unotools/viewoptions.hxx> @@ -47,13 +47,13 @@ #include <itemholder1.hxx> //_________________________________________________________________________________________________________________ -// namespaces +// namespaces //_________________________________________________________________________________________________________________ namespace css = ::com::sun::star; //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ #ifdef CONST_ASCII @@ -107,7 +107,7 @@ namespace css = ::com::sun::star; } //_________________________________________________________________________________________________________________ -// initialization! +// initialization! //_________________________________________________________________________________________________________________ SvtViewOptionsBase_Impl* SvtViewOptions::m_pDataContainer_Dialogs = NULL ; @@ -120,7 +120,7 @@ SvtViewOptionsBase_Impl* SvtViewOptions::m_pDataContainer_Windows = NUL sal_Int32 SvtViewOptions::m_nRefCount_Windows = 0 ; //_________________________________________________________________________________________________________________ -// private declarations! +// private declarations! //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** @@ -797,16 +797,16 @@ css::uno::Reference< css::uno::XInterface > SvtViewOptionsBase_Impl::impl_getSet } //_________________________________________________________________________________________________________________ -// definitions +// definitions //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** SvtViewOptions::SvtViewOptions( EViewType eType , const ::rtl::OUString& sViewName ) - : m_eViewType ( eType ) - , m_sViewName ( sViewName ) + : m_eViewType ( eType ) + , m_sViewName ( sViewName ) { // Global access, must be guarded (multithreading!) ::osl::MutexGuard aGuard( GetOwnStaticMutex() ); @@ -814,7 +814,7 @@ SvtViewOptions::SvtViewOptions( EViewType eType , // Search for right dat container for this view type and initialize right data container or set right ref count! switch( eType ) { - case E_DIALOG : { + case E_DIALOG : { // Increase ref count for dialog data container first. ++m_nRefCount_Dialogs; // If these instance the first user of the dialog data container - create these impl static container! @@ -826,7 +826,7 @@ SvtViewOptions::SvtViewOptions( EViewType eType , } } break; - case E_TABDIALOG : { + case E_TABDIALOG : { // Increase ref count for tab-dialog data container first. ++m_nRefCount_TabDialogs; // If these instance the first user of the tab-dialog data container - create these impl static container! @@ -837,7 +837,7 @@ SvtViewOptions::SvtViewOptions( EViewType eType , } } break; - case E_TABPAGE : { + case E_TABPAGE : { // Increase ref count for tab-page data container first. ++m_nRefCount_TabPages; // If these instance the first user of the tab-page data container - create these impl static container! @@ -848,7 +848,7 @@ SvtViewOptions::SvtViewOptions( EViewType eType , } } break; - case E_WINDOW : { + case E_WINDOW : { // Increase ref count for window data container first. ++m_nRefCount_Windows; // If these instance the first user of the window data container - create these impl static container! @@ -864,7 +864,7 @@ SvtViewOptions::SvtViewOptions( EViewType eType , } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** SvtViewOptions::~SvtViewOptions() { @@ -874,7 +874,7 @@ SvtViewOptions::~SvtViewOptions() // Search for right dat container for this view type and deinitialize right data container or set right ref count! switch( m_eViewType ) { - case E_DIALOG : { + case E_DIALOG : { // Decrease ref count for dialog data container first. --m_nRefCount_Dialogs; // If these instance the last user of the dialog data container - delete these impl static container! @@ -885,7 +885,7 @@ SvtViewOptions::~SvtViewOptions() } } break; - case E_TABDIALOG : { + case E_TABDIALOG : { // Decrease ref count for tab-dialog data container first. --m_nRefCount_TabDialogs; // If these instance the last user of the tab-dialog data container - delete these impl static container! @@ -896,7 +896,7 @@ SvtViewOptions::~SvtViewOptions() } } break; - case E_TABPAGE : { + case E_TABPAGE : { // Decrease ref count for tab-page data container first. --m_nRefCount_TabPages; // If these instance the last user of the tab-page data container - delete these impl static container! @@ -907,7 +907,7 @@ SvtViewOptions::~SvtViewOptions() } } break; - case E_WINDOW : { + case E_WINDOW : { // Decrease ref count for window data container first. --m_nRefCount_Windows; // If these instance the last user of the window data container - delete these impl static container! @@ -922,7 +922,7 @@ SvtViewOptions::~SvtViewOptions() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Bool SvtViewOptions::Exists() const { @@ -932,19 +932,19 @@ sal_Bool SvtViewOptions::Exists() const sal_Bool bExists = sal_False; switch( m_eViewType ) { - case E_DIALOG : { + case E_DIALOG : { bExists = m_pDataContainer_Dialogs->Exists( m_sViewName ); } break; - case E_TABDIALOG : { + case E_TABDIALOG : { bExists = m_pDataContainer_TabDialogs->Exists( m_sViewName ); } break; - case E_TABPAGE : { + case E_TABPAGE : { bExists = m_pDataContainer_TabPages->Exists( m_sViewName ); } break; - case E_WINDOW : { + case E_WINDOW : { bExists = m_pDataContainer_Windows->Exists( m_sViewName ); } break; @@ -953,7 +953,7 @@ sal_Bool SvtViewOptions::Exists() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Bool SvtViewOptions::Delete() { @@ -963,19 +963,19 @@ sal_Bool SvtViewOptions::Delete() sal_Bool bState = sal_False; switch( m_eViewType ) { - case E_DIALOG : { + case E_DIALOG : { bState = m_pDataContainer_Dialogs->Delete( m_sViewName ); } break; - case E_TABDIALOG : { + case E_TABDIALOG : { bState = m_pDataContainer_TabDialogs->Delete( m_sViewName ); } break; - case E_TABPAGE : { + case E_TABPAGE : { bState = m_pDataContainer_TabPages->Delete( m_sViewName ); } break; - case E_WINDOW : { + case E_WINDOW : { bState = m_pDataContainer_Windows->Delete( m_sViewName ); } break; @@ -984,7 +984,7 @@ sal_Bool SvtViewOptions::Delete() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** ::rtl::OUString SvtViewOptions::GetWindowState() const { @@ -994,19 +994,19 @@ sal_Bool SvtViewOptions::Delete() ::rtl::OUString sState; switch( m_eViewType ) { - case E_DIALOG : { + case E_DIALOG : { sState = m_pDataContainer_Dialogs->GetWindowState( m_sViewName ); } break; - case E_TABDIALOG : { + case E_TABDIALOG : { sState = m_pDataContainer_TabDialogs->GetWindowState( m_sViewName ); } break; - case E_TABPAGE : { + case E_TABPAGE : { sState = m_pDataContainer_TabPages->GetWindowState( m_sViewName ); } break; - case E_WINDOW : { + case E_WINDOW : { sState = m_pDataContainer_Windows->GetWindowState( m_sViewName ); } break; @@ -1015,7 +1015,7 @@ sal_Bool SvtViewOptions::Delete() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtViewOptions::SetWindowState( const ::rtl::OUString& sState ) { @@ -1024,19 +1024,19 @@ void SvtViewOptions::SetWindowState( const ::rtl::OUString& sState ) switch( m_eViewType ) { - case E_DIALOG : { + case E_DIALOG : { m_pDataContainer_Dialogs->SetWindowState( m_sViewName, sState ); } break; - case E_TABDIALOG : { + case E_TABDIALOG : { m_pDataContainer_TabDialogs->SetWindowState( m_sViewName, sState ); } break; - case E_TABPAGE : { + case E_TABPAGE : { m_pDataContainer_TabPages->SetWindowState( m_sViewName, sState ); } break; - case E_WINDOW : { + case E_WINDOW : { m_pDataContainer_Windows->SetWindowState( m_sViewName, sState ); } break; @@ -1044,7 +1044,7 @@ void SvtViewOptions::SetWindowState( const ::rtl::OUString& sState ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Int32 SvtViewOptions::GetPageID() const { @@ -1062,7 +1062,7 @@ sal_Int32 SvtViewOptions::GetPageID() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtViewOptions::SetPageID( sal_Int32 nID ) { @@ -1078,7 +1078,7 @@ void SvtViewOptions::SetPageID( sal_Int32 nID ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Bool SvtViewOptions::IsVisible() const { @@ -1097,7 +1097,7 @@ sal_Bool SvtViewOptions::IsVisible() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtViewOptions::SetVisible( sal_Bool bState ) { @@ -1121,19 +1121,19 @@ css::uno::Sequence< css::beans::NamedValue > SvtViewOptions::GetUserData() const css::uno::Sequence< css::beans::NamedValue > lData; switch( m_eViewType ) { - case E_DIALOG : { + case E_DIALOG : { lData = m_pDataContainer_Dialogs->GetUserData( m_sViewName ); } break; - case E_TABDIALOG : { + case E_TABDIALOG : { lData = m_pDataContainer_TabDialogs->GetUserData( m_sViewName ); } break; - case E_TABPAGE : { + case E_TABPAGE : { lData = m_pDataContainer_TabPages->GetUserData( m_sViewName ); } break; - case E_WINDOW : { + case E_WINDOW : { lData = m_pDataContainer_Windows->GetUserData( m_sViewName ); } break; @@ -1149,19 +1149,19 @@ void SvtViewOptions::SetUserData( const css::uno::Sequence< css::beans::NamedVal switch( m_eViewType ) { - case E_DIALOG : { + case E_DIALOG : { m_pDataContainer_Dialogs->SetUserData( m_sViewName, lData ); } break; - case E_TABDIALOG : { + case E_TABDIALOG : { m_pDataContainer_TabDialogs->SetUserData( m_sViewName, lData ); } break; - case E_TABPAGE : { + case E_TABPAGE : { m_pDataContainer_TabPages->SetUserData( m_sViewName, lData ); } break; - case E_WINDOW : { + case E_WINDOW : { m_pDataContainer_Windows->SetUserData( m_sViewName, lData ); } break; @@ -1177,19 +1177,19 @@ css::uno::Any SvtViewOptions::GetUserItem( const ::rtl::OUString& sName ) const css::uno::Any aItem; switch( m_eViewType ) { - case E_DIALOG : { + case E_DIALOG : { aItem = m_pDataContainer_Dialogs->GetUserItem( m_sViewName, sName ); } break; - case E_TABDIALOG : { + case E_TABDIALOG : { aItem = m_pDataContainer_TabDialogs->GetUserItem( m_sViewName, sName ); } break; - case E_TABPAGE : { + case E_TABPAGE : { aItem = m_pDataContainer_TabPages->GetUserItem( m_sViewName, sName ); } break; - case E_WINDOW : { + case E_WINDOW : { aItem = m_pDataContainer_Windows->GetUserItem( m_sViewName, sName ); } break; @@ -1206,19 +1206,19 @@ void SvtViewOptions::SetUserItem( const ::rtl::OUString& sName , switch( m_eViewType ) { - case E_DIALOG : { + case E_DIALOG : { m_pDataContainer_Dialogs->SetUserItem( m_sViewName, sName, aValue ); } break; - case E_TABDIALOG : { + case E_TABDIALOG : { m_pDataContainer_TabDialogs->SetUserItem( m_sViewName, sName, aValue ); } break; - case E_TABPAGE : { + case E_TABPAGE : { m_pDataContainer_TabPages->SetUserItem( m_sViewName, sName, aValue ); } break; - case E_WINDOW : { + case E_WINDOW : { m_pDataContainer_Windows->SetUserItem( m_sViewName, sName, aValue ); } break; @@ -1226,7 +1226,7 @@ void SvtViewOptions::SetUserItem( const ::rtl::OUString& sName , } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** ::osl::Mutex& SvtViewOptions::GetOwnStaticMutex() { diff --git a/unotools/source/config/workingsetoptions.cxx b/unotools/source/config/workingsetoptions.cxx index aebac3377510..f581cc4e0106 100644 --- a/unotools/source/config/workingsetoptions.cxx +++ b/unotools/source/config/workingsetoptions.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 @@ #endif //_________________________________________________________________________________________________________________ -// includes +// includes //_________________________________________________________________________________________________________________ #include <unotools/workingsetoptions.hxx> @@ -44,147 +44,147 @@ #include <itemholder1.hxx> //_________________________________________________________________________________________________________________ -// namespaces +// namespaces //_________________________________________________________________________________________________________________ -using namespace ::utl ; -using namespace ::rtl ; -using namespace ::osl ; -using namespace ::com::sun::star::uno ; +using namespace ::utl ; +using namespace ::rtl ; +using namespace ::osl ; +using namespace ::com::sun::star::uno ; //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ -#define ROOTNODE_WORKINGSET OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/WorkingSet")) -#define DEFAULT_WINDOWLIST Sequence< OUString >() +#define ROOTNODE_WORKINGSET OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/WorkingSet")) +#define DEFAULT_WINDOWLIST Sequence< OUString >() -#define PROPERTYNAME_WINDOWLIST OUString(RTL_CONSTASCII_USTRINGPARAM("WindowList" )) +#define PROPERTYNAME_WINDOWLIST OUString(RTL_CONSTASCII_USTRINGPARAM("WindowList" )) -#define PROPERTYHANDLE_WINDOWLIST 0 +#define PROPERTYHANDLE_WINDOWLIST 0 -#define PROPERTYCOUNT 1 +#define PROPERTYCOUNT 1 //_________________________________________________________________________________________________________________ -// private declarations! +// private declarations! //_________________________________________________________________________________________________________________ class SvtWorkingSetOptions_Impl : public ConfigItem { //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: //--------------------------------------------------------------------------------------------------------- - // constructor / destructor + // constructor / destructor //--------------------------------------------------------------------------------------------------------- SvtWorkingSetOptions_Impl(); ~SvtWorkingSetOptions_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 "seqPropertyNames" is the list of properties which should be updated. - @return - + @param "seqPropertyNames" is the list of properties which should be updated. + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual void Notify( const Sequence< OUString >& seqPropertyNames ); /*-****************************************************************************************************//** - @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 //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short access method to get internal values - @descr These method give us a chance to regulate acces to ouer internal values. + @short access method to get internal values + @descr These method give us a chance to regulate acces to ouer internal values. It's not used in the moment - but it's possible for the feature! - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ - Sequence< OUString > GetWindowList( ) const ; - void SetWindowList( const Sequence< OUString >& seqWindowList ) ; + Sequence< OUString > GetWindowList( ) const ; + void SetWindowList( const Sequence< OUString >& seqWindowList ) ; //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: /*-****************************************************************************************************//** - @short return list of key names of ouer configuration management which represent oue module tree - @descr These methods return a static const list of key names. We need it to get needed values from our + @short return list of key names of ouer configuration management which represent oue module tree + @descr These methods return a static const list of key names. We need it to get needed values from our configuration management. - @seealso - + @seealso - - @param - - @return A list of needed configuration keys is returned. + @param - + @return A list of needed configuration keys is returned. - @onerror - + @onerror - *//*-*****************************************************************************************************/ static Sequence< OUString > GetPropertyNames(); //------------------------------------------------------------------------------------------------------------- - // private member + // private member //------------------------------------------------------------------------------------------------------------- private: - Sequence< OUString > m_seqWindowList ; + Sequence< OUString > m_seqWindowList ; }; //_________________________________________________________________________________________________________________ -// definitions +// definitions //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** SvtWorkingSetOptions_Impl::SvtWorkingSetOptions_Impl() // Init baseclasses first - : ConfigItem ( ROOTNODE_WORKINGSET ) + : ConfigItem ( ROOTNODE_WORKINGSET ) // Init member then. - , m_seqWindowList ( DEFAULT_WINDOWLIST ) + , m_seqWindowList ( DEFAULT_WINDOWLIST ) { // Use our static list of configuration keys to get his values. - Sequence< OUString > seqNames = GetPropertyNames ( ); - Sequence< Any > seqValues = GetProperties ( seqNames ); + Sequence< OUString > seqNames = GetPropertyNames ( ); + Sequence< Any > seqValues = GetProperties ( seqNames ); // Safe impossible cases. // We need values from ALL configuration keys. @@ -200,7 +200,7 @@ SvtWorkingSetOptions_Impl::SvtWorkingSetOptions_Impl() DBG_ASSERT( !(seqValues[nProperty].hasValue()==sal_False), "SvtWorkingSetOptions_Impl::SvtWorkingSetOptions_Impl()\nInvalid property value detected!\n" ); switch( nProperty ) { - case PROPERTYHANDLE_WINDOWLIST : { + case PROPERTYHANDLE_WINDOWLIST : { DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_SEQUENCE), "SvtWorkingSetOptions_Impl::SvtWorkingSetOptions_Impl()\nWho has changed the value type of \"Office.Common\\WorkingSet\\WindowList\"?" ); seqValues[nProperty] >>= m_seqWindowList; } @@ -214,7 +214,7 @@ SvtWorkingSetOptions_Impl::SvtWorkingSetOptions_Impl() } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** SvtWorkingSetOptions_Impl::~SvtWorkingSetOptions_Impl() { @@ -226,7 +226,7 @@ SvtWorkingSetOptions_Impl::~SvtWorkingSetOptions_Impl() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtWorkingSetOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames ) { @@ -251,19 +251,19 @@ void SvtWorkingSetOptions_Impl::Notify( const Sequence< OUString >& seqPropertyN } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtWorkingSetOptions_Impl::Commit() { // Get names of supported properties, create a list for values and copy current values to it. - Sequence< OUString > seqNames = GetPropertyNames (); - sal_Int32 nCount = seqNames.getLength(); - Sequence< Any > seqValues ( nCount ); + Sequence< OUString > seqNames = GetPropertyNames (); + sal_Int32 nCount = seqNames.getLength(); + Sequence< Any > seqValues ( nCount ); for( sal_Int32 nProperty=0; nProperty<nCount; ++nProperty ) { switch( nProperty ) { - case PROPERTYHANDLE_WINDOWLIST : { + case PROPERTYHANDLE_WINDOWLIST : { seqValues[nProperty] <<= m_seqWindowList; } break; @@ -274,7 +274,7 @@ void SvtWorkingSetOptions_Impl::Commit() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** Sequence< OUString > SvtWorkingSetOptions_Impl::GetWindowList() const { @@ -282,7 +282,7 @@ Sequence< OUString > SvtWorkingSetOptions_Impl::GetWindowList() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtWorkingSetOptions_Impl::SetWindowList( const Sequence< OUString >& seqWindowList ) { @@ -291,14 +291,14 @@ void SvtWorkingSetOptions_Impl::SetWindowList( const Sequence< OUString >& seqWi } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** Sequence< OUString > SvtWorkingSetOptions_Impl::GetPropertyNames() { // Build static list of configuration key names. static const OUString pProperties[] = { - PROPERTYNAME_WINDOWLIST , + PROPERTYNAME_WINDOWLIST , }; // Initialize return sequence with these list ... static const Sequence< OUString > seqPropertyNames( pProperties, PROPERTYCOUNT ); @@ -307,15 +307,15 @@ Sequence< OUString > SvtWorkingSetOptions_Impl::GetPropertyNames() } //***************************************************************************************************************** -// 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 //***************************************************************************************************************** -SvtWorkingSetOptions_Impl* SvtWorkingSetOptions::m_pDataContainer = NULL ; -sal_Int32 SvtWorkingSetOptions::m_nRefCount = 0 ; +SvtWorkingSetOptions_Impl* SvtWorkingSetOptions::m_pDataContainer = NULL ; +sal_Int32 SvtWorkingSetOptions::m_nRefCount = 0 ; //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** SvtWorkingSetOptions::SvtWorkingSetOptions() { @@ -332,7 +332,7 @@ SvtWorkingSetOptions::SvtWorkingSetOptions() } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** SvtWorkingSetOptions::~SvtWorkingSetOptions() { @@ -350,7 +350,7 @@ SvtWorkingSetOptions::~SvtWorkingSetOptions() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** Sequence< OUString > SvtWorkingSetOptions::GetWindowList() const { @@ -359,7 +359,7 @@ Sequence< OUString > SvtWorkingSetOptions::GetWindowList() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtWorkingSetOptions::SetWindowList( const Sequence< OUString >& seqWindowList ) { @@ -368,7 +368,7 @@ void SvtWorkingSetOptions::SetWindowList( const Sequence< OUString >& seqWindowL } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** Mutex& SvtWorkingSetOptions::GetOwnStaticMutex() { diff --git a/unotools/source/config/xmlaccelcfg.cxx b/unotools/source/config/xmlaccelcfg.cxx index a446c60bbdc5..880f1705bb09 100644 --- a/unotools/source/config/xmlaccelcfg.cxx +++ b/unotools/source/config/xmlaccelcfg.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,14 +38,14 @@ using namespace rtl; using namespace com::sun::star::uno; using namespace com::sun::star::xml::sax; -#define ELEMENT_ACCELERATORLIST "acceleratorlist" -#define ELEMENT_ACCELERATORITEM "item" +#define ELEMENT_ACCELERATORLIST "acceleratorlist" +#define ELEMENT_ACCELERATORITEM "item" -#define ATTRIBUTE_KEYCODE "code" -#define ATTRIBUTE_MODIFIER "modifier" -#define ATTRIBUTE_URL "url" +#define ATTRIBUTE_KEYCODE "code" +#define ATTRIBUTE_MODIFIER "modifier" +#define ATTRIBUTE_URL "url" -#define ATTRIBUTE_TYPE_CDATA "CDATA" +#define ATTRIBUTE_TYPE_CDATA "CDATA" // ------------------------------------------------------------------ @@ -80,9 +80,9 @@ struct TagAttribute TagAttribute(){} TagAttribute( const OUString &aName, const OUString &aType , const OUString &aValue ) { - sName = aName; - sType = aType; - sValue = aValue; + sName = aName; + sType = aType; + sValue = aValue; } OUString sName; @@ -179,7 +179,7 @@ AttributeListImpl::~AttributeListImpl() } -void AttributeListImpl::addAttribute( const OUString &sName , +void AttributeListImpl::addAttribute( const OUString &sName , const OUString &sType , const OUString &sValue ) { @@ -219,7 +219,7 @@ throw( SAXException, RuntimeException ) void SAL_CALL OReadAccelatorDocumentHandler::setDocumentLocator( const Reference< XLocator > &xLocator) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { m_xLocator = xLocator; } @@ -314,7 +314,7 @@ throw( SAXException, RuntimeException ) void SAL_CALL OReadAccelatorDocumentHandler::characters(const rtl::OUString&) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException ) { } diff --git a/unotools/source/i18n/calendarwrapper.cxx b/unotools/source/i18n/calendarwrapper.cxx index ebf8146ef0fa..41696717a75e 100644 --- a/unotools/source/i18n/calendarwrapper.cxx +++ b/unotools/source/i18n/calendarwrapper.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 @@ -78,7 +78,7 @@ CalendarWrapper::CalendarWrapper( } } else - { // try to get an instance somehow + { // try to get an instance somehow DBG_ERRORFILE( "CalendarWrapper: no service manager, trying own" ); try { diff --git a/unotools/source/i18n/charclass.cxx b/unotools/source/i18n/charclass.cxx index e82fd7a603ad..ad5fbe208e01 100644 --- a/unotools/source/i18n/charclass.cxx +++ b/unotools/source/i18n/charclass.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 @@ -68,7 +68,7 @@ CharClass::CharClass( } } else - { // try to get an instance somehow + { // try to get an instance somehow getComponentInstance(); } } @@ -290,7 +290,7 @@ sal_Bool CharClass::isNumeric( const String& rStr ) const } -sal_Bool CharClass::isAlphaNumeric( const String& rStr, xub_StrLen nPos ) const +sal_Bool CharClass::isAlphaNumeric( const String& rStr, xub_StrLen nPos ) const { sal_Unicode c = rStr.GetChar( nPos ); if ( c < 128 ) diff --git a/unotools/source/i18n/collatorwrapper.cxx b/unotools/source/i18n/collatorwrapper.cxx index f4d679607424..fb6652d34221 100644 --- a/unotools/source/i18n/collatorwrapper.cxx +++ b/unotools/source/i18n/collatorwrapper.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/unotools/source/i18n/intlwrapper.cxx b/unotools/source/i18n/intlwrapper.cxx index 9f52cc60bfeb..97d6b3c9df37 100644 --- a/unotools/source/i18n/intlwrapper.cxx +++ b/unotools/source/i18n/intlwrapper.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/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx index 8bbe6f182862..baa63e09b3a8 100644 --- a/unotools/source/i18n/localedatawrapper.cxx +++ b/unotools/source/i18n/localedatawrapper.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 @@ -111,7 +111,7 @@ LocaleDataWrapper::LocaleDataWrapper( } } else - { // try to get an instance somehow + { // try to get an instance somehow DBG_ERRORFILE( "LocaleDataWrapper: no service manager, trying own" ); try { @@ -466,7 +466,7 @@ void LocaleDataWrapper::invalidateData() // In checks, exclude known problems because no MS-LCID defined. if (areChecksEnabled() && eLang == LANGUAGE_DONTKNOW -// && !aDebugLocale.EqualsAscii( "br_AE" ) // ?!? Breton in United Arabic Emirates +// && !aDebugLocale.EqualsAscii( "br_AE" ) // ?!? Breton in United Arabic Emirates ) { String aMsg( RTL_CONSTASCII_USTRINGPARAM( @@ -491,10 +491,10 @@ void LocaleDataWrapper::invalidateData() // In checks, exclude known problems because no MS-LCID defined // and default for Language found. if ( areChecksEnabled() - && !aDebugLocale.EqualsAscii( "ar_SD" ) // Sudan/ar - && !aDebugLocale.EqualsAscii( "en_CB" ) // Carribean is not a country -// && !aDebugLocale.EqualsAscii( "en_BG" ) // ?!? Bulgaria/en -// && !aDebugLocale.EqualsAscii( "es_BR" ) // ?!? Brazil/es + && !aDebugLocale.EqualsAscii( "ar_SD" ) // Sudan/ar + && !aDebugLocale.EqualsAscii( "en_CB" ) // Carribean is not a country +// && !aDebugLocale.EqualsAscii( "en_BG" ) // ?!? Bulgaria/en +// && !aDebugLocale.EqualsAscii( "es_BR" ) // ?!? Brazil/es ) { String aMsg( RTL_CONSTASCII_USTRINGPARAM( @@ -533,7 +533,7 @@ const String& LocaleDataWrapper::getOneLocaleItem( sal_Int16 nItem ) const return aLocaleItem[0]; } if ( aLocaleItem[nItem].Len() == 0 ) - { // no cached content + { // no cached content aGuard.changeReadToWrite(); ((LocaleDataWrapper*)this)->getOneLocaleItemImpl( nItem ); } @@ -629,7 +629,7 @@ const String& LocaleDataWrapper::getOneReservedWord( sal_Int16 nWord ) const nWord = reservedWords::FALSE_WORD; } if ( aReservedWord[nWord].Len() == 0 ) - { // no cached content + { // no cached content aGuard.changeReadToWrite(); ((LocaleDataWrapper*)this)->getOneReservedWordImpl( nWord ); } @@ -675,7 +675,7 @@ const ::boost::shared_ptr< ::com::sun::star::i18n::Calendar > LocaleDataWrapper: { ::utl::ReadWriteGuard aGuard( aMutex ); if (!xDefaultCalendar) - { // no cached content + { // no cached content aGuard.changeReadToWrite(); ((LocaleDataWrapper*)this)->getDefaultCalendarImpl(); } @@ -859,7 +859,7 @@ void LocaleDataWrapper::scanCurrFormatImpl( const String& rCode, break; default: if ( !nInSection && nSym == STRING_NOTFOUND && rCode.Equals( aCurrSymbol, (xub_StrLen)(p-pStr), aCurrSymbol.Len() ) ) - { // currency symbol not surrounded by [$...] + { // currency symbol not surrounded by [$...] nSym = (xub_StrLen)(p - pStr); if ( nBlank == STRING_NOTFOUND && pStr < p && *(p-1) == ' ' ) nBlank = (xub_StrLen)(p - pStr - 1); @@ -881,7 +881,7 @@ void LocaleDataWrapper::getCurrFormatsImpl() = aNumberFormatCode.getAllFormatCode( KNumberFormatUsage::CURRENCY ); sal_Int32 nCnt = aFormatSeq.getLength(); if ( !nCnt ) - { // bad luck + { // bad luck if (areChecksEnabled()) { String aMsg( RTL_CONSTASCII_USTRINGPARAM( @@ -940,16 +940,16 @@ void LocaleDataWrapper::getCurrFormatsImpl() if ( nBlank == STRING_NOTFOUND ) { if ( nSym < nNum ) - nCurrPositiveFormat = 0; // $1 + nCurrPositiveFormat = 0; // $1 else - nCurrPositiveFormat = 1; // 1$ + nCurrPositiveFormat = 1; // 1$ } else { if ( nSym < nNum ) - nCurrPositiveFormat = 2; // $ 1 + nCurrPositiveFormat = 2; // $ 1 else - nCurrPositiveFormat = 3; // 1 $ + nCurrPositiveFormat = 3; // 1 $ } // negative format @@ -973,24 +973,24 @@ void LocaleDataWrapper::getCurrFormatsImpl() if ( nSym < nNum ) { if ( nPar < nSym ) - nCurrNegativeFormat = 0; // ($1) + nCurrNegativeFormat = 0; // ($1) else if ( nSign < nSym ) - nCurrNegativeFormat = 1; // -$1 + nCurrNegativeFormat = 1; // -$1 else if ( nNum < nSign ) - nCurrNegativeFormat = 3; // $1- + nCurrNegativeFormat = 3; // $1- else - nCurrNegativeFormat = 2; // $-1 + nCurrNegativeFormat = 2; // $-1 } else { if ( nPar < nNum ) - nCurrNegativeFormat = 4; // (1$) + nCurrNegativeFormat = 4; // (1$) else if ( nSign < nNum ) - nCurrNegativeFormat = 5; // -1$ + nCurrNegativeFormat = 5; // -1$ else if ( nSym < nSign ) - nCurrNegativeFormat = 7; // 1$- + nCurrNegativeFormat = 7; // 1$- else - nCurrNegativeFormat = 6; // 1-$ + nCurrNegativeFormat = 6; // 1-$ } } else @@ -998,24 +998,24 @@ void LocaleDataWrapper::getCurrFormatsImpl() if ( nSym < nNum ) { if ( nPar < nSym ) - nCurrNegativeFormat = 14; // ($ 1) + nCurrNegativeFormat = 14; // ($ 1) else if ( nSign < nSym ) - nCurrNegativeFormat = 9; // -$ 1 + nCurrNegativeFormat = 9; // -$ 1 else if ( nNum < nSign ) - nCurrNegativeFormat = 12; // $ 1- + nCurrNegativeFormat = 12; // $ 1- else - nCurrNegativeFormat = 11; // $ -1 + nCurrNegativeFormat = 11; // $ -1 } else { if ( nPar < nNum ) - nCurrNegativeFormat = 15; // (1 $) + nCurrNegativeFormat = 15; // (1 $) else if ( nSign < nNum ) - nCurrNegativeFormat = 8; // -1 $ + nCurrNegativeFormat = 8; // -1 $ else if ( nSym < nSign ) - nCurrNegativeFormat = 10; // 1 $- + nCurrNegativeFormat = 10; // 1 $- else - nCurrNegativeFormat = 13; // 1- $ + nCurrNegativeFormat = 13; // 1- $ } } } @@ -1060,9 +1060,9 @@ DateFormat LocaleDataWrapper::scanDateFormatImpl( const String& rCode ) xub_StrLen nMonth = rCode.Search( 'M' ); xub_StrLen nYear = rCode.Search( 'Y' ); if ( nDay == STRING_NOTFOUND || nMonth == STRING_NOTFOUND || nYear == STRING_NOTFOUND ) - { // This algorithm assumes that all three parts (DMY) are present + { // This algorithm assumes that all three parts (DMY) are present if ( nMonth == STRING_NOTFOUND ) - { // only Finnish has something else than 'M' for month + { // only Finnish has something else than 'M' for month nMonth = rCode.Search( 'K' ); if ( nMonth != STRING_NOTFOUND ) { @@ -1071,30 +1071,30 @@ DateFormat LocaleDataWrapper::scanDateFormatImpl( const String& rCode ) } } else if ( nDay == STRING_NOTFOUND ) - { // We have a month 'M' if we reach this branch. + { // We have a month 'M' if we reach this branch. // Possible languages containing 'M' but no 'D': // German, French, Italian - nDay = rCode.Search( 'T' ); // German + nDay = rCode.Search( 'T' ); // German if ( nDay != STRING_NOTFOUND ) nYear = rCode.Search( 'J' ); else { - nYear = rCode.Search( 'A' ); // French, Italian + nYear = rCode.Search( 'A' ); // French, Italian if ( nYear != STRING_NOTFOUND ) { - nDay = rCode.Search( 'J' ); // French + nDay = rCode.Search( 'J' ); // French if ( nDay == STRING_NOTFOUND ) - nDay = rCode.Search( 'G' ); // Italian + nDay = rCode.Search( 'G' ); // Italian } } } else - { // We have a month 'M' and a day 'D'. + { // We have a month 'M' and a day 'D'. // Possible languages containing 'D' and 'M' but not 'Y': // Spanish, Dutch - nYear = rCode.Search( 'A' ); // Spanish + nYear = rCode.Search( 'A' ); // Spanish if ( nYear == STRING_NOTFOUND ) - nYear = rCode.Search( 'J' ); // Dutch + nYear = rCode.Search( 'J' ); // Dutch } if ( nDay == STRING_NOTFOUND || nMonth == STRING_NOTFOUND || nYear == STRING_NOTFOUND ) { @@ -1114,7 +1114,7 @@ DateFormat LocaleDataWrapper::scanDateFormatImpl( const String& rCode ) } // compare with <= because each position may equal rCode.Len() if ( nDay <= nMonth && nMonth <= nYear ) - return DMY; // also if every position equals rCode.Len() + return DMY; // also if every position equals rCode.Len() else if ( nMonth <= nDay && nDay <= nYear ) return MDY; else if ( nYear <= nMonth && nMonth <= nDay ) @@ -1139,7 +1139,7 @@ void LocaleDataWrapper::getDateFormatsImpl() = aNumberFormatCode.getAllFormatCode( KNumberFormatUsage::DATE ); sal_Int32 nCnt = aFormatSeq.getLength(); if ( !nCnt ) - { // bad luck + { // bad luck if (areChecksEnabled()) { String aMsg( RTL_CONSTASCII_USTRINGPARAM( @@ -1263,7 +1263,7 @@ const ::com::sun::star::uno::Sequence< sal_Int32 > LocaleDataWrapper::getDigitGr { ::utl::ReadWriteGuard aGuard( aMutex ); if (!aGrouping.getLength() || aGrouping[0] == 0) - { // no cached content + { // no cached content aGuard.changeReadToWrite(); ((LocaleDataWrapper*)this)->getDigitGroupingImpl(); } @@ -1400,9 +1400,9 @@ sal_Unicode* LocaleDataWrapper::ImplAddFormatNum( sal_Unicode* pBuf, { sal_Unicode aNumBuf[64]; sal_Unicode* pNumBuf; - USHORT nNumLen; - USHORT i = 0; - BOOL bNeg; + USHORT nNumLen; + USHORT i = 0; + BOOL bNeg; // negative number if ( nNumber < 0 ) @@ -1714,7 +1714,7 @@ String LocaleDataWrapper::getNum( sal_Int64 nNumber, USHORT nDecimals, BOOL bUseThousandSep, BOOL bTrailingZeros ) const { ::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nBlockCritical ); - sal_Unicode aBuf[128]; // big enough for 64-bit long and crazy grouping + sal_Unicode aBuf[128]; // big enough for 64-bit long and crazy grouping // check if digits and separators will fit into fixed buffer or allocate size_t nGuess = ImplGetNumberStringLengthGuess( *this, nDecimals ); sal_Unicode* const pBuffer = (nGuess < 118 ? aBuf : diff --git a/unotools/source/i18n/nativenumberwrapper.cxx b/unotools/source/i18n/nativenumberwrapper.cxx index f6df87615c6c..ac6a59517647 100644 --- a/unotools/source/i18n/nativenumberwrapper.cxx +++ b/unotools/source/i18n/nativenumberwrapper.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/unotools/source/i18n/numberformatcodewrapper.cxx b/unotools/source/i18n/numberformatcodewrapper.cxx index 2638e6730164..1d4169fd4e67 100644 --- a/unotools/source/i18n/numberformatcodewrapper.cxx +++ b/unotools/source/i18n/numberformatcodewrapper.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 @@ -68,7 +68,7 @@ NumberFormatCodeWrapper::NumberFormatCodeWrapper( } } else - { // try to get an instance somehow + { // try to get an instance somehow DBG_ERRORFILE( "NumberFormatCodeWrapper: no service manager, trying own" ); try { diff --git a/unotools/source/i18n/readwritemutexguard.cxx b/unotools/source/i18n/readwritemutexguard.cxx index 6adc5bab14bf..d57639541f8d 100644 --- a/unotools/source/i18n/readwritemutexguard.cxx +++ b/unotools/source/i18n/readwritemutexguard.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/unotools/source/i18n/textsearch.cxx b/unotools/source/i18n/textsearch.cxx index 3f722adb0dba..814816e7cca7 100644 --- a/unotools/source/i18n/textsearch.cxx +++ b/unotools/source/i18n/textsearch.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 @@ -179,7 +179,7 @@ void TextSearch::Init( const SearchParam & rParam, aSOpt.searchFlag |= SearchFlags::LEV_RELAXED; break; -// case SearchParam::SRCH_NORMAL: +// case SearchParam::SRCH_NORMAL: default: aSOpt.algorithmType = SearchAlgorithms_ABSOLUTE; if( rParam.IsSrchWordOnly() ) @@ -301,7 +301,7 @@ void TextSearch::ReplaceBackReferences( String& rReplaceStr, const String &rStr, { USHORT nStart = (USHORT)(rResult.startOffset[0]); USHORT nLength = (USHORT)(rResult.endOffset[0] - rResult.startOffset[0]); - rReplaceStr.Erase( nPos, 1 ); // delete ampersand + rReplaceStr.Erase( nPos, 1 ); // delete ampersand // replace by found string rReplaceStr.Insert( rStr, nStart, nLength, nPos ); // jump over @@ -325,8 +325,8 @@ void TextSearch::ReplaceBackReferences( String& rReplaceStr, const String &rStr, case '8': case '9': { - rReplaceStr.Erase( nPos, 2 ); // delete both - int i = sFndChar - '0'; // index + rReplaceStr.Erase( nPos, 2 ); // delete both + int i = sFndChar - '0'; // index if(i < rResult.subRegExpressions) { USHORT nSttReg = (USHORT)(rResult.startOffset[i]); @@ -369,10 +369,10 @@ void TextSearch::ReplaceBackReferences( String& rReplaceStr, const String &rStr, rReplaceStr.Erase( nPos, 1 ); nPos++; break; - case 't': + case 't': rReplaceStr.Erase( nPos, 2 ); // delete both rReplaceStr.Insert( sTab, nPos ); // insert tabulator - nPos++; // step over + nPos++; // step over break; default: nPos += 2; // ignore both characters @@ -393,6 +393,6 @@ void TextSearch::ReplaceBackReferences( String& rReplaceStr, const String &rStr, #endif // ............................................................................ -} // namespace utl +} // namespace utl // ............................................................................ diff --git a/unotools/source/i18n/transliterationwrapper.cxx b/unotools/source/i18n/transliterationwrapper.cxx index a10a52802e19..d8082166e6e2 100644 --- a/unotools/source/i18n/transliterationwrapper.cxx +++ b/unotools/source/i18n/transliterationwrapper.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,7 +65,7 @@ TransliterationWrapper::TransliterationWrapper( } } else - { // try to get an instance somehow + { // try to get an instance somehow DBG_ERRORFILE( "TransliterationWrapper: no service manager, trying own" ); try { @@ -192,7 +192,7 @@ void TransliterationWrapper::loadModuleIfNeeded( sal_uInt16 nLang ) if( !bLoad ) bLoad = needLanguageForTheMode(); } - if( bLoad ) + if( bLoad ) loadModuleImpl(); } } diff --git a/unotools/source/misc/atom.cxx b/unotools/source/misc/atom.cxx index 3d7ccd1dd10e..60bb85d0d236 100644 --- a/unotools/source/misc/atom.cxx +++ b/unotools/source/misc/atom.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,8 +65,8 @@ void AtomProvider::getAll( ::std::list< ::utl::AtomDescription >& atoms ) ::utl::AtomDescription aDesc; while( it != m_aAtomMap.end() ) { - aDesc.atom = it->second; - aDesc.description = it->first; + aDesc.atom = it->second; + aDesc.description = it->first; atoms.push_back( aDesc ); ++it; } @@ -75,7 +75,7 @@ void AtomProvider::getAll( ::std::list< ::utl::AtomDescription >& atoms ) void AtomProvider::getRecent( int atom, ::std::list< ::utl::AtomDescription >& atoms ) { atoms.clear(); - + ::std::hash_map< ::rtl::OUString, int, ::rtl::OUStringHash >::const_iterator it = m_aAtomMap.begin(); ::utl::AtomDescription aDesc; @@ -83,8 +83,8 @@ void AtomProvider::getRecent( int atom, ::std::list< ::utl::AtomDescription >& a { if( it->second > atom ) { - aDesc.atom = it->second; - aDesc.description = it->first; + aDesc.atom = it->second; + aDesc.description = it->first; atoms.push_back( aDesc ); } ++it; @@ -95,7 +95,7 @@ const ::rtl::OUString& AtomProvider::getString( int nAtom ) const { static ::rtl::OUString aEmpty; ::std::hash_map< int, ::rtl::OUString, ::std::hash< int > >::const_iterator it = m_aStringMap.find( nAtom ); - + return it == m_aStringMap.end() ? aEmpty : it->second; } @@ -243,8 +243,8 @@ Sequence< NMSP_UTIL::AtomDescription > AtomServer::getClass( sal_Int32 atomClass Sequence< NMSP_UTIL::AtomDescription > aRet( atoms.size() ); for( int i = aRet.getLength()-1; i >= 0; i-- ) { - aRet.getArray()[i].atom = atoms.back().atom; - aRet.getArray()[i].description = atoms.back().description; + aRet.getArray()[i].atom = atoms.back().atom; + aRet.getArray()[i].description = atoms.back().description; atoms.pop_back(); } @@ -261,8 +261,8 @@ Sequence< NMSP_UTIL::AtomDescription > AtomServer::getRecentAtoms( sal_Int32 ato Sequence< NMSP_UTIL::AtomDescription > aRet( atoms.size() ); for( int i = aRet.getLength()-1; i >= 0; i-- ) { - aRet.getArray()[i].atom = atoms.back().atom; - aRet.getArray()[i].description = atoms.back().description; + aRet.getArray()[i].atom = atoms.back().atom; + aRet.getArray()[i].description = atoms.back().description; atoms.pop_back(); } diff --git a/unotools/source/misc/componentresmodule.cxx b/unotools/source/misc/componentresmodule.cxx index 21c50d9ec7f1..8333193233d1 100644 --- a/unotools/source/misc/componentresmodule.cxx +++ b/unotools/source/misc/componentresmodule.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 @@ -49,7 +49,7 @@ namespace utl class OComponentResModuleImpl { private: - ResMgr* m_pRessources; + ResMgr* m_pRessources; bool m_bInitialized; ::rtl::OString m_sResFilePrefix; @@ -72,7 +72,7 @@ namespace utl /** retrieves our resource manager */ - ResMgr* getResManager(); + ResMgr* getResManager(); private: OComponentResModuleImpl(); // never implemented @@ -88,7 +88,7 @@ namespace utl } //-------------------------------------------------------------------- - ResMgr* OComponentResModuleImpl::getResManager() + ResMgr* OComponentResModuleImpl::getResManager() { if ( !m_pRessources && !m_bInitialized ) { @@ -96,10 +96,10 @@ namespace utl ByteString aMgrName = m_sResFilePrefix; m_pRessources = ResMgr::CreateResMgr( aMgrName.GetBuffer() ); - OSL_ENSURE( m_pRessources, + OSL_ENSURE( m_pRessources, ( ByteString( "OModuleImpl::getResManager: could not create the resource manager (file name: " ) - += aMgrName - += ByteString( ")!" ) ).GetBuffer() ); + += aMgrName + += ByteString( ")!" ) ).GetBuffer() ); m_bInitialized = sal_True; } @@ -122,7 +122,7 @@ namespace utl } //------------------------------------------------------------------------- - ResMgr* OComponentResourceModule::getResManager() + ResMgr* OComponentResourceModule::getResManager() { ::osl::MutexGuard aGuard( m_aMutex ); return m_pImpl->getResManager(); diff --git a/unotools/source/misc/datetime.cxx b/unotools/source/misc/datetime.cxx index 6bfd053b3fe9..3963f7b4b0bc 100644 --- a/unotools/source/misc/datetime.cxx +++ b/unotools/source/misc/datetime.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 @@ void typeConvert(const starutil::DateTime& _rDateTime, DateTime& _rOut) } //------------------------------------------------------------------------- -sal_Bool operator ==(const starutil::DateTime& _rLeft, const starutil::DateTime& _rRight) +sal_Bool operator ==(const starutil::DateTime& _rLeft, const starutil::DateTime& _rRight) { return ( _rLeft.HundredthSeconds == _rRight.HundredthSeconds) && ( _rLeft.Seconds == _rRight.Seconds) && @@ -99,7 +99,7 @@ sal_Bool operator ==(const starutil::DateTime& _rLeft, const starutil::DateTi } //------------------------------------------------------------------------- -sal_Bool operator ==(const starutil::Date& _rLeft, const starutil::Date& _rRight) +sal_Bool operator ==(const starutil::Date& _rLeft, const starutil::Date& _rRight) { return ( _rLeft.Day == _rRight.Day) && ( _rLeft.Month == _rRight.Month) && @@ -107,7 +107,7 @@ sal_Bool operator ==(const starutil::Date& _rLeft, const starutil::Date& _rRi } //------------------------------------------------------------------------- -sal_Bool operator ==(const starutil::Time& _rLeft, const starutil::Time& _rRight) +sal_Bool operator ==(const starutil::Time& _rLeft, const starutil::Time& _rRight) { return ( _rLeft.HundredthSeconds == _rRight.HundredthSeconds) && ( _rLeft.Seconds == _rRight.Seconds) && @@ -116,6 +116,6 @@ sal_Bool operator ==(const starutil::Time& _rLeft, const starutil::Time& _rRi } //......................................................................... -} // namespace utl +} // namespace utl //......................................................................... diff --git a/unotools/source/misc/desktopterminationobserver.cxx b/unotools/source/misc/desktopterminationobserver.cxx index 3900449f03c9..36fc7ebd1d83 100644 --- a/unotools/source/misc/desktopterminationobserver.cxx +++ b/unotools/source/misc/desktopterminationobserver.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 @@ -144,7 +144,7 @@ namespace utl throw TerminationVetoException(); } } - + //-------------------------------------------------------------------- void SAL_CALL OObserverImpl::notifyTermination( const EventObject& /*Event*/ ) throw (RuntimeException) { diff --git a/unotools/source/misc/eventlisteneradapter.cxx b/unotools/source/misc/eventlisteneradapter.cxx index 0e14a54cd3c0..b658f27db88d 100644 --- a/unotools/source/misc/eventlisteneradapter.cxx +++ b/unotools/source/misc/eventlisteneradapter.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,17 +46,17 @@ namespace utl class OEventListenerImpl : public ::cppu::WeakImplHelper1< XEventListener > { protected: - OEventListenerAdapter* m_pAdapter; - Reference< XEventListener > m_xKeepMeAlive; + OEventListenerAdapter* m_pAdapter; + Reference< XEventListener > m_xKeepMeAlive; // imagine an implementation of XComponent which holds it's listeners with a weak reference ... // would be very bad if we don't hold ourself - Reference< XComponent > m_xComponent; + Reference< XComponent > m_xComponent; public: OEventListenerImpl( OEventListenerAdapter* _pAdapter, const Reference< XComponent >& _rxComp ); - void dispose(); - const Reference< XComponent >& getComponent() const { return m_xComponent; } + void dispose(); + const Reference< XComponent >& getComponent() const { return m_xComponent; } protected: virtual void SAL_CALL disposing( const EventObject& _rSource ) throw (RuntimeException); @@ -106,7 +106,7 @@ namespace utl struct OEventListenerAdapterImpl { public: - ::std::vector< void* > aListeners; + ::std::vector< void* > aListeners; }; //===================================================================== @@ -151,7 +151,7 @@ namespace utl //--------------------------------------------------------------------- void OEventListenerAdapter::stopAllComponentListening( ) { - for ( ::std::vector< void* >::const_iterator aDisposeLoop = m_pImpl->aListeners.begin(); + for ( ::std::vector< void* >::const_iterator aDisposeLoop = m_pImpl->aListeners.begin(); aDisposeLoop != m_pImpl->aListeners.end(); ++aDisposeLoop ) @@ -178,5 +178,5 @@ namespace utl } //......................................................................... -} // namespace utl +} // namespace utl //......................................................................... diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx index 2bb682e4915b..93cb093c6491 100644 --- a/unotools/source/misc/fontcvt.cxx +++ b/unotools/source/misc/fontcvt.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/unotools/source/misc/fontdefs.cxx b/unotools/source/misc/fontdefs.cxx index c1c222755599..3f72799f06c7 100644 --- a/unotools/source/misc/fontdefs.cxx +++ b/unotools/source/misc/fontdefs.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/unotools/source/misc/sharedunocomponent.cxx b/unotools/source/misc/sharedunocomponent.cxx index 5402ebc06085..b7dc6bf3eff4 100644 --- a/unotools/source/misc/sharedunocomponent.cxx +++ b/unotools/source/misc/sharedunocomponent.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 utl CloseableComponentImpl( const Reference< XInterface >& _rxComponent ); /** closes the component - + @nofail */ void nf_closeComponent(); @@ -194,7 +194,7 @@ namespace utl DBG_ASSERT( Source.Source == m_xCloseable, "CloseableComponentImpl::queryClosing: where did this come from?" ); throw CloseVetoException(); } - + //-------------------------------------------------------------------- void SAL_CALL CloseableComponentImpl::notifyClosing( const EventObject& #ifdef DBG_UTIL diff --git a/unotools/source/misc/syslocale.cxx b/unotools/source/misc/syslocale.cxx index f51ef35512cb..e6da1757506c 100644 --- a/unotools/source/misc/syslocale.cxx +++ b/unotools/source/misc/syslocale.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,10 +56,10 @@ public: CharClass* pCharClass; SvtSysLocale_Impl(); - virtual ~SvtSysLocale_Impl(); + virtual ~SvtSysLocale_Impl(); - CharClass* GetCharClass(); - virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ); + CharClass* GetCharClass(); + virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ); }; // ----------------------------------------------------------------------- @@ -69,7 +69,7 @@ SvtSysLocale_Impl::SvtSysLocale_Impl() : pCharClass(NULL) pLocaleData = new LocaleDataWrapper( ::comphelper::getProcessServiceFactory(), aSysLocaleOptions.GetRealLocale() ); // listen for further changes - aSysLocaleOptions.AddListener( this ); + aSysLocaleOptions.AddListener( this ); } @@ -195,7 +195,7 @@ rtl_TextEncoding SvtSysLocale::GetBestMimeEncoding() const sal_Char* pCharSet = rtl_getBestMimeCharsetFromTextEncoding( gsl_getSystemTextEncoding() ); if ( !pCharSet ) - { + { // If the system locale is unknown to us, e.g. LC_ALL=xx, match the UI // language if possible. ::com::sun::star::lang::Locale aLocale( SvtSysLocale().GetUILocale() ); diff --git a/unotools/source/processfactory/componentfactory.cxx b/unotools/source/processfactory/componentfactory.cxx index 67055ee215ca..dc8efaacc579 100644 --- a/unotools/source/processfactory/componentfactory.cxx +++ b/unotools/source/processfactory/componentfactory.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 @@ -183,4 +183,4 @@ Reference< XSingleServiceFactory > loadLibComponentFactory( return xRet; } -} // namespace utl +} // namespace utl diff --git a/unotools/source/processfactory/processfactory.cxx b/unotools/source/processfactory/processfactory.cxx index e1f0cc876dce..f487227e8dbd 100644 --- a/unotools/source/processfactory/processfactory.cxx +++ b/unotools/source/processfactory/processfactory.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 @@ -43,12 +43,12 @@ namespace utl void setProcessServiceFactory(const Reference< XMultiServiceFactory >& xSMgr) { ::comphelper::setProcessServiceFactory(xSMgr); - } + } Reference< XMultiServiceFactory > getProcessServiceFactory() { return ::comphelper::getProcessServiceFactory(); - } + } } // namesapce utl diff --git a/unotools/source/property/propertysethelper.cxx b/unotools/source/property/propertysethelper.cxx index fac76bbe882a..868530dcdb9d 100644 --- a/unotools/source/property/propertysethelper.cxx +++ b/unotools/source/property/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 @@ -47,7 +47,7 @@ class PropertySetHelperImpl { public: PropertyMapEntry* find( const OUString& aName ) const throw(); - + PropertySetInfo* mpInfo; }; } diff --git a/unotools/source/property/propertysetinfo.cxx b/unotools/source/property/propertysetinfo.cxx index a5b8381de942..022f059b2c24 100644 --- a/unotools/source/property/propertysetinfo.cxx +++ b/unotools/source/property/propertysetinfo.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/unotools/source/streaming/streamhelper.cxx b/unotools/source/streaming/streamhelper.cxx index 0ca20cf1c5e2..a7d8f4e96438 100644 --- a/unotools/source/streaming/streamhelper.cxx +++ b/unotools/source/streaming/streamhelper.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/unotools/source/streaming/streamwrap.cxx b/unotools/source/streaming/streamwrap.cxx index eefaa7498070..390c433f967b 100644 --- a/unotools/source/streaming/streamwrap.cxx +++ b/unotools/source/streaming/streamwrap.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 @@ -237,8 +237,8 @@ void SAL_CALL OOutputStreamWrapper::writeBytes(const staruno::Sequence< sal_Int8 { sal_uInt32 nWritten = rStream.Write(aData.getConstArray(),aData.getLength()); ErrCode err = rStream.GetError(); - if ( (ERRCODE_NONE != err) - || (nWritten != (sal_uInt32)aData.getLength()) + if ( (ERRCODE_NONE != err) + || (nWritten != (sal_uInt32)aData.getLength()) ) { throw stario::BufferSizeExceededException(::rtl::OUString(),static_cast<staruno::XWeak*>(this)); @@ -348,8 +348,8 @@ void SAL_CALL OStreamWrapper::writeBytes(const staruno::Sequence< sal_Int8 >& aD { sal_uInt32 nWritten = m_pSvStream->Write(aData.getConstArray(),aData.getLength()); ErrCode err = m_pSvStream->GetError(); - if ( (ERRCODE_NONE != err) - || (nWritten != (sal_uInt32)aData.getLength()) + if ( (ERRCODE_NONE != err) + || (nWritten != (sal_uInt32)aData.getLength()) ) { throw stario::BufferSizeExceededException(::rtl::OUString(),static_cast<staruno::XWeak*>(this)); diff --git a/unotools/source/ucbhelper/XTempFile.hxx b/unotools/source/ucbhelper/XTempFile.hxx index 115f6cf823a7..af921ac54cda 100644 --- a/unotools/source/ucbhelper/XTempFile.hxx +++ b/unotools/source/ucbhelper/XTempFile.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,28 +45,28 @@ class SvStream; namespace utl { class TempFile; } -typedef ::cppu::WeakImplHelper5< ::com::sun::star::io::XTempFile - , ::com::sun::star::io::XInputStream - , ::com::sun::star::io::XOutputStream - , ::com::sun::star::io::XTruncate - , ::com::sun::star::lang::XServiceInfo +typedef ::cppu::WeakImplHelper5< ::com::sun::star::io::XTempFile + , ::com::sun::star::io::XInputStream + , ::com::sun::star::io::XOutputStream + , ::com::sun::star::io::XTruncate + , ::com::sun::star::lang::XServiceInfo > OTempFileBase; -class OTempFileService : +class OTempFileService : public OTempFileBase, public ::cppu::PropertySetMixin< ::com::sun::star::io::XTempFile > { protected: - ::utl::TempFile* mpTempFile; - ::osl::Mutex maMutex; - SvStream* mpStream; - sal_Bool mbRemoveFile; - sal_Bool mbInClosed; - sal_Bool mbOutClosed; + ::utl::TempFile* mpTempFile; + ::osl::Mutex maMutex; + SvStream* mpStream; + sal_Bool mbRemoveFile; + sal_Bool mbInClosed; + sal_Bool mbOutClosed; - sal_Int64 mnCachedPos; - sal_Bool mbHasCachedPos; + sal_Int64 mnCachedPos; + sal_Bool mbHasCachedPos; void checkError () const; void checkConnected (); @@ -75,20 +75,20 @@ public: OTempFileService (::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & context); //Methods - // XInterface + // 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 (); - // XTypeProvider + // 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); - // XTempFile + // XTempFile virtual ::sal_Bool SAL_CALL getRemoveFile() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setRemoveFile( ::sal_Bool _removefile ) diff --git a/unotools/source/ucbhelper/localfilehelper.cxx b/unotools/source/ucbhelper/localfilehelper.cxx index 5ddd1f811923..1955998934e8 100644 --- a/unotools/source/ucbhelper/localfilehelper.cxx +++ b/unotools/source/ucbhelper/localfilehelper.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/unotools/source/ucbhelper/progresshandlerwrap.cxx b/unotools/source/ucbhelper/progresshandlerwrap.cxx index 7fdbdacabc4b..064eacdd382e 100644 --- a/unotools/source/ucbhelper/progresshandlerwrap.cxx +++ b/unotools/source/ucbhelper/progresshandlerwrap.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 @@ sal_Bool getStatusFromAny_Impl( const Any& aAny, ::rtl::OUString& aText, sal_Int return bNumIsSet; } -void SAL_CALL ProgressHandlerWrap::push( const Any& Status ) +void SAL_CALL ProgressHandlerWrap::push( const Any& Status ) throw( RuntimeException ) { if( !m_xStatusIndicator.is() ) @@ -87,7 +87,7 @@ void SAL_CALL ProgressHandlerWrap::update( const Any& Status ) } } -void SAL_CALL ProgressHandlerWrap::pop() +void SAL_CALL ProgressHandlerWrap::pop() throw( RuntimeException ) { if( m_xStatusIndicator.is() ) diff --git a/unotools/source/ucbhelper/tempfile.cxx b/unotools/source/ucbhelper/tempfile.cxx index e77dc529e410..530892afbc4f 100644 --- a/unotools/source/ucbhelper/tempfile.cxx +++ b/unotools/source/ucbhelper/tempfile.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 @@ -254,8 +254,8 @@ umask(old_mode); DirectoryItem aTmpItem; FileStatus aTmpStatus( FileStatusMask_Type ); - if ( DirectoryItem::get( aTmp, aTmpItem ) != FileBase::E_None - || aTmpItem.getFileStatus( aTmpStatus ) != FileBase::E_None + if ( DirectoryItem::get( aTmp, aTmpItem ) != FileBase::E_None + || aTmpItem.getFileStatus( aTmpStatus ) != FileBase::E_None || aTmpStatus.getFileType() != FileStatus::Directory ) break; } @@ -319,8 +319,8 @@ umask(old_mode); DirectoryItem aTmpItem; FileStatus aTmpStatus( FileStatusMask_Type ); - if ( DirectoryItem::get( aTmp, aTmpItem ) != FileBase::E_None - || aTmpItem.getFileStatus( aTmpStatus ) != FileBase::E_None + if ( DirectoryItem::get( aTmp, aTmpItem ) != FileBase::E_None + || aTmpItem.getFileStatus( aTmpStatus ) != FileBase::E_None || aTmpStatus.getFileType() != FileStatus::Directory ) break; } diff --git a/unotools/source/ucbhelper/ucbhelper.cxx b/unotools/source/ucbhelper/ucbhelper.cxx index 4160f2f2f443..e2010656cacb 100644 --- a/unotools/source/ucbhelper/ucbhelper.cxx +++ b/unotools/source/ucbhelper/ucbhelper.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 @@ -872,5 +872,54 @@ sal_Bool UCBContentHelper::IsSubPath( const ::rtl::OUString& rPath, const ::rtl: return bResult; } +// ----------------------------------------------------------------------- +sal_Bool UCBContentHelper::EqualURLs( const ::rtl::OUString& aFirstURL, const ::rtl::OUString& aSecondURL ) +{ + sal_Bool bResult = sal_False; + + if ( aFirstURL.getLength() && aSecondURL.getLength() ) + { + INetURLObject aFirst( aFirstURL ); + INetURLObject aSecond( aSecondURL ); + + if ( aFirst.GetProtocol() != INET_PROT_NOT_VALID && aSecond.GetProtocol() != INET_PROT_NOT_VALID ) + { + try + { + ::ucbhelper::ContentBroker* pBroker = ::ucbhelper::ContentBroker::get(); + if ( !pBroker ) + throw uno::RuntimeException(); + + uno::Reference< ::com::sun::star::ucb::XContentIdentifierFactory > xIdFac + = pBroker->getContentIdentifierFactoryInterface(); + if ( !xIdFac.is() ) + throw uno::RuntimeException(); + + uno::Reference< ::com::sun::star::ucb::XContentIdentifier > xIdFirst + = xIdFac->createContentIdentifier( aFirst.GetMainURL( INetURLObject::NO_DECODE ) ); + uno::Reference< ::com::sun::star::ucb::XContentIdentifier > xIdSecond + = xIdFac->createContentIdentifier( aSecond.GetMainURL( INetURLObject::NO_DECODE ) ); + + if ( xIdFirst.is() && xIdSecond.is() ) + { + uno::Reference< ::com::sun::star::ucb::XContentProvider > xProvider = + pBroker->getContentProviderInterface(); + if ( !xProvider.is() ) + throw uno::RuntimeException(); + bResult = !xProvider->compareContentIds( xIdFirst, xIdSecond ); + } + } + catch( uno::Exception& ) + { + OSL_ENSURE( sal_False, "Can't compare URL's, treat as different!\n" ); + } + } + } + + return bResult; +} + + + } // namespace utl diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx index f21855d20aed..1ea67341c5b1 100644 --- a/unotools/source/ucbhelper/ucblockbytes.cxx +++ b/unotools/source/ucbhelper/ucblockbytes.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/unotools/source/ucbhelper/ucbstreamhelper.cxx b/unotools/source/ucbhelper/ucbstreamhelper.cxx index f27f663b3698..93d020a4d94d 100644 --- a/unotools/source/ucbhelper/ucbstreamhelper.cxx +++ b/unotools/source/ucbhelper/ucbstreamhelper.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/unotools/source/ucbhelper/xtempfile.cxx b/unotools/source/ucbhelper/xtempfile.cxx index 023211dc3527..36a848be1381 100644 --- a/unotools/source/ucbhelper/xtempfile.cxx +++ b/unotools/source/ucbhelper/xtempfile.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 @@ namespace css = com::sun::star; // copy define from desktop\source\app\appinit.cxx -#define DESKTOP_TEMPNAMEBASE_DIR "/temp/soffice.tmp" +#define DESKTOP_TEMPNAMEBASE_DIR "/temp/soffice.tmp" OTempFileService::OTempFileService(::css::uno::Reference< ::css::uno::XComponentContext > const & context) : ::cppu::PropertySetMixin< ::css::io::XTempFile >( @@ -91,7 +91,7 @@ throw () OTempFileBase::release(); } -// XTypeProvider +// XTypeProvider ::css::uno::Sequence< ::css::uno::Type > SAL_CALL OTempFileService::getTypes( ) throw ( ::css::uno::RuntimeException ) @@ -117,7 +117,7 @@ throw ( ::css::uno::RuntimeException ) return OTempFileBase::getImplementationId(); } -// XTempFile +// XTempFile sal_Bool SAL_CALL OTempFileService::getRemoveFile() throw ( ::css::uno::RuntimeException ) @@ -297,7 +297,7 @@ throw ( ::css::io::NotConnectedException, ::css::io::BufferSizeExceededException checkConnected(); sal_uInt32 nWritten = mpStream->Write(aData.getConstArray(),aData.getLength()); checkError(); - if ( nWritten != (sal_uInt32)aData.getLength()) + if ( nWritten != (sal_uInt32)aData.getLength()) throw ::css::io::BufferSizeExceededException( ::rtl::OUString(),static_cast < ::css::uno::XWeak * > ( this ) ); } void SAL_CALL OTempFileService::flush( ) |