diff options
Diffstat (limited to 'editeng/inc')
128 files changed, 3113 insertions, 3113 deletions
diff --git a/editeng/inc/editeng.hrc b/editeng/inc/editeng.hrc index cc1f45c06da3..66fcf0cb929e 100644 --- a/editeng/inc/editeng.hrc +++ b/editeng/inc/editeng.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,8 +36,8 @@ #define MN_WORDLANGUAGE 5 #define MN_PARALANGUAGE 6 -#define MN_ALTSTART 1000 -#define MN_AUTOSTART 2000 -#define MN_DICTSTART 3000 +#define MN_ALTSTART 1000 +#define MN_AUTOSTART 2000 +#define MN_DICTSTART 3000 -#endif // _EDITENG_HRC +#endif // _EDITENG_HRC diff --git a/editeng/inc/editeng/AccessibleComponentBase.hxx b/editeng/inc/editeng/AccessibleComponentBase.hxx index 7189595a0065..d2b41b9f63e0 100644 --- a/editeng/inc/editeng/AccessibleComponentBase.hxx +++ b/editeng/inc/editeng/AccessibleComponentBase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 accessibility { -/** @descr +/** @descr This base class provides (will provice) a base implementation of the <type>XAccessibleComponent</type> and the <type>XAccessibleExtendedComponent</type> for all shapes. For @@ -48,7 +48,7 @@ namespace accessibility { <type>XServiceInfo</type>, and <type>XTypeProvider</type>. */ class EDITENG_DLLPUBLIC AccessibleComponentBase - : public ::com::sun::star::accessibility::XAccessibleExtendedComponent + : public ::com::sun::star::accessibility::XAccessibleExtendedComponent { public: //===== internal ======================================================== @@ -63,15 +63,15 @@ public: inside this object. */ virtual sal_Bool SAL_CALL containsPoint ( - const ::com::sun::star::awt::Point& aPoint) + const ::com::sun::star::awt::Point& aPoint) throw (::com::sun::star::uno::RuntimeException); /** The default implementation returns an empty reference. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > SAL_CALL + virtual ::com::sun::star::uno::Reference< + ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint ( - const ::com::sun::star::awt::Point& aPoint) + const ::com::sun::star::awt::Point& aPoint) throw (::com::sun::star::uno::RuntimeException); /** The default implementation returns an empty rectangle. @@ -82,19 +82,19 @@ public: /** The default implementation uses the result of <member>getBounds</member> to determine the location. */ - virtual ::com::sun::star::awt::Point SAL_CALL getLocation (void) + virtual ::com::sun::star::awt::Point SAL_CALL getLocation (void) throw (::com::sun::star::uno::RuntimeException); /** The default implementation returns an empty position, i.e. the * result of the default constructor of <type>com::sun::star::awt::Point</type>. */ - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen (void) + virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen (void) throw (::com::sun::star::uno::RuntimeException); /** The default implementation uses the result of <member>getBounds</member> to determine the size. */ - virtual ::com::sun::star::awt::Size SAL_CALL getSize (void) + virtual ::com::sun::star::awt::Size SAL_CALL getSize (void) throw (::com::sun::star::uno::RuntimeException); /** The default implementation ignores this call. @@ -107,36 +107,36 @@ public: /** The default implementation ignores this call. */ virtual void SAL_CALL removeFocusListener (const ::com::sun::star::uno::Reference< - ::com::sun::star::awt::XFocusListener >& xListener ) + ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); /** The default implementation does nothing. */ - virtual void SAL_CALL grabFocus (void) + virtual void SAL_CALL grabFocus (void) throw (::com::sun::star::uno::RuntimeException); /** Returns black as the default foreground color. */ - virtual sal_Int32 SAL_CALL getForeground (void) + virtual sal_Int32 SAL_CALL getForeground (void) throw (::com::sun::star::uno::RuntimeException); /** Returns white as the default background color. */ - virtual sal_Int32 SAL_CALL getBackground (void) + virtual sal_Int32 SAL_CALL getBackground (void) throw (::com::sun::star::uno::RuntimeException); //===== XAccessibleExtendedComponent ==================================== - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL - getFont (void) + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL + getFont (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTitledBorderText (void) + virtual ::rtl::OUString SAL_CALL getTitledBorderText (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getToolTipText (void) + virtual ::rtl::OUString SAL_CALL getToolTipText (void) throw (::com::sun::star::uno::RuntimeException); //===== XTypeProvider =================================================== - + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL getTypes (void) throw (::com::sun::star::uno::RuntimeException); diff --git a/editeng/inc/editeng/AccessibleContextBase.hxx b/editeng/inc/editeng/AccessibleContextBase.hxx index e6d653ca443e..a9e3c321d4ef 100644 --- a/editeng/inc/editeng/AccessibleContextBase.hxx +++ b/editeng/inc/editeng/AccessibleContextBase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,14 +53,14 @@ namespace accessibility { struct MutexOwner {mutable ::osl::Mutex maMutex;}; -/** @descr +/** @descr This base class provides an implementation of the <type>AccessibleContext</type> service. Appart from the <type>XXAccessible<type> and <type>XAccessibleContextContext</type> interfaces it supports the <type>XServiceInfo</type> interface. */ class EDITENG_DLLPUBLIC AccessibleContextBase - : public MutexOwner, + : public MutexOwner, public cppu::WeakComponentImplHelper4< ::com::sun::star::accessibility::XAccessible, ::com::sun::star::accessibility::XAccessibleContext, @@ -69,7 +69,7 @@ class EDITENG_DLLPUBLIC AccessibleContextBase > { public: - + //===== internal ======================================================== /** The origin of the accessible name or description. @@ -181,61 +181,61 @@ public: //===== XAccessible ===================================================== - /// Return the XAccessibleContext. - virtual ::com::sun::star::uno::Reference< + /// Return the XAccessibleContext. + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext (void) throw (::com::sun::star::uno::RuntimeException); //===== XAccessibleContext ============================================== - /// Return the number of currently visible children. + /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL getAccessibleChildCount (void) throw (::com::sun::star::uno::RuntimeException); - /// Return the specified child or throw exception. + /// Return the specified child or throw exception. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - /// Return a reference to the parent. + /// Return a reference to the parent. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleParent (void) throw (::com::sun::star::uno::RuntimeException); - /// Return this objects index among the parents children. - virtual sal_Int32 SAL_CALL + /// Return this objects index among the parents children. + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent (void) throw (::com::sun::star::uno::RuntimeException); - /// Return this object's role. + /// Return this object's role. virtual sal_Int16 SAL_CALL getAccessibleRole (void) throw (::com::sun::star::uno::RuntimeException); - /// Return this object's description. + /// Return this object's description. virtual ::rtl::OUString SAL_CALL getAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException); - /// Return the object's current name. + /// Return the object's current name. virtual ::rtl::OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException); - /// Return NULL to indicate that an empty relation set. + /// Return NULL to indicate that an empty relation set. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet (void) throw (::com::sun::star::uno::RuntimeException); - /// Return the set of current states. + /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet (void) throw (::com::sun::star::uno::RuntimeException); - /** Return the parents locale or throw exception if this object has no + /** Return the parents locale or throw exception if this object has no parent yet/anymore. */ virtual ::com::sun::star::lang::Locale SAL_CALL @@ -250,28 +250,28 @@ public: //===== XAccessibleEventBroadcaster ======================================== - virtual void SAL_CALL + virtual void SAL_CALL addEventListener ( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleEventListener >& xListener) + const ::com::sun::star::uno::Reference< + ::com::sun::star::accessibility::XAccessibleEventListener >& xListener) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL - removeEventListener ( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleEventListener >& xListener) + virtual void SAL_CALL + removeEventListener ( + const ::com::sun::star::uno::Reference< + ::com::sun::star::accessibility::XAccessibleEventListener >& xListener) throw (::com::sun::star::uno::RuntimeException); //===== XServiceInfo ==================================================== - /** Returns an identifier for the implementation of this object. + /** Returns an identifier for the implementation of this object. */ virtual ::rtl::OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); - /** Return whether the specified service is supported by this class. + /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL supportsService (const ::rtl::OUString& sServiceName) @@ -287,13 +287,13 @@ 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) @@ -302,28 +302,28 @@ public: protected: /** The state set. */ - ::com::sun::star::uno::Reference< + ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> mxStateSet; /** The relation set. Relations can be set or removed by calling the <member>AddRelation</member> and <member>RemoveRelation</member> methods. */ - ::com::sun::star::uno::Reference< + ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> mxRelationSet; // This method is called from the component helper base class while disposing. virtual void SAL_CALL disposing (void); - /** Create the accessible object's name. This method may be called more + /** Create the accessible object's name. This method may be called more than once for a single object. - @return + @return The returned string is a unique (among the accessible object's siblings) name. */ virtual ::rtl::OUString CreateAccessibleName (void) throw (::com::sun::star::uno::RuntimeException); - /** Create the accessible object's descriptive string. May be called + /** Create the accessible object's descriptive string. May be called more than once. @return Descriptive string. Not necessarily unique. @@ -343,7 +343,7 @@ protected: throw (::com::sun::star::lang::DisposedException); /** Check whether or not the object has been disposed (or is in the - state of beeing disposed). + state of beeing disposed). @return sal_True, if the object is disposed or in the course of being disposed. Otherwise, sal_False is returned. @@ -359,11 +359,11 @@ protected: void SetAccessibleRole( sal_Int16 _nRole ); private: - /// Reference to the parent object. + /// Reference to the parent object. ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> mxParent; - /** Description of this object. This is not a constant because it can + /** Description of this object. This is not a constant because it can be set from the outside. Furthermore, it changes according the the draw page's display mode. */ @@ -375,7 +375,7 @@ private: */ StringOrigin meDescriptionOrigin; - /** Name of this object. It changes according the the draw page's + /** Name of this object. It changes according the the draw page's display mode. */ ::rtl::OUString msName; diff --git a/editeng/inc/editeng/AccessibleEditableTextPara.hxx b/editeng/inc/editeng/AccessibleEditableTextPara.hxx index 22b34aadf515..ee97b4b7fb32 100644 --- a/editeng/inc/editeng/AccessibleEditableTextPara.hxx +++ b/editeng/inc/editeng/AccessibleEditableTextPara.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ namespace accessibility protected: // override OCommonAccessibleText methods - virtual ::rtl::OUString implGetText(); - virtual ::com::sun::star::lang::Locale implGetLocale(); - virtual void implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ); - virtual void implGetParagraphBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ); - virtual void implGetLineBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ); + virtual ::rtl::OUString implGetText(); + virtual ::com::sun::star::lang::Locale implGetLocale(); + virtual void implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ); + virtual void implGetParagraphBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ); + virtual void implGetLineBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex ); public: /// Create accessible object for given parent @@ -87,7 +87,7 @@ namespace accessibility AccessibleEditableTextPara ( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rParent, const AccessibleParaManager* _pParaManager = NULL ); - virtual ~AccessibleEditableTextPara (); + virtual ~AccessibleEditableTextPara (); // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface (const ::com::sun::star::uno::Type & rType) throw (::com::sun::star::uno::RuntimeException); @@ -163,7 +163,7 @@ namespace accessibility // XAccessibleTextAttributes virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getDefaultAttributes( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& RequestedAttributes ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getRunAttributes( ::sal_Int32 Index, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& RequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - + // XAccessibleHypertext virtual ::sal_Int32 SAL_CALL getHyperLinkCount( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleHyperlink > SAL_CALL getHyperLink( ::sal_Int32 nLinkIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); @@ -264,7 +264,7 @@ namespace accessibility there potential deadlock situations can be resolved. Thus, make sure SolarMutex is locked when calling this. */ - SvxAccessibleTextAdapter& GetTextForwarder() const SAL_THROW((::com::sun::star::uno::RuntimeException)); + SvxAccessibleTextAdapter& GetTextForwarder() const SAL_THROW((::com::sun::star::uno::RuntimeException)); /** Query the SvxViewForwarder for EditEngine access. @@ -273,7 +273,7 @@ namespace accessibility there potential deadlock situations can be resolved. Thus, make sure SolarMutex is locked when calling this. */ - SvxViewForwarder& GetViewForwarder() const SAL_THROW((::com::sun::star::uno::RuntimeException)); + SvxViewForwarder& GetViewForwarder() const SAL_THROW((::com::sun::star::uno::RuntimeException)); /** Query whether a GetEditViewForwarder( sal_False ) will return a forwarder @@ -282,7 +282,7 @@ namespace accessibility there potential deadlock situations can be resolved. Thus, make sure SolarMutex is locked when calling this. */ - sal_Bool HaveEditView() const; + sal_Bool HaveEditView() const; /** Query the SvxEditViewForwarder for EditEngine access. @@ -364,9 +364,9 @@ namespace accessibility /** create selection from Accessible selection. */ - ESelection MakeSelection( sal_Int32 nStartEEIndex, sal_Int32 nEndEEIndex ); - ESelection MakeSelection( sal_Int32 nEEIndex ); - ESelection MakeCursor( sal_Int32 nEEIndex ); + ESelection MakeSelection( sal_Int32 nStartEEIndex, sal_Int32 nEndEEIndex ); + ESelection MakeSelection( sal_Int32 nEEIndex ); + ESelection MakeCursor( sal_Int32 nEEIndex ); // check whether index value is within permitted range @@ -378,10 +378,10 @@ namespace accessibility void CheckRange( sal_Int32 nStart, sal_Int32 nEnd ) SAL_THROW((::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException)); // the paragraph index in the edit engine (guarded by solar mutex) - sal_Int32 mnParagraphIndex; + sal_Int32 mnParagraphIndex; // our current index in the parent (guarded by solar mutex) - sal_Int32 mnIndexInParent; + sal_Int32 mnIndexInParent; // the current edit source (guarded by solar mutex) SvxEditSourceAdapter* mpEditSource; diff --git a/editeng/inc/editeng/AccessibleImageBullet.hxx b/editeng/inc/editeng/AccessibleImageBullet.hxx index aa470ea65ab3..444917fedec5 100644 --- a/editeng/inc/editeng/AccessibleImageBullet.hxx +++ b/editeng/inc/editeng/AccessibleImageBullet.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ #include <cppuhelper/interfacecontainer.hxx> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/accessibility/XAccessible.hpp> +#include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/accessibility/XAccessibleContext.hpp> #include <com/sun/star/accessibility/XAccessibleComponent.hpp> #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp> @@ -60,7 +60,7 @@ namespace accessibility /// Create accessible object for given parent AccessibleImageBullet ( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rParent ); - virtual ~AccessibleImageBullet (); + virtual ~AccessibleImageBullet (); // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface (const ::com::sun::star::uno::Type & rType) throw (::com::sun::star::uno::RuntimeException); @@ -106,7 +106,7 @@ namespace accessibility virtual ::rtl::OUString SAL_CALL getServiceName (void) throw (::com::sun::star::uno::RuntimeException); /** Set the current index in the accessibility parent - + @attention This method does not lock the SolarMutex, leaving that to the calling code. This is because only there potential deadlock situations can be resolved. Thus, @@ -115,7 +115,7 @@ namespace accessibility void SetIndexInParent( sal_Int32 nIndex ); /** Get the current index in the accessibility parent - + @attention This method does not lock the SolarMutex, leaving that to the calling code. This is because only there potential deadlock situations can be resolved. Thus, @@ -124,7 +124,7 @@ namespace accessibility sal_Int32 GetIndexInParent() const; /** Set the edit engine offset - + @attention This method does not lock the SolarMutex, leaving that to the calling code. This is because only there potential deadlock situations can be resolved. Thus, @@ -133,7 +133,7 @@ namespace accessibility void SetEEOffset( const Point& rOffset ); /** Set the EditEngine offset - + @attention This method does not lock the SolarMutex, leaving that to the calling code. This is because only there potential deadlock situations can be resolved. Thus, @@ -142,13 +142,13 @@ namespace accessibility void SetEditSource( SvxEditSource* pEditSource ); /** Dispose this object - + Notifies and deregisters the listeners, drops all references. */ void Dispose(); /** Set the current paragraph number - + @attention This method does not lock the SolarMutex, leaving that to the calling code. This is because only there potential deadlock situations can be resolved. Thus, @@ -157,7 +157,7 @@ namespace accessibility void SetParagraphIndex( sal_Int32 nIndex ); /** Query the current paragraph number (0 - nParas-1) - + @attention This method does not lock the SolarMutex, leaving that to the calling code. This is because only there potential deadlock situations can be resolved. Thus, @@ -186,31 +186,31 @@ namespace accessibility int getNotifierClientId() const; - /** Query the SvxTextForwarder for EditEngine access. - + /** Query the SvxTextForwarder for EditEngine access. + @attention This method does not lock the SolarMutex, leaving that to the calling code. This is because only there potential deadlock situations can be resolved. Thus, make sure SolarMutex is locked when calling this. */ - SvxTextForwarder& GetTextForwarder() const SAL_THROW((::com::sun::star::uno::RuntimeException)); - - /** Query the SvxViewForwarder for EditEngine access. + SvxTextForwarder& GetTextForwarder() const SAL_THROW((::com::sun::star::uno::RuntimeException)); + /** Query the SvxViewForwarder for EditEngine access. + @attention This method does not lock the SolarMutex, leaving that to the calling code. This is because only there potential deadlock situations can be resolved. Thus, make sure SolarMutex is locked when calling this. */ - SvxViewForwarder& GetViewForwarder() const SAL_THROW((::com::sun::star::uno::RuntimeException)); + SvxViewForwarder& GetViewForwarder() const SAL_THROW((::com::sun::star::uno::RuntimeException)); const Point& GetEEOffset() const; // the paragraph index in the edit engine (guarded by solar mutex) - sal_Int32 mnParagraphIndex; + sal_Int32 mnParagraphIndex; // our current index in the parent (guarded by solar mutex) - sal_Int32 mnIndexInParent; + sal_Int32 mnIndexInParent; // the current edit source (guarded by solar mutex) SvxEditSource* mpEditSource; @@ -221,7 +221,7 @@ namespace accessibility // the current state set (updated from SetState/UnSetState and guarded by solar mutex) ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > mxStateSet; - mutable osl::Mutex maMutex; + mutable osl::Mutex maMutex; /// The shape we're the accessible for (unguarded) ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > mxParent; diff --git a/editeng/inc/editeng/AccessibleParaManager.hxx b/editeng/inc/editeng/AccessibleParaManager.hxx index b2116034bb1b..e3c538ba6a05 100644 --- a/editeng/inc/editeng/AccessibleParaManager.hxx +++ b/editeng/inc/editeng/AccessibleParaManager.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -85,10 +85,10 @@ namespace accessibility private: // the interface, hard reference to prevent object from vanishing - ::com::sun::star::uno::Reference< UnoInterfaceType > mxRef; + ::com::sun::star::uno::Reference< UnoInterfaceType > mxRef; // the c++ object, for our internal stuff - InterfaceType* mpImpl; + InterfaceType* mpImpl; }; @@ -131,10 +131,10 @@ namespace accessibility private: // the interface, hold weakly - ::com::sun::star::uno::WeakReference< UnoInterfaceType > maWeakRef; + ::com::sun::star::uno::WeakReference< UnoInterfaceType > maWeakRef; // hard ref to c++ class, _only_ valid if maWeakRef.is() is true - InterfaceType* maUnsafeRef; + InterfaceType* maUnsafeRef; }; @@ -199,10 +199,10 @@ namespace accessibility sal_Bool IsReferencable( sal_uInt32 nChild ) const; static void ShutdownPara( const WeakChild& rChild ); - Child CreateChild( sal_Int32 nChild, + Child CreateChild( sal_Int32 nChild, const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& xFrontEnd, - SvxEditSourceAdapter& rEditSource, - sal_uInt32 nParagraphIndex ); + SvxEditSourceAdapter& rEditSource, + sal_uInt32 nParagraphIndex ); WeakChild GetChild( sal_uInt32 nParagraphIndex ) const; @@ -214,11 +214,11 @@ namespace accessibility /// Unset state of all children void UnSetState( const sal_Int16 nStateId ); /// Set offset to edit engine for all children - void SetEEOffset ( const Point& rOffset ); + void SetEEOffset ( const Point& rOffset ); /// Change edit source on all living children - void SetEditSource ( SvxEditSourceAdapter* pEditSource ); + void SetEditSource ( SvxEditSourceAdapter* pEditSource ); /// Dispose all living children - void Dispose (); + void Dispose (); // forwarder to given paragraphs //------------------------------------------------------------------------ @@ -321,10 +321,10 @@ namespace accessibility /// Unset state on given child void UnSetState( sal_Int32 nChild, const sal_Int16 nStateId ); /// Init child with default state (as stored in previous SetFocus and SetActive calls) - void InitChild( AccessibleEditableTextPara& rChild, - SvxEditSourceAdapter& rEditSource, - sal_Int32 nChild, - sal_uInt32 nParagraphIndex ) const; + void InitChild( AccessibleEditableTextPara& rChild, + SvxEditSourceAdapter& rEditSource, + sal_Int32 nChild, + sal_uInt32 nParagraphIndex ) const; // vector the size of the paragraph number of the underlying EditEngine VectorOfChildren maChildren; diff --git a/editeng/inc/editeng/AccessibleSelectionBase.hxx b/editeng/inc/editeng/AccessibleSelectionBase.hxx index d2ef88ef4533..fd39bd960af3 100644 --- a/editeng/inc/editeng/AccessibleSelectionBase.hxx +++ b/editeng/inc/editeng/AccessibleSelectionBase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/editeng/inc/editeng/AccessibleStaticTextBase.hxx b/editeng/inc/editeng/AccessibleStaticTextBase.hxx index ece0611b5d57..9f4eae4ed32c 100644 --- a/editeng/inc/editeng/AccessibleStaticTextBase.hxx +++ b/editeng/inc/editeng/AccessibleStaticTextBase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/editeng/inc/editeng/AccessibleStringWrap.hxx b/editeng/inc/editeng/AccessibleStringWrap.hxx index 5bafee122ea0..b833e091ba36 100644 --- a/editeng/inc/editeng/AccessibleStringWrap.hxx +++ b/editeng/inc/editeng/AccessibleStringWrap.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,10 +55,10 @@ public: EDITENG_DLLPUBLIC sal_Int32 GetIndexAtPoint( const Point& rPoint ); private: - - OutputDevice& mrDev; - SvxFont& mrFont; - String maText; + + OutputDevice& mrDev; + SvxFont& mrFont; + String maText; }; #endif /* _ACCESSIBLESTRINGWRAP_HXX */ diff --git a/editeng/inc/editeng/SpellPortions.hxx b/editeng/inc/editeng/SpellPortions.hxx index 55a161c773c8..e13aed8a26e5 100644 --- a/editeng/inc/editeng/SpellPortions.hxx +++ b/editeng/inc/editeng/SpellPortions.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,8 +53,8 @@ struct SpellPortion should be protected against unintentional deletion. */ bool bIsField; - /** Marks the portion hidden content that should not be touched by spell checking - and not be removed like redlines. The creator of the portions has to take care + /** Marks the portion hidden content that should not be touched by spell checking + and not be removed like redlines. The creator of the portions has to take care for them. */ bool bIsHidden; @@ -65,7 +65,7 @@ struct SpellPortion it's an empty reference */ ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellAlternatives> xAlternatives; - /** determines whether the error type is a grammar error + /** determines whether the error type is a grammar error */ bool bIsGrammarError; /** contains the grammar error information @@ -79,7 +79,7 @@ struct SpellPortion /** contains the proposed dialog title if the proof reading component provides one. */ rtl::OUString sDialogTitle; - + bool bIgnoreThisError; SpellPortion() : bIsField(false), diff --git a/editeng/inc/editeng/UnoForbiddenCharsTable.hxx b/editeng/inc/editeng/UnoForbiddenCharsTable.hxx index fd63297ac953..f34e2d260e5e 100644 --- a/editeng/inc/editeng/UnoForbiddenCharsTable.hxx +++ b/editeng/inc/editeng/UnoForbiddenCharsTable.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/editeng/inc/editeng/acorrcfg.hxx b/editeng/inc/editeng/acorrcfg.hxx index 555aaea150d0..32618473378d 100644 --- a/editeng/inc/editeng/acorrcfg.hxx +++ b/editeng/inc/editeng/acorrcfg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/editeng/inc/editeng/adjitem.hxx b/editeng/inc/editeng/adjitem.hxx index 3c5a63164e87..1e1545352f38 100644 --- a/editeng/inc/editeng/adjitem.hxx +++ b/editeng/inc/editeng/adjitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ namespace rtl [Beschreibung] Dieses Item beschreibt die Zeilenausrichtung. */ -#define ADJUST_LASTBLOCK_VERSION ((USHORT)0x0001) +#define ADJUST_LASTBLOCK_VERSION ((USHORT)0x0001) class EDITENG_DLLPUBLIC SvxAdjustItem : public SfxEnumItemInterface { @@ -69,23 +69,23 @@ public: const USHORT nId ); // "pure virtual Methoden" vom SfxPoolItem - virtual int operator==( const SfxPoolItem& ) const; + virtual int operator==( const SfxPoolItem& ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - virtual USHORT GetValueCount() const; - virtual String GetValueTextByPos( USHORT nPos ) const; - virtual USHORT GetEnumValue() const; - virtual void SetEnumValue( USHORT nNewVal ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; - virtual USHORT GetVersion( USHORT nFileVersion ) const; + virtual USHORT GetValueCount() const; + virtual String GetValueTextByPos( USHORT nPos ) const; + virtual USHORT GetEnumValue() const; + virtual void SetEnumValue( USHORT nNewVal ); + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Create(SvStream &, USHORT) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; + virtual USHORT GetVersion( USHORT nFileVersion ) const; inline void SetOneWord( const SvxAdjust eType ) { diff --git a/editeng/inc/editeng/akrnitem.hxx b/editeng/inc/editeng/akrnitem.hxx index bcdbc7fdde96..6bcf6a3bee8a 100644 --- a/editeng/inc/editeng/akrnitem.hxx +++ b/editeng/inc/editeng/akrnitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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: // "pure virtual Methoden" vom SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/editeng/inc/editeng/blnkitem.hxx b/editeng/inc/editeng/blnkitem.hxx index 177bbd372009..304f0f50f7aa 100644 --- a/editeng/inc/editeng/blnkitem.hxx +++ b/editeng/inc/editeng/blnkitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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: // "pure virtual Methoden" vom SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, diff --git a/editeng/inc/editeng/bolnitem.hxx b/editeng/inc/editeng/bolnitem.hxx index 44899034f0f7..af1b6a0bba63 100644 --- a/editeng/inc/editeng/bolnitem.hxx +++ b/editeng/inc/editeng/bolnitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/editeng/inc/editeng/borderline.hxx b/editeng/inc/editeng/borderline.hxx index 3b94f92cf1bb..ecaf3ce93ffe 100644 --- a/editeng/inc/editeng/borderline.hxx +++ b/editeng/inc/editeng/borderline.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -85,9 +85,9 @@ #define DEF_DOUBLE_LINE9_IN DEF_LINE_WIDTH_0 #define DEF_DOUBLE_LINE9_DIST DEF_LINE_WIDTH_2 -#define DEF_DOUBLE_LINE10_OUT DEF_LINE_WIDTH_3 -#define DEF_DOUBLE_LINE10_IN DEF_LINE_WIDTH_0 -#define DEF_DOUBLE_LINE10_DIST DEF_LINE_WIDTH_2 +#define DEF_DOUBLE_LINE10_OUT DEF_LINE_WIDTH_3 +#define DEF_DOUBLE_LINE10_IN DEF_LINE_WIDTH_0 +#define DEF_DOUBLE_LINE10_DIST DEF_LINE_WIDTH_2 // ============================================================================ @@ -114,27 +114,27 @@ public: SvxBorderLine& operator=( const SvxBorderLine& r ); - const Color& GetColor() const { return aColor; } - USHORT GetOutWidth() const { return nOutWidth; } - USHORT GetInWidth() const { return nInWidth; } - USHORT GetDistance() const { return nDistance; } + const Color& GetColor() const { return aColor; } + USHORT GetOutWidth() const { return nOutWidth; } + USHORT GetInWidth() const { return nInWidth; } + USHORT GetDistance() const { return nDistance; } SvxBorderStyle GetStyle() const { return m_nStyle; } - void SetColor( const Color &rColor ) { aColor = rColor; } - void SetOutWidth( USHORT nNew ) { nOutWidth = nNew; } - void SetInWidth( USHORT nNew ) { nInWidth = nNew; } - void SetDistance( USHORT nNew ) { nDistance = nNew; } + void SetColor( const Color &rColor ) { aColor = rColor; } + void SetOutWidth( USHORT nNew ) { nOutWidth = nNew; } + void SetInWidth( USHORT nNew ) { nInWidth = nNew; } + void SetDistance( USHORT nNew ) { nDistance = nNew; } void SetStyle( SvxBorderStyle nNew ) { m_nStyle = nNew; } - void ScaleMetrics( long nMult, long nDiv ); + void ScaleMetrics( long nMult, long nDiv ); - BOOL operator==( const SvxBorderLine &rCmp ) const; + BOOL operator==( const SvxBorderLine &rCmp ) const; String GetValueString( SfxMapUnit eSrcUnit, SfxMapUnit eDestUnit, const IntlWrapper* pIntl, BOOL bMetricStr = FALSE ) const; - bool HasPriority( const SvxBorderLine& rOtherLine ) const; + bool HasPriority( const SvxBorderLine& rOtherLine ) const; bool isEmpty() const { return (0 == nOutWidth && 0 == nInWidth && 0 == nDistance); } bool isDouble() const { return (0 != nOutWidth && 0 != nInWidth); } diff --git a/editeng/inc/editeng/boxitem.hxx b/editeng/inc/editeng/boxitem.hxx index 497dd44cdcc5..35fd036e3046 100644 --- a/editeng/inc/editeng/boxitem.hxx +++ b/editeng/inc/editeng/boxitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,10 +43,10 @@ Dieses Item beschreibt ein Umrandungsattribut (alle vier Kanten und Abstand nach innen. */ -#define BOX_LINE_TOP ((USHORT)0) -#define BOX_LINE_BOTTOM ((USHORT)1) -#define BOX_LINE_LEFT ((USHORT)2) -#define BOX_LINE_RIGHT ((USHORT)3) +#define BOX_LINE_TOP ((USHORT)0) +#define BOX_LINE_BOTTOM ((USHORT)1) +#define BOX_LINE_LEFT ((USHORT)2) +#define BOX_LINE_RIGHT ((USHORT)3) #define BOX_4DISTS_VERSION ((USHORT)1) @@ -56,7 +56,7 @@ class EDITENG_DLLPUBLIC SvxBoxItem : public SfxPoolItem *pBottom, *pLeft, *pRight; - USHORT nTopDist, + USHORT nTopDist, nBottomDist, nLeftDist, nRightDist; @@ -70,43 +70,43 @@ public: SvxBoxItem &operator=( const SvxBoxItem& rBox ); // "pure virtual Methoden" vom SfxPoolItem - virtual int operator==( const SfxPoolItem& ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual int operator==( const SfxPoolItem& ) const; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; - virtual USHORT GetVersion( USHORT nFileVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Create(SvStream &, USHORT) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; + virtual USHORT GetVersion( USHORT nFileVersion ) const; virtual bool ScaleMetrics( long nMult, long nDiv ); - virtual bool HasMetrics() const; + virtual bool HasMetrics() const; - const SvxBorderLine* GetTop() const { return pTop; } - const SvxBorderLine* GetBottom() const { return pBottom; } - const SvxBorderLine* GetLeft() const { return pLeft; } - const SvxBorderLine* GetRight() const { return pRight; } + const SvxBorderLine* GetTop() const { return pTop; } + const SvxBorderLine* GetBottom() const { return pBottom; } + const SvxBorderLine* GetLeft() const { return pLeft; } + const SvxBorderLine* GetRight() const { return pRight; } - const SvxBorderLine* GetLine( USHORT nLine ) const; + const SvxBorderLine* GetLine( USHORT nLine ) const; //Die Pointer werden kopiert! - void SetLine( const SvxBorderLine* pNew, USHORT nLine ); + void SetLine( const SvxBorderLine* pNew, USHORT nLine ); - USHORT GetDistance( USHORT nLine ) const; - USHORT GetDistance() const; + USHORT GetDistance( USHORT nLine ) const; + USHORT GetDistance() const; - void SetDistance( USHORT nNew, USHORT nLine ); + void SetDistance( USHORT nNew, USHORT nLine ); inline void SetDistance( USHORT nNew ); //Breite der Linien plus Zwischenraum plus Abstand nach innen. //JP 09.06.99: bIgnoreLine = TRUE -> Distance auch returnen, wenn - // keine Line gesetzt ist - USHORT CalcLineSpace( USHORT nLine, BOOL bIgnoreLine = FALSE ) const; + // keine Line gesetzt ist + USHORT CalcLineSpace( USHORT nLine, BOOL bIgnoreLine = FALSE ) const; static com::sun::star::table::BorderLine2 SvxLineToLine( const SvxBorderLine* pLine, sal_Bool bConvert ); static sal_Bool LineToSvxLine(const ::com::sun::star::table::BorderLine& rLine, SvxBorderLine& rSvxLine, sal_Bool bConvert); static sal_Bool LineToSvxLine(const ::com::sun::star::table::BorderLine2& rLine, SvxBorderLine& rSvxLine, sal_Bool bConvert); @@ -128,17 +128,17 @@ Andererseits werden ueber dieses Attribut ggf. die BorderLines fuer die horizontalen und vertikalen innerern Linien transportiert. */ -#define BOXINFO_LINE_HORI ((USHORT)0) -#define BOXINFO_LINE_VERT ((USHORT)1) +#define BOXINFO_LINE_HORI ((USHORT)0) +#define BOXINFO_LINE_VERT ((USHORT)1) -#define VALID_TOP 0x01 -#define VALID_BOTTOM 0x02 -#define VALID_LEFT 0x04 -#define VALID_RIGHT 0x08 -#define VALID_HORI 0x10 -#define VALID_VERT 0x20 -#define VALID_DISTANCE 0x40 -#define VALID_DISABLE 0x80 +#define VALID_TOP 0x01 +#define VALID_BOTTOM 0x02 +#define VALID_LEFT 0x04 +#define VALID_RIGHT 0x08 +#define VALID_HORI 0x10 +#define VALID_VERT 0x20 +#define VALID_DISTANCE 0x40 +#define VALID_DISABLE 0x80 class EDITENG_DLLPUBLIC SvxBoxInfoItem : public SfxPoolItem { @@ -152,16 +152,16 @@ class EDITENG_DLLPUBLIC SvxBoxInfoItem : public SfxPoolItem z.Z. nur fuer StarWriter: Abstand nach innen von SvxBoxItem. Wenn der Abstand gewuenscht ist, so muss das Feld fuer den Abstand vom Dialog freigeschaltet werden. nDefDist ist als Defaultwert anzusehen. - Wenn irgendeine Linie eingeschalt ist oder wird, so muss dieser + Wenn irgendeine Linie eingeschalt ist oder wird, so muss dieser Abstand defaultet werden. bMinDist gibt an, ob der Wert durch den Anwender unterschritten werden darf. Mit nDist wird der aktuelle Abstand von der App zum Dialog und zurueck transportiert. */ - BOOL bDist :1; // TRUE, Abstand freischalten. - BOOL bMinDist :1; // TRUE, Abstand darf nicht unterschritten werden. + BOOL bDist :1; // TRUE, Abstand freischalten. + BOOL bMinDist :1; // TRUE, Abstand darf nicht unterschritten werden. - BYTE nValidFlags; // 0000 0000 + BYTE nValidFlags; // 0000 0000 // ³³³³ ³³³ÀÄ VALID_TOP // ³³³³ ³³ÀÄÄ VALID_BOTTOM // ³³³³ ³ÀÄÄÄ VALID_LEFT @@ -171,7 +171,7 @@ class EDITENG_DLLPUBLIC SvxBoxInfoItem : public SfxPoolItem // ³ÀÄÄÄÄÄÄÄÄ VALID_DIST // ÀÄÄÄÄÄÄÄÄÄ VALID_DISABLE - USHORT nDefDist; // Der Default- bzw. Minimalabstand. + USHORT nDefDist; // Der Default- bzw. Minimalabstand. public: TYPEINFO(); @@ -182,25 +182,25 @@ public: SvxBoxInfoItem &operator=( const SvxBoxInfoItem &rCpy ); // "pure virtual Methoden" vom SfxPoolItem - virtual int operator==( const SfxPoolItem& ) const; + virtual int operator==( const SfxPoolItem& ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Create(SvStream &, USHORT) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; virtual bool ScaleMetrics( long nMult, long nDiv ); - virtual bool HasMetrics() const; + virtual bool HasMetrics() const; - const SvxBorderLine* GetHori() const { return pHori; } - const SvxBorderLine* GetVert() const { return pVert; } + const SvxBorderLine* GetHori() const { return pHori; } + const SvxBorderLine* GetVert() const { return pVert; } //Die Pointer werden kopiert! - void SetLine( const SvxBorderLine* pNew, USHORT nLine ); + void SetLine( const SvxBorderLine* pNew, USHORT nLine ); BOOL IsTable() const { return mbEnableHor && mbEnableVer; } void SetTable( BOOL bNew ) { mbEnableHor = mbEnableVer = bNew; } @@ -210,19 +210,19 @@ public: inline bool IsVerEnabled() const { return mbEnableVer; } inline void EnableVer( bool bEnable ) { mbEnableVer = bEnable; } - BOOL IsDist() const { return bDist; } - void SetDist( BOOL bNew ) { bDist = bNew; } - BOOL IsMinDist() const { return bMinDist; } - void SetMinDist( BOOL bNew ) { bMinDist = bNew; } - USHORT GetDefDist() const { return nDefDist; } - void SetDefDist( USHORT nNew ) { nDefDist = nNew; } + BOOL IsDist() const { return bDist; } + void SetDist( BOOL bNew ) { bDist = bNew; } + BOOL IsMinDist() const { return bMinDist; } + void SetMinDist( BOOL bNew ) { bMinDist = bNew; } + USHORT GetDefDist() const { return nDefDist; } + void SetDefDist( USHORT nNew ) { nDefDist = nNew; } - BOOL IsValid( BYTE nValid ) const + BOOL IsValid( BYTE nValid ) const { return ( nValidFlags & nValid ) == nValid; } - void SetValid( BYTE nValid, BOOL bValid = TRUE ) + void SetValid( BYTE nValid, BOOL bValid = TRUE ) { bValid ? ( nValidFlags |= nValid ) : ( nValidFlags &= ~nValid ); } - void ResetFlags(); + void ResetFlags(); }; #endif diff --git a/editeng/inc/editeng/brkitem.hxx b/editeng/inc/editeng/brkitem.hxx index 293ae9b09a9b..1409f3152000 100644 --- a/editeng/inc/editeng/brkitem.hxx +++ b/editeng/inc/editeng/brkitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ namespace rtl Dieses Item beschreibt ein Umbruch-Attribut Automatisch?, Seiten- oder Spaltenumbruch, davor oder danach? */ -#define FMTBREAK_NOAUTO ((USHORT)0x0001) +#define FMTBREAK_NOAUTO ((USHORT)0x0001) class EDITENG_DLLPUBLIC SvxFmtBreakItem : public SfxEnumItem { @@ -59,27 +59,27 @@ public: inline SvxFmtBreakItem& operator=( const SvxFmtBreakItem& rCpy ); // "pure virtual Methoden" vom SfxPoolItem - virtual int operator==( const SfxPoolItem& ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual int operator==( const SfxPoolItem& ) const; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - virtual String GetValueTextByPos( USHORT nPos ) const; + virtual String GetValueTextByPos( USHORT nPos ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SvStream& Store( SvStream& , USHORT nItemVersion ) const; - virtual USHORT GetVersion( USHORT nFileVersion ) const; - virtual SfxPoolItem* Create( SvStream&, USHORT ) const; - virtual USHORT GetValueCount() const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SvStream& Store( SvStream& , USHORT nItemVersion ) const; + virtual USHORT GetVersion( USHORT nFileVersion ) const; + virtual SfxPoolItem* Create( SvStream&, USHORT ) const; + virtual USHORT GetValueCount() const; // MS VC4.0 kommt durcheinander - void SetValue( USHORT nNewVal ) + void SetValue( USHORT nNewVal ) {SfxEnumItem::SetValue(nNewVal); } - SvxBreak GetBreak() const { return SvxBreak( GetValue() ); } - void SetBreak( const SvxBreak eNew ) + SvxBreak GetBreak() const { return SvxBreak( GetValue() ); } + void SetBreak( const SvxBreak eNew ) { SetValue( (USHORT)eNew ); } }; diff --git a/editeng/inc/editeng/brshitem.hxx b/editeng/inc/editeng/brshitem.hxx index f9a2853462ed..025c39161ea7 100644 --- a/editeng/inc/editeng/brshitem.hxx +++ b/editeng/inc/editeng/brshitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 rtl class OUString; } -#define BRUSH_GRAPHIC_VERSION ((USHORT)0x0001) +#define BRUSH_GRAPHIC_VERSION ((USHORT)0x0001) enum SvxGraphicPosition { @@ -56,18 +56,18 @@ enum SvxGraphicPosition GPOS_AREA, GPOS_TILED }; -#define PARA_DEST_PARA 0 +#define PARA_DEST_PARA 0 #define PARA_DEST_CHAR 1 class SvxBrushItem_Impl; class EDITENG_DLLPUBLIC SvxBrushItem : public SfxPoolItem { - Color aColor; + Color aColor; SvxBrushItem_Impl* pImpl; - String* pStrLink; - String* pStrFilter; - SvxGraphicPosition eGraphicPos; - BOOL bLoadAgain; + String* pStrLink; + String* pStrFilter; + SvxGraphicPosition eGraphicPos; + BOOL bLoadAgain; void ApplyGraphicTransparency_Impl(); DECL_STATIC_LINK( SvxBrushItem, DoneHdl_Impl, void *); @@ -99,42 +99,42 @@ public: SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual int operator==( const SfxPoolItem& ) const; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream&, USHORT nVersion ) const; - virtual SvStream& Store( SvStream& , USHORT nItemVersion ) const; - virtual USHORT GetVersion( USHORT nFileVersion ) const; + virtual SfxPoolItem* Create( SvStream&, USHORT nVersion ) const; + virtual SvStream& Store( SvStream& , USHORT nItemVersion ) const; + virtual USHORT GetVersion( USHORT nFileVersion ) const; - const Color& GetColor() const { return aColor; } - Color& GetColor() { return aColor; } - void SetColor( const Color& rCol) { aColor = rCol; } + const Color& GetColor() const { return aColor; } + Color& GetColor() { return aColor; } + void SetColor( const Color& rCol) { aColor = rCol; } void SetDoneLink( const Link& rLink ); - SvxGraphicPosition GetGraphicPos() const { return eGraphicPos; } + SvxGraphicPosition GetGraphicPos() const { return eGraphicPos; } void PurgeGraphic() const; void PurgeMedium() const; - const Graphic* GetGraphic() const; - const GraphicObject* GetGraphicObject() const; - const String* GetGraphicLink() const { return pStrLink; } - const String* GetGraphicFilter() const { return pStrFilter; } + const Graphic* GetGraphic() const; + const GraphicObject* GetGraphicObject() const; + const String* GetGraphicLink() const { return pStrLink; } + const String* GetGraphicFilter() const { return pStrFilter; } - void SetGraphicPos( SvxGraphicPosition eNew ); - void SetGraphic( const Graphic& rNew ); - void SetGraphicObject( const GraphicObject& rNewObj ); - void SetGraphicLink( const String& rNew ); - void SetGraphicFilter( const String& rNew ); + void SetGraphicPos( SvxGraphicPosition eNew ); + void SetGraphic( const Graphic& rNew ); + void SetGraphicObject( const GraphicObject& rNewObj ); + void SetGraphicLink( const String& rNew ); + void SetGraphicFilter( const String& rNew ); - SvxBrushItem& operator=( const SvxBrushItem& rItem); + SvxBrushItem& operator=( const SvxBrushItem& rItem); - static SvxGraphicPosition WallpaperStyle2GraphicPos( WallpaperStyle eStyle ); - static WallpaperStyle GraphicPos2WallpaperStyle( SvxGraphicPosition ePos ); - CntWallpaperItem* CreateCntWallpaperItem() const; + static SvxGraphicPosition WallpaperStyle2GraphicPos( WallpaperStyle eStyle ); + static WallpaperStyle GraphicPos2WallpaperStyle( SvxGraphicPosition ePos ); + CntWallpaperItem* CreateCntWallpaperItem() const; }; #endif // #ifndef _SVX_BRSHITEM_HXX diff --git a/editeng/inc/editeng/bulitem.hxx b/editeng/inc/editeng/bulitem.hxx index ff31fb8ce103..ea41ef5e5f38 100644 --- a/editeng/inc/editeng/bulitem.hxx +++ b/editeng/inc/editeng/bulitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/editeng/inc/editeng/charhiddenitem.hxx b/editeng/inc/editeng/charhiddenitem.hxx index 04e1ca1612d6..0e4ae84bf2f4 100644 --- a/editeng/inc/editeng/charhiddenitem.hxx +++ b/editeng/inc/editeng/charhiddenitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/editeng/inc/editeng/charreliefitem.hxx b/editeng/inc/editeng/charreliefitem.hxx index 906535a13585..376090a53685 100644 --- a/editeng/inc/editeng/charreliefitem.hxx +++ b/editeng/inc/editeng/charreliefitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,13 +51,13 @@ public: SvxCharReliefItem( FontRelief eValue /*= RELIEF_NONE*/, const sal_uInt16 nId ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream & rStrm, USHORT nIVer) const; - virtual USHORT GetVersion( USHORT nFileVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Create(SvStream &, USHORT) const; + virtual SvStream& Store(SvStream & rStrm, USHORT nIVer) const; + virtual USHORT GetVersion( USHORT nFileVersion ) const; - virtual String GetValueTextByPos( USHORT nPos ) const; - virtual USHORT GetValueCount() const; + virtual String GetValueTextByPos( USHORT nPos ) const; + virtual USHORT GetValueCount() const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/editeng/inc/editeng/charrotateitem.hxx b/editeng/inc/editeng/charrotateitem.hxx index a36b6540166a..f085beb2fed1 100644 --- a/editeng/inc/editeng/charrotateitem.hxx +++ b/editeng/inc/editeng/charrotateitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,10 +54,10 @@ public: sal_Bool bFitIntoLine /*= sal_False*/, const sal_uInt16 nId ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream & rStrm, USHORT nIVer) const; - virtual USHORT GetVersion( USHORT nFileVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Create(SvStream &, USHORT) const; + virtual SvStream& Store(SvStream & rStrm, USHORT nIVer) const; + virtual USHORT GetVersion( USHORT nFileVersion ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -77,16 +77,16 @@ public: return *this; } - virtual int operator==( const SfxPoolItem& ) const; + virtual int operator==( const SfxPoolItem& ) const; // our currently only degree values - void SetTopToBotton() { SetValue( 2700 ); } - void SetBottomToTop() { SetValue( 900 ); } - sal_Bool IsTopToBotton() const { return 2700 == GetValue(); } - sal_Bool IsBottomToTop() const { return 900 == GetValue(); } + void SetTopToBotton() { SetValue( 2700 ); } + void SetBottomToTop() { SetValue( 900 ); } + sal_Bool IsTopToBotton() const { return 2700 == GetValue(); } + sal_Bool IsBottomToTop() const { return 900 == GetValue(); } - sal_Bool IsFitToLine() const { return bFitToLine; } - void SetFitToLine( sal_Bool b ) { bFitToLine = b; } + sal_Bool IsFitToLine() const { return bFitToLine; } + void SetFitToLine( sal_Bool b ) { bFitToLine = b; } }; #endif diff --git a/editeng/inc/editeng/charscaleitem.hxx b/editeng/inc/editeng/charscaleitem.hxx index fd4a0e6e3564..6c6e0db5b573 100644 --- a/editeng/inc/editeng/charscaleitem.hxx +++ b/editeng/inc/editeng/charscaleitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,10 +51,10 @@ public: SvxCharScaleWidthItem( sal_uInt16 nValue /*= 100*/, const sal_uInt16 nId ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store( SvStream& , USHORT nItemVersion ) const; - virtual USHORT GetVersion( USHORT nFileVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Create(SvStream &, USHORT) const; + virtual SvStream& Store( SvStream& , USHORT nItemVersion ) const; + virtual USHORT GetVersion( USHORT nFileVersion ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/editeng/inc/editeng/cmapitem.hxx b/editeng/inc/editeng/cmapitem.hxx index 5335d9cde708..b436b1e1f3b1 100644 --- a/editeng/inc/editeng/cmapitem.hxx +++ b/editeng/inc/editeng/cmapitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 rtl // class SvxCaseMapItem -------------------------------------------------- -/* [Beschreibung] +/* [Beschreibung] Dieses Item beschreibt die Schrift-Ausrichtung (Versalien, Kapitaelchen,...). */ @@ -63,12 +63,12 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; - virtual String GetValueTextByPos( USHORT nPos ) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; + virtual String GetValueTextByPos( USHORT nPos ) const; virtual USHORT GetValueCount() const; // MS VC4.0 kommt durcheinander - void SetValue( USHORT nNewVal ) + void SetValue( USHORT nNewVal ) {SfxEnumItem::SetValue(nNewVal); } inline SvxCaseMapItem& operator=(const SvxCaseMapItem& rMap) @@ -78,12 +78,12 @@ public: } // enum cast - SvxCaseMap GetCaseMap() const + SvxCaseMap GetCaseMap() const { return (SvxCaseMap)GetValue(); } - void SetCaseMap( SvxCaseMap eNew ) + void SetCaseMap( SvxCaseMap eNew ) { SetValue( (USHORT)eNew ); } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); }; #endif diff --git a/editeng/inc/editeng/cntritem.hxx b/editeng/inc/editeng/cntritem.hxx index f1c1e67fec67..d1b4bfeb87c7 100644 --- a/editeng/inc/editeng/cntritem.hxx +++ b/editeng/inc/editeng/cntritem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ public: // "pure virtual Methoden" vom SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/editeng/inc/editeng/colritem.hxx b/editeng/inc/editeng/colritem.hxx index 947c679d7f82..c71829bcee49 100644 --- a/editeng/inc/editeng/colritem.hxx +++ b/editeng/inc/editeng/colritem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,17 +42,17 @@ namespace rtl // class SvxColorItem ---------------------------------------------------- -/* [Beschreibung] +/* [Beschreibung] Dieses Item beschreibt eine Farbe. */ -#define VERSION_USEAUTOCOLOR 1 +#define VERSION_USEAUTOCOLOR 1 class EDITENG_DLLPUBLIC SvxColorItem : public SfxPoolItem { private: - Color mColor; + Color mColor; public: TYPEINFO(); @@ -64,19 +64,19 @@ public: ~SvxColorItem(); // "pure virtual Methoden" vom SfxPoolItem - virtual int operator==( const SfxPoolItem& ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); - virtual USHORT GetVersion( USHORT nFileVersion ) const; + virtual int operator==( const SfxPoolItem& ) const; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual USHORT GetVersion( USHORT nFileVersion ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Create(SvStream &, USHORT) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; inline SvxColorItem& operator=(const SvxColorItem& rColor) { @@ -84,11 +84,11 @@ public: return *this; } - const Color& GetValue() const + const Color& GetValue() const { return mColor; } - void SetValue( const Color& rNewCol ); + void SetValue( const Color& rNewCol ); }; diff --git a/editeng/inc/editeng/crsditem.hxx b/editeng/inc/editeng/crsditem.hxx index 6a3860be9a71..6c832f503cab 100644 --- a/editeng/inc/editeng/crsditem.hxx +++ b/editeng/inc/editeng/crsditem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,19 +63,19 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; - virtual String GetValueTextByPos( USHORT nPos ) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; + virtual String GetValueTextByPos( USHORT nPos ) const; virtual USHORT GetValueCount() const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); // MS VC4.0 kommt durcheinander - void SetValue( USHORT nNewVal ) + void SetValue( USHORT nNewVal ) {SfxEnumItem::SetValue(nNewVal); } - virtual int HasBoolValue() const; - virtual BOOL GetBoolValue() const; - virtual void SetBoolValue( BOOL bVal ); + virtual int HasBoolValue() const; + virtual BOOL GetBoolValue() const; + virtual void SetBoolValue( BOOL bVal ); inline SvxCrossedOutItem& operator=(const SvxCrossedOutItem& rCross) { @@ -84,9 +84,9 @@ public: } // enum cast - FontStrikeout GetStrikeout() const + FontStrikeout GetStrikeout() const { return (FontStrikeout)GetValue(); } - void SetStrikeout( FontStrikeout eNew ) + void SetStrikeout( FontStrikeout eNew ) { SetValue( (USHORT)eNew ); } }; diff --git a/editeng/inc/editeng/cscoitem.hxx b/editeng/inc/editeng/cscoitem.hxx index db46c3da3997..4ddbfe32df85 100644 --- a/editeng/inc/editeng/cscoitem.hxx +++ b/editeng/inc/editeng/cscoitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ // class SvxCharSetColorItem --------------------------------------------- -/* [Beschreibung] +/* [Beschreibung] PB: wird nur intern im Reader des Writers benoetigt */ @@ -59,10 +59,10 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; - inline rtl_TextEncoding& GetCharSet() { return eFrom; } - inline rtl_TextEncoding GetCharSet() const { return eFrom; } + inline rtl_TextEncoding& GetCharSet() { return eFrom; } + inline rtl_TextEncoding GetCharSet() const { return eFrom; } inline SvxCharSetColorItem& operator=(const SvxCharSetColorItem& rColor) { diff --git a/editeng/inc/editeng/editdata.hxx b/editeng/inc/editeng/editdata.hxx index f4c8ed5d6bba..6d252b336ac7 100644 --- a/editeng/inc/editeng/editdata.hxx +++ b/editeng/inc/editeng/editdata.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,62 +40,62 @@ class SfxPoolItem; class SvParser; class SvxFieldItem; -enum EETextFormat { EE_FORMAT_TEXT = 0x20, EE_FORMAT_RTF, EE_FORMAT_BIN = 0x31, EE_FORMAT_HTML, EE_FORMAT_XML }; +enum EETextFormat { EE_FORMAT_TEXT = 0x20, EE_FORMAT_RTF, EE_FORMAT_BIN = 0x31, EE_FORMAT_HTML, EE_FORMAT_XML }; enum EEHorizontalTextDirection { EE_HTEXTDIR_DEFAULT, EE_HTEXTDIR_L2R, EE_HTEXTDIR_R2L }; -enum EESelectionMode { EE_SELMODE_STD, EE_SELMODE_TXTONLY, EE_SELMODE_HIDDEN }; +enum EESelectionMode { EE_SELMODE_STD, EE_SELMODE_TXTONLY, EE_SELMODE_HIDDEN }; // EE_SELMODE_HIDDEN can be used to completely hide the selection. This is usefull e.g. when you want show the selection // only as long as your window (which the edit view works on) has the focus -enum EESpellState { EE_SPELL_OK, EE_SPELL_NOLANGUAGE, EE_SPELL_LANGUAGENOTINSTALLED, EE_SPELL_NOSPELLER, EE_SPELL_ERRORFOUND }; -enum EVAnchorMode { - ANCHOR_TOP_LEFT, ANCHOR_VCENTER_LEFT, ANCHOR_BOTTOM_LEFT, - ANCHOR_TOP_HCENTER, ANCHOR_VCENTER_HCENTER, ANCHOR_BOTTOM_HCENTER, - ANCHOR_TOP_RIGHT, ANCHOR_VCENTER_RIGHT, ANCHOR_BOTTOM_RIGHT }; - -#define EE_PARA_NOT_FOUND 0xFFFF -#define EE_PARA_APPEND 0xFFFF -#define EE_PARA_ALL 0xFFFF -#define EE_APPEND 0xFFFF -#define EE_INDEX_NOT_FOUND 0xFFFF +enum EESpellState { EE_SPELL_OK, EE_SPELL_NOLANGUAGE, EE_SPELL_LANGUAGENOTINSTALLED, EE_SPELL_NOSPELLER, EE_SPELL_ERRORFOUND }; +enum EVAnchorMode { + ANCHOR_TOP_LEFT, ANCHOR_VCENTER_LEFT, ANCHOR_BOTTOM_LEFT, + ANCHOR_TOP_HCENTER, ANCHOR_VCENTER_HCENTER, ANCHOR_BOTTOM_HCENTER, + ANCHOR_TOP_RIGHT, ANCHOR_VCENTER_RIGHT, ANCHOR_BOTTOM_RIGHT }; + +#define EE_PARA_NOT_FOUND 0xFFFF +#define EE_PARA_APPEND 0xFFFF +#define EE_PARA_ALL 0xFFFF +#define EE_APPEND 0xFFFF +#define EE_INDEX_NOT_FOUND 0xFFFF // Fehlermeldungen fuer Read/Write-Methode -#define EE_READWRITE_OK (SVSTREAM_OK) -#define EE_READWRITE_WRONGFORMAT (SVSTREAM_ERRBASE_USER+1) -#define EE_READWRITE_GENERALERROR (SVSTREAM_ERRBASE_USER+2) - -#define EDITUNDO_START 100 -#define EDITUNDO_REMOVECHARS 100 -#define EDITUNDO_CONNECTPARAS 101 -#define EDITUNDO_REMOVEFEATURE 102 -#define EDITUNDO_MOVEPARAGRAPHS 103 -#define EDITUNDO_INSERTFEATURE 104 -#define EDITUNDO_SPLITPARA 105 -#define EDITUNDO_INSERTCHARS 106 -#define EDITUNDO_DELCONTENT 107 -#define EDITUNDO_DELETE 108 -#define EDITUNDO_CUT 109 -#define EDITUNDO_PASTE 110 -#define EDITUNDO_INSERT 111 -#define EDITUNDO_SRCHANDREPL 112 -#define EDITUNDO_MOVEPARAS 113 -#define EDITUNDO_PARAATTRIBS 114 -#define EDITUNDO_ATTRIBS 115 -#define EDITUNDO_DRAGANDDROP 116 -#define EDITUNDO_READ 117 -#define EDITUNDO_STYLESHEET 118 -#define EDITUNDO_REPLACEALL 119 -#define EDITUNDO_STRETCH 120 -#define EDITUNDO_RESETATTRIBS 121 -#define EDITUNDO_INDENTBLOCK 122 -#define EDITUNDO_UNINDENTBLOCK 123 -#define EDITUNDO_MARKSELECTION 124 -#define EDITUNDO_TRANSLITERATE 125 -#define EDITUNDO_END 125 - -#define EDITUNDO_USER 200 - - -#define EE_COMPATIBLEMODE_PARAGRAPHSPACING_SUMMATION 0x0001 -#define EE_COMPATIBLEMODE_PARAGRAPHSPACING_BEFOREFIRSTPARAGRAPH 0x0002 +#define EE_READWRITE_OK (SVSTREAM_OK) +#define EE_READWRITE_WRONGFORMAT (SVSTREAM_ERRBASE_USER+1) +#define EE_READWRITE_GENERALERROR (SVSTREAM_ERRBASE_USER+2) + +#define EDITUNDO_START 100 +#define EDITUNDO_REMOVECHARS 100 +#define EDITUNDO_CONNECTPARAS 101 +#define EDITUNDO_REMOVEFEATURE 102 +#define EDITUNDO_MOVEPARAGRAPHS 103 +#define EDITUNDO_INSERTFEATURE 104 +#define EDITUNDO_SPLITPARA 105 +#define EDITUNDO_INSERTCHARS 106 +#define EDITUNDO_DELCONTENT 107 +#define EDITUNDO_DELETE 108 +#define EDITUNDO_CUT 109 +#define EDITUNDO_PASTE 110 +#define EDITUNDO_INSERT 111 +#define EDITUNDO_SRCHANDREPL 112 +#define EDITUNDO_MOVEPARAS 113 +#define EDITUNDO_PARAATTRIBS 114 +#define EDITUNDO_ATTRIBS 115 +#define EDITUNDO_DRAGANDDROP 116 +#define EDITUNDO_READ 117 +#define EDITUNDO_STYLESHEET 118 +#define EDITUNDO_REPLACEALL 119 +#define EDITUNDO_STRETCH 120 +#define EDITUNDO_RESETATTRIBS 121 +#define EDITUNDO_INDENTBLOCK 122 +#define EDITUNDO_UNINDENTBLOCK 123 +#define EDITUNDO_MARKSELECTION 124 +#define EDITUNDO_TRANSLITERATE 125 +#define EDITUNDO_END 125 + +#define EDITUNDO_USER 200 + + +#define EE_COMPATIBLEMODE_PARAGRAPHSPACING_SUMMATION 0x0001 +#define EE_COMPATIBLEMODE_PARAGRAPHSPACING_BEFOREFIRSTPARAGRAPH 0x0002 class EditView; class EditEngine; @@ -104,14 +104,14 @@ class ImpEditEngine; class EditTextObject; class SfxStyleSheet; -#define RGCHK_NONE 0 // Keine Korrektur der ViusArea beim Scrollen -#define RGCHK_NEG 1 // Keine neg. ViusArea beim Scrollen -#define RGCHK_PAPERSZ1 2 // VisArea muss in Papierbreite,Texthoehe liegen +#define RGCHK_NONE 0 // Keine Korrektur der ViusArea beim Scrollen +#define RGCHK_NEG 1 // Keine neg. ViusArea beim Scrollen +#define RGCHK_PAPERSZ1 2 // VisArea muss in Papierbreite,Texthoehe liegen struct EPosition { - USHORT nPara; - xub_StrLen nIndex; + USHORT nPara; + xub_StrLen nIndex; EPosition() : nPara( EE_PARA_NOT_FOUND ), @@ -128,10 +128,10 @@ struct EPosition struct ESelection { - USHORT nStartPara; - xub_StrLen nStartPos; - USHORT nEndPara; - xub_StrLen nEndPos; + USHORT nStartPara; + xub_StrLen nStartPos; + USHORT nEndPara; + xub_StrLen nEndPos; ESelection() : nStartPara( 0 ), nStartPos( 0 ), nEndPara( 0 ), nEndPos( 0 ) {} @@ -151,12 +151,12 @@ struct ESelection { } - void Adjust(); + void Adjust(); BOOL IsEqual( const ESelection& rS ) const; BOOL IsLess( const ESelection& rS ) const; BOOL IsGreater( const ESelection& rS ) const; BOOL IsZero() const; - BOOL HasRange() const; + BOOL HasRange() const; }; inline BOOL ESelection::HasRange() const @@ -235,41 +235,41 @@ struct EDITENG_DLLPUBLIC EFieldInfo // ----------------------------------------------------------------------- enum ImportState { - RTFIMP_START, RTFIMP_END, // nur pParser, nPara, nIndex - RTFIMP_NEXTTOKEN, RTFIMP_UNKNOWNATTR, // nToken+nTokenValue - RTFIMP_SETATTR, // pAttrs - RTFIMP_INSERTTEXT, // aText - RTFIMP_INSERTPARA, // - - HTMLIMP_START, HTMLIMP_END, // nur pParser, nPara, nIndex - HTMLIMP_NEXTTOKEN, HTMLIMP_UNKNOWNATTR, // nToken - HTMLIMP_SETATTR, // pAttrs - HTMLIMP_INSERTTEXT, // aText - HTMLIMP_INSERTPARA, HTMLIMP_INSERTFIELD // - + RTFIMP_START, RTFIMP_END, // nur pParser, nPara, nIndex + RTFIMP_NEXTTOKEN, RTFIMP_UNKNOWNATTR, // nToken+nTokenValue + RTFIMP_SETATTR, // pAttrs + RTFIMP_INSERTTEXT, // aText + RTFIMP_INSERTPARA, // - + HTMLIMP_START, HTMLIMP_END, // nur pParser, nPara, nIndex + HTMLIMP_NEXTTOKEN, HTMLIMP_UNKNOWNATTR, // nToken + HTMLIMP_SETATTR, // pAttrs + HTMLIMP_INSERTTEXT, // aText + HTMLIMP_INSERTPARA, HTMLIMP_INSERTFIELD // - }; struct ImportInfo { - SvParser* pParser; - ESelection aSelection; - ImportState eState; + SvParser* pParser; + ESelection aSelection; + ImportState eState; - int nToken; - short nTokenValue; + int nToken; + short nTokenValue; - String aText; + String aText; - void* pAttrs; // RTF: SvxRTFItemStackType*, HTML: SfxItemSet* + void* pAttrs; // RTF: SvxRTFItemStackType*, HTML: SfxItemSet* ImportInfo( ImportState eState, SvParser* pPrsrs, const ESelection& rSel ); ~ImportInfo(); }; -#define EE_SEARCH_WORDONLY 0x0001 -#define EE_SEARCH_EXACT 0x0002 -#define EE_SEARCH_BACKWARD 0x0004 -#define EE_SEARCH_INSELECTION 0x0008 -#define EE_SEARCH_REGEXPR 0x0010 -#define EE_SEARCH_PATTERN 0x0020 +#define EE_SEARCH_WORDONLY 0x0001 +#define EE_SEARCH_EXACT 0x0002 +#define EE_SEARCH_BACKWARD 0x0004 +#define EE_SEARCH_INSELECTION 0x0008 +#define EE_SEARCH_REGEXPR 0x0010 +#define EE_SEARCH_PATTERN 0x0020 struct ParagraphInfos { @@ -283,26 +283,26 @@ struct ParagraphInfos , nFirstLineMaxAscent( 0 ) , bValid( 0 ) {} - USHORT nParaHeight; - USHORT nLines; + USHORT nParaHeight; + USHORT nLines; - USHORT nFirstLineStartX; + USHORT nFirstLineStartX; - USHORT nFirstLineOffset; - USHORT nFirstLineHeight; - USHORT nFirstLineTextHeight; - USHORT nFirstLineMaxAscent; + USHORT nFirstLineOffset; + USHORT nFirstLineHeight; + USHORT nFirstLineTextHeight; + USHORT nFirstLineMaxAscent; - BOOL bValid; // Bei einer Abfrage waehrend der Formatierung ungueltig! + BOOL bValid; // Bei einer Abfrage waehrend der Formatierung ungueltig! }; struct EECharAttrib { - const SfxPoolItem* pAttr; + const SfxPoolItem* pAttr; - USHORT nPara; - xub_StrLen nStart; - xub_StrLen nEnd; + USHORT nPara; + xub_StrLen nStart; + xub_StrLen nEnd; }; SV_DECL_VARARR_VISIBILITY( EECharAttribArray, EECharAttrib, 0, 4, EDITENG_DLLPUBLIC ) diff --git a/editeng/inc/editeng/editeng.hxx b/editeng/inc/editeng/editeng.hxx index e0e7e542da99..75750ba74f41 100644 --- a/editeng/inc/editeng/editeng.hxx +++ b/editeng/inc/editeng/editeng.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -92,7 +92,7 @@ namespace basegfx { class B2DPolyPolygon; } #include <i18npool/lang.h> #include "editeng/editengdllapi.h" -#include <tools/rtti.hxx> // wegen typedef TypeId +#include <tools/rtti.hxx> // wegen typedef TypeId #include <editeng/eedata.hxx> class SvxFieldData; @@ -101,9 +101,9 @@ class SvxFieldData; /** values for GetAttribs */ -const sal_uInt8 EditEngineAttribs_All = 0; /// returns all attributes even when theire not set -const sal_uInt8 EditEngineAttribs_HardAndPara = 1; /// returns all attributes set on paragraph and on portions -const sal_uInt8 EditEngineAttribs_OnlyHard = 2; /// returns only attributes hard set on portions +const sal_uInt8 EditEngineAttribs_All = 0; /// returns all attributes even when theire not set +const sal_uInt8 EditEngineAttribs_HardAndPara = 1; /// returns all attributes set on paragraph and on portions +const sal_uInt8 EditEngineAttribs_OnlyHard = 2; /// returns only attributes hard set on portions #define GETATTRIBS_STYLESHEET (sal_uInt8)0x01 #define GETATTRIBS_PARAATTRIBS (sal_uInt8)0x02 @@ -118,66 +118,66 @@ class EDITENG_DLLPUBLIC EditEngine friend class Outliner; private: - ImpEditEngine* pImpEditEngine; + ImpEditEngine* pImpEditEngine; EDITENG_DLLPRIVATE EditEngine( const EditEngine& ); - EDITENG_DLLPRIVATE EditEngine& operator=( const EditEngine& ); - EDITENG_DLLPRIVATE BOOL PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pView, Window* pFrameWin = NULL ); + EDITENG_DLLPRIVATE EditEngine& operator=( const EditEngine& ); + EDITENG_DLLPRIVATE BOOL PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pView, Window* pFrameWin = NULL ); protected: public: EditEngine( SfxItemPool* pItemPool ); - virtual ~EditEngine(); + virtual ~EditEngine(); - const SfxItemSet& GetEmptyItemSet(); + const SfxItemSet& GetEmptyItemSet(); - void SetDefTab( USHORT nDefTab ); - USHORT GetDefTab() const; + void SetDefTab( USHORT nDefTab ); + USHORT GetDefTab() const; - void SetRefDevice( OutputDevice* pRefDef ); - OutputDevice* GetRefDevice() const; + void SetRefDevice( OutputDevice* pRefDef ); + OutputDevice* GetRefDevice() const; - void SetRefMapMode( const MapMode& rMapMode ); - MapMode GetRefMapMode(); + void SetRefMapMode( const MapMode& rMapMode ); + MapMode GetRefMapMode(); - void SetUpdateMode( BOOL bUpdate ); - BOOL GetUpdateMode() const; + void SetUpdateMode( BOOL bUpdate ); + BOOL GetUpdateMode() const; - void SetBackgroundColor( const Color& rColor ); - Color GetBackgroundColor() const; - Color GetAutoColor() const; + void SetBackgroundColor( const Color& rColor ); + Color GetBackgroundColor() const; + Color GetAutoColor() const; void EnableAutoColor( BOOL b ); BOOL IsAutoColorEnabled() const; void ForceAutoColor( BOOL b ); BOOL IsForceAutoColor() const; - void InsertView( EditView* pEditView, USHORT nIndex = EE_APPEND ); - EditView* RemoveView( EditView* pEditView ); - EditView* RemoveView( USHORT nIndex = EE_APPEND ); - EditView* GetView( USHORT nIndex = 0 ) const; - USHORT GetViewCount() const; - BOOL HasView( EditView* pView ) const; - EditView* GetActiveView() const; - void SetActiveView( EditView* pView ); + void InsertView( EditView* pEditView, USHORT nIndex = EE_APPEND ); + EditView* RemoveView( EditView* pEditView ); + EditView* RemoveView( USHORT nIndex = EE_APPEND ); + EditView* GetView( USHORT nIndex = 0 ) const; + USHORT GetViewCount() const; + BOOL HasView( EditView* pView ) const; + EditView* GetActiveView() const; + void SetActiveView( EditView* pView ); - void SetPaperSize( const Size& rSize ); - const Size& GetPaperSize() const; + void SetPaperSize( const Size& rSize ); + const Size& GetPaperSize() const; - void SetVertical( BOOL bVertical ); - BOOL IsVertical() const; + void SetVertical( BOOL bVertical ); + BOOL IsVertical() const; - void SetFixedCellHeight( BOOL bUseFixedCellHeight ); - BOOL IsFixedCellHeight() const; + void SetFixedCellHeight( BOOL bUseFixedCellHeight ); + BOOL IsFixedCellHeight() const; void SetDefaultHorizontalTextDirection( EEHorizontalTextDirection eHTextDir ); EEHorizontalTextDirection GetDefaultHorizontalTextDirection() const; - USHORT GetScriptType( const ESelection& rSelection ) const; + USHORT GetScriptType( const ESelection& rSelection ) const; LanguageType GetLanguage( USHORT nPara, USHORT nPos ) const; - void TransliterateText( const ESelection& rSelection, sal_Int32 nTransliterationMode ); + void TransliterateText( const ESelection& rSelection, sal_Int32 nTransliterationMode ); void SetAsianCompressionMode( USHORT nCompression ); USHORT GetAsianCompressionMode() const; @@ -188,41 +188,41 @@ public: void SetAddExtLeading( BOOL b ); BOOL IsAddExtLeading() const; - void SetPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon ); - void SetPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::B2DPolyPolygon* pLinePolyPolygon); - void ClearPolygon(); - const PolyPolygon* GetPolygon(); + void SetPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon ); + void SetPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::B2DPolyPolygon* pLinePolyPolygon); + void ClearPolygon(); + const PolyPolygon* GetPolygon(); - const Size& GetMinAutoPaperSize() const; - void SetMinAutoPaperSize( const Size& rSz ); + const Size& GetMinAutoPaperSize() const; + void SetMinAutoPaperSize( const Size& rSz ); - const Size& GetMaxAutoPaperSize() const; - void SetMaxAutoPaperSize( const Size& rSz ); + const Size& GetMaxAutoPaperSize() const; + void SetMaxAutoPaperSize( const Size& rSz ); - String GetText( LineEnd eEnd = LINEEND_LF ) const; - String GetText( const ESelection& rSelection, const LineEnd eEnd = LINEEND_LF ) const; - sal_uInt32 GetTextLen() const; - sal_uInt32 GetTextHeight() const; - sal_uInt32 CalcTextWidth(); + String GetText( LineEnd eEnd = LINEEND_LF ) const; + String GetText( const ESelection& rSelection, const LineEnd eEnd = LINEEND_LF ) const; + sal_uInt32 GetTextLen() const; + sal_uInt32 GetTextHeight() const; + sal_uInt32 CalcTextWidth(); - String GetText( USHORT nParagraph ) const; - xub_StrLen GetTextLen( USHORT nParagraph ) const; - sal_uInt32 GetTextHeight( USHORT nParagraph ) const; + String GetText( USHORT nParagraph ) const; + xub_StrLen GetTextLen( USHORT nParagraph ) const; + sal_uInt32 GetTextHeight( USHORT nParagraph ) const; - USHORT GetParagraphCount() const; + USHORT GetParagraphCount() const; - USHORT GetLineCount( USHORT nParagraph ) const; - xub_StrLen GetLineLen( USHORT nParagraph, USHORT nLine ) const; + USHORT GetLineCount( USHORT nParagraph ) const; + xub_StrLen GetLineLen( USHORT nParagraph, USHORT nLine ) const; void GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEnd, USHORT nParagraph, USHORT nLine ) const; USHORT GetLineNumberAtIndex( USHORT nPara, USHORT nIndex ) const; - sal_uInt32 GetLineHeight( USHORT nParagraph, USHORT nLine = 0 ); - USHORT GetFirstLineOffset( USHORT nParagraph ); - ParagraphInfos GetParagraphInfos( USHORT nPara ); - USHORT FindParagraph( long nDocPosY ); + sal_uInt32 GetLineHeight( USHORT nParagraph, USHORT nLine = 0 ); + USHORT GetFirstLineOffset( USHORT nParagraph ); + ParagraphInfos GetParagraphInfos( USHORT nPara ); + USHORT FindParagraph( long nDocPosY ); EPosition FindDocPosition( const Point& rDocPos ) const; Rectangle GetCharacterBounds( const EPosition& rPos ) const; - String GetWord( USHORT nPara, xub_StrLen nIndex ); + String GetWord( USHORT nPara, xub_StrLen nIndex ); ESelection GetWord( const ESelection& rSelection, USHORT nWordType ) const; ESelection WordLeft( const ESelection& rSelection, USHORT nWordType ) const; @@ -231,135 +231,135 @@ public: ESelection CursorRight( const ESelection& rSelection, USHORT nCharacterIteratorMode ) const; ESelection SelectSentence( const ESelection& rCurSel ) const; - void Clear(); - void SetText( const String& rStr ); + void Clear(); + void SetText( const String& rStr ); - EditTextObject* CreateTextObject(); - EditTextObject* CreateTextObject( USHORT nPara, USHORT nParas = 1 ); - EditTextObject* CreateTextObject( const ESelection& rESelection ); - void SetText( const EditTextObject& rTextObject ); + EditTextObject* CreateTextObject(); + EditTextObject* CreateTextObject( USHORT nPara, USHORT nParas = 1 ); + EditTextObject* CreateTextObject( const ESelection& rESelection ); + void SetText( const EditTextObject& rTextObject ); - void RemoveParagraph( USHORT nPara ); - void InsertParagraph( USHORT nPara, const EditTextObject& rTxtObj ); - void InsertParagraph( USHORT nPara, const String& rText); + void RemoveParagraph( USHORT nPara ); + void InsertParagraph( USHORT nPara, const EditTextObject& rTxtObj ); + void InsertParagraph( USHORT nPara, const String& rText); - void SetText( USHORT nPara, const EditTextObject& rTxtObj ); - void SetText( USHORT nPara, const String& rText); + void SetText( USHORT nPara, const EditTextObject& rTxtObj ); + void SetText( USHORT nPara, const String& rText); virtual void SetParaAttribs( USHORT nPara, const SfxItemSet& rSet ); - virtual const SfxItemSet& GetParaAttribs( USHORT nPara ) const; + virtual const SfxItemSet& GetParaAttribs( USHORT nPara ) const; - void GetCharAttribs( USHORT nPara, EECharAttribArray& rLst ) const; + void GetCharAttribs( USHORT nPara, EECharAttribArray& rLst ) const; SfxItemSet GetAttribs( USHORT nPara, USHORT nStart, USHORT nEnd, sal_uInt8 nFlags = 0xFF ) const; - SfxItemSet GetAttribs( const ESelection& rSel, BOOL bOnlyHardAttrib = EditEngineAttribs_All ); + SfxItemSet GetAttribs( const ESelection& rSel, BOOL bOnlyHardAttrib = EditEngineAttribs_All ); - BOOL HasParaAttrib( USHORT nPara, USHORT nWhich ) const; - const SfxPoolItem& GetParaAttrib( USHORT nPara, USHORT nWhich ); + BOOL HasParaAttrib( USHORT nPara, USHORT nWhich ) const; + const SfxPoolItem& GetParaAttrib( USHORT nPara, USHORT nWhich ); - Font GetStandardFont( USHORT nPara ); - SvxFont GetStandardSvxFont( USHORT nPara ); + Font GetStandardFont( USHORT nPara ); + SvxFont GetStandardSvxFont( USHORT nPara ); void RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich ); - void ShowParagraph( USHORT nParagraph, BOOL bShow = TRUE ); - BOOL IsParagraphVisible( USHORT nParagraph ); + void ShowParagraph( USHORT nParagraph, BOOL bShow = TRUE ); + BOOL IsParagraphVisible( USHORT nParagraph ); - SfxUndoManager& GetUndoManager(); - void UndoActionStart( USHORT nId ); - void UndoActionEnd( USHORT nId ); - BOOL IsInUndo(); + SfxUndoManager& GetUndoManager(); + void UndoActionStart( USHORT nId ); + void UndoActionEnd( USHORT nId ); + BOOL IsInUndo(); - void EnableUndo( BOOL bEnable ); - BOOL IsUndoEnabled(); + void EnableUndo( BOOL bEnable ); + BOOL IsUndoEnabled(); /** returns the value last used for bTryMerge while calling ImpEditEngine::InsertUndo This is currently used in a bad but needed hack to get undo actions merged in the OutlineView in impress. Do not use it unless you want to sell your soul too! */ - BOOL HasTriedMergeOnLastAddUndo() const; + BOOL HasTriedMergeOnLastAddUndo() const; - void ClearModifyFlag(); - void SetModified(); - BOOL IsModified() const; + void ClearModifyFlag(); + void SetModified(); + BOOL IsModified() const; - void SetModifyHdl( const Link& rLink ); - Link GetModifyHdl() const; + void SetModifyHdl( const Link& rLink ); + Link GetModifyHdl() const; - BOOL IsInSelectionMode() const; - void StopSelectionMode(); + BOOL IsInSelectionMode() const; + void StopSelectionMode(); - void StripPortions(); - void GetPortions( USHORT nPara, SvUShorts& rList ); + void StripPortions(); + void GetPortions( USHORT nPara, SvUShorts& rList ); - long GetFirstLineStartX( USHORT nParagraph ); - Point GetDocPosTopLeft( USHORT nParagraph ); - Point GetDocPos( const Point& rPaperPos ) const; - BOOL IsTextPos( const Point& rPaperPos, USHORT nBorder = 0 ); + long GetFirstLineStartX( USHORT nParagraph ); + Point GetDocPosTopLeft( USHORT nParagraph ); + Point GetDocPos( const Point& rPaperPos ) const; + BOOL IsTextPos( const Point& rPaperPos, USHORT nBorder = 0 ); // StartDocPos entspr. VisArea.TopLeft(). - void Draw( OutputDevice* pOutDev, const Rectangle& rOutRect ); - void Draw( OutputDevice* pOutDev, const Rectangle& rOutRect, const Point& rStartDocPos ); - void Draw( OutputDevice* pOutDev, const Rectangle& rOutRect, const Point& rStartDocPos, BOOL bClip ); - void Draw( OutputDevice* pOutDev, const Point& rStartPos, short nOrientation = 0 ); + void Draw( OutputDevice* pOutDev, const Rectangle& rOutRect ); + void Draw( OutputDevice* pOutDev, const Rectangle& rOutRect, const Point& rStartDocPos ); + void Draw( OutputDevice* pOutDev, const Rectangle& rOutRect, const Point& rStartDocPos, BOOL bClip ); + void Draw( OutputDevice* pOutDev, const Point& rStartPos, short nOrientation = 0 ); // ULONG: Fehlercode des Streams. ULONG Read( SvStream& rInput, const String& rBaseURL, EETextFormat, SvKeyValueIterator* pHTTPHeaderAttrs = NULL ); - ULONG Write( SvStream& rOutput, EETextFormat ); + ULONG Write( SvStream& rOutput, EETextFormat ); - void SetStatusEventHdl( const Link& rLink ); - Link GetStatusEventHdl() const; + void SetStatusEventHdl( const Link& rLink ); + Link GetStatusEventHdl() const; - void SetNotifyHdl( const Link& rLink ); - Link GetNotifyHdl() const; + void SetNotifyHdl( const Link& rLink ); + Link GetNotifyHdl() const; - void SetImportHdl( const Link& rLink ); - Link GetImportHdl() const; + void SetImportHdl( const Link& rLink ); + Link GetImportHdl() const; // Flat-Mode: Keine Zeichenformatierung auswerten => Fuer Outliner - BOOL IsFlatMode() const; - void SetFlatMode( BOOL bFlat ); + BOOL IsFlatMode() const; + void SetFlatMode( BOOL bFlat ); - void SetControlWord( sal_uInt32 nWord ); - sal_uInt32 GetControlWord() const; + void SetControlWord( sal_uInt32 nWord ); + sal_uInt32 GetControlWord() const; - void QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel ); - void QuickRemoveCharAttribs( USHORT nPara, USHORT nWhich = 0 ); - void QuickMarkInvalid( const ESelection& rSel ); - void QuickFormatDoc( BOOL bFull = FALSE ); - void QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel ); - void QuickInsertLineBreak( const ESelection& rSel ); - void QuickInsertText( const String& rText, const ESelection& rSel ); - void QuickDelete( const ESelection& rSel ); - void QuickMarkToBeRepainted( USHORT nPara ); + void QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel ); + void QuickRemoveCharAttribs( USHORT nPara, USHORT nWhich = 0 ); + void QuickMarkInvalid( const ESelection& rSel ); + void QuickFormatDoc( BOOL bFull = FALSE ); + void QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel ); + void QuickInsertLineBreak( const ESelection& rSel ); + void QuickInsertText( const String& rText, const ESelection& rSel ); + void QuickDelete( const ESelection& rSel ); + void QuickMarkToBeRepainted( USHORT nPara ); - void SetGlobalCharStretching( USHORT nX = 100, USHORT nY = 100 ); - void GetGlobalCharStretching( USHORT& rX, USHORT& rY ); - void DoStretchChars( USHORT nX, USHORT nY ); + void SetGlobalCharStretching( USHORT nX = 100, USHORT nY = 100 ); + void GetGlobalCharStretching( USHORT& rX, USHORT& rY ); + void DoStretchChars( USHORT nX, USHORT nY ); - void SetEditTextObjectPool( SfxItemPool* pPool ); - SfxItemPool* GetEditTextObjectPool() const; + void SetEditTextObjectPool( SfxItemPool* pPool ); + SfxItemPool* GetEditTextObjectPool() const; - void SetStyleSheetPool( SfxStyleSheetPool* pSPool ); - SfxStyleSheetPool* GetStyleSheetPool(); + void SetStyleSheetPool( SfxStyleSheetPool* pSPool ); + SfxStyleSheetPool* GetStyleSheetPool(); - void SetStyleSheet( USHORT nPara, SfxStyleSheet* pStyle ); - SfxStyleSheet* GetStyleSheet( USHORT nPara ) const; + void SetStyleSheet( USHORT nPara, SfxStyleSheet* pStyle ); + SfxStyleSheet* GetStyleSheet( USHORT nPara ) const; - void SetWordDelimiters( const String& rDelimiters ); - String GetWordDelimiters() const; + void SetWordDelimiters( const String& rDelimiters ); + String GetWordDelimiters() const; - void SetGroupChars( const String& rChars ); - String GetGroupChars() const; + void SetGroupChars( const String& rChars ); + String GetGroupChars() const; - void EnablePasteSpecial( BOOL bEnable ); - BOOL IsPasteSpecialEnabled() const; + void EnablePasteSpecial( BOOL bEnable ); + BOOL IsPasteSpecialEnabled() const; - void EnableIdleFormatter( BOOL bEnable ); - BOOL IsIdleFormatterEnabled() const; + void EnableIdleFormatter( BOOL bEnable ); + BOOL IsIdleFormatterEnabled() const; - void EraseVirtualDevice(); + void EraseVirtualDevice(); - void SetSpeller( ::com::sun::star::uno::Reference< + void SetSpeller( ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > &xSpeller ); ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > @@ -367,25 +367,25 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenator > GetHyphenator() const; - void SetHyphenator( ::com::sun::star::uno::Reference< + void SetHyphenator( ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenator >& xHyph ); - void SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars ); - rtl::Reference<SvxForbiddenCharactersTable> GetForbiddenCharsTable() const; + void SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars ); + rtl::Reference<SvxForbiddenCharactersTable> GetForbiddenCharsTable() const; - void SetDefaultLanguage( LanguageType eLang ); - LanguageType GetDefaultLanguage() const; + void SetDefaultLanguage( LanguageType eLang ); + LanguageType GetDefaultLanguage() const; - BOOL HasOnlineSpellErrors() const; - void CompleteOnlineSpelling(); + BOOL HasOnlineSpellErrors() const; + void CompleteOnlineSpelling(); - void SetBigTextObjectStart( USHORT nStartAtPortionCount ); - USHORT GetBigTextObjectStart() const; - BOOL ShouldCreateBigTextObject() const; + void SetBigTextObjectStart( USHORT nStartAtPortionCount ); + USHORT GetBigTextObjectStart() const; + BOOL ShouldCreateBigTextObject() const; // Zum schnellen Vorab-Pruefen ohne View: - EESpellState HasSpellErrors(); - BOOL HasText( const SvxSearchItem& rSearchItem ); + EESpellState HasSpellErrors(); + BOOL HasText( const SvxSearchItem& rSearchItem ); //initialize sentence spelling void StartSpelling(EditView& rEditView, sal_Bool bMultipleDoc); @@ -402,8 +402,8 @@ public: sal_Bool HasConvertibleTextPortion( LanguageType nLang ); virtual BOOL ConvertNextDocument(); - BOOL UpdateFields(); - void RemoveFields( BOOL bKeepFieldText, TypeId aType = NULL ); + BOOL UpdateFields(); + void RemoveFields( BOOL bKeepFieldText, TypeId aType = NULL ); USHORT GetFieldCount( USHORT nPara ) const; EFieldInfo GetFieldInfo( USHORT nPara, USHORT nField ) const; @@ -419,13 +419,13 @@ public: void SetBeginPasteOrDropHdl( const Link& rLink ); void SetEndPasteOrDropHdl( const Link& rLink ); - virtual void PaintingFirstLine( USHORT nPara, const Point& rStartPos, long nBaseLineY, const Point& rOrigin, short nOrientation, OutputDevice* pOutDev ); - virtual void ParagraphInserted( USHORT nNewParagraph ); - virtual void ParagraphDeleted( USHORT nDeletedParagraph ); + virtual void PaintingFirstLine( USHORT nPara, const Point& rStartPos, long nBaseLineY, const Point& rOrigin, short nOrientation, OutputDevice* pOutDev ); + virtual void ParagraphInserted( USHORT nNewParagraph ); + virtual void ParagraphDeleted( USHORT nDeletedParagraph ); virtual void ParagraphConnected( USHORT nLeftParagraph, USHORT nRightParagraph ); - virtual void ParaAttribsChanged( USHORT nParagraph ); - virtual void StyleSheetChanged( SfxStyleSheet* pStyle ); - virtual void ParagraphHeightChanged( USHORT nPara ); + virtual void ParaAttribsChanged( USHORT nParagraph ); + virtual void StyleSheetChanged( SfxStyleSheet* pStyle ); + virtual void ParagraphHeightChanged( USHORT nPara ); // #101498# virtual void DrawingText( @@ -448,41 +448,41 @@ public: const Color& rOverlineColor, const Color& rTextLineColor); - virtual String GetUndoComment( USHORT nUndoId ) const; - virtual BOOL FormattingParagraph( USHORT nPara ); - virtual BOOL SpellNextDocument(); - virtual void FieldClicked( const SvxFieldItem& rField, USHORT nPara, xub_StrLen nPos ); - virtual void FieldSelected( const SvxFieldItem& rField, USHORT nPara, xub_StrLen nPos ); - virtual String CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, xub_StrLen nPos, Color*& rTxtColor, Color*& rFldColor ); + virtual String GetUndoComment( USHORT nUndoId ) const; + virtual BOOL FormattingParagraph( USHORT nPara ); + virtual BOOL SpellNextDocument(); + virtual void FieldClicked( const SvxFieldItem& rField, USHORT nPara, xub_StrLen nPos ); + virtual void FieldSelected( const SvxFieldItem& rField, USHORT nPara, xub_StrLen nPos ); + virtual String CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, xub_StrLen nPos, Color*& rTxtColor, Color*& rFldColor ); // to be overloaded if access to bullet information needs to be provided virtual const SvxNumberFormat * GetNumberFormat( USHORT nPara ) const; virtual Rectangle GetBulletArea( USHORT nPara ); - static SfxItemPool* CreatePool( BOOL bLoadRefCounts = TRUE ); - static SfxItemPool& GetGlobalItemPool(); - static sal_uInt32 RegisterClipboardFormatName(); - static BOOL DoesKeyChangeText( const KeyEvent& rKeyEvent ); - static BOOL DoesKeyMoveCursor( const KeyEvent& rKeyEvent ); - static BOOL IsSimpleCharInput( const KeyEvent& rKeyEvent ); - static USHORT GetAvailableSearchOptions(); - static void SetFontInfoInItemSet( SfxItemSet& rItemSet, const Font& rFont ); - static void SetFontInfoInItemSet( SfxItemSet& rItemSet, const SvxFont& rFont ); - static Font CreateFontFromItemSet( const SfxItemSet& rItemSet ); - static Font CreateFontFromItemSet( const SfxItemSet& rItemSet, USHORT nScriptType ); - static SvxFont CreateSvxFontFromItemSet( const SfxItemSet& rItemSet ); - static void ImportBulletItem( SvxNumBulletItem& rNumBullet, USHORT nLevel, const SvxBulletItem* pOldBullet, const SvxLRSpaceItem* pOldLRSpace ); - static BOOL IsPrintable( sal_Unicode c ) { return ( ( c >= 32 ) && ( c != 127 ) ); } + static SfxItemPool* CreatePool( BOOL bLoadRefCounts = TRUE ); + static SfxItemPool& GetGlobalItemPool(); + static sal_uInt32 RegisterClipboardFormatName(); + static BOOL DoesKeyChangeText( const KeyEvent& rKeyEvent ); + static BOOL DoesKeyMoveCursor( const KeyEvent& rKeyEvent ); + static BOOL IsSimpleCharInput( const KeyEvent& rKeyEvent ); + static USHORT GetAvailableSearchOptions(); + static void SetFontInfoInItemSet( SfxItemSet& rItemSet, const Font& rFont ); + static void SetFontInfoInItemSet( SfxItemSet& rItemSet, const SvxFont& rFont ); + static Font CreateFontFromItemSet( const SfxItemSet& rItemSet ); + static Font CreateFontFromItemSet( const SfxItemSet& rItemSet, USHORT nScriptType ); + static SvxFont CreateSvxFontFromItemSet( const SfxItemSet& rItemSet ); + static void ImportBulletItem( SvxNumBulletItem& rNumBullet, USHORT nLevel, const SvxBulletItem* pOldBullet, const SvxLRSpaceItem* pOldLRSpace ); + static BOOL IsPrintable( sal_Unicode c ) { return ( ( c >= 32 ) && ( c != 127 ) ); } static BOOL HasValidData( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rTransferable ); /** sets a link that is called at the beginning of a drag operation at an edit view */ - void SetBeginDropHdl( const Link& rLink ); - Link GetBeginDropHdl() const; + void SetBeginDropHdl( const Link& rLink ); + Link GetBeginDropHdl() const; /** sets a link that is called at the end of a drag operation at an edit view */ - void SetEndDropHdl( const Link& rLink ); - Link GetEndDropHdl() const; + void SetEndDropHdl( const Link& rLink ); + Link GetEndDropHdl() const; /// specifies if auto-correction should capitalize the first word or not (default is on) void SetFirstWordCapitalization( BOOL bCapitalize ); diff --git a/editeng/inc/editeng/editengdllapi.h b/editeng/inc/editeng/editengdllapi.h index fd3418482293..9ec0aeaaa0f1 100644 --- a/editeng/inc/editeng/editengdllapi.h +++ b/editeng/inc/editeng/editengdllapi.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/editeng/inc/editeng/editerr.hxx b/editeng/inc/editeng/editerr.hxx index f6be02051edd..f5791b83e4c4 100644 --- a/editeng/inc/editeng/editerr.hxx +++ b/editeng/inc/editeng/editerr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/editeng/inc/editeng/editids.hrc b/editeng/inc/editeng/editids.hrc index b0cedbd29fa1..386dd0b4118f 100644 --- a/editeng/inc/editeng/editids.hrc +++ b/editeng/inc/editeng/editids.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,23 +39,23 @@ #define SID_ATTR_TABSTOP_DEFAULTS ( SID_SVX_START + 3 ) #define SID_ATTR_TABSTOP_POS ( SID_SVX_START + 4 ) #define SID_ATTR_TABSTOP_OFFSET ( SID_SVX_START + 5 ) -#define SID_ATTR_CHAR ( SID_SVX_START + 6 ) -#define SID_ATTR_CHAR_FONT ( SID_SVX_START + 7 ) -#define SID_ATTR_CHAR_POSTURE ( SID_SVX_START + 8 ) -#define SID_ATTR_CHAR_WEIGHT ( SID_SVX_START + 9 ) -#define SID_ATTR_CHAR_SHADOWED ( SID_SVX_START + 10 ) -#define SID_ATTR_CHAR_WORDLINEMODE ( SID_SVX_START + 11 ) -#define SID_ATTR_CHAR_CONTOUR ( SID_SVX_START + 12 ) -#define SID_ATTR_CHAR_STRIKEOUT ( SID_SVX_START + 13 ) -#define SID_ATTR_CHAR_UNDERLINE ( SID_SVX_START + 14 ) -#define SID_ATTR_CHAR_FONTHEIGHT ( SID_SVX_START + 15 ) -#define SID_ATTR_CHAR_PROPSIZE ( SID_SVX_START + 16 ) -#define SID_ATTR_CHAR_COLOR ( SID_SVX_START + 17 ) -#define SID_ATTR_CHAR_KERNING ( SID_SVX_START + 18 ) -#define SID_ATTR_CHAR_CASEMAP ( SID_SVX_START + 19 ) -#define SID_ATTR_CHAR_LANGUAGE ( SID_SVX_START + 20 ) -#define SID_ATTR_CHAR_ESCAPEMENT ( SID_SVX_START + 21 ) -#define SID_ATTR_CHAR_FONTLIST ( SID_SVX_START + 22 ) +#define SID_ATTR_CHAR ( SID_SVX_START + 6 ) +#define SID_ATTR_CHAR_FONT ( SID_SVX_START + 7 ) +#define SID_ATTR_CHAR_POSTURE ( SID_SVX_START + 8 ) +#define SID_ATTR_CHAR_WEIGHT ( SID_SVX_START + 9 ) +#define SID_ATTR_CHAR_SHADOWED ( SID_SVX_START + 10 ) +#define SID_ATTR_CHAR_WORDLINEMODE ( SID_SVX_START + 11 ) +#define SID_ATTR_CHAR_CONTOUR ( SID_SVX_START + 12 ) +#define SID_ATTR_CHAR_STRIKEOUT ( SID_SVX_START + 13 ) +#define SID_ATTR_CHAR_UNDERLINE ( SID_SVX_START + 14 ) +#define SID_ATTR_CHAR_FONTHEIGHT ( SID_SVX_START + 15 ) +#define SID_ATTR_CHAR_PROPSIZE ( SID_SVX_START + 16 ) +#define SID_ATTR_CHAR_COLOR ( SID_SVX_START + 17 ) +#define SID_ATTR_CHAR_KERNING ( SID_SVX_START + 18 ) +#define SID_ATTR_CHAR_CASEMAP ( SID_SVX_START + 19 ) +#define SID_ATTR_CHAR_LANGUAGE ( SID_SVX_START + 20 ) +#define SID_ATTR_CHAR_ESCAPEMENT ( SID_SVX_START + 21 ) +#define SID_ATTR_CHAR_FONTLIST ( SID_SVX_START + 22 ) #define SID_ATTR_BORDER_OUTER ( SID_SVX_START + 24 ) #define SID_ATTR_BORDER_SHADOW ( SID_SVX_START + 25 ) #define SID_ATTR_PARA ( SID_SVX_START + 26 ) @@ -78,10 +78,10 @@ #define SID_ATTR_PARA_LRSPACE ( SID_SVX_START + 43 ) #define SID_ATTR_LRSPACE ( SID_SVX_START + 48 ) #define SID_ATTR_ULSPACE ( SID_SVX_START + 49 ) -#define SID_ATTR_CHAR_MAPTYPE ( SID_SVX_START + 64 ) +#define SID_ATTR_CHAR_MAPTYPE ( SID_SVX_START + 64 ) #define SID_ATTR_PARA_MODEL ( SID_SVX_START + 65 ) #define SID_ATTR_PARA_KEEP ( SID_SVX_START + 66 ) -#define SID_ATTR_CHAR_AUTOKERN ( SID_SVX_START + 67 ) +#define SID_ATTR_CHAR_AUTOKERN ( SID_SVX_START + 67 ) #define SID_ATTR_PARA_BULLET ( SID_SVX_START + 250 ) #define SID_ATTR_PARA_OUTLLEVEL ( SID_SVX_START + 300 ) #define SID_FIELD ( SID_SVX_START + 363 ) @@ -128,7 +128,7 @@ #define SID_ATTR_PARA_OUTLINE_LEVEL ( SID_SVX_START +1092 ) // this ID didn't exist prior to the svx split -#define SID_ATTR_CHAR_OVERLINE ( SID_EDIT_START + 68 ) +#define SID_ATTR_CHAR_OVERLINE ( SID_EDIT_START + 68 ) #define SID_ATTR_ALIGN_HOR_JUSTIFY_METHOD ( SID_EDIT_START + 69 ) #define SID_ATTR_ALIGN_VER_JUSTIFY_METHOD ( SID_EDIT_START + 70 ) #define SID_ATTR_ALIGN_HOR_JUSTIFY ( SID_EDIT_START + 71 ) @@ -185,26 +185,26 @@ #define SID_ATTR_TABSTOP_DEFAULTS ( SID_EDIT_START + 46 ) #define SID_ATTR_TABSTOP_POS ( SID_EDIT_START + 47 ) #define SID_ATTR_TABSTOP_OFFSET ( SID_EDIT_START + 48 ) -#define SID_ATTR_CHAR ( SID_EDIT_START + 49 ) -#define SID_ATTR_CHAR_FONT ( SID_EDIT_START + 50 ) -#define SID_ATTR_CHAR_POSTURE ( SID_EDIT_START + 51 ) -#define SID_ATTR_CHAR_WEIGHT ( SID_EDIT_START + 52 ) -#define SID_ATTR_CHAR_SHADOWED ( SID_EDIT_START + 53 ) -#define SID_ATTR_CHAR_WORDLINEMODE ( SID_EDIT_START + 54 ) -#define SID_ATTR_CHAR_CONTOUR ( SID_EDIT_START + 55 ) -#define SID_ATTR_CHAR_STRIKEOUT ( SID_EDIT_START + 56 ) -#define SID_ATTR_CHAR_UNDERLINE ( SID_EDIT_START + 57 ) -#define SID_ATTR_CHAR_FONTHEIGHT ( SID_EDIT_START + 58 ) -#define SID_ATTR_CHAR_PROPSIZE ( SID_EDIT_START + 59 ) -#define SID_ATTR_CHAR_COLOR ( SID_EDIT_START + 60 ) -#define SID_ATTR_CHAR_KERNING ( SID_EDIT_START + 61 ) -#define SID_ATTR_CHAR_CASEMAP ( SID_EDIT_START + 62 ) -#define SID_ATTR_CHAR_LANGUAGE ( SID_EDIT_START + 63 ) -#define SID_ATTR_CHAR_ESCAPEMENT ( SID_EDIT_START + 64 ) -#define SID_ATTR_CHAR_FONTLIST ( SID_EDIT_START + 65 ) -#define SID_ATTR_CHAR_MAPTYPE ( SID_EDIT_START + 66 ) -#define SID_ATTR_CHAR_AUTOKERN ( SID_EDIT_START + 67 ) -#define SID_ATTR_CHAR_OVERLINE ( SID_EDIT_START + 68 ) +#define SID_ATTR_CHAR ( SID_EDIT_START + 49 ) +#define SID_ATTR_CHAR_FONT ( SID_EDIT_START + 50 ) +#define SID_ATTR_CHAR_POSTURE ( SID_EDIT_START + 51 ) +#define SID_ATTR_CHAR_WEIGHT ( SID_EDIT_START + 52 ) +#define SID_ATTR_CHAR_SHADOWED ( SID_EDIT_START + 53 ) +#define SID_ATTR_CHAR_WORDLINEMODE ( SID_EDIT_START + 54 ) +#define SID_ATTR_CHAR_CONTOUR ( SID_EDIT_START + 55 ) +#define SID_ATTR_CHAR_STRIKEOUT ( SID_EDIT_START + 56 ) +#define SID_ATTR_CHAR_UNDERLINE ( SID_EDIT_START + 57 ) +#define SID_ATTR_CHAR_FONTHEIGHT ( SID_EDIT_START + 58 ) +#define SID_ATTR_CHAR_PROPSIZE ( SID_EDIT_START + 59 ) +#define SID_ATTR_CHAR_COLOR ( SID_EDIT_START + 60 ) +#define SID_ATTR_CHAR_KERNING ( SID_EDIT_START + 61 ) +#define SID_ATTR_CHAR_CASEMAP ( SID_EDIT_START + 62 ) +#define SID_ATTR_CHAR_LANGUAGE ( SID_EDIT_START + 63 ) +#define SID_ATTR_CHAR_ESCAPEMENT ( SID_EDIT_START + 64 ) +#define SID_ATTR_CHAR_FONTLIST ( SID_EDIT_START + 65 ) +#define SID_ATTR_CHAR_MAPTYPE ( SID_EDIT_START + 66 ) +#define SID_ATTR_CHAR_AUTOKERN ( SID_EDIT_START + 67 ) +#define SID_ATTR_CHAR_OVERLINE ( SID_EDIT_START + 68 ) #define SID_ATTR_CHAR_CHARSETCOLOR ( SID_EDIT_START + 69 ) #define SID_ATTR_CHAR_CJK_FONT ( SID_EDIT_START + 70 ) #define SID_ATTR_CHAR_CJK_FONTHEIGHT ( SID_EDIT_START + 71 ) @@ -220,7 +220,7 @@ #define SID_ATTR_CHAR_CJK_RUBY ( SID_EDIT_START + 81 ) #define SID_ATTR_CHAR_EMPHASISMARK ( SID_EDIT_START + 82 ) #define SID_ATTR_CHAR_SCRIPTTYPE ( SID_EDIT_START + 83 ) -#define SID_ATTR_CHAR_VERTICAL ( SID_EDIT_START + 84 ) +#define SID_ATTR_CHAR_VERTICAL ( SID_EDIT_START + 84 ) #define SID_ATTR_CHAR_ROTATED ( SID_EDIT_START + 85 ) #define SID_ATTR_CHAR_SCALEWIDTH ( SID_EDIT_START + 86 ) #define SID_ATTR_CHAR_WIDTH_FIT_TO_LINE ( SID_EDIT_START + 87 ) @@ -241,7 +241,7 @@ #define SID_TEXT_ALIGNRIGHT SID_ATTR_PARA_ADJUST_RIGHT #define SID_TEXT_ALIGNCENTER SID_ATTR_PARA_ADJUST_CENTER #define SID_TEXT_ALIGNBLOCK SID_ATTR_PARA_ADJUST_BLOCK -#define SID_DRAW_TEXT_VERTICAL SID_ATTR_CHAR_VERTICAL +#define SID_DRAW_TEXT_VERTICAL SID_ATTR_CHAR_VERTICAL #endif diff --git a/editeng/inc/editeng/editobj.hxx b/editeng/inc/editeng/editobj.hxx index 3fca07338613..c995ea2565fd 100644 --- a/editeng/inc/editeng/editobj.hxx +++ b/editeng/inc/editeng/editobj.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,91 +39,91 @@ DBG_NAMEEX( EE_EditTextObject ) class SfxItemPool; -class SfxStyleSheetPool; +class SfxStyleSheetPool; class SvxFieldItem; -class EECharAttribArray; +class EECharAttribArray; -#define EDTOBJ_SETTINGS_ULITEMSUMMATION 0x00000001 -#define EDTOBJ_SETTINGS_ULITEMFIRSTPARA 0x00000002 +#define EDTOBJ_SETTINGS_ULITEMSUMMATION 0x00000001 +#define EDTOBJ_SETTINGS_ULITEMFIRSTPARA 0x00000002 class EDITENG_DLLPUBLIC EditTextObject { private: - USHORT nWhich; - EDITENG_DLLPRIVATE EditTextObject& operator=( const EditTextObject& ); + USHORT nWhich; + EDITENG_DLLPRIVATE EditTextObject& operator=( const EditTextObject& ); protected: EditTextObject( USHORT nWhich ); EditTextObject( const EditTextObject& r ); - virtual void StoreData( SvStream& rOStream ) const; - virtual void CreateData( SvStream& rIStream ); + virtual void StoreData( SvStream& rOStream ) const; + virtual void CreateData( SvStream& rIStream ); public: - virtual ~EditTextObject(); + virtual ~EditTextObject(); - USHORT Which() const { return nWhich; } + USHORT Which() const { return nWhich; } - virtual USHORT GetUserType() const; // Fuer OutlinerMode, der kann das aber nicht kompatibel speichern - virtual void SetUserType( USHORT n ); + virtual USHORT GetUserType() const; // Fuer OutlinerMode, der kann das aber nicht kompatibel speichern + virtual void SetUserType( USHORT n ); - virtual ULONG GetObjectSettings() const; - virtual void SetObjectSettings( ULONG n ); + virtual ULONG GetObjectSettings() const; + virtual void SetObjectSettings( ULONG n ); - virtual BOOL IsVertical() const; - virtual void SetVertical( BOOL bVertical ); + virtual BOOL IsVertical() const; + virtual void SetVertical( BOOL bVertical ); - virtual USHORT GetScriptType() const; + virtual USHORT GetScriptType() const; - virtual USHORT GetVersion() const; // Solange der Outliner keine Recordlaenge speichert + virtual USHORT GetVersion() const; // Solange der Outliner keine Recordlaenge speichert - virtual EditTextObject* Clone() const = 0; + virtual EditTextObject* Clone() const = 0; - BOOL Store( SvStream& rOStream ) const; - static EditTextObject* Create( SvStream& rIStream, + BOOL Store( SvStream& rOStream ) const; + static EditTextObject* Create( SvStream& rIStream, SfxItemPool* pGlobalTextObjectPool = 0 ); - void Skip( SvStream& rIStream ); + void Skip( SvStream& rIStream ); - virtual USHORT GetParagraphCount() const; + virtual USHORT GetParagraphCount() const; - virtual XubString GetText( USHORT nParagraph ) const; - virtual void Insert( const EditTextObject& rObj, USHORT nPara ); - virtual void RemoveParagraph( USHORT nPara ); - virtual EditTextObject* CreateTextObject( USHORT nPara, USHORT nParas = 1 ) const; + virtual XubString GetText( USHORT nParagraph ) const; + virtual void Insert( const EditTextObject& rObj, USHORT nPara ); + virtual void RemoveParagraph( USHORT nPara ); + virtual EditTextObject* CreateTextObject( USHORT nPara, USHORT nParas = 1 ) const; - virtual BOOL HasPortionInfo() const; - virtual void ClearPortionInfo(); + virtual BOOL HasPortionInfo() const; + virtual void ClearPortionInfo(); - virtual BOOL HasOnlineSpellErrors() const; + virtual BOOL HasOnlineSpellErrors() const; - virtual BOOL HasCharAttribs( USHORT nWhich = 0 ) const; - virtual void GetCharAttribs( USHORT nPara, EECharAttribArray& rLst ) const; + virtual BOOL HasCharAttribs( USHORT nWhich = 0 ) const; + virtual void GetCharAttribs( USHORT nPara, EECharAttribArray& rLst ) const; - virtual BOOL RemoveCharAttribs( USHORT nWhich = 0 ); - virtual BOOL RemoveParaAttribs( USHORT nWhich = 0 ); + virtual BOOL RemoveCharAttribs( USHORT nWhich = 0 ); + virtual BOOL RemoveParaAttribs( USHORT nWhich = 0 ); - virtual void MergeParaAttribs( const SfxItemSet& rAttribs, USHORT nStart = EE_CHAR_START, USHORT nEnd = EE_CHAR_END ); + virtual void MergeParaAttribs( const SfxItemSet& rAttribs, USHORT nStart = EE_CHAR_START, USHORT nEnd = EE_CHAR_END ); - virtual BOOL IsFieldObject() const; - virtual const SvxFieldItem* GetField() const; - virtual BOOL HasField( TypeId aType = NULL ) const; + virtual BOOL IsFieldObject() const; + virtual const SvxFieldItem* GetField() const; + virtual BOOL HasField( TypeId aType = NULL ) const; - virtual SfxItemSet GetParaAttribs( USHORT nPara ) const; - virtual void SetParaAttribs( USHORT nPara, const SfxItemSet& rAttribs ); + virtual SfxItemSet GetParaAttribs( USHORT nPara ) const; + virtual void SetParaAttribs( USHORT nPara, const SfxItemSet& rAttribs ); - virtual BOOL HasStyleSheet( const XubString& rName, SfxStyleFamily eFamily ) const; - virtual void GetStyleSheet( USHORT nPara, XubString& rName, SfxStyleFamily& eFamily ) const; - virtual void SetStyleSheet( USHORT nPara, const XubString& rName, const SfxStyleFamily& eFamily ); - virtual BOOL ChangeStyleSheets( const XubString& rOldName, SfxStyleFamily eOldFamily, + virtual BOOL HasStyleSheet( const XubString& rName, SfxStyleFamily eFamily ) const; + virtual void GetStyleSheet( USHORT nPara, XubString& rName, SfxStyleFamily& eFamily ) const; + virtual void SetStyleSheet( USHORT nPara, const XubString& rName, const SfxStyleFamily& eFamily ); + virtual BOOL ChangeStyleSheets( const XubString& rOldName, SfxStyleFamily eOldFamily, const XubString& rNewName, SfxStyleFamily eNewFamily ); - virtual void ChangeStyleSheetName( SfxStyleFamily eFamily, const XubString& rOldName, const XubString& rNewName ); + virtual void ChangeStyleSheetName( SfxStyleFamily eFamily, const XubString& rOldName, const XubString& rNewName ); - bool operator==( const EditTextObject& rCompare ) const; + bool operator==( const EditTextObject& rCompare ) const; // #i102062# bool isWrongListEqual(const EditTextObject& rCompare) const; }; -#endif // _EDITOBJ_HXX +#endif // _EDITOBJ_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/inc/editeng/editrids.hrc b/editeng/inc/editeng/editrids.hrc index 1b539531ebd7..6e11e0617c26 100644 --- a/editeng/inc/editeng/editrids.hrc +++ b/editeng/inc/editeng/editrids.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,404 +35,404 @@ #include <svl/solar.hrc> // strings also used in cui -#define RID_SVXSTR_PAPERBIN_SETTINGS (RID_EDIT_START) +#define RID_SVXSTR_PAPERBIN_SETTINGS (RID_EDIT_START) #define RID_SVXSTR_PAPERBIN (RID_EDIT_START + 1) -#define RID_OUTLUNDO_EXPAND (RID_EDIT_START + 2) -#define RID_OUTLUNDO_COLLAPSE (RID_EDIT_START + 3) -#define RID_OUTLUNDO_ATTR (RID_EDIT_START + 4) -#define RID_OUTLUNDO_INSERT (RID_EDIT_START + 5) -#define RID_OUTLUNDO_DEPTH (RID_EDIT_START + 6) -#define RID_OUTLUNDO_HEIGHT (RID_EDIT_START + 7) +#define RID_OUTLUNDO_EXPAND (RID_EDIT_START + 2) +#define RID_OUTLUNDO_COLLAPSE (RID_EDIT_START + 3) +#define RID_OUTLUNDO_ATTR (RID_EDIT_START + 4) +#define RID_OUTLUNDO_INSERT (RID_EDIT_START + 5) +#define RID_OUTLUNDO_DEPTH (RID_EDIT_START + 6) +#define RID_OUTLUNDO_HEIGHT (RID_EDIT_START + 7) // strings for items -#define RID_SVXITEMS_FRMDIR_BEGIN (RID_EDIT_START + 9) -#define RID_SVXITEMS_FRMDIR_HORI_LEFT_TOP (RID_EDIT_START + 9) -#define RID_SVXITEMS_FRMDIR_HORI_RIGHT_TOP (RID_EDIT_START + 10) -#define RID_SVXITEMS_FRMDIR_VERT_TOP_RIGHT (RID_EDIT_START + 11) -#define RID_SVXITEMS_FRMDIR_VERT_TOP_LEFT (RID_EDIT_START + 12) -#define RID_SVXITEMS_FRMDIR_ENVIRONMENT (RID_EDIT_START + 13) -#define RID_SVXITEMS_FRMDIR_END (RID_EDIT_START + 14) - -#define RID_SVXITEMS_TRUE (RID_EDIT_START + 15) -#define RID_SVXITEMS_FALSE (RID_EDIT_START + 16) -#define RID_SVXITEMS_BORDER_COMPLETE (RID_EDIT_START + 17) -#define RID_SVXITEMS_BORDER_TOP (RID_EDIT_START + 18) -#define RID_SVXITEMS_BORDER_BOTTOM (RID_EDIT_START + 19) -#define RID_SVXITEMS_BORDER_LEFT (RID_EDIT_START + 20) -#define RID_SVXITEMS_BORDER_RIGHT (RID_EDIT_START + 21) -#define RID_SVXITEMS_BORDER_DISTANCE (RID_EDIT_START + 22) -#define RID_SVXITEMS_BORDER_NONE (RID_EDIT_START + 23) - -#define RID_SVXITEMS_TRANSPARENT_TRUE (RID_EDIT_START + 24) -#define RID_SVXITEMS_TRANSPARENT_FALSE (RID_EDIT_START + 25) -#define RID_SVXITEMS_OPAQUE_TRUE (RID_EDIT_START + 26) -#define RID_SVXITEMS_OPAQUE_FALSE (RID_EDIT_START + 27) - -#define RID_SVXITEMS_SHADOW_COMPLETE (RID_EDIT_START + 28) -#define RID_SVXITEMS_GRAPHIC (RID_EDIT_START + 29) -#define RID_SVXITEMS_LINES (RID_EDIT_START + 30) -#define RID_SVXITEMS_ORPHANS_COMPLETE (RID_EDIT_START + 31) -#define RID_SVXITEMS_WIDOWS_COMPLETE (RID_EDIT_START + 32) -#define RID_SVXITEMS_PAGEMODEL_COMPLETE (RID_EDIT_START + 33) - -#define RID_SVXITEMS_SHADOWED_TRUE (RID_EDIT_START + 34) -#define RID_SVXITEMS_SHADOWED_FALSE (RID_EDIT_START + 35) -#define RID_SVXITEMS_AUTOKERN_TRUE (RID_EDIT_START + 36) -#define RID_SVXITEMS_AUTOKERN_FALSE (RID_EDIT_START + 37) -#define RID_SVXITEMS_WORDLINE_TRUE (RID_EDIT_START + 38) -#define RID_SVXITEMS_WORDLINE_FALSE (RID_EDIT_START + 39) -#define RID_SVXITEMS_CONTOUR_TRUE (RID_EDIT_START + 40) -#define RID_SVXITEMS_CONTOUR_FALSE (RID_EDIT_START + 41) -#define RID_SVXITEMS_NOLINEBREAK_TRUE (RID_EDIT_START + 42) -#define RID_SVXITEMS_NOLINEBREAK_FALSE (RID_EDIT_START + 43) -#define RID_SVXITEMS_NOHYPHEN_TRUE (RID_EDIT_START + 44) -#define RID_SVXITEMS_NOHYPHEN_FALSE (RID_EDIT_START + 45) -#define RID_SVXITEMS_FMTKEEP_TRUE (RID_EDIT_START + 46) -#define RID_SVXITEMS_FMTKEEP_FALSE (RID_EDIT_START + 47) -#define RID_SVXITEMS_FMTSPLIT_TRUE (RID_EDIT_START + 48) -#define RID_SVXITEMS_FMTSPLIT_FALSE (RID_EDIT_START + 49) -#define RID_SVXITEMS_PRINT_TRUE (RID_EDIT_START + 50) -#define RID_SVXITEMS_PRINT_FALSE (RID_EDIT_START + 51) -#define RID_SVXITEMS_PROT_POS_TRUE (RID_EDIT_START + 52) -#define RID_SVXITEMS_PROT_POS_FALSE (RID_EDIT_START + 53) -#define RID_SVXITEMS_PROT_SIZE_TRUE (RID_EDIT_START + 54) -#define RID_SVXITEMS_PROT_SIZE_FALSE (RID_EDIT_START + 55) -#define RID_SVXITEMS_PROT_CONTENT_TRUE (RID_EDIT_START + 56) -#define RID_SVXITEMS_PROT_CONTENT_FALSE (RID_EDIT_START + 57) -#define RID_SVXITEMS_ULSPACE_UPPER (RID_EDIT_START + 58) -#define RID_SVXITEMS_ULSPACE_LOWER (RID_EDIT_START + 59) -#define RID_SVXITEMS_LRSPACE_LEFT (RID_EDIT_START + 60) -#define RID_SVXITEMS_LRSPACE_FLINE (RID_EDIT_START + 62) -#define RID_SVXITEMS_LRSPACE_RIGHT (RID_EDIT_START + 63) -#define RID_SVXITEMS_SIZE_WIDTH (RID_EDIT_START + 64) -#define RID_SVXITEMS_SIZE_HEIGHT (RID_EDIT_START + 65) -#define RID_SVXITEMS_PAGE_END_TRUE (RID_EDIT_START + 66) -#define RID_SVXITEMS_PAGE_END_FALSE (RID_EDIT_START + 67) -#define RID_SVXITEMS_HYPHEN_TRUE (RID_EDIT_START + 68) -#define RID_SVXITEMS_HYPHEN_FALSE (RID_EDIT_START + 69) -#define RID_SVXITEMS_HYPHEN_MINLEAD (RID_EDIT_START + 70) -#define RID_SVXITEMS_HYPHEN_MINTRAIL (RID_EDIT_START + 71) -#define RID_SVXITEMS_HYPHEN_MAX (RID_EDIT_START + 72) -#define RID_SVXITEMS_HNGPNCT_OFF (RID_EDIT_START + 73) -#define RID_SVXITEMS_HNGPNCT_ON (RID_EDIT_START + 74) -#define RID_SVXITEMS_FORBIDDEN_RULE_OFF (RID_EDIT_START + 75) -#define RID_SVXITEMS_FORBIDDEN_RULE_ON (RID_EDIT_START + 76) -#define RID_SVXITEMS_SCRPTSPC_OFF (RID_EDIT_START + 77) -#define RID_SVXITEMS_SCRPTSPC_ON (RID_EDIT_START + 78) -#define RID_SVXITEMS_CHARSCALE_OFF (RID_EDIT_START + 79) -#define RID_SVXITEMS_CHARSCALE (RID_EDIT_START + 80) -#define RID_SVXITEMS_CHARROTATE_OFF (RID_EDIT_START + 81) -#define RID_SVXITEMS_CHARROTATE (RID_EDIT_START + 82) -#define RID_SVXITEMS_CHARROTATE_FITLINE (RID_EDIT_START + 83) - -#define RID_SVXITEMS_RELIEF_BEGIN (RID_EDIT_START + 85) -#define RID_SVXITEMS_RELIEF_NONE (RID_EDIT_START + 85) -#define RID_SVXITEMS_RELIEF_EMBOSSED (RID_EDIT_START + 86) -#define RID_SVXITEMS_RELIEF_ENGRAVED (RID_EDIT_START + 87) -#define RID_SVXITEMS_RELIEF_END (RID_EDIT_START + 88) +#define RID_SVXITEMS_FRMDIR_BEGIN (RID_EDIT_START + 9) +#define RID_SVXITEMS_FRMDIR_HORI_LEFT_TOP (RID_EDIT_START + 9) +#define RID_SVXITEMS_FRMDIR_HORI_RIGHT_TOP (RID_EDIT_START + 10) +#define RID_SVXITEMS_FRMDIR_VERT_TOP_RIGHT (RID_EDIT_START + 11) +#define RID_SVXITEMS_FRMDIR_VERT_TOP_LEFT (RID_EDIT_START + 12) +#define RID_SVXITEMS_FRMDIR_ENVIRONMENT (RID_EDIT_START + 13) +#define RID_SVXITEMS_FRMDIR_END (RID_EDIT_START + 14) + +#define RID_SVXITEMS_TRUE (RID_EDIT_START + 15) +#define RID_SVXITEMS_FALSE (RID_EDIT_START + 16) +#define RID_SVXITEMS_BORDER_COMPLETE (RID_EDIT_START + 17) +#define RID_SVXITEMS_BORDER_TOP (RID_EDIT_START + 18) +#define RID_SVXITEMS_BORDER_BOTTOM (RID_EDIT_START + 19) +#define RID_SVXITEMS_BORDER_LEFT (RID_EDIT_START + 20) +#define RID_SVXITEMS_BORDER_RIGHT (RID_EDIT_START + 21) +#define RID_SVXITEMS_BORDER_DISTANCE (RID_EDIT_START + 22) +#define RID_SVXITEMS_BORDER_NONE (RID_EDIT_START + 23) + +#define RID_SVXITEMS_TRANSPARENT_TRUE (RID_EDIT_START + 24) +#define RID_SVXITEMS_TRANSPARENT_FALSE (RID_EDIT_START + 25) +#define RID_SVXITEMS_OPAQUE_TRUE (RID_EDIT_START + 26) +#define RID_SVXITEMS_OPAQUE_FALSE (RID_EDIT_START + 27) + +#define RID_SVXITEMS_SHADOW_COMPLETE (RID_EDIT_START + 28) +#define RID_SVXITEMS_GRAPHIC (RID_EDIT_START + 29) +#define RID_SVXITEMS_LINES (RID_EDIT_START + 30) +#define RID_SVXITEMS_ORPHANS_COMPLETE (RID_EDIT_START + 31) +#define RID_SVXITEMS_WIDOWS_COMPLETE (RID_EDIT_START + 32) +#define RID_SVXITEMS_PAGEMODEL_COMPLETE (RID_EDIT_START + 33) + +#define RID_SVXITEMS_SHADOWED_TRUE (RID_EDIT_START + 34) +#define RID_SVXITEMS_SHADOWED_FALSE (RID_EDIT_START + 35) +#define RID_SVXITEMS_AUTOKERN_TRUE (RID_EDIT_START + 36) +#define RID_SVXITEMS_AUTOKERN_FALSE (RID_EDIT_START + 37) +#define RID_SVXITEMS_WORDLINE_TRUE (RID_EDIT_START + 38) +#define RID_SVXITEMS_WORDLINE_FALSE (RID_EDIT_START + 39) +#define RID_SVXITEMS_CONTOUR_TRUE (RID_EDIT_START + 40) +#define RID_SVXITEMS_CONTOUR_FALSE (RID_EDIT_START + 41) +#define RID_SVXITEMS_NOLINEBREAK_TRUE (RID_EDIT_START + 42) +#define RID_SVXITEMS_NOLINEBREAK_FALSE (RID_EDIT_START + 43) +#define RID_SVXITEMS_NOHYPHEN_TRUE (RID_EDIT_START + 44) +#define RID_SVXITEMS_NOHYPHEN_FALSE (RID_EDIT_START + 45) +#define RID_SVXITEMS_FMTKEEP_TRUE (RID_EDIT_START + 46) +#define RID_SVXITEMS_FMTKEEP_FALSE (RID_EDIT_START + 47) +#define RID_SVXITEMS_FMTSPLIT_TRUE (RID_EDIT_START + 48) +#define RID_SVXITEMS_FMTSPLIT_FALSE (RID_EDIT_START + 49) +#define RID_SVXITEMS_PRINT_TRUE (RID_EDIT_START + 50) +#define RID_SVXITEMS_PRINT_FALSE (RID_EDIT_START + 51) +#define RID_SVXITEMS_PROT_POS_TRUE (RID_EDIT_START + 52) +#define RID_SVXITEMS_PROT_POS_FALSE (RID_EDIT_START + 53) +#define RID_SVXITEMS_PROT_SIZE_TRUE (RID_EDIT_START + 54) +#define RID_SVXITEMS_PROT_SIZE_FALSE (RID_EDIT_START + 55) +#define RID_SVXITEMS_PROT_CONTENT_TRUE (RID_EDIT_START + 56) +#define RID_SVXITEMS_PROT_CONTENT_FALSE (RID_EDIT_START + 57) +#define RID_SVXITEMS_ULSPACE_UPPER (RID_EDIT_START + 58) +#define RID_SVXITEMS_ULSPACE_LOWER (RID_EDIT_START + 59) +#define RID_SVXITEMS_LRSPACE_LEFT (RID_EDIT_START + 60) +#define RID_SVXITEMS_LRSPACE_FLINE (RID_EDIT_START + 62) +#define RID_SVXITEMS_LRSPACE_RIGHT (RID_EDIT_START + 63) +#define RID_SVXITEMS_SIZE_WIDTH (RID_EDIT_START + 64) +#define RID_SVXITEMS_SIZE_HEIGHT (RID_EDIT_START + 65) +#define RID_SVXITEMS_PAGE_END_TRUE (RID_EDIT_START + 66) +#define RID_SVXITEMS_PAGE_END_FALSE (RID_EDIT_START + 67) +#define RID_SVXITEMS_HYPHEN_TRUE (RID_EDIT_START + 68) +#define RID_SVXITEMS_HYPHEN_FALSE (RID_EDIT_START + 69) +#define RID_SVXITEMS_HYPHEN_MINLEAD (RID_EDIT_START + 70) +#define RID_SVXITEMS_HYPHEN_MINTRAIL (RID_EDIT_START + 71) +#define RID_SVXITEMS_HYPHEN_MAX (RID_EDIT_START + 72) +#define RID_SVXITEMS_HNGPNCT_OFF (RID_EDIT_START + 73) +#define RID_SVXITEMS_HNGPNCT_ON (RID_EDIT_START + 74) +#define RID_SVXITEMS_FORBIDDEN_RULE_OFF (RID_EDIT_START + 75) +#define RID_SVXITEMS_FORBIDDEN_RULE_ON (RID_EDIT_START + 76) +#define RID_SVXITEMS_SCRPTSPC_OFF (RID_EDIT_START + 77) +#define RID_SVXITEMS_SCRPTSPC_ON (RID_EDIT_START + 78) +#define RID_SVXITEMS_CHARSCALE_OFF (RID_EDIT_START + 79) +#define RID_SVXITEMS_CHARSCALE (RID_EDIT_START + 80) +#define RID_SVXITEMS_CHARROTATE_OFF (RID_EDIT_START + 81) +#define RID_SVXITEMS_CHARROTATE (RID_EDIT_START + 82) +#define RID_SVXITEMS_CHARROTATE_FITLINE (RID_EDIT_START + 83) + +#define RID_SVXITEMS_RELIEF_BEGIN (RID_EDIT_START + 85) +#define RID_SVXITEMS_RELIEF_NONE (RID_EDIT_START + 85) +#define RID_SVXITEMS_RELIEF_EMBOSSED (RID_EDIT_START + 86) +#define RID_SVXITEMS_RELIEF_ENGRAVED (RID_EDIT_START + 87) +#define RID_SVXITEMS_RELIEF_END (RID_EDIT_START + 88) // HM_ERR #define RID_SVXSTR_HMERR_THESAURUS (RID_EDIT_START + 89) // enum FontEmphasisMark --------------------------------------------------- -#define RID_SVXITEMS_EMPHASIS_BEGIN_STYLE (RID_EDIT_START + 90) -#define RID_SVXITEMS_EMPHASIS_NONE_STYLE (RID_EDIT_START + 90) -#define RID_SVXITEMS_EMPHASIS_DOT_STYLE (RID_EDIT_START + 91) -#define RID_SVXITEMS_EMPHASIS_CIRCLE_STYLE (RID_EDIT_START + 92) -#define RID_SVXITEMS_EMPHASIS_DISC_STYLE (RID_EDIT_START + 93) -#define RID_SVXITEMS_EMPHASIS_ACCENT_STYLE (RID_EDIT_START + 94) +#define RID_SVXITEMS_EMPHASIS_BEGIN_STYLE (RID_EDIT_START + 90) +#define RID_SVXITEMS_EMPHASIS_NONE_STYLE (RID_EDIT_START + 90) +#define RID_SVXITEMS_EMPHASIS_DOT_STYLE (RID_EDIT_START + 91) +#define RID_SVXITEMS_EMPHASIS_CIRCLE_STYLE (RID_EDIT_START + 92) +#define RID_SVXITEMS_EMPHASIS_DISC_STYLE (RID_EDIT_START + 93) +#define RID_SVXITEMS_EMPHASIS_ACCENT_STYLE (RID_EDIT_START + 94) -#define RID_SVXITEMS_EMPHASIS_ABOVE_POS (RID_EDIT_START + 95) -#define RID_SVXITEMS_EMPHASIS_BELOW_POS (RID_EDIT_START + 96) +#define RID_SVXITEMS_EMPHASIS_ABOVE_POS (RID_EDIT_START + 95) +#define RID_SVXITEMS_EMPHASIS_BELOW_POS (RID_EDIT_START + 96) // enum ESCAPEMENT ------------------------------------------------------- -#define RID_SVXITEMS_ESCAPEMENT_BEGIN (RID_EDIT_START + 97) -#define RID_SVXITEMS_ESCAPEMENT_OFF (RID_EDIT_START + 97) -#define RID_SVXITEMS_ESCAPEMENT_SUPER (RID_EDIT_START + 98) -#define RID_SVXITEMS_ESCAPEMENT_SUB (RID_EDIT_START + 99) -#define RID_SVXITEMS_ESCAPEMENT_AUTO (RID_EDIT_START + 100) +#define RID_SVXITEMS_ESCAPEMENT_BEGIN (RID_EDIT_START + 97) +#define RID_SVXITEMS_ESCAPEMENT_OFF (RID_EDIT_START + 97) +#define RID_SVXITEMS_ESCAPEMENT_SUPER (RID_EDIT_START + 98) +#define RID_SVXITEMS_ESCAPEMENT_SUB (RID_EDIT_START + 99) +#define RID_SVXITEMS_ESCAPEMENT_AUTO (RID_EDIT_START + 100) // enum CASEMAP ---------------------------------------------------------- -#define RID_SVXITEMS_CASEMAP_BEGIN (RID_EDIT_START + 101) -#define RID_SVXITEMS_CASEMAP_NONE (RID_EDIT_START + 101) -#define RID_SVXITEMS_CASEMAP_VERSALIEN (RID_EDIT_START + 102) -#define RID_SVXITEMS_CASEMAP_GEMEINE (RID_EDIT_START + 103) -#define RID_SVXITEMS_CASEMAP_TITEL (RID_EDIT_START + 104) -#define RID_SVXITEMS_CASEMAP_KAPITAELCHEN (RID_EDIT_START + 105) +#define RID_SVXITEMS_CASEMAP_BEGIN (RID_EDIT_START + 101) +#define RID_SVXITEMS_CASEMAP_NONE (RID_EDIT_START + 101) +#define RID_SVXITEMS_CASEMAP_VERSALIEN (RID_EDIT_START + 102) +#define RID_SVXITEMS_CASEMAP_GEMEINE (RID_EDIT_START + 103) +#define RID_SVXITEMS_CASEMAP_TITEL (RID_EDIT_START + 104) +#define RID_SVXITEMS_CASEMAP_KAPITAELCHEN (RID_EDIT_START + 105) -#define RID_SVXITEMS_KERNING_COMPLETE (RID_EDIT_START + 106) -#define RID_SVXITEMS_KERNING_EXPANDED (RID_EDIT_START + 107) -#define RID_SVXITEMS_KERNING_CONDENSED (RID_EDIT_START + 108) +#define RID_SVXITEMS_KERNING_COMPLETE (RID_EDIT_START + 106) +#define RID_SVXITEMS_KERNING_EXPANDED (RID_EDIT_START + 107) +#define RID_SVXITEMS_KERNING_CONDENSED (RID_EDIT_START + 108) -#define RID_SVXITEMS_BLINK_TRUE (RID_EDIT_START + 109) -#define RID_SVXITEMS_BLINK_FALSE (RID_EDIT_START + 110) +#define RID_SVXITEMS_BLINK_TRUE (RID_EDIT_START + 109) +#define RID_SVXITEMS_BLINK_FALSE (RID_EDIT_START + 110) -#define RID_SVXITEMS_TWOLINES_OFF (RID_EDIT_START + 111) -#define RID_SVXITEMS_TWOLINES (RID_EDIT_START + 112) +#define RID_SVXITEMS_TWOLINES_OFF (RID_EDIT_START + 111) +#define RID_SVXITEMS_TWOLINES (RID_EDIT_START + 112) // enum FontStrikeout ---------------------------------------------------- -#define RID_SVXITEMS_STRIKEOUT_BEGIN (RID_EDIT_START + 113) -#define RID_SVXITEMS_STRIKEOUT_NONE (RID_EDIT_START + 113) -#define RID_SVXITEMS_STRIKEOUT_SINGLE (RID_EDIT_START + 114) -#define RID_SVXITEMS_STRIKEOUT_DOUBLE (RID_EDIT_START + 115) -#define RID_SVXITEMS_STRIKEOUT_DONTKNOW (RID_EDIT_START + 116) -#define RID_SVXITEMS_STRIKEOUT_BOLD (RID_EDIT_START + 117) -#define RID_SVXITEMS_STRIKEOUT_SLASH (RID_EDIT_START + 118) -#define RID_SVXITEMS_STRIKEOUT_X (RID_EDIT_START + 119) +#define RID_SVXITEMS_STRIKEOUT_BEGIN (RID_EDIT_START + 113) +#define RID_SVXITEMS_STRIKEOUT_NONE (RID_EDIT_START + 113) +#define RID_SVXITEMS_STRIKEOUT_SINGLE (RID_EDIT_START + 114) +#define RID_SVXITEMS_STRIKEOUT_DOUBLE (RID_EDIT_START + 115) +#define RID_SVXITEMS_STRIKEOUT_DONTKNOW (RID_EDIT_START + 116) +#define RID_SVXITEMS_STRIKEOUT_BOLD (RID_EDIT_START + 117) +#define RID_SVXITEMS_STRIKEOUT_SLASH (RID_EDIT_START + 118) +#define RID_SVXITEMS_STRIKEOUT_X (RID_EDIT_START + 119) // enum FontUnderline - used for overline -------------------------------- -#define RID_SVXITEMS_OL_BEGIN (RID_EDIT_START + 120) -#define RID_SVXITEMS_OL_NONE (RID_EDIT_START + 120) -#define RID_SVXITEMS_OL_SINGLE (RID_EDIT_START + 121) -#define RID_SVXITEMS_OL_DOUBLE (RID_EDIT_START + 122) -#define RID_SVXITEMS_OL_DOTTED (RID_EDIT_START + 123) -#define RID_SVXITEMS_OL_DONTKNOW (RID_EDIT_START + 124) -#define RID_SVXITEMS_OL_DASH (RID_EDIT_START + 125) -#define RID_SVXITEMS_OL_LONGDASH (RID_EDIT_START + 126) -#define RID_SVXITEMS_OL_DASHDOT (RID_EDIT_START + 127) -#define RID_SVXITEMS_OL_DASHDOTDOT (RID_EDIT_START + 128) -#define RID_SVXITEMS_OL_SMALLWAVE (RID_EDIT_START + 129) -#define RID_SVXITEMS_OL_WAVE (RID_EDIT_START + 130) -#define RID_SVXITEMS_OL_DOUBLEWAVE (RID_EDIT_START + 131) -#define RID_SVXITEMS_OL_BOLD (RID_EDIT_START + 132) -#define RID_SVXITEMS_OL_BOLDDOTTED (RID_EDIT_START + 133) -#define RID_SVXITEMS_OL_BOLDDASH (RID_EDIT_START + 134) -#define RID_SVXITEMS_OL_BOLDLONGDASH (RID_EDIT_START + 135) -#define RID_SVXITEMS_OL_BOLDDASHDOT (RID_EDIT_START + 136) -#define RID_SVXITEMS_OL_BOLDDASHDOTDOT (RID_EDIT_START + 137) -#define RID_SVXITEMS_OL_BOLDWAVE (RID_EDIT_START + 138) +#define RID_SVXITEMS_OL_BEGIN (RID_EDIT_START + 120) +#define RID_SVXITEMS_OL_NONE (RID_EDIT_START + 120) +#define RID_SVXITEMS_OL_SINGLE (RID_EDIT_START + 121) +#define RID_SVXITEMS_OL_DOUBLE (RID_EDIT_START + 122) +#define RID_SVXITEMS_OL_DOTTED (RID_EDIT_START + 123) +#define RID_SVXITEMS_OL_DONTKNOW (RID_EDIT_START + 124) +#define RID_SVXITEMS_OL_DASH (RID_EDIT_START + 125) +#define RID_SVXITEMS_OL_LONGDASH (RID_EDIT_START + 126) +#define RID_SVXITEMS_OL_DASHDOT (RID_EDIT_START + 127) +#define RID_SVXITEMS_OL_DASHDOTDOT (RID_EDIT_START + 128) +#define RID_SVXITEMS_OL_SMALLWAVE (RID_EDIT_START + 129) +#define RID_SVXITEMS_OL_WAVE (RID_EDIT_START + 130) +#define RID_SVXITEMS_OL_DOUBLEWAVE (RID_EDIT_START + 131) +#define RID_SVXITEMS_OL_BOLD (RID_EDIT_START + 132) +#define RID_SVXITEMS_OL_BOLDDOTTED (RID_EDIT_START + 133) +#define RID_SVXITEMS_OL_BOLDDASH (RID_EDIT_START + 134) +#define RID_SVXITEMS_OL_BOLDLONGDASH (RID_EDIT_START + 135) +#define RID_SVXITEMS_OL_BOLDDASHDOT (RID_EDIT_START + 136) +#define RID_SVXITEMS_OL_BOLDDASHDOTDOT (RID_EDIT_START + 137) +#define RID_SVXITEMS_OL_BOLDWAVE (RID_EDIT_START + 138) // enum FontUnderline - used for underline ------------------------------- -#define RID_SVXITEMS_UL_BEGIN (RID_EDIT_START + 139) -#define RID_SVXITEMS_UL_NONE (RID_EDIT_START + 139) -#define RID_SVXITEMS_UL_SINGLE (RID_EDIT_START + 140) -#define RID_SVXITEMS_UL_DOUBLE (RID_EDIT_START + 141) -#define RID_SVXITEMS_UL_DOTTED (RID_EDIT_START + 142) -#define RID_SVXITEMS_UL_DONTKNOW (RID_EDIT_START + 143) -#define RID_SVXITEMS_UL_DASH (RID_EDIT_START + 144) -#define RID_SVXITEMS_UL_LONGDASH (RID_EDIT_START + 145) -#define RID_SVXITEMS_UL_DASHDOT (RID_EDIT_START + 146) -#define RID_SVXITEMS_UL_DASHDOTDOT (RID_EDIT_START + 147) -#define RID_SVXITEMS_UL_SMALLWAVE (RID_EDIT_START + 148) -#define RID_SVXITEMS_UL_WAVE (RID_EDIT_START + 149) -#define RID_SVXITEMS_UL_DOUBLEWAVE (RID_EDIT_START + 150) -#define RID_SVXITEMS_UL_BOLD (RID_EDIT_START + 151) -#define RID_SVXITEMS_UL_BOLDDOTTED (RID_EDIT_START + 152) -#define RID_SVXITEMS_UL_BOLDDASH (RID_EDIT_START + 153) -#define RID_SVXITEMS_UL_BOLDLONGDASH (RID_EDIT_START + 154) -#define RID_SVXITEMS_UL_BOLDDASHDOT (RID_EDIT_START + 155) -#define RID_SVXITEMS_UL_BOLDDASHDOTDOT (RID_EDIT_START + 156) -#define RID_SVXITEMS_UL_BOLDWAVE (RID_EDIT_START + 157) +#define RID_SVXITEMS_UL_BEGIN (RID_EDIT_START + 139) +#define RID_SVXITEMS_UL_NONE (RID_EDIT_START + 139) +#define RID_SVXITEMS_UL_SINGLE (RID_EDIT_START + 140) +#define RID_SVXITEMS_UL_DOUBLE (RID_EDIT_START + 141) +#define RID_SVXITEMS_UL_DOTTED (RID_EDIT_START + 142) +#define RID_SVXITEMS_UL_DONTKNOW (RID_EDIT_START + 143) +#define RID_SVXITEMS_UL_DASH (RID_EDIT_START + 144) +#define RID_SVXITEMS_UL_LONGDASH (RID_EDIT_START + 145) +#define RID_SVXITEMS_UL_DASHDOT (RID_EDIT_START + 146) +#define RID_SVXITEMS_UL_DASHDOTDOT (RID_EDIT_START + 147) +#define RID_SVXITEMS_UL_SMALLWAVE (RID_EDIT_START + 148) +#define RID_SVXITEMS_UL_WAVE (RID_EDIT_START + 149) +#define RID_SVXITEMS_UL_DOUBLEWAVE (RID_EDIT_START + 150) +#define RID_SVXITEMS_UL_BOLD (RID_EDIT_START + 151) +#define RID_SVXITEMS_UL_BOLDDOTTED (RID_EDIT_START + 152) +#define RID_SVXITEMS_UL_BOLDDASH (RID_EDIT_START + 153) +#define RID_SVXITEMS_UL_BOLDLONGDASH (RID_EDIT_START + 154) +#define RID_SVXITEMS_UL_BOLDDASHDOT (RID_EDIT_START + 155) +#define RID_SVXITEMS_UL_BOLDDASHDOTDOT (RID_EDIT_START + 156) +#define RID_SVXITEMS_UL_BOLDWAVE (RID_EDIT_START + 157) // enum FontWeight ------------------------------------------------------- -#define RID_SVXITEMS_WEIGHT_BEGIN (RID_EDIT_START + 158) -#define RID_SVXITEMS_WEIGHT_DONTKNOW (RID_EDIT_START + 158) -#define RID_SVXITEMS_WEIGHT_THIN (RID_EDIT_START + 159) -#define RID_SVXITEMS_WEIGHT_ULTRALIGHT (RID_EDIT_START + 160) -#define RID_SVXITEMS_WEIGHT_LIGHT (RID_EDIT_START + 161) -#define RID_SVXITEMS_WEIGHT_SEMILIGHT (RID_EDIT_START + 162) -#define RID_SVXITEMS_WEIGHT_NORMAL (RID_EDIT_START + 163) -#define RID_SVXITEMS_WEIGHT_MEDIUM (RID_EDIT_START + 164) -#define RID_SVXITEMS_WEIGHT_SEMIBOLD (RID_EDIT_START + 165) -#define RID_SVXITEMS_WEIGHT_BOLD (RID_EDIT_START + 166) -#define RID_SVXITEMS_WEIGHT_ULTRABOLD (RID_EDIT_START + 167) -#define RID_SVXITEMS_WEIGHT_BLACK (RID_EDIT_START + 168) +#define RID_SVXITEMS_WEIGHT_BEGIN (RID_EDIT_START + 158) +#define RID_SVXITEMS_WEIGHT_DONTKNOW (RID_EDIT_START + 158) +#define RID_SVXITEMS_WEIGHT_THIN (RID_EDIT_START + 159) +#define RID_SVXITEMS_WEIGHT_ULTRALIGHT (RID_EDIT_START + 160) +#define RID_SVXITEMS_WEIGHT_LIGHT (RID_EDIT_START + 161) +#define RID_SVXITEMS_WEIGHT_SEMILIGHT (RID_EDIT_START + 162) +#define RID_SVXITEMS_WEIGHT_NORMAL (RID_EDIT_START + 163) +#define RID_SVXITEMS_WEIGHT_MEDIUM (RID_EDIT_START + 164) +#define RID_SVXITEMS_WEIGHT_SEMIBOLD (RID_EDIT_START + 165) +#define RID_SVXITEMS_WEIGHT_BOLD (RID_EDIT_START + 166) +#define RID_SVXITEMS_WEIGHT_ULTRABOLD (RID_EDIT_START + 167) +#define RID_SVXITEMS_WEIGHT_BLACK (RID_EDIT_START + 168) // paper formats #define RID_SVXSTR_PAPER_A0 (RID_SVX_START + 169) -#define RID_SVXSTR_PAPER_A1 (RID_SVX_START + 170) -#define RID_SVXSTR_PAPER_A2 (RID_SVX_START + 171) -#define RID_SVXSTR_PAPER_A3 (RID_SVX_START + 172) -#define RID_SVXSTR_PAPER_A4 (RID_SVX_START + 173) -#define RID_SVXSTR_PAPER_A5 (RID_SVX_START + 174) -#define RID_SVXSTR_PAPER_B4_ISO (RID_SVX_START + 175) -#define RID_SVXSTR_PAPER_B5_ISO (RID_SVX_START + 176) -#define RID_SVXSTR_PAPER_LETTER (RID_SVX_START + 177) -#define RID_SVXSTR_PAPER_LEGAL (RID_SVX_START + 178) -#define RID_SVXSTR_PAPER_TABLOID (RID_SVX_START + 179) -#define RID_SVXSTR_PAPER_USER (RID_SVX_START + 180) -#define RID_SVXSTR_PAPER_B6_ISO (RID_SVX_START + 181) -#define RID_SVXSTR_PAPER_C4 (RID_SVX_START + 182) -#define RID_SVXSTR_PAPER_C5 (RID_SVX_START + 183) -#define RID_SVXSTR_PAPER_C6 (RID_SVX_START + 184) -#define RID_SVXSTR_PAPER_C65 (RID_SVX_START + 185) -#define RID_SVXSTR_PAPER_DL (RID_SVX_START + 186) -#define RID_SVXSTR_PAPER_DIA (RID_SVX_START + 187) -#define RID_SVXSTR_PAPER_SCREEN (RID_SVX_START + 188) -#define RID_SVXSTR_PAPER_C (RID_SVX_START + 189) -#define RID_SVXSTR_PAPER_D (RID_SVX_START + 190) -#define RID_SVXSTR_PAPER_E (RID_SVX_START + 191) -#define RID_SVXSTR_PAPER_EXECUTIVE (RID_SVX_START + 192) -#define RID_SVXSTR_PAPER_LEGAL2 (RID_SVX_START + 193) -#define RID_SVXSTR_PAPER_MONARCH (RID_SVX_START + 194) -#define RID_SVXSTR_PAPER_COM675 (RID_SVX_START + 195) -#define RID_SVXSTR_PAPER_COM9 (RID_SVX_START + 196) -#define RID_SVXSTR_PAPER_COM10 (RID_SVX_START + 197) -#define RID_SVXSTR_PAPER_COM11 (RID_SVX_START + 198) -#define RID_SVXSTR_PAPER_COM12 (RID_SVX_START + 199) -#define RID_SVXSTR_PAPER_KAI16 (RID_SVX_START + 200) -#define RID_SVXSTR_PAPER_KAI32 (RID_SVX_START + 201) -#define RID_SVXSTR_PAPER_KAI32BIG (RID_SVX_START + 202) -#define RID_SVXSTR_PAPER_B4_JIS (RID_SVX_START + 203) -#define RID_SVXSTR_PAPER_B5_JIS (RID_SVX_START + 204) -#define RID_SVXSTR_PAPER_B6_JIS (RID_SVX_START + 205) +#define RID_SVXSTR_PAPER_A1 (RID_SVX_START + 170) +#define RID_SVXSTR_PAPER_A2 (RID_SVX_START + 171) +#define RID_SVXSTR_PAPER_A3 (RID_SVX_START + 172) +#define RID_SVXSTR_PAPER_A4 (RID_SVX_START + 173) +#define RID_SVXSTR_PAPER_A5 (RID_SVX_START + 174) +#define RID_SVXSTR_PAPER_B4_ISO (RID_SVX_START + 175) +#define RID_SVXSTR_PAPER_B5_ISO (RID_SVX_START + 176) +#define RID_SVXSTR_PAPER_LETTER (RID_SVX_START + 177) +#define RID_SVXSTR_PAPER_LEGAL (RID_SVX_START + 178) +#define RID_SVXSTR_PAPER_TABLOID (RID_SVX_START + 179) +#define RID_SVXSTR_PAPER_USER (RID_SVX_START + 180) +#define RID_SVXSTR_PAPER_B6_ISO (RID_SVX_START + 181) +#define RID_SVXSTR_PAPER_C4 (RID_SVX_START + 182) +#define RID_SVXSTR_PAPER_C5 (RID_SVX_START + 183) +#define RID_SVXSTR_PAPER_C6 (RID_SVX_START + 184) +#define RID_SVXSTR_PAPER_C65 (RID_SVX_START + 185) +#define RID_SVXSTR_PAPER_DL (RID_SVX_START + 186) +#define RID_SVXSTR_PAPER_DIA (RID_SVX_START + 187) +#define RID_SVXSTR_PAPER_SCREEN (RID_SVX_START + 188) +#define RID_SVXSTR_PAPER_C (RID_SVX_START + 189) +#define RID_SVXSTR_PAPER_D (RID_SVX_START + 190) +#define RID_SVXSTR_PAPER_E (RID_SVX_START + 191) +#define RID_SVXSTR_PAPER_EXECUTIVE (RID_SVX_START + 192) +#define RID_SVXSTR_PAPER_LEGAL2 (RID_SVX_START + 193) +#define RID_SVXSTR_PAPER_MONARCH (RID_SVX_START + 194) +#define RID_SVXSTR_PAPER_COM675 (RID_SVX_START + 195) +#define RID_SVXSTR_PAPER_COM9 (RID_SVX_START + 196) +#define RID_SVXSTR_PAPER_COM10 (RID_SVX_START + 197) +#define RID_SVXSTR_PAPER_COM11 (RID_SVX_START + 198) +#define RID_SVXSTR_PAPER_COM12 (RID_SVX_START + 199) +#define RID_SVXSTR_PAPER_KAI16 (RID_SVX_START + 200) +#define RID_SVXSTR_PAPER_KAI32 (RID_SVX_START + 201) +#define RID_SVXSTR_PAPER_KAI32BIG (RID_SVX_START + 202) +#define RID_SVXSTR_PAPER_B4_JIS (RID_SVX_START + 203) +#define RID_SVXSTR_PAPER_B5_JIS (RID_SVX_START + 204) +#define RID_SVXSTR_PAPER_B6_JIS (RID_SVX_START + 205) // enum FontItalic ------------------------------------------------------- -#define RID_SVXITEMS_ITALIC_BEGIN (RID_EDIT_START + 206) -#define RID_SVXITEMS_ITALIC_NONE (RID_EDIT_START + 206) -#define RID_SVXITEMS_ITALIC_OBLIQUE (RID_EDIT_START + 207) -#define RID_SVXITEMS_ITALIC_NORMAL (RID_EDIT_START + 208) +#define RID_SVXITEMS_ITALIC_BEGIN (RID_EDIT_START + 206) +#define RID_SVXITEMS_ITALIC_NONE (RID_EDIT_START + 206) +#define RID_SVXITEMS_ITALIC_OBLIQUE (RID_EDIT_START + 207) +#define RID_SVXITEMS_ITALIC_NORMAL (RID_EDIT_START + 208) // enum SvxAdjust ----------------------------------------------------------- -#define RID_SVXITEMS_ADJUST_BEGIN (RID_EDIT_START + 209) -#define RID_SVXITEMS_ADJUST_LEFT (RID_EDIT_START + 209) -#define RID_SVXITEMS_ADJUST_RIGHT (RID_EDIT_START + 210) -#define RID_SVXITEMS_ADJUST_BLOCK (RID_EDIT_START + 211) -#define RID_SVXITEMS_ADJUST_CENTER (RID_EDIT_START + 212) -#define RID_SVXITEMS_ADJUST_BLOCKLINE (RID_EDIT_START + 213) - -#define RID_SVXITEMS_TAB_DECIMAL_CHAR (RID_EDIT_START + 214) -#define RID_SVXITEMS_TAB_FILL_CHAR (RID_EDIT_START + 215) - -#define RID_SVXITEMS_TAB_ADJUST_BEGIN (RID_EDIT_START + 217) -#define RID_SVXITEMS_TAB_ADJUST_LEFT (RID_EDIT_START + 217) -#define RID_SVXITEMS_TAB_ADJUST_RIGHT (RID_EDIT_START + 218) -#define RID_SVXITEMS_TAB_ADJUST_DECIMAL (RID_EDIT_START + 219) -#define RID_SVXITEMS_TAB_ADJUST_CENTER (RID_EDIT_START + 220) -#define RID_SVXITEMS_TAB_ADJUST_DEFAULT (RID_EDIT_START + 221) +#define RID_SVXITEMS_ADJUST_BEGIN (RID_EDIT_START + 209) +#define RID_SVXITEMS_ADJUST_LEFT (RID_EDIT_START + 209) +#define RID_SVXITEMS_ADJUST_RIGHT (RID_EDIT_START + 210) +#define RID_SVXITEMS_ADJUST_BLOCK (RID_EDIT_START + 211) +#define RID_SVXITEMS_ADJUST_CENTER (RID_EDIT_START + 212) +#define RID_SVXITEMS_ADJUST_BLOCKLINE (RID_EDIT_START + 213) + +#define RID_SVXITEMS_TAB_DECIMAL_CHAR (RID_EDIT_START + 214) +#define RID_SVXITEMS_TAB_FILL_CHAR (RID_EDIT_START + 215) + +#define RID_SVXITEMS_TAB_ADJUST_BEGIN (RID_EDIT_START + 217) +#define RID_SVXITEMS_TAB_ADJUST_LEFT (RID_EDIT_START + 217) +#define RID_SVXITEMS_TAB_ADJUST_RIGHT (RID_EDIT_START + 218) +#define RID_SVXITEMS_TAB_ADJUST_DECIMAL (RID_EDIT_START + 219) +#define RID_SVXITEMS_TAB_ADJUST_CENTER (RID_EDIT_START + 220) +#define RID_SVXITEMS_TAB_ADJUST_DEFAULT (RID_EDIT_START + 221) // enum SvxBreak ------------------------------------------------------------ -#define RID_SVXITEMS_BREAK_BEGIN (RID_EDIT_START + 222) -#define RID_SVXITEMS_BREAK_NONE (RID_EDIT_START + 222) -#define RID_SVXITEMS_BREAK_COLUMN_BEFORE (RID_EDIT_START + 223) -#define RID_SVXITEMS_BREAK_COLUMN_AFTER (RID_EDIT_START + 224) -#define RID_SVXITEMS_BREAK_COLUMN_BOTH (RID_EDIT_START + 225) -#define RID_SVXITEMS_BREAK_PAGE_BEFORE (RID_EDIT_START + 226) -#define RID_SVXITEMS_BREAK_PAGE_AFTER (RID_EDIT_START + 227) -#define RID_SVXITEMS_BREAK_PAGE_BOTH (RID_EDIT_START + 228) +#define RID_SVXITEMS_BREAK_BEGIN (RID_EDIT_START + 222) +#define RID_SVXITEMS_BREAK_NONE (RID_EDIT_START + 222) +#define RID_SVXITEMS_BREAK_COLUMN_BEFORE (RID_EDIT_START + 223) +#define RID_SVXITEMS_BREAK_COLUMN_AFTER (RID_EDIT_START + 224) +#define RID_SVXITEMS_BREAK_COLUMN_BOTH (RID_EDIT_START + 225) +#define RID_SVXITEMS_BREAK_PAGE_BEFORE (RID_EDIT_START + 226) +#define RID_SVXITEMS_BREAK_PAGE_AFTER (RID_EDIT_START + 227) +#define RID_SVXITEMS_BREAK_PAGE_BOTH (RID_EDIT_START + 228) // enum SvxShadowLocation --------------------------------------------------- -#define RID_SVXITEMS_SHADOW_BEGIN (RID_EDIT_START + 229) -#define RID_SVXITEMS_SHADOW_NONE (RID_EDIT_START + 229) -#define RID_SVXITEMS_SHADOW_TOPLEFT (RID_EDIT_START + 230) -#define RID_SVXITEMS_SHADOW_TOPRIGHT (RID_EDIT_START + 231) -#define RID_SVXITEMS_SHADOW_BOTTOMLEFT (RID_EDIT_START + 232) -#define RID_SVXITEMS_SHADOW_BOTTOMRIGHT (RID_EDIT_START + 233) +#define RID_SVXITEMS_SHADOW_BEGIN (RID_EDIT_START + 229) +#define RID_SVXITEMS_SHADOW_NONE (RID_EDIT_START + 229) +#define RID_SVXITEMS_SHADOW_TOPLEFT (RID_EDIT_START + 230) +#define RID_SVXITEMS_SHADOW_TOPRIGHT (RID_EDIT_START + 231) +#define RID_SVXITEMS_SHADOW_BOTTOMLEFT (RID_EDIT_START + 232) +#define RID_SVXITEMS_SHADOW_BOTTOMRIGHT (RID_EDIT_START + 233) // Umrandungslinien -#define RID_SINGLE_LINE0 (RID_EDIT_START + 234) -#define RID_SINGLE_LINE1 (RID_EDIT_START + 235) -#define RID_SINGLE_LINE2 (RID_EDIT_START + 236) -#define RID_SINGLE_LINE3 (RID_EDIT_START + 237) -#define RID_SINGLE_LINE4 (RID_EDIT_START + 238) -#define RID_DOUBLE_LINE0 (RID_EDIT_START + 239) -#define RID_DOUBLE_LINE1 (RID_EDIT_START + 240) -#define RID_DOUBLE_LINE2 (RID_EDIT_START + 241) -#define RID_DOUBLE_LINE3 (RID_EDIT_START + 242) -#define RID_DOUBLE_LINE4 (RID_EDIT_START + 243) -#define RID_DOUBLE_LINE5 (RID_EDIT_START + 244) -#define RID_DOUBLE_LINE6 (RID_EDIT_START + 245) -#define RID_DOUBLE_LINE7 (RID_EDIT_START + 246) -#define RID_DOUBLE_LINE8 (RID_EDIT_START + 247) -#define RID_DOUBLE_LINE9 (RID_EDIT_START + 248) -#define RID_DOUBLE_LINE10 (RID_EDIT_START + 249) +#define RID_SINGLE_LINE0 (RID_EDIT_START + 234) +#define RID_SINGLE_LINE1 (RID_EDIT_START + 235) +#define RID_SINGLE_LINE2 (RID_EDIT_START + 236) +#define RID_SINGLE_LINE3 (RID_EDIT_START + 237) +#define RID_SINGLE_LINE4 (RID_EDIT_START + 238) +#define RID_DOUBLE_LINE0 (RID_EDIT_START + 239) +#define RID_DOUBLE_LINE1 (RID_EDIT_START + 240) +#define RID_DOUBLE_LINE2 (RID_EDIT_START + 241) +#define RID_DOUBLE_LINE3 (RID_EDIT_START + 242) +#define RID_DOUBLE_LINE4 (RID_EDIT_START + 243) +#define RID_DOUBLE_LINE5 (RID_EDIT_START + 244) +#define RID_DOUBLE_LINE6 (RID_EDIT_START + 245) +#define RID_DOUBLE_LINE7 (RID_EDIT_START + 246) +#define RID_DOUBLE_LINE8 (RID_EDIT_START + 247) +#define RID_DOUBLE_LINE9 (RID_EDIT_START + 248) +#define RID_DOUBLE_LINE10 (RID_EDIT_START + 249) // Metric-Texte -#define RID_SVXITEMS_METRIC_MM (RID_EDIT_START + 250) -#define RID_SVXITEMS_METRIC_CM (RID_EDIT_START + 251) -#define RID_SVXITEMS_METRIC_INCH (RID_EDIT_START + 252) -#define RID_SVXITEMS_METRIC_POINT (RID_EDIT_START + 253) -#define RID_SVXITEMS_METRIC_TWIP (RID_EDIT_START + 254) -#define RID_SVXITEMS_METRIC_PIXEL (RID_EDIT_START + 255) +#define RID_SVXITEMS_METRIC_MM (RID_EDIT_START + 250) +#define RID_SVXITEMS_METRIC_CM (RID_EDIT_START + 251) +#define RID_SVXITEMS_METRIC_INCH (RID_EDIT_START + 252) +#define RID_SVXITEMS_METRIC_POINT (RID_EDIT_START + 253) +#define RID_SVXITEMS_METRIC_TWIP (RID_EDIT_START + 254) +#define RID_SVXITEMS_METRIC_PIXEL (RID_EDIT_START + 255) // enum ColorName ----------------------------------------------------------- -#define RID_SVXITEMS_COLOR_BEGIN (RID_EDIT_START + 256) -#define RID_SVXITEMS_COLOR (RID_EDIT_START + 256) -#define RID_SVXITEMS_COLOR_BLACK (RID_EDIT_START + 257) -#define RID_SVXITEMS_COLOR_BLUE (RID_EDIT_START + 258) -#define RID_SVXITEMS_COLOR_GREEN (RID_EDIT_START + 259) -#define RID_SVXITEMS_COLOR_CYAN (RID_EDIT_START + 260) -#define RID_SVXITEMS_COLOR_RED (RID_EDIT_START + 261) -#define RID_SVXITEMS_COLOR_MAGENTA (RID_EDIT_START + 262) -#define RID_SVXITEMS_COLOR_BROWN (RID_EDIT_START + 263) -#define RID_SVXITEMS_COLOR_GRAY (RID_EDIT_START + 264) -#define RID_SVXITEMS_COLOR_LIGHTGRAY (RID_EDIT_START + 265) -#define RID_SVXITEMS_COLOR_LIGHTBLUE (RID_EDIT_START + 266) -#define RID_SVXITEMS_COLOR_LIGHTGREEN (RID_EDIT_START + 267) -#define RID_SVXITEMS_COLOR_LIGHTCYAN (RID_EDIT_START + 268) -#define RID_SVXITEMS_COLOR_LIGHTRED (RID_EDIT_START + 269) -#define RID_SVXITEMS_COLOR_LIGHTMAGENTA (RID_EDIT_START + 270) -#define RID_SVXITEMS_COLOR_YELLOW (RID_EDIT_START + 271) -#define RID_SVXITEMS_COLOR_WHITE (RID_EDIT_START + 272) -#define RID_SVXITEMS_COLOR_MENUBAR (RID_EDIT_START + 273) -#define RID_SVXITEMS_COLOR_MENUBARTEXT (RID_EDIT_START + 274) -#define RID_SVXITEMS_COLOR_POPUPMENU (RID_EDIT_START + 275) -#define RID_SVXITEMS_COLOR_POPUPMENUTEXT (RID_EDIT_START + 276) -#define RID_SVXITEMS_COLOR_WINDOWTEXT (RID_EDIT_START + 277) -#define RID_SVXITEMS_COLOR_WINDOWWORKSPACE (RID_EDIT_START + 278) -#define RID_SVXITEMS_COLOR_HIGHLIGHT (RID_EDIT_START + 279) -#define RID_SVXITEMS_COLOR_HIGHLIGHTTEXT (RID_EDIT_START + 280) -#define RID_SVXITEMS_COLOR_3DTEXT (RID_EDIT_START + 281) -#define RID_SVXITEMS_COLOR_3DFACE (RID_EDIT_START + 282) -#define RID_SVXITEMS_COLOR_3DLIGHT (RID_EDIT_START + 283) -#define RID_SVXITEMS_COLOR_3DSHADOW (RID_EDIT_START + 284) -#define RID_SVXITEMS_COLOR_SCROLLBAR (RID_EDIT_START + 285) -#define RID_SVXITEMS_COLOR_FIELD (RID_EDIT_START + 286) -#define RID_SVXITEMS_COLOR_FIELDTEXT (RID_EDIT_START + 287) +#define RID_SVXITEMS_COLOR_BEGIN (RID_EDIT_START + 256) +#define RID_SVXITEMS_COLOR (RID_EDIT_START + 256) +#define RID_SVXITEMS_COLOR_BLACK (RID_EDIT_START + 257) +#define RID_SVXITEMS_COLOR_BLUE (RID_EDIT_START + 258) +#define RID_SVXITEMS_COLOR_GREEN (RID_EDIT_START + 259) +#define RID_SVXITEMS_COLOR_CYAN (RID_EDIT_START + 260) +#define RID_SVXITEMS_COLOR_RED (RID_EDIT_START + 261) +#define RID_SVXITEMS_COLOR_MAGENTA (RID_EDIT_START + 262) +#define RID_SVXITEMS_COLOR_BROWN (RID_EDIT_START + 263) +#define RID_SVXITEMS_COLOR_GRAY (RID_EDIT_START + 264) +#define RID_SVXITEMS_COLOR_LIGHTGRAY (RID_EDIT_START + 265) +#define RID_SVXITEMS_COLOR_LIGHTBLUE (RID_EDIT_START + 266) +#define RID_SVXITEMS_COLOR_LIGHTGREEN (RID_EDIT_START + 267) +#define RID_SVXITEMS_COLOR_LIGHTCYAN (RID_EDIT_START + 268) +#define RID_SVXITEMS_COLOR_LIGHTRED (RID_EDIT_START + 269) +#define RID_SVXITEMS_COLOR_LIGHTMAGENTA (RID_EDIT_START + 270) +#define RID_SVXITEMS_COLOR_YELLOW (RID_EDIT_START + 271) +#define RID_SVXITEMS_COLOR_WHITE (RID_EDIT_START + 272) +#define RID_SVXITEMS_COLOR_MENUBAR (RID_EDIT_START + 273) +#define RID_SVXITEMS_COLOR_MENUBARTEXT (RID_EDIT_START + 274) +#define RID_SVXITEMS_COLOR_POPUPMENU (RID_EDIT_START + 275) +#define RID_SVXITEMS_COLOR_POPUPMENUTEXT (RID_EDIT_START + 276) +#define RID_SVXITEMS_COLOR_WINDOWTEXT (RID_EDIT_START + 277) +#define RID_SVXITEMS_COLOR_WINDOWWORKSPACE (RID_EDIT_START + 278) +#define RID_SVXITEMS_COLOR_HIGHLIGHT (RID_EDIT_START + 279) +#define RID_SVXITEMS_COLOR_HIGHLIGHTTEXT (RID_EDIT_START + 280) +#define RID_SVXITEMS_COLOR_3DTEXT (RID_EDIT_START + 281) +#define RID_SVXITEMS_COLOR_3DFACE (RID_EDIT_START + 282) +#define RID_SVXITEMS_COLOR_3DLIGHT (RID_EDIT_START + 283) +#define RID_SVXITEMS_COLOR_3DSHADOW (RID_EDIT_START + 284) +#define RID_SVXITEMS_COLOR_SCROLLBAR (RID_EDIT_START + 285) +#define RID_SVXITEMS_COLOR_FIELD (RID_EDIT_START + 286) +#define RID_SVXITEMS_COLOR_FIELDTEXT (RID_EDIT_START + 287) #define RID_SVXITEMS_PARASNAPTOGRID_ON (RID_EDIT_START + 288) #define RID_SVXITEMS_PARASNAPTOGRID_OFF (RID_EDIT_START + 289) -#define RID_SVXITEMS_PARAVERTALIGN_AUTO (RID_EDIT_START + 290) -#define RID_SVXITEMS_PARAVERTALIGN_BASELINE (RID_EDIT_START + 291) -#define RID_SVXITEMS_PARAVERTALIGN_TOP (RID_EDIT_START + 292) -#define RID_SVXITEMS_PARAVERTALIGN_CENTER (RID_EDIT_START + 293) -#define RID_SVXITEMS_PARAVERTALIGN_BOTTOM (RID_EDIT_START + 294) +#define RID_SVXITEMS_PARAVERTALIGN_AUTO (RID_EDIT_START + 290) +#define RID_SVXITEMS_PARAVERTALIGN_BASELINE (RID_EDIT_START + 291) +#define RID_SVXITEMS_PARAVERTALIGN_TOP (RID_EDIT_START + 292) +#define RID_SVXITEMS_PARAVERTALIGN_CENTER (RID_EDIT_START + 293) +#define RID_SVXITEMS_PARAVERTALIGN_BOTTOM (RID_EDIT_START + 294) #define RID_SVXITEMS_CHARHIDDEN_FALSE (RID_EDIT_START + 295) #define RID_SVXITEMS_CHARHIDDEN_TRUE (RID_EDIT_START + 296) // strings for error messsages in dictionary updates -#define RID_SVXSTR_DIC_ERR_UNKNOWN (RID_EDIT_START + 297) -#define RID_SVXSTR_DIC_ERR_FULL (RID_EDIT_START + 298) -#define RID_SVXSTR_DIC_ERR_READONLY (RID_EDIT_START + 299) +#define RID_SVXSTR_DIC_ERR_UNKNOWN (RID_EDIT_START + 297) +#define RID_SVXSTR_DIC_ERR_FULL (RID_EDIT_START + 298) +#define RID_SVXSTR_DIC_ERR_READONLY (RID_EDIT_START + 299) // ResIds fuer HM-QueryBoxen und Error-Strings #define RID_SVXQB_BW_CONTINUE (RID_EDIT_START + 300) #define RID_SVXQB_CONTINUE (RID_EDIT_START + 301) // EditEngine -#define RID_EDITUNDO_DEL (RID_EDIT_START + 302) -#define RID_EDITUNDO_MOVE (RID_EDIT_START + 303) -#define RID_EDITUNDO_INSERT (RID_EDIT_START + 304) -#define RID_EDITUNDO_REPLACE (RID_EDIT_START + 305) -#define RID_EDITUNDO_SETATTRIBS (RID_EDIT_START + 306) -#define RID_EDITUNDO_SETSTYLE (RID_EDIT_START + 307) -#define RID_EDITUNDO_RESETATTRIBS (RID_EDIT_START + 308) -#define RID_EDITUNDO_INDENT (RID_EDIT_START + 309) -#define RID_EDITUNDO_TRANSLITERATE (RID_EDIT_START + 310) -#define RID_MENU_SPELL (RID_EDIT_START + 311) -#define RID_STR_PARAGRAPH (RID_EDIT_START + 312) -#define RID_STR_WORD (RID_EDIT_START + 313) -#define RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION (RID_EDIT_START + 314) -#define RID_SVXSTR_A11Y_IMAGEBULLET_NAME (RID_EDIT_START + 315) +#define RID_EDITUNDO_DEL (RID_EDIT_START + 302) +#define RID_EDITUNDO_MOVE (RID_EDIT_START + 303) +#define RID_EDITUNDO_INSERT (RID_EDIT_START + 304) +#define RID_EDITUNDO_REPLACE (RID_EDIT_START + 305) +#define RID_EDITUNDO_SETATTRIBS (RID_EDIT_START + 306) +#define RID_EDITUNDO_SETSTYLE (RID_EDIT_START + 307) +#define RID_EDITUNDO_RESETATTRIBS (RID_EDIT_START + 308) +#define RID_EDITUNDO_INDENT (RID_EDIT_START + 309) +#define RID_EDITUNDO_TRANSLITERATE (RID_EDIT_START + 310) +#define RID_MENU_SPELL (RID_EDIT_START + 311) +#define RID_STR_PARAGRAPH (RID_EDIT_START + 312) +#define RID_STR_WORD (RID_EDIT_START + 313) +#define RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION (RID_EDIT_START + 314) +#define RID_SVXSTR_A11Y_IMAGEBULLET_NAME (RID_EDIT_START + 315) // enum SvxCellHorJustify -#define RID_SVXITEMS_HORJUST_STANDARD (RID_EDIT_START + 316) -#define RID_SVXITEMS_HORJUST_LEFT (RID_EDIT_START + 317) -#define RID_SVXITEMS_HORJUST_CENTER (RID_EDIT_START + 318) -#define RID_SVXITEMS_HORJUST_RIGHT (RID_EDIT_START + 319) -#define RID_SVXITEMS_HORJUST_BLOCK (RID_EDIT_START + 320) -#define RID_SVXITEMS_HORJUST_REPEAT (RID_EDIT_START + 321) +#define RID_SVXITEMS_HORJUST_STANDARD (RID_EDIT_START + 316) +#define RID_SVXITEMS_HORJUST_LEFT (RID_EDIT_START + 317) +#define RID_SVXITEMS_HORJUST_CENTER (RID_EDIT_START + 318) +#define RID_SVXITEMS_HORJUST_RIGHT (RID_EDIT_START + 319) +#define RID_SVXITEMS_HORJUST_BLOCK (RID_EDIT_START + 320) +#define RID_SVXITEMS_HORJUST_REPEAT (RID_EDIT_START + 321) // enum SvxCellVerJustify -#define RID_SVXITEMS_VERJUST_STANDARD (RID_EDIT_START + 322) -#define RID_SVXITEMS_VERJUST_TOP (RID_EDIT_START + 323) -#define RID_SVXITEMS_VERJUST_CENTER (RID_EDIT_START + 324) -#define RID_SVXITEMS_VERJUST_BOTTOM (RID_EDIT_START + 325) +#define RID_SVXITEMS_VERJUST_STANDARD (RID_EDIT_START + 322) +#define RID_SVXITEMS_VERJUST_TOP (RID_EDIT_START + 323) +#define RID_SVXITEMS_VERJUST_CENTER (RID_EDIT_START + 324) +#define RID_SVXITEMS_VERJUST_BOTTOM (RID_EDIT_START + 325) // enum SvxCellJustifyMethod #define RID_SVXITEMS_JUSTMETHOD_AUTO (RID_EDIT_START + 326) diff --git a/editeng/inc/editeng/editstat.hxx b/editeng/inc/editeng/editstat.hxx index 9957cd2d9c96..15de80a6a0f6 100644 --- a/editeng/inc/editeng/editstat.hxx +++ b/editeng/inc/editeng/editstat.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,58 +32,58 @@ #include <tools/string.hxx> #include <i18npool/lang.h> -#define EE_CNTRL_USECHARATTRIBS 0x00000001 // Verwendung harter ZeichenAttr. -#define EE_CNTRL_USEPARAATTRIBS 0x00000002 // Verwendung von AbsatzAttr. -#define EE_CNTRL_CRSRLEFTPARA 0x00000004 // Cursor ist in einen anderen Absatz gewandert -#define EE_CNTRL_DOIDLEFORMAT 0x00000008 // Idle-Formatierung -#define EE_CNTRL_PASTESPECIAL 0x00000010 // Allow PasteSpecial -#define EE_CNTRL_AUTOINDENTING 0x00000020 // Automatisches einruecken -#define EE_CNTRL_UNDOATTRIBS 0x00000040 // Undo fuer Attribute.... -#define EE_CNTRL_ONECHARPERLINE 0x00000080 // Ein Zeichen pro Zeile -#define EE_CNTRL_NOCOLORS 0x00000100 // Engine: Keine Farben -#define EE_CNTRL_OUTLINER 0x00000200 // Sonderbehandlung Outliner/Gliederungsmodus -#define EE_CNTRL_OUTLINER2 0x00000400 // Sonderbehandlung Outliner/Seite -#define EE_CNTRL_ALLOWBIGOBJS 0x00000800 // PortionInfo in Textobjekten -#define EE_CNTRL_ONLINESPELLING 0x00001000 // Waehrend des editieren Spelling -#define EE_CNTRL_STRETCHING 0x00002000 // Stretch-Modus -#define EE_CNTRL_MARKFIELDS 0x00004000 // Felder farblich hinterlegen -#define EE_CNTRL_URLSFXEXECUTE 0x00008000 // !!!OLD!!!: SFX-URL-Execute. -#define EE_CNTRL_RESTOREFONT 0x00010000 // Font im OutDev restaurieren -#define EE_CNTRL_RTFSTYLESHEETS 0x00020000 // Stylesheets bei Import verwenden +#define EE_CNTRL_USECHARATTRIBS 0x00000001 // Verwendung harter ZeichenAttr. +#define EE_CNTRL_USEPARAATTRIBS 0x00000002 // Verwendung von AbsatzAttr. +#define EE_CNTRL_CRSRLEFTPARA 0x00000004 // Cursor ist in einen anderen Absatz gewandert +#define EE_CNTRL_DOIDLEFORMAT 0x00000008 // Idle-Formatierung +#define EE_CNTRL_PASTESPECIAL 0x00000010 // Allow PasteSpecial +#define EE_CNTRL_AUTOINDENTING 0x00000020 // Automatisches einruecken +#define EE_CNTRL_UNDOATTRIBS 0x00000040 // Undo fuer Attribute.... +#define EE_CNTRL_ONECHARPERLINE 0x00000080 // Ein Zeichen pro Zeile +#define EE_CNTRL_NOCOLORS 0x00000100 // Engine: Keine Farben +#define EE_CNTRL_OUTLINER 0x00000200 // Sonderbehandlung Outliner/Gliederungsmodus +#define EE_CNTRL_OUTLINER2 0x00000400 // Sonderbehandlung Outliner/Seite +#define EE_CNTRL_ALLOWBIGOBJS 0x00000800 // PortionInfo in Textobjekten +#define EE_CNTRL_ONLINESPELLING 0x00001000 // Waehrend des editieren Spelling +#define EE_CNTRL_STRETCHING 0x00002000 // Stretch-Modus +#define EE_CNTRL_MARKFIELDS 0x00004000 // Felder farblich hinterlegen +#define EE_CNTRL_URLSFXEXECUTE 0x00008000 // !!!OLD!!!: SFX-URL-Execute. +#define EE_CNTRL_RESTOREFONT 0x00010000 // Font im OutDev restaurieren +#define EE_CNTRL_RTFSTYLESHEETS 0x00020000 // Stylesheets bei Import verwenden //#define EE_CNTRL_NOREDLINES 0x00040000 // Keine RedLines bei OnlineSpellError /* removed #i91949 */ -#define EE_CNTRL_AUTOCORRECT 0x00080000 // AutoKorrektur -#define EE_CNTRL_AUTOCOMPLETE 0x00100000 // AutoComplete -#define EE_CNTRL_AUTOPAGESIZEX 0x00200000 // Papierbreite an Text anpassen -#define EE_CNTRL_AUTOPAGESIZEY 0x00400000 // Papierhoehe an Text anpassen -#define EE_CNTRL_AUTOPAGESIZE (EE_CNTRL_AUTOPAGESIZEX|EE_CNTRL_AUTOPAGESIZEY) -#define EE_CNTRL_TABINDENTING 0x00800000 // Einruecken mit Tab -#define EE_CNTRL_FORMAT100 0x01000000 // Immer nach 100% formatieren -#define EE_CNTRL_ULSPACESUMMATION 0x02000000 // MS Compat: SA und SB aufsummieren, nicht maximalwert -#define EE_CNTRL_ULSPACEFIRSTPARA 0x04000000 // MS Compat: SB auch beim ersten Absatz auswerten - -#define EV_CNTRL_AUTOSCROLL 0x00000001 // Autom. Scrollen horiz. -#define EV_CNTRL_BIGSCROLL 0x00000002 // Weiter Scrollen, als nur zum Cursor -#define EV_CNTRL_ENABLEPASTE 0x00000004 // Paste erlauben -#define EV_CNTRL_SINGLELINEPASTE 0x00000008 // View: Paste in Eingabezeile... -#define EV_CNTRL_OVERWRITE 0x00000010 // Ueberschreibmodus -#define EV_CNTRL_INVONEMORE 0x00000020 // Ein Pixel mehr invalidieren -#define EV_CNTRL_AUTOSIZEX 0x00000040 // Automatisch an Textbreite anpassen -#define EV_CNTRL_AUTOSIZEY 0x00000080 // Automatisch an Texthoehe anpassen -#define EV_CNTRL_AUTOSIZE (EV_CNTRL_AUTOSIZEX|EV_CNTRL_AUTOSIZEY) - -#define EE_STAT_HSCROLL 0x00000001 -#define EE_STAT_VSCROLL 0x00000002 -#define EE_STAT_CURSOROUT 0x00000004 -#define EE_STAT_CRSRMOVEFAIL 0x00000008 -#define EE_STAT_CRSRLEFTPARA 0x00000010 -#define EE_STAT_TEXTWIDTHCHANGED 0x00000020 -#define EE_STAT_TEXTHEIGHTCHANGED 0x00000040 -#define EE_STAT_WRONGWORDCHANGED 0x00000080 -// #define EE_STAT_MODIFIED 0x00000100 +#define EE_CNTRL_AUTOCORRECT 0x00080000 // AutoKorrektur +#define EE_CNTRL_AUTOCOMPLETE 0x00100000 // AutoComplete +#define EE_CNTRL_AUTOPAGESIZEX 0x00200000 // Papierbreite an Text anpassen +#define EE_CNTRL_AUTOPAGESIZEY 0x00400000 // Papierhoehe an Text anpassen +#define EE_CNTRL_AUTOPAGESIZE (EE_CNTRL_AUTOPAGESIZEX|EE_CNTRL_AUTOPAGESIZEY) +#define EE_CNTRL_TABINDENTING 0x00800000 // Einruecken mit Tab +#define EE_CNTRL_FORMAT100 0x01000000 // Immer nach 100% formatieren +#define EE_CNTRL_ULSPACESUMMATION 0x02000000 // MS Compat: SA und SB aufsummieren, nicht maximalwert +#define EE_CNTRL_ULSPACEFIRSTPARA 0x04000000 // MS Compat: SB auch beim ersten Absatz auswerten + +#define EV_CNTRL_AUTOSCROLL 0x00000001 // Autom. Scrollen horiz. +#define EV_CNTRL_BIGSCROLL 0x00000002 // Weiter Scrollen, als nur zum Cursor +#define EV_CNTRL_ENABLEPASTE 0x00000004 // Paste erlauben +#define EV_CNTRL_SINGLELINEPASTE 0x00000008 // View: Paste in Eingabezeile... +#define EV_CNTRL_OVERWRITE 0x00000010 // Ueberschreibmodus +#define EV_CNTRL_INVONEMORE 0x00000020 // Ein Pixel mehr invalidieren +#define EV_CNTRL_AUTOSIZEX 0x00000040 // Automatisch an Textbreite anpassen +#define EV_CNTRL_AUTOSIZEY 0x00000080 // Automatisch an Texthoehe anpassen +#define EV_CNTRL_AUTOSIZE (EV_CNTRL_AUTOSIZEX|EV_CNTRL_AUTOSIZEY) + +#define EE_STAT_HSCROLL 0x00000001 +#define EE_STAT_VSCROLL 0x00000002 +#define EE_STAT_CURSOROUT 0x00000004 +#define EE_STAT_CRSRMOVEFAIL 0x00000008 +#define EE_STAT_CRSRLEFTPARA 0x00000010 +#define EE_STAT_TEXTWIDTHCHANGED 0x00000020 +#define EE_STAT_TEXTHEIGHTCHANGED 0x00000040 +#define EE_STAT_WRONGWORDCHANGED 0x00000080 +// #define EE_STAT_MODIFIED 0x00000100 // Nur fuer Update: -#define EE_CNTRL_AUTOCENTER EE_CNTRL_AUTOPAGESIZE -#define EE_STAT_GROWY EE_STAT_TEXTHEIGHTCHANGED +#define EE_CNTRL_AUTOCENTER EE_CNTRL_AUTOPAGESIZE +#define EE_STAT_GROWY EE_STAT_TEXTHEIGHTCHANGED /* EE_STAT_CRSRLEFTPARA zur Zeit bei Cursorbewegungen und Return. @@ -100,37 +100,37 @@ inline void SetFlags( ULONG& rBits, const ULONG nMask, bool bOn ) class EditStatus { protected: - ULONG nStatusBits; - ULONG nControlBits; - USHORT nPrevPara; // fuer EE_STAT_CRSRLEFTPARA + ULONG nStatusBits; + ULONG nControlBits; + USHORT nPrevPara; // fuer EE_STAT_CRSRLEFTPARA public: - EditStatus() { nStatusBits = 0; nControlBits = 0; nPrevPara = 0xFFFF; } + EditStatus() { nStatusBits = 0; nControlBits = 0; nPrevPara = 0xFFFF; } - void Clear() { nStatusBits = 0; } - void SetControlBits( ULONG nMask, bool bOn ) + void Clear() { nStatusBits = 0; } + void SetControlBits( ULONG nMask, bool bOn ) { SetFlags( nControlBits, nMask, bOn ); } - ULONG GetStatusWord() const { return nStatusBits; } - ULONG& GetStatusWord() { return nStatusBits; } + ULONG GetStatusWord() const { return nStatusBits; } + ULONG& GetStatusWord() { return nStatusBits; } - ULONG GetControlWord() const { return nControlBits; } - ULONG& GetControlWord() { return nControlBits; } + ULONG GetControlWord() const { return nControlBits; } + ULONG& GetControlWord() { return nControlBits; } - USHORT GetPrevParagraph() const { return nPrevPara; } - USHORT& GetPrevParagraph() { return nPrevPara; } + USHORT GetPrevParagraph() const { return nPrevPara; } + USHORT& GetPrevParagraph() { return nPrevPara; } }; -#define SPELLCMD_IGNOREWORD 0x0001 -#define SPELLCMD_STARTSPELLDLG 0x0002 -#define SPELLCMD_ADDTODICTIONARY 0x0003 -#define SPELLCMD_WORDLANGUAGE 0x0004 -#define SPELLCMD_PARALANGUAGE 0x0005 +#define SPELLCMD_IGNOREWORD 0x0001 +#define SPELLCMD_STARTSPELLDLG 0x0002 +#define SPELLCMD_ADDTODICTIONARY 0x0003 +#define SPELLCMD_WORDLANGUAGE 0x0004 +#define SPELLCMD_PARALANGUAGE 0x0005 struct SpellCallbackInfo { - USHORT nCommand; - String aWord; + USHORT nCommand; + String aWord; LanguageType eLanguage; SpellCallbackInfo( USHORT nCMD, const String& rWord ) diff --git a/editeng/inc/editeng/editund2.hxx b/editeng/inc/editeng/editund2.hxx index 0fdd2f9d3f3c..a4c7917ec800 100644 --- a/editeng/inc/editeng/editund2.hxx +++ b/editeng/inc/editeng/editund2.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,12 +40,12 @@ class EDITENG_DLLPUBLIC EditUndoManager : public SfxUndoManager using SfxUndoManager::Redo; private: - ImpEditEngine* pImpEE; + ImpEditEngine* pImpEE; public: EditUndoManager( ImpEditEngine* pImpEE ); - virtual BOOL Undo( USHORT nCount=1 ); - virtual BOOL Redo( USHORT nCount=1 ); + virtual BOOL Undo( USHORT nCount=1 ); + virtual BOOL Redo( USHORT nCount=1 ); }; // ----------------------------------------------------------------------- @@ -54,25 +54,25 @@ public: class EDITENG_DLLPUBLIC EditUndo : public SfxUndoAction { private: - USHORT nId; - ImpEditEngine* pImpEE; + USHORT nId; + ImpEditEngine* pImpEE; public: TYPEINFO(); EditUndo( USHORT nI, ImpEditEngine* pImpEE ); - virtual ~EditUndo(); + virtual ~EditUndo(); - ImpEditEngine* GetImpEditEngine() const { return pImpEE; } + ImpEditEngine* GetImpEditEngine() const { return pImpEE; } - virtual void Undo() = 0; - virtual void Redo() = 0; + virtual void Undo() = 0; + virtual void Redo() = 0; - virtual BOOL CanRepeat(SfxRepeatTarget&) const; - virtual String GetComment() const; - virtual USHORT GetId() const; + virtual BOOL CanRepeat(SfxRepeatTarget&) const; + virtual String GetComment() const; + virtual USHORT GetId() const; }; -#endif // _EDITUND2_HXX +#endif // _EDITUND2_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/inc/editeng/editview.hxx b/editeng/inc/editeng/editview.hxx index a0543ee13edc..39756b53c3de 100644 --- a/editeng/inc/editeng/editview.hxx +++ b/editeng/inc/editeng/editview.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -76,174 +76,174 @@ class EDITENG_DLLPUBLIC EditView friend class ImpEditEngine; friend class EditSelFunctionSet; -public: // brauche ich fuer Undo - ImpEditView* GetImpEditView() const { return pImpEditView; } - ImpEditEngine* GetImpEditEngine() const; +public: // brauche ich fuer Undo + ImpEditView* GetImpEditView() const { return pImpEditView; } + ImpEditEngine* GetImpEditEngine() const; private: - ImpEditView* pImpEditView; + ImpEditView* pImpEditView; EDITENG_DLLPRIVATE EditView( const EditView& ); - EDITENG_DLLPRIVATE EditView& operator=( const EditView& ); + EDITENG_DLLPRIVATE EditView& operator=( const EditView& ); public: EditView( EditEngine* pEng, Window* pWindow ); - virtual ~EditView(); + virtual ~EditView(); - void SetEditEngine( EditEngine* pEditEngine ); - EditEngine* GetEditEngine() const; + void SetEditEngine( EditEngine* pEditEngine ); + EditEngine* GetEditEngine() const; - void SetWindow( Window* pWin ); - Window* GetWindow() const; + void SetWindow( Window* pWin ); + Window* GetWindow() const; - void Paint( const Rectangle& rRect ); - void Invalidate(); - Pair Scroll( long nHorzScroll, long nVertScroll, BYTE nRangeCheck = RGCHK_NEG ); + void Paint( const Rectangle& rRect ); + void Invalidate(); + Pair Scroll( long nHorzScroll, long nVertScroll, BYTE nRangeCheck = RGCHK_NEG ); - void ShowCursor( BOOL bGotoCursor = TRUE, BOOL bForceVisCursor = TRUE ); - void HideCursor(); + void ShowCursor( BOOL bGotoCursor = TRUE, BOOL bForceVisCursor = TRUE ); + void HideCursor(); - EESelectionMode GetSelectionMode() const; - void SetSelectionMode( EESelectionMode eMode ); + EESelectionMode GetSelectionMode() const; + void SetSelectionMode( EESelectionMode eMode ); - void SetReadOnly( BOOL bReadOnly ); - BOOL IsReadOnly() const; + void SetReadOnly( BOOL bReadOnly ); + BOOL IsReadOnly() const; - BOOL HasSelection() const; - ESelection GetSelection() const; - void SetSelection( const ESelection& rNewSel ); + BOOL HasSelection() const; + ESelection GetSelection() const; + void SetSelection( const ESelection& rNewSel ); BOOL SelectCurrentWord( sal_Int16 nWordType = ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ); - void IndentBlock(); - void UnindentBlock(); + void IndentBlock(); + void UnindentBlock(); - BOOL IsInsertMode() const; - void SetInsertMode( BOOL bInsert ); + BOOL IsInsertMode() const; + void SetInsertMode( BOOL bInsert ); - void ReplaceSelected( const String& rStr ); - String GetSelected(); - void DeleteSelected(); + void ReplaceSelected( const String& rStr ); + String GetSelected(); + void DeleteSelected(); - USHORT GetSelectedScriptType() const; + USHORT GetSelectedScriptType() const; // Position der VisArea im Ausgabefenster. // Eine Groessenaenderung betrifft auch die VisArea - void SetOutputArea( const Rectangle& rRec ); - const Rectangle& GetOutputArea() const; + void SetOutputArea( const Rectangle& rRec ); + const Rectangle& GetOutputArea() const; // Dokumentposition. // Eine Groessenaenderung betrifft auch die VisArea - void SetVisArea( const Rectangle& rRec ); - const Rectangle& GetVisArea() const; + void SetVisArea( const Rectangle& rRec ); + const Rectangle& GetVisArea() const; - void SetPointer( const Pointer& rPointer ); - const Pointer& GetPointer() const; + void SetPointer( const Pointer& rPointer ); + const Pointer& GetPointer() const; - void SetCursor( const Cursor& rCursor ); - Cursor* GetCursor() const; + void SetCursor( const Cursor& rCursor ); + Cursor* GetCursor() const; - void InsertText( const String& rNew, BOOL bSelect = FALSE ); + void InsertText( const String& rNew, BOOL bSelect = FALSE ); - BOOL PostKeyEvent( const KeyEvent& rKeyEvent, Window* pFrameWin = NULL ); + BOOL PostKeyEvent( const KeyEvent& rKeyEvent, Window* pFrameWin = NULL ); - BOOL MouseButtonUp( const MouseEvent& rMouseEvent ); - BOOL MouseButtonDown( const MouseEvent& rMouseEvent ); - BOOL MouseMove( const MouseEvent& rMouseEvent ); - void Command( const CommandEvent& rCEvt ); + BOOL MouseButtonUp( const MouseEvent& rMouseEvent ); + BOOL MouseButtonDown( const MouseEvent& rMouseEvent ); + BOOL MouseMove( const MouseEvent& rMouseEvent ); + void Command( const CommandEvent& rCEvt ); BOOL Drop( const DropEvent& rEvt ); - BOOL QueryDrop( DropEvent& rEvt ); - ESelection GetDropPos(); + BOOL QueryDrop( DropEvent& rEvt ); + ESelection GetDropPos(); - void Cut(); - void Copy(); + void Cut(); + void Copy(); void Paste(); void PasteSpecial(); - void EnablePaste( BOOL bEnable ); - BOOL IsPasteEnabled() const; + void EnablePaste( BOOL bEnable ); + BOOL IsPasteEnabled() const; - void Undo(); - void Redo(); + void Undo(); + void Redo(); // speziell fuer Olli - USHORT GetParagraph( const Point& rMousePosPixel ); - Point GetWindowPosTopLeft( USHORT nParagraph ); - void MoveParagraphs( Range aParagraphs, USHORT nNewPos ); + USHORT GetParagraph( const Point& rMousePosPixel ); + Point GetWindowPosTopLeft( USHORT nParagraph ); + void MoveParagraphs( Range aParagraphs, USHORT nNewPos ); void MoveParagraphs( long nDiff ); - const SfxItemSet& GetEmptyItemSet(); - SfxItemSet GetAttribs(); - void SetAttribs( const SfxItemSet& rSet ); - void SetParaAttribs( const SfxItemSet& rSet, USHORT nPara ); + const SfxItemSet& GetEmptyItemSet(); + SfxItemSet GetAttribs(); + void SetAttribs( const SfxItemSet& rSet ); + void SetParaAttribs( const SfxItemSet& rSet, USHORT nPara ); void RemoveAttribs( BOOL bRemoveParaAttribs = FALSE, USHORT nWhich = 0 ); - void RemoveCharAttribs( USHORT nPara, USHORT nWhich = 0 ); + void RemoveCharAttribs( USHORT nPara, USHORT nWhich = 0 ); void RemoveAttribsKeepLanguages( BOOL bRemoveParaAttribs = FALSE ); ULONG Read( SvStream& rInput, const String& rBaseURL, EETextFormat eFormat, BOOL bSelect = FALSE, SvKeyValueIterator* pHTTPHeaderAttrs = NULL ); - ULONG Write( SvStream& rOutput, EETextFormat eFormat ); + ULONG Write( SvStream& rOutput, EETextFormat eFormat ); - void SetBackgroundColor( const Color& rColor ); - Color GetBackgroundColor() const; + void SetBackgroundColor( const Color& rColor ); + Color GetBackgroundColor() const; - void SetControlWord( sal_uInt32 nWord ); - sal_uInt32 GetControlWord() const; + void SetControlWord( sal_uInt32 nWord ); + sal_uInt32 GetControlWord() const; - EditTextObject* CreateTextObject(); - void InsertText( const EditTextObject& rTextObject ); + EditTextObject* CreateTextObject(); + void InsertText( const EditTextObject& rTextObject ); void InsertText( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xDataObj, const String& rBaseURL, BOOL bUseSpecial ); ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > GetTransferable(); // An EditView, damit bei TRUE flackerfreies Update: - void SetEditEngineUpdateMode( BOOL bUpdate ); - void ForceUpdate(); + void SetEditEngineUpdateMode( BOOL bUpdate ); + void ForceUpdate(); - SfxStyleSheet* GetStyleSheet() const; - void SetStyleSheet( SfxStyleSheet* pStyle ); + SfxStyleSheet* GetStyleSheet() const; + void SetStyleSheet( SfxStyleSheet* pStyle ); - void SetAnchorMode( EVAnchorMode eMode ); - EVAnchorMode GetAnchorMode() const; + void SetAnchorMode( EVAnchorMode eMode ); + EVAnchorMode GetAnchorMode() const; - BOOL MatchGroup(); + BOOL MatchGroup(); - void CompleteAutoCorrect( Window* pFrameWin = NULL ); + void CompleteAutoCorrect( Window* pFrameWin = NULL ); - EESpellState StartSpeller( BOOL bMultipleDoc = FALSE ); - EESpellState StartThesaurus(); - USHORT StartSearchAndReplace( const SvxSearchItem& rSearchItem ); + EESpellState StartSpeller( BOOL bMultipleDoc = FALSE ); + EESpellState StartThesaurus(); + USHORT StartSearchAndReplace( const SvxSearchItem& rSearchItem ); // for text conversion void StartTextConversion( LanguageType nSrcLang, LanguageType nDestLang, const Font *pDestFont, INT32 nOptions, BOOL bIsInteractive, BOOL bMultipleDoc ); sal_Bool HasConvertibleTextPortion( LanguageType nLang ); - void TransliterateText( sal_Int32 nTransliterationMode ); + void TransliterateText( sal_Int32 nTransliterationMode ); - BOOL IsCursorAtWrongSpelledWord( BOOL bMarkIfWrong = FALSE ); - BOOL IsWrongSpelledWordAtPos( const Point& rPosPixel, BOOL bMarkIfWrong = FALSE ); - void SpellIgnoreWord(); - void ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack = 0 ); + BOOL IsCursorAtWrongSpelledWord( BOOL bMarkIfWrong = FALSE ); + BOOL IsWrongSpelledWordAtPos( const Point& rPosPixel, BOOL bMarkIfWrong = FALSE ); + void SpellIgnoreWord(); + void ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack = 0 ); - void InsertField( const SvxFieldItem& rFld ); - const SvxFieldItem* GetFieldUnderMousePointer() const; - const SvxFieldItem* GetFieldUnderMousePointer( USHORT& nPara, xub_StrLen& nPos ) const; - const SvxFieldItem* GetField( const Point& rPos, USHORT* pnPara = NULL, xub_StrLen* pnPos = NULL ) const; + void InsertField( const SvxFieldItem& rFld ); + const SvxFieldItem* GetFieldUnderMousePointer() const; + const SvxFieldItem* GetFieldUnderMousePointer( USHORT& nPara, xub_StrLen& nPos ) const; + const SvxFieldItem* GetField( const Point& rPos, USHORT* pnPara = NULL, xub_StrLen* pnPos = NULL ) const; - const SvxFieldItem* GetFieldAtSelection() const; + const SvxFieldItem* GetFieldAtSelection() const; - String GetWordUnderMousePointer() const; - String GetWordUnderMousePointer( Rectangle& rWordRect ) const; + String GetWordUnderMousePointer() const; + String GetWordUnderMousePointer( Rectangle& rWordRect ) const; - void SetInvalidateMore( USHORT nPixel ); - USHORT GetInvalidateMore() const; + void SetInvalidateMore( USHORT nPixel ); + USHORT GetInvalidateMore() const; // grows or shrinks the font height for the current selection void ChangeFontSize( bool bGrow, const FontList* pList ); static bool ChangeFontSize( bool bGrow, SfxItemSet& rSet, const FontList* pFontList ); - String GetSurroundingText() const; - Selection GetSurroundingTextSelection() const; + String GetSurroundingText() const; + Selection GetSurroundingTextSelection() const; }; #endif // _MyEDITVIEW_HXX diff --git a/editeng/inc/editeng/edtdlg.hxx b/editeng/inc/editeng/edtdlg.hxx index 3273c5038e54..7fe32ac5e11b 100644 --- a/editeng/inc/editeng/edtdlg.hxx +++ b/editeng/inc/editeng/edtdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,9 +39,9 @@ #include <i18npool/lang.h> #include <com/sun/star/uno/Reference.hxx> #include <vcl/abstdlg.hxx> -#include <editeng/hangulhanja.hxx> +#include <editeng/hangulhanja.hxx> -namespace com { namespace sun { namespace star { namespace linguistic2 +namespace com { namespace sun { namespace star { namespace linguistic2 { class XThesaurus; class XHyphenator; @@ -55,17 +55,17 @@ class SvxSpellWrapper; class AbstractThesaurusDialog : public VclAbstractDialog { public: - virtual String GetWord() = 0; - virtual sal_uInt16 GetLanguage() const = 0; - virtual Window* GetWindow() = 0; + virtual String GetWord() = 0; + virtual sal_uInt16 GetLanguage() const = 0; + virtual Window* GetWindow() = 0; }; class AbstractHyphenWordDialog : public VclAbstractDialog { public: - virtual void SelLeft() = 0; - virtual void SelRight() = 0; - virtual Window* GetWindow() = 0; + virtual void SelLeft() = 0; + virtual void SelRight() = 0; + virtual Window* GetWindow() = 0; }; class AbstractHangulHanjaConversionDialog : public VclAbstractTerminatedDialog @@ -73,37 +73,37 @@ class AbstractHangulHanjaConversionDialog : public VclAbstractTerminatedDialog public: virtual void EnableRubySupport( sal_Bool _bVal ) = 0; virtual void SetByCharacter( sal_Bool _bByCharacter ) = 0; - virtual void SetConversionDirectionState( sal_Bool _bTryBothDirections, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection ) = 0; + virtual void SetConversionDirectionState( sal_Bool _bTryBothDirections, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection ) = 0; virtual void SetConversionFormat( editeng::HangulHanjaConversion::ConversionFormat _eType ) = 0; - virtual void SetOptionsChangedHdl( const Link& _rHdl ) = 0; - virtual void SetIgnoreHdl( const Link& _rHdl ) = 0; - virtual void SetIgnoreAllHdl( const Link& _rHdl ) = 0; - virtual void SetChangeHdl( const Link& _rHdl ) = 0; - virtual void SetChangeAllHdl( const Link& _rHdl ) = 0; - virtual void SetClickByCharacterHdl( const Link& _rHdl ) = 0; - virtual void SetConversionFormatChangedHdl( const Link& _rHdl ) = 0; - virtual void SetFindHdl( const Link& _rHdl ) = 0; - virtual sal_Bool GetUseBothDirections( ) const= 0; + virtual void SetOptionsChangedHdl( const Link& _rHdl ) = 0; + virtual void SetIgnoreHdl( const Link& _rHdl ) = 0; + virtual void SetIgnoreAllHdl( const Link& _rHdl ) = 0; + virtual void SetChangeHdl( const Link& _rHdl ) = 0; + virtual void SetChangeAllHdl( const Link& _rHdl ) = 0; + virtual void SetClickByCharacterHdl( const Link& _rHdl ) = 0; + virtual void SetConversionFormatChangedHdl( const Link& _rHdl ) = 0; + virtual void SetFindHdl( const Link& _rHdl ) = 0; + virtual sal_Bool GetUseBothDirections( ) const= 0; virtual editeng::HangulHanjaConversion::ConversionDirection GetDirection( editeng::HangulHanjaConversion::ConversionDirection _eDefaultDirection ) const = 0; - virtual void SetCurrentString( + virtual void SetCurrentString( const String& _rNewString, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rSuggestions, bool _bOriginatesFromDocument = true )=0; - virtual String GetCurrentString( ) const =0; + virtual String GetCurrentString( ) const =0; virtual editeng::HangulHanjaConversion::ConversionFormat GetConversionFormat( ) const =0; - virtual void FocusSuggestion( )= 0; - virtual String GetCurrentSuggestion( ) const =0; + virtual void FocusSuggestion( )= 0; + virtual String GetCurrentSuggestion( ) const =0; }; class EDITENG_DLLPUBLIC EditAbstractDialogFactory : virtual public VclAbstractDialogFactory { public: - virtual ~EditAbstractDialogFactory(); // needed for export of vtable - static EditAbstractDialogFactory* Create(); - virtual AbstractThesaurusDialog* CreateThesaurusDialog( Window*, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XThesaurus > xThesaurus, + virtual ~EditAbstractDialogFactory(); // needed for export of vtable + static EditAbstractDialogFactory* Create(); + virtual AbstractThesaurusDialog* CreateThesaurusDialog( Window*, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XThesaurus > xThesaurus, const String &rWord, sal_Int16 nLanguage ) = 0; - virtual AbstractHyphenWordDialog* CreateHyphenWordDialog( Window*, + virtual AbstractHyphenWordDialog* CreateHyphenWordDialog( Window*, const String &rWord, LanguageType nLang, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenator > &xHyphen, SvxSpellWrapper* pWrapper ) = 0; diff --git a/editeng/inc/editeng/eedata.hxx b/editeng/inc/editeng/eedata.hxx index 7f1f131df054..43657d6e811b 100644 --- a/editeng/inc/editeng/eedata.hxx +++ b/editeng/inc/editeng/eedata.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 _EEDATA_HXX ////////////////////////////////////////////////////////////////////////////// -// extended data definitions for EditEngine portion stripping (StripPortions() +// extended data definitions for EditEngine portion stripping (StripPortions() // support). These may be mapped to some primitive definitions from Drawinglayer // later. #include <vector> @@ -37,11 +37,11 @@ namespace EEngineData { // spell checking wrong vector containing the redlining data - class WrongSpellClass - { + class WrongSpellClass + { public: - sal_uInt32 nStart; - sal_uInt32 nEnd; + sal_uInt32 nStart; + sal_uInt32 nEnd; WrongSpellClass(sal_uInt32 nS, sal_uInt32 nE) : nStart(nS), nEnd(nE) {} }; @@ -49,7 +49,7 @@ namespace EEngineData typedef std::vector< WrongSpellClass > WrongSpellVector; // text marking vector containing the EOC, EOW and EOS TEXT definitions - enum TextMarkingType + enum TextMarkingType { EndOfCaracter = 0, EndOfWord = 1, diff --git a/editeng/inc/editeng/eeitem.hxx b/editeng/inc/editeng/eeitem.hxx index 085ffb226b35..936109b28323 100644 --- a/editeng/inc/editeng/eeitem.hxx +++ b/editeng/inc/editeng/eeitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,26 +29,26 @@ #ifndef _EEITEM_HXX #define _EEITEM_HXX -#define EE_ITEMS_START 3989 +#define EE_ITEMS_START 3989 // Paragraph attributes: -#define EE_PARA_START (EE_ITEMS_START+0) +#define EE_PARA_START (EE_ITEMS_START+0) #define EE_PARA_WRITINGDIR (EE_ITEMS_START+0) -#define EE_PARA_XMLATTRIBS (EE_ITEMS_START+1) -#define EE_PARA_HANGINGPUNCTUATION (EE_ITEMS_START+2) -#define EE_PARA_FORBIDDENRULES (EE_ITEMS_START+3) -#define EE_PARA_ASIANCJKSPACING (EE_ITEMS_START+4) -#define EE_PARA_NUMBULLET (EE_ITEMS_START+5) -#define EE_PARA_HYPHENATE (EE_ITEMS_START+6) -#define EE_PARA_BULLETSTATE (EE_ITEMS_START+7) -#define EE_PARA_OUTLLRSPACE (EE_ITEMS_START+8) -#define EE_PARA_OUTLLEVEL (EE_ITEMS_START+9) -#define EE_PARA_BULLET (EE_ITEMS_START+10) -#define EE_PARA_LRSPACE (EE_ITEMS_START+11) -#define EE_PARA_ULSPACE (EE_ITEMS_START+12) -#define EE_PARA_SBL (EE_ITEMS_START+13) -#define EE_PARA_JUST (EE_ITEMS_START+14) -#define EE_PARA_TABS (EE_ITEMS_START+15) +#define EE_PARA_XMLATTRIBS (EE_ITEMS_START+1) +#define EE_PARA_HANGINGPUNCTUATION (EE_ITEMS_START+2) +#define EE_PARA_FORBIDDENRULES (EE_ITEMS_START+3) +#define EE_PARA_ASIANCJKSPACING (EE_ITEMS_START+4) +#define EE_PARA_NUMBULLET (EE_ITEMS_START+5) +#define EE_PARA_HYPHENATE (EE_ITEMS_START+6) +#define EE_PARA_BULLETSTATE (EE_ITEMS_START+7) +#define EE_PARA_OUTLLRSPACE (EE_ITEMS_START+8) +#define EE_PARA_OUTLLEVEL (EE_ITEMS_START+9) +#define EE_PARA_BULLET (EE_ITEMS_START+10) +#define EE_PARA_LRSPACE (EE_ITEMS_START+11) +#define EE_PARA_ULSPACE (EE_ITEMS_START+12) +#define EE_PARA_SBL (EE_ITEMS_START+13) +#define EE_PARA_JUST (EE_ITEMS_START+14) +#define EE_PARA_TABS (EE_ITEMS_START+15) #define EE_PARA_JUST_METHOD (EE_ITEMS_START+16) #define EE_PARA_VER_JUST (EE_ITEMS_START+17) #define EE_PARA_END (EE_ITEMS_START+17) diff --git a/editeng/inc/editeng/eeitemid.hxx b/editeng/inc/editeng/eeitemid.hxx index bfb5daa55a23..3e28e0e5e1f8 100644 --- a/editeng/inc/editeng/eeitemid.hxx +++ b/editeng/inc/editeng/eeitemid.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,57 +81,57 @@ #endif // Zeichenattribute.... -#define ITEMID_FONT EE_CHAR_FONTINFO -#define ITEMID_POSTURE EE_CHAR_ITALIC -#define ITEMID_WEIGHT EE_CHAR_WEIGHT -#define ITEMID_SHADOWED EE_CHAR_SHADOW -#define ITEMID_CONTOUR EE_CHAR_OUTLINE -#define ITEMID_CROSSEDOUT EE_CHAR_STRIKEOUT -#define ITEMID_UNDERLINE EE_CHAR_UNDERLINE -#define ITEMID_OVERLINE EE_CHAR_OVERLINE -#define ITEMID_FONTHEIGHT EE_CHAR_FONTHEIGHT -#define ITEMID_CHARSCALE_W EE_CHAR_FONTWIDTH -#define ITEMID_COLOR EE_CHAR_COLOR -#define ITEMID_WORDLINEMODE EE_CHAR_WLM -#define ITEMID_PROPSIZE 0 -#define ITEMID_CHARSETCOLOR 0 // EE_FEATURE_NOTCONV -#define ITEMID_CASEMAP 0 -#define ITEMID_LANGUAGE 0 -#define ITEMID_ESCAPEMENT EE_CHAR_ESCAPEMENT -#define ITEMID_NOLINEBREAK 0 -#define ITEMID_NOHYPHENHERE 0 -#define ITEMID_AUTOKERN EE_CHAR_PAIRKERNING -#define ITEMID_KERNING EE_CHAR_KERNING -#define ITEMID_EMPHASISMARK EE_CHAR_EMPHASISMARK -#define ITEMID_CHARRELIEF EE_CHAR_RELIEF +#define ITEMID_FONT EE_CHAR_FONTINFO +#define ITEMID_POSTURE EE_CHAR_ITALIC +#define ITEMID_WEIGHT EE_CHAR_WEIGHT +#define ITEMID_SHADOWED EE_CHAR_SHADOW +#define ITEMID_CONTOUR EE_CHAR_OUTLINE +#define ITEMID_CROSSEDOUT EE_CHAR_STRIKEOUT +#define ITEMID_UNDERLINE EE_CHAR_UNDERLINE +#define ITEMID_OVERLINE EE_CHAR_OVERLINE +#define ITEMID_FONTHEIGHT EE_CHAR_FONTHEIGHT +#define ITEMID_CHARSCALE_W EE_CHAR_FONTWIDTH +#define ITEMID_COLOR EE_CHAR_COLOR +#define ITEMID_WORDLINEMODE EE_CHAR_WLM +#define ITEMID_PROPSIZE 0 +#define ITEMID_CHARSETCOLOR 0 // EE_FEATURE_NOTCONV +#define ITEMID_CASEMAP 0 +#define ITEMID_LANGUAGE 0 +#define ITEMID_ESCAPEMENT EE_CHAR_ESCAPEMENT +#define ITEMID_NOLINEBREAK 0 +#define ITEMID_NOHYPHENHERE 0 +#define ITEMID_AUTOKERN EE_CHAR_PAIRKERNING +#define ITEMID_KERNING EE_CHAR_KERNING +#define ITEMID_EMPHASISMARK EE_CHAR_EMPHASISMARK +#define ITEMID_CHARRELIEF EE_CHAR_RELIEF // Absatzattribute -#define ITEMID_SCRIPTSPACE EE_PARA_ASIANCJKSPACING -#define ITEMID_ADJUST EE_PARA_JUST -#define ITEMID_LINESPACING EE_PARA_SBL -#define ITEMID_WIDOWS 0 -#define ITEMID_ORPHANS 0 -#define ITEMID_HYPHENZONE 0 +#define ITEMID_SCRIPTSPACE EE_PARA_ASIANCJKSPACING +#define ITEMID_ADJUST EE_PARA_JUST +#define ITEMID_LINESPACING EE_PARA_SBL +#define ITEMID_WIDOWS 0 +#define ITEMID_ORPHANS 0 +#define ITEMID_HYPHENZONE 0 -#define ITEMID_TABSTOP EE_PARA_TABS +#define ITEMID_TABSTOP EE_PARA_TABS -#define ITEMID_PAPERBIN 0 -#define ITEMID_LRSPACE EE_PARA_LRSPACE -#define ITEMID_ULSPACE EE_PARA_ULSPACE +#define ITEMID_PAPERBIN 0 +#define ITEMID_LRSPACE EE_PARA_LRSPACE +#define ITEMID_ULSPACE EE_PARA_ULSPACE #define ITEMID_FRAMEDIR EE_PARA_WRITINGDIR -#define ITEMID_PRINT 0 -#define ITEMID_OPAQUE 0 -#define ITEMID_PROTECT 0 -#define ITEMID_BACKGROUND 0 -#define ITEMID_SHADOW 0 -#define ITEMID_MACRO 0 -#define ITEMID_BOX 0 -#define ITEMID_BOXINFO 0 -#define ITEMID_BRUSH 0 +#define ITEMID_PRINT 0 +#define ITEMID_OPAQUE 0 +#define ITEMID_PROTECT 0 +#define ITEMID_BACKGROUND 0 +#define ITEMID_SHADOW 0 +#define ITEMID_MACRO 0 +#define ITEMID_BOX 0 +#define ITEMID_BOXINFO 0 +#define ITEMID_BRUSH 0 -#define ITEMID_FIELD EE_FEATURE_FIELD +#define ITEMID_FIELD EE_FEATURE_FIELD -#define ITEMID_SEARCH 0 +#define ITEMID_SEARCH 0 #endif //_EEITEMID_HXX diff --git a/editeng/inc/editeng/eerdll.hxx b/editeng/inc/editeng/eerdll.hxx index f584a158ec3e..f942c7d6fc84 100644 --- a/editeng/inc/editeng/eerdll.hxx +++ b/editeng/inc/editeng/eerdll.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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: class EditDLL { - ResMgr* pResMgr; - GlobalEditData* pGlobalData; + ResMgr* pResMgr; + GlobalEditData* pGlobalData; public: EditDLL(); ~EditDLL(); - ResMgr* GetResMgr() const { return pResMgr; } - GlobalEditData* GetGlobalData() const { return pGlobalData; } + ResMgr* GetResMgr() const { return pResMgr; } + GlobalEditData* GetGlobalData() const { return pGlobalData; } static EditDLL* Get(); }; diff --git a/editeng/inc/editeng/emphitem.hxx b/editeng/inc/editeng/emphitem.hxx index e3c2c3608b7c..2715f5057e03 100644 --- a/editeng/inc/editeng/emphitem.hxx +++ b/editeng/inc/editeng/emphitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,14 +62,14 @@ public: String &rText, const IntlWrapper * = 0 ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; - virtual USHORT GetVersion( USHORT nFileVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Create(SvStream &, USHORT) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; + virtual USHORT GetVersion( USHORT nFileVersion ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); inline SvxEmphasisMarkItem& operator=(const SvxEmphasisMarkItem& rItem ) @@ -79,9 +79,9 @@ public: } // enum cast - FontEmphasisMark GetEmphasisMark() const + FontEmphasisMark GetEmphasisMark() const { return (FontEmphasisMark)GetValue(); } - void SetEmphasisMark( FontEmphasisMark eNew ) + void SetEmphasisMark( FontEmphasisMark eNew ) { SetValue( (USHORT)eNew ); } }; diff --git a/editeng/inc/editeng/escpitem.hxx b/editeng/inc/editeng/escpitem.hxx index 8bc84d9dda8b..f37f763b741a 100644 --- a/editeng/inc/editeng/escpitem.hxx +++ b/editeng/inc/editeng/escpitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,13 +42,13 @@ namespace rtl // class SvxEscapementItem ----------------------------------------------- -#define DFLT_ESC_SUPER 33 // 1/3 -#define DFLT_ESC_SUB -33 // auch 1/3 fr"uher 8/100 -#define DFLT_ESC_PROP 58 -#define DFLT_ESC_AUTO_SUPER 101 +#define DFLT_ESC_SUPER 33 // 1/3 +#define DFLT_ESC_SUB -33 // auch 1/3 fr"uher 8/100 +#define DFLT_ESC_PROP 58 +#define DFLT_ESC_AUTO_SUPER 101 #define DFLT_ESC_AUTO_SUB -101 -/* [Beschreibung] +/* [Beschreibung] Dieses Item beschreibt die Schrift-Position. */ @@ -67,18 +67,18 @@ public: const USHORT nId ); // "pure virtual Methoden" vom SfxPoolItem - virtual int operator==( const SfxPoolItem& ) const; + virtual int operator==( const SfxPoolItem& ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Create(SvStream &, USHORT) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; inline void SetEscapement( const SvxEscapement eNew ) { @@ -105,10 +105,10 @@ public: return *this; } - virtual USHORT GetValueCount() const; - virtual String GetValueTextByPos( USHORT nPos ) const; - virtual USHORT GetEnumValue() const; - virtual void SetEnumValue( USHORT nNewVal ); + virtual USHORT GetValueCount() const; + virtual String GetValueTextByPos( USHORT nPos ) const; + virtual USHORT GetEnumValue() const; + virtual void SetEnumValue( USHORT nNewVal ); }; #endif diff --git a/editeng/inc/editeng/fhgtitem.hxx b/editeng/inc/editeng/fhgtitem.hxx index dc776e45c271..e4305a6ed1b1 100644 --- a/editeng/inc/editeng/fhgtitem.hxx +++ b/editeng/inc/editeng/fhgtitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,19 +43,19 @@ namespace rtl // Achtung: Twips-Werte -/* [Beschreibung] +/* [Beschreibung] Dieses Item beschreibt die Font-Hoehe. */ -#define FONTHEIGHT_16_VERSION ((USHORT)0x0001) -#define FONTHEIGHT_UNIT_VERSION ((USHORT)0x0002) +#define FONTHEIGHT_16_VERSION ((USHORT)0x0001) +#define FONTHEIGHT_UNIT_VERSION ((USHORT)0x0002) class EDITENG_DLLPUBLIC SvxFontHeightItem : public SfxPoolItem { - UINT32 nHeight; - USHORT nProp; // default 100% - SfxMapUnit ePropUnit; // Percent, Twip, ... + UINT32 nHeight; + USHORT nProp; // default 100% + SfxMapUnit ePropUnit; // Percent, Twip, ... public: TYPEINFO(); @@ -63,21 +63,21 @@ public: const USHORT nId ); // "pure virtual Methoden" vom SfxPoolItem - virtual int operator==( const SfxPoolItem& ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual int operator==( const SfxPoolItem& ) const; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; - virtual USHORT GetVersion( USHORT nItemVersion) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; + virtual USHORT GetVersion( USHORT nItemVersion) const; virtual bool ScaleMetrics( long nMult, long nDiv ); - virtual bool HasMetrics() const; + virtual bool HasMetrics() const; inline SvxFontHeightItem& operator=(const SvxFontHeightItem& rSize) { @@ -110,7 +110,7 @@ public: USHORT GetProp() const { return nProp; } - SfxMapUnit GetPropUnit() const { return ePropUnit; } // Percent, Twip, ... + SfxMapUnit GetPropUnit() const { return ePropUnit; } // Percent, Twip, ... }; #endif diff --git a/editeng/inc/editeng/flditem.hxx b/editeng/inc/editeng/flditem.hxx index 157d901ec0b7..6a680b070b1d 100644 --- a/editeng/inc/editeng/flditem.hxx +++ b/editeng/inc/editeng/flditem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,10 +48,10 @@ public: SV_DECL_PERSIST1( SvxFieldData, SvPersistBase, 1 ) SvxFieldData(); - virtual ~SvxFieldData(); + virtual ~SvxFieldData(); - virtual SvxFieldData* Clone() const; - virtual int operator==( const SvxFieldData& ) const; + virtual SvxFieldData* Clone() const; + virtual int operator==( const SvxFieldData& ) const; virtual MetaAction* createBeginComment() const; virtual MetaAction* createEndComment() const; @@ -67,7 +67,7 @@ Das Feld selbst wird durch eine Ableitung von SvxFieldData bestimmt. (RTTI) class EDITENG_DLLPUBLIC SvxFieldItem : public SfxPoolItem { private: - SvxFieldData* pField; + SvxFieldData* pField; EDITENG_DLLPRIVATE SvxFieldItem( SvxFieldData* pField, const USHORT nId ); @@ -78,54 +78,54 @@ public: SvxFieldItem( const SvxFieldItem& rItem ); ~SvxFieldItem(); - virtual int operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream&, USHORT nVer ) const; - virtual SvStream& Store( SvStream& , USHORT nItemVersion ) const; + virtual int operator==( const SfxPoolItem& ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Create( SvStream&, USHORT nVer ) const; + virtual SvStream& Store( SvStream& , USHORT nItemVersion ) const; - const SvxFieldData* GetField() const { return pField; } - static SvClassManager& GetClassManager(); + const SvxFieldData* GetField() const { return pField; } + static SvClassManager& GetClassManager(); }; // ================================================================= // Es folgen die Ableitungen von SvxFieldData... // ================================================================= -#define SVX_DATEFIELD 2 -#define SVX_URLFIELD 3 +#define SVX_DATEFIELD 2 +#define SVX_URLFIELD 3 -#define SVX_PAGEFIELD 100 // Ex-Calc-Felder -#define SVX_PAGESFIELD 101 -#define SVX_TIMEFIELD 102 -#define SVX_FILEFIELD 103 -#define SVX_TABLEFIELD 104 -#define SVX_EXT_TIMEFIELD 105 -#define SVX_EXT_FILEFIELD 106 -#define SVX_AUTHORFIELD 107 -#define SVX_HEADERFIELD 108 -#define SVX_FOOTERFIELD 109 -#define SVX_DATEFIMEFIELD 110 +#define SVX_PAGEFIELD 100 // Ex-Calc-Felder +#define SVX_PAGESFIELD 101 +#define SVX_TIMEFIELD 102 +#define SVX_FILEFIELD 103 +#define SVX_TABLEFIELD 104 +#define SVX_EXT_TIMEFIELD 105 +#define SVX_EXT_FILEFIELD 106 +#define SVX_AUTHORFIELD 107 +#define SVX_HEADERFIELD 108 +#define SVX_FOOTERFIELD 109 +#define SVX_DATEFIMEFIELD 110 -#define SVX_USERFIELD 200 // Ab hier eigene Felder, nicht im SVX +#define SVX_USERFIELD 200 // Ab hier eigene Felder, nicht im SVX enum SvxDateType { SVXDATETYPE_FIX, SVXDATETYPE_VAR }; -enum SvxDateFormat { SVXDATEFORMAT_APPDEFAULT, // Wie in App eingestellt - SVXDATEFORMAT_SYSTEM, // Wie im System eingestellt +enum SvxDateFormat { SVXDATEFORMAT_APPDEFAULT, // Wie in App eingestellt + SVXDATEFORMAT_SYSTEM, // Wie im System eingestellt SVXDATEFORMAT_STDSMALL, SVXDATEFORMAT_STDBIG, - SVXDATEFORMAT_A, // 13.02.96 - SVXDATEFORMAT_B, // 13.02.1996 - SVXDATEFORMAT_C, // 13.Feb 1996 - SVXDATEFORMAT_D, // 13.Februar 1996 - SVXDATEFORMAT_E, // Die, 13.Februar 1996 - SVXDATEFORMAT_F // Dienstag, 13.Februar 1996 + SVXDATEFORMAT_A, // 13.02.96 + SVXDATEFORMAT_B, // 13.02.1996 + SVXDATEFORMAT_C, // 13.Feb 1996 + SVXDATEFORMAT_D, // 13.Februar 1996 + SVXDATEFORMAT_E, // Die, 13.Februar 1996 + SVXDATEFORMAT_F // Dienstag, 13.Februar 1996 }; class EDITENG_DLLPUBLIC SvxDateField : public SvxFieldData { - sal_uInt32 nFixDate; - SvxDateType eType; - SvxDateFormat eFormat; + sal_uInt32 nFixDate; + SvxDateType eType; + SvxDateFormat eFormat; public: SV_DECL_PERSIST1( SvxDateField, SvxFieldData, SVX_DATEFIELD ) @@ -135,42 +135,42 @@ public: SvxDateType eType = SVXDATETYPE_VAR, SvxDateFormat eFormat = SVXDATEFORMAT_STDSMALL ); - sal_uInt32 GetFixDate() const { return nFixDate; } - void SetFixDate( const Date& rDate ) { nFixDate = rDate.GetDate(); } + sal_uInt32 GetFixDate() const { return nFixDate; } + void SetFixDate( const Date& rDate ) { nFixDate = rDate.GetDate(); } - SvxDateType GetType() const { return eType; } - void SetType( SvxDateType eTp ) { eType = eTp; } + SvxDateType GetType() const { return eType; } + void SetType( SvxDateType eTp ) { eType = eTp; } - SvxDateFormat GetFormat() const { return eFormat; } - void SetFormat( SvxDateFormat eFmt ) { eFormat = eFmt; } + SvxDateFormat GetFormat() const { return eFormat; } + void SetFormat( SvxDateFormat eFmt ) { eFormat = eFmt; } // deprecated, to be removed - String GetFormatted( LanguageType eLanguage, LanguageType eFormat ) const; + String GetFormatted( LanguageType eLanguage, LanguageType eFormat ) const; // use this instead // If eLanguage==LANGUAGE_DONTKNOW the language/country // used in number formatter initialization is taken. String GetFormatted( SvNumberFormatter& rFormatter, LanguageType eLanguage ) const; - static String GetFormatted( Date& rDate, SvxDateFormat eFormat, SvNumberFormatter& rFormatter, LanguageType eLanguage ); + static String GetFormatted( Date& rDate, SvxDateFormat eFormat, SvNumberFormatter& rFormatter, LanguageType eLanguage ); - virtual SvxFieldData* Clone() const; - virtual int operator==( const SvxFieldData& ) const; + virtual SvxFieldData* Clone() const; + virtual int operator==( const SvxFieldData& ) const; virtual MetaAction* createBeginComment() const; }; -enum SvxURLFormat { SVXURLFORMAT_APPDEFAULT, // Wie in App eingestellt - SVXURLFORMAT_URL, // URL darstellen - SVXURLFORMAT_REPR // Repraesentation darstellen +enum SvxURLFormat { SVXURLFORMAT_APPDEFAULT, // Wie in App eingestellt + SVXURLFORMAT_URL, // URL darstellen + SVXURLFORMAT_REPR // Repraesentation darstellen }; class EDITENG_DLLPUBLIC SvxURLField : public SvxFieldData { private: - SvxURLFormat eFormat; - XubString aURL; // URL-Adresse - XubString aRepresentation; // Was wird dargestellt - XubString aTargetFrame; // In welchem Frame + SvxURLFormat eFormat; + XubString aURL; // URL-Adresse + XubString aRepresentation; // Was wird dargestellt + XubString aTargetFrame; // In welchem Frame public: SV_DECL_PERSIST1( SvxURLField, SvxFieldData, SVX_URLFIELD ) @@ -178,20 +178,20 @@ public: SvxURLField(); SvxURLField( const XubString& rURL, const XubString& rRepres, SvxURLFormat eFmt = SVXURLFORMAT_URL ); - const XubString& GetURL() const { return aURL; } - void SetURL( const XubString& rURL ) { aURL = rURL; } + const XubString& GetURL() const { return aURL; } + void SetURL( const XubString& rURL ) { aURL = rURL; } - const XubString& GetRepresentation() const { return aRepresentation; } - void SetRepresentation( const XubString& rRep ) { aRepresentation= rRep; } + const XubString& GetRepresentation() const { return aRepresentation; } + void SetRepresentation( const XubString& rRep ) { aRepresentation= rRep; } - const XubString& GetTargetFrame() const { return aTargetFrame; } - void SetTargetFrame( const XubString& rFrm ) { aTargetFrame = rFrm; } + const XubString& GetTargetFrame() const { return aTargetFrame; } + void SetTargetFrame( const XubString& rFrm ) { aTargetFrame = rFrm; } - SvxURLFormat GetFormat() const { return eFormat; } - void SetFormat( SvxURLFormat eFmt ) { eFormat = eFmt; } + SvxURLFormat GetFormat() const { return eFormat; } + void SetFormat( SvxURLFormat eFmt ) { eFormat = eFmt; } - virtual SvxFieldData* Clone() const; - virtual int operator==( const SvxFieldData& ) const; + virtual SvxFieldData* Clone() const; + virtual int operator==( const SvxFieldData& ) const; virtual MetaAction* createBeginComment() const; }; @@ -201,8 +201,8 @@ class EDITENG_DLLPUBLIC SvxPageField : public SvxFieldData public: SV_DECL_PERSIST1( SvxPageField, SvxFieldData, SVX_PAGEFIELD ) SvxPageField() {} - virtual SvxFieldData* Clone() const; - virtual int operator==( const SvxFieldData& ) const; + virtual SvxFieldData* Clone() const; + virtual int operator==( const SvxFieldData& ) const; virtual MetaAction* createBeginComment() const; }; @@ -212,8 +212,8 @@ class EDITENG_DLLPUBLIC SvxPagesField : public SvxFieldData public: SV_DECL_PERSIST1( SvxPagesField, SvxFieldData, SVX_PAGESFIELD ) SvxPagesField() {} - virtual SvxFieldData* Clone() const; - virtual int operator==( const SvxFieldData& ) const; + virtual SvxFieldData* Clone() const; + virtual int operator==( const SvxFieldData& ) const; }; class EDITENG_DLLPUBLIC SvxTimeField : public SvxFieldData @@ -221,8 +221,8 @@ class EDITENG_DLLPUBLIC SvxTimeField : public SvxFieldData public: SV_DECL_PERSIST1( SvxTimeField, SvxFieldData, SVX_TIMEFIELD ) SvxTimeField() {} - virtual SvxFieldData* Clone() const; - virtual int operator==( const SvxFieldData& ) const; + virtual SvxFieldData* Clone() const; + virtual int operator==( const SvxFieldData& ) const; virtual MetaAction* createBeginComment() const; }; @@ -232,8 +232,8 @@ class EDITENG_DLLPUBLIC SvxFileField : public SvxFieldData public: SV_DECL_PERSIST1( SvxFileField, SvxFieldData, SVX_FILEFIELD ) SvxFileField() {} - virtual SvxFieldData* Clone() const; - virtual int operator==( const SvxFieldData& ) const; + virtual SvxFieldData* Clone() const; + virtual int operator==( const SvxFieldData& ) const; }; class EDITENG_DLLPUBLIC SvxTableField : public SvxFieldData @@ -241,32 +241,32 @@ class EDITENG_DLLPUBLIC SvxTableField : public SvxFieldData public: SV_DECL_PERSIST1( SvxTableField, SvxFieldData, SVX_TABLEFIELD ) SvxTableField() {} - virtual SvxFieldData* Clone() const; - virtual int operator==( const SvxFieldData& ) const; + virtual SvxFieldData* Clone() const; + virtual int operator==( const SvxFieldData& ) const; }; enum SvxTimeType { SVXTIMETYPE_FIX, SVXTIMETYPE_VAR }; -enum SvxTimeFormat { SVXTIMEFORMAT_APPDEFAULT, // Wie in App eingestellt - SVXTIMEFORMAT_SYSTEM, // Wie im System eingestellt +enum SvxTimeFormat { SVXTIMEFORMAT_APPDEFAULT, // Wie in App eingestellt + SVXTIMEFORMAT_SYSTEM, // Wie im System eingestellt SVXTIMEFORMAT_STANDARD, - SVXTIMEFORMAT_24_HM, // 13:49 - SVXTIMEFORMAT_24_HMS, // 13:49:38 - SVXTIMEFORMAT_24_HMSH, // 13:49:38.78 - SVXTIMEFORMAT_12_HM, // 01:49 - SVXTIMEFORMAT_12_HMS, // 01:49:38 - SVXTIMEFORMAT_12_HMSH, // 01:49:38.78 - SVXTIMEFORMAT_AM_HM, // 01:49 PM - SVXTIMEFORMAT_AM_HMS, // 01:49:38 PM - SVXTIMEFORMAT_AM_HMSH // 01:49:38.78 PM + SVXTIMEFORMAT_24_HM, // 13:49 + SVXTIMEFORMAT_24_HMS, // 13:49:38 + SVXTIMEFORMAT_24_HMSH, // 13:49:38.78 + SVXTIMEFORMAT_12_HM, // 01:49 + SVXTIMEFORMAT_12_HMS, // 01:49:38 + SVXTIMEFORMAT_12_HMSH, // 01:49:38.78 + SVXTIMEFORMAT_AM_HM, // 01:49 PM + SVXTIMEFORMAT_AM_HMS, // 01:49:38 PM + SVXTIMEFORMAT_AM_HMSH // 01:49:38.78 PM }; class EDITENG_DLLPUBLIC SvxExtTimeField : public SvxFieldData { private: - sal_uInt32 nFixTime; - SvxTimeType eType; - SvxTimeFormat eFormat; + sal_uInt32 nFixTime; + SvxTimeType eType; + SvxTimeFormat eFormat; public: SV_DECL_PERSIST1( SvxExtTimeField, SvxFieldData, SVX_EXT_TIMEFIELD ) @@ -275,35 +275,35 @@ public: SvxTimeType eType = SVXTIMETYPE_VAR, SvxTimeFormat eFormat = SVXTIMEFORMAT_STANDARD ); - sal_uInt32 GetFixTime() const { return nFixTime; } - void SetFixTime( const Time& rTime ) { nFixTime = rTime.GetTime(); } + sal_uInt32 GetFixTime() const { return nFixTime; } + void SetFixTime( const Time& rTime ) { nFixTime = rTime.GetTime(); } - SvxTimeType GetType() const { return eType; } - void SetType( SvxTimeType eTp ) { eType = eTp; } + SvxTimeType GetType() const { return eType; } + void SetType( SvxTimeType eTp ) { eType = eTp; } - SvxTimeFormat GetFormat() const { return eFormat; } - void SetFormat( SvxTimeFormat eFmt ) { eFormat = eFmt; } + SvxTimeFormat GetFormat() const { return eFormat; } + void SetFormat( SvxTimeFormat eFmt ) { eFormat = eFmt; } // deprecated, to be removed - XubString GetFormatted( LanguageType eLanguage, LanguageType eFormat ) const; + XubString GetFormatted( LanguageType eLanguage, LanguageType eFormat ) const; // use this instead // If eLanguage==LANGUAGE_DONTKNOW the language/country // used in number formatter initialization is taken. String GetFormatted( SvNumberFormatter& rFormatter, LanguageType eLanguage ) const; static String GetFormatted( Time& rTime, SvxTimeFormat eFormat, SvNumberFormatter& rFormatter, LanguageType eLanguage ); - virtual SvxFieldData* Clone() const; - virtual int operator==( const SvxFieldData& ) const; + virtual SvxFieldData* Clone() const; + virtual int operator==( const SvxFieldData& ) const; virtual MetaAction* createBeginComment() const; }; enum SvxFileType { SVXFILETYPE_FIX, SVXFILETYPE_VAR }; -enum SvxFileFormat { SVXFILEFORMAT_NAME_EXT, // Dateiname mit Extension - SVXFILEFORMAT_FULLPATH, // vollst„ndiger Pfad - SVXFILEFORMAT_PATH, // nur Pfad - SVXFILEFORMAT_NAME // nur Dateiname +enum SvxFileFormat { SVXFILEFORMAT_NAME_EXT, // Dateiname mit Extension + SVXFILEFORMAT_FULLPATH, // vollst„ndiger Pfad + SVXFILEFORMAT_PATH, // nur Pfad + SVXFILEFORMAT_NAME // nur Dateiname }; @@ -311,9 +311,9 @@ enum SvxFileFormat { SVXFILEFORMAT_NAME_EXT, // Dateiname mit Extension class EDITENG_DLLPUBLIC SvxExtFileField : public SvxFieldData { private: - XubString aFile; - SvxFileType eType; - SvxFileFormat eFormat; + XubString aFile; + SvxFileType eType; + SvxFileFormat eFormat; public: SV_DECL_PERSIST1( SvxExtFileField, SvxFieldData, SVX_EXT_FILEFIELD ) @@ -322,37 +322,37 @@ public: SvxFileType eType = SVXFILETYPE_VAR, SvxFileFormat eFormat = SVXFILEFORMAT_FULLPATH ); - String GetFile() const { return aFile; } - void SetFile( const XubString& rString ) { aFile = rString; } + String GetFile() const { return aFile; } + void SetFile( const XubString& rString ) { aFile = rString; } - SvxFileType GetType() const { return eType; } - void SetType( SvxFileType eTp ) { eType = eTp; } + SvxFileType GetType() const { return eType; } + void SetType( SvxFileType eTp ) { eType = eTp; } - SvxFileFormat GetFormat() const { return eFormat; } - void SetFormat( SvxFileFormat eFmt ) { eFormat = eFmt; } + SvxFileFormat GetFormat() const { return eFormat; } + void SetFormat( SvxFileFormat eFmt ) { eFormat = eFmt; } - XubString GetFormatted() const; + XubString GetFormatted() const; - virtual SvxFieldData* Clone() const; - virtual int operator==( const SvxFieldData& ) const; + virtual SvxFieldData* Clone() const; + virtual int operator==( const SvxFieldData& ) const; }; enum SvxAuthorType { SVXAUTHORTYPE_FIX, SVXAUTHORTYPE_VAR }; -enum SvxAuthorFormat { SVXAUTHORFORMAT_FULLNAME, // vollst„ndiger Name - SVXAUTHORFORMAT_NAME, // nur Nachname - SVXAUTHORFORMAT_FIRSTNAME, // nur Vorname - SVXAUTHORFORMAT_SHORTNAME // Initialen +enum SvxAuthorFormat { SVXAUTHORFORMAT_FULLNAME, // vollst„ndiger Name + SVXAUTHORFORMAT_NAME, // nur Nachname + SVXAUTHORFORMAT_FIRSTNAME, // nur Vorname + SVXAUTHORFORMAT_SHORTNAME // Initialen }; class EDITENG_DLLPUBLIC SvxAuthorField : public SvxFieldData { private: - XubString aName; - XubString aFirstName; - XubString aShortName; - SvxAuthorType eType; - SvxAuthorFormat eFormat; + XubString aName; + XubString aFirstName; + XubString aShortName; + SvxAuthorType eType; + SvxAuthorFormat eFormat; public: SV_DECL_PERSIST1( SvxAuthorField, SvxFieldData, SVX_AUTHORFIELD ) @@ -364,25 +364,25 @@ public: SvxAuthorType eType = SVXAUTHORTYPE_VAR, SvxAuthorFormat eFormat = SVXAUTHORFORMAT_FULLNAME ); - XubString GetName() const { return aName; } - void SetName( const XubString& rString ) { aName = rString; } + XubString GetName() const { return aName; } + void SetName( const XubString& rString ) { aName = rString; } - XubString GetFirstName() const { return aFirstName; } - void SetFirstName( const XubString& rString ) { aFirstName = rString; } + XubString GetFirstName() const { return aFirstName; } + void SetFirstName( const XubString& rString ) { aFirstName = rString; } - XubString GetShortName() const { return aShortName; } - void SetShortName( const XubString& rString ) { aShortName = rString; } + XubString GetShortName() const { return aShortName; } + void SetShortName( const XubString& rString ) { aShortName = rString; } - SvxAuthorType GetType() const { return eType; } - void SetType( SvxAuthorType eTp ) { eType = eTp; } + SvxAuthorType GetType() const { return eType; } + void SetType( SvxAuthorType eTp ) { eType = eTp; } - SvxAuthorFormat GetFormat() const { return eFormat; } - void SetFormat( SvxAuthorFormat eFmt ) { eFormat = eFmt; } + SvxAuthorFormat GetFormat() const { return eFormat; } + void SetFormat( SvxAuthorFormat eFmt ) { eFormat = eFmt; } - XubString GetFormatted() const; + XubString GetFormatted() const; - virtual SvxFieldData* Clone() const; - virtual int operator==( const SvxFieldData& ) const; + virtual SvxFieldData* Clone() const; + virtual int operator==( const SvxFieldData& ) const; }; /** this field is used as a placeholder for a header&footer in impress. The actual @@ -392,8 +392,8 @@ class EDITENG_DLLPUBLIC SvxHeaderField : public SvxFieldData public: SV_DECL_PERSIST1( SvxHeaderField, SvxFieldData, SVX_HEADERFIELD ) SvxHeaderField() {} - virtual SvxFieldData* Clone() const; - virtual int operator==( const SvxFieldData& ) const; + virtual SvxFieldData* Clone() const; + virtual int operator==( const SvxFieldData& ) const; }; /** this field is used as a placeholder for a header&footer in impress. The actual @@ -403,8 +403,8 @@ class EDITENG_DLLPUBLIC SvxFooterField : public SvxFieldData public: SV_DECL_PERSIST1( SvxFooterField, SvxFieldData, SVX_FOOTERFIELD ) SvxFooterField() {} - virtual SvxFieldData* Clone() const; - virtual int operator==( const SvxFieldData& ) const; + virtual SvxFieldData* Clone() const; + virtual int operator==( const SvxFieldData& ) const; }; /** this field is used as a placeholder for a header&footer in impress. The actual @@ -417,8 +417,8 @@ public: static String GetFormatted( Date& rDate, Time& rTime, int eFormat, SvNumberFormatter& rFormatter, LanguageType eLanguage ); - virtual SvxFieldData* Clone() const; - virtual int operator==( const SvxFieldData& ) const; + virtual SvxFieldData* Clone() const; + virtual int operator==( const SvxFieldData& ) const; }; diff --git a/editeng/inc/editeng/flstitem.hxx b/editeng/inc/editeng/flstitem.hxx index d2303f646986..b2d35dd0400b 100644 --- a/editeng/inc/editeng/flstitem.hxx +++ b/editeng/inc/editeng/flstitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,17 +59,17 @@ public: const USHORT nId ); SvxFontListItem( const SvxFontListItem& rItem ); - virtual int operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual int operator==( const SfxPoolItem& ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - const FontList* GetFontList() const { return pFontList; } + const FontList* GetFontList() const { return pFontList; } }; diff --git a/editeng/inc/editeng/fontitem.hxx b/editeng/inc/editeng/fontitem.hxx index c192772266f6..c0ac85b1dac7 100644 --- a/editeng/inc/editeng/fontitem.hxx +++ b/editeng/inc/editeng/fontitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,12 +69,12 @@ public: const USHORT nId ); // "pure virtual Methoden" vom SfxPoolItem - virtual int operator==( const SfxPoolItem& ) const; + virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual SfxPoolItem* Create(SvStream &, USHORT) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/editeng/inc/editeng/forbiddencharacterstable.hxx b/editeng/inc/editeng/forbiddencharacterstable.hxx index bd42ead29838..477274f98b8a 100644 --- a/editeng/inc/editeng/forbiddencharacterstable.hxx +++ b/editeng/inc/editeng/forbiddencharacterstable.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,8 +61,8 @@ public: ~SvxForbiddenCharactersTable(); const com::sun::star::i18n::ForbiddenCharacters* GetForbiddenCharacters( USHORT nLanuage, BOOL bGetDefault ) const; - void SetForbiddenCharacters( USHORT nLanuage , const com::sun::star::i18n::ForbiddenCharacters& ); - void ClearForbiddenCharacters( USHORT nLanuage ); + void SetForbiddenCharacters( USHORT nLanuage , const com::sun::star::i18n::ForbiddenCharacters& ); + void ClearForbiddenCharacters( USHORT nLanuage ); }; #endif // _FORBIDDENCHARACTERSTABLE_HXX diff --git a/editeng/inc/editeng/forbiddenruleitem.hxx b/editeng/inc/editeng/forbiddenruleitem.hxx index 37c3561749af..f1fb7fd37b38 100644 --- a/editeng/inc/editeng/forbiddenruleitem.hxx +++ b/editeng/inc/editeng/forbiddenruleitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,9 +48,9 @@ public: SvxForbiddenRuleItem( sal_Bool bOn /*= sal_False*/, const sal_uInt16 nId ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual USHORT GetVersion( USHORT nFileVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Create(SvStream &, USHORT) const; + virtual USHORT GetVersion( USHORT nFileVersion ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/editeng/inc/editeng/frmdir.hxx b/editeng/inc/editeng/frmdir.hxx index ec5d5b7e0b10..a2006b6be9dc 100644 --- a/editeng/inc/editeng/frmdir.hxx +++ b/editeng/inc/editeng/frmdir.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/editeng/inc/editeng/frmdiritem.hxx b/editeng/inc/editeng/frmdiritem.hxx index f763174a001b..1420ee4b6a7d 100644 --- a/editeng/inc/editeng/frmdiritem.hxx +++ b/editeng/inc/editeng/frmdiritem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,11 +53,11 @@ public: USHORT nWhich ); virtual ~SvxFrameDirectionItem(); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream & rStrm, USHORT nIVer) const; - virtual USHORT GetVersion( USHORT nFileVersion ) const; - virtual int operator==( const SfxPoolItem& ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Create(SvStream &, USHORT) const; + virtual SvStream& Store(SvStream & rStrm, USHORT nIVer) const; + virtual USHORT GetVersion( USHORT nFileVersion ) const; + virtual int operator==( const SfxPoolItem& ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/editeng/inc/editeng/fwdtitem.hxx b/editeng/inc/editeng/fwdtitem.hxx index 3fb01828394f..cbf4a7071acf 100644 --- a/editeng/inc/editeng/fwdtitem.hxx +++ b/editeng/inc/editeng/fwdtitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,15 +37,15 @@ // class SvxFontWidthItem ----------------------------------------------- -/* [Beschreibung] +/* [Beschreibung] Dieses Item beschreibt die Font-Breite. */ class SvxFontWidthItem : public SfxPoolItem { - UINT16 nWidth; // 0 = default - USHORT nProp; // default 100% + UINT16 nWidth; // 0 = default + USHORT nProp; // default 100% public: TYPEINFO(); @@ -54,20 +54,20 @@ public: const USHORT nId ); // "pure virtual Methoden" vom SfxPoolItem - virtual int operator==( const SfxPoolItem& ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual int operator==( const SfxPoolItem& ) const; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; virtual bool ScaleMetrics( long nMult, long nDiv ); - virtual bool HasMetrics() const; + virtual bool HasMetrics() const; inline SvxFontWidthItem& operator=(const SvxFontWidthItem& rItem ) { diff --git a/editeng/inc/editeng/hangulhanja.hxx b/editeng/inc/editeng/hangulhanja.hxx index 69c3ae8c6496..15a80b5e8c41 100644 --- a/editeng/inc/editeng/hangulhanja.hxx +++ b/editeng/inc/editeng/hangulhanja.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,13 +65,13 @@ namespace editeng public: enum ReplacementAction { - eExchange, // simply exchange one text with another - eReplacementBracketed, // keep the original, and put the replacement in brackets after it - eOriginalBracketed, // replace the original text, but put it in brackeds after the replacement - eReplacementAbove, // keep the original, and put the replacement text as ruby text above it - eOriginalAbove, // replace the original text, but put it as ruby text above it - eReplacementBelow, // keep the original, and put the replacement text as ruby text below it - eOriginalBelow // replace the original text, but put it as ruby text below it + eExchange, // simply exchange one text with another + eReplacementBracketed, // keep the original, and put the replacement in brackets after it + eOriginalBracketed, // replace the original text, but put it in brackeds after the replacement + eReplacementAbove, // keep the original, and put the replacement text as ruby text above it + eOriginalAbove, // replace the original text, but put it as ruby text above it + eReplacementBelow, // keep the original, and put the replacement text as ruby text below it + eOriginalBelow // replace the original text, but put it as ruby text below it }; enum ConversionType // does not specify direction... @@ -80,11 +80,11 @@ namespace editeng eConvSimplifiedTraditional // Chinese simplified / Chinese traditional conversion }; - // Note: conversion direction for eConvSimplifiedTraditional is + // Note: conversion direction for eConvSimplifiedTraditional is // specified by source language. // This one is for Hangul/Hanja where source and target language // are the same. - enum ConversionDirection + enum ConversionDirection { eHangulToHanja, eHanjaToHangul @@ -102,12 +102,12 @@ namespace editeng }; private: - ::std::auto_ptr< HangulHanjaConversion_Impl > m_pImpl; + ::std::auto_ptr< HangulHanjaConversion_Impl > m_pImpl; // used to set initial values of m_pImpl object from saved ones - static sal_Bool m_bUseSavedValues; // defines if the followng two values should be used for initialization - static sal_Bool m_bTryBothDirectionsSave; - static ConversionDirection m_ePrimaryConversionDirectionSave; + static sal_Bool m_bUseSavedValues; // defines if the followng two values should be used for initialization + static sal_Bool m_bTryBothDirectionsSave; + static ConversionDirection m_ePrimaryConversionDirectionSave; // Forbidden and not implemented. HangulHanjaConversion (const HangulHanjaConversion &); @@ -146,7 +146,7 @@ namespace editeng // initial conversion direction for the next incarnation. // (A hack used to transport a state information from // one incarnation to the next. Used in Writers text conversion...) - static void SetUseSavedConversionDirectionState( sal_Bool bVal ); + static void SetUseSavedConversionDirectionState( sal_Bool bVal ); static sal_Bool IsUseSavedConversionDirectionState(); protected: @@ -162,8 +162,8 @@ namespace editeng too look for even if the 'source' language usually is only 'simplified' or 'traditional'.) */ - virtual void GetNextPortion( - ::rtl::OUString& /* [out] */ _rNextPortion, + virtual void GetNextPortion( + ::rtl::OUString& /* [out] */ _rNextPortion, LanguageType& /* [out] */ _rLangOfPortion, sal_Bool /* [in] */ _bAllowImplicitChangesForNotConvertibleText ); @@ -195,7 +195,7 @@ namespace editeng @see GetNextPortion */ - virtual void HandleNewUnit( const sal_Int32 _nUnitStart, const sal_Int32 _nUnitEnd ); + virtual void HandleNewUnit( const sal_Int32 _nUnitStart, const sal_Int32 _nUnitEnd ); /** replaces a text unit within a text portion with a new text @@ -216,7 +216,7 @@ namespace editeng the target language (as given by 'GetTargetLanguage') for example when converting simplified Chinese from/to traditional Chinese the language attribute of the new text has to be changed as well, - **and** the font is to be set to the default (document) font for + **and** the font is to be set to the default (document) font for that language.</p> @param _nUnitStart @@ -239,10 +239,10 @@ namespace editeng An sequence matching the indices (characters) of _rReplaceWith to the indices of the characters in the original text they are replacing. - This is necessary since some portions of the text may get + This is necessary since some portions of the text may get converted in portions of different length than the original. - The sequence will be empty if all conversions in the text are - of equal length. That is if always the character at index i in + The sequence will be empty if all conversions in the text are + of equal length. That is if always the character at index i in _rOffsets is replacing the character at index i in the original text for all valid index values of i. @@ -254,10 +254,10 @@ namespace editeng is specified here. If the language is to be left unchanged this is the 0 pointer. */ - virtual void ReplaceUnit( + virtual void ReplaceUnit( const sal_Int32 _nUnitStart, const sal_Int32 _nUnitEnd, const ::rtl::OUString& _rOrigText, - const ::rtl::OUString& _rReplaceWith, + const ::rtl::OUString& _rReplaceWith, const ::com::sun::star::uno::Sequence< sal_Int32 > &_rOffsets, ReplacementAction _eAction, LanguageType *pNewUnitLanguage @@ -297,7 +297,7 @@ namespace editeng } //............................................................................. -} // namespace svx +} // namespace svx //............................................................................. #endif // SVX_HANGUL_HANJA_CONVERSION_HXX diff --git a/editeng/inc/editeng/hngpnctitem.hxx b/editeng/inc/editeng/hngpnctitem.hxx index a8cd70e1f391..4dcafd2845bc 100644 --- a/editeng/inc/editeng/hngpnctitem.hxx +++ b/editeng/inc/editeng/hngpnctitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,9 +48,9 @@ public: SvxHangingPunctuationItem( sal_Bool bOn /*= sal_False*/, const sal_uInt16 nId ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual USHORT GetVersion( USHORT nFileVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Create(SvStream &, USHORT) const; + virtual USHORT GetVersion( USHORT nFileVersion ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/editeng/inc/editeng/hyznitem.hxx b/editeng/inc/editeng/hyznitem.hxx index ddd16b1b564f..f586b1818e8b 100644 --- a/editeng/inc/editeng/hyznitem.hxx +++ b/editeng/inc/editeng/hyznitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,18 +64,18 @@ public: const USHORT nId ); // "pure virtual Methoden" vom SfxPoolItem - virtual int operator==( const SfxPoolItem& ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual int operator==( const SfxPoolItem& ) const; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Create(SvStream &, USHORT) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; inline void SetHyphen( const BOOL bNew ) { bHyphen = bNew; } inline BOOL IsHyphen() const { return bHyphen; } diff --git a/editeng/inc/editeng/itemtype.hxx b/editeng/inc/editeng/itemtype.hxx index 6371fece9b6b..8dd7edb22042 100644 --- a/editeng/inc/editeng/itemtype.hxx +++ b/editeng/inc/editeng/itemtype.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/editeng/inc/editeng/keepitem.hxx b/editeng/inc/editeng/keepitem.hxx index 0fa4c76eee8e..b98aff4dfc83 100644 --- a/editeng/inc/editeng/keepitem.hxx +++ b/editeng/inc/editeng/keepitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,9 +55,9 @@ public: inline SvxFmtKeepItem& operator=( const SvxFmtKeepItem& rSplit ); // "pure virtual Methoden" vom SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream&, USHORT ) const; - virtual SvStream& Store( SvStream& , USHORT nItemVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Create( SvStream&, USHORT ) const; + virtual SvStream& Store( SvStream& , USHORT nItemVersion ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/editeng/inc/editeng/kernitem.hxx b/editeng/inc/editeng/kernitem.hxx index 2f76c8420b63..d6463784f611 100644 --- a/editeng/inc/editeng/kernitem.hxx +++ b/editeng/inc/editeng/kernitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 rtl // Achtung: Twips-Werte // Twips: 0 = kein Kerning -/* [Beschreibung] +/* [Beschreibung] Dieses Item beschreibt die Schrift-Laufweite. */ @@ -59,9 +59,9 @@ public: // "pure virtual Methoden" vom SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; virtual bool ScaleMetrics( long nMult, long nDiv ); - virtual bool HasMetrics() const; + virtual bool HasMetrics() const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -73,8 +73,8 @@ public: return *this; } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); }; #endif diff --git a/editeng/inc/editeng/langitem.hxx b/editeng/inc/editeng/langitem.hxx index 3c592beb405c..4d4ddf272a65 100644 --- a/editeng/inc/editeng/langitem.hxx +++ b/editeng/inc/editeng/langitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 rtl // class SvxLanguageItem ------------------------------------------------- -/* [Beschreibung] +/* [Beschreibung] Dieses Item beschreibt eine Sprache. */ @@ -63,7 +63,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; virtual USHORT GetValueCount() const; inline SvxLanguageItem& operator=(const SvxLanguageItem& rLang) @@ -73,12 +73,12 @@ public: } // enum cast - LanguageType GetLanguage() const + LanguageType GetLanguage() const { return (LanguageType)GetValue(); } - void SetLanguage( const LanguageType eLang ) + void SetLanguage( const LanguageType eLang ) { SetValue( (USHORT)eLang ); } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); }; #endif diff --git a/editeng/inc/editeng/lcolitem.hxx b/editeng/inc/editeng/lcolitem.hxx index 8af47041a884..00b116f1f08f 100644 --- a/editeng/inc/editeng/lcolitem.hxx +++ b/editeng/inc/editeng/lcolitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/editeng/inc/editeng/lrspitem.hxx b/editeng/inc/editeng/lrspitem.hxx index a94aaa12b480..d0e03995a751 100644 --- a/editeng/inc/editeng/lrspitem.hxx +++ b/editeng/inc/editeng/lrspitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,22 +59,22 @@ SetTxtLeft SetTxtFirst GetLeft GetTxtLeft GetTxtFirst (Was?) 700 -500 200 700 -500 */ -#define LRSPACE_16_VERSION ((USHORT)0x0001) -#define LRSPACE_TXTLEFT_VERSION ((USHORT)0x0002) -#define LRSPACE_AUTOFIRST_VERSION ((USHORT)0x0003) -#define LRSPACE_NEGATIVE_VERSION ((USHORT)0x0004) +#define LRSPACE_16_VERSION ((USHORT)0x0001) +#define LRSPACE_TXTLEFT_VERSION ((USHORT)0x0002) +#define LRSPACE_AUTOFIRST_VERSION ((USHORT)0x0003) +#define LRSPACE_NEGATIVE_VERSION ((USHORT)0x0004) class EDITENG_DLLPUBLIC SvxLRSpaceItem : public SfxPoolItem { - short nFirstLineOfst; // Erstzeileneinzug _immer_ relativ zu nTxtLeft - long nTxtLeft; // wir spendieren einen USHORT - long nLeftMargin; // nLeft oder der neg. Erstzeileneinzug - long nRightMargin; // der unproblematische rechte Rand + short nFirstLineOfst; // Erstzeileneinzug _immer_ relativ zu nTxtLeft + long nTxtLeft; // wir spendieren einen USHORT + long nLeftMargin; // nLeft oder der neg. Erstzeileneinzug + long nRightMargin; // der unproblematische rechte Rand - USHORT nPropFirstLineOfst, nPropLeftMargin, nPropRightMargin; - BOOL bAutoFirst : 1; // Automatische Berechnung der Erstzeileneinzugs + USHORT nPropFirstLineOfst, nPropLeftMargin, nPropRightMargin; + BOOL bAutoFirst : 1; // Automatische Berechnung der Erstzeileneinzugs - void AdjustLeft(); // nLeftMargin und nTxtLeft werden angepasst. + void AdjustLeft(); // nLeftMargin und nTxtLeft werden angepasst. public: TYPEINFO(); @@ -86,22 +86,22 @@ public: inline SvxLRSpaceItem& operator=( const SvxLRSpaceItem &rCpy ); // "pure virtual Methoden" vom SfxPoolItem - virtual int operator==( const SfxPoolItem& ) const; + virtual int operator==( const SfxPoolItem& ) const; virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; - virtual USHORT GetVersion( USHORT nFileVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Create(SvStream &, USHORT) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; + virtual USHORT GetVersion( USHORT nFileVersion ) const; virtual bool ScaleMetrics( long nMult, long nDiv ); - virtual bool HasMetrics() const; + virtual bool HasMetrics() const; // Die "Layout-Schnittstelle": inline void SetLeft ( const long nL, const USHORT nProp = 100 ); diff --git a/editeng/inc/editeng/lspcitem.hxx b/editeng/inc/editeng/lspcitem.hxx index 83f1ce2d999d..edc631f6463b 100644 --- a/editeng/inc/editeng/lspcitem.hxx +++ b/editeng/inc/editeng/lspcitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,18 +70,18 @@ public: SvxLineSpacingItem( USHORT nHeight /*= LINE_SPACE_DEFAULT_HEIGHT*/, const USHORT nId ); // "pure virtual Methoden" vom SfxPoolItem - virtual int operator==( const SfxPoolItem& ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual int operator==( const SfxPoolItem& ) const; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Create(SvStream &, USHORT) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; // Methoden zum Abfragen und Aendern // Interlinespace wird zur Hoehe addiert. @@ -114,10 +114,10 @@ public: inline SvxInterLineSpace &GetInterLineSpaceRule() { return eInterLineSpace; } inline SvxInterLineSpace GetInterLineSpaceRule() const { return eInterLineSpace; } - virtual USHORT GetValueCount() const; - virtual String GetValueTextByPos( USHORT nPos ) const; - virtual USHORT GetEnumValue() const; - virtual void SetEnumValue( USHORT nNewVal ); + virtual USHORT GetValueCount() const; + virtual String GetValueTextByPos( USHORT nPos ) const; + virtual USHORT GetEnumValue() const; + virtual void SetEnumValue( USHORT nNewVal ); }; #endif diff --git a/editeng/inc/editeng/measfld.hxx b/editeng/inc/editeng/measfld.hxx index ab3b0f71f240..174f8388f401 100644 --- a/editeng/inc/editeng/measfld.hxx +++ b/editeng/inc/editeng/measfld.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/editeng/inc/editeng/memberids.hrc b/editeng/inc/editeng/memberids.hrc index dc2aae408b83..0a4ac48f1ce8 100644 --- a/editeng/inc/editeng/memberids.hrc +++ b/editeng/inc/editeng/memberids.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,8 +45,8 @@ //NameOrIndex -#define MID_NAME 16 -#define MID_GRAFURL 32 +#define MID_NAME 16 +#define MID_GRAFURL 32 // SvxPageModelItem #define MID_AUTO 1 @@ -56,7 +56,7 @@ #define MID_STD_TAB 1 //SvxHyphenZoneItem -#define MID_IS_HYPHEN 0 +#define MID_IS_HYPHEN 0 #define MID_HYPHEN_MIN_LEAD 1 #define MID_HYPHEN_MIN_TRAIL 2 #define MID_HYPHEN_MAX_HYPHENS 3 @@ -67,47 +67,47 @@ #define MID_VALIDFLAGS 4 //AdjustItem -#define MID_PARA_ADJUST 0 +#define MID_PARA_ADJUST 0 #define MID_LAST_LINE_ADJUST 1 #define MID_EXPAND_SINGLE 2 //SvxFontItem // Don't use 0 as it used for the whole struct -#define MID_FONT_FAMILY_NAME 1 +#define MID_FONT_FAMILY_NAME 1 #define MID_FONT_STYLE_NAME 2 #define MID_FONT_FAMILY 3 #define MID_FONT_CHAR_SET 4 #define MID_FONT_PITCH 5 // SvxCharReliefItem -#define MID_RELIEF 0 +#define MID_RELIEF 0 //SvxCharRotateItem -#define MID_ROTATE 0 -#define MID_FITTOLINE 1 +#define MID_ROTATE 0 +#define MID_FITTOLINE 1 //SvxExcapementItem -#define MID_ESC 0 +#define MID_ESC 0 #define MID_ESC_HEIGHT 1 #define MID_AUTO_ESC 2 //SvxFontWidthItem -#define MID_FONTWIDTH 0 +#define MID_FONTWIDTH 0 #define MID_FONTWIDTH_PROP 1 //SvxFontHeightItem -#define MID_FONTHEIGHT 1 +#define MID_FONTHEIGHT 1 #define MID_FONTHEIGHT_PROP 2 #define MID_FONTHEIGHT_DIFF 3 //SvxTextLineItem -#define MID_TEXTLINED 0 -#define MID_TL_STYLE 1 -#define MID_TL_COLOR 2 -#define MID_TL_HASCOLOR 3 +#define MID_TEXTLINED 0 +#define MID_TL_STYLE 1 +#define MID_TL_COLOR 2 +#define MID_TL_HASCOLOR 3 //SvxCrossedOutItem -#define MID_CROSSED_OUT 0 +#define MID_CROSSED_OUT 0 #define MID_CROSS_OUT 1 //SvxPostureItem @@ -115,50 +115,50 @@ #define MID_POSTURE 1 //SvxBoolItem -#define MID_BOLD 0 +#define MID_BOLD 0 #define MID_WEIGHT 1 //SvxLanguageItem -#define MID_LANG_INT 0 -#define MID_LANG_LOCALE 1 +#define MID_LANG_INT 0 +#define MID_LANG_LOCALE 1 //SvxEmphasisMarkItem -#define MID_EMPHASIS 0 +#define MID_EMPHASIS 0 //SvxTwoLinesItem -#define MID_TWOLINES 0 -#define MID_START_BRACKET 1 -#define MID_END_BRACKET 2 +#define MID_TWOLINES 0 +#define MID_START_BRACKET 1 +#define MID_END_BRACKET 2 //ULSpaceItem -#define MID_UL_MARGIN 1 -#define MID_UL_REL_MARGIN 2 -#define MID_UP_MARGIN 3 -#define MID_LO_MARGIN 4 -#define MID_UP_REL_MARGIN 5 -#define MID_LO_REL_MARGIN 6 +#define MID_UL_MARGIN 1 +#define MID_UL_REL_MARGIN 2 +#define MID_UP_MARGIN 3 +#define MID_LO_MARGIN 4 +#define MID_UP_REL_MARGIN 5 +#define MID_LO_REL_MARGIN 6 //LRSpaceItem -#define MID_LR_MARGIN 0 -#define MID_LRP_MARGIN 1 -#define MID_LR_REL_MARGIN 2 +#define MID_LR_MARGIN 0 +#define MID_LRP_MARGIN 1 +#define MID_LR_REL_MARGIN 2 #define MID_LRP_REL_MARGIN 3 -#define MID_L_MARGIN 4 -#define MID_R_MARGIN 5 -#define MID_L_REL_MARGIN 6 -#define MID_R_REL_MARGIN 7 -#define MID_FIRST_LINE_INDENT 8 +#define MID_L_MARGIN 4 +#define MID_R_MARGIN 5 +#define MID_L_REL_MARGIN 6 +#define MID_R_REL_MARGIN 7 +#define MID_FIRST_LINE_INDENT 8 #define MID_FIRST_LINE_REL_INDENT 9 -#define MID_FIRST_AUTO 10 -#define MID_TXT_LMARGIN 11 +#define MID_FIRST_AUTO 10 +#define MID_TXT_LMARGIN 11 //ProtectItem -#define MID_PROTECT_CONTENT 0 +#define MID_PROTECT_CONTENT 0 #define MID_PROTECT_SIZE 1 #define MID_PROTECT_POSITION 2 //SvxBoxItem -#define LEFT_BORDER 1 +#define LEFT_BORDER 1 #define RIGHT_BORDER 2 #define TOP_BORDER 3 #define BOTTOM_BORDER 4 @@ -173,28 +173,28 @@ #define MID_BOTTOM_BORDER 13 //BrushItem -#define MID_BACK_COLOR 0 +#define MID_BACK_COLOR 0 #define MID_GRAPHIC_POSITION 1 #define MID_GRAPHIC_LINK 2 #define MID_GRAPHIC 3 #define MID_GRAPHIC_TRANSPARENT 4 -#define MID_GRAPHIC_URL 5 -#define MID_GRAPHIC_FILTER 6 -#define MID_GRAPHIC_REPEAT 7 +#define MID_GRAPHIC_URL 5 +#define MID_GRAPHIC_FILTER 6 +#define MID_GRAPHIC_REPEAT 7 #define MID_GRAPHIC_TRANSPARENCY 8 #define MID_BACK_COLOR_R_G_B 9 #define MID_BACK_COLOR_TRANSPARENCY 10 //SvxFmtBreakItem -#define MID_BREAK_BEFORE 0 -#define MID_BREAK_AFTER 1 +#define MID_BREAK_BEFORE 0 +#define MID_BREAK_AFTER 1 //SvxCaseMapItem -#define MID_CASEMAP_VARIANT 0 -#define MID_CASEMAP_TRANS 1 +#define MID_CASEMAP_VARIANT 0 +#define MID_CASEMAP_TRANS 1 // SvxHorJustifyItem -#define MID_HORJUST_HORJUST 0 -#define MID_HORJUST_ADJUST 1 +#define MID_HORJUST_HORJUST 0 +#define MID_HORJUST_ADJUST 1 #endif diff --git a/editeng/inc/editeng/mutxhelp.hxx b/editeng/inc/editeng/mutxhelp.hxx index 327595fdc5e2..72cff69e3c5a 100644 --- a/editeng/inc/editeng/mutxhelp.hxx +++ b/editeng/inc/editeng/mutxhelp.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/editeng/inc/editeng/nhypitem.hxx b/editeng/inc/editeng/nhypitem.hxx index 6e5849ebee8a..2ffcffccf183 100644 --- a/editeng/inc/editeng/nhypitem.hxx +++ b/editeng/inc/editeng/nhypitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 SvxNoHyphenItem ------------------------------------------------- -/* [Beschreibung] +/* [Beschreibung] PB: ??? */ @@ -51,7 +51,7 @@ public: // "pure virtual Methoden" vom SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/editeng/inc/editeng/nlbkitem.hxx b/editeng/inc/editeng/nlbkitem.hxx index e45384902bc3..f498cf500cb8 100644 --- a/editeng/inc/editeng/nlbkitem.hxx +++ b/editeng/inc/editeng/nlbkitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ // class SvxNoLinebreakItem ---------------------------------------------- -/* [Beschreibung] +/* [Beschreibung] PB: ??? */ @@ -53,7 +53,7 @@ public: // "pure virtual Methoden" vom SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/editeng/inc/editeng/numdef.hxx b/editeng/inc/editeng/numdef.hxx index 092901aa7fbe..4e5b901990d4 100644 --- a/editeng/inc/editeng/numdef.hxx +++ b/editeng/inc/editeng/numdef.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,7 +26,7 @@ * ************************************************************************/ -#define SVX_MAX_NUM 10 // max. moegliche Numerierungsebenen -#define SVX_DEF_BULLET (0xF000 + 149)// Charakter fuer Aufzaehlungen +#define SVX_MAX_NUM 10 // max. moegliche Numerierungsebenen +#define SVX_DEF_BULLET (0xF000 + 149)// Charakter fuer Aufzaehlungen /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/inc/editeng/numitem.hxx b/editeng/inc/editeng/numitem.hxx index e28fdccea552..3b694d07200d 100644 --- a/editeng/inc/editeng/numitem.hxx +++ b/editeng/inc/editeng/numitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,43 +57,43 @@ namespace com{namespace sun{ namespace star{ // ----------------------------------------------------------------------- //Feature-Flags (only USHORT!) -#define NUM_CONTINUOUS 0x0001 // fortlaufende Numerierung moeglich? -#define NUM_CHAR_TEXT_DISTANCE 0x0002 // Abstand Symbol<->Text? -#define NUM_CHAR_STYLE 0x0004 // Zeichenvorlagen? -#define NUM_BULLET_REL_SIZE 0x0008 // rel. Bulletgroesse? -#define NUM_BULLET_COLOR 0x0010 // Bullet color -#define NUM_SYMBOL_ALIGNMENT 0x0040 // alignment soll unter den Optionen angezeigt werden -#define NUM_NO_NUMBERS 0x0080 // Numberierungen sind nicht erlaubt -#define NUM_ENABLE_LINKED_BMP 0x0100 // linked bitmaps are available -#define NUM_ENABLE_EMBEDDED_BMP 0x0200 // embedded bitmaps are available - -#define SVX_NO_NUM 200 // Markierung fuer keine Numerierung +#define NUM_CONTINUOUS 0x0001 // fortlaufende Numerierung moeglich? +#define NUM_CHAR_TEXT_DISTANCE 0x0002 // Abstand Symbol<->Text? +#define NUM_CHAR_STYLE 0x0004 // Zeichenvorlagen? +#define NUM_BULLET_REL_SIZE 0x0008 // rel. Bulletgroesse? +#define NUM_BULLET_COLOR 0x0010 // Bullet color +#define NUM_SYMBOL_ALIGNMENT 0x0040 // alignment soll unter den Optionen angezeigt werden +#define NUM_NO_NUMBERS 0x0080 // Numberierungen sind nicht erlaubt +#define NUM_ENABLE_LINKED_BMP 0x0100 // linked bitmaps are available +#define NUM_ENABLE_EMBEDDED_BMP 0x0200 // embedded bitmaps are available + +#define SVX_NO_NUM 200 // Markierung fuer keine Numerierung #define SVX_NO_NUMLEVEL 0x20 -#define LINK_TOKEN 0x80 //indicate linked bitmaps - for use in dialog only +#define LINK_TOKEN 0x80 //indicate linked bitmaps - for use in dialog only class EDITENG_DLLPUBLIC SvxNumberType { static sal_Int32 nRefCount; static com::sun::star::uno::Reference<com::sun::star::text::XNumberingFormatter> xFormatter; - sal_Int16 nNumType; - sal_Bool bShowSymbol; // Symbol auch anzeigen? + sal_Int16 nNumType; + sal_Bool bShowSymbol; // Symbol auch anzeigen? public: SvxNumberType(sal_Int16 nType = com::sun::star::style::NumberingType::ARABIC); SvxNumberType(const SvxNumberType& rType); ~SvxNumberType(); - String GetNumStr( ULONG nNo ) const; - String GetNumStr( ULONG nNo, const com::sun::star::lang::Locale& rLocale ) const; + String GetNumStr( ULONG nNo ) const; + String GetNumStr( ULONG nNo, const com::sun::star::lang::Locale& rLocale ) const; - void SetNumberingType(sal_Int16 nSet) {nNumType = nSet;} - sal_Int16 GetNumberingType() const {return nNumType;} + void SetNumberingType(sal_Int16 nSet) {nNumType = nSet;} + sal_Int16 GetNumberingType() const {return nNumType;} - void SetShowSymbol(sal_Bool bSet) {bShowSymbol = bSet;} - sal_Bool IsShowSymbol()const{return bShowSymbol;} + void SetShowSymbol(sal_Bool bSet) {bShowSymbol = bSet;} + sal_Bool IsShowSymbol()const{return bShowSymbol;} - sal_Bool IsTxtFmt() const + sal_Bool IsTxtFmt() const { return com::sun::star::style::NumberingType::NUMBER_NONE != nNumType && com::sun::star::style::NumberingType::CHAR_SPECIAL != nNumType && @@ -117,17 +117,17 @@ public: }; private: - String sPrefix; - String sSuffix; + String sPrefix; + String sSuffix; - SvxAdjust eNumAdjust; + SvxAdjust eNumAdjust; - BYTE nInclUpperLevels; //Nummern aus der vorigen Ebenen uebernehmen - USHORT nStart; //Start der Zaehlung + BYTE nInclUpperLevels; //Nummern aus der vorigen Ebenen uebernehmen + USHORT nStart; //Start der Zaehlung - sal_Unicode cBullet; //Symbol - USHORT nBulletRelSize; //proz. Groesse des Bullets - Color nBulletColor; //Bullet color + sal_Unicode cBullet; //Symbol + USHORT nBulletRelSize; //proz. Groesse des Bullets + Color nBulletColor; //Bullet color // mode indicating, if the position and spacing of the list label is // determined by the former attributes (nFirstLineOffset, nAbsLSpace, @@ -140,10 +140,10 @@ private: // LABEL_ALIGNMENT is active. SvxNumPositionAndSpaceMode mePositionAndSpaceMode; - short nFirstLineOffset; //Erstzeileneinzug - short nAbsLSpace; //Abstand Rand<->Nummer - short nLSpace; //relative Einrueckung zum Vorgaenger - short nCharTextDistance; //Abstand Nummer<->Text + short nFirstLineOffset; //Erstzeileneinzug + short nAbsLSpace; //Abstand Rand<->Nummer + short nLSpace; //relative Einrueckung zum Vorgaenger + short nCharTextDistance; //Abstand Nummer<->Text // specifies what follows the list label before the text of the first line // of the list item starts @@ -155,15 +155,15 @@ private: // specifies the indent before the text, e.g. in L2R-layout the left margin long mnIndentAt; - SvxBrushItem* pGraphicBrush; // + SvxBrushItem* pGraphicBrush; // sal_Int16 eVertOrient; // vert. Ausrichtung einer Bitmap - Size aGraphicSize; // immer! in 1/100 mm - Font* pBulletFont; // Pointer auf den BulletFont + Size aGraphicSize; // immer! in 1/100 mm + Font* pBulletFont; // Pointer auf den BulletFont - String sCharStyleName; // Zeichenvorlage + String sCharStyleName; // Zeichenvorlage - BitmapEx* pScaledImageCache; // Image scaled to aGraphicSize, only cached for WINDOW/VDEV + BitmapEx* pScaledImageCache; // Image scaled to aGraphicSize, only cached for WINDOW/VDEV DECL_STATIC_LINK( SvxNumberFormat, GraphicArrived, void * ); virtual void NotifyGraphicArrived(); @@ -178,51 +178,51 @@ public: SvStream& Store(SvStream &rStream, FontToSubsFontConverter pConverter); SvxNumberFormat& operator=( const SvxNumberFormat& ); - BOOL operator==( const SvxNumberFormat& ) const; + BOOL operator==( const SvxNumberFormat& ) const; BOOL operator!=( const SvxNumberFormat& rFmt) const {return !(*this == rFmt);} - void SetNumAdjust(SvxAdjust eSet) {eNumAdjust = eSet;} - SvxAdjust GetNumAdjust() const {return eNumAdjust;} - void SetPrefix(const String& rSet) { sPrefix = rSet;} - const String& GetPrefix() const { return sPrefix;} + void SetNumAdjust(SvxAdjust eSet) {eNumAdjust = eSet;} + SvxAdjust GetNumAdjust() const {return eNumAdjust;} + void SetPrefix(const String& rSet) { sPrefix = rSet;} + const String& GetPrefix() const { return sPrefix;} void SetSuffix(const String& rSet) { sSuffix = rSet;} - const String& GetSuffix() const { return sSuffix;} + const String& GetSuffix() const { return sSuffix;} - void SetCharFmtName(const String& rSet){ sCharStyleName = rSet; } - virtual const String& GetCharFmtName()const; + void SetCharFmtName(const String& rSet){ sCharStyleName = rSet; } + virtual const String& GetCharFmtName()const; - void SetBulletFont(const Font* pFont); - const Font* GetBulletFont() const {return pBulletFont;} - void SetBulletChar(sal_Unicode cSet){cBullet = cSet;} - sal_Unicode GetBulletChar()const {return cBullet;} - void SetBulletRelSize(USHORT nSet) {nBulletRelSize = nSet;} - USHORT GetBulletRelSize() const { return nBulletRelSize;} - void SetBulletColor(Color nSet){nBulletColor = nSet;} - Color GetBulletColor()const {return nBulletColor;} + void SetBulletFont(const Font* pFont); + const Font* GetBulletFont() const {return pBulletFont;} + void SetBulletChar(sal_Unicode cSet){cBullet = cSet;} + sal_Unicode GetBulletChar()const {return cBullet;} + void SetBulletRelSize(USHORT nSet) {nBulletRelSize = nSet;} + USHORT GetBulletRelSize() const { return nBulletRelSize;} + void SetBulletColor(Color nSet){nBulletColor = nSet;} + Color GetBulletColor()const {return nBulletColor;} - void SetIncludeUpperLevels( BYTE nSet ) { nInclUpperLevels = nSet;} - BYTE GetIncludeUpperLevels()const { return nInclUpperLevels;} - void SetStart(USHORT nSet) {nStart = nSet;} - USHORT GetStart() const {return nStart;} + void SetIncludeUpperLevels( BYTE nSet ) { nInclUpperLevels = nSet;} + BYTE GetIncludeUpperLevels()const { return nInclUpperLevels;} + void SetStart(USHORT nSet) {nStart = nSet;} + USHORT GetStart() const {return nStart;} virtual void SetGraphicBrush( const SvxBrushItem* pBrushItem, const Size* pSize = 0, const sal_Int16* pOrient = 0); - const SvxBrushItem* GetBrush() const {return pGraphicBrush;} - void SetGraphic( const String& rName ); + const SvxBrushItem* GetBrush() const {return pGraphicBrush;} + void SetGraphic( const String& rName ); virtual void SetVertOrient(sal_Int16 eSet); virtual sal_Int16 GetVertOrient() const; - void SetGraphicSize(const Size& rSet) {aGraphicSize = rSet;} - const Size& GetGraphicSize() const {return aGraphicSize;} + void SetGraphicSize(const Size& rSet) {aGraphicSize = rSet;} + const Size& GetGraphicSize() const {return aGraphicSize;} SvxNumPositionAndSpaceMode GetPositionAndSpaceMode() const; void SetPositionAndSpaceMode( SvxNumPositionAndSpaceMode ePositionAndSpaceMode ); - void SetLSpace(short nSet) {nLSpace = nSet;} + void SetLSpace(short nSet) {nLSpace = nSet;} short GetLSpace() const; - void SetAbsLSpace(short nSet) {nAbsLSpace = nSet;} + void SetAbsLSpace(short nSet) {nAbsLSpace = nSet;} short GetAbsLSpace() const; - void SetFirstLineOffset(short nSet) { nFirstLineOffset = nSet;} + void SetFirstLineOffset(short nSet) { nFirstLineOffset = nSet;} short GetFirstLineOffset() const; - void SetCharTextDistance(short nSet) { nCharTextDistance = nSet; } + void SetCharTextDistance(short nSet) { nCharTextDistance = nSet; } short GetCharTextDistance() const; void SetLabelFollowedBy( const SvxNumLabelFollowedBy eLabelFollowedBy ); @@ -234,8 +234,8 @@ public: void SetIndentAt( const long nIndentAt ); long GetIndentAt() const; - static Size GetGraphicSizeMM100(const Graphic* pGraphic); - static String CreateRomanString( ULONG nNo, BOOL bUpper ); + static Size GetGraphicSizeMM100(const Graphic* pGraphic); + static String CreateRomanString( ULONG nNo, BOOL bUpper ); }; enum SvxNumRuleType @@ -248,15 +248,15 @@ enum SvxNumRuleType class EDITENG_DLLPUBLIC SvxNumRule { - USHORT nLevelCount; // Anzahl der unterstuetzten Levels - ULONG nFeatureFlags; // was wird unterstuetzt? - SvxNumRuleType eNumberingType; // was fuer eine Numerierung - BOOL bContinuousNumbering; // fortlaufende Numerierung + USHORT nLevelCount; // Anzahl der unterstuetzten Levels + ULONG nFeatureFlags; // was wird unterstuetzt? + SvxNumRuleType eNumberingType; // was fuer eine Numerierung + BOOL bContinuousNumbering; // fortlaufende Numerierung - SvxNumberFormat* aFmts[SVX_MAX_NUM]; - BOOL aFmtsSet[SVX_MAX_NUM]; //Flags ueber Gueltigkeit der Ebenen + SvxNumberFormat* aFmts[SVX_MAX_NUM]; + BOOL aFmtsSet[SVX_MAX_NUM]; //Flags ueber Gueltigkeit der Ebenen - static sal_Int32 nRefCount; + static sal_Int32 nRefCount; com::sun::star::lang::Locale aLocale; public: SvxNumRule( ULONG nFeatures, @@ -270,42 +270,42 @@ public: SvxNumRule(SvStream &rStream); virtual ~SvxNumRule(); - int operator==( const SvxNumRule& ) const; - int operator!=( const SvxNumRule& rRule ) const {return !(*this == rRule);} + int operator==( const SvxNumRule& ) const; + int operator!=( const SvxNumRule& rRule ) const {return !(*this == rRule);} - SvxNumRule& operator=( const SvxNumRule& ); + SvxNumRule& operator=( const SvxNumRule& ); SvStream& Store(SvStream &rStream); - const SvxNumberFormat* Get(USHORT nLevel)const; - const SvxNumberFormat& GetLevel(USHORT nLevel)const; - void SetLevel(USHORT nLevel, const SvxNumberFormat& rFmt, BOOL bIsValid = TRUE); - void SetLevel(USHORT nLevel, const SvxNumberFormat* pFmt); + const SvxNumberFormat* Get(USHORT nLevel)const; + const SvxNumberFormat& GetLevel(USHORT nLevel)const; + void SetLevel(USHORT nLevel, const SvxNumberFormat& rFmt, BOOL bIsValid = TRUE); + void SetLevel(USHORT nLevel, const SvxNumberFormat* pFmt); - BOOL IsContinuousNumbering()const + BOOL IsContinuousNumbering()const {return bContinuousNumbering;} - void SetContinuousNumbering(BOOL bSet) + void SetContinuousNumbering(BOOL bSet) {bContinuousNumbering = bSet;} - USHORT GetLevelCount() const {return nLevelCount;} - BOOL IsFeatureSupported(ULONG nFeature) const + USHORT GetLevelCount() const {return nLevelCount;} + BOOL IsFeatureSupported(ULONG nFeature) const {return 0 != (nFeatureFlags & nFeature);} - ULONG GetFeatureFlags() const {return nFeatureFlags;} - void SetFeatureFlag( ULONG nFlag, BOOL bSet = TRUE ) { if(bSet) nFeatureFlags |= nFlag; else nFeatureFlags &= ~nFlag; } + ULONG GetFeatureFlags() const {return nFeatureFlags;} + void SetFeatureFlag( ULONG nFlag, BOOL bSet = TRUE ) { if(bSet) nFeatureFlags |= nFlag; else nFeatureFlags &= ~nFlag; } - String MakeNumString( const SvxNodeNum&, BOOL bInclStrings = TRUE ) const; + String MakeNumString( const SvxNodeNum&, BOOL bInclStrings = TRUE ) const; - SvxNumRuleType GetNumRuleType() const { return eNumberingType; } + SvxNumRuleType GetNumRuleType() const { return eNumberingType; } void SetNumRuleType( const SvxNumRuleType& rType ) { eNumberingType = rType; } - BOOL UnLinkGraphics(); + BOOL UnLinkGraphics(); }; /* -----------------27.10.98 13:04------------------- * * --------------------------------------------------*/ class EDITENG_DLLPUBLIC SvxNumBulletItem : public SfxPoolItem { - SvxNumRule* pNumRule; + SvxNumRule* pNumRule; public: SvxNumBulletItem(SvxNumRule& rRule); SvxNumBulletItem(SvxNumRule& rRule, USHORT nWhich ); @@ -318,36 +318,36 @@ public: virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; virtual int operator==( const SfxPoolItem& ) const; - SvxNumRule* GetNumRule() const {return pNumRule;} + SvxNumRule* GetNumRule() const {return pNumRule;} - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); }; /* -----------------28.10.98 15:21------------------- * * --------------------------------------------------*/ class SvxNodeNum { - USHORT nLevelVal[ SVX_MAX_NUM ]; // Nummern aller Levels - USHORT nSetValue; // vorgegebene Nummer - BYTE nMyLevel; // akt. Level - BOOL bStartNum; // Numerierung neu starten + USHORT nLevelVal[ SVX_MAX_NUM ]; // Nummern aller Levels + USHORT nSetValue; // vorgegebene Nummer + BYTE nMyLevel; // akt. Level + BOOL bStartNum; // Numerierung neu starten public: inline SvxNodeNum( BYTE nLevel = SVX_NO_NUM, USHORT nSetVal = USHRT_MAX ); inline SvxNodeNum& operator=( const SvxNodeNum& rCpy ); - BYTE GetLevel() const { return nMyLevel; } - void SetLevel( BYTE nVal ) { nMyLevel = nVal; } + BYTE GetLevel() const { return nMyLevel; } + void SetLevel( BYTE nVal ) { nMyLevel = nVal; } - BOOL IsStart() const { return bStartNum; } - void SetStart( BOOL bFlag = TRUE ) { bStartNum = bFlag; } + BOOL IsStart() const { return bStartNum; } + void SetStart( BOOL bFlag = TRUE ) { bStartNum = bFlag; } - USHORT GetSetValue() const { return nSetValue; } - void SetSetValue( USHORT nVal ) { nSetValue = nVal; } + USHORT GetSetValue() const { return nSetValue; } + void SetSetValue( USHORT nVal ) { nSetValue = nVal; } - const USHORT* GetLevelVal() const { return nLevelVal; } - USHORT* GetLevelVal() { return nLevelVal; } + const USHORT* GetLevelVal() const { return nLevelVal; } + USHORT* GetLevelVal() { return nLevelVal; } }; SvxNodeNum::SvxNodeNum( BYTE nLevel, USHORT nSetVal ) diff --git a/editeng/inc/editeng/opaqitem.hxx b/editeng/inc/editeng/opaqitem.hxx index 7531a0ab1272..1ba364836a07 100644 --- a/editeng/inc/editeng/opaqitem.hxx +++ b/editeng/inc/editeng/opaqitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ public: // "pure virtual Methoden" vom SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/editeng/inc/editeng/optitems.hxx b/editeng/inc/editeng/optitems.hxx index c2d97dc5a2fb..fc4e23d04038 100644 --- a/editeng/inc/editeng/optitems.hxx +++ b/editeng/inc/editeng/optitems.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ #include <editeng/editengdllapi.h> // forward --------------------------------------------------------------- -namespace com { namespace sun { namespace star { +namespace com { namespace sun { namespace star { namespace linguistic2{ class XSpellChecker1; }}}} @@ -59,7 +59,7 @@ public: String &rText, const IntlWrapper * = 0 ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; + virtual int operator==( const SfxPoolItem& ) const; ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > @@ -67,7 +67,7 @@ public: private: ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSpellChecker1 > xSpellCheck; + ::com::sun::star::linguistic2::XSpellChecker1 > xSpellCheck; }; @@ -84,15 +84,15 @@ public: SfxHyphenRegionItem( const sal_uInt16 nId ); SfxHyphenRegionItem( const SfxHyphenRegionItem& rItem ); - virtual int operator==( const SfxPoolItem& ) const; + virtual int operator==( const SfxPoolItem& ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rStrm, sal_uInt16 nVer ) const; - virtual SvStream& Store( SvStream& rStrm, sal_uInt16 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Create( SvStream& rStrm, sal_uInt16 nVer ) const; + virtual SvStream& Store( SvStream& rStrm, sal_uInt16 ) const; inline sal_uInt8 &GetMinLead() { return nMinLead; } inline sal_uInt8 GetMinLead() const { return nMinLead; } diff --git a/editeng/inc/editeng/orphitem.hxx b/editeng/inc/editeng/orphitem.hxx index 057c97516dca..d97511683296 100644 --- a/editeng/inc/editeng/orphitem.hxx +++ b/editeng/inc/editeng/orphitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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: // "pure virtual Methoden" vom SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/editeng/inc/editeng/outliner.hxx b/editeng/inc/editeng/outliner.hxx index dfe3255233ba..004cb6a51c92 100644 --- a/editeng/inc/editeng/outliner.hxx +++ b/editeng/inc/editeng/outliner.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ #include <svtools/grfmgr.hxx> -#include <tools/rtti.hxx> // wegen typedef TypeId +#include <tools/rtti.hxx> // wegen typedef TypeId #include <vector> class OutlinerEditEng; @@ -105,7 +105,7 @@ namespace basegfx { class B2DPolyPolygon; } #define PARAFLAG_DROPTARGET_EMPTY 0x2000 #define PARAFLAG_HOLDDEPTH 0x4000 #define PARAFLAG_SETBULLETTEXT 0x8000 -#define PARAFLAG_ISPAGE 0x0100 +#define PARAFLAG_ISPAGE 0x0100 // Undo-Action-Ids #define OLUNDO_DEPTH EDITUNDO_USER @@ -115,8 +115,8 @@ namespace basegfx { class B2DPolyPolygon; } // #define OLUNDO_REMOVE EDITUNDO_USER+4 #define OLUNDO_ATTR EDITUNDO_USER+5 #define OLUNDO_INSERT EDITUNDO_USER+6 -// #define OLUNDO_MOVEPARAGRAPHS EDITUNDO_USER+7 -#define OLUNDO_CHECKPARA EDITUNDO_USER+8 +// #define OLUNDO_MOVEPARAGRAPHS EDITUNDO_USER+7 +#define OLUNDO_CHECKPARA EDITUNDO_USER+8 class Paragraph : protected ParagraphData { @@ -132,23 +132,23 @@ private: Paragraph& operator=(const Paragraph& rPara ); - USHORT nFlags; - XubString aBulText; - Size aBulSize; - BOOL bVisible; + USHORT nFlags; + XubString aBulText; + Size aBulSize; + BOOL bVisible; - BOOL IsVisible() const { return bVisible; } - void SetText( const XubString& rText ) { aBulText = rText; aBulSize.Width() = -1; } - void Invalidate() { aBulSize.Width() = -1; } - void SetDepth( sal_Int16 nNewDepth ) { nDepth = nNewDepth; aBulSize.Width() = -1; } - const XubString& GetText() const { return aBulText; } + BOOL IsVisible() const { return bVisible; } + void SetText( const XubString& rText ) { aBulText = rText; aBulSize.Width() = -1; } + void Invalidate() { aBulSize.Width() = -1; } + void SetDepth( sal_Int16 nNewDepth ) { nDepth = nNewDepth; aBulSize.Width() = -1; } + const XubString& GetText() const { return aBulText; } Paragraph( sal_Int16 nDepth ); Paragraph( const Paragraph& ); Paragraph( const ParagraphData& ); ~Paragraph(); - sal_Int16 GetDepth() const { return nDepth; } + sal_Int16 GetDepth() const { return nDepth; } sal_Int16 GetNumberingStartValue() const { return mnNumberingStartValue; } void SetNumberingStartValue( sal_Int16 nNumberingStartValue ); @@ -156,20 +156,20 @@ private: sal_Bool IsParaIsNumberingRestart() const { return mbParaIsNumberingRestart; } void SetParaIsNumberingRestart( sal_Bool bParaIsNumberingRestart ); - void SetFlag( USHORT nFlag ) { nFlags |= nFlag; } - void RemoveFlag( USHORT nFlag ) { nFlags &= ~nFlag; } - bool HasFlag( USHORT nFlag ) const { return (nFlags & nFlag) != 0; } + void SetFlag( USHORT nFlag ) { nFlags |= nFlag; } + void RemoveFlag( USHORT nFlag ) { nFlags &= ~nFlag; } + bool HasFlag( USHORT nFlag ) const { return (nFlags & nFlag) != 0; } }; struct ParaRange { - USHORT nStartPara; - USHORT nEndPara; + USHORT nStartPara; + USHORT nEndPara; ParaRange( USHORT nS, USHORT nE ) { nStartPara = nS, nEndPara = nE; } - void Adjust(); - USHORT Len() const { return 1 + ( ( nEndPara > nStartPara ) ? (nEndPara-nStartPara) : (nStartPara-nEndPara) ); } + void Adjust(); + USHORT Len() const { return 1 + ( ( nEndPara > nStartPara ) ? (nEndPara-nStartPara) : (nStartPara-nEndPara) ); } }; inline void ParaRange::Adjust() @@ -212,8 +212,8 @@ private: long nDDScrollLROffs; long nDDScrollTDOffs; - void* pDummy; - ULONG nDummy; + void* pDummy; + ULONG nDummy; enum MouseTarget { MouseText = 0, @@ -226,11 +226,11 @@ private: #ifdef _OUTLINER_CXX - EDITENG_DLLPRIVATE void ImplExpandOrCollaps( USHORT nStartPara, USHORT nEndPara, BOOL bExpand ); + EDITENG_DLLPRIVATE void ImplExpandOrCollaps( USHORT nStartPara, USHORT nEndPara, BOOL bExpand ); EDITENG_DLLPRIVATE ULONG ImpCheckMousePos( const Point& rPosPixel, MouseTarget& reTarget); EDITENG_DLLPRIVATE void ImpToggleExpand( Paragraph* pParentPara ); - EDITENG_DLLPRIVATE ParaRange ImpGetSelectedParagraphs( BOOL bIncludeHiddenChilds ); + EDITENG_DLLPRIVATE ParaRange ImpGetSelectedParagraphs( BOOL bIncludeHiddenChilds ); EDITENG_DLLPRIVATE void ImpHideDDCursor(); EDITENG_DLLPRIVATE void ImpShowDDCursor(); EDITENG_DLLPRIVATE void ImpPaintDDCursor(); @@ -253,9 +253,9 @@ private: public: OutlinerView( Outliner* pOut, Window* pWindow ); - virtual ~OutlinerView(); + virtual ~OutlinerView(); - EditView& GetEditView() const { return *pEditView; } + EditView& GetEditView() const { return *pEditView; } void Scroll( long nHorzScroll, long nVertScroll ); @@ -274,8 +274,8 @@ public: void SetWindow( Window* pWindow ); Window* GetWindow() const; - void SetReadOnly( BOOL bReadOnly ); - BOOL IsReadOnly() const; + void SetReadOnly( BOOL bReadOnly ); + BOOL IsReadOnly() const; void SetOutputArea( const Rectangle& rRect ); Rectangle GetOutputArea() const; @@ -293,8 +293,8 @@ public: String GetSelected() const; void SelectRange( ULONG nFirst, USHORT nCount ); void SetAttribs( const SfxItemSet& ); - void Indent( short nDiff ); - void AdjustDepth( short nDX ); // Spaeter gegeb Indent ersetzen! + void Indent( short nDiff ); + void AdjustDepth( short nDX ); // Spaeter gegeb Indent ersetzen! BOOL AdjustHeight( long nDY ); void AdjustDepth( Paragraph* pPara, short nDX, @@ -303,7 +303,7 @@ public: BOOL bWithChilds=FALSE ); ULONG Read( SvStream& rInput, const String& rBaseURL, EETextFormat eFormat, BOOL bSelect = FALSE, SvKeyValueIterator* pHTTPHeaderAttrs = NULL ); - ULONG Write( SvStream& rOutput, EETextFormat eFormat ); + ULONG Write( SvStream& rOutput, EETextFormat eFormat ); void InsertText( const String& rNew, BOOL bSelect = FALSE ); void InsertText( const OutlinerParaObject& rParaObj ); @@ -314,8 +314,8 @@ public: void ExpandAll(); void CollapseAll(); - void SetBackgroundColor( const Color& rColor ); - Color GetBackgroundColor(); + void SetBackgroundColor( const Color& rColor ); + Color GetBackgroundColor(); SfxItemSet GetAttribs(); @@ -328,8 +328,8 @@ public: void Undo(); void Redo(); - void SetStyleSheet( SfxStyleSheet* ); - SfxStyleSheet* GetStyleSheet() const; + void SetStyleSheet( SfxStyleSheet* ); + SfxStyleSheet* GetStyleSheet() const; void SetControlWord( ULONG nWord ); ULONG GetControlWord() const; @@ -341,7 +341,7 @@ public: void Command( const CommandEvent& rCEvt ); void RemoveCharAttribs( ULONG nPara, USHORT nWhich = 0 ); - void CompleteAutoCorrect(); + void CompleteAutoCorrect(); EESpellState StartSpeller( BOOL bMultipleDoc = FALSE ); EESpellState StartThesaurus(); @@ -350,11 +350,11 @@ public: // for text conversion void StartTextConversion( LanguageType nSrcLang, LanguageType nDestLang, const Font *pDestFont, INT32 nOptions, BOOL bIsInteractive, BOOL bMultipleDoc ); - void TransliterateText( sal_Int32 nTransliterationMode ); + void TransliterateText( sal_Int32 nTransliterationMode ); ESelection GetSelection(); - USHORT GetSelectedScriptType() const; + USHORT GetSelectedScriptType() const; void SetVisArea( const Rectangle& rRec ); void SetSelection( const ESelection& ); @@ -365,7 +365,7 @@ public: void InsertField( const SvxFieldItem& rFld ); const SvxFieldItem* GetFieldUnderMousePointer() const; - const SvxFieldItem* GetFieldUnderMousePointer( USHORT& nPara, xub_StrLen& nPos ) const; + const SvxFieldItem* GetFieldUnderMousePointer( USHORT& nPara, xub_StrLen& nPos ) const; const SvxFieldItem* GetFieldAtSelection() const; /** enables numbering for the selected paragraphs if the numbering of the first paragraph is off @@ -383,11 +383,11 @@ public: void SpellIgnoreWord(); void ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack = 0 ); - void SetInvalidateMore( USHORT nPixel ); - USHORT GetInvalidateMore() const; + void SetInvalidateMore( USHORT nPixel ); + USHORT GetInvalidateMore() const; - String GetSurroundingText() const; - Selection GetSurroundingTextSelection() const; + String GetSurroundingText() const; + Selection GetSurroundingTextSelection() const; }; @@ -417,7 +417,7 @@ public: const Color maTextLineColor; // #101498# BiDi level needs to be transported, too. - BYTE mnBiDiLevel; + BYTE mnBiDiLevel; bool mbFilled; long mnWidthToFill; @@ -450,7 +450,7 @@ public: bool bEndOfLine, bool bEndOfParagraph, bool bEndOfBullet) - : mrStartPos(rPos), + : mrStartPos(rPos), mrText(rTxt), mnTextStart(nTxtStart), mnTextLen(nTxtLen), @@ -508,7 +508,7 @@ class SdrPage; class EditFieldInfo { private: - Outliner* pOutliner; + Outliner* pOutliner; const SvxFieldItem& rFldItem; Color* pTxtColor; @@ -517,13 +517,13 @@ private: String aRepresentation; USHORT nPara; - xub_StrLen nPos; + xub_StrLen nPos; BOOL bSimpleClick; EditFieldInfo(); EditFieldInfo( const EditFieldInfo& ); - SdrPage* mpSdrPage; + SdrPage* mpSdrPage; public: EditFieldInfo( Outliner* pOutl, const SvxFieldItem& rFItem, USHORT nPa, xub_StrLen nPo ) @@ -540,7 +540,7 @@ public: delete pFldColor; } - Outliner* GetOutliner() const { return pOutliner; } + Outliner* GetOutliner() const { return pOutliner; } const SvxFieldItem& GetField() const { return rFldItem; } @@ -564,8 +564,8 @@ public: String& GetRepresentation() { return aRepresentation; } void SetRepresentation( const String& rStr ) { aRepresentation = rStr; } - void SetSdrPage( SdrPage* pPage ) { mpSdrPage = pPage; } - SdrPage* GetSdrPage() const { return mpSdrPage; } + void SetSdrPage( SdrPage* pPage ) { mpSdrPage = pPage; } + SdrPage* GetSdrPage() const { return mpSdrPage; } }; struct EBulletInfo @@ -573,7 +573,7 @@ struct EBulletInfo BOOL bVisible; USHORT nType; // see SvxNumberType String aText; - SvxFont aFont; + SvxFont aFont; Graphic aGraphic; USHORT nParagraph; Rectangle aBounds; @@ -581,16 +581,16 @@ struct EBulletInfo EBulletInfo() : bVisible( FALSE ), nType( 0 ), nParagraph( EE_PARA_NOT_FOUND ) {} }; -#define OUTLINERMODE_DONTKNOW 0x0000 -#define OUTLINERMODE_TEXTOBJECT 0x0001 -#define OUTLINERMODE_TITLEOBJECT 0x0002 -#define OUTLINERMODE_OUTLINEOBJECT 0x0003 -#define OUTLINERMODE_OUTLINEVIEW 0x0004 +#define OUTLINERMODE_DONTKNOW 0x0000 +#define OUTLINERMODE_TEXTOBJECT 0x0001 +#define OUTLINERMODE_TITLEOBJECT 0x0002 +#define OUTLINERMODE_OUTLINEOBJECT 0x0003 +#define OUTLINERMODE_OUTLINEVIEW 0x0004 -#define OUTLINERMODE_USERMASK 0x00FF +#define OUTLINERMODE_USERMASK 0x00FF -#define OUTLINERMODE_SUBTITLE (0x0100|OUTLINERMODE_TEXTOBJECT) -#define OUTLINERMODE_NOTE (0x0200|OUTLINERMODE_TEXTOBJECT) +#define OUTLINERMODE_SUBTITLE (0x0100|OUTLINERMODE_TEXTOBJECT) +#define OUTLINERMODE_NOTE (0x0200|OUTLINERMODE_TEXTOBJECT) class EDITENG_DLLPUBLIC Outliner : public SfxBroadcaster { @@ -608,7 +608,7 @@ class EDITENG_DLLPUBLIC Outliner : public SfxBroadcaster ViewList aViewList; Paragraph* pHdlParagraph; - ULONG mnFirstSelPage; + ULONG mnFirstSelPage; Link aDrawPortionHdl; Link aDrawBulletHdl; Link aExpandHdl; @@ -622,72 +622,72 @@ class EDITENG_DLLPUBLIC Outliner : public SfxBroadcaster Link aRemovingPagesHdl; Link aFieldClickedHdl; Link aCalcFieldValueHdl; - Link maPaintFirstLineHdl; + Link maPaintFirstLineHdl; Link maBeginPasteOrDropHdl; Link maEndPasteOrDropHdl; - sal_Int16 nDepthChangedHdlPrevDepth; - USHORT mnDepthChangeHdlPrevFlags; - sal_Int16 nMaxDepth; - const sal_Int16 nMinDepth; - USHORT nFirstPage; + sal_Int16 nDepthChangedHdlPrevDepth; + USHORT mnDepthChangeHdlPrevFlags; + sal_Int16 nMaxDepth; + const sal_Int16 nMinDepth; + USHORT nFirstPage; - USHORT nOutlinerMode; + USHORT nOutlinerMode; BOOL bIsExpanding; // Nur in Expand/Collaps-Hdl gueltig, mal umstellen BOOL bFirstParaIsEmpty; BOOL bBlockInsCallback; BOOL bStrippingPortions; - BOOL bPasting; + BOOL bPasting; - ULONG nDummy; + ULONG nDummy; #ifdef _OUTLINER_CXX - DECL_LINK( ParaVisibleStateChangedHdl, Paragraph* ); - DECL_LINK( BeginMovingParagraphsHdl, MoveParagraphsInfo* ); - DECL_LINK( EndMovingParagraphsHdl, MoveParagraphsInfo* ); - DECL_LINK( BeginPasteOrDropHdl, PasteOrDropInfos* ); - DECL_LINK( EndPasteOrDropHdl, PasteOrDropInfos* ); - DECL_LINK( EditEngineNotifyHdl, EENotify* ); - void ImplCheckParagraphs( USHORT nStart, USHORT nEnd ); - BOOL ImplHasBullet( USHORT nPara ) const; - Size ImplGetBulletSize( USHORT nPara ); + DECL_LINK( ParaVisibleStateChangedHdl, Paragraph* ); + DECL_LINK( BeginMovingParagraphsHdl, MoveParagraphsInfo* ); + DECL_LINK( EndMovingParagraphsHdl, MoveParagraphsInfo* ); + DECL_LINK( BeginPasteOrDropHdl, PasteOrDropInfos* ); + DECL_LINK( EndPasteOrDropHdl, PasteOrDropInfos* ); + DECL_LINK( EditEngineNotifyHdl, EENotify* ); + void ImplCheckParagraphs( USHORT nStart, USHORT nEnd ); + BOOL ImplHasBullet( USHORT nPara ) const; + Size ImplGetBulletSize( USHORT nPara ); sal_uInt16 ImplGetNumbering( USHORT nPara, const SvxNumberFormat* pParaFmt ); - void ImplCalcBulletText( USHORT nPara, BOOL bRecalcLevel, BOOL bRecalcChilds ); - String ImplGetBulletText( USHORT nPara ); - void ImplCheckNumBulletItem( USHORT nPara ); - void ImplInitDepth( USHORT nPara, sal_Int16 nDepth, BOOL bCreateUndo, BOOL bUndoAction = FALSE ); - void ImplSetLevelDependendStyleSheet( USHORT nPara, SfxStyleSheet* pLevelStyle = NULL ); + void ImplCalcBulletText( USHORT nPara, BOOL bRecalcLevel, BOOL bRecalcChilds ); + String ImplGetBulletText( USHORT nPara ); + void ImplCheckNumBulletItem( USHORT nPara ); + void ImplInitDepth( USHORT nPara, sal_Int16 nDepth, BOOL bCreateUndo, BOOL bUndoAction = FALSE ); + void ImplSetLevelDependendStyleSheet( USHORT nPara, SfxStyleSheet* pLevelStyle = NULL ); void ImplBlockInsertionCallbacks( BOOL b ); - void ImplCheckStyleSheet( USHORT nPara, BOOL bReplaceExistingStyle ); + void ImplCheckStyleSheet( USHORT nPara, BOOL bReplaceExistingStyle ); void ImpRecalcBulletIndent( ULONG nPara ); const SvxBulletItem& ImpGetBullet( ULONG nPara, USHORT& ); void ImpFilterIndents( ULONG nFirstPara, ULONG nLastPara ); - bool ImpConvertEdtToOut( sal_uInt32 nPara, EditView* pView = 0 ); + bool ImpConvertEdtToOut( sal_uInt32 nPara, EditView* pView = 0 ); void ImpTextPasted( ULONG nStartPara, USHORT nCount ); - long ImpCalcMaxBulletWidth( USHORT nPara, const SvxBulletItem& rBullet ); + long ImpCalcMaxBulletWidth( USHORT nPara, const SvxBulletItem& rBullet ); Font ImpCalcBulletFont( USHORT nPara ) const; Rectangle ImpCalcBulletArea( USHORT nPara, BOOL bAdjust, BOOL bReturnPaperPos ); - long ImpGetTextIndent( ULONG nPara ); + long ImpGetTextIndent( ULONG nPara ); BOOL ImpCanIndentSelectedPages( OutlinerView* pCurView ); BOOL ImpCanDeleteSelectedPages( OutlinerView* pCurView ); BOOL ImpCanDeleteSelectedPages( OutlinerView* pCurView, USHORT nFirstPage, USHORT nPages ); - USHORT ImplGetOutlinerMode() const { return nOutlinerMode & OUTLINERMODE_USERMASK; } + USHORT ImplGetOutlinerMode() const { return nOutlinerMode & OUTLINERMODE_USERMASK; } void ImplCheckDepth( sal_Int16& rnDepth ) const; #endif protected: - void ParagraphInserted( USHORT nParagraph ); - void ParagraphDeleted( USHORT nParagraph ); - void ParaAttribsChanged( USHORT nParagraph ); + void ParagraphInserted( USHORT nParagraph ); + void ParagraphDeleted( USHORT nParagraph ); + void ParaAttribsChanged( USHORT nParagraph ); - virtual void StyleSheetChanged( SfxStyleSheet* pStyle ); + virtual void StyleSheetChanged( SfxStyleSheet* pStyle ); void InvalidateBullet( Paragraph* pPara, ULONG nPara ); void PaintBullet( USHORT nPara, const Point& rStartPos, @@ -704,18 +704,18 @@ public: virtual ~Outliner(); void Init( USHORT nOutlinerMode ); - USHORT GetMode() const { return nOutlinerMode; } + USHORT GetMode() const { return nOutlinerMode; } - void SetVertical( BOOL bVertical ); - BOOL IsVertical() const; + void SetVertical( BOOL bVertical ); + BOOL IsVertical() const; - void SetFixedCellHeight( BOOL bUseFixedCellHeight ); - BOOL IsFixedCellHeight() const; + void SetFixedCellHeight( BOOL bUseFixedCellHeight ); + BOOL IsFixedCellHeight() const; void SetDefaultHorizontalTextDirection( EEHorizontalTextDirection eHTextDir ); EEHorizontalTextDirection GetDefaultHorizontalTextDirection() const; - USHORT GetScriptType( const ESelection& rSelection ) const; + USHORT GetScriptType( const ESelection& rSelection ) const; LanguageType GetLanguage( USHORT nPara, USHORT nPos ) const; void SetAsianCompressionMode( USHORT nCompressionMode ); @@ -746,10 +746,10 @@ public: void SetRefMapMode( const MapMode& ); MapMode GetRefMapMode() const; - void SetBackgroundColor( const Color& rColor ); - Color GetBackgroundColor() const; + void SetBackgroundColor( const Color& rColor ); + Color GetBackgroundColor() const; - sal_Int16 GetMinDepth() const { return -1; } + sal_Int16 GetMinDepth() const { return -1; } void SetMaxDepth( sal_Int16 nDepth, BOOL bCheckParas = FALSE ); sal_Int16 GetMaxDepth() const { return nMaxDepth; } @@ -768,15 +768,15 @@ public: BOOL HasChilds( Paragraph* pParagraph ) const; ULONG GetChildCount( Paragraph* pParent ) const; BOOL IsExpanded( Paragraph* pPara ) const; -// Paragraph* GetParagraph( Paragraph* pParent, ULONG nRelPos ) const; +// Paragraph* GetParagraph( Paragraph* pParent, ULONG nRelPos ) const; Paragraph* GetParent( Paragraph* pParagraph ) const; -// ULONG GetRelPos( Paragraph* pParent, Paragraph* pPara ) const; +// ULONG GetRelPos( Paragraph* pParent, Paragraph* pPara ) const; ULONG GetAbsPos( Paragraph* pPara ); - sal_Int16 GetDepth( ULONG nPara ) const; - void SetDepth( Paragraph* pParagraph, sal_Int16 nNewDepth ); + sal_Int16 GetDepth( ULONG nPara ) const; + void SetDepth( Paragraph* pParagraph, sal_Int16 nNewDepth ); - void SetVisible( Paragraph* pPara, BOOL bVisible ); + void SetVisible( Paragraph* pPara, BOOL bVisible ); BOOL IsVisible( Paragraph* pPara ) const { return pPara->IsVisible(); } void EnableUndo( BOOL bEnable ); @@ -808,7 +808,7 @@ public: void SetDepthChangedHdl(const Link& rLink){aDepthChangedHdl=rLink;} Link GetDepthChangedHdl() const { return aDepthChangedHdl; } sal_Int16 GetPrevDepth() const { return nDepthChangedHdlPrevDepth; } - USHORT GetPrevFlags() const { return mnDepthChangeHdlPrevFlags; } + USHORT GetPrevFlags() const { return mnDepthChangeHdlPrevFlags; } virtual long RemovingPagesHdl( OutlinerView* ); void SetRemovingPagesHdl(const Link& rLink){aRemovingPagesHdl=rLink;} @@ -833,11 +833,11 @@ public: void SetDrawBulletHdl(const Link& rLink){aDrawBulletHdl=rLink;} Link GetDrawBulletHdl() const { return aDrawBulletHdl; } - void SetPaintFirstLineHdl(const Link& rLink) { maPaintFirstLineHdl = rLink; } - Link GetPaintFirstLineHdl() const { return maPaintFirstLineHdl; } + void SetPaintFirstLineHdl(const Link& rLink) { maPaintFirstLineHdl = rLink; } + Link GetPaintFirstLineHdl() const { return maPaintFirstLineHdl; } - void SetModifyHdl( const Link& rLink ); - Link GetModifyHdl() const; + void SetModifyHdl( const Link& rLink ); + Link GetModifyHdl() const; void SetNotifyHdl( const Link& rLink ); Link GetNotifyHdl() const; @@ -852,13 +852,13 @@ public: const Size& GetPaperSize() const; void SetPaperSize( const Size& rSize ); - void SetFirstPageNumber( USHORT n ) { nFirstPage = n; } - USHORT GetFirstPageNumber() const { return nFirstPage; } + void SetFirstPageNumber( USHORT n ) { nFirstPage = n; } + USHORT GetFirstPageNumber() const { return nFirstPage; } - void SetPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon ); - void SetPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::B2DPolyPolygon* pLinePolyPolygon); - void ClearPolygon(); - const PolyPolygon* GetPolygon(); + void SetPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon ); + void SetPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::B2DPolyPolygon* pLinePolyPolygon); + void ClearPolygon(); + const PolyPolygon* GetPolygon(); const Size& GetMinAutoPaperSize() const; void SetMinAutoPaperSize( const Size& rSz ); @@ -869,8 +869,8 @@ public: void SetDefTab( USHORT nTab ); USHORT GetDefTab() const; - BOOL IsFlatMode() const; - void SetFlatMode( BOOL bFlat ); + BOOL IsFlatMode() const; + void SetFlatMode( BOOL bFlat ); void EnableAutoColor( BOOL b ); BOOL IsAutoColorEnabled() const; @@ -911,13 +911,13 @@ public: Point GetDocPos( Paragraph* pPara ); - void SetStyleSheetPool( SfxStyleSheetPool* pSPool ); - SfxStyleSheetPool* GetStyleSheetPool(); + void SetStyleSheetPool( SfxStyleSheetPool* pSPool ); + SfxStyleSheetPool* GetStyleSheetPool(); BOOL IsInSelectionMode() const; void SetStyleSheet( ULONG nPara, SfxStyleSheet* pStyle ); - SfxStyleSheet* GetStyleSheet( ULONG nPara ); + SfxStyleSheet* GetStyleSheet( ULONG nPara ); void SetParaAttribs( USHORT nPara, const SfxItemSet& ); SfxItemSet GetParaAttribs( USHORT nPara ); @@ -926,9 +926,9 @@ public: BOOL Expand( Paragraph* ); BOOL Collapse( Paragraph* ); - void SetParaFlag( Paragraph* pPara, sal_uInt16 nFlag ); - void RemoveParaFlag( Paragraph* pPara, sal_uInt16 nFlag ); - bool HasParaFlag( const Paragraph* pPara, sal_uInt16 nFlag ) const; + void SetParaFlag( Paragraph* pPara, sal_uInt16 nFlag ); + void RemoveParaFlag( Paragraph* pPara, sal_uInt16 nFlag ); + bool HasParaFlag( const Paragraph* pPara, sal_uInt16 nFlag ) const; // gibt ein Array mit den Bulletbreiten der n Einrueckebenen // zurueck. Letzter Wert muss -1 sein. Wird vom Outliner geloescht. @@ -954,7 +954,7 @@ public: void QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel ); void QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel ); - void QuickInsertLineBreak( const ESelection& rSel ); + void QuickInsertLineBreak( const ESelection& rSel ); // nur fuer EditEngine-Modus void QuickInsertText( const String& rText, const ESelection& rSel ); @@ -963,13 +963,13 @@ public: void QuickFormatDoc( BOOL bFull = FALSE ); BOOL UpdateFields(); - void RemoveFields( BOOL bKeepFieldText, TypeId aType = NULL ); + void RemoveFields( BOOL bKeepFieldText, TypeId aType = NULL ); virtual void FieldClicked( const SvxFieldItem& rField, USHORT nPara, xub_StrLen nPos ); virtual void FieldSelected( const SvxFieldItem& rField, USHORT nPara, xub_StrLen nPos ); virtual String CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, xub_StrLen nPos, Color*& rTxtColor, Color*& rFldColor ); - void SetSpeller( ::com::sun::star::uno::Reference< + void SetSpeller( ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > &xSpeller ); ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > @@ -977,18 +977,18 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenator > GetHyphenator() const; - void SetHyphenator( ::com::sun::star::uno::Reference< + void SetHyphenator( ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenator >& xHyph ); - void SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars ); + void SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars ); rtl::Reference<SvxForbiddenCharactersTable> GetForbiddenCharsTable() const; // Depricated - void SetDefaultLanguage( LanguageType eLang ); - LanguageType GetDefaultLanguage() const; + void SetDefaultLanguage( LanguageType eLang ); + LanguageType GetDefaultLanguage() const; - BOOL HasOnlineSpellErrors() const; - void CompleteOnlineSpelling(); + BOOL HasOnlineSpellErrors() const; + void CompleteOnlineSpelling(); EESpellState HasSpellErrors(); BOOL HasText( const SvxSearchItem& rSearchItem ); @@ -1009,9 +1009,9 @@ public: ULONG GetTextHeight() const; ULONG GetTextHeight( ULONG nParagraph ) const; Point GetDocPosTopLeft( ULONG nParagraph ); - Point GetDocPos( const Point& rPaperPos ) const; - BOOL IsTextPos( const Point& rPaperPos, USHORT nBorder = 0 ); - BOOL IsTextPos( const Point& rPaperPos, USHORT nBorder, BOOL* pbBuuletPos ); + Point GetDocPos( const Point& rPaperPos ) const; + BOOL IsTextPos( const Point& rPaperPos, USHORT nBorder = 0 ); + BOOL IsTextPos( const Point& rPaperPos, USHORT nBorder, BOOL* pbBuuletPos ); void SetGlobalCharStretching( USHORT nX = 100, USHORT nY = 100 ); void GetGlobalCharStretching( USHORT& rX, USHORT& rY ); @@ -1027,7 +1027,7 @@ public: // this is needed for StarOffice Api void SetLevelDependendStyleSheet( USHORT nPara ); - USHORT GetOutlinerMode() const { return nOutlinerMode & OUTLINERMODE_USERMASK; } + USHORT GetOutlinerMode() const { return nOutlinerMode & OUTLINERMODE_USERMASK; } void StartSpelling(EditView& rEditView, sal_Bool bMultipleDoc); //spell and return a sentence @@ -1039,12 +1039,12 @@ public: void EndSpelling(); /** sets a link that is called at the beginning of a drag operation at an edit view */ - void SetBeginDropHdl( const Link& rLink ); - Link GetBeginDropHdl() const; + void SetBeginDropHdl( const Link& rLink ); + Link GetBeginDropHdl() const; /** sets a link that is called at the end of a drag operation at an edit view */ - void SetEndDropHdl( const Link& rLink ); - Link GetEndDropHdl() const; + void SetEndDropHdl( const Link& rLink ); + Link GetEndDropHdl() const; /** sets a link that is called before a drop or paste operation. */ void SetBeginPasteOrDropHdl( const Link& rLink ); diff --git a/editeng/inc/editeng/outlobj.hxx b/editeng/inc/editeng/outlobj.hxx index 25ecec238d23..c402675bcda1 100644 --- a/editeng/inc/editeng/outlobj.hxx +++ b/editeng/inc/editeng/outlobj.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,8 +52,8 @@ private: public: // constructors/destructor OutlinerParaObject( - const EditTextObject& rEditTextObject, - const ParagraphDataVector& rParagraphDataVector = ParagraphDataVector(), + const EditTextObject& rEditTextObject, + const ParagraphDataVector& rParagraphDataVector = ParagraphDataVector(), bool bIsEditDoc = true); OutlinerParaObject(const OutlinerParaObject& rCandidate); ~OutlinerParaObject(); diff --git a/editeng/inc/editeng/paperinf.hxx b/editeng/inc/editeng/paperinf.hxx index 31d2748539e5..a4c32f678893 100644 --- a/editeng/inc/editeng/paperinf.hxx +++ b/editeng/inc/editeng/paperinf.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/editeng/inc/editeng/paragraphdata.hxx b/editeng/inc/editeng/paragraphdata.hxx index cb56f74eaeb6..b869a801e177 100644 --- a/editeng/inc/editeng/paragraphdata.hxx +++ b/editeng/inc/editeng/paragraphdata.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ class ParagraphData friend class OutlinerParaObject; protected: - sal_Int16 nDepth; + sal_Int16 nDepth; sal_Int16 mnNumberingStartValue; sal_Bool mbParaIsNumberingRestart; diff --git a/editeng/inc/editeng/paravertalignitem.hxx b/editeng/inc/editeng/paravertalignitem.hxx index 3bb59a20d540..ed8f0af6d818 100644 --- a/editeng/inc/editeng/paravertalignitem.hxx +++ b/editeng/inc/editeng/paravertalignitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,10 +51,10 @@ public: SvxParaVertAlignItem( sal_uInt16 nValue /*= 0*/, const sal_uInt16 nId ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream & rStrm, USHORT nIVer) const; - virtual USHORT GetVersion( USHORT nFileVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Create(SvStream &, USHORT) const; + virtual SvStream& Store(SvStream & rStrm, USHORT nIVer) const; + virtual USHORT GetVersion( USHORT nFileVersion ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -73,7 +73,7 @@ public: return *this; } - virtual int operator==( const SfxPoolItem& ) const; + virtual int operator==( const SfxPoolItem& ) const; }; diff --git a/editeng/inc/editeng/pbinitem.hxx b/editeng/inc/editeng/pbinitem.hxx index 2773627e1cb9..6f217a1f2cad 100644 --- a/editeng/inc/editeng/pbinitem.hxx +++ b/editeng/inc/editeng/pbinitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,11 +35,11 @@ // define ---------------------------------------------------------------- -#define PAPERBIN_PRINTER_SETTINGS ((BYTE)0xFF) +#define PAPERBIN_PRINTER_SETTINGS ((BYTE)0xFF) // class SvxPaperBinItem ------------------------------------------------- -/* [Beschreibung] +/* [Beschreibung] Dieses Item beschreibt die Auswahl eines Papierschachts des Drucker. */ @@ -56,8 +56,8 @@ public: // "pure virtual Methoden" vom SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create( SvStream &, USHORT ) const; - virtual SvStream& Store( SvStream &, USHORT nItemVersion ) const; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + virtual SvStream& Store( SvStream &, USHORT nItemVersion ) const; + virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; diff --git a/editeng/inc/editeng/pgrditem.hxx b/editeng/inc/editeng/pgrditem.hxx index 80c503d96e45..16877f55a478 100644 --- a/editeng/inc/editeng/pgrditem.hxx +++ b/editeng/inc/editeng/pgrditem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,7 +52,7 @@ public: // "pure virtual Methoden" vom SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual USHORT GetVersion( USHORT nFileVersion ) const; + virtual USHORT GetVersion( USHORT nFileVersion ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/editeng/inc/editeng/pmdlitem.hxx b/editeng/inc/editeng/pmdlitem.hxx index 71fba1248bbf..a474e287b27f 100644 --- a/editeng/inc/editeng/pmdlitem.hxx +++ b/editeng/inc/editeng/pmdlitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,8 +60,8 @@ public: SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); BOOL IsAuto() const { return bAuto; } }; diff --git a/editeng/inc/editeng/postitem.hxx b/editeng/inc/editeng/postitem.hxx index 5503438dd343..2b0e8639fcb4 100644 --- a/editeng/inc/editeng/postitem.hxx +++ b/editeng/inc/editeng/postitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,16 +63,16 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; - virtual String GetValueTextByPos( USHORT nPos ) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; + virtual String GetValueTextByPos( USHORT nPos ) const; virtual USHORT GetValueCount() const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); - virtual int HasBoolValue() const; - virtual BOOL GetBoolValue() const; - virtual void SetBoolValue( BOOL bVal ); + virtual int HasBoolValue() const; + virtual BOOL GetBoolValue() const; + virtual void SetBoolValue( BOOL bVal ); inline SvxPostureItem& operator=(const SvxPostureItem& rPost) { SetValue( rPost.GetValue() ); @@ -80,9 +80,9 @@ public: } // enum cast - FontItalic GetPosture() const + FontItalic GetPosture() const { return (FontItalic)GetValue(); } - void SetPosture( FontItalic eNew ) + void SetPosture( FontItalic eNew ) { SetValue( (USHORT)eNew ); } }; diff --git a/editeng/inc/editeng/prntitem.hxx b/editeng/inc/editeng/prntitem.hxx index efc07aa6f037..d05b9355db5f 100644 --- a/editeng/inc/editeng/prntitem.hxx +++ b/editeng/inc/editeng/prntitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ public: // "pure virtual Methoden" vom SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/editeng/inc/editeng/protitem.hxx b/editeng/inc/editeng/protitem.hxx index d1a437d3057d..dec9414fdc51 100644 --- a/editeng/inc/editeng/protitem.hxx +++ b/editeng/inc/editeng/protitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,7 +62,7 @@ public: inline SvxProtectItem &operator=( const SvxProtectItem &rCpy ); // "pure virtual Methoden" vom SfxPoolItem - virtual int operator==( const SfxPoolItem& ) const; + virtual int operator==( const SfxPoolItem& ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -71,8 +71,8 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; + virtual SfxPoolItem* Create(SvStream &, USHORT) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; BOOL IsCntntProtected() const { return bCntnt; } BOOL IsSizeProtected() const { return bSize; } @@ -81,8 +81,8 @@ public: void SetSizeProtect ( BOOL bNew ) { bSize = bNew; } void SetPosProtect ( BOOL bNew ) { bPos = bNew; } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); }; inline SvxProtectItem::SvxProtectItem( const USHORT nId ) diff --git a/editeng/inc/editeng/prszitem.hxx b/editeng/inc/editeng/prszitem.hxx index 9bc2b5e13499..d0eec00ffb57 100644 --- a/editeng/inc/editeng/prszitem.hxx +++ b/editeng/inc/editeng/prszitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 SvxPropSizeItem ------------------------------------------------- -/* [Beschreibung] +/* [Beschreibung] Dieses Item beschreibt die relative Schriftgroesse. */ @@ -51,7 +51,7 @@ public: // "pure virtual Methoden" vom SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/editeng/inc/editeng/scriptspaceitem.hxx b/editeng/inc/editeng/scriptspaceitem.hxx index 2bd3778e5509..a2c9b419e9a4 100644 --- a/editeng/inc/editeng/scriptspaceitem.hxx +++ b/editeng/inc/editeng/scriptspaceitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,9 +49,9 @@ public: SvxScriptSpaceItem( sal_Bool bOn /*= sal_False*/, const sal_uInt16 nId ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual USHORT GetVersion( USHORT nFileVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Create(SvStream &, USHORT) const; + virtual USHORT GetVersion( USHORT nFileVersion ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/editeng/inc/editeng/scripttypeitem.hxx b/editeng/inc/editeng/scripttypeitem.hxx index 2e22a89ea176..45d93ea15d60 100644 --- a/editeng/inc/editeng/scripttypeitem.hxx +++ b/editeng/inc/editeng/scripttypeitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/editeng/inc/editeng/shaditem.hxx b/editeng/inc/editeng/shaditem.hxx index f09ad7fd2e86..1ecaa399175f 100644 --- a/editeng/inc/editeng/shaditem.hxx +++ b/editeng/inc/editeng/shaditem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,21 +42,21 @@ namespace rtl // class SvxShadowItem --------------------------------------------------- -/* [Beschreibung] +/* [Beschreibung] Dieses Item beschreibt ein Schattenattribut (Farbe, Breite, Lage). */ -#define SHADOW_TOP ((USHORT)0) -#define SHADOW_BOTTOM ((USHORT)1) -#define SHADOW_LEFT ((USHORT)2) -#define SHADOW_RIGHT ((USHORT)3) +#define SHADOW_TOP ((USHORT)0) +#define SHADOW_BOTTOM ((USHORT)1) +#define SHADOW_LEFT ((USHORT)2) +#define SHADOW_RIGHT ((USHORT)3) class EDITENG_DLLPUBLIC SvxShadowItem : public SfxEnumItemInterface { - Color aShadowColor; - USHORT nWidth; - SvxShadowLocation eLocation; + Color aShadowColor; + USHORT nWidth; + SvxShadowLocation eLocation; public: TYPEINFO(); @@ -67,22 +67,22 @@ public: inline SvxShadowItem& operator=( const SvxShadowItem& rFmtShadow ); // "pure virtual Methoden" vom SfxPoolItem - virtual int operator==( const SfxPoolItem& ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual int operator==( const SfxPoolItem& ) const; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Create(SvStream &, USHORT) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; virtual bool ScaleMetrics( long nMult, long nDiv ); - virtual bool HasMetrics() const; + virtual bool HasMetrics() const; - const Color& GetColor() const { return aShadowColor;} + const Color& GetColor() const { return aShadowColor;} void SetColor( const Color &rNew ) { aShadowColor = rNew; } USHORT GetWidth() const { return nWidth; } @@ -94,10 +94,10 @@ public: //Breite des Schattens auf der jeweiligen Seite berechnen. USHORT CalcShadowSpace( USHORT nShadow ) const; - virtual USHORT GetValueCount() const; - virtual String GetValueTextByPos( USHORT nPos ) const; - virtual USHORT GetEnumValue() const; - virtual void SetEnumValue( USHORT nNewVal ); + virtual USHORT GetValueCount() const; + virtual String GetValueTextByPos( USHORT nPos ) const; + virtual USHORT GetEnumValue() const; + virtual void SetEnumValue( USHORT nNewVal ); }; inline SvxShadowItem &SvxShadowItem::operator=( const SvxShadowItem& rFmtShadow ) diff --git a/editeng/inc/editeng/shdditem.hxx b/editeng/inc/editeng/shdditem.hxx index a5b356dde834..ec47d7e4e5fb 100644 --- a/editeng/inc/editeng/shdditem.hxx +++ b/editeng/inc/editeng/shdditem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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: // "pure virtual Methoden" vom SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/editeng/inc/editeng/sizeitem.hxx b/editeng/inc/editeng/sizeitem.hxx index 7c40f8c9fbad..a3b71805c7fa 100644 --- a/editeng/inc/editeng/sizeitem.hxx +++ b/editeng/inc/editeng/sizeitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,23 +55,23 @@ public: inline SvxSizeItem& operator=( const SvxSizeItem &rCpy ); // "pure virtual Methoden" vom SfxPoolItem - virtual int operator==( const SfxPoolItem& ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual int operator==( const SfxPoolItem& ) const; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Create(SvStream &, USHORT) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; virtual bool ScaleMetrics( long nMult, long nDiv ); - virtual bool HasMetrics() const; + virtual bool HasMetrics() const; const Size& GetSize() const { return aSize; } - void SetSize(const Size& rSize) { aSize = rSize; } + void SetSize(const Size& rSize) { aSize = rSize; } }; inline SvxSizeItem& SvxSizeItem::operator=( const SvxSizeItem &rCpy ) diff --git a/editeng/inc/editeng/spltitem.hxx b/editeng/inc/editeng/spltitem.hxx index a5178ca8e15d..311f0e14f040 100644 --- a/editeng/inc/editeng/spltitem.hxx +++ b/editeng/inc/editeng/spltitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,9 +57,9 @@ public: inline SvxFmtSplitItem& operator=( const SvxFmtSplitItem& rSplit ); // "pure virtual Methoden" vom SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream&, USHORT ) const; - virtual SvStream& Store( SvStream& , USHORT nItemVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Create( SvStream&, USHORT ) const; + virtual SvStream& Store( SvStream& , USHORT nItemVersion ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/editeng/inc/editeng/splwrap.hxx b/editeng/inc/editeng/splwrap.hxx index b5efad92a40d..67d03a7b7788 100644 --- a/editeng/inc/editeng/splwrap.hxx +++ b/editeng/inc/editeng/splwrap.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,28 +59,28 @@ private: friend class SvxHyphenWordDialog; friend class SvxHyphenWordDialog_Impl; - Window* pWin; + Window* pWin; ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface > xLast; // result of last spelling/hyphenation attempt + ::com::sun::star::uno::XInterface > xLast; // result of last spelling/hyphenation attempt ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > xSpell; ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XHyphenator > xHyph; - sal_uInt16 nOldLang; // Sprache merken, nur bei Aenderung SetLanguage rufen - sal_Bool bOtherCntnt : 1; // gesetzt => Sonderbereiche zunaechst pruefen - sal_Bool bDialog : 1; // Ist pWin der Svx...Dialog? - sal_Bool bHyphen : 1; // Trennen statt Spellen - sal_Bool bAuto : 1; // Autokorrektur vorhanden? - sal_Bool bReverse : 1; // Rueckwaerts Spellen - sal_Bool bStartDone : 1; // Vorderen Teil bereits korrigiert - sal_Bool bEndDone : 1; // Hinteren Teil bereits korrigiert - sal_Bool bStartChk : 1; // Vorderen Teil pruefen - sal_Bool bRevAllowed : 1; // Niemals rueckwaerts spellen - sal_Bool bAllRight : 1; // falsche Woerter in geignetes Woerterbuch + ::com::sun::star::linguistic2::XHyphenator > xHyph; + sal_uInt16 nOldLang; // Sprache merken, nur bei Aenderung SetLanguage rufen + sal_Bool bOtherCntnt : 1; // gesetzt => Sonderbereiche zunaechst pruefen + sal_Bool bDialog : 1; // Ist pWin der Svx...Dialog? + sal_Bool bHyphen : 1; // Trennen statt Spellen + sal_Bool bAuto : 1; // Autokorrektur vorhanden? + sal_Bool bReverse : 1; // Rueckwaerts Spellen + sal_Bool bStartDone : 1; // Vorderen Teil bereits korrigiert + sal_Bool bEndDone : 1; // Hinteren Teil bereits korrigiert + sal_Bool bStartChk : 1; // Vorderen Teil pruefen + sal_Bool bRevAllowed : 1; // Niemals rueckwaerts spellen + sal_Bool bAllRight : 1; // falsche Woerter in geignetes Woerterbuch // aufnehmen und nicht den Dialog starten. - EDITENG_DLLPRIVATE sal_Bool SpellNext(); // naechsten Bereich anwaehlen - sal_Bool FindSpellError(); // Suche nach Fehlern ( ueber Bereiche hinweg ) + EDITENG_DLLPRIVATE sal_Bool SpellNext(); // naechsten Bereich anwaehlen + sal_Bool FindSpellError(); // Suche nach Fehlern ( ueber Bereiche hinweg ) public: SvxSpellWrapper( Window* pWn, @@ -95,57 +95,57 @@ public: virtual ~SvxSpellWrapper(); - static sal_Int16 CheckSpellLang( + static sal_Int16 CheckSpellLang( ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > xSpell, sal_Int16 nLang ); - static sal_Int16 CheckHyphLang( + static sal_Int16 CheckHyphLang( ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenator > xHyph, sal_Int16 nLang ); - static void ShowLanguageErrors(); + static void ShowLanguageErrors(); - void SpellDocument(); // Rechtschreibpruefung durchfuehren + void SpellDocument(); // Rechtschreibpruefung durchfuehren inline sal_Bool IsStartDone(){ return bStartDone; } inline sal_Bool IsEndDone(){ return bEndDone; } inline sal_Bool IsReverse(){ return bReverse; } inline sal_Bool IsDialog(){ return bDialog; } // SvxSpellCheckDialog OnScreen inline sal_Bool IsHyphen(){ return bHyphen; } // Trennen statt Spellen - inline void SetHyphen( const sal_Bool bNew = sal_True ){ bHyphen = bNew; } + inline void SetHyphen( const sal_Bool bNew = sal_True ){ bHyphen = bNew; } inline ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > GetXSpellChecker() { return xSpell; } inline ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenator > - GetXHyphenator() { return xHyph; } - inline sal_Bool IsAllRight() { return bAllRight; } - inline Window* GetWin() { return pWin; } + GetXHyphenator() { return xHyph; } + inline sal_Bool IsAllRight() { return bAllRight; } + inline Window* GetWin() { return pWin; } // kann evtl entfallen in ONE_LINGU: - inline void SetOldLang( const sal_uInt16 nNew ){ nOldLang = nNew; } + inline void SetOldLang( const sal_uInt16 nNew ){ nOldLang = nNew; } // kann evtl entfallen in ONE_LINGU: - inline void ChangeLanguage( const sal_uInt16 nNew ) // rufe ggf. SetLanguage + inline void ChangeLanguage( const sal_uInt16 nNew ) // rufe ggf. SetLanguage { if ( nNew != nOldLang ) { SetLanguage( nNew ); nOldLang = nNew; } } - inline void EnableAutoCorrect() { bAuto = sal_True; } + inline void EnableAutoCorrect() { bAuto = sal_True; } protected: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - GetLast() { return xLast; } - void SetLast(const ::com::sun::star::uno::Reference< + GetLast() { return xLast; } + void SetLast(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > &xNewLast) { xLast = xNewLast; } - virtual sal_Bool SpellMore(); // weitere Dokumente pruefen? - virtual sal_Bool HasOtherCnt(); // gibt es ueberhaupt Sonderbereiche - virtual void SpellStart( SvxSpellArea eSpell ); // Bereich vorbereiten - virtual sal_Bool SpellContinue(); // Bereich pruefen + virtual sal_Bool SpellMore(); // weitere Dokumente pruefen? + virtual sal_Bool HasOtherCnt(); // gibt es ueberhaupt Sonderbereiche + virtual void SpellStart( SvxSpellArea eSpell ); // Bereich vorbereiten + virtual sal_Bool SpellContinue(); // Bereich pruefen // Ergebnis mit GetLast verfuegbar - virtual void ReplaceAll( const String &rNewText, sal_Int16 nLanguage ); // Wort aus Replace-Liste ersetzen - virtual void StartThesaurus( const String &rWord, sal_uInt16 nLang ); // Thesaurus starten + virtual void ReplaceAll( const String &rNewText, sal_Int16 nLanguage ); // Wort aus Replace-Liste ersetzen + virtual void StartThesaurus( const String &rWord, sal_uInt16 nLang ); // Thesaurus starten virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > GetAllRightDic() const; - virtual void SpellEnd(); // Bereich abschliessen + virtual void SpellEnd(); // Bereich abschliessen virtual void ScrollArea(); // ScrollArea einstellen // Wort ersetzen virtual void ChangeWord( const String& rNewWord, const sal_uInt16 nLang ); diff --git a/editeng/inc/editeng/svxacorr.hxx b/editeng/inc/editeng/svxacorr.hxx index ddaa793306a2..fe8b7ca4babd 100644 --- a/editeng/inc/editeng/svxacorr.hxx +++ b/editeng/inc/editeng/svxacorr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,24 +51,24 @@ class SotStorage; class Window; // Flags fuer die AutoKorrekt-Flags -const long CptlSttSntnc = 0x00000001; // Gross-Buchstaben am SatzAnfang -const long CptlSttWrd = 0x00000002; // keine 2 Gr.-Buchst. am WordAnfang -const long AddNonBrkSpace = 0x00000004; // Add non breaking space before :;?! -const long ChgOrdinalNumber = 0x00000008; // Ordinal-Number 1st, 2nd,.. -const long ChgToEnEmDash = 0x00000010; // - -> Endash/Emdash -const long ChgWeightUnderl = 0x00000020; // * -> Fett, _ -> unterstreichen -const long SetINetAttr = 0x00000040; // INetAttribut setzen -const long Autocorrect = 0x00000080; // Autokorrektur aufrufen -const long ChgQuotes = 0x00000100; // doppelte Quotes ersetzen -const long SaveWordCplSttLst= 0x00000200; // GrB. am SatzAnf. auto. aufnehmen -const long SaveWordWrdSttLst= 0x00000400; // 2 GrB. am WortAnf. auto. aufnehmen -const long IgnoreDoubleSpace= 0x00000800; // 2 Spaces ignorieren -const long ChgSglQuotes = 0x00001000; // einfache Quotes ersetzen +const long CptlSttSntnc = 0x00000001; // Gross-Buchstaben am SatzAnfang +const long CptlSttWrd = 0x00000002; // keine 2 Gr.-Buchst. am WordAnfang +const long AddNonBrkSpace = 0x00000004; // Add non breaking space before :;?! +const long ChgOrdinalNumber = 0x00000008; // Ordinal-Number 1st, 2nd,.. +const long ChgToEnEmDash = 0x00000010; // - -> Endash/Emdash +const long ChgWeightUnderl = 0x00000020; // * -> Fett, _ -> unterstreichen +const long SetINetAttr = 0x00000040; // INetAttribut setzen +const long Autocorrect = 0x00000080; // Autokorrektur aufrufen +const long ChgQuotes = 0x00000100; // doppelte Quotes ersetzen +const long SaveWordCplSttLst= 0x00000200; // GrB. am SatzAnf. auto. aufnehmen +const long SaveWordWrdSttLst= 0x00000400; // 2 GrB. am WortAnf. auto. aufnehmen +const long IgnoreDoubleSpace= 0x00000800; // 2 Spaces ignorieren +const long ChgSglQuotes = 0x00001000; // einfache Quotes ersetzen const long CorrectCapsLock = 0x00002000; // Correct accidental use of cAPS LOCK key -const long ChgWordLstLoad = 0x20000000; // Ersetzungsliste geladen -const long CplSttLstLoad = 0x40000000; // Exceptionlist fuer CplStart geladen -const long WrdSttLstLoad = 0x80000000; // Exceptionlist fuer WordStart geladen +const long ChgWordLstLoad = 0x20000000; // Ersetzungsliste geladen +const long CplSttLstLoad = 0x40000000; // Exceptionlist fuer CplStart geladen +const long WrdSttLstLoad = 0x80000000; // Exceptionlist fuer WordStart geladen // TODO: handle unicodes > U+FFFF and check users of this class @@ -92,17 +92,17 @@ public: // Dieser darf nicht leer sein! // Gibt es diesen nicht oder gibt es davor nur Leere, dann returne 0 // Das Flag gibt an: - // TRUE: den, vor der normalen Einfuegeposition (TRUE) - // FALSE: den, in den das korrigierte Wort eingfuegt wurde. - // (Muss nicht der gleiche Absatz sein!!!!) + // TRUE: den, vor der normalen Einfuegeposition (TRUE) + // FALSE: den, in den das korrigierte Wort eingfuegt wurde. + // (Muss nicht der gleiche Absatz sein!!!!) virtual const String* GetPrevPara( BOOL bAtNormalPos ) = 0; virtual BOOL ChgAutoCorrWord( xub_StrLen& rSttPos, xub_StrLen nEndPos, SvxAutoCorrect& rACorrect, const String** ppPara ) = 0; // wird nach dem austauschen der Zeichen von den Funktionen - // - FnCptlSttWrd - // - FnCptlSttSntnc + // - FnCptlSttWrd + // - FnCptlSttSntnc // gerufen. Dann koennen die Worte ggfs. in die Ausnahmelisten // aufgenommen werden. virtual void SaveCpltSttWord( ULONG nFlag, xub_StrLen nPos, @@ -117,15 +117,15 @@ public: class EDITENG_DLLPUBLIC SvxAutocorrWord { String sShort, sLong; - BOOL bIsTxtOnly; // ist reiner ASCII - Text + BOOL bIsTxtOnly; // ist reiner ASCII - Text public: SvxAutocorrWord( const String& rS, const String& rL, BOOL bFlag = TRUE ) : sShort( rS ), sLong( rL ), bIsTxtOnly( bFlag ) {} - const String& GetShort() const { return sShort; } - const String& GetLong() const { return sLong; } - BOOL IsTextOnly() const { return bIsTxtOnly; } + const String& GetShort() const { return sShort; } + const String& GetLong() const { return sLong; } + BOOL IsTextOnly() const { return bIsTxtOnly; } }; typedef SvxAutocorrWord* SvxAutocorrWordPtr; @@ -138,11 +138,11 @@ class EDITENG_DLLPUBLIC SvxAutoCorrectLanguageLists Date aModifiedDate; Time aModifiedTime, aLastCheckTime; - LanguageType eLanguage; //LANGUAGE_DONTKNOW fuer alle Sprachen verwenden - SvStringsISortDtor* pCplStt_ExcptLst; - SvStringsISortDtor* pWrdStt_ExcptLst; - SvxAutocorrWordList* pAutocorr_List; - SvxAutoCorrect& rAutoCorrect; + LanguageType eLanguage; //LANGUAGE_DONTKNOW fuer alle Sprachen verwenden + SvStringsISortDtor* pCplStt_ExcptLst; + SvStringsISortDtor* pWrdStt_ExcptLst; + SvxAutocorrWordList* pAutocorr_List; + SvxAutoCorrect& rAutoCorrect; long nFlags; @@ -188,13 +188,13 @@ public: BOOL AddToWrdSttExceptList(const String& rNew); // Speichern von Wortersetzungen: - // Diese speichern direkt im Storage. Die Wortliste wird - // entsprechend aktualisiert! - // - purer Text + // Diese speichern direkt im Storage. Die Wortliste wird + // entsprechend aktualisiert! + // - purer Text BOOL PutText( const String& rShort, const String& rLong ); - // - Text mit Attributierung (kann nur der SWG - SWG-Format!) + // - Text mit Attributierung (kann nur der SWG - SWG-Format!) BOOL PutText( const String& rShort, SfxObjectShell& ); - // - loesche einen Eintrag + // - loesche einen Eintrag BOOL DeleteText( const String& rShort ); }; @@ -205,7 +205,7 @@ class EDITENG_DLLPUBLIC SvxAutoCorrect String sShareAutoCorrFile, sUserAutoCorrFile; - SvxSwAutoFmtFlags aSwFlags; // StarWriter AutoFormat-Flags + SvxSwAutoFmtFlags aSwFlags; // StarWriter AutoFormat-Flags // alle Sprachen in einer Tabelle SvxAutoCorrLanguageTable_Impl* pLangTable; @@ -227,16 +227,16 @@ class EDITENG_DLLPUBLIC SvxAutoCorrect void _GetCharClass( LanguageType eLang ); protected: - // - Text mit Attributierung (kann nur der SWG - SWG-Format!) - // rShort ist der Stream-Name - gecryptet! + // - Text mit Attributierung (kann nur der SWG - SWG-Format!) + // rShort ist der Stream-Name - gecryptet! virtual BOOL PutText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rStg, const String& rFileName, const String& rShort, SfxObjectShell& , String& ); // geforderte Sprache in die Tabelle eintragen gfs. nur wenn das file existiert - BOOL CreateLanguageFile(LanguageType eLang, BOOL bNewFile = TRUE); - // - return den Ersetzungstext (nur fuer SWG-Format, alle anderen - // koennen aus der Wortliste herausgeholt werden!) - // rShort ist der Stream-Name - gecryptet! + BOOL CreateLanguageFile(LanguageType eLang, BOOL bNewFile = TRUE); + // - return den Ersetzungstext (nur fuer SWG-Format, alle anderen + // koennen aus der Wortliste herausgeholt werden!) + // rShort ist der Stream-Name - gecryptet! public: sal_Unicode GetQuote( sal_Unicode cInsChar, BOOL bSttQuote, @@ -265,22 +265,22 @@ public: // rStt - die gefundene Startposition // nEnd - zu ueberpruefende Position - ab dieser Pos nach vorne // rLang - Input: in welcher Sprache wird gesucht - // Output: in welcher "Sprach-Liste" wurde es gefunden + // Output: in welcher "Sprach-Liste" wurde es gefunden const SvxAutocorrWord* SearchWordsInList( const String& rTxt, xub_StrLen& rStt, xub_StrLen nEndPos, SvxAutoCorrDoc& rDoc, LanguageType& rLang ); // erfrage / setze die Zeichen fuer die Quote-Ersetzung - sal_Unicode GetStartSingleQuote() const { return cStartSQuote; } - sal_Unicode GetEndSingleQuote() const { return cEndSQuote; } - sal_Unicode GetStartDoubleQuote() const { return cStartDQuote; } - sal_Unicode GetEndDoubleQuote() const { return cEndDQuote; } + sal_Unicode GetStartSingleQuote() const { return cStartSQuote; } + sal_Unicode GetEndSingleQuote() const { return cEndSQuote; } + sal_Unicode GetStartDoubleQuote() const { return cStartDQuote; } + sal_Unicode GetEndDoubleQuote() const { return cEndDQuote; } - void SetStartSingleQuote( const sal_Unicode cStart ) { cStartSQuote = cStart; } - void SetEndSingleQuote( const sal_Unicode cEnd ) { cEndSQuote = cEnd; } - void SetStartDoubleQuote( const sal_Unicode cStart ) { cStartDQuote = cStart; } - void SetEndDoubleQuote( const sal_Unicode cEnd ) { cEndDQuote = cEnd; } + void SetStartSingleQuote( const sal_Unicode cStart ) { cStartSQuote = cStart; } + void SetEndSingleQuote( const sal_Unicode cEnd ) { cEndSQuote = cEnd; } + void SetStartDoubleQuote( const sal_Unicode cStart ) { cStartDQuote = cStart; } + void SetEndDoubleQuote( const sal_Unicode cEnd ) { cEndDQuote = cEnd; } String GetQuote( SvxAutoCorrDoc& rDoc, xub_StrLen nInsPos, sal_Unicode cInsChar, BOOL bSttQuote ); @@ -296,8 +296,8 @@ public: void SetShareAutoCorrFileName( const String& rNew ); // erfrage / setze die aktuellen Einstellungen der AutoKorrektur - long GetFlags() const { return nFlags; } - inline SvxSwAutoFmtFlags& GetSwFlags() { return aSwFlags;} + long GetFlags() const { return nFlags; } + inline SvxSwAutoFmtFlags& GetSwFlags() { return aSwFlags;} BOOL IsAutoCorrFlag( long nFlag ) const { return nFlags & nFlag ? TRUE : FALSE; } void SetAutoCorrFlag( long nFlag, BOOL bOn = TRUE ); @@ -311,16 +311,16 @@ public: { return _GetLanguageList( eLang ).GetAutocorrWordList(); } // Speichern von Wortersetzungen: - // Diese speichern direkt im Storage. Die Wortliste wird - // entsprechend aktualisiert! - // - purer Text + // Diese speichern direkt im Storage. Die Wortliste wird + // entsprechend aktualisiert! + // - purer Text BOOL PutText( const String& rShort, const String& rLong, LanguageType eLang = LANGUAGE_SYSTEM ); - // - Text mit Attributierung (kann nur der SWG - SWG-Format!) + // - Text mit Attributierung (kann nur der SWG - SWG-Format!) BOOL PutText( const String& rShort, SfxObjectShell& rShell, LanguageType eLang = LANGUAGE_SYSTEM ) { return _GetLanguageList( eLang ).PutText(rShort, rShell ); } - // - loesche einen Eintrag + // - loesche einen Eintrag BOOL DeleteText( const String& rShort, LanguageType eLang = LANGUAGE_SYSTEM); // Lade, Setze, Gebe - die Ausnahmeliste fuer Grossbuchstabe am @@ -328,10 +328,10 @@ public: void SaveCplSttExceptList( LanguageType eLang = LANGUAGE_SYSTEM ); SvStringsISortDtor* LoadCplSttExceptList( LanguageType eLang = LANGUAGE_SYSTEM) - { return _GetLanguageList( eLang ).LoadCplSttExceptList(); } + { return _GetLanguageList( eLang ).LoadCplSttExceptList(); } const SvStringsISortDtor* GetCplSttExceptList( LanguageType eLang = LANGUAGE_SYSTEM ) - { return _GetLanguageList( eLang ).GetCplSttExceptList(); } + { return _GetLanguageList( eLang ).GetCplSttExceptList(); } // fuegt ein einzelnes Wort hinzu. Die Liste wird sofort // in die Datei geschrieben! @@ -343,10 +343,10 @@ public: void SaveWrdSttExceptList( LanguageType eLang = LANGUAGE_SYSTEM ); SvStringsISortDtor* LoadWrdSttExceptList( LanguageType eLang = LANGUAGE_SYSTEM ) - { return _GetLanguageList( eLang ).LoadWrdSttExceptList(); } + { return _GetLanguageList( eLang ).LoadWrdSttExceptList(); } const SvStringsISortDtor* GetWrdSttExceptList( LanguageType eLang = LANGUAGE_SYSTEM ) - { return _GetLanguageList( eLang ).GetWrdSttExceptList(); } + { return _GetLanguageList( eLang ).GetWrdSttExceptList(); } // fuegt ein einzelnes Wort hinzu. Die Liste wird sofort // in die Datei geschrieben! BOOL AddWrtSttException( const String& rNew, LanguageType eLang = LANGUAGE_SYSTEM); @@ -384,12 +384,12 @@ public: bool HasRunNext() { return bRunNext; } - static long GetDefaultFlags(); + static long GetDefaultFlags(); // returns TRUE for charcters where the function // 'SvxAutoCorrect::AutoCorrect' should be called. // (used to avoid occasional 'collisions' with (Thai) input-sequence-checking) - static sal_Bool IsAutoCorrectChar( sal_Unicode cChar ); + static sal_Bool IsAutoCorrectChar( sal_Unicode cChar ); sal_Bool NeedsHardspaceAutocorr( sal_Unicode cChar ); diff --git a/editeng/inc/editeng/svxenum.hxx b/editeng/inc/editeng/svxenum.hxx index 91195f6b4467..37f0276aa16b 100644 --- a/editeng/inc/editeng/svxenum.hxx +++ b/editeng/inc/editeng/svxenum.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -202,9 +202,9 @@ enum SvxSpellArea enum SvxFrameAnchor { - SVX_FLY_AT_CNTNT, //Absatzgebundener Rahmen - SVX_FLY_IN_CNTNT, //Zeichengebundener Rahmen - SVX_FLY_PAGE //Seitengebundener Rahmen + SVX_FLY_AT_CNTNT, //Absatzgebundener Rahmen + SVX_FLY_IN_CNTNT, //Zeichengebundener Rahmen + SVX_FLY_PAGE //Seitengebundener Rahmen }; enum SvxExtNumType @@ -215,8 +215,8 @@ enum SvxExtNumType SVX_NUM_ROMAN_LOWER, SVX_NUM_ARABIC, SVX_NUM_NUMBER_NONE, - SVX_NUM_CHAR_SPECIAL, //Bullet - SVX_NUM_PAGEDESC, // Numerierung aus der Seitenvorlage + SVX_NUM_CHAR_SPECIAL, //Bullet + SVX_NUM_PAGEDESC, // Numerierung aus der Seitenvorlage SVX_NUM_BITMAP, SVX_NUM_CHARS_UPPER_LETTER_N, // zaehlt von a-z, aa-zz, aaa-zzz SVX_NUM_CHARS_LOWER_LETTER_N diff --git a/editeng/inc/editeng/svxfont.hxx b/editeng/inc/editeng/svxfont.hxx index 69c8f2ca854c..120dd2c03c5a 100644 --- a/editeng/inc/editeng/svxfont.hxx +++ b/editeng/inc/editeng/svxfont.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -25,10 +25,10 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#ifndef _SVX_SVXFONT_HXX -#define _SVX_SVXFONT_HXX +#ifndef _SVX_SVXFONT_HXX +#define _SVX_SVXFONT_HXX -#include <limits.h> // USHRT_MAX +#include <limits.h> // USHRT_MAX #include <editeng/svxenum.hxx> #include <i18npool/lang.h> #include <vcl/font.hxx> @@ -41,7 +41,7 @@ class Printer; class EDITENG_DLLPUBLIC SvxFont : public Font { LanguageType eLang; // Language - SvxCaseMap eCaseMap; // Textauszeichnung + SvxCaseMap eCaseMap; // Textauszeichnung short nEsc; // Grad der Hoch-/Tiefstellung BYTE nPropr; // Grad der Verkleinerung der Fonthoehe short nKern; // Kerning in Pt @@ -119,10 +119,10 @@ public: #endif // !REDUCEDSVXFONT static void DrawArrow( OutputDevice &rOut, const Rectangle& rRect, const Size& rSize, const Color& rCol, BOOL bLeft ); - SvxFont& operator=( const SvxFont& rFont ); - SvxFont& operator=( const Font& rFont ); + SvxFont& operator=( const SvxFont& rFont ); + SvxFont& operator=( const Font& rFont ); }; -#endif // #ifndef _SVX_SVXFONT_HXX +#endif // #ifndef _SVX_SVXFONT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/inc/editeng/svxrtf.hxx b/editeng/inc/editeng/svxrtf.hxx index 307fb5654418..5c92d5a5d79b 100644 --- a/editeng/inc/editeng/svxrtf.hxx +++ b/editeng/inc/editeng/svxrtf.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ namespace com { namespace sun { namespace star { // Mapper-Klassen fuer die verschiedenen Anforderungen an Doc-Positionen -// Swg - NodePosition ist ein SwIndex, der intern veraendert wird +// Swg - NodePosition ist ein SwIndex, der intern veraendert wird // EditEngine - ULONG auf Liste von Absaetzen // ..... @@ -66,8 +66,8 @@ class SvxNodeIdx { public: virtual ~SvxNodeIdx() {} - virtual ULONG GetIdx() const = 0; - virtual SvxNodeIdx* Clone() const = 0; // erzeuge von sich eine Kopie + virtual ULONG GetIdx() const = 0; + virtual SvxNodeIdx* Clone() const = 0; // erzeuge von sich eine Kopie }; class SvxPosition @@ -75,8 +75,8 @@ class SvxPosition public: virtual ~SvxPosition() {} - virtual ULONG GetNodeIdx() const = 0; - virtual xub_StrLen GetCntIdx() const = 0; + virtual ULONG GetNodeIdx() const = 0; + virtual xub_StrLen GetCntIdx() const = 0; virtual SvxPosition* Clone() const = 0; // erzeuge von sich eine Kopie virtual SvxNodeIdx* MakeNodeIdx() const = 0; // erzeuge vom NodeIndex eine Kopie @@ -94,7 +94,7 @@ SV_DECL_PTRARR_STACK( SvxRTFItemStack, SvxRTFItemStackTypePtr, 0, 1 ) // einige Hilfsklassen fuer den RTF-Parser struct SvxRTFStyleType { - SfxItemSet aAttrSet; // die Attribute vom Style (+Ableitung!) + SfxItemSet aAttrSet; // die Attribute vom Style (+Ableitung!) String sName; USHORT nBasedOn, nNext; BOOL bBasedOnIsSet; //$flr #117411# @@ -112,14 +112,14 @@ struct EDITENG_DLLPUBLIC SvxRTFPictureType // Format der Bitmap enum RTF_BMPSTYLE { - RTF_BITMAP, // Bitmap, die Planes sind in den Pict.Daten - WIN_METAFILE, // in den Pict.Daten steht ein Window-Metafile - MAC_QUICKDRAW, // in den Pict.Daten steht ein Mac-QuickDraw - OS2_METAFILE, // in den Pict.Daten steht ein OS2-Metafile - RTF_DI_BMP, // Device Independent Bitmap - ENHANCED_MF, // in den Pict.Daten steht ein Enhanced-Metafile - RTF_PNG, // in den Pict.Daten steht ein PNG file - RTF_JPG // in den Pict.Daten steht ein JPG file + RTF_BITMAP, // Bitmap, die Planes sind in den Pict.Daten + WIN_METAFILE, // in den Pict.Daten steht ein Window-Metafile + MAC_QUICKDRAW, // in den Pict.Daten steht ein Mac-QuickDraw + OS2_METAFILE, // in den Pict.Daten steht ein OS2-Metafile + RTF_DI_BMP, // Device Independent Bitmap + ENHANCED_MF, // in den Pict.Daten steht ein Enhanced-Metafile + RTF_PNG, // in den Pict.Daten steht ein PNG file + RTF_JPG // in den Pict.Daten steht ein JPG file } eStyle; enum RTF_BMPMODE @@ -128,15 +128,15 @@ struct EDITENG_DLLPUBLIC SvxRTFPictureType HEX_MODE } nMode; - USHORT nType; + USHORT nType; sal_uInt32 uPicLen; - USHORT nWidth, nHeight; - USHORT nGoalWidth, nGoalHeight; - USHORT nBitsPerPixel; - USHORT nPlanes; - USHORT nWidthBytes; - USHORT nScalX, nScalY; - short nCropT, nCropB, nCropL, nCropR; + USHORT nWidth, nHeight; + USHORT nGoalWidth, nGoalHeight; + USHORT nBitsPerPixel; + USHORT nPlanes; + USHORT nWidthBytes; + USHORT nScalX, nScalY; + short nCropT, nCropB, nCropL, nCropR; PictPropertyNameValuePairs aPropertyPairs; SvxRTFPictureType() { ResetValues(); } // alle Werte auf default; wird nach einlesen der Bitmap aufgerufen ! @@ -148,7 +148,7 @@ struct EDITENG_DLLPUBLIC SvxRTFPictureType // Die Ids werden ueber die SlotIds vom POOL richtig gesetzt. struct RTFPlainAttrMapIds { - USHORT nCaseMap, + USHORT nCaseMap, nBgColor, nColor, nContour, @@ -191,7 +191,7 @@ struct RTFPlainAttrMapIds // Die Ids werden ueber die SlotIds vom POOL richtig gesetzt. struct RTFPardAttrMapIds { - USHORT nLinespacing, + USHORT nLinespacing, nAdjust, nTabStop, nHyphenzone, @@ -220,45 +220,45 @@ struct RTFPardAttrMapIds class EDITENG_DLLPUBLIC SvxRTFParser : public SvRTFParser { SvStream &rStrm; - SvxRTFColorTbl aColorTbl; - SvxRTFFontTbl aFontTbl; - SvxRTFStyleTbl aStyleTbl; + SvxRTFColorTbl aColorTbl; + SvxRTFFontTbl aFontTbl; + SvxRTFStyleTbl aStyleTbl; SvxRTFItemStack aAttrStack; SvxRTFItemStackList aAttrSetList; SvUShorts aPlainMap; SvUShorts aPardMap; SvUShorts aWhichMap; - String sBaseURL; + String sBaseURL; SvxPosition* pInsPos; SfxItemPool* pAttrPool; Color* pDfltColor; - Font* pDfltFont; + Font* pDfltFont; ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties> m_xDocProps; SfxItemSet *pRTFDefaults; - long nVersionNo; - int nDfltFont; - - BOOL bNewDoc : 1; // FALSE - in ein bestehendes lesen - BOOL bNewGroup : 1; // TRUE - es gab eine oeffnende Klammer - BOOL bIsSetDfltTab : 1; // TRUE - DefTab wurde eingelesen - BOOL bChkStyleAttr : 1; // TRUE - StyleSheets werden ausgewertet - BOOL bCalcValue : 1; // TRUE - Twipwerte an APP anpassen - BOOL bPardTokenRead : 1; // TRUE - Token \pard wurde erkannt - BOOL bReadDocInfo : 1; // TRUE - DocInfo mit einlesen - BOOL bIsLeftToRightDef : 1; // TRUE - in LeftToRight char run def. + long nVersionNo; + int nDfltFont; + + BOOL bNewDoc : 1; // FALSE - in ein bestehendes lesen + BOOL bNewGroup : 1; // TRUE - es gab eine oeffnende Klammer + BOOL bIsSetDfltTab : 1; // TRUE - DefTab wurde eingelesen + BOOL bChkStyleAttr : 1; // TRUE - StyleSheets werden ausgewertet + BOOL bCalcValue : 1; // TRUE - Twipwerte an APP anpassen + BOOL bPardTokenRead : 1; // TRUE - Token \pard wurde erkannt + BOOL bReadDocInfo : 1; // TRUE - DocInfo mit einlesen + BOOL bIsLeftToRightDef : 1; // TRUE - in LeftToRight char run def. // FALSE - in RightToLeft char run def. - BOOL bIsInReadStyleTab : 1; // TRUE - in ReadStyleTable + BOOL bIsInReadStyleTab : 1; // TRUE - in ReadStyleTable void ClearColorTbl(); void ClearFontTbl(); void ClearStyleTbl(); void ClearAttrStack(); - SvxRTFItemStackTypePtr _GetAttrSet( int bCopyAttr=FALSE ); // neue ItemStackType anlegen + SvxRTFItemStackTypePtr _GetAttrSet( int bCopyAttr=FALSE ); // neue ItemStackType anlegen void _ClearStyleAttr( SvxRTFItemStackType& rStkType ); // setzt alle Attribute, die unterschiedlich zum aktuellen sind @@ -312,8 +312,8 @@ protected: inline SfxItemSet& GetAttrSet(); // wurde noch kein Text eingefuegt ? (SttPos vom obersten StackEintrag!) int IsAttrSttPos(); - void AttrGroupEnd(); // den akt. Bearbeiten, vom Stack loeschen - void SetAllAttrOfStk(); // end all Attr. and set it into doc + void AttrGroupEnd(); // den akt. Bearbeiten, vom Stack loeschen + void SetAllAttrOfStk(); // end all Attr. and set it into doc virtual void InsertText() = 0; @@ -334,36 +334,36 @@ protected: int bReadNewDoc = TRUE ); virtual ~SvxRTFParser(); - int IsNewDoc() const { return bNewDoc; } - void SetNewDoc( int bFlag ) { bNewDoc = bFlag; } - int IsNewGroup() const { return bNewGroup; } - void SetNewGroup( int bFlag ) { bNewGroup = bFlag; } - int IsChkStyleAttr() const { return bChkStyleAttr; } - void SetChkStyleAttr( int bFlag ) { bChkStyleAttr = bFlag; } - int IsCalcValue() const { return bCalcValue; } - void SetCalcValue( int bFlag ) { bCalcValue = bFlag; } - int IsPardTokenRead() const { return bPardTokenRead; } - void SetPardTokenRead( int bFlag ) { bPardTokenRead = bFlag; } - int IsReadDocInfo() const { return bReadDocInfo; } - void SetReadDocInfo( int bFlag ) { bReadDocInfo = bFlag; } + int IsNewDoc() const { return bNewDoc; } + void SetNewDoc( int bFlag ) { bNewDoc = bFlag; } + int IsNewGroup() const { return bNewGroup; } + void SetNewGroup( int bFlag ) { bNewGroup = bFlag; } + int IsChkStyleAttr() const { return bChkStyleAttr; } + void SetChkStyleAttr( int bFlag ) { bChkStyleAttr = bFlag; } + int IsCalcValue() const { return bCalcValue; } + void SetCalcValue( int bFlag ) { bCalcValue = bFlag; } + int IsPardTokenRead() const { return bPardTokenRead; } + void SetPardTokenRead( int bFlag ) { bPardTokenRead = bFlag; } + int IsReadDocInfo() const { return bReadDocInfo; } + void SetReadDocInfo( int bFlag ) { bReadDocInfo = bFlag; } // erfrage/setze die aktuelle Einfuegeposition - SvxPosition& GetInsPos() const { return *pInsPos; } + SvxPosition& GetInsPos() const { return *pInsPos; } void SetInsPos( const SvxPosition& rNew ); - long GetVersionNo() const { return nVersionNo; } + long GetVersionNo() const { return nVersionNo; } // erfrage/setze die Mapping-Ids fuer die Pard/Plain Attribute // (Set: es werden sich die Pointer gemerkt, also keine Kopie erzeugt!!! ) void AddPardAttr( USHORT nWhich ) { aPardMap.Insert( nWhich, aPardMap.Count() ); } void AddPlainAttr( USHORT nWhich ) { aPlainMap.Insert( nWhich, aPlainMap.Count() ); } - SvxRTFStyleTbl& GetStyleTbl() { return aStyleTbl; } - SvxRTFItemStack& GetAttrStack() { return aAttrStack; } - SvxRTFColorTbl& GetColorTbl() { return aColorTbl; } - SvxRTFFontTbl& GetFontTbl() { return aFontTbl; } + SvxRTFStyleTbl& GetStyleTbl() { return aStyleTbl; } + SvxRTFItemStack& GetAttrStack() { return aAttrStack; } + SvxRTFColorTbl& GetColorTbl() { return aColorTbl; } + SvxRTFFontTbl& GetFontTbl() { return aFontTbl; } - const String& GetBaseURL() const { return sBaseURL; } + const String& GetBaseURL() const { return sBaseURL; } // lesen die GrafikDaten und fuelle damit die Grafik und die // die PicDaten. @@ -379,13 +379,13 @@ public: virtual SvParserState CallParser(); // Aufruf des Parsers inline const Color& GetColor( USHORT nId ) const; - const Font& GetFont( USHORT nId ); // aendert den dflt Font + const Font& GetFont( USHORT nId ); // aendert den dflt Font virtual int IsEndPara( SvxNodeIdx* pNd, xub_StrLen nCnt ) const = 0; // um einen anderen Attribut-Pool setzen zukoennen. Darf nur vorm // CallParser erfolgen!! Die Maps werden nicht neu erzeugt! - void SetAttrPool( SfxItemPool* pNewPool ) { pAttrPool = pNewPool; } + void SetAttrPool( SfxItemPool* pNewPool ) { pAttrPool = pNewPool; } // um andere WhichIds fuer einen anderen Pool zusetzen. RTFPardAttrMapIds& GetPardMap() { return (RTFPardAttrMapIds&)*aPardMap.GetData(); } @@ -393,7 +393,7 @@ public: { return (RTFPlainAttrMapIds&)*aPlainMap.GetData(); } // um diese von aussen z.B. Tabellenzellen zuordnen zu koennen void ReadBorderAttr( int nToken, SfxItemSet& rSet, int bTableDef=FALSE ); - void ReadBackgroundAttr( int nToken, SfxItemSet& rSet, int bTableDef=FALSE ); + void ReadBackgroundAttr( int nToken, SfxItemSet& rSet, int bTableDef=FALSE ); // fuers asynchrone lesen aus dem SvStream virtual void Continue( int nToken ); @@ -411,8 +411,8 @@ class EDITENG_DLLPUBLIC SvxRTFItemStackType friend class SvxRTFParser; friend class SvxRTFItemStackList; - SfxItemSet aAttrSet; - SvxNodeIdx *pSttNd, *pEndNd; + SfxItemSet aAttrSet; + SvxNodeIdx *pSttNd, *pEndNd; xub_StrLen nSttCnt, nEndCnt; SvxRTFItemStackList* pChildList; USHORT nStyleNo; @@ -444,10 +444,10 @@ public: xub_StrLen GetSttCnt() const { return nSttCnt; } xub_StrLen GetEndCnt() const { return nEndCnt; } - SfxItemSet& GetAttrSet() { return aAttrSet; } - const SfxItemSet& GetAttrSet() const { return aAttrSet; } + SfxItemSet& GetAttrSet() { return aAttrSet; } + const SfxItemSet& GetAttrSet() const { return aAttrSet; } - USHORT StyleNo() const { return nStyleNo; } + USHORT StyleNo() const { return nStyleNo; } void SetRTFDefaults( const SfxItemSet& rDefaults ); }; diff --git a/editeng/inc/editeng/swafopt.hxx b/editeng/inc/editeng/swafopt.hxx index 84c0ce439771..8292df4d8235 100644 --- a/editeng/inc/editeng/swafopt.hxx +++ b/editeng/inc/editeng/swafopt.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/editeng/inc/editeng/tstpitem.hxx b/editeng/inc/editeng/tstpitem.hxx index 2c71ef5309dd..6d80024d445c 100644 --- a/editeng/inc/editeng/tstpitem.hxx +++ b/editeng/inc/editeng/tstpitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,8 +48,8 @@ private: long nTabPos; SvxTabAdjust eAdjustment; - mutable sal_Unicode m_cDecimal; - sal_Unicode cFill; + mutable sal_Unicode m_cDecimal; + sal_Unicode cFill; EDITENG_DLLPRIVATE friend SvStream& operator<<( SvStream&, SvxTabStop& ); @@ -81,10 +81,10 @@ public: sal_Unicode& GetFill() { return cFill; } sal_Unicode GetFill() const { return cFill; } - String GetValueString() const; + String GetValueString() const; // das "alte" operator==() - BOOL IsEqual( const SvxTabStop& rTS ) const + BOOL IsEqual( const SvxTabStop& rTS ) const { return ( nTabPos == rTS.nTabPos && eAdjustment == rTS.eAdjustment && @@ -152,7 +152,7 @@ public: // this is already included in SfxPoolItem declaration //int operator!=( const SvxTabStopItem& rTSI ) const - // { return !( operator==( rTSI ) ); } + // { return !( operator==( rTSI ) ); } // SortedArrays liefern nur Stackobjekte zurueck! const SvxTabStop& operator[]( const USHORT nPos ) const @@ -165,18 +165,18 @@ public: { return SvxTabStopArr::GetData(); } // "pure virtual Methoden" vom SfxPoolItem - virtual int operator==( const SfxPoolItem& ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual int operator==( const SfxPoolItem& ) const; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream&, USHORT ) const; - virtual SvStream& Store( SvStream& , USHORT nItemVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Create( SvStream&, USHORT ) const; + virtual SvStream& Store( SvStream& , USHORT nItemVersion ) const; using SvxTabStopArr::Insert; using SvxTabStopArr::Remove; diff --git a/editeng/inc/editeng/twolinesitem.hxx b/editeng/inc/editeng/twolinesitem.hxx index 98fd7936b338..c5f48e55ea2c 100644 --- a/editeng/inc/editeng/twolinesitem.hxx +++ b/editeng/inc/editeng/twolinesitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ namespace rtl class EDITENG_DLLPUBLIC SvxTwoLinesItem : public SfxPoolItem { - sal_Unicode cStartBracket, cEndBracket; + sal_Unicode cStartBracket, cEndBracket; sal_Bool bOn; public: TYPEINFO(); @@ -53,23 +53,23 @@ public: // "pure virtual Methoden" vom SfxPoolItem virtual int operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, USHORT nVer) const; - virtual SvStream& Store(SvStream &, USHORT nIVer) const; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; + virtual SfxPoolItem* Create(SvStream &, USHORT nVer) const; + virtual SvStream& Store(SvStream &, USHORT nIVer) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper* pIntl = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); - virtual USHORT GetVersion( USHORT nFFVer ) const; + virtual USHORT GetVersion( USHORT nFFVer ) const; - SvxTwoLinesItem& operator=( const SvxTwoLinesItem& rCpy ) + SvxTwoLinesItem& operator=( const SvxTwoLinesItem& rCpy ) { SetValue( rCpy.GetValue() ); SetStartBracket( rCpy.GetStartBracket() ); @@ -77,14 +77,14 @@ public: return *this; } - sal_Bool GetValue() const { return bOn; } - void SetValue( sal_Bool bFlag ) { bOn = bFlag; } + sal_Bool GetValue() const { return bOn; } + void SetValue( sal_Bool bFlag ) { bOn = bFlag; } - sal_Unicode GetStartBracket() const { return cStartBracket; } - void SetStartBracket( sal_Unicode c ) { cStartBracket = c; } + sal_Unicode GetStartBracket() const { return cStartBracket; } + void SetStartBracket( sal_Unicode c ) { cStartBracket = c; } - sal_Unicode GetEndBracket() const { return cEndBracket; } - void SetEndBracket( sal_Unicode c ) { cEndBracket = c; } + sal_Unicode GetEndBracket() const { return cEndBracket; } + void SetEndBracket( sal_Unicode c ) { cEndBracket = c; } }; #endif diff --git a/editeng/inc/editeng/txtrange.hxx b/editeng/inc/editeng/txtrange.hxx index 0cd816140900..44c33bd95d03 100644 --- a/editeng/inc/editeng/txtrange.hxx +++ b/editeng/inc/editeng/txtrange.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,18 +61,18 @@ class EDITENG_DLLPUBLIC TextRanger SvLongsPtr *pCache; PolyPolygon *mpPolyPolygon; // Flaechenpolygon PolyPolygon *mpLinePolyPolygon; // Linienpolygon - Rectangle *pBound; // Umfassendes Rechteck - USHORT nCacheSize; // Cache-Size - USHORT nCacheIdx; // Cache-Index - USHORT nRight; // Abstand Kontur-Text - USHORT nLeft; // Abstand Text-Kontur - USHORT nUpper; // Abstand Kontur-Text - USHORT nLower; // Abstand Text-Kontur + Rectangle *pBound; // Umfassendes Rechteck + USHORT nCacheSize; // Cache-Size + USHORT nCacheIdx; // Cache-Index + USHORT nRight; // Abstand Kontur-Text + USHORT nLeft; // Abstand Text-Kontur + USHORT nUpper; // Abstand Kontur-Text + USHORT nLower; // Abstand Text-Kontur sal_uInt32 nPointCount; // Anzahl der Polygonpunkte - BOOL bSimple : 1; // Nur Aussenkante - BOOL bInner : 1; // TRUE: Objekt beschriften (EditEngine); + BOOL bSimple : 1; // Nur Aussenkante + BOOL bInner : 1; // TRUE: Objekt beschriften (EditEngine); // FALSE: Objekt umfliessen (StarWriter); - BOOL bVertical :1; // for vertical writing mode + BOOL bVertical :1; // for vertical writing mode BOOL bFlag3 :1; BOOL bFlag4 :1; BOOL bFlag5 :1; diff --git a/editeng/inc/editeng/udlnitem.hxx b/editeng/inc/editeng/udlnitem.hxx index 79ae74752e6e..8f5d13c65f8d 100644 --- a/editeng/inc/editeng/udlnitem.hxx +++ b/editeng/inc/editeng/udlnitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,23 +62,23 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; - virtual String GetValueTextByPos( USHORT nPos ) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; + virtual String GetValueTextByPos( USHORT nPos ) const; virtual USHORT GetValueCount() const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); // MS VC4.0 kommt durcheinander - void SetValue( USHORT nNewVal ) + void SetValue( USHORT nNewVal ) {SfxEnumItem::SetValue(nNewVal); } - virtual int HasBoolValue() const; - virtual BOOL GetBoolValue() const; - virtual void SetBoolValue( BOOL bVal ); + virtual int HasBoolValue() const; + virtual BOOL GetBoolValue() const; + virtual void SetBoolValue( BOOL bVal ); - virtual int operator==( const SfxPoolItem& ) const; + virtual int operator==( const SfxPoolItem& ) const; inline SvxTextLineItem& operator=(const SvxTextLineItem& rTextLine) { @@ -88,13 +88,13 @@ public: } // enum cast - FontUnderline GetLineStyle() const + FontUnderline GetLineStyle() const { return (FontUnderline)GetValue(); } - void SetLineStyle( FontUnderline eNew ) + void SetLineStyle( FontUnderline eNew ) { SetValue((USHORT) eNew); } - const Color& GetColor() const { return mColor; } - void SetColor( const Color& rCol ) { mColor = rCol; } + const Color& GetColor() const { return mColor; } + void SetColor( const Color& rCol ) { mColor = rCol; } }; // class SvxUnderlineItem ------------------------------------------------ @@ -111,7 +111,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual String GetValueTextByPos( USHORT nPos ) const; + virtual String GetValueTextByPos( USHORT nPos ) const; }; // class SvxOverlineItem ------------------------------------------------ @@ -128,7 +128,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual String GetValueTextByPos( USHORT nPos ) const; + virtual String GetValueTextByPos( USHORT nPos ) const; }; #endif // #ifndef _SVX_UDLNITEM_HXX diff --git a/editeng/inc/editeng/ulspitem.hxx b/editeng/inc/editeng/ulspitem.hxx index 6b474032f3d9..83bc11893883 100644 --- a/editeng/inc/editeng/ulspitem.hxx +++ b/editeng/inc/editeng/ulspitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,13 +45,13 @@ namespace rtl Dieses Item beschreibt den oberen und unteren Rand einer Seite oder Absatz. */ -#define ULSPACE_16_VERSION ((USHORT)0x0001) +#define ULSPACE_16_VERSION ((USHORT)0x0001) class EDITENG_DLLPUBLIC SvxULSpaceItem : public SfxPoolItem { USHORT nUpper; //Oberer Rand USHORT nLower; //Unterer Rand - USHORT nPropUpper, nPropLower; // relativ oder absolut (=100%) + USHORT nPropUpper, nPropLower; // relativ oder absolut (=100%) public: TYPEINFO(); @@ -61,22 +61,22 @@ public: inline SvxULSpaceItem& operator=( const SvxULSpaceItem &rCpy ); // "pure virtual Methoden" vom SfxPoolItem - virtual int operator==( const SfxPoolItem& ) const; + virtual int operator==( const SfxPoolItem& ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; - virtual USHORT GetVersion( USHORT nFileVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Create(SvStream &, USHORT) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; + virtual USHORT GetVersion( USHORT nFileVersion ) const; virtual bool ScaleMetrics( long nMult, long nDiv ); - virtual bool HasMetrics() const; + virtual bool HasMetrics() const; inline void SetUpper( const USHORT nU, const USHORT nProp = 100 ); inline void SetLower( const USHORT nL, const USHORT nProp = 100 ); diff --git a/editeng/inc/editeng/unoedhlp.hxx b/editeng/inc/editeng/unoedhlp.hxx index 1cb92e56bbda..b35254844053 100644 --- a/editeng/inc/editeng/unoedhlp.hxx +++ b/editeng/inc/editeng/unoedhlp.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,14 +33,14 @@ #include <tools/solar.h> #include <svtools/textdata.hxx> #include <svl/hint.hxx> -#include <tools/gen.hxx> +#include <tools/gen.hxx> #include "editeng/editengdllapi.h" struct EENotify; class EditEngine; -#define EDITSOURCE_HINT_PARASMOVED 20 -#define EDITSOURCE_HINT_SELECTIONCHANGED 21 +#define EDITSOURCE_HINT_PARASMOVED 20 +#define EDITSOURCE_HINT_SELECTIONCHANGED 21 /** Extends TextHint by two additional parameters which are necessary for the EDITSOURCE_HINT_PARASMOVED hint. TextHint's value in this @@ -50,20 +50,20 @@ class EditEngine; class EDITENG_DLLPUBLIC SvxEditSourceHint : public TextHint { private: - ULONG mnStart; - ULONG mnEnd; + ULONG mnStart; + ULONG mnEnd; public: TYPEINFO(); SvxEditSourceHint( ULONG nId ); SvxEditSourceHint( ULONG nId, ULONG nValue, ULONG nStart=0, ULONG nEnd=0 ); - ULONG GetValue() const; - ULONG GetStartValue() const; - ULONG GetEndValue() const; - void SetValue( ULONG n ); - void SetStartValue( ULONG n ); - void SetEndValue( ULONG n ); + ULONG GetValue() const; + ULONG GetStartValue() const; + ULONG GetEndValue() const; + void SetValue( ULONG n ); + void SetStartValue( ULONG n ); + void SetEndValue( ULONG n ); }; /** Helper class for common functionality in edit sources @@ -85,10 +85,10 @@ public: Please note that the range returned is half-open: [nStartIndex,nEndIndex) - @param nStartIndex + @param nStartIndex Herein, the start index of the range of similar attributes is returned - @param nEndIndex + @param nEndIndex Herein, the end index (exclusive) of the range of similar attributes is returned @param rEE diff --git a/editeng/inc/editeng/unoedprx.hxx b/editeng/inc/editeng/unoedprx.hxx index 33df15d47d57..2dfd05ec7770 100644 --- a/editeng/inc/editeng/unoedprx.hxx +++ b/editeng/inc/editeng/unoedprx.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,56 +40,56 @@ class SvxAccessibleTextAdapter : public SvxTextForwarder { public: SvxAccessibleTextAdapter(); - virtual ~SvxAccessibleTextAdapter(); - - virtual USHORT GetParagraphCount() const; - virtual USHORT GetTextLen( USHORT nParagraph ) const; - virtual String GetText( const ESelection& rSel ) const; - virtual SfxItemSet GetAttribs( const ESelection& rSel, BOOL bOnlyHardAttrib = 0 ) const; - virtual SfxItemSet GetParaAttribs( USHORT nPara ) const; - virtual void SetParaAttribs( USHORT nPara, const SfxItemSet& rSet ); + virtual ~SvxAccessibleTextAdapter(); + + virtual USHORT GetParagraphCount() const; + virtual USHORT GetTextLen( USHORT nParagraph ) const; + virtual String GetText( const ESelection& rSel ) const; + virtual SfxItemSet GetAttribs( const ESelection& rSel, BOOL bOnlyHardAttrib = 0 ) const; + virtual SfxItemSet GetParaAttribs( USHORT nPara ) const; + virtual void SetParaAttribs( USHORT nPara, const SfxItemSet& rSet ); virtual void RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich ); virtual void GetPortions( USHORT nPara, SvUShorts& rList ) const; - + virtual sal_Int32 CalcLogicalIndex( USHORT nPara, USHORT nEEIndex ); virtual USHORT CalcEditEngineIndex( USHORT nPara, sal_Int32 nLogicalIndex ); + + virtual USHORT GetItemState( const ESelection& rSel, USHORT nWhich ) const; + virtual USHORT GetItemState( USHORT nPara, USHORT nWhich ) const; - virtual USHORT GetItemState( const ESelection& rSel, USHORT nWhich ) const; - virtual USHORT GetItemState( USHORT nPara, USHORT nWhich ) const; - - virtual void QuickInsertText( const String& rText, const ESelection& rSel ); - virtual void QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel ); - virtual void QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel ); - virtual void QuickInsertLineBreak( const ESelection& rSel ); + virtual void QuickInsertText( const String& rText, const ESelection& rSel ); + virtual void QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel ); + virtual void QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel ); + virtual void QuickInsertLineBreak( const ESelection& rSel ); - virtual SfxItemPool* GetPool() const; + virtual SfxItemPool* GetPool() const; - virtual XubString CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rpTxtColor, Color*& rpFldColor ); - virtual void FieldClicked( const SvxFieldItem& rField, USHORT nPara, xub_StrLen nPos ); + virtual XubString CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rpTxtColor, Color*& rpFldColor ); + virtual void FieldClicked( const SvxFieldItem& rField, USHORT nPara, xub_StrLen nPos ); + + virtual BOOL IsValid() const; - virtual BOOL IsValid() const; - - virtual LanguageType GetLanguage( USHORT, USHORT ) const; - virtual USHORT GetFieldCount( USHORT nPara ) const; - virtual EFieldInfo GetFieldInfo( USHORT nPara, USHORT nField ) const; + virtual LanguageType GetLanguage( USHORT, USHORT ) const; + virtual USHORT GetFieldCount( USHORT nPara ) const; + virtual EFieldInfo GetFieldInfo( USHORT nPara, USHORT nField ) const; virtual EBulletInfo GetBulletInfo( USHORT nPara ) const; - virtual Rectangle GetCharBounds( USHORT nPara, USHORT nIndex ) const; - virtual Rectangle GetParaBounds( USHORT nPara ) const; - virtual MapMode GetMapMode() const; - virtual OutputDevice* GetRefDevice() const; - virtual sal_Bool GetIndexAtPoint( const Point&, USHORT& nPara, USHORT& nIndex ) const; - virtual sal_Bool GetWordIndices( USHORT nPara, USHORT nIndex, USHORT& nStart, USHORT& nEnd ) const; - virtual sal_Bool GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, USHORT nPara, USHORT nIndex ) const; - virtual USHORT GetLineCount( USHORT nPara ) const; - virtual USHORT GetLineLen( USHORT nPara, USHORT nLine ) const; + virtual Rectangle GetCharBounds( USHORT nPara, USHORT nIndex ) const; + virtual Rectangle GetParaBounds( USHORT nPara ) const; + virtual MapMode GetMapMode() const; + virtual OutputDevice* GetRefDevice() const; + virtual sal_Bool GetIndexAtPoint( const Point&, USHORT& nPara, USHORT& nIndex ) const; + virtual sal_Bool GetWordIndices( USHORT nPara, USHORT nIndex, USHORT& nStart, USHORT& nEnd ) const; + virtual sal_Bool GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, USHORT nPara, USHORT nIndex ) const; + virtual USHORT GetLineCount( USHORT nPara ) const; + virtual USHORT GetLineLen( USHORT nPara, USHORT nLine ) const; virtual void GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEnd, USHORT nParagraph, USHORT nLine ) const; virtual USHORT GetLineNumberAtIndex( USHORT nPara, USHORT nIndex ) const; - + virtual sal_Bool Delete( const ESelection& ); - virtual sal_Bool InsertText( const String&, const ESelection& ); - virtual sal_Bool QuickFormatDoc( BOOL bFull=FALSE ); - virtual sal_Int16 GetDepth( USHORT nPara ) const; - virtual sal_Bool SetDepth( USHORT nPara, sal_Int16 nNewDepth ); + virtual sal_Bool InsertText( const String&, const ESelection& ); + virtual sal_Bool QuickFormatDoc( BOOL bFull=FALSE ); + virtual sal_Int16 GetDepth( USHORT nPara ) const; + virtual sal_Bool SetDepth( USHORT nPara, sal_Int16 nNewDepth ); virtual const SfxItemSet* GetEmptyItemSetPtr(); @@ -99,11 +99,11 @@ public: virtual xub_StrLen AppendTextPortion( USHORT nPara, const String &rText, const SfxItemSet &rSet ); //XTextCopy - virtual void CopyText(const SvxTextForwarder& rSource); - + virtual void CopyText(const SvxTextForwarder& rSource); + void SetForwarder( SvxTextForwarder& ); - sal_Bool HaveImageBullet( USHORT nPara ) const; - sal_Bool HaveTextBullet( USHORT nPara ) const; + sal_Bool HaveImageBullet( USHORT nPara ) const; + sal_Bool HaveTextBullet( USHORT nPara ) const; /** Query whether all text in given selection is editable @@ -111,7 +111,7 @@ public: be changed, and sal_False if e.g. a field or a bullet is contained therein. */ - sal_Bool IsEditable( const ESelection& rSelection ); + sal_Bool IsEditable( const ESelection& rSelection ); private: SvxTextForwarder* mrTextForwarder; @@ -122,26 +122,26 @@ class SvxAccessibleTextEditViewAdapter : public SvxEditViewForwarder public: SvxAccessibleTextEditViewAdapter(); - virtual ~SvxAccessibleTextEditViewAdapter(); + virtual ~SvxAccessibleTextEditViewAdapter(); // SvxViewForwarder interface - virtual BOOL IsValid() const; - virtual Rectangle GetVisArea() const; - virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const; - virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const; + virtual BOOL IsValid() const; + virtual Rectangle GetVisArea() const; + virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const; + virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const; // SvxEditViewForwarder interface - virtual sal_Bool GetSelection( ESelection& rSelection ) const; - virtual sal_Bool SetSelection( const ESelection& rSelection ); - virtual sal_Bool Copy(); - virtual sal_Bool Cut(); + virtual sal_Bool GetSelection( ESelection& rSelection ) const; + virtual sal_Bool SetSelection( const ESelection& rSelection ); + virtual sal_Bool Copy(); + virtual sal_Bool Cut(); virtual sal_Bool Paste(); - void SetForwarder( SvxEditViewForwarder&, SvxAccessibleTextAdapter& ); + void SetForwarder( SvxEditViewForwarder&, SvxAccessibleTextAdapter& ); private: - SvxEditViewForwarder* mrViewForwarder; - SvxAccessibleTextAdapter* mrTextForwarder; + SvxEditViewForwarder* mrViewForwarder; + SvxAccessibleTextAdapter* mrTextForwarder; }; class EDITENG_DLLPUBLIC SvxEditSourceAdapter : public SvxEditSource @@ -150,31 +150,31 @@ public: SvxEditSourceAdapter(); ~SvxEditSourceAdapter(); - virtual SvxEditSource* Clone() const; - virtual SvxTextForwarder* GetTextForwarder(); - SvxAccessibleTextAdapter* GetTextForwarderAdapter(); // covariant return types don't work on MSVC - virtual SvxViewForwarder* GetViewForwarder(); - virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool bCreate = sal_False ); - SvxAccessibleTextEditViewAdapter* GetEditViewForwarderAdapter( sal_Bool bCreate = sal_False ); // covariant return types don't work on MSVC - virtual void UpdateData(); - virtual SfxBroadcaster& GetBroadcaster() const; + virtual SvxEditSource* Clone() const; + virtual SvxTextForwarder* GetTextForwarder(); + SvxAccessibleTextAdapter* GetTextForwarderAdapter(); // covariant return types don't work on MSVC + virtual SvxViewForwarder* GetViewForwarder(); + virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool bCreate = sal_False ); + SvxAccessibleTextEditViewAdapter* GetEditViewForwarderAdapter( sal_Bool bCreate = sal_False ); // covariant return types don't work on MSVC + virtual void UpdateData(); + virtual SfxBroadcaster& GetBroadcaster() const; - void SetEditSource( ::std::auto_ptr< SvxEditSource > pAdaptee ); - sal_Bool IsValid() const; + void SetEditSource( ::std::auto_ptr< SvxEditSource > pAdaptee ); + sal_Bool IsValid() const; private: // declared, but not defined SvxEditSourceAdapter( const SvxEditSourceAdapter& ); SvxEditSourceAdapter& operator= ( const SvxEditSourceAdapter& ); - ::std::auto_ptr< SvxEditSource > mpAdaptee; + ::std::auto_ptr< SvxEditSource > mpAdaptee; - SvxAccessibleTextAdapter maTextAdapter; - SvxAccessibleTextEditViewAdapter maEditViewAdapter; + SvxAccessibleTextAdapter maTextAdapter; + SvxAccessibleTextEditViewAdapter maEditViewAdapter; - mutable SfxBroadcaster maDummyBroadcaster; + mutable SfxBroadcaster maDummyBroadcaster; - sal_Bool mbEditSourceValid; + sal_Bool mbEditSourceValid; }; #endif diff --git a/editeng/inc/editeng/unoedsrc.hxx b/editeng/inc/editeng/unoedsrc.hxx index bcb46ed37e96..db401d59ced8 100644 --- a/editeng/inc/editeng/unoedsrc.hxx +++ b/editeng/inc/editeng/unoedsrc.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,7 +61,7 @@ class SvxUnoTextRangeBase; typedef std::list< SvxUnoTextRangeBase* > SvxUnoTextRangeBaseList; -/** Wrapper class for unified EditEngine/Outliner access +/** Wrapper class for unified EditEngine/Outliner access This class wraps a textual object, which might or might not contain an EditEngine/Outliner. Is used e.g. for filling an @@ -70,16 +70,16 @@ typedef std::list< SvxUnoTextRangeBase* > SvxUnoTextRangeBaseList; class EDITENG_DLLPUBLIC SvxEditSource { public: - virtual ~SvxEditSource(); + virtual ~SvxEditSource(); /// Returns a new reference to the same object. This is a shallow copy - virtual SvxEditSource* Clone() const = 0; + virtual SvxEditSource* Clone() const = 0; /** Query the text forwarder @return the text forwarder, or NULL if the underlying object is dead */ - virtual SvxTextForwarder* GetTextForwarder() = 0; + virtual SvxTextForwarder* GetTextForwarder() = 0; /** Query the view forwarder @@ -88,7 +88,7 @@ public: @derive default implementation provided, overriding is optional */ - virtual SvxViewForwarder* GetViewForwarder(); + virtual SvxViewForwarder* GetViewForwarder(); /** Query the edit view forwarder @@ -109,16 +109,16 @@ public: sal_True, all previously returned text forwarder can become invalid */ - virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool bCreate = sal_False ); + virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool bCreate = sal_False ); /// Write back data to model - virtual void UpdateData() = 0; + virtual void UpdateData() = 0; /** Returns broadcaster the underlying edit engine's events are sent from @derive default implementation provided, overriding is optional */ - virtual SfxBroadcaster& GetBroadcaster() const; + virtual SfxBroadcaster& GetBroadcaster() const; /** adds the given SvxUnoTextRangeBase to the text object capsulated by this SvxEditSource. This allows the text @@ -140,7 +140,7 @@ public: }; -/** Contains an EditEngine or an Outliner and unifies access to them. +/** Contains an EditEngine or an Outliner and unifies access to them. The EditEngine-UNO objects use this class only. To reflect changes not only in the EditEngine, but also in the model data, call @@ -150,44 +150,44 @@ public: class EDITENG_DLLPUBLIC SvxTextForwarder { public: - virtual ~SvxTextForwarder(); - - virtual USHORT GetParagraphCount() const = 0; - virtual USHORT GetTextLen( USHORT nParagraph ) const = 0; - virtual String GetText( const ESelection& rSel ) const = 0; - virtual SfxItemSet GetAttribs( const ESelection& rSel, BOOL bOnlyHardAttrib = 0 ) const = 0; - virtual SfxItemSet GetParaAttribs( USHORT nPara ) const = 0; - virtual void SetParaAttribs( USHORT nPara, const SfxItemSet& rSet ) = 0; + virtual ~SvxTextForwarder(); + + virtual USHORT GetParagraphCount() const = 0; + virtual USHORT GetTextLen( USHORT nParagraph ) const = 0; + virtual String GetText( const ESelection& rSel ) const = 0; + virtual SfxItemSet GetAttribs( const ESelection& rSel, BOOL bOnlyHardAttrib = 0 ) const = 0; + virtual SfxItemSet GetParaAttribs( USHORT nPara ) const = 0; + virtual void SetParaAttribs( USHORT nPara, const SfxItemSet& rSet ) = 0; virtual void RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich ) = 0; - virtual void GetPortions( USHORT nPara, SvUShorts& rList ) const = 0; - - virtual USHORT GetItemState( const ESelection& rSel, USHORT nWhich ) const = 0; - virtual USHORT GetItemState( USHORT nPara, USHORT nWhich ) const = 0; + virtual void GetPortions( USHORT nPara, SvUShorts& rList ) const = 0; + + virtual USHORT GetItemState( const ESelection& rSel, USHORT nWhich ) const = 0; + virtual USHORT GetItemState( USHORT nPara, USHORT nWhich ) const = 0; - virtual void QuickInsertText( const String& rText, const ESelection& rSel ) = 0; - virtual void QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel ) = 0; - virtual void QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel ) = 0; - virtual void QuickInsertLineBreak( const ESelection& rSel ) = 0; + virtual void QuickInsertText( const String& rText, const ESelection& rSel ) = 0; + virtual void QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel ) = 0; + virtual void QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel ) = 0; + virtual void QuickInsertLineBreak( const ESelection& rSel ) = 0; virtual XubString CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rpTxtColor, Color*& rpFldColor ) = 0; - virtual void FieldClicked( const SvxFieldItem& rField, USHORT nPara, xub_StrLen nPos ) = 0; + virtual void FieldClicked( const SvxFieldItem& rField, USHORT nPara, xub_StrLen nPos ) = 0; virtual SfxItemPool* GetPool() const = 0; virtual const SfxItemSet* GetEmptyItemSetPtr() = 0; - + // implementation functions for XParagraphAppend and XTextPortionAppend virtual void AppendParagraph() = 0; virtual xub_StrLen AppendTextPortion( USHORT nPara, const String &rText, const SfxItemSet &rSet ) = 0; - + // XTextCopy - virtual void CopyText(const SvxTextForwarder& rSource) = 0; + virtual void CopyText(const SvxTextForwarder& rSource) = 0; /** Query state of forwarder @return sal_False, if no longer valid */ - virtual BOOL IsValid() const = 0; + virtual BOOL IsValid() const = 0; /** Query language of character at given position on the underlying edit engine @@ -197,14 +197,14 @@ public: @param nIndex[0 .. m-1] Index of character to query language of */ - virtual LanguageType GetLanguage( USHORT nPara, USHORT nIndex ) const = 0; + virtual LanguageType GetLanguage( USHORT nPara, USHORT nIndex ) const = 0; /** Query number of fields in the underlying edit engine @param nPara[0 .. n-1] Index of paragraph to query field number in */ - virtual USHORT GetFieldCount( USHORT nPara ) const = 0; + virtual USHORT GetFieldCount( USHORT nPara ) const = 0; /** Query information for given field number in the underlying edit engine @@ -214,7 +214,7 @@ public: @param nField[0 .. m-1] Index of field to query information of */ - virtual EFieldInfo GetFieldInfo( USHORT nPara, USHORT nField ) const = 0; + virtual EFieldInfo GetFieldInfo( USHORT nPara, USHORT nField ) const = 0; /** Query information regarding bullets for given paragraph on the underlying edit engine @@ -244,7 +244,7 @@ public: left corner of text. The coordinates returned here are to be interpreted in the map mode given by GetMapMode(). */ - virtual Rectangle GetCharBounds( USHORT nPara, USHORT nIndex ) const = 0; + virtual Rectangle GetCharBounds( USHORT nPara, USHORT nIndex ) const = 0; /** Query the bounding rectangle of the given paragraph @@ -255,7 +255,7 @@ public: left corner of text. The coordinates returned here are to be interpreted in the map mode given by GetMapMode(). */ - virtual Rectangle GetParaBounds( USHORT nPara ) const = 0; + virtual Rectangle GetParaBounds( USHORT nPara ) const = 0; /** Query the map mode of the underlying EditEngine/Outliner @@ -264,7 +264,7 @@ public: be interpreted in this map mode, the point given to GetIndexAtPoint() is interpreted in this map mode. */ - virtual MapMode GetMapMode() const = 0; + virtual MapMode GetMapMode() const = 0; /** Query the reference output device of the underlying EditEngine/Outliner @@ -273,7 +273,7 @@ public: calculations, since this is usually a printer with fonts and resolution different from the screen. */ - virtual OutputDevice* GetRefDevice() const = 0; + virtual OutputDevice* GetRefDevice() const = 0; /** Query paragraph and character index of the character at the given point. Returns sal_True on success, sal_False otherwise @@ -292,7 +292,7 @@ public: @return sal_True, if the point is over any text and both rPara and rIndex are valid */ - virtual sal_Bool GetIndexAtPoint( const Point& rPoint, USHORT& rPara, USHORT& rIndex ) const = 0; + virtual sal_Bool GetIndexAtPoint( const Point& rPoint, USHORT& rPara, USHORT& rIndex ) const = 0; /** Get the start and the end index of the word at the given index @@ -317,7 +317,7 @@ public: @return sal_True, if the result is non-empty */ - virtual sal_Bool GetWordIndices( USHORT nPara, USHORT nIndex, USHORT& rStart, USHORT& rEnd ) const = 0; + virtual sal_Bool GetWordIndices( USHORT nPara, USHORT nIndex, USHORT& rStart, USHORT& rEnd ) const = 0; /** Query range of similar attributes @@ -334,7 +334,7 @@ public: @return sal_True, if the range has been successfully determined */ - virtual sal_Bool GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, USHORT nPara, USHORT nIndex ) const = 0; + virtual sal_Bool GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, USHORT nPara, USHORT nIndex ) const = 0; /** Query number of lines in the formatted paragraph @@ -344,7 +344,7 @@ public: @return number of lines in given paragraph */ - virtual USHORT GetLineCount( USHORT nPara ) const = 0; + virtual USHORT GetLineCount( USHORT nPara ) const = 0; /** Query line length @@ -355,16 +355,16 @@ public: Index of line in paragraph to query line length of */ - virtual USHORT GetLineLen( USHORT nPara, USHORT nLine ) const = 0; - + virtual USHORT GetLineLen( USHORT nPara, USHORT nLine ) const = 0; + /** Query bounds of line in paragraph @param rStart [output param; 0 .. text_len] The index in the paragraph text that belongs to the chara at the start of the line - + @param rEnd [output param; 0 .. text_len] The index in the paragraph text that follows the last chara in the line - + @param nParagraph[0 .. n-1] Index of paragraph to query line length in @@ -373,7 +373,7 @@ public: */ virtual void GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEnd, USHORT nParagraph, USHORT nLine ) const = 0; - + /** Query the line number for a index in the paragraphs text @param nPara[0 .. n-1] @@ -394,7 +394,7 @@ public: @return sal_True if text has been successfully deleted */ - virtual sal_Bool Delete( const ESelection& rSelection ) = 0; + virtual sal_Bool Delete( const ESelection& rSelection ) = 0; /** Insert/Replace given text in given range and reformat text @@ -406,7 +406,7 @@ public: @return sal_True if text has been successfully inserted */ - virtual sal_Bool InsertText( const String& rText, const ESelection& rSel ) = 0; + virtual sal_Bool InsertText( const String& rText, const ESelection& rSel ) = 0; /** Updates the formatting @@ -414,7 +414,7 @@ public: @return sal_True if text have been successfully reformatted */ - virtual sal_Bool QuickFormatDoc( BOOL bFull=FALSE ) = 0; + virtual sal_Bool QuickFormatDoc( BOOL bFull=FALSE ) = 0; /** Get the outline depth of given paragraph @@ -424,7 +424,7 @@ public: @return the outline level of the given paragraph. The range is [0,n), where n is the maximal outline level. */ - virtual sal_Int16 GetDepth( USHORT nPara ) const = 0; + virtual sal_Int16 GetDepth( USHORT nPara ) const = 0; /** Set the outline depth of given paragraph @@ -439,7 +439,7 @@ public: failure are e.g. the text does not support outline level (EditEngine), or the depth range is exceeded. */ - virtual sal_Bool SetDepth( USHORT nPara, sal_Int16 nNewDepth ) = 0; + virtual sal_Bool SetDepth( USHORT nPara, sal_Int16 nNewDepth ) = 0; virtual sal_Int16 GetNumberingStartValue( sal_uInt16 nPara ); virtual void SetNumberingStartValue( sal_uInt16 nPara, sal_Int16 nNumberingStartValue ); @@ -457,13 +457,13 @@ public: class EDITENG_DLLPUBLIC SvxViewForwarder { public: - virtual ~SvxViewForwarder(); + virtual ~SvxViewForwarder(); /** Query state of forwarder @return sal_False, if no longer valid */ - virtual BOOL IsValid() const = 0; + virtual BOOL IsValid() const = 0; /** Query visible area of the view containing the text @@ -472,7 +472,7 @@ public: values are already in screen coordinates (pixel), and have to be relative to the EditEngine/Outliner's upper left corner. */ - virtual Rectangle GetVisArea() const = 0; + virtual Rectangle GetVisArea() const = 0; /** Convert from logical, EditEngine-relative coordinates to screen coordinates @@ -484,7 +484,7 @@ public: @return the point in screen coordinates */ - virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const = 0; + virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const = 0; /** Convert from screen to logical, EditEngine-relative coordinates @@ -496,7 +496,7 @@ public: @return the point in logical coordinates. */ - virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const = 0; + virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const = 0; }; diff --git a/editeng/inc/editeng/unofdesc.hxx b/editeng/inc/editeng/unofdesc.hxx index 8a4af581a4f8..f46aeb32b858 100644 --- a/editeng/inc/editeng/unofdesc.hxx +++ b/editeng/inc/editeng/unofdesc.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/editeng/inc/editeng/unofield.hxx b/editeng/inc/editeng/unofield.hxx index 8bae85ac2d2d..5c004494b7cf 100644 --- a/editeng/inc/editeng/unofield.hxx +++ b/editeng/inc/editeng/unofield.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,28 +42,28 @@ #include <editeng/mutxhelp.hxx> // ids usable for the constructor -#define ID_DATEFIELD 0 -#define ID_URLFIELD 1 -#define ID_PAGEFIELD 2 -#define ID_PAGESFIELD 3 -#define ID_TIMEFIELD 4 -#define ID_FILEFIELD 5 -#define ID_TABLEFIELD 6 -#define ID_EXT_TIMEFIELD 7 -#define ID_EXT_FILEFIELD 8 -#define ID_AUTHORFIELD 9 -#define ID_MEASUREFIELD 10 -#define ID_EXT_DATEFIELD 11 -#define ID_HEADERFIELD 12 -#define ID_FOOTERFIELD 13 -#define ID_DATETIMEFIELD 14 -#define ID_UNKNOWN 15 // this must be the last entry +#define ID_DATEFIELD 0 +#define ID_URLFIELD 1 +#define ID_PAGEFIELD 2 +#define ID_PAGESFIELD 3 +#define ID_TIMEFIELD 4 +#define ID_FILEFIELD 5 +#define ID_TABLEFIELD 6 +#define ID_EXT_TIMEFIELD 7 +#define ID_EXT_FILEFIELD 8 +#define ID_AUTHORFIELD 9 +#define ID_MEASUREFIELD 10 +#define ID_EXT_DATEFIELD 11 +#define ID_HEADERFIELD 12 +#define ID_FOOTERFIELD 13 +#define ID_DATETIMEFIELD 14 +#define ID_UNKNOWN 15 // this must be the last entry class SvxUnoFieldData_Impl; class SfxItemPropertySet; class SvxFieldData; -com::sun::star::uno::Reference< com::sun::star::uno::XInterface > EDITENG_DLLPUBLIC SAL_CALL SvxUnoTextCreateTextField( +com::sun::star::uno::Reference< com::sun::star::uno::XInterface > EDITENG_DLLPUBLIC SAL_CALL SvxUnoTextCreateTextField( const ::rtl::OUString& ServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); class EDITENG_DLLPUBLIC SvxUnoTextField : public SvxMutexHelper, @@ -75,9 +75,9 @@ class EDITENG_DLLPUBLIC SvxUnoTextField : public SvxMutexHelper, { private: ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > mxAnchor; - const SfxItemPropertySet* mpPropSet; - sal_Int32 mnServiceId; - SvxUnoFieldData_Impl* mpImpl; + const SfxItemPropertySet* mpPropSet; + sal_Int32 mnServiceId; + SvxUnoFieldData_Impl* mpImpl; protected: ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > maTypeSequence; @@ -85,7 +85,7 @@ protected: public: SvxUnoTextField( sal_Int32 nServiceId ) throw(); SvxUnoTextField( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > xAnchor, const ::rtl::OUString& rPresentation, const SvxFieldData* pFieldData ) throw(); - virtual ~SvxUnoTextField() throw(); + virtual ~SvxUnoTextField() throw(); // Intern virtual sal_Int32 GetFieldId( const SvxFieldData* pFieldData ) const throw(); diff --git a/editeng/inc/editeng/unofored.hxx b/editeng/inc/editeng/unofored.hxx index 5b7dd477d214..b13118c390c9 100644 --- a/editeng/inc/editeng/unofored.hxx +++ b/editeng/inc/editeng/unofored.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,68 +33,68 @@ #include <editeng/unoedsrc.hxx> #include "editeng/editengdllapi.h" -// SvxEditEngineForwarder - SvxTextForwarder fuer EditEngine +// SvxEditEngineForwarder - SvxTextForwarder fuer EditEngine class EDITENG_DLLPUBLIC SvxEditEngineForwarder : public SvxTextForwarder { private: - EditEngine& rEditEngine; + EditEngine& rEditEngine; public: SvxEditEngineForwarder( EditEngine& rEngine ); - virtual ~SvxEditEngineForwarder(); + virtual ~SvxEditEngineForwarder(); - virtual USHORT GetParagraphCount() const; - virtual USHORT GetTextLen( USHORT nParagraph ) const; - virtual String GetText( const ESelection& rSel ) const; - virtual SfxItemSet GetAttribs( const ESelection& rSel, BOOL bOnlyHardAttrib = EditEngineAttribs_All ) const; - virtual SfxItemSet GetParaAttribs( USHORT nPara ) const; - virtual void SetParaAttribs( USHORT nPara, const SfxItemSet& rSet ); + virtual USHORT GetParagraphCount() const; + virtual USHORT GetTextLen( USHORT nParagraph ) const; + virtual String GetText( const ESelection& rSel ) const; + virtual SfxItemSet GetAttribs( const ESelection& rSel, BOOL bOnlyHardAttrib = EditEngineAttribs_All ) const; + virtual SfxItemSet GetParaAttribs( USHORT nPara ) const; + virtual void SetParaAttribs( USHORT nPara, const SfxItemSet& rSet ); virtual void RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich ); - virtual void GetPortions( USHORT nPara, SvUShorts& rList ) const; - - virtual USHORT GetItemState( const ESelection& rSel, USHORT nWhich ) const; - virtual USHORT GetItemState( USHORT nPara, USHORT nWhich ) const; + virtual void GetPortions( USHORT nPara, SvUShorts& rList ) const; + + virtual USHORT GetItemState( const ESelection& rSel, USHORT nWhich ) const; + virtual USHORT GetItemState( USHORT nPara, USHORT nWhich ) const; - virtual void QuickInsertText( const String& rText, const ESelection& rSel ); - virtual void QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel ); - virtual void QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel ); - virtual void QuickInsertLineBreak( const ESelection& rSel ); + virtual void QuickInsertText( const String& rText, const ESelection& rSel ); + virtual void QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel ); + virtual void QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel ); + virtual void QuickInsertLineBreak( const ESelection& rSel ); virtual SfxItemPool* GetPool() const; virtual XubString CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rpTxtColor, Color*& rpFldColor ); - virtual void FieldClicked( const SvxFieldItem& rField, USHORT nPara, xub_StrLen nPos ); - virtual BOOL IsValid() const; + virtual void FieldClicked( const SvxFieldItem& rField, USHORT nPara, xub_StrLen nPos ); + virtual BOOL IsValid() const; - virtual LanguageType GetLanguage( USHORT, USHORT ) const; - virtual USHORT GetFieldCount( USHORT nPara ) const; - virtual EFieldInfo GetFieldInfo( USHORT nPara, USHORT nField ) const; + virtual LanguageType GetLanguage( USHORT, USHORT ) const; + virtual USHORT GetFieldCount( USHORT nPara ) const; + virtual EFieldInfo GetFieldInfo( USHORT nPara, USHORT nField ) const; virtual EBulletInfo GetBulletInfo( USHORT nPara ) const; - virtual Rectangle GetCharBounds( USHORT nPara, USHORT nIndex ) const; - virtual Rectangle GetParaBounds( USHORT nPara ) const; - virtual MapMode GetMapMode() const; - virtual OutputDevice* GetRefDevice() const; - virtual sal_Bool GetIndexAtPoint( const Point&, USHORT& nPara, USHORT& nIndex ) const; - virtual sal_Bool GetWordIndices( USHORT nPara, USHORT nIndex, USHORT& nStart, USHORT& nEnd ) const; - virtual sal_Bool GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, USHORT nPara, USHORT nIndex ) const; - virtual USHORT GetLineCount( USHORT nPara ) const; - virtual USHORT GetLineLen( USHORT nPara, USHORT nLine ) const; + virtual Rectangle GetCharBounds( USHORT nPara, USHORT nIndex ) const; + virtual Rectangle GetParaBounds( USHORT nPara ) const; + virtual MapMode GetMapMode() const; + virtual OutputDevice* GetRefDevice() const; + virtual sal_Bool GetIndexAtPoint( const Point&, USHORT& nPara, USHORT& nIndex ) const; + virtual sal_Bool GetWordIndices( USHORT nPara, USHORT nIndex, USHORT& nStart, USHORT& nEnd ) const; + virtual sal_Bool GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, USHORT nPara, USHORT nIndex ) const; + virtual USHORT GetLineCount( USHORT nPara ) const; + virtual USHORT GetLineLen( USHORT nPara, USHORT nLine ) const; virtual void GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEnd, USHORT nParagraph, USHORT nLine ) const; virtual USHORT GetLineNumberAtIndex( USHORT nPara, USHORT nIndex ) const; - virtual sal_Bool Delete( const ESelection& ); - virtual sal_Bool InsertText( const String&, const ESelection& ); - virtual sal_Bool QuickFormatDoc( BOOL bFull=FALSE ); - virtual sal_Int16 GetDepth( USHORT nPara ) const; - virtual sal_Bool SetDepth( USHORT nPara, sal_Int16 nNewDepth ); + virtual sal_Bool Delete( const ESelection& ); + virtual sal_Bool InsertText( const String&, const ESelection& ); + virtual sal_Bool QuickFormatDoc( BOOL bFull=FALSE ); + virtual sal_Int16 GetDepth( USHORT nPara ) const; + virtual sal_Bool SetDepth( USHORT nPara, sal_Int16 nNewDepth ); virtual const SfxItemSet* GetEmptyItemSetPtr(); - + // implementation functions for XParagraphAppend and XTextPortionAppend virtual void AppendParagraph(); virtual xub_StrLen AppendTextPortion( USHORT nPara, const String &rText, const SfxItemSet &rSet ); //XTextCopy - virtual void CopyText(const SvxTextForwarder& rSource); + virtual void CopyText(const SvxTextForwarder& rSource); }; #endif diff --git a/editeng/inc/editeng/unoforou.hxx b/editeng/inc/editeng/unoforou.hxx index f32625958a0e..80f053a7679a 100644 --- a/editeng/inc/editeng/unoforou.hxx +++ b/editeng/inc/editeng/unoforou.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,94 +36,94 @@ class Outliner; -// SvxOutlinerForwarder - SvxTextForwarder fuer Outliner +// SvxOutlinerForwarder - SvxTextForwarder fuer Outliner class EDITENG_DLLPUBLIC SvxOutlinerForwarder : public SvxTextForwarder { private: - Outliner& rOutliner; - BOOL bOutlinerText; + Outliner& rOutliner; + BOOL bOutlinerText; /** this pointer may be null or point to an item set for the attribs of the selection maAttribsSelection */ mutable SfxItemSet* mpAttribsCache; /** if we have a chached attribute item set, this is the selection of it */ - mutable ESelection maAttribCacheSelection; + mutable ESelection maAttribCacheSelection; /** this pointer may be null or point to an item set for the paragraph mnParaAttribsCache */ - mutable SfxItemSet* mpParaAttribsCache; + mutable SfxItemSet* mpParaAttribsCache; /** if we have a cached para attribute item set, this is the paragraph of it */ - mutable USHORT mnParaAttribsCache; + mutable USHORT mnParaAttribsCache; public: SvxOutlinerForwarder( Outliner& rOutl, BOOL bOutlText = FALSE ); - virtual ~SvxOutlinerForwarder(); - - virtual USHORT GetParagraphCount() const; - virtual USHORT GetTextLen( USHORT nParagraph ) const; - virtual String GetText( const ESelection& rSel ) const; - virtual SfxItemSet GetAttribs( const ESelection& rSel, BOOL bOnlyHardAttrib = 0 ) const; - virtual SfxItemSet GetParaAttribs( USHORT nPara ) const; - virtual void SetParaAttribs( USHORT nPara, const SfxItemSet& rSet ); + virtual ~SvxOutlinerForwarder(); + + virtual USHORT GetParagraphCount() const; + virtual USHORT GetTextLen( USHORT nParagraph ) const; + virtual String GetText( const ESelection& rSel ) const; + virtual SfxItemSet GetAttribs( const ESelection& rSel, BOOL bOnlyHardAttrib = 0 ) const; + virtual SfxItemSet GetParaAttribs( USHORT nPara ) const; + virtual void SetParaAttribs( USHORT nPara, const SfxItemSet& rSet ); virtual void RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich ); - virtual void GetPortions( USHORT nPara, SvUShorts& rList ) const; + virtual void GetPortions( USHORT nPara, SvUShorts& rList ) const; - virtual USHORT GetItemState( const ESelection& rSel, USHORT nWhich ) const; - virtual USHORT GetItemState( USHORT nPara, USHORT nWhich ) const; + virtual USHORT GetItemState( const ESelection& rSel, USHORT nWhich ) const; + virtual USHORT GetItemState( USHORT nPara, USHORT nWhich ) const; - virtual void QuickInsertText( const String& rText, const ESelection& rSel ); - virtual void QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel ); - virtual void QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel ); - virtual void QuickInsertLineBreak( const ESelection& rSel ); + virtual void QuickInsertText( const String& rText, const ESelection& rSel ); + virtual void QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel ); + virtual void QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel ); + virtual void QuickInsertLineBreak( const ESelection& rSel ); virtual SfxItemPool* GetPool() const; virtual XubString CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rpTxtColor, Color*& rpFldColor ); - virtual void FieldClicked( const SvxFieldItem& rField, USHORT nPara, xub_StrLen nPos ); - - virtual BOOL IsValid() const; + virtual void FieldClicked( const SvxFieldItem& rField, USHORT nPara, xub_StrLen nPos ); + + virtual BOOL IsValid() const; - Outliner& GetOutliner() const { return rOutliner; } + Outliner& GetOutliner() const { return rOutliner; } - virtual LanguageType GetLanguage( USHORT, USHORT ) const; - virtual USHORT GetFieldCount( USHORT nPara ) const; - virtual EFieldInfo GetFieldInfo( USHORT nPara, USHORT nField ) const; + virtual LanguageType GetLanguage( USHORT, USHORT ) const; + virtual USHORT GetFieldCount( USHORT nPara ) const; + virtual EFieldInfo GetFieldInfo( USHORT nPara, USHORT nField ) const; virtual EBulletInfo GetBulletInfo( USHORT nPara ) const; - virtual Rectangle GetCharBounds( USHORT nPara, USHORT nIndex ) const; - virtual Rectangle GetParaBounds( USHORT nPara ) const; - virtual MapMode GetMapMode() const; - virtual OutputDevice* GetRefDevice() const; - virtual sal_Bool GetIndexAtPoint( const Point&, USHORT& nPara, USHORT& nIndex ) const; - virtual sal_Bool GetWordIndices( USHORT nPara, USHORT nIndex, USHORT& nStart, USHORT& nEnd ) const; - virtual sal_Bool GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, USHORT nPara, USHORT nIndex ) const; - virtual USHORT GetLineCount( USHORT nPara ) const; - virtual USHORT GetLineLen( USHORT nPara, USHORT nLine ) const; + virtual Rectangle GetCharBounds( USHORT nPara, USHORT nIndex ) const; + virtual Rectangle GetParaBounds( USHORT nPara ) const; + virtual MapMode GetMapMode() const; + virtual OutputDevice* GetRefDevice() const; + virtual sal_Bool GetIndexAtPoint( const Point&, USHORT& nPara, USHORT& nIndex ) const; + virtual sal_Bool GetWordIndices( USHORT nPara, USHORT nIndex, USHORT& nStart, USHORT& nEnd ) const; + virtual sal_Bool GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, USHORT nPara, USHORT nIndex ) const; + virtual USHORT GetLineCount( USHORT nPara ) const; + virtual USHORT GetLineLen( USHORT nPara, USHORT nLine ) const; virtual void GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEnd, USHORT nPara, USHORT nLine ) const; virtual USHORT GetLineNumberAtIndex( USHORT nPara, USHORT nIndex ) const; - virtual sal_Bool Delete( const ESelection& ); - virtual sal_Bool InsertText( const String&, const ESelection& ); - virtual sal_Bool QuickFormatDoc( BOOL bFull=FALSE ); - virtual sal_Int16 GetDepth( USHORT nPara ) const; - virtual sal_Bool SetDepth( USHORT nPara, sal_Int16 nNewDepth ); + virtual sal_Bool Delete( const ESelection& ); + virtual sal_Bool InsertText( const String&, const ESelection& ); + virtual sal_Bool QuickFormatDoc( BOOL bFull=FALSE ); + virtual sal_Int16 GetDepth( USHORT nPara ) const; + virtual sal_Bool SetDepth( USHORT nPara, sal_Int16 nNewDepth ); virtual sal_Int16 GetNumberingStartValue( sal_uInt16 nPara ); virtual void SetNumberingStartValue( sal_uInt16 nPara, sal_Int16 nNumberingStartValue ); - virtual sal_Bool IsParaIsNumberingRestart( sal_uInt16 nPara ); + virtual sal_Bool IsParaIsNumberingRestart( sal_uInt16 nPara ); virtual void SetParaIsNumberingRestart( sal_uInt16 nPara, sal_Bool bParaIsNumberingRestart ); /* this method flushes internal caches for this forwarder */ - void flushCache(); - + void flushCache(); + virtual const SfxItemSet* GetEmptyItemSetPtr(); // implementation functions for XParagraphAppend and XTextPortionAppend virtual void AppendParagraph(); virtual xub_StrLen AppendTextPortion( USHORT nPara, const String &rText, const SfxItemSet &rSet ); //XTextCopy - virtual void CopyText(const SvxTextForwarder& rSource); + virtual void CopyText(const SvxTextForwarder& rSource); }; #endif diff --git a/editeng/inc/editeng/unoipset.hxx b/editeng/inc/editeng/unoipset.hxx index 0f40d675e6d8..b5f002d6d9db 100644 --- a/editeng/inc/editeng/unoipset.hxx +++ b/editeng/inc/editeng/unoipset.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,9 +46,9 @@ class EDITENG_DLLPUBLIC SvxItemPropertySet SfxItemPropertyMap m_aPropertyMap; mutable com::sun::star::uno::Reference<com::sun::star::beans::XPropertySetInfo> m_xInfo; const SfxItemPropertyMapEntry* _pMap; - SvxIDPropertyCombineList* pCombiList; - sal_Bool mbConvertTwips; - SfxItemPool& mrItemPool; + SvxIDPropertyCombineList* pCombiList; + sal_Bool mbConvertTwips; + SfxItemPool& mrItemPool; public: SvxItemPropertySet( const SfxItemPropertyMapEntry *pMap, SfxItemPool& rPool, sal_Bool bConvertTwips = sal_False ); diff --git a/editeng/inc/editeng/unolingu.hxx b/editeng/inc/editeng/unolingu.hxx index 69110679a4e4..e50884e4de12 100644 --- a/editeng/inc/editeng/unolingu.hxx +++ b/editeng/inc/editeng/unolingu.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,38 +79,38 @@ class EDITENG_DLLPUBLIC LinguMgr static ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > xSpell; static ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XHyphenator > xHyph; + ::com::sun::star::linguistic2::XHyphenator > xHyph; static ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XThesaurus > xThes; + ::com::sun::star::linguistic2::XThesaurus > xThes; static ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryList > xDicList; static ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > xProp; + ::com::sun::star::beans::XPropertySet > xProp; static ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XDictionary > xIgnoreAll; + ::com::sun::star::linguistic2::XDictionary > xIgnoreAll; static ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XDictionary > xChangeAll; + ::com::sun::star::linguistic2::XDictionary > xChangeAll; - static LinguMgrExitLstnr *pExitLstnr; - static sal_Bool bExiting; + static LinguMgrExitLstnr *pExitLstnr; + static sal_Bool bExiting; static ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > GetSpell(); static ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XHyphenator > GetHyph(); + ::com::sun::star::linguistic2::XHyphenator > GetHyph(); static ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XThesaurus > GetThes(); + ::com::sun::star::linguistic2::XThesaurus > GetThes(); static ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryList > GetDicList(); static ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > GetProp(); + ::com::sun::star::beans::XPropertySet > GetProp(); static ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XDictionary > GetStandard(); + ::com::sun::star::linguistic2::XDictionary > GetStandard(); static ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XDictionary > GetIgnoreAll(); + ::com::sun::star::linguistic2::XDictionary > GetIgnoreAll(); static ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XDictionary > GetChangeAll(); + ::com::sun::star::linguistic2::XDictionary > GetChangeAll(); // disallow access to copy-constructor and assignment-operator LinguMgr(const LinguMgr &); @@ -121,23 +121,23 @@ public: static ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > GetSpellChecker(); static ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XHyphenator > GetHyphenator(); + ::com::sun::star::linguistic2::XHyphenator > GetHyphenator(); static ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XThesaurus > GetThesaurus(); + ::com::sun::star::linguistic2::XThesaurus > GetThesaurus(); static ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryList > GetDictionaryList(); static ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > GetLinguPropertySet(); + ::com::sun::star::beans::XPropertySet > GetLinguPropertySet(); static ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLinguServiceManager > GetLngSvcMgr(); static ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XDictionary > GetStandardDic(); - static ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XDictionary > GetIgnoreAllList(); - static ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XDictionary > GetChangeAllList(); + ::com::sun::star::linguistic2::XDictionary > GetStandardDic(); + static ::com::sun::star::uno::Reference< + ::com::sun::star::linguistic2::XDictionary > GetIgnoreAllList(); + static ::com::sun::star::uno::Reference< + ::com::sun::star::linguistic2::XDictionary > GetChangeAllList(); // update all configuration entries static void UpdateAll(); @@ -152,12 +152,12 @@ namespace com { namespace sun { namespace star { namespace linguistic2 { struct SvxAlternativeSpelling { - String aReplacement; - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XHyphenatedWord > xHyphWord; - INT16 nChangedPos, + String aReplacement; + ::com::sun::star::uno::Reference< + ::com::sun::star::linguistic2::XHyphenatedWord > xHyphWord; + INT16 nChangedPos, nChangedLength; - BOOL bIsAltSpelling; + BOOL bIsAltSpelling; inline SvxAlternativeSpelling(); }; @@ -168,8 +168,8 @@ inline SvxAlternativeSpelling::SvxAlternativeSpelling() : } -EDITENG_DLLPUBLIC SvxAlternativeSpelling SvxGetAltSpelling( - const ::com::sun::star::uno::Reference< +EDITENG_DLLPUBLIC SvxAlternativeSpelling SvxGetAltSpelling( + const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenatedWord > & rHyphWord ); @@ -178,15 +178,15 @@ EDITENG_DLLPUBLIC SvxAlternativeSpelling SvxGetAltSpelling( class EDITENG_DLLPUBLIC SvxDicListChgClamp { private: - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XDictionaryList > xDicList; + ::com::sun::star::uno::Reference< + ::com::sun::star::linguistic2::XDictionaryList > xDicList; // disallow access to copy-constructor and assignment-operator EDITENG_DLLPRIVATE SvxDicListChgClamp(const SvxDicListChgClamp &); EDITENG_DLLPRIVATE SvxDicListChgClamp & operator = (const SvxDicListChgClamp &); public: - SvxDicListChgClamp( ::com::sun::star::uno::Reference< + SvxDicListChgClamp( ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryList > &rxDicList ); ~SvxDicListChgClamp(); }; @@ -194,38 +194,38 @@ public: /////////////////////////////////////////////////////////////////////////// //TL:TODO: remove those functions or make them inline -EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSpellChecker1 > SvxGetSpellChecker(); -EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XHyphenator > SvxGetHyphenator(); -EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XThesaurus > SvxGetThesaurus(); -EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< +EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< + ::com::sun::star::linguistic2::XSpellChecker1 > SvxGetSpellChecker(); +EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< + ::com::sun::star::linguistic2::XHyphenator > SvxGetHyphenator(); +EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< + ::com::sun::star::linguistic2::XThesaurus > SvxGetThesaurus(); +EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryList > SvxGetDictionaryList(); -EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > SvxGetLinguPropertySet(); +EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< + ::com::sun::star::beans::XPropertySet > SvxGetLinguPropertySet(); //TL:TODO: remove argument or provide SvxGetIgnoreAllList with the same one -EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XDictionary > SvxGetOrCreatePosDic( - ::com::sun::star::uno::Reference< +EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< + ::com::sun::star::linguistic2::XDictionary > SvxGetOrCreatePosDic( + ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryList > xDicList ); -EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XDictionary > SvxGetIgnoreAllList(); -EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XDictionary > SvxGetChangeAllList(); +EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< + ::com::sun::star::linguistic2::XDictionary > SvxGetIgnoreAllList(); +EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< + ::com::sun::star::linguistic2::XDictionary > SvxGetChangeAllList(); /////////////////////////////////////////////////////////////////////////// // misc functions // -EDITENG_DLLPUBLIC LanguageType SvxLocaleToLanguage( +EDITENG_DLLPUBLIC LanguageType SvxLocaleToLanguage( const ::com::sun::star::lang::Locale& rLocale ); -EDITENG_DLLPUBLIC ::com::sun::star::lang::Locale& SvxLanguageToLocale( +EDITENG_DLLPUBLIC ::com::sun::star::lang::Locale& SvxLanguageToLocale( ::com::sun::star::lang::Locale& rLocale, LanguageType eLang ); EDITENG_DLLPUBLIC ::com::sun::star::lang::Locale SvxCreateLocale( LanguageType eLang ); -EDITENG_DLLPUBLIC short SvxDicError( Window *pParent, sal_Int16 nError ); +EDITENG_DLLPUBLIC short SvxDicError( Window *pParent, sal_Int16 nError ); #endif diff --git a/editeng/inc/editeng/unonrule.hxx b/editeng/inc/editeng/unonrule.hxx index 8bd5d2e68a01..f7d0592c45b5 100644 --- a/editeng/inc/editeng/unonrule.hxx +++ b/editeng/inc/editeng/unonrule.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ const SvxNumRule& SvxGetNumRule( ::com::sun::star::uno::Reference< ::com::sun::s bool SvxGetNumRule( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > xRule, SvxNumRule& rNumRule ); EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompare > SvxCreateNumRuleCompare() throw(); -class SvxUnoNumberingRules : public ::cppu::WeakAggImplHelper5< com::sun::star::container::XIndexReplace, com::sun::star::ucb::XAnyCompare, +class SvxUnoNumberingRules : public ::cppu::WeakAggImplHelper5< com::sun::star::container::XIndexReplace, com::sun::star::ucb::XAnyCompare, com::sun::star::lang::XUnoTunnel, com::sun::star::util::XCloneable, com::sun::star::lang::XServiceInfo > { private: @@ -63,7 +63,7 @@ public: //XIndexAccess virtual sal_Int32 SAL_CALL getCount() throw(com::sun::star::uno::RuntimeException) ; - virtual com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(com::sun::star::lang::IndexOutOfBoundsException, + virtual com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(com::sun::star::lang::IndexOutOfBoundsException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException); //XElementAccess diff --git a/editeng/inc/editeng/unopracc.hxx b/editeng/inc/editeng/unopracc.hxx index c1e57ed3944a..da4d92d2b729 100644 --- a/editeng/inc/editeng/unopracc.hxx +++ b/editeng/inc/editeng/unopracc.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,12 +35,12 @@ class SvxEditSource; /** Wraps SvxUnoTextRangeBase and provides us with the text properties - + Inherits from SvxUnoTextRangeBase and provides XPropertySet and XMultiPropertySet interfaces. Just set the selection to the required text range and return a reference to a XPropertySet. */ -class SvxAccessibleTextPropertySet : public SvxUnoTextRangeBase, +class SvxAccessibleTextPropertySet : public SvxUnoTextRangeBase, public ::com::sun::star::lang::XTypeProvider, public ::cppu::OWeakObject { @@ -50,7 +50,7 @@ public: // XTextRange virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException); - + // uno::XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); diff --git a/editeng/inc/editeng/unoprnms.hxx b/editeng/inc/editeng/unoprnms.hxx index bea28992fa7b..625ccfa00d2f 100644 --- a/editeng/inc/editeng/unoprnms.hxx +++ b/editeng/inc/editeng/unoprnms.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,348 +28,348 @@ #ifndef _SVX_UNOPRNMS_HXX #define _SVX_UNOPRNMS_HXX -#define UNO_NAME_SHAPE_SIZE "Size" -#define UNO_NAME_SHAPE_POSITION "Position" - -#define UNO_NAME_CHAR_COLOR "CharColor" -#define UNO_NAME_CHAR_FONT "CharFont" -#define UNO_NAME_CHAR_HEIGHT "CharHeight" -#define UNO_NAME_CHAR_POSTURE "CharPosture" -#define UNO_NAME_CHAR_SHADOWED "CharShadowed" -#define UNO_NAME_CHAR_UNDERLINE "CharUnderline" -#define UNO_NAME_CHAR_WEIGHT "CharWeight" - -#define UNO_NAME_FILLSTYLE "FillStyle" -#define UNO_NAME_FILLCOLOR "FillColor" -#define UNO_NAME_FILLGRADIENT "FillGradient" -#define UNO_NAME_FILLHATCH "FillHatch" -#define UNO_NAME_FILLBITMAP "FillBitmap" -#define UNO_NAME_FILLBACKGROUND "FillBackground" -#define UNO_NAME_FILLCOLOR_2 "FillColor2" - -#define UNO_NAME_EDGEKIND "EdgeKind" -#define UNO_NAME_EDGELINE1DELTA "EdgeLine1Delta" -#define UNO_NAME_EDGELINE2DELTA "EdgeLine2Delta" -#define UNO_NAME_EDGELINE3DELTA "EdgeLine3Delta" +#define UNO_NAME_SHAPE_SIZE "Size" +#define UNO_NAME_SHAPE_POSITION "Position" + +#define UNO_NAME_CHAR_COLOR "CharColor" +#define UNO_NAME_CHAR_FONT "CharFont" +#define UNO_NAME_CHAR_HEIGHT "CharHeight" +#define UNO_NAME_CHAR_POSTURE "CharPosture" +#define UNO_NAME_CHAR_SHADOWED "CharShadowed" +#define UNO_NAME_CHAR_UNDERLINE "CharUnderline" +#define UNO_NAME_CHAR_WEIGHT "CharWeight" + +#define UNO_NAME_FILLSTYLE "FillStyle" +#define UNO_NAME_FILLCOLOR "FillColor" +#define UNO_NAME_FILLGRADIENT "FillGradient" +#define UNO_NAME_FILLHATCH "FillHatch" +#define UNO_NAME_FILLBITMAP "FillBitmap" +#define UNO_NAME_FILLBACKGROUND "FillBackground" +#define UNO_NAME_FILLCOLOR_2 "FillColor2" + +#define UNO_NAME_EDGEKIND "EdgeKind" +#define UNO_NAME_EDGELINE1DELTA "EdgeLine1Delta" +#define UNO_NAME_EDGELINE2DELTA "EdgeLine2Delta" +#define UNO_NAME_EDGELINE3DELTA "EdgeLine3Delta" #define UNO_NAME_EDGENODE1HORZDIST "EdgeNode1HorzDist" #define UNO_NAME_EDGENODE1VERTDIST "EdgeNode1VertDist" #define UNO_NAME_EDGENODE2HORZDIST "EdgeNode2HorzDist" -#define UNO_NAME_EDGENODE2VERTDIST "EdgeNode2VertDist" - -#define UNO_NAME_FILLBMP_OFFSET_X "FillBitmapOffsetX" -#define UNO_NAME_FILLBMP_OFFSET_Y "FillBitmapOffsetY" -#define UNO_NAME_FILLBMP_POSITION_OFFSET_X "FillBitmapPositionOffsetX" -#define UNO_NAME_FILLBMP_POSITION_OFFSET_Y "FillBitmapPositionOffsetY" -#define UNO_NAME_FILLBMP_RECTANGLE_POINT "FillBitmapRectanglePoint" -#define UNO_NAME_FILLBMP_TILE "FillBitmapTile" -#define UNO_NAME_FILLBMP_STRETCH "FillBitmapStretch" -#define UNO_NAME_FILLBMP_LOGICAL_SIZE "FillBitmapLogicalSize" -#define UNO_NAME_FILLBMP_SIZE_X "FillBitmapSizeX" -#define UNO_NAME_FILLBMP_SIZE_Y "FillBitmapSizeY" -#define UNO_NAME_FILL_TRANSPARENCE "FillTransparence" -#define UNO_NAME_FILLBMP_MODE "FillBitmapMode" - -#define UNO_NAME_FILL_GRADIENT_STYLE "FillGradientStyle" -#define UNO_NAME_FILL_GRADIENT_START_COLOR "FillGradientStartColor" -#define UNO_NAME_FILL_GRADIENT_END_COLOR "FillGradientEndColor" -#define UNO_NAME_FILL_GRADIENT_ANGLE "FillGradientAngle" -#define UNO_NAME_FILL_GRADIENT_BORDER "FillGradientBorder" -#define UNO_NAME_FILL_GRADIENT_OFFSET_X "FillGradientOffsetX" -#define UNO_NAME_FILL_GRADIENT_OFFSET_Y "FillGradientOffsetY" -#define UNO_NAME_FILL_GRADIENT_START_INTENSITY "FillGradientStartIntensity" -#define UNO_NAME_FILL_GRADIENT_END_INTENSITY "FillGradientEndIntensity" -#define UNO_NAME_FILL_GRADIENT_STEPS "FillGradientSteps" - -#define UNO_NAME_FILL_HATCH_STYLE "FillHatchStyle" -#define UNO_NAME_FILL_HATCH_COLOR "FillHatchColor" -#define UNO_NAME_FILL_HATCH_DISTANCE "FillHatchDistance" -#define UNO_NAME_FILL_HATCH_ANGLE "FillHatchAngle" - -#define UNO_NAME_LINESTYLE "LineStyle" -#define UNO_NAME_LINEDASH "LineDash" -#define UNO_NAME_LINEWIDTH "LineWidth" -#define UNO_NAME_LINECOLOR "LineColor" -#define UNO_NAME_LINEJOINT "LineJoint" -#define UNO_NAME_LINESTART "LineStart" -#define UNO_NAME_LINEEND "LineEnd" -#define UNO_NAME_LINESTARTWIDTH "LineStartWidth" -#define UNO_NAME_LINEENDWIDTH "LineEndWidth" -#define UNO_NAME_LINESTARTCENTER "LineStartCenter" -#define UNO_NAME_LINEENDCENTER "LineEndCenter" -#define UNO_NAME_LINETRANSPARENCE "LineTransparence" - -#define UNO_NAME_SHADOW "Shadow" -#define UNO_NAME_SHADOWCOLOR "ShadowColor" -#define UNO_NAME_SHADOWXDIST "ShadowXDistance" -#define UNO_NAME_SHADOWYDIST "ShadowYDistance" -#define UNO_NAME_SHADOWTRANSPARENCE "ShadowTransparence" - -#define UNO_NAME_EDGERADIUS "CornerRadius" - -#define UNO_NAME_TEXT_MINFRAMEHEIGHT "TextMinimumFrameHeight" -#define UNO_NAME_TEXT_AUTOGROWHEIGHT "TextAutoGrowHeight" -#define UNO_NAME_TEXT_FITTOSIZE "TextFitToSize" -#define UNO_NAME_TEXT_LEFTDIST "TextLeftDistance" -#define UNO_NAME_TEXT_RIGHTDIST "TextRightDistance" -#define UNO_NAME_TEXT_UPPERDIST "TextUpperDistance" -#define UNO_NAME_TEXT_LOWERDIST "TextLowerDistance" -#define UNO_NAME_TEXT_VERTADJUST "TextVerticalAdjust" -#define UNO_NAME_TEXT_MAXFRAMEHEIGHT "TextMaximumFrameHeight" -#define UNO_NAME_TEXT_MINFRAMEWIDTH "TextMinimumFrameWidth" -#define UNO_NAME_TEXT_MAXFRAMEWIDTH "TextMaximumFrameWidth" -#define UNO_NAME_TEXT_AUTOGROWWIDTH "TextAutoGrowWidth" -#define UNO_NAME_TEXT_HORZADJUST "TextHorizontalAdjust" -#define UNO_NAME_TEXT_ANIKIND "TextAnimationKind" -#define UNO_NAME_TEXT_ANIDIRECTION "TextAnimationDirection" -#define UNO_NAME_TEXT_ANISTARTINSIDE "TextAnimationStartInside" -#define UNO_NAME_TEXT_ANISTOPINSIDE "TextAnimationStopInside" -#define UNO_NAME_TEXT_ANICOUNT "TextAnimationCount" -#define UNO_NAME_TEXT_ANIDELAY "TextAnimationDelay" -#define UNO_NAME_TEXT_ANIAMOUNT "TextAnimationAmount" -#define UNO_NAME_TEXT_CONTOURFRAME "TextContourFrame" -#define UNO_NAME_TEXT_WRITINGMODE "TextWritingMode" +#define UNO_NAME_EDGENODE2VERTDIST "EdgeNode2VertDist" + +#define UNO_NAME_FILLBMP_OFFSET_X "FillBitmapOffsetX" +#define UNO_NAME_FILLBMP_OFFSET_Y "FillBitmapOffsetY" +#define UNO_NAME_FILLBMP_POSITION_OFFSET_X "FillBitmapPositionOffsetX" +#define UNO_NAME_FILLBMP_POSITION_OFFSET_Y "FillBitmapPositionOffsetY" +#define UNO_NAME_FILLBMP_RECTANGLE_POINT "FillBitmapRectanglePoint" +#define UNO_NAME_FILLBMP_TILE "FillBitmapTile" +#define UNO_NAME_FILLBMP_STRETCH "FillBitmapStretch" +#define UNO_NAME_FILLBMP_LOGICAL_SIZE "FillBitmapLogicalSize" +#define UNO_NAME_FILLBMP_SIZE_X "FillBitmapSizeX" +#define UNO_NAME_FILLBMP_SIZE_Y "FillBitmapSizeY" +#define UNO_NAME_FILL_TRANSPARENCE "FillTransparence" +#define UNO_NAME_FILLBMP_MODE "FillBitmapMode" + +#define UNO_NAME_FILL_GRADIENT_STYLE "FillGradientStyle" +#define UNO_NAME_FILL_GRADIENT_START_COLOR "FillGradientStartColor" +#define UNO_NAME_FILL_GRADIENT_END_COLOR "FillGradientEndColor" +#define UNO_NAME_FILL_GRADIENT_ANGLE "FillGradientAngle" +#define UNO_NAME_FILL_GRADIENT_BORDER "FillGradientBorder" +#define UNO_NAME_FILL_GRADIENT_OFFSET_X "FillGradientOffsetX" +#define UNO_NAME_FILL_GRADIENT_OFFSET_Y "FillGradientOffsetY" +#define UNO_NAME_FILL_GRADIENT_START_INTENSITY "FillGradientStartIntensity" +#define UNO_NAME_FILL_GRADIENT_END_INTENSITY "FillGradientEndIntensity" +#define UNO_NAME_FILL_GRADIENT_STEPS "FillGradientSteps" + +#define UNO_NAME_FILL_HATCH_STYLE "FillHatchStyle" +#define UNO_NAME_FILL_HATCH_COLOR "FillHatchColor" +#define UNO_NAME_FILL_HATCH_DISTANCE "FillHatchDistance" +#define UNO_NAME_FILL_HATCH_ANGLE "FillHatchAngle" + +#define UNO_NAME_LINESTYLE "LineStyle" +#define UNO_NAME_LINEDASH "LineDash" +#define UNO_NAME_LINEWIDTH "LineWidth" +#define UNO_NAME_LINECOLOR "LineColor" +#define UNO_NAME_LINEJOINT "LineJoint" +#define UNO_NAME_LINESTART "LineStart" +#define UNO_NAME_LINEEND "LineEnd" +#define UNO_NAME_LINESTARTWIDTH "LineStartWidth" +#define UNO_NAME_LINEENDWIDTH "LineEndWidth" +#define UNO_NAME_LINESTARTCENTER "LineStartCenter" +#define UNO_NAME_LINEENDCENTER "LineEndCenter" +#define UNO_NAME_LINETRANSPARENCE "LineTransparence" + +#define UNO_NAME_SHADOW "Shadow" +#define UNO_NAME_SHADOWCOLOR "ShadowColor" +#define UNO_NAME_SHADOWXDIST "ShadowXDistance" +#define UNO_NAME_SHADOWYDIST "ShadowYDistance" +#define UNO_NAME_SHADOWTRANSPARENCE "ShadowTransparence" + +#define UNO_NAME_EDGERADIUS "CornerRadius" + +#define UNO_NAME_TEXT_MINFRAMEHEIGHT "TextMinimumFrameHeight" +#define UNO_NAME_TEXT_AUTOGROWHEIGHT "TextAutoGrowHeight" +#define UNO_NAME_TEXT_FITTOSIZE "TextFitToSize" +#define UNO_NAME_TEXT_LEFTDIST "TextLeftDistance" +#define UNO_NAME_TEXT_RIGHTDIST "TextRightDistance" +#define UNO_NAME_TEXT_UPPERDIST "TextUpperDistance" +#define UNO_NAME_TEXT_LOWERDIST "TextLowerDistance" +#define UNO_NAME_TEXT_VERTADJUST "TextVerticalAdjust" +#define UNO_NAME_TEXT_MAXFRAMEHEIGHT "TextMaximumFrameHeight" +#define UNO_NAME_TEXT_MINFRAMEWIDTH "TextMinimumFrameWidth" +#define UNO_NAME_TEXT_MAXFRAMEWIDTH "TextMaximumFrameWidth" +#define UNO_NAME_TEXT_AUTOGROWWIDTH "TextAutoGrowWidth" +#define UNO_NAME_TEXT_HORZADJUST "TextHorizontalAdjust" +#define UNO_NAME_TEXT_ANIKIND "TextAnimationKind" +#define UNO_NAME_TEXT_ANIDIRECTION "TextAnimationDirection" +#define UNO_NAME_TEXT_ANISTARTINSIDE "TextAnimationStartInside" +#define UNO_NAME_TEXT_ANISTOPINSIDE "TextAnimationStopInside" +#define UNO_NAME_TEXT_ANICOUNT "TextAnimationCount" +#define UNO_NAME_TEXT_ANIDELAY "TextAnimationDelay" +#define UNO_NAME_TEXT_ANIAMOUNT "TextAnimationAmount" +#define UNO_NAME_TEXT_CONTOURFRAME "TextContourFrame" +#define UNO_NAME_TEXT_WRITINGMODE "TextWritingMode" #define UNO_NAME_TEXT_FONTINDEPENDENTLINESPACING "FontIndependentLineSpacing" -#define UNO_NAME_TEXT_WORDWRAP "TextWordWrap" - -#define UNO_NAME_MEASUREKIND "MeasureKind" -#define UNO_NAME_MEASURETEXTHPOS "MeasureTextHorizontalPosition" -#define UNO_NAME_MEASURETEXTVPOS "MeasureTextVerticalPosition" -#define UNO_NAME_MEASURELINEDIST "MeasureLineDistance" -#define UNO_NAME_MEASUREHELPLINEOVERHANG "MeasureHelpLineOverhang" -#define UNO_NAME_MEASUREHELPLINEDIST "MeasureHelpLineDistance" -#define UNO_NAME_MEASUREHELPLINE1LEN "MeasureHelpLine1Length" -#define UNO_NAME_MEASUREHELPLINE2LEN "MeasureHelpLine2Length" -#define UNO_NAME_MEASUREBELOWREFEDGE "MeasureBelowReferenceEdge" -#define UNO_NAME_MEASURETEXTROTA90 "MeasureTextRotate90" -#define UNO_NAME_MEASURETEXTUPSIDEDOWN "MeasureTextUpsideDown" -#define UNO_NAME_MEASUREOVERHANG "MeasureOverhang" -#define UNO_NAME_MEASUREUNIT "MeasureUnit" -#define UNO_NAME_MEASURESCALE "MeasureScale" -#define UNO_NAME_MEASURESHOWUNIT "MeasureShowUnit" -#define UNO_NAME_MEASUREFORMATSTRING "MeasureFormatString" -#define UNO_NAME_MEASURETEXTAUTOANGLE "MeasureTextAutoAngle" -#define UNO_NAME_MEASURETEXTAUTOANGLEVIEW "MeasureTextAutoAngleView" -#define UNO_NAME_MEASURETEXTISFIXEDANGLE "MeasureTextIsFixedAngle" -#define UNO_NAME_MEASURETEXTFIXEDANGLE "MeasureTextFixedAngle" - -#define UNO_NAME_CIRCKIND "CircleKind" -#define UNO_NAME_CIRCSTARTANGLE "CircleStartAngle" -#define UNO_NAME_CIRCENDANGLE "CircleEndAngle" - -#define UNO_NAME_POLYGONKIND "PolygonKind" -#define UNO_NAME_POLYPOLYGON "PolyPolygon" -#define UNO_NAME_POLYPOLYGONBEZIER "PolyPolygonBezier" -#define UNO_NAME_POLYGON "Polygon" - -#define UNO_NAME_MISC_OBJ_ZORDER "ZOrder" -#define UNO_NAME_MISC_OBJ_MOVEPROTECT "MoveProtect" -#define UNO_NAME_MISC_OBJ_SIZEPROTECT "SizeProtect" -#define UNO_NAME_MISC_OBJ_PRINTABLE "Printable" -#define UNO_NAME_MISC_OBJ_LAYERID "LayerID" -#define UNO_NAME_MISC_OBJ_LAYERNAME "LayerName" -#define UNO_NAME_MISC_OBJ_NAME "Name" -#define UNO_NAME_MISC_OBJ_ROTATEANGLE "RotateAngle" -#define UNO_NAME_MISC_OBJ_SHEARANGLE "ShearAngle" -#define UNO_NAME_MISC_OBJ_ROTATION_POINT_X "RotationPointX" -#define UNO_NAME_MISC_OBJ_ROTATION_POINT_Y "RotationPointY" -#define UNO_NAME_MISC_OBJ_FRAMERECT "FrameRect" -#define UNO_NAME_MISC_OBJ_BOUNDRECT "BoundRect" +#define UNO_NAME_TEXT_WORDWRAP "TextWordWrap" + +#define UNO_NAME_MEASUREKIND "MeasureKind" +#define UNO_NAME_MEASURETEXTHPOS "MeasureTextHorizontalPosition" +#define UNO_NAME_MEASURETEXTVPOS "MeasureTextVerticalPosition" +#define UNO_NAME_MEASURELINEDIST "MeasureLineDistance" +#define UNO_NAME_MEASUREHELPLINEOVERHANG "MeasureHelpLineOverhang" +#define UNO_NAME_MEASUREHELPLINEDIST "MeasureHelpLineDistance" +#define UNO_NAME_MEASUREHELPLINE1LEN "MeasureHelpLine1Length" +#define UNO_NAME_MEASUREHELPLINE2LEN "MeasureHelpLine2Length" +#define UNO_NAME_MEASUREBELOWREFEDGE "MeasureBelowReferenceEdge" +#define UNO_NAME_MEASURETEXTROTA90 "MeasureTextRotate90" +#define UNO_NAME_MEASURETEXTUPSIDEDOWN "MeasureTextUpsideDown" +#define UNO_NAME_MEASUREOVERHANG "MeasureOverhang" +#define UNO_NAME_MEASUREUNIT "MeasureUnit" +#define UNO_NAME_MEASURESCALE "MeasureScale" +#define UNO_NAME_MEASURESHOWUNIT "MeasureShowUnit" +#define UNO_NAME_MEASUREFORMATSTRING "MeasureFormatString" +#define UNO_NAME_MEASURETEXTAUTOANGLE "MeasureTextAutoAngle" +#define UNO_NAME_MEASURETEXTAUTOANGLEVIEW "MeasureTextAutoAngleView" +#define UNO_NAME_MEASURETEXTISFIXEDANGLE "MeasureTextIsFixedAngle" +#define UNO_NAME_MEASURETEXTFIXEDANGLE "MeasureTextFixedAngle" + +#define UNO_NAME_CIRCKIND "CircleKind" +#define UNO_NAME_CIRCSTARTANGLE "CircleStartAngle" +#define UNO_NAME_CIRCENDANGLE "CircleEndAngle" + +#define UNO_NAME_POLYGONKIND "PolygonKind" +#define UNO_NAME_POLYPOLYGON "PolyPolygon" +#define UNO_NAME_POLYPOLYGONBEZIER "PolyPolygonBezier" +#define UNO_NAME_POLYGON "Polygon" + +#define UNO_NAME_MISC_OBJ_ZORDER "ZOrder" +#define UNO_NAME_MISC_OBJ_MOVEPROTECT "MoveProtect" +#define UNO_NAME_MISC_OBJ_SIZEPROTECT "SizeProtect" +#define UNO_NAME_MISC_OBJ_PRINTABLE "Printable" +#define UNO_NAME_MISC_OBJ_LAYERID "LayerID" +#define UNO_NAME_MISC_OBJ_LAYERNAME "LayerName" +#define UNO_NAME_MISC_OBJ_NAME "Name" +#define UNO_NAME_MISC_OBJ_ROTATEANGLE "RotateAngle" +#define UNO_NAME_MISC_OBJ_SHEARANGLE "ShearAngle" +#define UNO_NAME_MISC_OBJ_ROTATION_POINT_X "RotationPointX" +#define UNO_NAME_MISC_OBJ_ROTATION_POINT_Y "RotationPointY" +#define UNO_NAME_MISC_OBJ_FRAMERECT "FrameRect" +#define UNO_NAME_MISC_OBJ_BOUNDRECT "BoundRect" // #i68101# -#define UNO_NAME_MISC_OBJ_TITLE "Title" -#define UNO_NAME_MISC_OBJ_DESCRIPTION "Description" +#define UNO_NAME_MISC_OBJ_TITLE "Title" +#define UNO_NAME_MISC_OBJ_DESCRIPTION "Description" -#define UNO_NAME_GRAPHOBJ_FILLBITMAP "GraphicObjectFillBitmap" -#define UNO_NAME_GRAPHOBJ_GRAFURL "GraphicURL" -#define UNO_NAME_GRAPHOBJ_GRAFSTREAMURL "GraphicStreamURL" -#define UNO_NAME_GRAPHOBJ_URLPREFIX "vnd.sun.star.GraphicObject:" -#define UNO_NAME_GRAPHOBJ_URLPKGPREFIX "vnd.sun.star.Package:" -#define UNO_NAME_GRAPHOBJ_GRAPHIC "Graphic" +#define UNO_NAME_GRAPHOBJ_FILLBITMAP "GraphicObjectFillBitmap" +#define UNO_NAME_GRAPHOBJ_GRAFURL "GraphicURL" +#define UNO_NAME_GRAPHOBJ_GRAFSTREAMURL "GraphicStreamURL" +#define UNO_NAME_GRAPHOBJ_URLPREFIX "vnd.sun.star.GraphicObject:" +#define UNO_NAME_GRAPHOBJ_URLPKGPREFIX "vnd.sun.star.Package:" +#define UNO_NAME_GRAPHOBJ_GRAPHIC "Graphic" #define UNO_NAME_OLE2_METAFILE "MetaFile" #define UNO_NAME_OLE2_PERSISTNAME "PersistName" -#define UNO_NAME_3D_SCENE_PERSPECTIVE "D3DScenePerspective" -#define UNO_NAME_3D_SCENE_DISTANCE "D3DSceneDistance" -#define UNO_NAME_3D_SCENE_FOCAL_LENGTH "D3DSceneFocalLength" -#define UNO_NAME_3D_SCENE_TWO_SIDED_LIGHTING "D3DSceneTwoSidedLighting" -#define UNO_NAME_3D_SCENE_LIGHTCOLOR_1 "D3DSceneLightColor1" -#define UNO_NAME_3D_SCENE_LIGHTCOLOR_2 "D3DSceneLightColor2" -#define UNO_NAME_3D_SCENE_LIGHTCOLOR_3 "D3DSceneLightColor3" -#define UNO_NAME_3D_SCENE_LIGHTCOLOR_4 "D3DSceneLightColor4" -#define UNO_NAME_3D_SCENE_LIGHTCOLOR_5 "D3DSceneLightColor5" -#define UNO_NAME_3D_SCENE_LIGHTCOLOR_6 "D3DSceneLightColor6" -#define UNO_NAME_3D_SCENE_LIGHTCOLOR_7 "D3DSceneLightColor7" -#define UNO_NAME_3D_SCENE_LIGHTCOLOR_8 "D3DSceneLightColor8" -#define UNO_NAME_3D_SCENE_LIGHTON_1 "D3DSceneLightOn1" -#define UNO_NAME_3D_SCENE_LIGHTON_2 "D3DSceneLightOn2" -#define UNO_NAME_3D_SCENE_LIGHTON_3 "D3DSceneLightOn3" -#define UNO_NAME_3D_SCENE_LIGHTON_4 "D3DSceneLightOn4" -#define UNO_NAME_3D_SCENE_LIGHTON_5 "D3DSceneLightOn5" -#define UNO_NAME_3D_SCENE_LIGHTON_6 "D3DSceneLightOn6" -#define UNO_NAME_3D_SCENE_LIGHTON_7 "D3DSceneLightOn7" -#define UNO_NAME_3D_SCENE_LIGHTON_8 "D3DSceneLightOn8" -#define UNO_NAME_3D_SCENE_LIGHTDIRECTION_1 "D3DSceneLightDirection1" -#define UNO_NAME_3D_SCENE_LIGHTDIRECTION_2 "D3DSceneLightDirection2" -#define UNO_NAME_3D_SCENE_LIGHTDIRECTION_3 "D3DSceneLightDirection3" -#define UNO_NAME_3D_SCENE_LIGHTDIRECTION_4 "D3DSceneLightDirection4" -#define UNO_NAME_3D_SCENE_LIGHTDIRECTION_5 "D3DSceneLightDirection5" -#define UNO_NAME_3D_SCENE_LIGHTDIRECTION_6 "D3DSceneLightDirection6" -#define UNO_NAME_3D_SCENE_LIGHTDIRECTION_7 "D3DSceneLightDirection7" -#define UNO_NAME_3D_SCENE_LIGHTDIRECTION_8 "D3DSceneLightDirection8" -#define UNO_NAME_3D_SCENE_AMBIENTCOLOR "D3DSceneAmbientColor" -#define UNO_NAME_3D_SCENE_SHADOW_SLANT "D3DSceneShadowSlant" -#define UNO_NAME_3D_SCENE_SHADE_MODE "D3DSceneShadeMode" - -#define UNO_NAME_3D_DOUBLE_SIDED "D3DDoubleSided" -#define UNO_NAME_3D_NORMALS_KIND "D3DNormalsKind" -#define UNO_NAME_3D_NORMALS_INVERT "D3DNormalsInvert" -#define UNO_NAME_3D_TEXTURE_PROJ_X "D3DTextureProjectionX" -#define UNO_NAME_3D_TEXTURE_PROJ_Y "D3DTextureProjectionY" -#define UNO_NAME_3D_SHADOW_3D "D3DShadow3D" -#define UNO_NAME_3D_MAT_COLOR "D3DMaterialColor" -#define UNO_NAME_3D_MAT_EMISSION "D3DMaterialEmission" -#define UNO_NAME_3D_MAT_SPECULAR "D3DMaterialSpecular" -#define UNO_NAME_3D_MAT_SPECULAR_INTENSITY "D3DMaterialSpecularIntensity" -#define UNO_NAME_3D_TEXTURE_KIND "D3DTextureKind" -#define UNO_NAME_3D_TEXTURE_MODE "D3DTextureMode" -#define UNO_NAME_3D_TEXTURE_FILTER "D3DTextureFilter" +#define UNO_NAME_3D_SCENE_PERSPECTIVE "D3DScenePerspective" +#define UNO_NAME_3D_SCENE_DISTANCE "D3DSceneDistance" +#define UNO_NAME_3D_SCENE_FOCAL_LENGTH "D3DSceneFocalLength" +#define UNO_NAME_3D_SCENE_TWO_SIDED_LIGHTING "D3DSceneTwoSidedLighting" +#define UNO_NAME_3D_SCENE_LIGHTCOLOR_1 "D3DSceneLightColor1" +#define UNO_NAME_3D_SCENE_LIGHTCOLOR_2 "D3DSceneLightColor2" +#define UNO_NAME_3D_SCENE_LIGHTCOLOR_3 "D3DSceneLightColor3" +#define UNO_NAME_3D_SCENE_LIGHTCOLOR_4 "D3DSceneLightColor4" +#define UNO_NAME_3D_SCENE_LIGHTCOLOR_5 "D3DSceneLightColor5" +#define UNO_NAME_3D_SCENE_LIGHTCOLOR_6 "D3DSceneLightColor6" +#define UNO_NAME_3D_SCENE_LIGHTCOLOR_7 "D3DSceneLightColor7" +#define UNO_NAME_3D_SCENE_LIGHTCOLOR_8 "D3DSceneLightColor8" +#define UNO_NAME_3D_SCENE_LIGHTON_1 "D3DSceneLightOn1" +#define UNO_NAME_3D_SCENE_LIGHTON_2 "D3DSceneLightOn2" +#define UNO_NAME_3D_SCENE_LIGHTON_3 "D3DSceneLightOn3" +#define UNO_NAME_3D_SCENE_LIGHTON_4 "D3DSceneLightOn4" +#define UNO_NAME_3D_SCENE_LIGHTON_5 "D3DSceneLightOn5" +#define UNO_NAME_3D_SCENE_LIGHTON_6 "D3DSceneLightOn6" +#define UNO_NAME_3D_SCENE_LIGHTON_7 "D3DSceneLightOn7" +#define UNO_NAME_3D_SCENE_LIGHTON_8 "D3DSceneLightOn8" +#define UNO_NAME_3D_SCENE_LIGHTDIRECTION_1 "D3DSceneLightDirection1" +#define UNO_NAME_3D_SCENE_LIGHTDIRECTION_2 "D3DSceneLightDirection2" +#define UNO_NAME_3D_SCENE_LIGHTDIRECTION_3 "D3DSceneLightDirection3" +#define UNO_NAME_3D_SCENE_LIGHTDIRECTION_4 "D3DSceneLightDirection4" +#define UNO_NAME_3D_SCENE_LIGHTDIRECTION_5 "D3DSceneLightDirection5" +#define UNO_NAME_3D_SCENE_LIGHTDIRECTION_6 "D3DSceneLightDirection6" +#define UNO_NAME_3D_SCENE_LIGHTDIRECTION_7 "D3DSceneLightDirection7" +#define UNO_NAME_3D_SCENE_LIGHTDIRECTION_8 "D3DSceneLightDirection8" +#define UNO_NAME_3D_SCENE_AMBIENTCOLOR "D3DSceneAmbientColor" +#define UNO_NAME_3D_SCENE_SHADOW_SLANT "D3DSceneShadowSlant" +#define UNO_NAME_3D_SCENE_SHADE_MODE "D3DSceneShadeMode" + +#define UNO_NAME_3D_DOUBLE_SIDED "D3DDoubleSided" +#define UNO_NAME_3D_NORMALS_KIND "D3DNormalsKind" +#define UNO_NAME_3D_NORMALS_INVERT "D3DNormalsInvert" +#define UNO_NAME_3D_TEXTURE_PROJ_X "D3DTextureProjectionX" +#define UNO_NAME_3D_TEXTURE_PROJ_Y "D3DTextureProjectionY" +#define UNO_NAME_3D_SHADOW_3D "D3DShadow3D" +#define UNO_NAME_3D_MAT_COLOR "D3DMaterialColor" +#define UNO_NAME_3D_MAT_EMISSION "D3DMaterialEmission" +#define UNO_NAME_3D_MAT_SPECULAR "D3DMaterialSpecular" +#define UNO_NAME_3D_MAT_SPECULAR_INTENSITY "D3DMaterialSpecularIntensity" +#define UNO_NAME_3D_TEXTURE_KIND "D3DTextureKind" +#define UNO_NAME_3D_TEXTURE_MODE "D3DTextureMode" +#define UNO_NAME_3D_TEXTURE_FILTER "D3DTextureFilter" // #i28528# // Added extra Item (Bool) for chart2 to be able to show reduced line geometry -#define UNO_NAME_3D_REDUCED_LINE_GEOMETRY "D3DReducedLineGeometry" +#define UNO_NAME_3D_REDUCED_LINE_GEOMETRY "D3DReducedLineGeometry" -#define UNO_NAME_3D_HORZ_SEGS "D3DHorizontalSegments" -#define UNO_NAME_3D_VERT_SEGS "D3DVerticalSegments" +#define UNO_NAME_3D_HORZ_SEGS "D3DHorizontalSegments" +#define UNO_NAME_3D_VERT_SEGS "D3DVerticalSegments" -#define UNO_NAME_3D_PERCENT_DIAGONAL "D3DPercentDiagonal" -#define UNO_NAME_3D_BACKSCALE "D3DBackscale" -#define UNO_NAME_3D_LATHE_END_ANGLE "D3DEndAngle" +#define UNO_NAME_3D_PERCENT_DIAGONAL "D3DPercentDiagonal" +#define UNO_NAME_3D_BACKSCALE "D3DBackscale" +#define UNO_NAME_3D_LATHE_END_ANGLE "D3DEndAngle" -#define UNO_NAME_3D_EXTRUDE_DEPTH "D3DDepth" +#define UNO_NAME_3D_EXTRUDE_DEPTH "D3DDepth" -#define UNO_NAME_3D_TRANSFORM_MATRIX "D3DTransformMatrix" -#define UNO_NAME_3D_CAMERA_GEOMETRY "D3DCameraGeometry" -#define UNO_NAME_3D_POS "D3DPosition" -#define UNO_NAME_3D_SIZE "D3DSize" -#define UNO_NAME_3D_POS_IS_CENTER "D3DPositionIsCenter" -#define UNO_NAME_3D_POLYPOLYGON3D "D3DPolyPolygon3D" -#define UNO_NAME_3D_NORMALSPOLYGON3D "D3DNormalsPolygon3D" -#define UNO_NAME_3D_TEXTUREPOLYGON3D "D3DTexturePolygon3D" -#define UNO_NAME_3D_LINEONLY "D3DLineOnly" +#define UNO_NAME_3D_TRANSFORM_MATRIX "D3DTransformMatrix" +#define UNO_NAME_3D_CAMERA_GEOMETRY "D3DCameraGeometry" +#define UNO_NAME_3D_POS "D3DPosition" +#define UNO_NAME_3D_SIZE "D3DSize" +#define UNO_NAME_3D_POS_IS_CENTER "D3DPositionIsCenter" +#define UNO_NAME_3D_POLYPOLYGON3D "D3DPolyPolygon3D" +#define UNO_NAME_3D_NORMALSPOLYGON3D "D3DNormalsPolygon3D" +#define UNO_NAME_3D_TEXTUREPOLYGON3D "D3DTexturePolygon3D" +#define UNO_NAME_3D_LINEONLY "D3DLineOnly" // #107245# New 3D properties which are possible for lathe and extrude 3d objects -#define UNO_NAME_3D_SMOOTH_NORMALS "D3DSmoothNormals" -#define UNO_NAME_3D_SMOOTH_LIDS "D3DSmoothLids" -#define UNO_NAME_3D_CHARACTER_MODE "D3DCharacterMode" -#define UNO_NAME_3D_CLOSE_FRONT "D3DCloseFront" -#define UNO_NAME_3D_CLOSE_BACK "D3DCloseBack" - -#define UNO_NAME_NUMBERING "NumberingIsNumber" -#define UNO_NAME_NUMBERING_RULES "NumberingRules" +#define UNO_NAME_3D_SMOOTH_NORMALS "D3DSmoothNormals" +#define UNO_NAME_3D_SMOOTH_LIDS "D3DSmoothLids" +#define UNO_NAME_3D_CHARACTER_MODE "D3DCharacterMode" +#define UNO_NAME_3D_CLOSE_FRONT "D3DCloseFront" +#define UNO_NAME_3D_CLOSE_BACK "D3DCloseBack" + +#define UNO_NAME_NUMBERING "NumberingIsNumber" +#define UNO_NAME_NUMBERING_RULES "NumberingRules" #define UNO_NAME_NUMBERING_LEVEL "NumberingLevel" -#define UNO_NAME_NRULE_NUMBERINGTYPE "NumberingType" -#define UNO_NAME_NRULE_PREFIX "Prefix" -#define UNO_NAME_NRULE_SUFFIX "Suffix" -#define UNO_NAME_NRULE_BULLETID "BulletId" -#define UNO_NAME_NRULE_BULLET_COLOR "BulletColor" -#define UNO_NAME_NRULE_BULLET_RELSIZE "BulletRelSize" -#define UNO_NAME_NRULE_BULLET_FONT "BulletFont" -#define UNO_NAME_NRULE_GRAPHICURL "GraphicURL" -#define UNO_NAME_NRULE_START_WITH "StartWith" -#define UNO_NAME_NRULE_LEFT_MARGIN "LeftMargin" -#define UNO_NAME_NRULE_FIRST_LINE_OFFSET "FirstLineOffset" -#define UNO_NAME_NRULE_ADJUST "Adjust" - -#define UNO_NAME_EDIT_FONT_DESCRIPTOR "FontDescriptor" -#define UNO_NAME_EDIT_FONT_STYLENAME "FontStyleName" - -#define UNO_NAME_EDIT_PARA_ADJUST "ParaAdjust" -#define UNO_NAME_EDIT_PARA_BMARGIN "ParaBottomMargin" -#define UNO_NAME_EDIT_PARA_LASTLINEADJ "ParaLastLineAdjust" -#define UNO_NAME_EDIT_PARA_LMARGIN "ParaLeftMargin" -#define UNO_NAME_EDIT_PARA_LRPARAMARGIN "ParaLeftRightParaMargin" -#define UNO_NAME_EDIT_PARA_LINESPACING "ParaLineSpacing" -#define UNO_NAME_EDIT_PARA_RMARGIN "ParaRightMargin" -#define UNO_NAME_EDIT_PARA_TAPSTOPS "ParaTabStops" -#define UNO_NAME_EDIT_PARA_TBMARGIN "ParaTopBottomMargin" -#define UNO_NAME_EDIT_PARA_TMARGIN "ParaTopMargin" -#define UNO_NAME_EDIT_PARA_IS_HYPHEN "ParaIsHyphenation" +#define UNO_NAME_NRULE_NUMBERINGTYPE "NumberingType" +#define UNO_NAME_NRULE_PREFIX "Prefix" +#define UNO_NAME_NRULE_SUFFIX "Suffix" +#define UNO_NAME_NRULE_BULLETID "BulletId" +#define UNO_NAME_NRULE_BULLET_COLOR "BulletColor" +#define UNO_NAME_NRULE_BULLET_RELSIZE "BulletRelSize" +#define UNO_NAME_NRULE_BULLET_FONT "BulletFont" +#define UNO_NAME_NRULE_GRAPHICURL "GraphicURL" +#define UNO_NAME_NRULE_START_WITH "StartWith" +#define UNO_NAME_NRULE_LEFT_MARGIN "LeftMargin" +#define UNO_NAME_NRULE_FIRST_LINE_OFFSET "FirstLineOffset" +#define UNO_NAME_NRULE_ADJUST "Adjust" + +#define UNO_NAME_EDIT_FONT_DESCRIPTOR "FontDescriptor" +#define UNO_NAME_EDIT_FONT_STYLENAME "FontStyleName" + +#define UNO_NAME_EDIT_PARA_ADJUST "ParaAdjust" +#define UNO_NAME_EDIT_PARA_BMARGIN "ParaBottomMargin" +#define UNO_NAME_EDIT_PARA_LASTLINEADJ "ParaLastLineAdjust" +#define UNO_NAME_EDIT_PARA_LMARGIN "ParaLeftMargin" +#define UNO_NAME_EDIT_PARA_LRPARAMARGIN "ParaLeftRightParaMargin" +#define UNO_NAME_EDIT_PARA_LINESPACING "ParaLineSpacing" +#define UNO_NAME_EDIT_PARA_RMARGIN "ParaRightMargin" +#define UNO_NAME_EDIT_PARA_TAPSTOPS "ParaTabStops" +#define UNO_NAME_EDIT_PARA_TBMARGIN "ParaTopBottomMargin" +#define UNO_NAME_EDIT_PARA_TMARGIN "ParaTopMargin" +#define UNO_NAME_EDIT_PARA_IS_HYPHEN "ParaIsHyphenation" #define UNO_NAME_EDIT_PARA_IS_HANGING_PUNCTUATION "ParaIsHangingPunctuation" #define UNO_NAME_EDIT_PARA_IS_CHARACTER_DISTANCE "ParaIsCharacterDistance" -#define UNO_NAME_EDIT_PARA_IS_FORBIDDEN_RULES "ParaIsForbiddenRules" -#define UNO_NAME_EDIT_PARA_FIRST_LINE_INDENT "ParaFirstLineIndent" - -#define UNO_NAME_EDIT_CHAR_HEIGHT "CharHeight" -#define UNO_NAME_EDIT_CHAR_FONTNAME "CharFontName" -#define UNO_NAME_EDIT_CHAR_FONTSTYLENAME "CharFontStyleName" -#define UNO_NAME_EDIT_CHAR_FONTFAMILY "CharFontFamily" -#define UNO_NAME_EDIT_CHAR_FONTCHARSET "CharFontCharSet" -#define UNO_NAME_EDIT_CHAR_FONTPITCH "CharFontPitch" -#define UNO_NAME_EDIT_CHAR_POSTURE "CharPosture" -#define UNO_NAME_EDIT_CHAR_WEIGHT "CharWeight" -#define UNO_NAME_EDIT_CHAR_LOCALE "CharLocale" +#define UNO_NAME_EDIT_PARA_IS_FORBIDDEN_RULES "ParaIsForbiddenRules" +#define UNO_NAME_EDIT_PARA_FIRST_LINE_INDENT "ParaFirstLineIndent" + +#define UNO_NAME_EDIT_CHAR_HEIGHT "CharHeight" +#define UNO_NAME_EDIT_CHAR_FONTNAME "CharFontName" +#define UNO_NAME_EDIT_CHAR_FONTSTYLENAME "CharFontStyleName" +#define UNO_NAME_EDIT_CHAR_FONTFAMILY "CharFontFamily" +#define UNO_NAME_EDIT_CHAR_FONTCHARSET "CharFontCharSet" +#define UNO_NAME_EDIT_CHAR_FONTPITCH "CharFontPitch" +#define UNO_NAME_EDIT_CHAR_POSTURE "CharPosture" +#define UNO_NAME_EDIT_CHAR_WEIGHT "CharWeight" +#define UNO_NAME_EDIT_CHAR_LOCALE "CharLocale" #define UNO_NAME_EDIT_CHAR_HEIGHT_ASIAN "CharHeightAsian" -#define UNO_NAME_EDIT_CHAR_FONTNAME_ASIAN "CharFontNameAsian" -#define UNO_NAME_EDIT_CHAR_FONTSTYLENAME_ASIAN "CharFontStyleNameAsian" -#define UNO_NAME_EDIT_CHAR_FONTFAMILY_ASIAN "CharFontFamilyAsian" -#define UNO_NAME_EDIT_CHAR_FONTCHARSET_ASIAN "CharFontCharSetAsian" -#define UNO_NAME_EDIT_CHAR_FONTPITCH_ASIAN "CharFontPitchAsian" -#define UNO_NAME_EDIT_CHAR_POSTURE_ASIAN "CharPostureAsian" -#define UNO_NAME_EDIT_CHAR_WEIGHT_ASIAN "CharWeightAsian" -#define UNO_NAME_EDIT_CHAR_LOCALE_ASIAN "CharLocaleAsian" - -#define UNO_NAME_EDIT_CHAR_HEIGHT_COMPLEX "CharHeightComplex" -#define UNO_NAME_EDIT_CHAR_FONTNAME_COMPLEX "CharFontNameComplex" +#define UNO_NAME_EDIT_CHAR_FONTNAME_ASIAN "CharFontNameAsian" +#define UNO_NAME_EDIT_CHAR_FONTSTYLENAME_ASIAN "CharFontStyleNameAsian" +#define UNO_NAME_EDIT_CHAR_FONTFAMILY_ASIAN "CharFontFamilyAsian" +#define UNO_NAME_EDIT_CHAR_FONTCHARSET_ASIAN "CharFontCharSetAsian" +#define UNO_NAME_EDIT_CHAR_FONTPITCH_ASIAN "CharFontPitchAsian" +#define UNO_NAME_EDIT_CHAR_POSTURE_ASIAN "CharPostureAsian" +#define UNO_NAME_EDIT_CHAR_WEIGHT_ASIAN "CharWeightAsian" +#define UNO_NAME_EDIT_CHAR_LOCALE_ASIAN "CharLocaleAsian" + +#define UNO_NAME_EDIT_CHAR_HEIGHT_COMPLEX "CharHeightComplex" +#define UNO_NAME_EDIT_CHAR_FONTNAME_COMPLEX "CharFontNameComplex" #define UNO_NAME_EDIT_CHAR_FONTSTYLENAME_COMPLEX "CharFontStyleNameComplex" -#define UNO_NAME_EDIT_CHAR_FONTFAMILY_COMPLEX "CharFontFamilyComplex" -#define UNO_NAME_EDIT_CHAR_FONTCHARSET_COMPLEX "CharFontCharSetComplex" -#define UNO_NAME_EDIT_CHAR_FONTPITCH_COMPLEX "CharFontPitchComplex" -#define UNO_NAME_EDIT_CHAR_POSTURE_COMPLEX "CharPostureComplex" -#define UNO_NAME_EDIT_CHAR_WEIGHT_COMPLEX "CharWeightComplex" -#define UNO_NAME_EDIT_CHAR_LOCALE_COMPLEX "CharLocaleComplex" - -#define UNO_NAME_EDIT_CHAR_COLOR "CharColor" -#define UNO_NAME_EDIT_CHAR_CROSSEDOUT "CharCrossedOut" -#define UNO_NAME_EDIT_CHAR_STRIKEOUT "CharStrikeout" -#define UNO_NAME_EDIT_CHAR_ESCAPEMENT "CharEscapement" -#define UNO_NAME_EDIT_CHAR_FONTNAME "CharFontName" -#define UNO_NAME_EDIT_CHAR_SHADOWED "CharShadowed" -#define UNO_NAME_EDIT_CHAR_UNDERLINE "CharUnderline" -#define UNO_NAME_EDIT_CHAR_OVERLINE "CharOverline" - -#define UNO_NAME_BITMAP "Bitmap" - -#define UNO_NAME_LINKDISPLAYNAME "LinkDisplayName" -#define UNO_NAME_LINKDISPLAYBITMAP "LinkDisplayBitmap" - -#define UNO_NAME_GRAPHIC_LUMINANCE "AdjustLuminance" -#define UNO_NAME_GRAPHIC_CONTRAST "AdjustContrast" -#define UNO_NAME_GRAPHIC_RED "AdjustRed" -#define UNO_NAME_GRAPHIC_GREEN "AdjustGreen" -#define UNO_NAME_GRAPHIC_BLUE "AdjustBlue" -#define UNO_NAME_GRAPHIC_GAMMA "Gamma" -#define UNO_NAME_GRAPHIC_TRANSPARENCY "Transparency" -#define UNO_NAME_GRAPHIC_COLOR_MODE "GraphicColorMode" -#define UNO_NAME_GRAPHIC_GRAPHICCROP "GraphicCrop" - -#define UNO_NAME_CUSTOMSHAPE_ADJUSTMENT "CustomShapeAdjustment" +#define UNO_NAME_EDIT_CHAR_FONTFAMILY_COMPLEX "CharFontFamilyComplex" +#define UNO_NAME_EDIT_CHAR_FONTCHARSET_COMPLEX "CharFontCharSetComplex" +#define UNO_NAME_EDIT_CHAR_FONTPITCH_COMPLEX "CharFontPitchComplex" +#define UNO_NAME_EDIT_CHAR_POSTURE_COMPLEX "CharPostureComplex" +#define UNO_NAME_EDIT_CHAR_WEIGHT_COMPLEX "CharWeightComplex" +#define UNO_NAME_EDIT_CHAR_LOCALE_COMPLEX "CharLocaleComplex" + +#define UNO_NAME_EDIT_CHAR_COLOR "CharColor" +#define UNO_NAME_EDIT_CHAR_CROSSEDOUT "CharCrossedOut" +#define UNO_NAME_EDIT_CHAR_STRIKEOUT "CharStrikeout" +#define UNO_NAME_EDIT_CHAR_ESCAPEMENT "CharEscapement" +#define UNO_NAME_EDIT_CHAR_FONTNAME "CharFontName" +#define UNO_NAME_EDIT_CHAR_SHADOWED "CharShadowed" +#define UNO_NAME_EDIT_CHAR_UNDERLINE "CharUnderline" +#define UNO_NAME_EDIT_CHAR_OVERLINE "CharOverline" + +#define UNO_NAME_BITMAP "Bitmap" + +#define UNO_NAME_LINKDISPLAYNAME "LinkDisplayName" +#define UNO_NAME_LINKDISPLAYBITMAP "LinkDisplayBitmap" + +#define UNO_NAME_GRAPHIC_LUMINANCE "AdjustLuminance" +#define UNO_NAME_GRAPHIC_CONTRAST "AdjustContrast" +#define UNO_NAME_GRAPHIC_RED "AdjustRed" +#define UNO_NAME_GRAPHIC_GREEN "AdjustGreen" +#define UNO_NAME_GRAPHIC_BLUE "AdjustBlue" +#define UNO_NAME_GRAPHIC_GAMMA "Gamma" +#define UNO_NAME_GRAPHIC_TRANSPARENCY "Transparency" +#define UNO_NAME_GRAPHIC_COLOR_MODE "GraphicColorMode" +#define UNO_NAME_GRAPHIC_GRAPHICCROP "GraphicCrop" + +#define UNO_NAME_CUSTOMSHAPE_ADJUSTMENT "CustomShapeAdjustment" // Die folgenden Properties sind veraltet und koennen irgendwann mal raus -#define UNO_NAME_EDIT_FONT_COLOR "FontColor" -#define UNO_NAME_EDIT_FONT_ESCAPEMENT "FontEscapement" -#define UNO_NAME_EDIT_FONT_HEIGHT "FontHeight" -#define UNO_NAME_EDIT_FONT_SHADOWED "FontShadowed" -#define UNO_NAME_EDIT_FONT_SLANT "FontSlant" -#define UNO_NAME_EDIT_FONT_STRIKEOUT "FontStrikeout" -#define UNO_NAME_EDIT_FONT_UNDERLINE "FontUnderline" -#define UNO_NAME_EDIT_FONT_WEIGHT "FontWeight" -#define UNO_NAME_EDIT_CHAR_STYLE "CharStyle" -#define UNO_NAME_EDIT_FONT_FAMILY "FontFamily" -#define UNO_NAME_EDIT_FONT_NAME "FontName" -#define UNO_NAME_EDIT_FONT_CHARSET "FontCharset" +#define UNO_NAME_EDIT_FONT_COLOR "FontColor" +#define UNO_NAME_EDIT_FONT_ESCAPEMENT "FontEscapement" +#define UNO_NAME_EDIT_FONT_HEIGHT "FontHeight" +#define UNO_NAME_EDIT_FONT_SHADOWED "FontShadowed" +#define UNO_NAME_EDIT_FONT_SLANT "FontSlant" +#define UNO_NAME_EDIT_FONT_STRIKEOUT "FontStrikeout" +#define UNO_NAME_EDIT_FONT_UNDERLINE "FontUnderline" +#define UNO_NAME_EDIT_FONT_WEIGHT "FontWeight" +#define UNO_NAME_EDIT_CHAR_STYLE "CharStyle" +#define UNO_NAME_EDIT_FONT_FAMILY "FontFamily" +#define UNO_NAME_EDIT_FONT_NAME "FontName" +#define UNO_NAME_EDIT_FONT_CHARSET "FontCharset" // Ende der veralteten Properties #endif diff --git a/editeng/inc/editeng/unotext.hxx b/editeng/inc/editeng/unotext.hxx index bfa5daa20d6d..ebd05769343c 100644 --- a/editeng/inc/editeng/unotext.hxx +++ b/editeng/inc/editeng/unotext.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,88 +79,88 @@ class SvxItemPropertySet; #endif #endif -#define WID_FONTDESC OWN_ATTR_VALUE_START -#define WID_NUMLEVEL OWN_ATTR_VALUE_START+1 -#define WID_PORTIONTYPE OWN_ATTR_VALUE_START+2 +#define WID_FONTDESC OWN_ATTR_VALUE_START +#define WID_NUMLEVEL OWN_ATTR_VALUE_START+1 +#define WID_PORTIONTYPE OWN_ATTR_VALUE_START+2 #define WID_NUMBERINGSTARTVALUE OWN_ATTR_VALUE_START+3 #define WID_PARAISNUMBERINGRESTART OWN_ATTR_VALUE_START+4 #define SVX_UNOEDIT_NUMBERING_PROPERTIE \ - {MAP_CHAR_LEN(UNO_NAME_NUMBERING_RULES), EE_PARA_NUMBULLET, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace>*)0), 0, 0 }, \ - {MAP_CHAR_LEN(UNO_NAME_NUMBERING), EE_PARA_BULLETSTATE,&::getBooleanCppuType(), 0, 0 } + {MAP_CHAR_LEN(UNO_NAME_NUMBERING_RULES), EE_PARA_NUMBULLET, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace>*)0), 0, 0 }, \ + {MAP_CHAR_LEN(UNO_NAME_NUMBERING), EE_PARA_BULLETSTATE,&::getBooleanCppuType(), 0, 0 } #define SVX_UNOEDIT_OUTLINER_PROPERTIES \ SVX_UNOEDIT_NUMBERING_PROPERTIE, \ - {MAP_CHAR_LEN(UNO_NAME_NUMBERING_LEVEL), WID_NUMLEVEL, &::getCppuType((const sal_Int16*)0), 0, 0 }, \ + {MAP_CHAR_LEN(UNO_NAME_NUMBERING_LEVEL), WID_NUMLEVEL, &::getCppuType((const sal_Int16*)0), 0, 0 }, \ {MAP_CHAR_LEN("NumberingStartValue"), WID_NUMBERINGSTARTVALUE, &::getCppuType((const sal_Int16*)0), 0, 0 }, \ {MAP_CHAR_LEN("ParaIsNumberingRestart"), WID_PARAISNUMBERINGRESTART, &::getBooleanCppuType(), 0, 0 } #define SVX_UNOEDIT_CHAR_PROPERTIES \ - { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_HEIGHT), EE_CHAR_FONTHEIGHT, &::getCppuType((const float*)0), 0, MID_FONTHEIGHT|CONVERT_TWIPS }, \ - { MAP_CHAR_LEN("CharScaleWidth"), EE_CHAR_FONTWIDTH, &::getCppuType((const sal_Int16*)0), 0, 0 }, \ - { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTNAME), EE_CHAR_FONTINFO, &::getCppuType((const ::rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },\ - { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTSTYLENAME),EE_CHAR_FONTINFO, &::getCppuType((const ::rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, \ - { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTFAMILY), EE_CHAR_FONTINFO, &::getCppuType((const sal_Int16*)0), 0, MID_FONT_FAMILY }, \ - { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTCHARSET), EE_CHAR_FONTINFO, &::getCppuType((const sal_Int16*)0), 0, MID_FONT_CHAR_SET }, \ - { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTPITCH), EE_CHAR_FONTINFO, &::getCppuType((const sal_Int16*)0), 0, MID_FONT_PITCH }, \ - { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_POSTURE), EE_CHAR_ITALIC, &::getCppuType((const ::com::sun::star::awt::FontSlant*)0),0, MID_POSTURE }, \ - { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_WEIGHT), EE_CHAR_WEIGHT, &::getCppuType((const float*)0), 0, MID_WEIGHT }, \ - { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_LOCALE), EE_CHAR_LANGUAGE, &::getCppuType((const ::com::sun::star::lang::Locale*)0),0, MID_LANG_LOCALE }, \ - { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_COLOR), EE_CHAR_COLOR, &::getCppuType((const sal_Int32*)0), 0, 0 }, \ - { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_ESCAPEMENT), EE_CHAR_ESCAPEMENT, &::getCppuType((const sal_Int16*)0), 0, MID_ESC }, \ - { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_UNDERLINE), EE_CHAR_UNDERLINE, &::getCppuType((const sal_Int16*)0), 0, MID_TL_STYLE }, \ - { MAP_CHAR_LEN("CharUnderlineColor"), EE_CHAR_UNDERLINE, &::getCppuType((const sal_Int32*)0), 0, MID_TL_COLOR }, \ - { MAP_CHAR_LEN("CharUnderlineHasColor"), EE_CHAR_UNDERLINE, &::getBooleanCppuType(), 0, MID_TL_HASCOLOR } , \ - { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_OVERLINE), EE_CHAR_OVERLINE, &::getCppuType((const sal_Int16*)0), 0, MID_TL_STYLE }, \ - { MAP_CHAR_LEN("CharOverlineColor"), EE_CHAR_OVERLINE, &::getCppuType((const sal_Int32*)0), 0, MID_TL_COLOR }, \ - { MAP_CHAR_LEN("CharOverlineHasColor"), EE_CHAR_OVERLINE, &::getBooleanCppuType(), 0, MID_TL_HASCOLOR } , \ - { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_CROSSEDOUT), EE_CHAR_STRIKEOUT, &::getBooleanCppuType(), 0, MID_CROSSED_OUT }, \ - { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_STRIKEOUT), EE_CHAR_STRIKEOUT, &::getCppuType((const sal_Int16*)0), 0, MID_CROSS_OUT}, \ - { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_SHADOWED), EE_CHAR_SHADOW, &::getBooleanCppuType(), 0, 0 }, \ - { MAP_CHAR_LEN("CharContoured"), EE_CHAR_OUTLINE, &::getBooleanCppuType(), 0, 0 }, \ - { MAP_CHAR_LEN("CharEscapementHeight"), EE_CHAR_ESCAPEMENT, &::getCppuType((const sal_Int8*)0), 0, MID_ESC_HEIGHT },\ - { MAP_CHAR_LEN("CharAutoKerning"), EE_CHAR_PAIRKERNING,&::getBooleanCppuType(), 0, 0 } , \ - { MAP_CHAR_LEN("CharKerning"), EE_CHAR_KERNING, &::getCppuType((const sal_Int16*)0) , 0, 0 }, \ - { MAP_CHAR_LEN("CharWordMode"), EE_CHAR_WLM, &::getBooleanCppuType(), 0, 0 }, \ - { MAP_CHAR_LEN("CharEmphasis"), EE_CHAR_EMPHASISMARK,&::getCppuType((const sal_Int16*)0), 0, MID_EMPHASIS},\ - { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_HEIGHT_ASIAN), EE_CHAR_FONTHEIGHT_CJK, &::getCppuType((const float*)0), 0, MID_FONTHEIGHT|CONVERT_TWIPS }, \ - { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTNAME_ASIAN), EE_CHAR_FONTINFO_CJK, &::getCppuType((const ::rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },\ - { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTSTYLENAME_ASIAN), EE_CHAR_FONTINFO_CJK, &::getCppuType((const ::rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, \ - { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTFAMILY_ASIAN), EE_CHAR_FONTINFO_CJK, &::getCppuType((const sal_Int16*)0), 0, MID_FONT_FAMILY }, \ - { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTCHARSET_ASIAN), EE_CHAR_FONTINFO_CJK, &::getCppuType((const sal_Int16*)0), 0, MID_FONT_CHAR_SET }, \ - { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTPITCH_ASIAN), EE_CHAR_FONTINFO_CJK, &::getCppuType((const sal_Int16*)0), 0, MID_FONT_PITCH }, \ - { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_POSTURE_ASIAN), EE_CHAR_ITALIC_CJK, &::getCppuType((const ::com::sun::star::awt::FontSlant*)0),0, MID_POSTURE }, \ - { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_WEIGHT_ASIAN), EE_CHAR_WEIGHT_CJK, &::getCppuType((const float*)0), 0, MID_WEIGHT }, \ - { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_LOCALE_ASIAN), EE_CHAR_LANGUAGE_CJK, &::getCppuType((const ::com::sun::star::lang::Locale*)0),0, MID_LANG_LOCALE }, \ - { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_HEIGHT_COMPLEX), EE_CHAR_FONTHEIGHT_CTL, &::getCppuType((const float*)0), 0, MID_FONTHEIGHT|CONVERT_TWIPS }, \ - { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTNAME_COMPLEX), EE_CHAR_FONTINFO_CTL, &::getCppuType((const ::rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },\ - {MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTSTYLENAME_COMPLEX),EE_CHAR_FONTINFO_CTL, &::getCppuType((const ::rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, \ - { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTFAMILY_COMPLEX), EE_CHAR_FONTINFO_CTL, &::getCppuType((const sal_Int16*)0), 0, MID_FONT_FAMILY }, \ - { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTCHARSET_COMPLEX), EE_CHAR_FONTINFO_CTL, &::getCppuType((const sal_Int16*)0), 0, MID_FONT_CHAR_SET }, \ - { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTPITCH_COMPLEX), EE_CHAR_FONTINFO_CTL, &::getCppuType((const sal_Int16*)0), 0, MID_FONT_PITCH }, \ - { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_POSTURE_COMPLEX), EE_CHAR_ITALIC_CTL, &::getCppuType((const ::com::sun::star::awt::FontSlant*)0),0, MID_POSTURE }, \ - { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_WEIGHT_COMPLEX), EE_CHAR_WEIGHT_CTL, &::getCppuType((const float*)0), 0, MID_WEIGHT }, \ - { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_LOCALE_COMPLEX), EE_CHAR_LANGUAGE_CTL, &::getCppuType((const ::com::sun::star::lang::Locale*)0),0, MID_LANG_LOCALE }, \ - { MAP_CHAR_LEN("CharRelief" ), EE_CHAR_RELIEF, &::getCppuType((const sal_Int16*)0), 0, MID_RELIEF } + { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_HEIGHT), EE_CHAR_FONTHEIGHT, &::getCppuType((const float*)0), 0, MID_FONTHEIGHT|CONVERT_TWIPS }, \ + { MAP_CHAR_LEN("CharScaleWidth"), EE_CHAR_FONTWIDTH, &::getCppuType((const sal_Int16*)0), 0, 0 }, \ + { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTNAME), EE_CHAR_FONTINFO, &::getCppuType((const ::rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },\ + { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTSTYLENAME),EE_CHAR_FONTINFO, &::getCppuType((const ::rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, \ + { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTFAMILY), EE_CHAR_FONTINFO, &::getCppuType((const sal_Int16*)0), 0, MID_FONT_FAMILY }, \ + { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTCHARSET), EE_CHAR_FONTINFO, &::getCppuType((const sal_Int16*)0), 0, MID_FONT_CHAR_SET }, \ + { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTPITCH), EE_CHAR_FONTINFO, &::getCppuType((const sal_Int16*)0), 0, MID_FONT_PITCH }, \ + { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_POSTURE), EE_CHAR_ITALIC, &::getCppuType((const ::com::sun::star::awt::FontSlant*)0),0, MID_POSTURE }, \ + { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_WEIGHT), EE_CHAR_WEIGHT, &::getCppuType((const float*)0), 0, MID_WEIGHT }, \ + { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_LOCALE), EE_CHAR_LANGUAGE, &::getCppuType((const ::com::sun::star::lang::Locale*)0),0, MID_LANG_LOCALE }, \ + { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_COLOR), EE_CHAR_COLOR, &::getCppuType((const sal_Int32*)0), 0, 0 }, \ + { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_ESCAPEMENT), EE_CHAR_ESCAPEMENT, &::getCppuType((const sal_Int16*)0), 0, MID_ESC }, \ + { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_UNDERLINE), EE_CHAR_UNDERLINE, &::getCppuType((const sal_Int16*)0), 0, MID_TL_STYLE }, \ + { MAP_CHAR_LEN("CharUnderlineColor"), EE_CHAR_UNDERLINE, &::getCppuType((const sal_Int32*)0), 0, MID_TL_COLOR }, \ + { MAP_CHAR_LEN("CharUnderlineHasColor"), EE_CHAR_UNDERLINE, &::getBooleanCppuType(), 0, MID_TL_HASCOLOR } , \ + { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_OVERLINE), EE_CHAR_OVERLINE, &::getCppuType((const sal_Int16*)0), 0, MID_TL_STYLE }, \ + { MAP_CHAR_LEN("CharOverlineColor"), EE_CHAR_OVERLINE, &::getCppuType((const sal_Int32*)0), 0, MID_TL_COLOR }, \ + { MAP_CHAR_LEN("CharOverlineHasColor"), EE_CHAR_OVERLINE, &::getBooleanCppuType(), 0, MID_TL_HASCOLOR } , \ + { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_CROSSEDOUT), EE_CHAR_STRIKEOUT, &::getBooleanCppuType(), 0, MID_CROSSED_OUT }, \ + { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_STRIKEOUT), EE_CHAR_STRIKEOUT, &::getCppuType((const sal_Int16*)0), 0, MID_CROSS_OUT}, \ + { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_SHADOWED), EE_CHAR_SHADOW, &::getBooleanCppuType(), 0, 0 }, \ + { MAP_CHAR_LEN("CharContoured"), EE_CHAR_OUTLINE, &::getBooleanCppuType(), 0, 0 }, \ + { MAP_CHAR_LEN("CharEscapementHeight"), EE_CHAR_ESCAPEMENT, &::getCppuType((const sal_Int8*)0), 0, MID_ESC_HEIGHT },\ + { MAP_CHAR_LEN("CharAutoKerning"), EE_CHAR_PAIRKERNING,&::getBooleanCppuType(), 0, 0 } , \ + { MAP_CHAR_LEN("CharKerning"), EE_CHAR_KERNING, &::getCppuType((const sal_Int16*)0) , 0, 0 }, \ + { MAP_CHAR_LEN("CharWordMode"), EE_CHAR_WLM, &::getBooleanCppuType(), 0, 0 }, \ + { MAP_CHAR_LEN("CharEmphasis"), EE_CHAR_EMPHASISMARK,&::getCppuType((const sal_Int16*)0), 0, MID_EMPHASIS},\ + { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_HEIGHT_ASIAN), EE_CHAR_FONTHEIGHT_CJK, &::getCppuType((const float*)0), 0, MID_FONTHEIGHT|CONVERT_TWIPS }, \ + { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTNAME_ASIAN), EE_CHAR_FONTINFO_CJK, &::getCppuType((const ::rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },\ + { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTSTYLENAME_ASIAN), EE_CHAR_FONTINFO_CJK, &::getCppuType((const ::rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, \ + { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTFAMILY_ASIAN), EE_CHAR_FONTINFO_CJK, &::getCppuType((const sal_Int16*)0), 0, MID_FONT_FAMILY }, \ + { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTCHARSET_ASIAN), EE_CHAR_FONTINFO_CJK, &::getCppuType((const sal_Int16*)0), 0, MID_FONT_CHAR_SET }, \ + { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTPITCH_ASIAN), EE_CHAR_FONTINFO_CJK, &::getCppuType((const sal_Int16*)0), 0, MID_FONT_PITCH }, \ + { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_POSTURE_ASIAN), EE_CHAR_ITALIC_CJK, &::getCppuType((const ::com::sun::star::awt::FontSlant*)0),0, MID_POSTURE }, \ + { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_WEIGHT_ASIAN), EE_CHAR_WEIGHT_CJK, &::getCppuType((const float*)0), 0, MID_WEIGHT }, \ + { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_LOCALE_ASIAN), EE_CHAR_LANGUAGE_CJK, &::getCppuType((const ::com::sun::star::lang::Locale*)0),0, MID_LANG_LOCALE }, \ + { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_HEIGHT_COMPLEX), EE_CHAR_FONTHEIGHT_CTL, &::getCppuType((const float*)0), 0, MID_FONTHEIGHT|CONVERT_TWIPS }, \ + { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTNAME_COMPLEX), EE_CHAR_FONTINFO_CTL, &::getCppuType((const ::rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },\ + {MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTSTYLENAME_COMPLEX),EE_CHAR_FONTINFO_CTL, &::getCppuType((const ::rtl::OUString*)0), 0, MID_FONT_STYLE_NAME }, \ + { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTFAMILY_COMPLEX), EE_CHAR_FONTINFO_CTL, &::getCppuType((const sal_Int16*)0), 0, MID_FONT_FAMILY }, \ + { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTCHARSET_COMPLEX), EE_CHAR_FONTINFO_CTL, &::getCppuType((const sal_Int16*)0), 0, MID_FONT_CHAR_SET }, \ + { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_FONTPITCH_COMPLEX), EE_CHAR_FONTINFO_CTL, &::getCppuType((const sal_Int16*)0), 0, MID_FONT_PITCH }, \ + { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_POSTURE_COMPLEX), EE_CHAR_ITALIC_CTL, &::getCppuType((const ::com::sun::star::awt::FontSlant*)0),0, MID_POSTURE }, \ + { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_WEIGHT_COMPLEX), EE_CHAR_WEIGHT_CTL, &::getCppuType((const float*)0), 0, MID_WEIGHT }, \ + { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_LOCALE_COMPLEX), EE_CHAR_LANGUAGE_CTL, &::getCppuType((const ::com::sun::star::lang::Locale*)0),0, MID_LANG_LOCALE }, \ + { MAP_CHAR_LEN("CharRelief" ), EE_CHAR_RELIEF, &::getCppuType((const sal_Int16*)0), 0, MID_RELIEF } #define SVX_UNOEDIT_FONT_PROPERTIES \ - {MAP_CHAR_LEN(UNO_NAME_EDIT_FONT_DESCRIPTOR), WID_FONTDESC, &::getCppuType((const ::com::sun::star::awt::FontDescriptor*)0), 0, MID_FONT_FAMILY_NAME } + {MAP_CHAR_LEN(UNO_NAME_EDIT_FONT_DESCRIPTOR), WID_FONTDESC, &::getCppuType((const ::com::sun::star::awt::FontDescriptor*)0), 0, MID_FONT_FAMILY_NAME } #define SVX_UNOEDIT_PARA_PROPERTIES \ - {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_ADJUST), EE_PARA_JUST, &::getCppuType((const sal_Int16*)0), 0, MID_PARA_ADJUST }, \ - {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_BMARGIN), EE_PARA_ULSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_LO_MARGIN|SFX_METRIC_ITEM }, \ - {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_IS_HYPHEN), EE_PARA_HYPHENATE, &::getBooleanCppuType(), 0, 0 }, \ - {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_LASTLINEADJ), EE_PARA_JUST, &::getCppuType((const sal_Int16*)0), 0, MID_LAST_LINE_ADJUST }, \ - {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_LMARGIN), EE_PARA_LRSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_TXT_LMARGIN|SFX_METRIC_ITEM }, \ - {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_LINESPACING), EE_PARA_SBL, &::getCppuType((const ::com::sun::star::style::LineSpacing*)0), 0, 0 }, \ - {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_RMARGIN), EE_PARA_LRSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_R_MARGIN|SFX_METRIC_ITEM }, \ - {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_TAPSTOPS), EE_PARA_TABS, SEQTYPE(::getCppuType((const ::com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop >*)0)), 0, 0 }, \ - {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_TMARGIN), EE_PARA_ULSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_UP_MARGIN|SFX_METRIC_ITEM },\ - {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_FIRST_LINE_INDENT), EE_PARA_LRSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_FIRST_LINE_INDENT|SFX_METRIC_ITEM}, \ - {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_IS_HANGING_PUNCTUATION),EE_PARA_HANGINGPUNCTUATION, &::getBooleanCppuType(), 0 ,0 }, \ - {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_IS_CHARACTER_DISTANCE), EE_PARA_ASIANCJKSPACING, &::getBooleanCppuType(), 0 ,0 }, \ - {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_IS_FORBIDDEN_RULES), EE_PARA_FORBIDDENRULES, &::getBooleanCppuType(), 0 ,0 },\ - {MAP_CHAR_LEN("WritingMode"), EE_PARA_WRITINGDIR, &::getCppuType((const sal_Int16*)0), 0, 0 } + {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_ADJUST), EE_PARA_JUST, &::getCppuType((const sal_Int16*)0), 0, MID_PARA_ADJUST }, \ + {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_BMARGIN), EE_PARA_ULSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_LO_MARGIN|SFX_METRIC_ITEM }, \ + {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_IS_HYPHEN), EE_PARA_HYPHENATE, &::getBooleanCppuType(), 0, 0 }, \ + {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_LASTLINEADJ), EE_PARA_JUST, &::getCppuType((const sal_Int16*)0), 0, MID_LAST_LINE_ADJUST }, \ + {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_LMARGIN), EE_PARA_LRSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_TXT_LMARGIN|SFX_METRIC_ITEM }, \ + {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_LINESPACING), EE_PARA_SBL, &::getCppuType((const ::com::sun::star::style::LineSpacing*)0), 0, 0 }, \ + {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_RMARGIN), EE_PARA_LRSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_R_MARGIN|SFX_METRIC_ITEM }, \ + {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_TAPSTOPS), EE_PARA_TABS, SEQTYPE(::getCppuType((const ::com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop >*)0)), 0, 0 }, \ + {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_TMARGIN), EE_PARA_ULSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_UP_MARGIN|SFX_METRIC_ITEM },\ + {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_FIRST_LINE_INDENT), EE_PARA_LRSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_FIRST_LINE_INDENT|SFX_METRIC_ITEM}, \ + {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_IS_HANGING_PUNCTUATION),EE_PARA_HANGINGPUNCTUATION, &::getBooleanCppuType(), 0 ,0 }, \ + {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_IS_CHARACTER_DISTANCE), EE_PARA_ASIANCJKSPACING, &::getBooleanCppuType(), 0 ,0 }, \ + {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_IS_FORBIDDEN_RULES), EE_PARA_FORBIDDENRULES, &::getBooleanCppuType(), 0 ,0 },\ + {MAP_CHAR_LEN("WritingMode"), EE_PARA_WRITINGDIR, &::getCppuType((const sal_Int16*)0), 0, 0 } class SvxEditSource; class SvxTextForwarder; @@ -183,56 +183,56 @@ public: // SvxEditSource virtual ~SvxDummyTextSource(); - virtual SvxEditSource* Clone() const; - virtual SvxTextForwarder* GetTextForwarder(); - virtual void UpdateData(); + virtual SvxEditSource* Clone() const; + virtual SvxTextForwarder* GetTextForwarder(); + virtual void UpdateData(); // SvxTextForwarder - virtual sal_uInt16 GetParagraphCount() const; - virtual sal_uInt16 GetTextLen( sal_uInt16 nParagraph ) const; - virtual String GetText( const ESelection& rSel ) const; - virtual SfxItemSet GetAttribs( const ESelection& rSel, BOOL bOnlyHardAttrib = 0 ) const; - virtual SfxItemSet GetParaAttribs( sal_uInt16 nPara ) const; - virtual void SetParaAttribs( sal_uInt16 nPara, const SfxItemSet& rSet ); + virtual sal_uInt16 GetParagraphCount() const; + virtual sal_uInt16 GetTextLen( sal_uInt16 nParagraph ) const; + virtual String GetText( const ESelection& rSel ) const; + virtual SfxItemSet GetAttribs( const ESelection& rSel, BOOL bOnlyHardAttrib = 0 ) const; + virtual SfxItemSet GetParaAttribs( sal_uInt16 nPara ) const; + virtual void SetParaAttribs( sal_uInt16 nPara, const SfxItemSet& rSet ); virtual void RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich ); virtual void GetPortions( sal_uInt16 nPara, SvUShorts& rList ) const; - - sal_uInt16 GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const; - sal_uInt16 GetItemState( sal_uInt16 nPara, sal_uInt16 nWhich ) const; - - virtual SfxItemPool* GetPool() const; - - virtual void QuickInsertText( const String& rText, const ESelection& rSel ); - virtual void QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel ); - virtual void QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel ); - virtual void QuickInsertLineBreak( const ESelection& rSel ); - - virtual XubString CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor ); - virtual void FieldClicked( const SvxFieldItem& rField, USHORT nPara, xub_StrLen nPos ); - - virtual sal_Bool IsValid() const; - - virtual void SetNotifyHdl( const Link& ); - virtual LanguageType GetLanguage( USHORT, USHORT ) const; - virtual USHORT GetFieldCount( USHORT nPara ) const; - virtual EFieldInfo GetFieldInfo( USHORT nPara, USHORT nField ) const; + + sal_uInt16 GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const; + sal_uInt16 GetItemState( sal_uInt16 nPara, sal_uInt16 nWhich ) const; + + virtual SfxItemPool* GetPool() const; + + virtual void QuickInsertText( const String& rText, const ESelection& rSel ); + virtual void QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel ); + virtual void QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel ); + virtual void QuickInsertLineBreak( const ESelection& rSel ); + + virtual XubString CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor ); + virtual void FieldClicked( const SvxFieldItem& rField, USHORT nPara, xub_StrLen nPos ); + + virtual sal_Bool IsValid() const; + + virtual void SetNotifyHdl( const Link& ); + virtual LanguageType GetLanguage( USHORT, USHORT ) const; + virtual USHORT GetFieldCount( USHORT nPara ) const; + virtual EFieldInfo GetFieldInfo( USHORT nPara, USHORT nField ) const; virtual EBulletInfo GetBulletInfo( USHORT nPara ) const; - virtual Rectangle GetCharBounds( USHORT nPara, USHORT nIndex ) const; - virtual Rectangle GetParaBounds( USHORT nPara ) const; - virtual MapMode GetMapMode() const; - virtual OutputDevice* GetRefDevice() const; - virtual sal_Bool GetIndexAtPoint( const Point&, USHORT& nPara, USHORT& nIndex ) const; - virtual sal_Bool GetWordIndices( USHORT nPara, USHORT nIndex, USHORT& nStart, USHORT& nEnd ) const; - virtual sal_Bool GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, USHORT nPara, USHORT nIndex ) const; - virtual USHORT GetLineCount( USHORT nPara ) const; - virtual USHORT GetLineLen( USHORT nPara, USHORT nLine ) const; + virtual Rectangle GetCharBounds( USHORT nPara, USHORT nIndex ) const; + virtual Rectangle GetParaBounds( USHORT nPara ) const; + virtual MapMode GetMapMode() const; + virtual OutputDevice* GetRefDevice() const; + virtual sal_Bool GetIndexAtPoint( const Point&, USHORT& nPara, USHORT& nIndex ) const; + virtual sal_Bool GetWordIndices( USHORT nPara, USHORT nIndex, USHORT& nStart, USHORT& nEnd ) const; + virtual sal_Bool GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, USHORT nPara, USHORT nIndex ) const; + virtual USHORT GetLineCount( USHORT nPara ) const; + virtual USHORT GetLineLen( USHORT nPara, USHORT nLine ) const; virtual void GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEnd, USHORT nParagraph, USHORT nLine ) const; virtual USHORT GetLineNumberAtIndex( USHORT nPara, USHORT nIndex ) const; - virtual sal_Bool Delete( const ESelection& ); - virtual sal_Bool InsertText( const String&, const ESelection& ); - virtual sal_Bool QuickFormatDoc( BOOL bFull=FALSE ); - virtual sal_Int16 GetDepth( USHORT nPara ) const; - virtual sal_Bool SetDepth( USHORT nPara, sal_Int16 nNewDepth ); + virtual sal_Bool Delete( const ESelection& ); + virtual sal_Bool InsertText( const String&, const ESelection& ); + virtual sal_Bool QuickFormatDoc( BOOL bFull=FALSE ); + virtual sal_Int16 GetDepth( USHORT nPara ) const; + virtual sal_Bool SetDepth( USHORT nPara, sal_Int16 nNewDepth ); virtual const SfxItemSet* GetEmptyItemSetPtr(); @@ -240,10 +240,10 @@ public: virtual void AppendParagraph(); virtual xub_StrLen AppendTextPortion( USHORT nPara, const String &rText, const SfxItemSet &rSet ); //XTextCopy - virtual void CopyText(const SvxTextForwarder& rSource); + virtual void CopyText(const SvxTextForwarder& rSource); }; -namespace accessibility +namespace accessibility { class AccessibleEditableTextPara; } @@ -263,8 +263,8 @@ class EDITENG_DLLPUBLIC SvxUnoTextRangeBase : public ::com::sun::star::text::XTe friend class accessibility::AccessibleEditableTextPara; protected: - SvxEditSource* mpEditSource; - ESelection maSelection; + SvxEditSource* mpEditSource; + ESelection maSelection; const SvxItemPropertySet* mpPropSet; virtual void SAL_CALL _setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue, sal_Int32 nPara = -1 ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); @@ -293,20 +293,20 @@ public: virtual ~SvxUnoTextRangeBase() throw(); // Internal - const ESelection& GetSelection() const throw() { CheckSelection( ((SvxUnoTextRangeBase*)this)->maSelection, mpEditSource->GetTextForwarder() ); return maSelection; }; - void SetSelection( const ESelection& rSelection ) throw(); + const ESelection& GetSelection() const throw() { CheckSelection( ((SvxUnoTextRangeBase*)this)->maSelection, mpEditSource->GetTextForwarder() ); return maSelection; }; + void SetSelection( const ESelection& rSelection ) throw(); - virtual void CollapseToStart(void) throw(); - virtual void CollapseToEnd(void) throw(); - virtual sal_Bool IsCollapsed(void) throw(); - virtual sal_Bool GoLeft(sal_Int16 nCount, sal_Bool Expand) throw(); - virtual sal_Bool GoRight(sal_Int16 nCount, sal_Bool Expand) throw(); - virtual void GotoStart(sal_Bool Expand) throw(); - virtual void GotoEnd(sal_Bool Expand) throw(); + virtual void CollapseToStart(void) throw(); + virtual void CollapseToEnd(void) throw(); + virtual sal_Bool IsCollapsed(void) throw(); + virtual sal_Bool GoLeft(sal_Int16 nCount, sal_Bool Expand) throw(); + virtual sal_Bool GoRight(sal_Int16 nCount, sal_Bool Expand) throw(); + virtual void GotoStart(sal_Bool Expand) throw(); + virtual void GotoEnd(sal_Bool Expand) throw(); //const SfxItemPropertyMapEntry* getPropertyMapEntries() const throw() { return maPropSet.getPropertyMapEntries(); } const SvxItemPropertySet* getPropertySet() const throw() { return mpPropSet; } - SvxEditSource* GetEditSource() const throw() { return mpEditSource; } + SvxEditSource* GetEditSource() const throw() { return mpEditSource; } static sal_Bool SetPropertyValueHelper( const SfxItemSet& rOldSet, const SfxItemPropertySimpleEntry* pMap, const ::com::sun::star::uno::Any& aValue, SfxItemSet& rNewSet, const ESelection* pSelection = NULL, SvxEditSource* pEditSource = NULL ) throw( ::com::sun::star::uno::RuntimeException ); static sal_Bool GetPropertyValueHelper( SfxItemSet& rSet, const SfxItemPropertySimpleEntry* pMap, ::com::sun::star::uno::Any& aAny, const ESelection* pSelection = NULL, SvxEditSource* pEditSource = NULL ) throw( ::com::sun::star::uno::RuntimeException ); @@ -368,7 +368,7 @@ class EDITENG_DLLPUBLIC SvxUnoTextRange : public SvxUnoTextRangeBase, { friend class SvxUnoTextRangeEnumeration; private: - ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > xParentText; + ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > xParentText; sal_Bool mbPortion; protected: @@ -403,7 +403,7 @@ class EDITENG_DLLPUBLIC SvxUnoTextBase : public SvxUnoTextRangeBase, public ::com::sun::star::lang::XTypeProvider { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > xParentText; + ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > xParentText; static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > maTypeSequence; public: @@ -460,7 +460,7 @@ public: // com::sun::star::text::XTextCopy virtual void SAL_CALL copyText( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCopy >& xSource ) throw (::com::sun::star::uno::RuntimeException); - + // ::com::sun::star::lang::XServiceInfo virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); @@ -504,9 +504,9 @@ class SvxUnoTextContentEnumeration : public ::cppu::WeakAggImplHelper1< ::com::s { private: ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > mxParentText; - SvxEditSource* mpEditSource; - sal_uInt16 mnNextParagraph; - const SvxUnoTextBase& mrText; + SvxEditSource* mpEditSource; + sal_uInt16 mnNextParagraph; + const SvxUnoTextBase& mrText; public: SvxUnoTextContentEnumeration( const SvxUnoTextBase& _rText ) throw(); @@ -530,8 +530,8 @@ class SvxUnoTextContent : public SvxUnoTextRangeBase, friend class SvxUnoTextContentEnumeration; private: ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > mxParentText; - sal_uInt16 mnParagraph; - const SvxUnoTextBase& mrParentText; + sal_uInt16 mnParagraph; + const SvxUnoTextBase& mrParentText; // for xComponent ::osl::Mutex maDisposeContainerMutex; @@ -548,7 +548,7 @@ public: SvxUnoTextContent() throw(); SvxUnoTextContent( const SvxUnoTextBase& rText, sal_uInt16 nPara ) throw(); SvxUnoTextContent( const SvxUnoTextContent& rContent ) throw(); - virtual ~SvxUnoTextContent() throw(); + virtual ~SvxUnoTextContent() throw(); // ::com::sun::star::uno::XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); @@ -602,12 +602,12 @@ public: class SvxUnoTextRangeEnumeration : public ::cppu::WeakAggImplHelper1< ::com::sun::star::container::XEnumeration > { private: - SvxEditSource* mpEditSource; + SvxEditSource* mpEditSource; ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > mxParentText; - const SvxUnoTextBase& mrParentText; - sal_uInt16 mnParagraph; - SvUShorts* mpPortions; - sal_uInt16 mnNextPortion; + const SvxUnoTextBase& mrParentText; + sal_uInt16 mnParagraph; + SvUShorts* mpPortions; + sal_uInt16 mnNextPortion; public: SvxUnoTextRangeEnumeration( const SvxUnoTextBase& rText, sal_uInt16 nPara ) throw(); diff --git a/editeng/inc/editeng/unoviwed.hxx b/editeng/inc/editeng/unoviwed.hxx index ed4adec50721..7e023fd37727 100644 --- a/editeng/inc/editeng/unoviwed.hxx +++ b/editeng/inc/editeng/unoviwed.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,22 +39,22 @@ class EditView; class SvxEditEngineViewForwarder : public SvxEditViewForwarder { private: - EditView& mrView; + EditView& mrView; public: SvxEditEngineViewForwarder( EditView& rView ); - virtual ~SvxEditEngineViewForwarder(); + virtual ~SvxEditEngineViewForwarder(); - virtual BOOL IsValid() const; + virtual BOOL IsValid() const; - virtual Rectangle GetVisArea() const; - virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const; - virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const; + virtual Rectangle GetVisArea() const; + virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const; + virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const; - virtual sal_Bool GetSelection( ESelection& rSelection ) const; - virtual sal_Bool SetSelection( const ESelection& rSelection ); - virtual sal_Bool Copy(); - virtual sal_Bool Cut(); + virtual sal_Bool GetSelection( ESelection& rSelection ) const; + virtual sal_Bool SetSelection( const ESelection& rSelection ); + virtual sal_Bool Copy(); + virtual sal_Bool Cut(); virtual sal_Bool Paste(); }; diff --git a/editeng/inc/editeng/unoviwou.hxx b/editeng/inc/editeng/unoviwou.hxx index 1ff03a3e468c..b0efc092b812 100644 --- a/editeng/inc/editeng/unoviwou.hxx +++ b/editeng/inc/editeng/unoviwou.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,26 +38,26 @@ class OutlinerView; class EDITENG_DLLPUBLIC SvxDrawOutlinerViewForwarder : public SvxEditViewForwarder { private: - OutlinerView& mrOutlinerView; - Point maTextShapeTopLeft; + OutlinerView& mrOutlinerView; + Point maTextShapeTopLeft; - EDITENG_DLLPRIVATE Point GetTextOffset() const; + EDITENG_DLLPRIVATE Point GetTextOffset() const; public: - explicit SvxDrawOutlinerViewForwarder( OutlinerView& rOutl ); + explicit SvxDrawOutlinerViewForwarder( OutlinerView& rOutl ); SvxDrawOutlinerViewForwarder( OutlinerView& rOutl, const Point& rShapePosTopLeft ); - virtual ~SvxDrawOutlinerViewForwarder(); + virtual ~SvxDrawOutlinerViewForwarder(); - virtual BOOL IsValid() const; + virtual BOOL IsValid() const; - virtual Rectangle GetVisArea() const; - virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const; - virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const; + virtual Rectangle GetVisArea() const; + virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const; + virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const; - virtual sal_Bool GetSelection( ESelection& rSelection ) const; - virtual sal_Bool SetSelection( const ESelection& rSelection ); - virtual sal_Bool Copy(); - virtual sal_Bool Cut(); + virtual sal_Bool GetSelection( ESelection& rSelection ) const; + virtual sal_Bool SetSelection( const ESelection& rSelection ); + virtual sal_Bool Copy(); + virtual sal_Bool Cut(); virtual sal_Bool Paste(); /// Set the top, left position of the underlying draw shape, to diff --git a/editeng/inc/editeng/wghtitem.hxx b/editeng/inc/editeng/wghtitem.hxx index 3234a1fc8ec0..8a77027bfe79 100644 --- a/editeng/inc/editeng/wghtitem.hxx +++ b/editeng/inc/editeng/wghtitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,18 +61,18 @@ public: SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; - virtual String GetValueTextByPos( USHORT nPos ) const; - virtual USHORT GetValueCount() const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Create(SvStream &, USHORT) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; + virtual String GetValueTextByPos( USHORT nPos ) const; + virtual USHORT GetValueCount() const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); - virtual int HasBoolValue() const; - virtual BOOL GetBoolValue() const; - virtual void SetBoolValue( BOOL bVal ); + virtual int HasBoolValue() const; + virtual BOOL GetBoolValue() const; + virtual void SetBoolValue( BOOL bVal ); inline SvxWeightItem& operator=(const SvxWeightItem& rWeight) { SetValue( rWeight.GetValue() ); @@ -80,9 +80,9 @@ public: } // enum cast - FontWeight GetWeight() const + FontWeight GetWeight() const { return (FontWeight)GetValue(); } - void SetWeight( FontWeight eNew ) + void SetWeight( FontWeight eNew ) { SetValue( (USHORT)eNew ); } }; diff --git a/editeng/inc/editeng/widwitem.hxx b/editeng/inc/editeng/widwitem.hxx index 0f4a809f7656..f8aaeba29e3e 100644 --- a/editeng/inc/editeng/widwitem.hxx +++ b/editeng/inc/editeng/widwitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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: // "pure virtual Methoden" vom SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create( SvStream &, USHORT ) const; - virtual SvStream& Store( SvStream & , USHORT nItemVersion ) const; + virtual SvStream& Store( SvStream & , USHORT nItemVersion ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/editeng/inc/editeng/writingmodeitem.hxx b/editeng/inc/editeng/writingmodeitem.hxx index 03d61a79a8aa..a7d569d15879 100644 --- a/editeng/inc/editeng/writingmodeitem.hxx +++ b/editeng/inc/editeng/writingmodeitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ public: SvxWritingModeItem& operator=( const SvxWritingModeItem& rItem ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream & rStrm, USHORT nIVer) const; - virtual USHORT GetVersion( USHORT nFileVersion ) const; - virtual int operator==( const SfxPoolItem& ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Create(SvStream &, USHORT) const; + virtual SvStream& Store(SvStream & rStrm, USHORT nIVer) const; + virtual USHORT GetVersion( USHORT nFileVersion ) const; + virtual int operator==( const SfxPoolItem& ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/editeng/inc/editeng/wrlmitem.hxx b/editeng/inc/editeng/wrlmitem.hxx index c008efeb966f..de29f41368f9 100644 --- a/editeng/inc/editeng/wrlmitem.hxx +++ b/editeng/inc/editeng/wrlmitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ namespace rtl // class SvxWordLineModeItem --------------------------------------------- -/* [Beschreibung] +/* [Beschreibung] Dieses Item beschreibt, ob Unterstrichen und Durchgestrichen auf Wortgrenzen beschraenkt ist. @@ -58,7 +58,7 @@ public: // "pure virtual Methoden" vom SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; + virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/editeng/inc/editeng/xmlcnitm.hxx b/editeng/inc/editeng/xmlcnitm.hxx index 3d6837d77636..0c048c7c3c2f 100644 --- a/editeng/inc/editeng/xmlcnitm.hxx +++ b/editeng/inc/editeng/xmlcnitm.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ class SvXMLAttrContainerData; class EDITENG_DLLPUBLIC SvXMLAttrContainerItem: public SfxPoolItem { - SvXMLAttrContainerData *pImpl; + SvXMLAttrContainerData *pImpl; public: TYPEINFO(); @@ -52,7 +52,7 @@ public: virtual int operator==( const SfxPoolItem& ) const; using SfxPoolItem::Compare; - virtual int Compare( const SfxPoolItem &rWith ) const; + virtual int Compare( const SfxPoolItem &rWith ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePresentation, @@ -63,8 +63,8 @@ public: virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); virtual SfxPoolItem *Clone( SfxItemPool * = 0) const { return new SvXMLAttrContainerItem( *this ); } diff --git a/editeng/inc/editxml.hxx b/editeng/inc/editxml.hxx index 54ece4b1ecf4..8d103edde394 100644 --- a/editeng/inc/editxml.hxx +++ b/editeng/inc/editxml.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/editeng/inc/helpid.hrc b/editeng/inc/helpid.hrc index 204f97842bf9..32c109aad2a5 100644 --- a/editeng/inc/helpid.hrc +++ b/editeng/inc/helpid.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,7 +72,7 @@ // Overrun check --------------------------------------------------------- // ----------------------------------------------------------------------- -#define ACT_SVX_HID_END (HID_EDIT_START+28) +#define ACT_SVX_HID_END (HID_EDIT_START+28) #if ACT_SVX_HID_END > HID_EDIT_END #error Resource-Ueberlauf in #line, #file #endif diff --git a/editeng/inc/pch/precompiled_editeng.cxx b/editeng/inc/pch/precompiled_editeng.cxx index b76a66fef50c..3fe7dcce130e 100644 --- a/editeng/inc/pch/precompiled_editeng.cxx +++ b/editeng/inc/pch/precompiled_editeng.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite |